From 124b88533c55c5996e088c7932f203396ba6dbfb Mon Sep 17 00:00:00 2001 From: Kirill Fomichev Date: Fri, 12 Jul 2024 13:51:19 -0500 Subject: [PATCH 1/4] solana: update to 1.18.18 --- CHANGELOG.md | 11 +++++ Cargo.lock | 66 +++++++++++++++--------------- Cargo.toml | 24 +++++------ examples/rust/Cargo.toml | 2 +- yellowstone-grpc-client/Cargo.toml | 2 +- yellowstone-grpc-geyser/Cargo.toml | 2 +- yellowstone-grpc-proto/Cargo.toml | 2 +- yellowstone-grpc-tools/Cargo.toml | 4 +- 8 files changed, 62 insertions(+), 51 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1fd629e0..6ebca75a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,17 @@ The minor version will be incremented upon a breaking change and the patch versi ### Breaking +## 2024-07-12 + +- yellowstone-grpc-client-1.15.0+solana.1.18.18 +- yellowstone-grpc-geyser-1.15.0+solana.1.18.18 +- yellowstone-grpc-proto-1.15.0+solana.1.18.18 +- yellowstone-grpc-tools-1.0.0-rc.11+solana.1.18.18 + +### Features + +- solana: update to 1.18.18 ([#374](https://github.com/rpcpool/yellowstone-grpc/pull/374)) + ## 2024-06-26 - yellowstone-grpc-client-1.15.0+solana.1.18.17 diff --git a/Cargo.lock b/Cargo.lock index 12a008de..33d6406b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3630,9 +3630,9 @@ dependencies = [ [[package]] name = "solana-account-decoder" -version = "1.18.17" +version = "1.18.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4973213a11c2e1b924b36e0c6688682b5aa4623f8d4eeaa1204c32cee524e6d6" +checksum = "b4a1297281b114406a9165c6f55ff9f8706f6244545194c7aa837f9b25dee16e" dependencies = [ "Inflector", "base64 0.21.7", @@ -3655,9 +3655,9 @@ dependencies = [ [[package]] name = "solana-config-program" -version = "1.18.17" +version = "1.18.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e38b040d3a42e8f7d80c4a86bb0d49d7aed663b56b0fe0ae135d2d145fb7ae3a" +checksum = "e6db8509d749ff1396a0b538ade995908361563b4f2c875b09cf096ba4ba0fae" dependencies = [ "bincode", "chrono", @@ -3669,9 +3669,9 @@ dependencies = [ [[package]] name = "solana-frozen-abi" -version = "1.18.17" +version = "1.18.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4867f66e9527fa44451c861c1dc6d9b2a7c7a668d7c6a297cdefbe39f4395b33" +checksum = "3f498a2b290abca1cf77feacef01b904be725fd46a7aea5ba121cce8c1269dcf" dependencies = [ "block-buffer 0.10.4", "bs58", @@ -3694,9 +3694,9 @@ dependencies = [ [[package]] name = "solana-frozen-abi-macro" -version = "1.18.17" +version = "1.18.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168f24d97347b85f05192df58d6be3e3047a4aadc4001bc1b9e711a5ec878eea" +checksum = "e4ab48d1be18021f5c13f94671e766699511044f81aab3376313f6a2392f8fab" dependencies = [ "proc-macro2", "quote", @@ -3706,9 +3706,9 @@ dependencies = [ [[package]] name = "solana-geyser-plugin-interface" -version = "1.18.17" +version = "1.18.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "231ae125a126f3469a4a1a473bd194507f33efb28b061103af4f8cc0d5948c29" +checksum = "69fa618be6c880aebfd01541e1ce386985441a4df43fbf83de58f194502fe64b" dependencies = [ "log", "solana-sdk", @@ -3718,9 +3718,9 @@ dependencies = [ [[package]] name = "solana-logger" -version = "1.18.17" +version = "1.18.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0511082fc62f2d086520fff5aa1917c389d8c840930c08ad255ae05952c08a2" +checksum = "ed08bcdd54232d2017071a6f5d664b34649ef0110801ac310a01418215f22ff7" dependencies = [ "env_logger 0.9.3", "lazy_static", @@ -3729,9 +3729,9 @@ dependencies = [ [[package]] name = "solana-measure" -version = "1.18.17" +version = "1.18.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55a3df105431d25f86f2a7da0cbbde5f54c1f0782ca59367ea4a8037bc6797" +checksum = "5db05e4bba8562a2419cb980301152fc7f60f643065c3aba4b3b5d6e3bd66e45" dependencies = [ "log", "solana-sdk", @@ -3739,9 +3739,9 @@ dependencies = [ [[package]] name = "solana-metrics" -version = "1.18.17" +version = "1.18.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddec097ed7572804389195128dbd57958b427829153c6cd8ec3343c86fe3cd22" +checksum = "f7a77735beed78eb221e123e0d46a991dc91db9e199d5c5fdbea22a55149d162" dependencies = [ "crossbeam-channel", "gethostname", @@ -3754,9 +3754,9 @@ dependencies = [ [[package]] name = "solana-program" -version = "1.18.17" +version = "1.18.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bc5a636dc75e5c25651e34f7a36afc9ae60d38166687c5b0375abb580ac81a2" +checksum = "d97cec6d3d60ef58168c8b3e97fd88e8903fa059eff6635361427c61c946ec1e" dependencies = [ "ark-bn254", "ark-ec", @@ -3809,9 +3809,9 @@ dependencies = [ [[package]] name = "solana-program-runtime" -version = "1.18.17" +version = "1.18.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf373c3da0387f47fee4c5ed2465a9628b9db026a62211a692a9285aa9251544" +checksum = "d4b76599d73401663bc1fde39f9fa5e538bd74451ea4a8d4e3ac14541be0a5de" dependencies = [ "base64 0.21.7", "bincode", @@ -3837,9 +3837,9 @@ dependencies = [ [[package]] name = "solana-sdk" -version = "1.18.17" +version = "1.18.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df43d3a1e1637397ab43cbc216a5a8f977ec8a3cc3f3ae8c3851c83a3255dbcf" +checksum = "1c335bdf35728ea876506babffcfd85fa4dd66af6438f9472afc91b278946909" dependencies = [ "assert_matches", "base64 0.21.7", @@ -3892,9 +3892,9 @@ dependencies = [ [[package]] name = "solana-sdk-macro" -version = "1.18.17" +version = "1.18.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86c76414183a325038ff020b22c07d1e9d2da0703ddc0244acfed37ee2921d96" +checksum = "4ba67050b90454a8638913a7d5775703c0557157def04ddcc8b59c964cda8535" dependencies = [ "bs58", "proc-macro2", @@ -3911,9 +3911,9 @@ checksum = "468aa43b7edb1f9b7b7b686d5c3aeb6630dc1708e86e31343499dd5c4d775183" [[package]] name = "solana-transaction-status" -version = "1.18.17" +version = "1.18.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a0cdfdf63192fb60de094fae8e81159e4e3e9aac9659fe3f9ef0e707023fb32" +checksum = "7595aef5a9ddfdecd0966cc12ad0006713e4f8d87eafb4cb7b60fb18d98eff3a" dependencies = [ "Inflector", "base64 0.21.7", @@ -3936,9 +3936,9 @@ dependencies = [ [[package]] name = "solana-zk-token-sdk" -version = "1.18.17" +version = "1.18.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "513407f88394e437b4ff5aad892bc5bf51a655ae2401e6e63549734d3695c46f" +checksum = "616130045004bccc9dd016fe03ac458db38bd61456f1d16f126acb60f968dcae" dependencies = [ "aes-gcm-siv", "base64 0.21.7", @@ -5253,7 +5253,7 @@ dependencies = [ [[package]] name = "yellowstone-grpc-client" -version = "1.15.0+solana.1.18.17" +version = "1.15.0+solana.1.18.18" dependencies = [ "bytes", "futures", @@ -5266,7 +5266,7 @@ dependencies = [ [[package]] name = "yellowstone-grpc-client-simple" -version = "1.13.0+solana.1.18.17" +version = "1.13.0+solana.1.18.18" dependencies = [ "anyhow", "backoff", @@ -5289,7 +5289,7 @@ dependencies = [ [[package]] name = "yellowstone-grpc-geyser" -version = "1.15.0+solana.1.18.17" +version = "1.15.0+solana.1.18.18" dependencies = [ "anyhow", "base64 0.21.7", @@ -5322,7 +5322,7 @@ dependencies = [ [[package]] name = "yellowstone-grpc-proto" -version = "1.14.0+solana.1.18.17" +version = "1.14.0+solana.1.18.18" dependencies = [ "anyhow", "bincode", @@ -5337,7 +5337,7 @@ dependencies = [ [[package]] name = "yellowstone-grpc-tools" -version = "1.0.0-rc.11+solana.1.18.17" +version = "1.0.0-rc.11+solana.1.18.18" dependencies = [ "anyhow", "async-trait", diff --git a/Cargo.toml b/Cargo.toml index f08394f7..f542d755 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,11 +1,11 @@ [workspace] resolver = "2" members = [ - "examples/rust", # 1.13.0+solana.1.18.17 - "yellowstone-grpc-client", # 1.15.0+solana.1.18.17 - "yellowstone-grpc-geyser", # 1.15.0+solana.1.18.17 - "yellowstone-grpc-proto", # 1.14.0+solana.1.18.17 - "yellowstone-grpc-tools", # 1.0.0-rc.11+solana.1.18.17 + "examples/rust", # 1.13.0+solana.1.18.18 + "yellowstone-grpc-client", # 1.15.0+solana.1.18.18 + "yellowstone-grpc-geyser", # 1.15.0+solana.1.18.18 + "yellowstone-grpc-proto", # 1.14.0+solana.1.18.18 + "yellowstone-grpc-tools", # 1.0.0-rc.11+solana.1.18.18 ] [workspace.package] @@ -53,11 +53,11 @@ serde = "1.0.145" serde_json = "1.0.86" serde_yaml = "0.9.25" sha2 = "0.10.7" -solana-account-decoder = "=1.18.17" -solana-geyser-plugin-interface = "=1.18.17" -solana-logger = "=1.18.17" -solana-sdk = "=1.18.17" -solana-transaction-status = "=1.18.17" +solana-account-decoder = "=1.18.18" +solana-geyser-plugin-interface = "=1.18.18" +solana-logger = "=1.18.18" +solana-sdk = "=1.18.18" +solana-transaction-status = "=1.18.18" spl-token-2022 = "0.9.0" thiserror = "1.0" tokio = "1.21.2" @@ -69,8 +69,8 @@ tracing = "0.1.37" tracing-subscriber = "0.3.17" uuid = "1.8.0" vergen = "8.2.1" -yellowstone-grpc-client = { path = "yellowstone-grpc-client", version = "=1.15.0+solana.1.18.17" } -yellowstone-grpc-proto = { path = "yellowstone-grpc-proto", version = "=1.14.0+solana.1.18.17" } +yellowstone-grpc-client = { path = "yellowstone-grpc-client", version = "=1.15.0+solana.1.18.18" } +yellowstone-grpc-proto = { path = "yellowstone-grpc-proto", version = "=1.14.0+solana.1.18.18" } [profile.release] debug = true diff --git a/examples/rust/Cargo.toml b/examples/rust/Cargo.toml index 253e7e9e..d95501a2 100644 --- a/examples/rust/Cargo.toml +++ b/examples/rust/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "yellowstone-grpc-client-simple" -version = "1.13.0+solana.1.18.17" +version = "1.13.0+solana.1.18.18" authors = { workspace = true } edition = { workspace = true } homepage = { workspace = true } diff --git a/yellowstone-grpc-client/Cargo.toml b/yellowstone-grpc-client/Cargo.toml index 7841af4d..f27f76b6 100644 --- a/yellowstone-grpc-client/Cargo.toml +++ b/yellowstone-grpc-client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "yellowstone-grpc-client" -version = "1.15.0+solana.1.18.17" +version = "1.15.0+solana.1.18.18" authors = { workspace = true } edition = { workspace = true } description = "Yellowstone gRPC Geyser Simple Client" diff --git a/yellowstone-grpc-geyser/Cargo.toml b/yellowstone-grpc-geyser/Cargo.toml index eac82367..bba6912c 100644 --- a/yellowstone-grpc-geyser/Cargo.toml +++ b/yellowstone-grpc-geyser/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "yellowstone-grpc-geyser" -version = "1.15.0+solana.1.18.17" +version = "1.15.0+solana.1.18.18" 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 7db0a22b..45655b0e 100644 --- a/yellowstone-grpc-proto/Cargo.toml +++ b/yellowstone-grpc-proto/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "yellowstone-grpc-proto" -version = "1.14.0+solana.1.18.17" +version = "1.14.0+solana.1.18.18" 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 e693327e..61a5a1a7 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.11+solana.1.18.17" +version = "1.0.0-rc.11+solana.1.18.18" authors = { workspace = true } edition = { workspace = true } description = "Yellowstone gRPC Tools" @@ -64,4 +64,4 @@ vergen = { workspace = true, features = ["build", "rustc"] } [features] default = ["google-pubsub", "kafka"] google-pubsub = ["google-cloud-googleapis", "google-cloud-pubsub"] -kafka = ["const-hex", "rdkafka", "sha2"] \ No newline at end of file +kafka = ["const-hex", "rdkafka", "sha2"] From 2d8a857b591ab6c388794a39d18797eb09cb07c7 Mon Sep 17 00:00:00 2001 From: Kirill Fomichev Date: Fri, 12 Jul 2024 13:52:49 -0500 Subject: [PATCH 2/4] update ci --- .github/workflows/release.yml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 69a55412..89f11f3b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -84,8 +84,7 @@ jobs: target/release/client.d \ target/release/config-check.d \ target/release/grpc-google-pubsub.d \ - target/release/grpc-kafka.d \ - target/release/grpc-scylladb.d + target/release/grpc-kafka.d - name: Remove debug information run: | @@ -93,8 +92,7 @@ jobs: target/release/client \ target/release/config-check \ target/release/grpc-google-pubsub \ - target/release/grpc-kafka \ - target/release/grpc-scylladb + target/release/grpc-kafka - name: Rename binaries run: | @@ -102,7 +100,6 @@ jobs: mv target/release/config-check target/release/config-check-${{ matrix.os }} mv target/release/grpc-google-pubsub target/release/grpc-google-pubsub-${{ matrix.os }} mv target/release/grpc-kafka target/release/grpc-kafka-${{ matrix.os }} - mv target/release/grpc-scylladb target/release/grpc-scylladb-${{ matrix.os }} - name: Rename lib for ubuntu22 release if: matrix.os == 'ubuntu-22.04' @@ -124,9 +121,8 @@ jobs: yellowstone-grpc-proto/proto/*.proto target/release/client* target/release/config-check* - target/release/grpc-google-pubsub* + # target/release/grpc-google-pubsub* target/release/grpc-kafka* - target/release/grpc-scylladb* - uses: actions/upload-artifact@v4 with: @@ -136,6 +132,5 @@ jobs: yellowstone-grpc-proto/proto/*.proto target/release/client* target/release/config-check* - target/release/grpc-google-pubsub* + # target/release/grpc-google-pubsub* target/release/grpc-kafka* - target/release/grpc-scylladb* From 72d8db44f9366724d708be4a41164444624c8617 Mon Sep 17 00:00:00 2001 From: Kirill Fomichev Date: Fri, 12 Jul 2024 13:54:07 -0500 Subject: [PATCH 3/4] remove debug on release profile --- Cargo.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index f542d755..b7e2bb3d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -73,6 +73,5 @@ yellowstone-grpc-client = { path = "yellowstone-grpc-client", version = "=1.15.0 yellowstone-grpc-proto = { path = "yellowstone-grpc-proto", version = "=1.14.0+solana.1.18.18" } [profile.release] -debug = true lto = true codegen-units = 1 From c4e332cd0b7ec0fa46adbb870c59ad26c9ec8494 Mon Sep 17 00:00:00 2001 From: Kirill Fomichev Date: Fri, 12 Jul 2024 13:57:56 -0500 Subject: [PATCH 4/4] remove scylladb feature --- ci/cargo-install-all.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/cargo-install-all.sh b/ci/cargo-install-all.sh index 9f35ede9..e478dc46 100755 --- a/ci/cargo-install-all.sh +++ b/ci/cargo-install-all.sh @@ -69,7 +69,7 @@ mkdir -p "$installDir/lib" ( set -x # shellcheck disable=SC2086 # Don't want to double quote $rust_version - cargo $maybeRustVersion build $maybeReleaseFlag --features scylladb + cargo $maybeRustVersion build $maybeReleaseFlag ) cp -fv "target/$buildVariant/${GEYSER_PLUGIN_LIB}.$libExt" "$installDir"/lib/