Update solana =1.14.13 (#35)

This commit is contained in:
Kirill Fomichev 2023-01-30 14:35:54 -03:00 committed by GitHub
parent 042351661d
commit 0d635694f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 396 additions and 386 deletions

737
Cargo.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,6 @@
[package]
name = "solana-geyser-grpc"
version = "0.4.1+solana.1.14.10"
version = "0.4.1+solana.1.14.13"
authors = ["Triton One"]
edition = "2021"
@ -19,10 +19,10 @@ prometheus = "0.13.2"
prost = "0.11.0"
serde = { version = "1.0.145", features = ["derive"] }
serde_json = "1.0.86"
solana-geyser-plugin-interface = "=1.14.10"
solana-logger = "=1.14.10"
solana-sdk = "=1.14.10"
solana-transaction-status = "=1.14.10"
solana-geyser-plugin-interface = "=1.14.13"
solana-logger = "=1.14.13"
solana-sdk = "=1.14.13"
solana-transaction-status = "=1.14.13"
tokio = { version = "1.21.2", features = ["rt-multi-thread", "macros", "time"] }
tokio-stream = "0.1.11"
tonic = { version = "0.8.2", features = ["gzip", "tls", "tls-roots"] }

View File

@ -1,6 +1,6 @@
syntax = "proto3";
import public "solana-storage-v1.14.10.proto";
import public "solana-storage-v1.14.13.proto";
package geyser;

View File

@ -19,9 +19,8 @@ mod convert {
clock::UnixTimestamp,
instruction::CompiledInstruction,
message::{
legacy::Message as LegacyMessage,
v0::{LoadedMessage, MessageAddressTableLookup},
MessageHeader, SanitizedMessage,
LegacyMessage, MessageHeader, SanitizedMessage,
},
pubkey::Pubkey,
signature::Signature,
@ -46,27 +45,21 @@ mod convert {
}
}
impl From<&LegacyMessage> for super::Message {
fn from(message: &LegacyMessage) -> Self {
Self {
header: Some((&message.header).into()),
account_keys: message
.account_keys
.iter()
.map(|key| <Pubkey as AsRef<[u8]>>::as_ref(key).into())
.collect(),
recent_blockhash: message.recent_blockhash.to_bytes().into(),
instructions: message.instructions.iter().map(|ix| ix.into()).collect(),
versioned: false,
address_table_lookups: vec![],
}
}
}
impl From<&SanitizedMessage> for super::Message {
fn from(message: &SanitizedMessage) -> Self {
match message {
SanitizedMessage::Legacy(message) => Self::from(message),
SanitizedMessage::Legacy(LegacyMessage { message, .. }) => Self {
header: Some((&message.header).into()),
account_keys: message
.account_keys
.iter()
.map(|key| <Pubkey as AsRef<[u8]>>::as_ref(key).into())
.collect(),
recent_blockhash: message.recent_blockhash.to_bytes().into(),
instructions: message.instructions.iter().map(|ix| ix.into()).collect(),
versioned: false,
address_table_lookups: vec![],
},
SanitizedMessage::V0(LoadedMessage { message, .. }) => Self {
header: Some((&message.header).into()),
account_keys: message