From 6a9712bb2384d8933835e81e2c20dec2821e839e Mon Sep 17 00:00:00 2001
From: Kirill Fomichev <fanatid@ya.ru>
Date: Fri, 26 Jul 2024 13:24:20 -0500
Subject: [PATCH] solana: update to 1.18.20 (#385)

---
 CHANGELOG.md                       | 11 +++++
 Cargo.lock                         | 73 ++++++++++++++----------------
 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  |  2 +-
 8 files changed, 63 insertions(+), 55 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6ebca75a..ed16e1ab 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-26
+
+- yellowstone-grpc-client-1.15.0+solana.1.18.20
+- yellowstone-grpc-geyser-1.15.0+solana.1.18.20
+- yellowstone-grpc-proto-1.15.0+solana.1.18.20
+- yellowstone-grpc-tools-1.0.0-rc.11+solana.1.18.20
+
+### Features
+
+- solana: update to 1.18.20 ([#375](https://github.com/rpcpool/yellowstone-grpc/pull/375))
+
 ## 2024-07-12
 
 - yellowstone-grpc-client-1.15.0+solana.1.18.18
diff --git a/Cargo.lock b/Cargo.lock
index ccca3f09..dc1ae319 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -579,7 +579,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4114279215a005bc675e386011e594e1d9b800918cea18fcadadcce864a2046b"
 dependencies = [
  "borsh-derive 0.10.3",
- "hashbrown 0.12.3",
+ "hashbrown 0.13.2",
 ]
 
 [[package]]
@@ -1611,9 +1611,6 @@ name = "hashbrown"
 version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-dependencies = [
- "ahash 0.7.8",
-]
 
 [[package]]
 name = "hashbrown"
@@ -2406,7 +2403,7 @@ version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b"
 dependencies = [
- "proc-macro-crate 1.3.1",
+ "proc-macro-crate 3.1.0",
  "proc-macro2",
  "quote",
  "syn 2.0.60",
@@ -3633,9 +3630,9 @@ dependencies = [
 
 [[package]]
 name = "solana-account-decoder"
-version = "1.18.18"
+version = "1.18.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4a1297281b114406a9165c6f55ff9f8706f6244545194c7aa837f9b25dee16e"
+checksum = "5e621af8405ad85f2c3822bb1794f57389b7bc2e8c8c49e0d5a38b85b8955565"
 dependencies = [
  "Inflector",
  "base64 0.21.7",
@@ -3658,9 +3655,9 @@ dependencies = [
 
 [[package]]
 name = "solana-config-program"
-version = "1.18.18"
+version = "1.18.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6db8509d749ff1396a0b538ade995908361563b4f2c875b09cf096ba4ba0fae"
+checksum = "5544b247de63cb2a90f8d8dbbe61468405ed9895d245c1e28f7806c918fe0fb4"
 dependencies = [
  "bincode",
  "chrono",
@@ -3672,9 +3669,9 @@ dependencies = [
 
 [[package]]
 name = "solana-frozen-abi"
-version = "1.18.18"
+version = "1.18.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f498a2b290abca1cf77feacef01b904be725fd46a7aea5ba121cce8c1269dcf"
+checksum = "0f0c52f25d28a1b5af57d5de3802e49883f68792a343101a9daf9817d8dfffff"
 dependencies = [
  "block-buffer 0.10.4",
  "bs58",
@@ -3697,9 +3694,9 @@ dependencies = [
 
 [[package]]
 name = "solana-frozen-abi-macro"
-version = "1.18.18"
+version = "1.18.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4ab48d1be18021f5c13f94671e766699511044f81aab3376313f6a2392f8fab"
+checksum = "fc7d0abca44a21c83305e8650341f67ccc919a1a9dd698ddafc86e78b74b9296"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3709,9 +3706,9 @@ dependencies = [
 
 [[package]]
 name = "solana-geyser-plugin-interface"
-version = "1.18.18"
+version = "1.18.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69fa618be6c880aebfd01541e1ce386985441a4df43fbf83de58f194502fe64b"
+checksum = "7036332d3ada8f354fb5e245125623634c9d69fe187ef9fac53362bc2e7549eb"
 dependencies = [
  "log",
  "solana-sdk",
@@ -3721,9 +3718,9 @@ dependencies = [
 
 [[package]]
 name = "solana-logger"
-version = "1.18.18"
+version = "1.18.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed08bcdd54232d2017071a6f5d664b34649ef0110801ac310a01418215f22ff7"
+checksum = "d5bc0644a410b8bff84ad18541a176f27776062b1ad116cb315c6f5f14b94fed"
 dependencies = [
  "env_logger 0.9.3",
  "lazy_static",
@@ -3732,9 +3729,9 @@ dependencies = [
 
 [[package]]
 name = "solana-measure"
-version = "1.18.18"
+version = "1.18.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5db05e4bba8562a2419cb980301152fc7f60f643065c3aba4b3b5d6e3bd66e45"
+checksum = "3b2a96265160981b5aab8a73c9830f2cd8ce7b557790d19c18cabb8565563f2f"
 dependencies = [
  "log",
  "solana-sdk",
@@ -3742,9 +3739,9 @@ dependencies = [
 
 [[package]]
 name = "solana-metrics"
-version = "1.18.18"
+version = "1.18.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7a77735beed78eb221e123e0d46a991dc91db9e199d5c5fdbea22a55149d162"
+checksum = "d140890d4f906315533de1c9b929e1b3b8f4a0515f45a85ee90859778ea6e6ab"
 dependencies = [
  "crossbeam-channel",
  "gethostname",
@@ -3757,9 +3754,9 @@ dependencies = [
 
 [[package]]
 name = "solana-program"
-version = "1.18.18"
+version = "1.18.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d97cec6d3d60ef58168c8b3e97fd88e8903fa059eff6635361427c61c946ec1e"
+checksum = "76a99c3bc26fda40f42db98494271bda4906b0d7ab55f3ea7755fa5f110f58b5"
 dependencies = [
  "ark-bn254",
  "ark-ec",
@@ -3812,9 +3809,9 @@ dependencies = [
 
 [[package]]
 name = "solana-program-runtime"
-version = "1.18.18"
+version = "1.18.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4b76599d73401663bc1fde39f9fa5e538bd74451ea4a8d4e3ac14541be0a5de"
+checksum = "11ae79e82b97a66ff00770d9190abc7e6b610c108254cd84fcd0f100a1c4d165"
 dependencies = [
  "base64 0.21.7",
  "bincode",
@@ -3840,9 +3837,9 @@ dependencies = [
 
 [[package]]
 name = "solana-sdk"
-version = "1.18.18"
+version = "1.18.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c335bdf35728ea876506babffcfd85fa4dd66af6438f9472afc91b278946909"
+checksum = "90a8affb5b3acd43f7164368b88243bf091e46eccff9bea5b743e4691d7c2600"
 dependencies = [
  "assert_matches",
  "base64 0.21.7",
@@ -3895,9 +3892,9 @@ dependencies = [
 
 [[package]]
 name = "solana-sdk-macro"
-version = "1.18.18"
+version = "1.18.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ba67050b90454a8638913a7d5775703c0557157def04ddcc8b59c964cda8535"
+checksum = "4c2ac8d7ef471476164edb2ed105bcf26071835a15f0e74703929d4ec913676b"
 dependencies = [
  "bs58",
  "proc-macro2",
@@ -3914,9 +3911,9 @@ checksum = "468aa43b7edb1f9b7b7b686d5c3aeb6630dc1708e86e31343499dd5c4d775183"
 
 [[package]]
 name = "solana-transaction-status"
-version = "1.18.18"
+version = "1.18.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7595aef5a9ddfdecd0966cc12ad0006713e4f8d87eafb4cb7b60fb18d98eff3a"
+checksum = "65cbdbde85fff3b4c2e134f6bd70d26c0cc9cd2b63892be2afd424a21e2b316b"
 dependencies = [
  "Inflector",
  "base64 0.21.7",
@@ -3939,9 +3936,9 @@ dependencies = [
 
 [[package]]
 name = "solana-zk-token-sdk"
-version = "1.18.18"
+version = "1.18.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "616130045004bccc9dd016fe03ac458db38bd61456f1d16f126acb60f968dcae"
+checksum = "8cf73fd7e430bf3269539c2fb1d05af0df26fc3b7bc090172ceda5cd4340657c"
 dependencies = [
  "aes-gcm-siv",
  "base64 0.21.7",
@@ -5256,7 +5253,7 @@ dependencies = [
 
 [[package]]
 name = "yellowstone-grpc-client"
-version = "1.15.0+solana.1.18.18"
+version = "1.15.0+solana.1.18.20"
 dependencies = [
  "bytes",
  "futures",
@@ -5269,7 +5266,7 @@ dependencies = [
 
 [[package]]
 name = "yellowstone-grpc-client-simple"
-version = "1.13.0+solana.1.18.18"
+version = "1.13.0+solana.1.18.20"
 dependencies = [
  "anyhow",
  "backoff",
@@ -5292,7 +5289,7 @@ dependencies = [
 
 [[package]]
 name = "yellowstone-grpc-geyser"
-version = "1.15.0+solana.1.18.18"
+version = "1.15.0+solana.1.18.20"
 dependencies = [
  "anyhow",
  "base64 0.21.7",
@@ -5325,7 +5322,7 @@ dependencies = [
 
 [[package]]
 name = "yellowstone-grpc-proto"
-version = "1.14.0+solana.1.18.18"
+version = "1.14.0+solana.1.18.20"
 dependencies = [
  "anyhow",
  "bincode",
@@ -5340,7 +5337,7 @@ dependencies = [
 
 [[package]]
 name = "yellowstone-grpc-tools"
-version = "1.0.0-rc.11+solana.1.18.18"
+version = "1.0.0-rc.11+solana.1.18.20"
 dependencies = [
  "anyhow",
  "async-trait",
diff --git a/Cargo.toml b/Cargo.toml
index b7e2bb3d..a7142e9f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,11 +1,11 @@
 [workspace]
 resolver = "2"
 members = [
-    "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
+    "examples/rust", # 1.13.0+solana.1.18.20
+    "yellowstone-grpc-client", # 1.15.0+solana.1.18.20
+    "yellowstone-grpc-geyser", # 1.15.0+solana.1.18.20
+    "yellowstone-grpc-proto", # 1.14.0+solana.1.18.20
+    "yellowstone-grpc-tools", # 1.0.0-rc.11+solana.1.18.20
 ]
 
 [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.18"
-solana-geyser-plugin-interface = "=1.18.18"
-solana-logger = "=1.18.18"
-solana-sdk = "=1.18.18"
-solana-transaction-status = "=1.18.18"
+solana-account-decoder = "=1.18.20"
+solana-geyser-plugin-interface = "=1.18.20"
+solana-logger = "=1.18.20"
+solana-sdk = "=1.18.20"
+solana-transaction-status = "=1.18.20"
 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.18" }
-yellowstone-grpc-proto = { path = "yellowstone-grpc-proto", version = "=1.14.0+solana.1.18.18" }
+yellowstone-grpc-client = { path = "yellowstone-grpc-client", version = "=1.15.0+solana.1.18.20" }
+yellowstone-grpc-proto = { path = "yellowstone-grpc-proto", version = "=1.14.0+solana.1.18.20" }
 
 [profile.release]
 lto = true
diff --git a/examples/rust/Cargo.toml b/examples/rust/Cargo.toml
index d95501a2..1807de1e 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.18"
+version = "1.13.0+solana.1.18.20"
 authors = { workspace = true }
 edition = { workspace = true }
 homepage = { workspace = true }
diff --git a/yellowstone-grpc-client/Cargo.toml b/yellowstone-grpc-client/Cargo.toml
index f27f76b6..c51614ec 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.18"
+version = "1.15.0+solana.1.18.20"
 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 bba6912c..a315a637 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.18"
+version = "1.15.0+solana.1.18.20"
 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 45655b0e..a75b9546 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.18"
+version = "1.14.0+solana.1.18.20"
 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 61a5a1a7..bb51bacc 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.18"
+version = "1.0.0-rc.11+solana.1.18.20"
 authors = { workspace = true }
 edition = { workspace = true }
 description = "Yellowstone gRPC Tools"