Merge remote-tracking branch 'rpcpool/v1.10'

Cargo.lock

@@ -4969,9 +4969,9 @@ dependencies = [
 
 [[package]]
 name = "solana-account-decoder"
-version = "1.10.34"
+version = "1.10.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d59ce383cb83639d5a08805f3f55201aa95b5b92fbd38075fd7745bf91dc983"
+checksum = "cb5144c8430126674afc11fb2d7812d860b8576b60f8d55cc1770a8762787d4c"
 dependencies = [
  "Inflector",
  "base64 0.13.0",
@@ -4993,9 +4993,9 @@ dependencies = [
 
 [[package]]
 name = "solana-address-lookup-table-program"
-version = "1.10.34"
+version = "1.10.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e288d49ed08c0f86d776d6e3525f4e7bd96ca5e25d5b2e583c51077a714c893b"
+checksum = "9d2d41fe6f6e52befcb9986d2da0a1b8ce3d3e33549937337f935924e09513fd"
 dependencies = [
  "bincode",
  "bytemuck",
@@ -5014,9 +5014,9 @@ dependencies = [
 
 [[package]]
 name = "solana-bloom"
-version = "1.10.34"
+version = "1.10.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ed1c856b083278f7cb5b252b1cee1fe8febff0de506e34f8e563bc6ed0e0a42"
+checksum = "4b417fc68ac85d24b26577720f351f95f6a763a1a9d1dbfd3519732627d880ab"
 dependencies = [
  "bv",
  "fnv",
@@ -5033,9 +5033,9 @@ dependencies = [
 
 [[package]]
 name = "solana-bpf-loader-program"
-version = "1.10.34"
+version = "1.10.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c45bb606cb1614ebdc4b164fe894a1d29ac6b41bb965919692c42ba4b398cee6"
+checksum = "5c235d548865070498b33555547f870bb0adfaf8f21f80b1b49b380bac897f88"
 dependencies = [
  "bincode",
  "byteorder",
@@ -5045,16 +5045,16 @@ dependencies = [
  "solana-metrics",
  "solana-program-runtime",
  "solana-sdk",
- "solana-zk-token-sdk 1.10.34",
+ "solana-zk-token-sdk",
  "solana_rbpf",
  "thiserror",
 ]
 
 [[package]]
 name = "solana-bucket-map"
-version = "1.10.34"
+version = "1.10.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55225f8bf152c97377d4e8cbb9e3d6a51fbe50fc875e7e6c64793e294a30ccc0"
+checksum = "74f945ea2c94d01b76cbbcc1a8edd89917e03a722cb527d5391fb90e53533312"
 dependencies = [
  "log 0.4.17",
  "memmap2",
@@ -5067,9 +5067,9 @@ dependencies = [
 
 [[package]]
 name = "solana-clap-utils"
-version = "1.10.34"
+version = "1.10.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7b79ccbafa22fb42d04cc59b32093ff9c43205724fe3d7f89ecc27824833fbc"
+checksum = "41c39a39251f47d0644c9e0e65b53fe9cbb879f68a8810db3997becd91a5004c"
 dependencies = [
  "chrono",
  "clap",
@@ -5085,9 +5085,9 @@ dependencies = [
 
 [[package]]
 name = "solana-cli-config"
-version = "1.10.34"
+version = "1.10.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b759f7b9fef53608fe883cd63feb32c01ce70ea8788ba72be66d553f3f61a415"
+checksum = "d79f3ed77fd9d49d36c1064f460948b9de7db081f38def534d9ed03ab31a48a6"
 dependencies = [
  "dirs-next",
  "lazy_static",
@@ -5101,9 +5101,9 @@ dependencies = [
 
 [[package]]
 name = "solana-client"
-version = "1.10.34"
+version = "1.10.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9e8f702f2fd857b9e37af9de21d335af43335416c8c5dbe0710fccd00b1c3bd"
+checksum = "fa4a2334d59d3940f49bfeeb1b52cddd3bc2fb1268d4a65ce0c55d76aafd4361"
 dependencies = [
  "async-mutex",
  "async-trait",
@@ -5156,9 +5156,9 @@ dependencies = [
 
 [[package]]
 name = "solana-compute-budget-program"
-version = "1.10.34"
+version = "1.10.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1404708102bd4a69bfcd8fd36b1c8f60ad978fe133b86eb568f16e51c83f0e1"
+checksum = "7eea0851474a6420c0fc731b09755baaa5a8f9189c797ebd1f569f1f2a5247ac"
 dependencies = [
  "solana-program-runtime",
  "solana-sdk",
@@ -5166,9 +5166,9 @@ dependencies = [
 
 [[package]]
 name = "solana-config-program"
-version = "1.10.34"
+version = "1.10.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07542a24bdedf4c3031801ce0b3782cf790a825db97538062acef6717ba4be2c"
+checksum = "4767691bf3743e3a8fa6cedfc82920140d2d9dafa9fd4aef13e644efe443d188"
 dependencies = [
  "bincode",
  "chrono",
@@ -5180,9 +5180,9 @@ dependencies = [
 
 [[package]]
 name = "solana-entry"
-version = "1.10.34"
+version = "1.10.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f51a92dbb65a7a144237b6df584cfdd1cc39611083d2c7b727989ba653297fd"
+checksum = "b182d2ac4b9ca43b7a2b6e687ea25f2cb4eea29e7105cbaa97fe3b4404580992"
 dependencies = [
  "bincode",
  "crossbeam-channel",
@@ -5202,9 +5202,9 @@ dependencies = [
 
 [[package]]
 name = "solana-faucet"
-version = "1.10.34"
+version = "1.10.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31c773aee679b10b7223262265e13830f59ea8844818a2bdd7bf3d08eea06f68"
+checksum = "e72d1e9e924b590bca1df6de3b5b05dc6a6e8001fb608a425992eabdfcfca63e"
 dependencies = [
  "bincode",
  "byteorder",
@@ -5226,9 +5226,9 @@ dependencies = [
 
 [[package]]
 name = "solana-frozen-abi"
-version = "1.10.34"
+version = "1.10.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82e98bd52827bff5f57c7dad4a42163bceba92b8a330fde2edb000976146ca26"
+checksum = "4e73830d41b18597084df1d216b997c4a7396f0eb6674b4d411c30a4ba68d189"
 dependencies = [
  "bs58 0.4.0",
  "bv",
@@ -5248,9 +5248,9 @@ dependencies = [
 
 [[package]]
 name = "solana-frozen-abi-macro"
-version = "1.10.34"
+version = "1.10.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b45334ad9c4abcc2946c4de684616bb155d5b9c4705d22de9b7fb17a902bcc58"
+checksum = "d8dbca5d2413ddb4885b9bbaa14fdb9dd134539cabda8169a51b8990ee798bf4"
 dependencies = [
  "proc-macro2 1.0.43",
  "quote 1.0.21",
@@ -5341,6 +5341,8 @@ dependencies = [
  "tokio-stream",
  "tonic 0.6.2",
  "tonic-build 0.6.2",
+ "zstd",
+ "zstd-safe",
 ]
 
 [[package]]
@@ -5357,9 +5359,9 @@ dependencies = [
 
 [[package]]
 name = "solana-geyser-plugin-interface"
-version = "1.10.34"
+version = "1.10.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aecaa3362807156deec98bcced6fa04eddef7a86bdb40ba87098ea39be53fe5d"
+checksum = "cc98399cf8e266c16f1ce603b3cc442b66e17adb2d4cefeabc30f6ac2c7cdc1e"
 dependencies = [
  "log 0.4.17",
  "solana-sdk",
@@ -5369,9 +5371,9 @@ dependencies = [
 
 [[package]]
 name = "solana-gossip"
-version = "1.10.34"
+version = "1.10.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d498f0d742d7296caa396b9e4bacf00d0ffc953016f70a4a629ae39a65fb9c4"
+checksum = "5b4a15f633ccf3a9cfdf3674e26b8d6c5f90cd35e949884e6f269ad70036ab7b"
 dependencies = [
  "bincode",
  "bv",
@@ -5414,9 +5416,9 @@ dependencies = [
 
 [[package]]
 name = "solana-ledger"
-version = "1.10.34"
+version = "1.10.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09c93d87df27dc2a8c9a5fa018d53d52f585c852c15563634a00130c075e3946"
+checksum = "88fa564d42a183383dda3ce2f0255079a8d876749ccc5c7d962755284eb52d6f"
 dependencies = [
  "bincode",
  "bitflags",
@@ -5443,6 +5445,7 @@ dependencies = [
  "serde",
  "serde_bytes",
  "sha2 0.10.2",
+ "solana-account-decoder",
  "solana-bpf-loader-program",
  "solana-entry",
  "solana-frozen-abi",
@@ -5458,6 +5461,8 @@ dependencies = [
  "solana-storage-proto",
  "solana-transaction-status",
  "solana-vote-program",
+ "spl-token",
+ "spl-token-2022",
  "tempfile",
  "thiserror",
  "tokio",
@@ -5467,9 +5472,9 @@ dependencies = [
 
 [[package]]
 name = "solana-logger"
-version = "1.10.34"
+version = "1.10.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e152dd8a83f444d101605fbd29beec3182b6e666c8c9bbd344a43d8b28b0e47f"
+checksum = "f48e928cd31684d1b9aa993e9c69dc203ce5804372930f6a5ddf0db7e3be1f94"
 dependencies = [
  "env_logger",
  "lazy_static",
@@ -5478,9 +5483,9 @@ dependencies = [
 
 [[package]]
 name = "solana-measure"
-version = "1.10.34"
+version = "1.10.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2351e8ac2d724b8f84ba88d2f3c846f196a507162840fad6b562d53485aa9a58"
+checksum = "5ff96807e4cf467a3643e47816f976adac135dacfd3fe6e90171c7ce0e9dad9b"
 dependencies = [
  "log 0.4.17",
  "solana-sdk",
@@ -5488,9 +5493,9 @@ dependencies = [
 
 [[package]]
 name = "solana-merkle-tree"
-version = "1.10.34"
+version = "1.10.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adebe1c504a5c7e43a508024e6b1f0b7ca37939976459238b7ee346cfaa61c47"
+checksum = "cf0b054463adb10001e65942c5292e364ff492d33a0b316d28ac9e8674eca4e7"
 dependencies = [
  "fast-math",
  "matches",
@@ -5499,9 +5504,9 @@ dependencies = [
 
 [[package]]
 name = "solana-metrics"
-version = "1.10.34"
+version = "1.10.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5643ed8dd7fa76f269c39e17aaccaae6393b2f9e2eae4f75fe05922fece3331a"
+checksum = "f528b6f6bf473b6f434f7c836e07fef06f075f4ae542575aae5d569f6069b787"
 dependencies = [
  "crossbeam-channel",
  "gethostname",
@@ -5513,9 +5518,9 @@ dependencies = [
 
 [[package]]
 name = "solana-net-utils"
-version = "1.10.34"
+version = "1.10.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c27db447c84cedf6aad1dbc735ea845d6828aba580ac7190d6351f3a92b2e1b6"
+checksum = "d5554713bec31030a3f237dfddac06b1777ddcc3efb9d88b44133ddf0d8154db"
 dependencies = [
  "bincode",
  "clap",
@@ -5535,9 +5540,9 @@ dependencies = [
 
 [[package]]
 name = "solana-perf"
-version = "1.10.34"
+version = "1.10.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "383c1bebdc50c0d2aa284e23ec3c8237c6df6d6a9ce6dbaea75e4be693cfee13"
+checksum = "875983b5a2230bc3388936b39bbee18841b5efff8e0de609575e7ed45fcb36fb"
 dependencies = [
  "ahash",
  "bincode",
@@ -5562,9 +5567,9 @@ dependencies = [
 
 [[package]]
 name = "solana-poh"
-version = "1.10.34"
+version = "1.10.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "daf36d556ce6594093364f30201d48a5d31f6c5781b617f57135984a00892e72"
+checksum = "7bd241ff75afe45a17d796d73bf0c6ffde1a7000841b93a95661edc6c4bcd343"
 dependencies = [
  "core_affinity",
  "crossbeam-channel",
@@ -5581,9 +5586,9 @@ dependencies = [
 
 [[package]]
 name = "solana-program"
-version = "1.10.34"
+version = "1.10.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee21d6a0e27792587baf99e024938bc63d8ec7652ef0abfadb85814d616d8862"
+checksum = "352ca385618fc739f45e98fde4b340cfd0570d3d1c31e1657a72fd71f51c6ead"
 dependencies = [
  "base64 0.13.0",
  "bincode",
@@ -5623,9 +5628,9 @@ dependencies = [
 
 [[package]]
 name = "solana-program-runtime"
-version = "1.10.34"
+version = "1.10.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72877543165c1b8618989a5ae97c47dd318554404ae667ee7cefa540bef93d49"
+checksum = "c04fa734343cd31a4fbfb8292df367816995f99db99728a748465d1a18596f9e"
 dependencies = [
  "base64 0.13.0",
  "bincode",
@@ -5647,9 +5652,9 @@ dependencies = [
 
 [[package]]
 name = "solana-rayon-threadlimit"
-version = "1.10.34"
+version = "1.10.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecdd8e58d4a190a8ee865329f5b86e28e161873cac3db578c894172f433522fe"
+checksum = "d6be1d60635644e5d49ebcc997bf41a2ba299775c4a47e6652558e1be35ca00d"
 dependencies = [
  "lazy_static",
  "num_cpus",
@@ -5657,9 +5662,9 @@ dependencies = [
 
 [[package]]
 name = "solana-remote-wallet"
-version = "1.10.34"
+version = "1.10.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03ba16d22f11a6d5007ee3fc012865986ce0c9047856fb773b58d2b2886b3cdb"
+checksum = "f5bb7538dc7ce62dcd0ba346c8d30d81c63004e592641d7df9ac57d609dda6ca"
 dependencies = [
  "console",
  "dialoguer",
@@ -5676,9 +5681,9 @@ dependencies = [
 
 [[package]]
 name = "solana-rpc"
-version = "1.10.34"
+version = "1.10.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40776694aadea3242645dbb12d1fe15c600b05100887f2fadbe0c0bc6b45dde3"
+checksum = "ac64c4c13b6792eceac97f515a898a76f16e5dd8388948e7b58b15824768f144"
 dependencies = [
  "base64 0.13.0",
  "bincode",
@@ -5728,9 +5733,9 @@ dependencies = [
 
 [[package]]
 name = "solana-runtime"
-version = "1.10.34"
+version = "1.10.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f1121f0559aaa0f9e202395a96c258da1c2318b9ae2d7edcfbbbab29fc77262"
+checksum = "53fd4514aca1b82c7f0fcb84095c040c9a633a2d24fbd6dae9f186f64ce753f4"
 dependencies = [
  "arrayref",
  "bincode",
@@ -5775,7 +5780,7 @@ dependencies = [
  "solana-stake-program",
  "solana-vote-program",
  "solana-zk-token-proof-program",
- "solana-zk-token-sdk 1.10.34",
+ "solana-zk-token-sdk",
  "strum",
  "strum_macros",
  "symlink",
@@ -5787,9 +5792,9 @@ dependencies = [
 
 [[package]]
 name = "solana-sdk"
-version = "1.10.34"
+version = "1.10.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e1865a804a5cb0870cef475c621ea6e28ea361ea6428541a3fa56131c2618f0"
+checksum = "4ebb1a97dbb9fec5ecf7618d42885a3f9e397f8618854e80d03bf5f8f80694fa"
 dependencies = [
  "assert_matches",
  "base64 0.13.0",
@@ -5838,9 +5843,9 @@ dependencies = [
 
 [[package]]
 name = "solana-sdk-macro"
-version = "1.10.34"
+version = "1.10.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79cbfc2108bbe9f02851efc7b09f11b1eb9d9331eedbdf015b8815c9adf3b7aa"
+checksum = "b65b8de75a25a8d7358b58d4a1899843f4c1e22fe5e760a4d1931adbc7975d9e"
 dependencies = [
  "bs58 0.4.0",
  "proc-macro2 1.0.43",
@@ -5851,9 +5856,9 @@ dependencies = [
 
 [[package]]
 name = "solana-send-transaction-service"
-version = "1.10.34"
+version = "1.10.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3334f6112d604c3de9730e8cc7935c05a759eabb3f39c2ef90e1e6f82bf9760f"
+checksum = "2c8d450a4f94c0e5967e356f0647c292b4e06117636dba8f6bd10469063fe8c7"
 dependencies = [
  "crossbeam-channel",
  "log 0.4.17",
@@ -5866,9 +5871,9 @@ dependencies = [
 
 [[package]]
 name = "solana-stake-program"
-version = "1.10.34"
+version = "1.10.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6270ec01d96cd5396dc6576ec9bc588a377ec31528997562a345cbf4e2321369"
+checksum = "4773d42d25dc8253fcd50c7b17686b72d4f7e1a02b6c440a3bdc1c93645d7f7b"
 dependencies = [
  "bincode",
  "log 0.4.17",
@@ -5889,9 +5894,9 @@ dependencies = [
 
 [[package]]
 name = "solana-storage-bigtable"
-version = "1.10.34"
+version = "1.10.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "936400b991dd293eededc924b13b89c9c02b7fb5b0a9421cf1ece9baee05dc45"
+checksum = "b284a6ab0cb250656d8c8e5524ae3203c4f6471ef592297a6ed441dbd1ca724b"
 dependencies = [
  "backoff",
  "bincode",
@@ -5923,9 +5928,9 @@ dependencies = [
 
 [[package]]
 name = "solana-storage-proto"
-version = "1.10.34"
+version = "1.10.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d3f2b0a5e666f92c9ef4d573f1c5418098aa0d615995dbf2b07cec0c6569c56"
+checksum = "d675226e7a7e7921dd317e0c50d088d573718042ae2378c8f204912659db9910"
 dependencies = [
  "bincode",
  "bs58 0.4.0",
@@ -5939,9 +5944,9 @@ dependencies = [
 
 [[package]]
 name = "solana-streamer"
-version = "1.10.34"
+version = "1.10.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3897750f1ed02de72bfc2696b0a2123b8f6ff7ab28436a363492b153404d6c6a"
+checksum = "dfe086ff7dee82d8762e81a37350df7b9669eeaea8ebc4feeddeefe9ae9cfbe4"
 dependencies = [
  "crossbeam-channel",
  "futures-util",
@@ -5968,9 +5973,9 @@ dependencies = [
 
 [[package]]
 name = "solana-sys-tuner"
-version = "1.10.34"
+version = "1.10.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b229d2674fc48747546b319987a942a6ad52313c9d4fba9b626692863c872db1"
+checksum = "da22612af8636dd15a53d055d0b66298c1f076202a0f94584f65b440ed73dcca"
 dependencies = [
  "clap",
  "libc",
@@ -5985,9 +5990,9 @@ dependencies = [
 
 [[package]]
 name = "solana-transaction-status"
-version = "1.10.34"
+version = "1.10.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12f05d50c02df3bbde97962aebe51e749218b732a36cebc2e1dd95b887b3e937"
+checksum = "82733ac4a3298ace97281dcdd20bb000e9c19458789f7b0c269556446eb0c453"
 dependencies = [
  "Inflector",
  "base64 0.13.0",
@@ -6002,7 +6007,6 @@ dependencies = [
  "solana-account-decoder",
  "solana-measure",
  "solana-metrics",
- "solana-runtime",
  "solana-sdk",
  "solana-vote-program",
  "spl-associated-token-account",
@@ -6014,9 +6018,9 @@ dependencies = [
 
 [[package]]
 name = "solana-version"
-version = "1.10.34"
+version = "1.10.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1546721c034a8bfddb357d3ef87dc35845a8eef5922b0d912103b86adb88c2b0"
+checksum = "d2c4eed14a3bab6fc8c12a95891496f9c53db7fb4f891943d7c271725ea79afb"
 dependencies = [
  "log 0.4.17",
  "rustc_version 0.4.0",
@@ -6030,9 +6034,9 @@ dependencies = [
 
 [[package]]
 name = "solana-vote-program"
-version = "1.10.34"
+version = "1.10.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91a788d387a2daadf1e5f2278e62a1303b3901145ec000ae8483ad6d8aa9830e"
+checksum = "22a6f3cd2673ba295354cdebaf74d8ab2b89a37f79e1e462026ae73b5cc0fd5d"
 dependencies = [
  "bincode",
  "log 0.4.17",
@@ -6051,9 +6055,9 @@ dependencies = [
 
 [[package]]
 name = "solana-zk-token-proof-program"
-version = "1.10.34"
+version = "1.10.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15a628c868557c5b546fc75d4418201ec14b9530d90d967faac5b5826761ac7f"
+checksum = "42b029edc2f22f48e8e02c3b4cd80e3b88aec3a09af6971e61dd1f09c721e5ad"
 dependencies = [
  "bytemuck",
  "getrandom 0.1.16",
@@ -6061,44 +6065,14 @@ dependencies = [
  "num-traits",
  "solana-program-runtime",
  "solana-sdk",
- "solana-zk-token-sdk 1.10.34",
+ "solana-zk-token-sdk",
 ]
 
 [[package]]
 name = "solana-zk-token-sdk"
-version = "0.8.1"
+version = "1.10.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74b149253f9ed1afb68b3161b53b62b637d0dd7a3b328dffdc8bb5878d48358e"
-dependencies = [
- "aes-gcm-siv",
- "arrayref",
- "base64 0.13.0",
- "bincode",
- "bytemuck",
- "byteorder",
- "cipher 0.3.0",
- "curve25519-dalek",
- "getrandom 0.1.16",
- "lazy_static",
- "merlin",
- "num-derive",
- "num-traits",
- "rand 0.7.3",
- "serde",
- "serde_json",
- "sha3 0.9.1",
- "solana-program",
- "solana-sdk",
- "subtle",
- "thiserror",
- "zeroize",
-]
-
-[[package]]
-name = "solana-zk-token-sdk"
-version = "1.10.34"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d84ccefe3a0f9d27e50e50755e17bb5928d8f4fd53a33ccb844497f1259ce261"
+checksum = "6049c87802e1d91d0d5a9b027a1ab1d6e70e97a9bec331661bd556f795674aa8"
 dependencies = [
  "aes-gcm-siv",
  "arrayref",
@@ -6167,13 +6141,18 @@ dependencies = [
 
 [[package]]
 name = "spl-associated-token-account"
-version = "1.0.5"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b013067447a1396303ddfc294f36e3d260a32f8a16c501c295bcdc7de39b490"
+checksum = "16a33ecc83137583902c3e13c02f34151c8b2f2b74120f9c2b3ff841953e083d"
 dependencies = [
+ "assert_matches",
  "borsh",
+ "num-derive",
+ "num-traits",
  "solana-program",
  "spl-token",
+ "spl-token-2022",
+ "thiserror",
 ]
 
 [[package]]
@@ -6187,9 +6166,9 @@ dependencies = [
 
 [[package]]
 name = "spl-token"
-version = "3.3.1"
+version = "3.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32d05653bed5932064a287340dbc8a3cb298ee717e5c7ec3353d7cdb9f8fb7e1"
+checksum = "8e85e168a785e82564160dcb87b2a8e04cee9bfd1f4d488c729d53d6a4bd300d"
 dependencies = [
  "arrayref",
  "bytemuck",
@@ -6202,9 +6181,9 @@ dependencies = [
 
 [[package]]
 name = "spl-token-2022"
-version = "0.2.0"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fce48c69350134e8678de5c0956a531b7de586b28eebdddc03211ceec0660983"
+checksum = "f0a97cbf60b91b610c846ccf8eecca96d92a24a19ffbf9fe06cd0c84e76ec45e"
 dependencies = [
  "arrayref",
  "bytemuck",
@@ -6212,7 +6191,7 @@ dependencies = [
  "num-traits",
  "num_enum",
  "solana-program",
- "solana-zk-token-sdk 0.8.1",
+ "solana-zk-token-sdk",
  "spl-memo",
  "spl-token",
  "thiserror",
@@ -6878,6 +6857,7 @@ dependencies = [
  "async-trait",
  "base64 0.13.0",
  "bytes 1.2.1",
+ "flate2 1.0.24",
  "futures-core",
  "futures-util",
  "h2",

connector-mango/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2018"
 
 [dependencies]
 solana-geyser-connector-lib = { path = "../lib" }
-solana-logger = ">=1.10.35"
+solana-logger = "=1.10.35"
 log = "0.4"
 anyhow = "1.0"
 toml = "0.5"

connector-raw/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2018"
 
 [dependencies]
 solana-geyser-connector-lib = { path = "../lib" }
-solana-logger = ">=1.10.0"
+solana-logger = "=1.10.35"
 log = "0.4"
 tokio = { version = "1", features = ["full"] }
 anyhow = "1.0"

geyser-plugin-grpc/Cargo.toml

@@ -1,3 +1,4 @@
+
 [package]
 name = "solana-geyser-connector-plugin-grpc"
 version = "0.1.0"
@@ -23,7 +24,7 @@ solana-logger = "=1.10.35"
 solana-metrics = "=1.10.35"
 solana-sdk = "=1.10.35"
 
-tonic = "0.6"
+tonic = { version = "0.6", features = ["compression"] }
 prost = "0.9"
 futures-core = "0.3"
 futures-util = "0.3"
@@ -32,9 +33,10 @@ tokio-stream = "0.1"
 
 async-stream = "0.2"
 rand = "0.8"
-
+zstd = "0.11.2"
+zstd-safe = "5.0.2"
 [build-dependencies]
-tonic-build = "0.6"
+tonic-build = { version = "0.6", features = ["compression"] }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

geyser-plugin-grpc/src/compression.rs

@@ -0,0 +1,41 @@
+use std::io::{Read, Write};
+
+pub fn zstd_compress(data: &[u8]) -> Result<Vec<u8>, std::io::Error> {
+    let mut encoder = zstd::stream::write::Encoder::new(Vec::new(), 0).unwrap();
+    encoder.write_all(data)?;
+    encoder.finish()
+}
+
+pub fn zstd_decompress(data: &[u8], uncompressed: &mut Vec<u8>) -> Result<usize, std::io::Error> {
+    let mut decoder = zstd::stream::read::Decoder::new(data).unwrap();
+    decoder.read_to_end(uncompressed)
+}
+
+pub(crate) mod tests {
+    use super::*;
+    #[test]
+    fn test_zstd_compression() {
+        let data = vec![100; 256]; //sample data, 256 bytes of val 100.
+        println!("Uncompressed Data = {:?}", data);
+
+        match zstd_compress(&data) {
+            Ok(compressed) => {
+                println!("Compressed Data = {:?}\n", compressed);
+
+                let mut uncompressed: Vec<u8> = Vec::new();
+
+                match zstd_decompress(&compressed, &mut uncompressed) {
+                    Ok(_) => {
+                        println!("Uncompressed Data = {:?}\n", uncompressed);
+                    }
+                    Err(e) => {
+                        println!("Error = {:?}", e);
+                    }
+                }
+            }
+            Err(e) => {
+                println!("Error compressing Data {:?}", e);
+            }
+        }
+    }
+}

geyser-plugin-grpc/src/geyser_plugin_grpc.rs

@@ -1,5 +1,8 @@
+use crate::compression::zstd_compress;
+
 use {
     crate::accounts_selector::AccountsSelector,
+    crate::compression,
     bs58,
     geyser_proto::{
         slot_update::Status as SlotUpdateStatus, update::UpdateOneof, AccountWrite, Ping,
@@ -113,6 +116,7 @@ pub struct PluginData {
     /// Needed to catch writes that signal account closure, where
     /// lamports=0 and owner=system-program.
     active_accounts: RwLock<HashSet<[u8; 32]>>,
+    zstd_compression: bool,
 }
 
 #[derive(Default)]
@@ -131,6 +135,7 @@ impl std::fmt::Debug for Plugin {
 pub struct PluginConfig {
     pub bind_address: String,
     pub service_config: geyser_service::ServiceConfig,
+    pub zstd_compression: bool,
 }
 
 impl PluginData {
@@ -182,10 +187,13 @@ impl GeyserPlugin for Plugin {
         let highest_write_slot = Arc::new(AtomicU64::new(0));
         let service =
             geyser_service::Service::new(config.service_config, highest_write_slot.clone());
+
         let (server_exit_sender, mut server_exit_receiver) = broadcast::channel::<()>(1);
         let server_broadcast = service.sender.clone();
 
-        let server = geyser_proto::accounts_db_server::AccountsDbServer::new(service);
+        let server = geyser_proto::accounts_db_server::AccountsDbServer::new(service)
+            .accept_gzip()
+            .send_gzip();
         let runtime = tokio::runtime::Runtime::new().unwrap();
         runtime.spawn(Server::builder().add_service(server).serve_with_shutdown(
             addr,
@@ -216,6 +224,7 @@ impl GeyserPlugin for Plugin {
             accounts_selector,
             highest_write_slot,
             active_accounts: RwLock::new(HashSet::new()),
+            zstd_compression: config.zstd_compression,
         });
 
         Ok(())
@@ -282,6 +291,21 @@ impl GeyserPlugin for Plugin {
                     slot,
                 );
 
+                let mut account_data = account.data.to_vec();
+
+                //zstd compress if enabled.
+                if data.zstd_compression {
+                    match zstd_compress(&account_data) {
+                        Ok(res) => account_data = res,
+                        Err(e) => {
+                            println!(
+                                "zstd_decompress compression failed = {:?} , using original data.",
+                                e
+                            );
+                        }
+                    }
+                }
+
                 data.broadcast(UpdateOneof::AccountWrite(AccountWrite {
                     slot,
                     is_startup,
@@ -291,7 +315,7 @@ impl GeyserPlugin for Plugin {
                     owner: account.owner.to_vec(),
                     executable: account.executable,
                     rent_epoch: account.rent_epoch,
-                    data: account.data.to_vec(),
+                    data: account_data,
                     is_selected,
                 }));
             }
@@ -374,6 +398,8 @@ pub unsafe extern "C" fn _create_plugin() -> *mut dyn GeyserPlugin {
 
 #[cfg(test)]
 pub(crate) mod tests {
+    use std::io::Write;
+
     use {super::*, serde_json};
 
     #[test]

geyser-plugin-grpc/src/lib.rs

@@ -1,2 +1,3 @@
 pub mod accounts_selector;
+pub mod compression;
 pub mod geyser_plugin_grpc;