From caf83cde6262781db88368df255b88db5b92395e Mon Sep 17 00:00:00 2001 From: Kirill Fomichev Date: Mon, 8 Jan 2024 13:17:32 -0500 Subject: [PATCH] solana: update to 1.16.27 --- CHANGELOG.md | 10 ++- Cargo.lock | 99 ++++++++++++++++++------------ Cargo.toml | 38 ++++++------ examples/rust/Cargo.toml | 2 +- yellowstone-grpc-client/Cargo.toml | 2 +- yellowstone-grpc-client/src/lib.rs | 2 +- yellowstone-grpc-geyser/Cargo.toml | 2 +- yellowstone-grpc-proto/Cargo.toml | 2 +- yellowstone-grpc-tools/Cargo.toml | 2 +- 9 files changed, 89 insertions(+), 70 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f75a4dc..42b84543 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,9 +18,9 @@ The minor version will be incremented upon a breaking change and the patch versi ## 2024-01-10 -- yellowstone-grpc-client-1.12.0+solana.1.16.27 -- yellowstone-grpc-geyser-1.11.2+solana.1.16.27 -- yellowstone-grpc-proto-1.11.0+solana.1.16.27 +- yellowstone-grpc-client-1.13.0+solana.1.16.27 +- yellowstone-grpc-geyser-1.12.0+solana.1.16.27 +- yellowstone-grpc-proto-1.12.0+solana.1.16.27 - yellowstone-grpc-tools-1.0.0-rc.9+solana.1.16.27 ### Features @@ -29,9 +29,7 @@ The minor version will be incremented upon a breaking change and the patch versi - geyser: change plugin name to `{name}-{version}` ([#270](https://github.com/rpcpool/yellowstone-grpc/pull/270)) - proto: add more convert functions ([#264](https://github.com/rpcpool/yellowstone-grpc/pull/264)) -### Breaking - -## 2023-012-11 +## 2023-12-11 - yellowstone-grpc-client-1.12.0+solana.1.16.23 - yellowstone-grpc-geyser-1.11.1+solana.1.16.23 diff --git a/Cargo.lock b/Cargo.lock index 0643c002..8b65953d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -76,14 +76,15 @@ dependencies = [ [[package]] name = "ahash" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +checksum = "72832d73be48bac96a5d7944568f305d829ed55b0ce3b483647089dfaf6cf704" dependencies = [ "cfg-if", "getrandom 0.2.10", "once_cell", "version_check", + "zerocopy", ] [[package]] @@ -1617,7 +1618,7 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.4", ] [[package]] @@ -3500,8 +3501,8 @@ dependencies = [ [[package]] name = "solana-account-decoder" -version = "1.16.23" -source = "git+https://github.com/rpcpool/solana-public.git?tag=v1.16.23-geyser-block-v3#bd956d6a01a94f41c1a38ac5a42d2384634f6578" +version = "1.16.27" +source = "git+https://github.com/rpcpool/solana-public.git?tag=v1.16.27-geyser-block-v3#a5055235540b70d610df8d9453fd8896ef5eaa3b" dependencies = [ "Inflector", "base64 0.21.4", @@ -3524,8 +3525,8 @@ dependencies = [ [[package]] name = "solana-address-lookup-table-program" -version = "1.16.23" -source = "git+https://github.com/rpcpool/solana-public.git?tag=v1.16.23-geyser-block-v3#bd956d6a01a94f41c1a38ac5a42d2384634f6578" +version = "1.16.27" +source = "git+https://github.com/rpcpool/solana-public.git?tag=v1.16.27-geyser-block-v3#a5055235540b70d610df8d9453fd8896ef5eaa3b" dependencies = [ "bincode", "bytemuck", @@ -3544,8 +3545,8 @@ dependencies = [ [[package]] name = "solana-config-program" -version = "1.16.23" -source = "git+https://github.com/rpcpool/solana-public.git?tag=v1.16.23-geyser-block-v3#bd956d6a01a94f41c1a38ac5a42d2384634f6578" +version = "1.16.27" +source = "git+https://github.com/rpcpool/solana-public.git?tag=v1.16.27-geyser-block-v3#a5055235540b70d610df8d9453fd8896ef5eaa3b" dependencies = [ "bincode", "chrono", @@ -3557,10 +3558,10 @@ dependencies = [ [[package]] name = "solana-frozen-abi" -version = "1.16.23" -source = "git+https://github.com/rpcpool/solana-public.git?tag=v1.16.23-geyser-block-v3#bd956d6a01a94f41c1a38ac5a42d2384634f6578" +version = "1.16.27" +source = "git+https://github.com/rpcpool/solana-public.git?tag=v1.16.27-geyser-block-v3#a5055235540b70d610df8d9453fd8896ef5eaa3b" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.4", "blake3", "block-buffer 0.10.4", "bs58", @@ -3589,8 +3590,8 @@ dependencies = [ [[package]] name = "solana-frozen-abi-macro" -version = "1.16.23" -source = "git+https://github.com/rpcpool/solana-public.git?tag=v1.16.23-geyser-block-v3#bd956d6a01a94f41c1a38ac5a42d2384634f6578" +version = "1.16.27" +source = "git+https://github.com/rpcpool/solana-public.git?tag=v1.16.27-geyser-block-v3#a5055235540b70d610df8d9453fd8896ef5eaa3b" dependencies = [ "proc-macro2", "quote", @@ -3600,8 +3601,8 @@ dependencies = [ [[package]] name = "solana-geyser-plugin-interface" -version = "1.16.23" -source = "git+https://github.com/rpcpool/solana-public.git?tag=v1.16.23-geyser-block-v3#bd956d6a01a94f41c1a38ac5a42d2384634f6578" +version = "1.16.27" +source = "git+https://github.com/rpcpool/solana-public.git?tag=v1.16.27-geyser-block-v3#a5055235540b70d610df8d9453fd8896ef5eaa3b" dependencies = [ "log", "solana-sdk", @@ -3611,8 +3612,8 @@ dependencies = [ [[package]] name = "solana-logger" -version = "1.16.23" -source = "git+https://github.com/rpcpool/solana-public.git?tag=v1.16.23-geyser-block-v3#bd956d6a01a94f41c1a38ac5a42d2384634f6578" +version = "1.16.27" +source = "git+https://github.com/rpcpool/solana-public.git?tag=v1.16.27-geyser-block-v3#a5055235540b70d610df8d9453fd8896ef5eaa3b" dependencies = [ "env_logger 0.9.3", "lazy_static", @@ -3621,8 +3622,8 @@ dependencies = [ [[package]] name = "solana-measure" -version = "1.16.23" -source = "git+https://github.com/rpcpool/solana-public.git?tag=v1.16.23-geyser-block-v3#bd956d6a01a94f41c1a38ac5a42d2384634f6578" +version = "1.16.27" +source = "git+https://github.com/rpcpool/solana-public.git?tag=v1.16.27-geyser-block-v3#a5055235540b70d610df8d9453fd8896ef5eaa3b" dependencies = [ "log", "solana-sdk", @@ -3630,8 +3631,8 @@ dependencies = [ [[package]] name = "solana-metrics" -version = "1.16.23" -source = "git+https://github.com/rpcpool/solana-public.git?tag=v1.16.23-geyser-block-v3#bd956d6a01a94f41c1a38ac5a42d2384634f6578" +version = "1.16.27" +source = "git+https://github.com/rpcpool/solana-public.git?tag=v1.16.27-geyser-block-v3#a5055235540b70d610df8d9453fd8896ef5eaa3b" dependencies = [ "crossbeam-channel", "gethostname", @@ -3643,8 +3644,8 @@ dependencies = [ [[package]] name = "solana-program" -version = "1.16.23" -source = "git+https://github.com/rpcpool/solana-public.git?tag=v1.16.23-geyser-block-v3#bd956d6a01a94f41c1a38ac5a42d2384634f6578" +version = "1.16.27" +source = "git+https://github.com/rpcpool/solana-public.git?tag=v1.16.27-geyser-block-v3#a5055235540b70d610df8d9453fd8896ef5eaa3b" dependencies = [ "ark-bn254", "ark-ec", @@ -3697,8 +3698,8 @@ dependencies = [ [[package]] name = "solana-program-runtime" -version = "1.16.23" -source = "git+https://github.com/rpcpool/solana-public.git?tag=v1.16.23-geyser-block-v3#bd956d6a01a94f41c1a38ac5a42d2384634f6578" +version = "1.16.27" +source = "git+https://github.com/rpcpool/solana-public.git?tag=v1.16.27-geyser-block-v3#a5055235540b70d610df8d9453fd8896ef5eaa3b" dependencies = [ "base64 0.21.4", "bincode", @@ -3724,8 +3725,8 @@ dependencies = [ [[package]] name = "solana-sdk" -version = "1.16.23" -source = "git+https://github.com/rpcpool/solana-public.git?tag=v1.16.23-geyser-block-v3#bd956d6a01a94f41c1a38ac5a42d2384634f6578" +version = "1.16.27" +source = "git+https://github.com/rpcpool/solana-public.git?tag=v1.16.27-geyser-block-v3#a5055235540b70d610df8d9453fd8896ef5eaa3b" dependencies = [ "assert_matches", "base64 0.21.4", @@ -3776,8 +3777,8 @@ dependencies = [ [[package]] name = "solana-sdk-macro" -version = "1.16.23" -source = "git+https://github.com/rpcpool/solana-public.git?tag=v1.16.23-geyser-block-v3#bd956d6a01a94f41c1a38ac5a42d2384634f6578" +version = "1.16.27" +source = "git+https://github.com/rpcpool/solana-public.git?tag=v1.16.27-geyser-block-v3#a5055235540b70d610df8d9453fd8896ef5eaa3b" dependencies = [ "bs58", "proc-macro2", @@ -3788,8 +3789,8 @@ dependencies = [ [[package]] name = "solana-transaction-status" -version = "1.16.23" -source = "git+https://github.com/rpcpool/solana-public.git?tag=v1.16.23-geyser-block-v3#bd956d6a01a94f41c1a38ac5a42d2384634f6578" +version = "1.16.27" +source = "git+https://github.com/rpcpool/solana-public.git?tag=v1.16.27-geyser-block-v3#a5055235540b70d610df8d9453fd8896ef5eaa3b" dependencies = [ "Inflector", "base64 0.21.4", @@ -3813,9 +3814,9 @@ dependencies = [ [[package]] name = "solana-zk-token-sdk" -version = "1.16.23" +version = "1.16.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc4b0547480462cfec9dddaa8adcf2fa7c8b022021738bf71c790c0c7be54a34" +checksum = "9513c4f1595b61f8a39a14c27535da2b2145c20c6b35ab491a1830981972b2bd" dependencies = [ "aes-gcm-siv", "base64 0.21.4", @@ -4949,7 +4950,7 @@ dependencies = [ [[package]] name = "yellowstone-grpc-client" -version = "1.12.0+solana.1.16.23" +version = "1.13.0+solana.1.16.27" dependencies = [ "bytes", "futures", @@ -4963,7 +4964,7 @@ dependencies = [ [[package]] name = "yellowstone-grpc-client-simple" -version = "1.11.0+solana.1.16.23" +version = "1.11.0+solana.1.16.27" dependencies = [ "anyhow", "backoff", @@ -4986,7 +4987,7 @@ dependencies = [ [[package]] name = "yellowstone-grpc-geyser" -version = "1.11.1+solana.1.16.23" +version = "1.12.0+solana.1.16.27" dependencies = [ "anyhow", "base64 0.21.4", @@ -5018,7 +5019,7 @@ dependencies = [ [[package]] name = "yellowstone-grpc-proto" -version = "1.11.0+solana.1.16.23" +version = "1.12.0+solana.1.16.27" dependencies = [ "anyhow", "bincode", @@ -5033,7 +5034,7 @@ dependencies = [ [[package]] name = "yellowstone-grpc-tools" -version = "1.0.0-rc.9+solana.1.16.23" +version = "1.0.0-rc.9+solana.1.16.27" dependencies = [ "anyhow", "async-trait", @@ -5065,6 +5066,26 @@ dependencies = [ "yellowstone-grpc-proto", ] +[[package]] +name = "zerocopy" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.37", +] + [[package]] name = "zeroize" version = "1.3.0" diff --git a/Cargo.toml b/Cargo.toml index 838cb506..70bdbeb2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,11 +1,11 @@ [workspace] resolver = "2" members = [ - "examples/rust", # 1.11.0+solana.1.16.23 - "yellowstone-grpc-client", # 1.12.0+solana.1.16.23 - "yellowstone-grpc-geyser", # 1.11.1+solana.1.16.23 - "yellowstone-grpc-proto", # 1.11.0+solana.1.16.23 - "yellowstone-grpc-tools", # 1.0.0-rc.9+solana.1.16.23 + "examples/rust", # 1.11.0+solana.1.16.27 + "yellowstone-grpc-client", # 1.13.0+solana.1.16.27 + "yellowstone-grpc-geyser", # 1.12.0+solana.1.16.27 + "yellowstone-grpc-proto", # 1.12.0+solana.1.16.27 + "yellowstone-grpc-tools", # 1.0.0-rc.9+solana.1.16.27 ] [workspace.package] @@ -50,12 +50,12 @@ serde = "1.0.145" serde_json = "1.0.86" serde_yaml = "0.9.25" sha2 = "0.10.7" -solana-account-decoder = "=1.16.23" -solana-geyser-plugin-interface = "=1.16.23" -solana-logger = "=1.16.23" -solana-sdk = "=1.16.23" -solana-transaction-status = "=1.16.23" -spl-token-2022 = "0.9.0" +solana-account-decoder = "=1.16.27" +solana-geyser-plugin-interface = "=1.16.27" +solana-logger = "=1.16.27" +solana-sdk = "=1.16.27" +solana-transaction-status = "=1.16.27" +spl-token-2022 = "=0.9.0" thiserror = "1.0" tokio = "1.21.2" tokio-stream = "0.1.11" @@ -65,8 +65,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.23" } -yellowstone-grpc-proto = { path = "yellowstone-grpc-proto", version = "=1.11.0+solana.1.16.23" } +yellowstone-grpc-client = { path = "yellowstone-grpc-client", version = "=1.13.0+solana.1.16.27" } +yellowstone-grpc-proto = { path = "yellowstone-grpc-proto", version = "=1.12.0+solana.1.16.27" } [profile.release] debug = true @@ -74,9 +74,9 @@ lto = true codegen-units = 1 [patch.crates-io] -solana-account-decoder = { git = "https://github.com/rpcpool/solana-public.git", tag = "v1.16.23-geyser-block-v3" } -solana-geyser-plugin-interface = { git = "https://github.com/rpcpool/solana-public.git", tag = "v1.16.23-geyser-block-v3" } -solana-logger = { git = "https://github.com/rpcpool/solana-public.git", tag = "v1.16.23-geyser-block-v3" } -solana-program = { git = "https://github.com/rpcpool/solana-public.git", tag = "v1.16.23-geyser-block-v3" } -solana-sdk = { git = "https://github.com/rpcpool/solana-public.git", tag = "v1.16.23-geyser-block-v3" } -solana-transaction-status = { git = "https://github.com/rpcpool/solana-public.git", tag = "v1.16.23-geyser-block-v3" } +solana-account-decoder = { git = "https://github.com/rpcpool/solana-public.git", tag = "v1.16.27-geyser-block-v3" } +solana-geyser-plugin-interface = { git = "https://github.com/rpcpool/solana-public.git", tag = "v1.16.27-geyser-block-v3" } +solana-logger = { git = "https://github.com/rpcpool/solana-public.git", tag = "v1.16.27-geyser-block-v3" } +solana-program = { git = "https://github.com/rpcpool/solana-public.git", tag = "v1.16.27-geyser-block-v3" } +solana-sdk = { git = "https://github.com/rpcpool/solana-public.git", tag = "v1.16.27-geyser-block-v3" } +solana-transaction-status = { git = "https://github.com/rpcpool/solana-public.git", tag = "v1.16.27-geyser-block-v3" } diff --git a/examples/rust/Cargo.toml b/examples/rust/Cargo.toml index d714d777..2762c4a9 100644 --- a/examples/rust/Cargo.toml +++ b/examples/rust/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "yellowstone-grpc-client-simple" -version = "1.11.0+solana.1.16.23" +version = "1.11.0+solana.1.16.27" authors = { workspace = true } edition = { workspace = true } homepage = { workspace = true } diff --git a/yellowstone-grpc-client/Cargo.toml b/yellowstone-grpc-client/Cargo.toml index c53d4f37..c4781b91 100644 --- a/yellowstone-grpc-client/Cargo.toml +++ b/yellowstone-grpc-client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "yellowstone-grpc-client" -version = "1.12.0+solana.1.16.23" +version = "1.13.0+solana.1.16.27" authors = { workspace = true } edition = { workspace = true } description = "Yellowstone gRPC Geyser Simple Client" diff --git a/yellowstone-grpc-client/src/lib.rs b/yellowstone-grpc-client/src/lib.rs index 5afe591d..e039403b 100644 --- a/yellowstone-grpc-client/src/lib.rs +++ b/yellowstone-grpc-client/src/lib.rs @@ -29,7 +29,7 @@ use { #[derive(Debug, Clone)] pub struct InterceptorXToken { - x_token: Option, + pub x_token: Option, } impl Interceptor for InterceptorXToken { diff --git a/yellowstone-grpc-geyser/Cargo.toml b/yellowstone-grpc-geyser/Cargo.toml index ab5d4c6a..bdb6833b 100644 --- a/yellowstone-grpc-geyser/Cargo.toml +++ b/yellowstone-grpc-geyser/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "yellowstone-grpc-geyser" -version = "1.11.1+solana.1.16.23" +version = "1.12.0+solana.1.16.27" authors = { workspace = true } edition = { workspace = true } description = "Yellowstone gRPC Geyser Plugin" diff --git a/yellowstone-grpc-proto/Cargo.toml b/yellowstone-grpc-proto/Cargo.toml index 13372d31..5e076061 100644 --- a/yellowstone-grpc-proto/Cargo.toml +++ b/yellowstone-grpc-proto/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "yellowstone-grpc-proto" -version = "1.11.0+solana.1.16.23" +version = "1.12.0+solana.1.16.27" authors = { workspace = true } edition = { workspace = true } description = "Yellowstone gRPC Geyser Protobuf Definitions" diff --git a/yellowstone-grpc-tools/Cargo.toml b/yellowstone-grpc-tools/Cargo.toml index 4f957cbc..1d80db01 100644 --- a/yellowstone-grpc-tools/Cargo.toml +++ b/yellowstone-grpc-tools/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "yellowstone-grpc-tools" -version = "1.0.0-rc.9+solana.1.16.23" +version = "1.0.0-rc.9+solana.1.16.27" authors = { workspace = true } edition = { workspace = true } description = "Yellowstone gRPC Tools"