Skip to content

Commit

Permalink
proto: add timestamp field to SubscribeUpdate message
Browse files Browse the repository at this point in the history
  • Loading branch information
fanatid committed Dec 24, 2023
1 parent 4783b60 commit 3197466
Show file tree
Hide file tree
Showing 13 changed files with 64 additions and 32 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,17 @@ The minor version will be incremented upon a breaking change and the patch versi

### Breaking

## 2023-12-24

- yellowstone-grpc-client-1.13.0+solana.1.16.21
- yellowstone-grpc-geyser-1.12.0+solana.1.16.21
- yellowstone-grpc-proto-1.12.0+solana.1.16.21
- yellowstone-grpc-tools-1.0.0-rc.10+solana.1.16.21

### Features

- proto: add `timestamp` field to `SubscribeUpdate` message

## 2023-12-08

- yellowstone-grpc-tools-1.0.0-rc.9+solana.1.16.21
Expand Down
11 changes: 6 additions & 5 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 8 additions & 7 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[workspace]
resolver = "2"
members = [
"examples/rust", # 1.11.0+solana.1.16.21
"yellowstone-grpc-client", # 1.12.0+solana.1.16.21
"yellowstone-grpc-geyser", # 1.11.1+solana.1.16.21
"yellowstone-grpc-proto", # 1.11.0+solana.1.16.21
"yellowstone-grpc-tools", # 1.0.0-rc.9+solana.1.16.21
"examples/rust", # 1.12.0+solana.1.16.21
"yellowstone-grpc-client", # 1.13.0+solana.1.16.21
"yellowstone-grpc-geyser", # 1.12.0+solana.1.16.21
"yellowstone-grpc-proto", # 1.12.0+solana.1.16.21
"yellowstone-grpc-tools", # 1.0.0-rc.10+solana.1.16.21
]

[workspace.package]
Expand Down Expand Up @@ -44,6 +44,7 @@ log = "0.4.17"
maplit = "1.0.2"
prometheus = "0.13.2"
prost = "0.12.1"
prost-types = "0.12.1"
protobuf-src = "1.1.0"
rdkafka = "0.34.0"
serde = "1.0.145"
Expand All @@ -65,8 +66,8 @@ tonic-health = "0.10.2"
tracing = "0.1.37"
tracing-subscriber = "0.3.17"
vergen = "8.2.1"
yellowstone-grpc-client = { path = "yellowstone-grpc-client", version = "=1.12.0+solana.1.16.21" }
yellowstone-grpc-proto = { path = "yellowstone-grpc-proto", version = "=1.11.0+solana.1.16.21" }
yellowstone-grpc-client = { path = "yellowstone-grpc-client", version = "=1.13.0+solana.1.16.21" }
yellowstone-grpc-proto = { path = "yellowstone-grpc-proto", version = "=1.12.0+solana.1.16.21" }

[profile.release]
debug = true
Expand Down
2 changes: 1 addition & 1 deletion examples/rust/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "yellowstone-grpc-client-simple"
version = "1.11.0+solana.1.16.21"
version = "1.12.0+solana.1.16.21"
authors = { workspace = true }
edition = { workspace = true }
homepage = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion yellowstone-grpc-client/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "yellowstone-grpc-client"
version = "1.12.0+solana.1.16.21"
version = "1.13.0+solana.1.16.21"
authors = { workspace = true }
edition = { workspace = true }
description = "Yellowstone gRPC Geyser Simple Client"
Expand Down
2 changes: 1 addition & 1 deletion yellowstone-grpc-geyser/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "yellowstone-grpc-geyser"
version = "1.11.1+solana.1.16.21"
version = "1.12.0+solana.1.16.21"
authors = { workspace = true }
edition = { workspace = true }
description = "Yellowstone gRPC Geyser Plugin"
Expand Down
23 changes: 15 additions & 8 deletions yellowstone-grpc-geyser/src/filters.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,20 @@ use {
collections::{HashMap, HashSet},
iter::FromIterator,
str::FromStr,
time::SystemTime,
},
yellowstone_grpc_proto::prelude::{
subscribe_request_filter_accounts_filter::Filter as AccountsFilterDataOneof,
subscribe_request_filter_accounts_filter_memcmp::Data as AccountsFilterMemcmpOneof,
subscribe_update::UpdateOneof, CommitmentLevel, SubscribeRequest,
SubscribeRequestAccountsDataSlice, SubscribeRequestFilterAccounts,
SubscribeRequestFilterAccountsFilter, SubscribeRequestFilterBlocks,
SubscribeRequestFilterBlocksMeta, SubscribeRequestFilterEntry, SubscribeRequestFilterSlots,
SubscribeRequestFilterTransactions, SubscribeUpdate, SubscribeUpdatePong,
yellowstone_grpc_proto::{
prelude::{
subscribe_request_filter_accounts_filter::Filter as AccountsFilterDataOneof,
subscribe_request_filter_accounts_filter_memcmp::Data as AccountsFilterMemcmpOneof,
subscribe_update::UpdateOneof, CommitmentLevel, SubscribeRequest,
SubscribeRequestAccountsDataSlice, SubscribeRequestFilterAccounts,
SubscribeRequestFilterAccountsFilter, SubscribeRequestFilterBlocks,
SubscribeRequestFilterBlocksMeta, SubscribeRequestFilterEntry,
SubscribeRequestFilterSlots, SubscribeRequestFilterTransactions, SubscribeUpdate,
SubscribeUpdatePong,
},
prost_types::Timestamp,
},
};

Expand Down Expand Up @@ -113,6 +118,7 @@ impl Filter {
Some(SubscribeUpdate {
filters,
update_oneof: Some(message.to_proto(&self.accounts_data_slice)),
timestamp: Some(Timestamp::from(SystemTime::now())),
})
}
})
Expand All @@ -123,6 +129,7 @@ impl Filter {
self.ping.map(|id| SubscribeUpdate {
filters: vec![],
update_oneof: Some(UpdateOneof::Pong(SubscribeUpdatePong { id })),
timestamp: Some(Timestamp::from(SystemTime::now())),
})
}
}
Expand Down
3 changes: 3 additions & 0 deletions yellowstone-grpc-geyser/src/grpc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ use {
atomic::{AtomicUsize, Ordering},
Arc,
},
time::SystemTime,
},
tokio::{
fs,
Expand Down Expand Up @@ -52,6 +53,7 @@ use {
SubscribeUpdateBlockMeta, SubscribeUpdateEntry, SubscribeUpdatePing,
SubscribeUpdateSlot, SubscribeUpdateTransaction, SubscribeUpdateTransactionInfo,
},
prost_types::Timestamp,
},
};

Expand Down Expand Up @@ -1228,6 +1230,7 @@ impl Geyser for GrpcService {
let ping_msg = SubscribeUpdate {
filters: vec![],
update_oneof: Some(UpdateOneof::Ping(SubscribeUpdatePing {})),
timestamp: Some(Timestamp::from(SystemTime::now())),
};

loop {
Expand Down
3 changes: 2 additions & 1 deletion yellowstone-grpc-proto/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "yellowstone-grpc-proto"
version = "1.11.0+solana.1.16.21"
version = "1.12.0+solana.1.16.21"
authors = { workspace = true }
edition = { workspace = true }
description = "Yellowstone gRPC Geyser Protobuf Definitions"
Expand All @@ -13,6 +13,7 @@ publish = true
[dependencies]
bincode = { workspace = true }
prost = { workspace = true }
prost-types = { workspace = true }
solana-account-decoder = { workspace = true }
solana-sdk = { workspace = true }
solana-transaction-status = { workspace = true }
Expand Down
2 changes: 2 additions & 0 deletions yellowstone-grpc-proto/proto/geyser.proto
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
syntax = "proto3";

import "google/protobuf/timestamp.proto";
import public "solana-storage.proto";

option go_package = "github.com/rpcpool/solana-geyser-grpc/golang/proto";
Expand Down Expand Up @@ -102,6 +103,7 @@ message SubscribeUpdate {
SubscribeUpdateBlockMeta block_meta = 7;
SubscribeUpdateEntry entry = 8;
}
google.protobuf.Timestamp timestamp = 10;
}

message SubscribeUpdateAccount {
Expand Down
1 change: 1 addition & 0 deletions yellowstone-grpc-proto/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ pub mod prelude {
}

pub use prost;
pub use prost_types;
pub use tonic;

pub mod convert_to {
Expand Down
2 changes: 1 addition & 1 deletion yellowstone-grpc-tools/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "yellowstone-grpc-tools"
version = "1.0.0-rc.9+solana.1.16.21"
version = "1.0.0-rc.10+solana.1.16.21"
authors = { workspace = true }
edition = { workspace = true }
description = "Yellowstone gRPC Tools"
Expand Down
19 changes: 12 additions & 7 deletions yellowstone-grpc-tools/src/kafka/grpc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ use {
atomic::{AtomicUsize, Ordering},
Arc,
},
time::SystemTime,
},
tokio::{
sync::{broadcast, mpsc, Notify},
Expand All @@ -24,13 +25,16 @@ use {
},
tonic_health::server::health_reporter,
tracing::{error, info},
yellowstone_grpc_proto::prelude::{
geyser_server::{Geyser, GeyserServer},
subscribe_update::UpdateOneof,
GetBlockHeightRequest, GetBlockHeightResponse, GetLatestBlockhashRequest,
GetLatestBlockhashResponse, GetSlotRequest, GetSlotResponse, GetVersionRequest,
GetVersionResponse, IsBlockhashValidRequest, IsBlockhashValidResponse, PingRequest,
PongResponse, SubscribeRequest, SubscribeUpdate, SubscribeUpdatePing,
yellowstone_grpc_proto::{
prelude::{
geyser_server::{Geyser, GeyserServer},
subscribe_update::UpdateOneof,
GetBlockHeightRequest, GetBlockHeightResponse, GetLatestBlockhashRequest,
GetLatestBlockhashResponse, GetSlotRequest, GetSlotResponse, GetVersionRequest,
GetVersionResponse, IsBlockhashValidRequest, IsBlockhashValidResponse, PingRequest,
PongResponse, SubscribeRequest, SubscribeUpdate, SubscribeUpdatePing,
},
prost_types::Timestamp,
},
};

Expand Down Expand Up @@ -119,6 +123,7 @@ impl Geyser for GrpcService {
let ping_msg = SubscribeUpdate {
filters: vec![],
update_oneof: Some(UpdateOneof::Ping(SubscribeUpdatePing {})),
timestamp: Some(Timestamp::from(SystemTime::now())),
};

loop {
Expand Down

0 comments on commit 3197466

Please sign in to comment.