solana: update to 1.17.1 (#202)

This commit is contained in:
Kirill Fomichev 2023-10-12 21:06:19 +04:00 committed by GitHub
parent 87918a2a7d
commit c89b89dfc5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 111 additions and 111 deletions

154
Cargo.lock generated
View File

@ -297,12 +297,6 @@ dependencies = [
"rand 0.8.5",
]
[[package]]
name = "array-bytes"
version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9ad284aeb45c13f2fb4f084de4a420ebf447423bdf9386c0540ce33cb3ef4b8c"
[[package]]
name = "arrayref"
version = "0.3.7"
@ -506,6 +500,9 @@ name = "bitflags"
version = "2.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635"
dependencies = [
"serde",
]
[[package]]
name = "bitmaps"
@ -1883,6 +1880,17 @@ dependencies = [
"vcpkg",
]
[[package]]
name = "light-poseidon"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "949bdd22e4ed93481d45e9a6badb34b99132bcad0c8a8d4f05c42f7dcc7b90bc"
dependencies = [
"ark-bn254",
"ark-ff",
"thiserror",
]
[[package]]
name = "linux-raw-sys"
version = "0.4.8"
@ -2567,6 +2575,17 @@ dependencies = [
"percent-encoding",
]
[[package]]
name = "qualifier_attr"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9e2e25ee72f5b24d773cae88422baddefff7714f97aab68d96fe2b6fc4a28fb2"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.37",
]
[[package]]
name = "quote"
version = "1.0.33"
@ -3219,8 +3238,9 @@ dependencies = [
[[package]]
name = "solana-account-decoder"
version = "1.16.16"
source = "git+https://github.com/rpcpool/solana-public.git?tag=v1.16.16-geyser-block-v3#922d06aab6b6d4e866ddb1cef31362b249bf2576"
version = "1.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1475958be84fa0156c17a4de0bfd67108e164ea4c892d7d2418abeefce7d014c"
dependencies = [
"Inflector",
"base64 0.21.4",
@ -3231,7 +3251,6 @@ dependencies = [
"serde",
"serde_derive",
"serde_json",
"solana-address-lookup-table-program",
"solana-config-program",
"solana-sdk",
"spl-token",
@ -3241,30 +3260,11 @@ dependencies = [
"zstd",
]
[[package]]
name = "solana-address-lookup-table-program"
version = "1.16.16"
source = "git+https://github.com/rpcpool/solana-public.git?tag=v1.16.16-geyser-block-v3#922d06aab6b6d4e866ddb1cef31362b249bf2576"
dependencies = [
"bincode",
"bytemuck",
"log",
"num-derive 0.3.3",
"num-traits",
"rustc_version",
"serde",
"solana-frozen-abi",
"solana-frozen-abi-macro",
"solana-program",
"solana-program-runtime",
"solana-sdk",
"thiserror",
]
[[package]]
name = "solana-config-program"
version = "1.16.16"
source = "git+https://github.com/rpcpool/solana-public.git?tag=v1.16.16-geyser-block-v3#922d06aab6b6d4e866ddb1cef31362b249bf2576"
version = "1.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "55f80f9c0a31ca22ddc2f1cb3e304de0922e7abea3b96e075dbcc9745854ddc5"
dependencies = [
"bincode",
"chrono",
@ -3276,8 +3276,9 @@ dependencies = [
[[package]]
name = "solana-frozen-abi"
version = "1.16.16"
source = "git+https://github.com/rpcpool/solana-public.git?tag=v1.16.16-geyser-block-v3#922d06aab6b6d4e866ddb1cef31362b249bf2576"
version = "1.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c9c2657cb455b25192ad08f8536cacc8276d10a135ba81fb4fb3059f5c3c49a9"
dependencies = [
"ahash 0.8.3",
"blake3",
@ -3288,13 +3289,10 @@ dependencies = [
"cc",
"either",
"generic-array",
"getrandom 0.1.16",
"im",
"lazy_static",
"log",
"memmap2",
"once_cell",
"rand_core 0.6.4",
"rustc_version",
"serde",
"serde_bytes",
@ -3308,8 +3306,9 @@ dependencies = [
[[package]]
name = "solana-frozen-abi-macro"
version = "1.16.16"
source = "git+https://github.com/rpcpool/solana-public.git?tag=v1.16.16-geyser-block-v3#922d06aab6b6d4e866ddb1cef31362b249bf2576"
version = "1.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7db74b08897ff67d5e3d0d9592fabb304f891736d280ac1eecb4baa198cabaa0"
dependencies = [
"proc-macro2",
"quote",
@ -3319,8 +3318,9 @@ dependencies = [
[[package]]
name = "solana-geyser-plugin-interface"
version = "1.16.16"
source = "git+https://github.com/rpcpool/solana-public.git?tag=v1.16.16-geyser-block-v3#922d06aab6b6d4e866ddb1cef31362b249bf2576"
version = "1.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "84641415deefbb22b60da076fc7f2587c3c77fce770e30ea27e8f93f90e9ffd1"
dependencies = [
"log",
"solana-sdk",
@ -3330,8 +3330,9 @@ dependencies = [
[[package]]
name = "solana-logger"
version = "1.16.16"
source = "git+https://github.com/rpcpool/solana-public.git?tag=v1.16.16-geyser-block-v3#922d06aab6b6d4e866ddb1cef31362b249bf2576"
version = "1.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d5d880d87752d95ce8d1b2f141535e60054455954a651db65b52c64978f9b637"
dependencies = [
"env_logger 0.9.3",
"lazy_static",
@ -3340,8 +3341,9 @@ dependencies = [
[[package]]
name = "solana-measure"
version = "1.16.16"
source = "git+https://github.com/rpcpool/solana-public.git?tag=v1.16.16-geyser-block-v3#922d06aab6b6d4e866ddb1cef31362b249bf2576"
version = "1.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "84ec20b62a31b5e568004a2c28e7dc0f985aa6b89a151f06142a518fd13d8d1f"
dependencies = [
"log",
"solana-sdk",
@ -3349,8 +3351,9 @@ dependencies = [
[[package]]
name = "solana-metrics"
version = "1.16.16"
source = "git+https://github.com/rpcpool/solana-public.git?tag=v1.16.16-geyser-block-v3#922d06aab6b6d4e866ddb1cef31362b249bf2576"
version = "1.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ff82c026dded469e68dd1d48fe73260dfc6a17d9437764026bd6e2dce6f95fa2"
dependencies = [
"crossbeam-channel",
"gethostname",
@ -3358,21 +3361,22 @@ dependencies = [
"log",
"reqwest",
"solana-sdk",
"thiserror",
]
[[package]]
name = "solana-program"
version = "1.16.16"
source = "git+https://github.com/rpcpool/solana-public.git?tag=v1.16.16-geyser-block-v3#922d06aab6b6d4e866ddb1cef31362b249bf2576"
version = "1.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c491670a24d87af75a7b7771fc5961126dd838c5fb7f7657ec2662b1597c0cb"
dependencies = [
"ark-bn254",
"ark-ec",
"ark-ff",
"ark-serialize",
"array-bytes",
"base64 0.21.4",
"bincode",
"bitflags 1.3.2",
"bitflags 2.4.0",
"blake3",
"borsh 0.10.3",
"borsh 0.9.3",
@ -3389,14 +3393,14 @@ dependencies = [
"lazy_static",
"libc",
"libsecp256k1",
"light-poseidon",
"log",
"memoffset",
"num-bigint 0.4.4",
"num-derive 0.3.3",
"num-traits",
"parking_lot",
"rand 0.7.3",
"rand_chacha 0.2.2",
"rand 0.8.5",
"rustc_version",
"rustversion",
"serde",
@ -3416,8 +3420,9 @@ dependencies = [
[[package]]
name = "solana-program-runtime"
version = "1.16.16"
source = "git+https://github.com/rpcpool/solana-public.git?tag=v1.16.16-geyser-block-v3#922d06aab6b6d4e866ddb1cef31362b249bf2576"
version = "1.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "371ddaf68685fa6a25502d71dd61a742de2e78e2843a4a42000b1d818987ff4e"
dependencies = [
"base64 0.21.4",
"bincode",
@ -3429,7 +3434,7 @@ dependencies = [
"num-derive 0.3.3",
"num-traits",
"percentage",
"rand 0.7.3",
"rand 0.8.5",
"rustc_version",
"serde",
"solana-frozen-abi",
@ -3443,13 +3448,14 @@ dependencies = [
[[package]]
name = "solana-sdk"
version = "1.16.16"
source = "git+https://github.com/rpcpool/solana-public.git?tag=v1.16.16-geyser-block-v3#922d06aab6b6d4e866ddb1cef31362b249bf2576"
version = "1.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3b7d1f01c53520b2eaa59360e068ea3bdd52c59151b334e6f1e26638751e5986"
dependencies = [
"assert_matches",
"base64 0.21.4",
"bincode",
"bitflags 1.3.2",
"bitflags 2.4.0",
"borsh 0.10.3",
"bs58",
"bytemuck",
@ -3472,8 +3478,9 @@ dependencies = [
"num_enum 0.6.1",
"pbkdf2 0.11.0",
"qstring",
"qualifier_attr",
"rand 0.7.3",
"rand_chacha 0.2.2",
"rand 0.8.5",
"rustc_version",
"rustversion",
"serde",
@ -3495,8 +3502,9 @@ dependencies = [
[[package]]
name = "solana-sdk-macro"
version = "1.16.16"
source = "git+https://github.com/rpcpool/solana-public.git?tag=v1.16.16-geyser-block-v3#922d06aab6b6d4e866ddb1cef31362b249bf2576"
version = "1.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8dd1223f92124c255c9db21672fb050c64ae351d6c6baf168f14da632b41c195"
dependencies = [
"bs58",
"proc-macro2",
@ -3507,8 +3515,9 @@ dependencies = [
[[package]]
name = "solana-transaction-status"
version = "1.16.16"
source = "git+https://github.com/rpcpool/solana-public.git?tag=v1.16.16-geyser-block-v3#922d06aab6b6d4e866ddb1cef31362b249bf2576"
version = "1.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "db437597c99bd57a30f4ea97737eb8066bcea709fe3413d0e7fe9dad2ae084f5"
dependencies = [
"Inflector",
"base64 0.21.4",
@ -3521,7 +3530,6 @@ dependencies = [
"serde_derive",
"serde_json",
"solana-account-decoder",
"solana-address-lookup-table-program",
"solana-sdk",
"spl-associated-token-account",
"spl-memo",
@ -3532,9 +3540,9 @@ dependencies = [
[[package]]
name = "solana-zk-token-sdk"
version = "1.16.16"
version = "1.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5d1fe77918563768a65fd5d6cd2fa06cf0aeb11e529a1ef8c230b0fe018600e3"
checksum = "afb5d7d29b4566242b0bf5bb7d2ba941ddb18558a121555ec682bf6eae88e041"
dependencies = [
"aes-gcm-siv",
"base64 0.21.4",
@ -3561,9 +3569,9 @@ dependencies = [
[[package]]
name = "solana_rbpf"
version = "0.6.1"
version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "17d4ba1e58947346e360fabde0697029d36ba83c42f669199b16a8931313cf29"
checksum = "103318aa365ff7caa8cf534f2246b5eb7e5b34668736d52b1266b143f7a21196"
dependencies = [
"byteorder",
"combine",
@ -4597,7 +4605,7 @@ dependencies = [
[[package]]
name = "yellowstone-grpc-client"
version = "1.11.1+solana.1.16.16"
version = "1.11.1+solana.1.17.1"
dependencies = [
"bytes",
"futures",
@ -4611,7 +4619,7 @@ dependencies = [
[[package]]
name = "yellowstone-grpc-client-simple"
version = "1.10.0+solana.1.16.16"
version = "1.10.0+solana.1.17.1"
dependencies = [
"anyhow",
"backoff",
@ -4634,7 +4642,7 @@ dependencies = [
[[package]]
name = "yellowstone-grpc-geyser"
version = "1.10.0+solana.1.16.16"
version = "1.10.0+solana.1.17.1"
dependencies = [
"anyhow",
"base64 0.21.4",
@ -4666,7 +4674,7 @@ dependencies = [
[[package]]
name = "yellowstone-grpc-kafka"
version = "1.0.0-rc.3+solana.1.16.16"
version = "1.0.0-rc.3+solana.1.17.1"
dependencies = [
"anyhow",
"async-trait",
@ -4698,7 +4706,7 @@ dependencies = [
[[package]]
name = "yellowstone-grpc-proto"
version = "1.10.0+solana.1.16.16"
version = "1.10.0+solana.1.17.1"
dependencies = [
"anyhow",
"bincode",

View File

@ -1,21 +1,13 @@
[workspace]
members = [
"examples/rust", # 1.10.0+solana.1.16.16
"yellowstone-grpc-client", # 1.11.1+solana.1.16.16
"yellowstone-grpc-geyser", # 1.10.0+solana.1.16.16
"yellowstone-grpc-kafka", # 1.0.0-rc.3+solana.1.16.16
"yellowstone-grpc-proto", # 1.10.0+solana.1.16.16
"examples/rust", # 1.10.0+solana.1.17.1
"yellowstone-grpc-client", # 1.11.1+solana.1.17.1
"yellowstone-grpc-geyser", # 1.10.0+solana.1.17.1
"yellowstone-grpc-kafka", # 1.0.0-rc.3+solana.1.17.1
"yellowstone-grpc-proto", # 1.10.0+solana.1.17.1
]
[profile.release]
debug = true
lto = true
codegen-units = 1
[patch.crates-io]
solana-account-decoder = { git = "https://github.com/rpcpool/solana-public.git", tag = "v1.16.16-geyser-block-v3" }
solana-geyser-plugin-interface = { git = "https://github.com/rpcpool/solana-public.git", tag = "v1.16.16-geyser-block-v3" }
solana-logger = { git = "https://github.com/rpcpool/solana-public.git", tag = "v1.16.16-geyser-block-v3" }
solana-program = { git = "https://github.com/rpcpool/solana-public.git", tag = "v1.16.16-geyser-block-v3" }
solana-sdk = { git = "https://github.com/rpcpool/solana-public.git", tag = "v1.16.16-geyser-block-v3" }
solana-transaction-status = { git = "https://github.com/rpcpool/solana-public.git", tag = "v1.16.16-geyser-block-v3" }

View File

@ -1,6 +1,6 @@
[package]
name = "yellowstone-grpc-client-simple"
version = "1.10.0+solana.1.16.16"
version = "1.10.0+solana.1.17.1"
authors = ["Triton One"]
edition = "2021"
publish = false
@ -21,8 +21,8 @@ hex = "0.4.3"
log = { version = "0.4.14", features = ["std"] }
maplit = "1.0.2"
serde_json = "1.0.86"
solana-sdk = "=1.16.16"
solana-transaction-status = "=1.16.16"
solana-sdk = "=1.17.1"
solana-transaction-status = "=1.17.1"
tokio = { version = "1.32.0", features = ["rt-multi-thread", "macros", "time"] }
yellowstone-grpc-client = { path = "../../yellowstone-grpc-client" }
yellowstone-grpc-proto = { path = "../../yellowstone-grpc-proto" }

View File

@ -1,5 +1,5 @@
[toolchain]
channel = "1.69.0"
channel = "1.73.0"
components = ["clippy", "rustfmt"]
targets = []
profile = "minimal"

View File

@ -1,6 +1,6 @@
[package]
name = "yellowstone-grpc-client"
version = "1.11.1+solana.1.16.16"
version = "1.11.1+solana.1.17.1"
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.10.2", features = ["gzip", "tls", "tls-roots"] }
tonic-health = "0.10.2"
yellowstone-grpc-proto = { path = "../yellowstone-grpc-proto", version = "1.10.0+solana.1.16.16" }
yellowstone-grpc-proto = { path = "../yellowstone-grpc-proto", version = "1.10.0+solana.1.17.1" }
[dev-dependencies]
tokio = { version = "1.32.0", features = ["macros"] }

View File

@ -1,6 +1,6 @@
[package]
name = "yellowstone-grpc-geyser"
version = "1.10.0+solana.1.16.16"
version = "1.10.0+solana.1.17.1"
authors = ["Triton One"]
edition = "2021"
description = "Yellowstone gRPC Geyser Plugin"
@ -26,11 +26,11 @@ log = "0.4.17"
prometheus = "0.13.2"
serde = { version = "1.0.145", features = ["derive"] }
serde_json = "1.0.86"
solana-geyser-plugin-interface = "=1.16.16"
solana-logger = "=1.16.16"
solana-sdk = "=1.16.16"
solana-transaction-status = "=1.16.16"
spl-token-2022 = "0.9.0"
solana-geyser-plugin-interface = "=1.17.1"
solana-logger = "=1.17.1"
solana-sdk = "=1.17.1"
solana-transaction-status = "=1.17.1"
spl-token-2022 = { version = "0.9.0", features = ["no-entrypoint"] }
tokio = { version = "1.32.0", features = ["rt-multi-thread", "macros", "time", "fs"] }
tokio-stream = "0.1.11"
tonic = { version = "0.10.2", features = ["gzip", "tls", "tls-roots"] }

View File

@ -909,7 +909,7 @@ mod tests {
let account_key_a = keypair_a.pubkey();
let keypair_b = Keypair::new();
let account_key_b = keypair_b.pubkey();
let account_include = vec![account_key_a].iter().map(|k| k.to_string()).collect();
let account_include = [account_key_a].iter().map(|k| k.to_string()).collect();
transactions.insert(
"serum".to_string(),
SubscribeRequestFilterTransactions {
@ -951,7 +951,7 @@ mod tests {
let account_key_a = keypair_a.pubkey();
let keypair_b = Keypair::new();
let account_key_b = keypair_b.pubkey();
let account_include = vec![account_key_b].iter().map(|k| k.to_string()).collect();
let account_include = [account_key_b].iter().map(|k| k.to_string()).collect();
transactions.insert(
"serum".to_string(),
SubscribeRequestFilterTransactions {
@ -993,7 +993,7 @@ mod tests {
let account_key_a = keypair_a.pubkey();
let keypair_b = Keypair::new();
let account_key_b = keypair_b.pubkey();
let account_exclude = vec![account_key_b].iter().map(|k| k.to_string()).collect();
let account_exclude = [account_key_b].iter().map(|k| k.to_string()).collect();
transactions.insert(
"serum".to_string(),
SubscribeRequestFilterTransactions {
@ -1037,11 +1037,11 @@ mod tests {
let account_key_z = Pubkey::new_unique();
// require x, include y, z
let account_include = vec![account_key_y, account_key_z]
let account_include = [account_key_y, account_key_z]
.iter()
.map(|k| k.to_string())
.collect();
let account_required = vec![account_key_x].iter().map(|k| k.to_string()).collect();
let account_required = [account_key_x].iter().map(|k| k.to_string()).collect();
transactions.insert(
"serum".to_string(),
SubscribeRequestFilterTransactions {
@ -1087,8 +1087,8 @@ mod tests {
let account_key_z = Pubkey::new_unique();
// require x, include y, z
let account_include = vec![account_key_x].iter().map(|k| k.to_string()).collect();
let account_required = vec![account_key_y, account_key_z]
let account_include = [account_key_x].iter().map(|k| k.to_string()).collect();
let account_required = [account_key_y, account_key_z]
.iter()
.map(|k| k.to_string())
.collect();

View File

@ -84,7 +84,7 @@ impl GeyserPlugin for Plugin {
let (snapshot_channel, grpc_channel, grpc_shutdown) =
GrpcService::create(config.grpc, config.block_fail_action)
.await
.map_err(|error| GeyserPluginError::Custom(error))?;
.map_err(GeyserPluginError::Custom)?;
let prometheus = PrometheusService::new(config.prometheus)
.map_err(|error| GeyserPluginError::Custom(Box::new(error)))?;
Ok::<_, GeyserPluginError>((

View File

@ -1,6 +1,6 @@
[package]
name = "yellowstone-grpc-kafka"
version = "1.0.0-rc.3+solana.1.16.16"
version = "1.0.0-rc.3+solana.1.17.1"
authors = ["Triton One"]
edition = "2021"
description = "Yellowstone gRPC Kafka Producer/Dedup/Consumer"

View File

@ -1,6 +1,6 @@
[package]
name = "yellowstone-grpc-proto"
version = "1.10.0+solana.1.16.16"
version = "1.10.0+solana.1.17.1"
authors = ["Triton One"]
edition = "2021"
description = "Yellowstone gRPC Geyser Protobuf Definitions"
@ -12,9 +12,9 @@ keywords = ["solana"]
[dependencies]
bincode = "1.3.3"
prost = "0.12.1"
solana-account-decoder = "=1.16.16"
solana-sdk = "=1.16.16"
solana-transaction-status = "=1.16.16"
solana-account-decoder = "=1.17.1"
solana-sdk = "=1.17.1"
solana-transaction-status = "=1.17.1"
tonic = "0.10.2"
[build-dependencies]