From ccf5ec2a7a99b40ad0cd57e01bc5be374101f659 Mon Sep 17 00:00:00 2001
From: Kirill Fomichev <fanatid@ya.ru>
Date: Sun, 15 Oct 2023 14:13:43 +0400
Subject: [PATCH] solana: update to 1.16.17

---
 Cargo.lock | 300 +++++++++++++++++++++++++++++++++++++++++------------
 Cargo.toml |  18 ++--
 src/sqs.rs |   5 +-
 3 files changed, 248 insertions(+), 75 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0e43342..51598fc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2002,6 +2002,17 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "num-derive"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfb77679af88f8b125209d354a202862602672222e7f2313fdd6dc349bad4712"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.37",
+]
+
 [[package]]
 name = "num-integer"
 version = "0.1.45"
@@ -2072,6 +2083,15 @@ dependencies = [
  "num_enum_derive 0.6.1",
 ]
 
+[[package]]
+name = "num_enum"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70bf6736f74634d299d00086f02986875b3c2d924781a6a2cb6c201e73da0ceb"
+dependencies = [
+ "num_enum_derive 0.7.0",
+]
+
 [[package]]
 name = "num_enum_derive"
 version = "0.5.11"
@@ -2096,6 +2116,18 @@ dependencies = [
  "syn 2.0.37",
 ]
 
+[[package]]
+name = "num_enum_derive"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56ea360eafe1022f7cc56cd7b869ed57330fb2453d0c7831d99b74c65d2f5597"
+dependencies = [
+ "proc-macro-crate 1.3.1",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.37",
+]
+
 [[package]]
 name = "num_threads"
 version = "0.1.6"
@@ -3096,9 +3128,8 @@ dependencies = [
 
 [[package]]
 name = "solana-account-decoder"
-version = "1.16.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "850d5d9dc8fa6ea42f4e61c78e296bbbce5a3531ff4cb3c58ef36ee31781049c"
+version = "1.16.17"
+source = "git+https://github.com/rpcpool/solana-public.git?tag=v1.16.17-geyser-block-v3#cdcfdb86e42956cf955a5ca6c5ef188821c70781"
 dependencies = [
  "Inflector",
  "base64 0.21.4",
@@ -3112,22 +3143,22 @@ dependencies = [
  "solana-address-lookup-table-program",
  "solana-config-program",
  "solana-sdk",
- "spl-token 3.5.0",
+ "spl-token 4.0.0",
  "spl-token-2022",
+ "spl-token-metadata-interface",
  "thiserror",
  "zstd 0.11.2+zstd.1.5.2",
 ]
 
 [[package]]
 name = "solana-address-lookup-table-program"
-version = "1.16.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a7f867cde478a078d4c4ceb113f4f9ac7e29c2efea98f80a2b30cdcd7be83c5"
+version = "1.16.17"
+source = "git+https://github.com/rpcpool/solana-public.git?tag=v1.16.17-geyser-block-v3#cdcfdb86e42956cf955a5ca6c5ef188821c70781"
 dependencies = [
  "bincode",
  "bytemuck",
  "log",
- "num-derive",
+ "num-derive 0.3.3",
  "num-traits",
  "rustc_version",
  "serde",
@@ -3141,9 +3172,8 @@ dependencies = [
 
 [[package]]
 name = "solana-config-program"
-version = "1.16.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6f9f2201c7e526581511fa6525e281518be5cabaee82bd5b29fe4b78744148d"
+version = "1.16.17"
+source = "git+https://github.com/rpcpool/solana-public.git?tag=v1.16.17-geyser-block-v3#cdcfdb86e42956cf955a5ca6c5ef188821c70781"
 dependencies = [
  "bincode",
  "chrono",
@@ -3155,9 +3185,8 @@ dependencies = [
 
 [[package]]
 name = "solana-frozen-abi"
-version = "1.16.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "361cc834e5fbbe1a73f1d904fcb8ab052a665e5be6061bd1ba7ab478d7d17c9c"
+version = "1.16.17"
+source = "git+https://github.com/rpcpool/solana-public.git?tag=v1.16.17-geyser-block-v3#cdcfdb86e42956cf955a5ca6c5ef188821c70781"
 dependencies = [
  "ahash 0.8.3",
  "blake3",
@@ -3188,9 +3217,8 @@ dependencies = [
 
 [[package]]
 name = "solana-frozen-abi-macro"
-version = "1.16.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "575d875dc050689f9f88c542e292e295e2f081d4e96e0df297981e45cbad8824"
+version = "1.16.17"
+source = "git+https://github.com/rpcpool/solana-public.git?tag=v1.16.17-geyser-block-v3#cdcfdb86e42956cf955a5ca6c5ef188821c70781"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3200,9 +3228,8 @@ dependencies = [
 
 [[package]]
 name = "solana-geyser-plugin-interface"
-version = "1.16.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "268db758cb4193ccf70c85459bfd0e8e5eb7a13b3ee876106d07fada04290a17"
+version = "1.16.17"
+source = "git+https://github.com/rpcpool/solana-public.git?tag=v1.16.17-geyser-block-v3#cdcfdb86e42956cf955a5ca6c5ef188821c70781"
 dependencies = [
  "log",
  "solana-sdk",
@@ -3212,7 +3239,7 @@ dependencies = [
 
 [[package]]
 name = "solana-geyser-sqs"
-version = "0.3.0+solana.1.16.15"
+version = "0.3.0+solana.1.16.17"
 dependencies = [
  "anyhow",
  "arrayref",
@@ -3247,7 +3274,7 @@ dependencies = [
  "serde_json",
  "serum_dex",
  "solana-geyser-plugin-interface",
- "solana-logger",
+ "solana-logger 1.16.17 (registry+https://github.com/rust-lang/crates.io-index)",
  "solana-sdk",
  "solana-transaction-status",
  "spl-token 4.0.0",
@@ -3259,9 +3286,19 @@ dependencies = [
 
 [[package]]
 name = "solana-logger"
-version = "1.16.15"
+version = "1.16.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c00faf7aa6a3f47c542bd45d2d7f13af9a382d993e647976a676fe1b0eec4eb2"
+checksum = "4f76fe25c2d06dcf621befd1e8d5655143e8a059c7e20fcb71736bc80ed779d6"
+dependencies = [
+ "env_logger",
+ "lazy_static",
+ "log",
+]
+
+[[package]]
+name = "solana-logger"
+version = "1.16.17"
+source = "git+https://github.com/rpcpool/solana-public.git?tag=v1.16.17-geyser-block-v3#cdcfdb86e42956cf955a5ca6c5ef188821c70781"
 dependencies = [
  "env_logger",
  "lazy_static",
@@ -3270,9 +3307,8 @@ dependencies = [
 
 [[package]]
 name = "solana-measure"
-version = "1.16.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e19c6e1b35df3c212619a7995ae3576fa92ab15ecfc065899f21385cbe45c95"
+version = "1.16.17"
+source = "git+https://github.com/rpcpool/solana-public.git?tag=v1.16.17-geyser-block-v3#cdcfdb86e42956cf955a5ca6c5ef188821c70781"
 dependencies = [
  "log",
  "solana-sdk",
@@ -3280,9 +3316,8 @@ dependencies = [
 
 [[package]]
 name = "solana-metrics"
-version = "1.16.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10e62760a5f87d836169eb3bb446bae174181db07d2c8016be36de49c04fd432"
+version = "1.16.17"
+source = "git+https://github.com/rpcpool/solana-public.git?tag=v1.16.17-geyser-block-v3#cdcfdb86e42956cf955a5ca6c5ef188821c70781"
 dependencies = [
  "crossbeam-channel",
  "gethostname",
@@ -3294,9 +3329,8 @@ dependencies = [
 
 [[package]]
 name = "solana-program"
-version = "1.16.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9863ff5c6e828015bec331c26fb53e48352a264a9be682e7e078d2c3b3e93b46"
+version = "1.16.17"
+source = "git+https://github.com/rpcpool/solana-public.git?tag=v1.16.17-geyser-block-v3#cdcfdb86e42956cf955a5ca6c5ef188821c70781"
 dependencies = [
  "ark-bn254",
  "ark-ec",
@@ -3325,7 +3359,7 @@ dependencies = [
  "log",
  "memoffset",
  "num-bigint 0.4.4",
- "num-derive",
+ "num-derive 0.3.3",
  "num-traits",
  "parking_lot",
  "rand 0.7.3",
@@ -3349,9 +3383,8 @@ dependencies = [
 
 [[package]]
 name = "solana-program-runtime"
-version = "1.16.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05813d4d2e141ab4449cf684cc5b05512dfaabb7251561c5bb1ccf1e4221b210"
+version = "1.16.17"
+source = "git+https://github.com/rpcpool/solana-public.git?tag=v1.16.17-geyser-block-v3#cdcfdb86e42956cf955a5ca6c5ef188821c70781"
 dependencies = [
  "base64 0.21.4",
  "bincode",
@@ -3360,7 +3393,7 @@ dependencies = [
  "itertools 0.10.5",
  "libc",
  "log",
- "num-derive",
+ "num-derive 0.3.3",
  "num-traits",
  "percentage",
  "rand 0.7.3",
@@ -3377,9 +3410,8 @@ dependencies = [
 
 [[package]]
 name = "solana-sdk"
-version = "1.16.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "621e6973766420162541b26e7974783d32d5471571610da30c5bb0b6263046c9"
+version = "1.16.17"
+source = "git+https://github.com/rpcpool/solana-public.git?tag=v1.16.17-geyser-block-v3#cdcfdb86e42956cf955a5ca6c5ef188821c70781"
 dependencies = [
  "assert_matches",
  "base64 0.21.4",
@@ -3402,7 +3434,7 @@ dependencies = [
  "libsecp256k1",
  "log",
  "memmap2",
- "num-derive",
+ "num-derive 0.3.3",
  "num-traits",
  "num_enum 0.6.1",
  "pbkdf2 0.11.0",
@@ -3420,7 +3452,7 @@ dependencies = [
  "sha3 0.10.8",
  "solana-frozen-abi",
  "solana-frozen-abi-macro",
- "solana-logger",
+ "solana-logger 1.16.17 (git+https://github.com/rpcpool/solana-public.git?tag=v1.16.17-geyser-block-v3)",
  "solana-program",
  "solana-sdk-macro",
  "thiserror",
@@ -3430,9 +3462,8 @@ dependencies = [
 
 [[package]]
 name = "solana-sdk-macro"
-version = "1.16.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd177a74fb3a0a362f1292c027d668eff609ac189f08b78158324587a0a4f8d1"
+version = "1.16.17"
+source = "git+https://github.com/rpcpool/solana-public.git?tag=v1.16.17-geyser-block-v3#cdcfdb86e42956cf955a5ca6c5ef188821c70781"
 dependencies = [
  "bs58",
  "proc-macro2",
@@ -3443,14 +3474,13 @@ dependencies = [
 
 [[package]]
 name = "solana-transaction-status"
-version = "1.16.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8aed485ddb4268b4e4ec64012016cd54ba3a4142377a99706fc3ab7768eb2bea"
+version = "1.16.17"
+source = "git+https://github.com/rpcpool/solana-public.git?tag=v1.16.17-geyser-block-v3#cdcfdb86e42956cf955a5ca6c5ef188821c70781"
 dependencies = [
  "Inflector",
  "base64 0.21.4",
  "bincode",
- "borsh 0.9.3",
+ "borsh 0.10.3",
  "bs58",
  "lazy_static",
  "log",
@@ -3462,16 +3492,16 @@ dependencies = [
  "solana-sdk",
  "spl-associated-token-account",
  "spl-memo",
- "spl-token 3.5.0",
+ "spl-token 4.0.0",
  "spl-token-2022",
  "thiserror",
 ]
 
 [[package]]
 name = "solana-zk-token-sdk"
-version = "1.16.15"
+version = "1.16.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61aabdec9fe1b311dce5d21fa5bd58fbaa985e8003e0d0aedf3795113aacc1ea"
+checksum = "278c08e13bc04b6940997602909052524a375154b00cf0bfa934359a3bb7e6f0"
 dependencies = [
  "aes-gcm-siv",
  "base64 0.21.4",
@@ -3483,7 +3513,7 @@ dependencies = [
  "itertools 0.10.5",
  "lazy_static",
  "merlin",
- "num-derive",
+ "num-derive 0.3.3",
  "num-traits",
  "rand 0.7.3",
  "serde",
@@ -3523,27 +3553,114 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
 
 [[package]]
 name = "spl-associated-token-account"
-version = "1.1.3"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "978dba3bcbe88d0c2c58366c254d9ea41c5f73357e72fc0bdee4d6b5fc99c8f4"
+checksum = "385e31c29981488f2820b2022d8e731aae3b02e6e18e2fd854e4c9a94dc44fc3"
 dependencies = [
  "assert_matches",
- "borsh 0.9.3",
- "num-derive",
+ "borsh 0.10.3",
+ "num-derive 0.4.1",
  "num-traits",
  "solana-program",
- "spl-token 3.5.0",
+ "spl-token 4.0.0",
  "spl-token-2022",
  "thiserror",
 ]
 
+[[package]]
+name = "spl-discriminator"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cce5d563b58ef1bb2cdbbfe0dfb9ffdc24903b10ae6a4df2d8f425ece375033f"
+dependencies = [
+ "bytemuck",
+ "solana-program",
+ "spl-discriminator-derive",
+]
+
+[[package]]
+name = "spl-discriminator-derive"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fadbefec4f3c678215ca72bd71862697bb06b41fd77c0088902dd3203354387b"
+dependencies = [
+ "quote",
+ "spl-discriminator-syn",
+ "syn 2.0.37",
+]
+
+[[package]]
+name = "spl-discriminator-syn"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e5f2044ca42c8938d54d1255ce599c79a1ffd86b677dfab695caa20f9ffc3f2"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "sha2 0.10.8",
+ "syn 2.0.37",
+ "thiserror",
+]
+
 [[package]]
 name = "spl-memo"
-version = "3.0.1"
+version = "4.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0f180b03318c3dbab3ef4e1e4d46d5211ae3c780940dd0a28695aba4b59a75a"
+dependencies = [
+ "solana-program",
+]
+
+[[package]]
+name = "spl-pod"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2881dddfca792737c0706fa0175345ab282b1b0879c7d877bad129645737c079"
+dependencies = [
+ "borsh 0.10.3",
+ "bytemuck",
+ "solana-program",
+ "solana-zk-token-sdk",
+ "spl-program-error",
+]
+
+[[package]]
+name = "spl-program-error"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "249e0318493b6bcf27ae9902600566c689b7dfba9f1bdff5893e92253374e78c"
+dependencies = [
+ "num-derive 0.4.1",
+ "num-traits",
+ "solana-program",
+ "spl-program-error-derive",
+ "thiserror",
+]
+
+[[package]]
+name = "spl-program-error-derive"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab5269c8e868da17b6552ef35a51355a017bd8e0eae269c201fef830d35fa52c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "sha2 0.10.8",
+ "syn 2.0.37",
+]
+
+[[package]]
+name = "spl-tlv-account-resolution"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd0dc6f70db6bacea7ff25870b016a65ba1d1b6013536f08e4fd79a8f9005325"
+checksum = "062e148d3eab7b165582757453632ffeef490c02c86a48bfdb4988f63eefb3b9"
 dependencies = [
+ "bytemuck",
  "solana-program",
+ "spl-discriminator",
+ "spl-pod",
+ "spl-program-error",
+ "spl-type-length-value",
 ]
 
 [[package]]
@@ -3554,7 +3671,7 @@ checksum = "8e85e168a785e82564160dcb87b2a8e04cee9bfd1f4d488c729d53d6a4bd300d"
 dependencies = [
  "arrayref",
  "bytemuck",
- "num-derive",
+ "num-derive 0.3.3",
  "num-traits",
  "num_enum 0.5.11",
  "solana-program",
@@ -3569,7 +3686,7 @@ checksum = "08459ba1b8f7c1020b4582c4edf0f5c7511a5e099a7a97570c9698d4f2337060"
 dependencies = [
  "arrayref",
  "bytemuck",
- "num-derive",
+ "num-derive 0.3.3",
  "num-traits",
  "num_enum 0.6.1",
  "solana-program",
@@ -3578,22 +3695,69 @@ dependencies = [
 
 [[package]]
 name = "spl-token-2022"
-version = "0.6.1"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0043b590232c400bad5ee9eb983ced003d15163c4c5d56b090ac6d9a57457b47"
+checksum = "e4abf34a65ba420584a0c35f3903f8d727d1f13ababbdc3f714c6b065a686e86"
 dependencies = [
  "arrayref",
  "bytemuck",
- "num-derive",
+ "num-derive 0.4.1",
  "num-traits",
- "num_enum 0.5.11",
+ "num_enum 0.7.0",
  "solana-program",
  "solana-zk-token-sdk",
  "spl-memo",
- "spl-token 3.5.0",
+ "spl-pod",
+ "spl-token 4.0.0",
+ "spl-token-metadata-interface",
+ "spl-transfer-hook-interface",
+ "spl-type-length-value",
  "thiserror",
 ]
 
+[[package]]
+name = "spl-token-metadata-interface"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c16ce3ba6979645fb7627aa1e435576172dd63088dc7848cb09aa331fa1fe4f"
+dependencies = [
+ "borsh 0.10.3",
+ "solana-program",
+ "spl-discriminator",
+ "spl-pod",
+ "spl-program-error",
+ "spl-type-length-value",
+]
+
+[[package]]
+name = "spl-transfer-hook-interface"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "051d31803f873cabe71aec3c1b849f35248beae5d19a347d93a5c9cccc5d5a9b"
+dependencies = [
+ "arrayref",
+ "bytemuck",
+ "solana-program",
+ "spl-discriminator",
+ "spl-pod",
+ "spl-program-error",
+ "spl-tlv-account-resolution",
+ "spl-type-length-value",
+]
+
+[[package]]
+name = "spl-type-length-value"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a468e6f6371f9c69aae760186ea9f1a01c2908351b06a5e0026d21cfc4d7ecac"
+dependencies = [
+ "bytemuck",
+ "solana-program",
+ "spl-discriminator",
+ "spl-pod",
+ "spl-program-error",
+]
+
 [[package]]
 name = "static_assertions"
 version = "1.1.0"
diff --git a/Cargo.toml b/Cargo.toml
index 5221c56..30c62ad 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-geyser-sqs"
-version = "0.3.0+solana.1.16.15"
+version = "0.3.0+solana.1.16.17"
 edition = "2018"
 publish = false
 
@@ -38,11 +38,11 @@ safe-transmute = "0.11.2"
 serde = { version = "1.0.132", features = ["derive"] }
 serde_json = "1.0.73"
 serum_dex = "0.5.4"
-solana-geyser-plugin-interface = "=1.16.15"
-solana-logger = "=1.16.15"
-solana-sdk = "=1.16.15"
-solana-transaction-status = "=1.16.15"
-spl-token = "=4.0.0"
+solana-geyser-plugin-interface = "=1.16.17"
+solana-logger = "=1.16.17"
+solana-sdk = "=1.16.17"
+solana-transaction-status = "=1.16.17"
+spl-token = { version = "=4.0.0", features = ["no-entrypoint"] }
 thiserror = "1.0.30"
 tokio = { version = "1.32.0", features = ["rt-multi-thread", "time", "macros", "io-util"] }
 zstd = "0.12.4"
@@ -57,3 +57,9 @@ vergen = { version = "8.2.1", features = ["build", "rustc"] }
 debug = true
 lto = true
 codegen-units = 1
+
+[patch.crates-io]
+solana-geyser-plugin-interface = { git = "https://github.com/rpcpool/solana-public.git", tag = "v1.16.17-geyser-block-v3" }
+solana-program = { git = "https://github.com/rpcpool/solana-public.git", tag = "v1.16.17-geyser-block-v3" }
+solana-sdk = { git = "https://github.com/rpcpool/solana-public.git", tag = "v1.16.17-geyser-block-v3" }
+solana-transaction-status = { git = "https://github.com/rpcpool/solana-public.git", tag = "v1.16.17-geyser-block-v3" }
diff --git a/src/sqs.rs b/src/sqs.rs
index da4d35f..d221c19 100644
--- a/src/sqs.rs
+++ b/src/sqs.rs
@@ -201,7 +201,10 @@ impl From<ReplicaBlockInfoVersions<'_>> for ReplicaBlockMetadata {
             ReplicaBlockInfoVersions::V0_0_1(_info) => {
                 unreachable!("ReplicaBlockInfoVersions::V0_0_1 is not supported")
             }
-            ReplicaBlockInfoVersions::V0_0_2(info) => Self {
+            ReplicaBlockInfoVersions::V0_0_2(_info) => {
+                unreachable!("ReplicaBlockInfoVersions::V0_0_2 is not supported")
+            }
+            ReplicaBlockInfoVersions::V0_0_3(info) => Self {
                 slot: info.slot,
                 block_time: info.block_time,
             },