From 3cdbeddf8ecc83f95037bc46a366ad793fd9ef04 Mon Sep 17 00:00:00 2001 From: Christian Kamm Date: Fri, 19 Nov 2021 11:59:59 +0100 Subject: [PATCH] Update solana version to 1.8.5 --- Cargo.lock | 188 ++++++++++++++++++------------ accountsdb-plugin-grpc/Cargo.toml | 8 +- connector-mango/Cargo.toml | 2 +- connector-raw/Cargo.toml | 2 +- lib/Cargo.toml | 6 +- 5 files changed, 121 insertions(+), 85 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ae1abd8..3d37c2d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -703,6 +703,17 @@ version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba" +[[package]] +name = "caps" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61bf7211aad104ce2769ec05efcdfabf85ee84ac92461d142f22cf8badd0e54c" +dependencies = [ + "errno", + "libc", + "thiserror", +] + [[package]] name = "cc" version = "1.0.72" @@ -1311,6 +1322,27 @@ dependencies = [ "termcolor", ] +[[package]] +name = "errno" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +dependencies = [ + "errno-dragonfly", + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + [[package]] name = "event-listener" version = "2.5.1" @@ -4280,9 +4312,9 @@ dependencies = [ [[package]] name = "solana-account-decoder" -version = "1.8.3" +version = "1.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35cb01a9e8093214bc68921ccb16cf5a3dabd91f6ed9122548cf3918e61c63db" +checksum = "f75f7002703ee0f9ad9871b6c2f5829bf74e1770f632913b75b8b8d32803be79" dependencies = [ "Inflector", "base64 0.12.3", @@ -4396,9 +4428,9 @@ dependencies = [ [[package]] name = "solana-accountsdb-plugin-interface" -version = "1.8.3" +version = "1.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dde1d65db0dcba1d29d1f5c0193b2b3122b1137cc95f7b13beb05aa3a1244061" +checksum = "9ff0abe6736db1324561c305e65e3a062f301cdce10d11f1686114417003499b" dependencies = [ "log 0.4.14", "thiserror", @@ -4406,9 +4438,9 @@ dependencies = [ [[package]] name = "solana-bpf-loader-program" -version = "1.8.3" +version = "1.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a61d25502e5e73cc5e811deba280f2018af05d8bcefed1a0abe79c41bdf6601e" +checksum = "f16181d85fd04fa53209ae27597c630ff312d8813639402b1ebd6d8868a20e68" dependencies = [ "bincode", "byteorder", @@ -4428,13 +4460,14 @@ dependencies = [ [[package]] name = "solana-clap-utils" -version = "1.8.3" +version = "1.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dea95a3ce40ebe5a991999a141aca4c9043002de61befcc41120d547b552aeaf" +checksum = "221d6c138089d3f55dd7ca96d61240f08011c4bd3965939791939fb612a4b6f3" dependencies = [ "chrono", "clap", "rpassword", + "solana-perf", "solana-remote-wallet", "solana-sdk", "thiserror", @@ -4445,9 +4478,9 @@ dependencies = [ [[package]] name = "solana-cli-config" -version = "1.8.3" +version = "1.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de655c4666a37c9243c43314648d8150f186b3776ec3c13807d127b204103f7" +checksum = "44bffa16600cd86d83f61c9dc95b8df8c952d5b3a771600d9aeb2c7ea9cc3567" dependencies = [ "dirs-next", "lazy_static", @@ -4459,9 +4492,9 @@ dependencies = [ [[package]] name = "solana-client" -version = "1.8.3" +version = "1.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a3e46c3389b4680dde1bbd14d69e959de9e2c0f77ceccbed031e9b411062ac1" +checksum = "64f99df9f27c5a1c30878dee056edd5906b66555bf1d3c611308d098bd3f2b59" dependencies = [ "base64 0.13.0", "bincode", @@ -4493,18 +4526,18 @@ dependencies = [ [[package]] name = "solana-compute-budget-program" -version = "1.8.3" +version = "1.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a18ee7b0318abd53af6e56872d8c27c1e66fc3d9ab61607f58fc3fe1f6c6a18" +checksum = "a3ce76ec3f5780663c39c2430daae0916cd9fb81688826dd5a634acdce2655c6" dependencies = [ "solana-sdk", ] [[package]] name = "solana-config-program" -version = "1.8.3" +version = "1.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8d8bec1e219c53c00f3771b22970ee34a274dc9ab3830bbe284f2d130faa99d" +checksum = "117d2b25301117446b8c9293fb205d9fc6659f1f9f96788764cdfc57870ed9f1" dependencies = [ "bincode", "chrono", @@ -4517,9 +4550,9 @@ dependencies = [ [[package]] name = "solana-crate-features" -version = "1.8.3" +version = "1.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a61261440cfab3f74e5acde66ad8a9bfbd9cb3c6e18c74f52a8c59901fa1702" +checksum = "a6aabd811ea101694b3b12f5d67d4b94055caebe824267eaa00af95e920fc2e4" dependencies = [ "backtrace", "bytes 0.4.12", @@ -4541,18 +4574,18 @@ dependencies = [ [[package]] name = "solana-ed25519-program" -version = "1.8.3" +version = "1.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41e8bcb610152a623ef9a0b40522492c83e9321a1faba80950cc0f5da9b288c4" +checksum = "36d050d95a9d9aa1595ea2afcaf7b5a012f54d4969a6ece6af312f19b3f4dd98" dependencies = [ "solana-sdk", ] [[package]] name = "solana-faucet" -version = "1.8.3" +version = "1.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3a874f8f6a1af2d4a8600318e9511dd54afe5f8b75392aebf2bbc046a8d4998" +checksum = "c22c2fb42ce3b3f834ea215a8e5549dcdd76db2f019c8168e1c5a973a31c5803" dependencies = [ "bincode", "byteorder", @@ -4573,9 +4606,9 @@ dependencies = [ [[package]] name = "solana-frozen-abi" -version = "1.8.3" +version = "1.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d345c0cac0bbf3b38dedcef5fe1184f1ee71c64ae20c7dd84c9435b8285daa99" +checksum = "bc1012d3d2ab907d942511eefa9e49dc411eeefda964c744ab431e5a4788decd" dependencies = [ "bs58 0.3.1", "bv", @@ -4593,9 +4626,9 @@ dependencies = [ [[package]] name = "solana-frozen-abi-macro" -version = "1.8.3" +version = "1.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b635c282ac3f3e9cb6c3d4c15a0bf4e83a406b2eb1f45a8342ee2a97ce9f302" +checksum = "2c02e8365ddbab83f2004041032a48e2b9e3b42a3fc44c318aebc96dce6bf920" dependencies = [ "proc-macro2 1.0.32", "quote 1.0.10", @@ -4605,9 +4638,9 @@ dependencies = [ [[package]] name = "solana-gossip" -version = "1.8.3" +version = "1.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d61ec15a5b2c334e5c500efc411c71f4bca2f5f925bf53781ceadae45349589" +checksum = "b6c38dbf320b9d2062f99706a2817400c907351e3c3c01aacf9b52fff86e5396" dependencies = [ "bincode", "bv", @@ -4647,9 +4680,9 @@ dependencies = [ [[package]] name = "solana-ledger" -version = "1.8.3" +version = "1.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b12e060f9da78daa7133ce784ea11cbe6bdf7f820a879ca4ba546a1499153b15" +checksum = "7d4d695606cbd0821c203c4db5cea8d09697018c7a6a8f13b8f76a1962fa8e46" dependencies = [ "bincode", "byteorder", @@ -4701,9 +4734,9 @@ dependencies = [ [[package]] name = "solana-logger" -version = "1.8.3" +version = "1.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32bcfc8060a6667a1686a1ce46fe1260ff93c0f6d49611bc188aa3013d03379" +checksum = "298885f4c7c704df17fa48ddf1a1582032e13174bc7e0e8ada57ca62740e8a98" dependencies = [ "env_logger", "lazy_static", @@ -4712,9 +4745,9 @@ dependencies = [ [[package]] name = "solana-measure" -version = "1.8.3" +version = "1.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cdf7cc16467143d7b397d3096e928e33402774c07773d73fff0e5ac93893c87" +checksum = "6b17305d54467acb3acc08bdb79f521d971f7affb767cab25675270f7e5d6d3c" dependencies = [ "log 0.4.14", "solana-metrics", @@ -4723,9 +4756,9 @@ dependencies = [ [[package]] name = "solana-merkle-tree" -version = "1.8.3" +version = "1.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0228def4cd205e57929c24efcf32e4f644c35714aa3ad9ce472c9c29301f8fad" +checksum = "4eda0d16dfc840a176da237d872f6eff7200c7f6665a510e98e0ed6606a7195e" dependencies = [ "fast-math", "matches", @@ -4734,9 +4767,9 @@ dependencies = [ [[package]] name = "solana-metrics" -version = "1.8.3" +version = "1.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b051c5baa73d826cb66b9cc9f28e105ef32a1b3ccb94fc1f3db8e4f1b2609d22" +checksum = "f4aabbe1c893f356d0a000ebe8c0d86ef5b85e76af7ac6cc28c45f20d7371dff" dependencies = [ "env_logger", "gethostname", @@ -4748,9 +4781,9 @@ dependencies = [ [[package]] name = "solana-net-utils" -version = "1.8.3" +version = "1.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed970451e7fa9ea7ca13dcb2de599a5d0722c5e7c35620d0acb2f88db437cc84" +checksum = "3e60f3184e1c5b74c7f24f6a128e91e5d013ac7c5fe899d388e809a73f145bd5" dependencies = [ "bincode", "clap", @@ -4770,16 +4803,19 @@ dependencies = [ [[package]] name = "solana-perf" -version = "1.8.3" +version = "1.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcdae9d7707a203f4ea2e9985d8701c7cedd21a935986bb5b3e68d13aea3ee0e" +checksum = "0452214f8b4bf0350dad9a6036b0e60ffe8bd18ab2efd1577d04c75fba145099" dependencies = [ "bincode", + "caps", "curve25519-dalek 2.1.3", "dlopen", "dlopen_derive", "lazy_static", + "libc", "log 0.4.14", + "nix", "rand 0.7.3", "rayon", "serde", @@ -4792,9 +4828,9 @@ dependencies = [ [[package]] name = "solana-poh" -version = "1.8.3" +version = "1.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff110ea2f17e0cfcdf00f60df3438c0e5c8d8d34b4732e40f6e7d544f59418d4" +checksum = "c153d24a5087b493d765c96cf3f2ee1f198d16ee8ba6b2923099ef53844b9828" dependencies = [ "core_affinity", "crossbeam-channel 0.4.4", @@ -4810,9 +4846,9 @@ dependencies = [ [[package]] name = "solana-program" -version = "1.8.3" +version = "1.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d40a9fca09255844607b1a730c0a2e33e5ff5755c8195d658edf0b5d4d9020e" +checksum = "d115ccafc326625e378cd8b4122a2e6a6666ad7907d165e9384a76ecbdb7b745" dependencies = [ "base64 0.13.0", "bincode", @@ -4847,9 +4883,9 @@ dependencies = [ [[package]] name = "solana-rayon-threadlimit" -version = "1.8.3" +version = "1.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3343634be85e71adeb596f249a62f911df9fba41682d687d56250801e46516e" +checksum = "2b2a52fbbc074efabca93cbed5b093fc7ae8a31d749a6287814c1001f7d4cc5e" dependencies = [ "lazy_static", "num_cpus", @@ -4857,9 +4893,9 @@ dependencies = [ [[package]] name = "solana-remote-wallet" -version = "1.8.3" +version = "1.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af8d9a910eb45f9b65c6b7f067583f90ced9dd7657d6e19b42e9cce5373bbab3" +checksum = "82b91d441ed00427226b08e9990367ecb4c952c70ab827c0250bd233e1ae9540" dependencies = [ "base32", "console 0.14.1", @@ -4878,9 +4914,9 @@ dependencies = [ [[package]] name = "solana-rpc" -version = "1.8.3" +version = "1.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5e839a8768c1aec51c6fd6471327572f7b4815ffae7b5d54da97b35b3ec4a5" +checksum = "c4f0f6c1b1dd06a49e23af9e4af76f06d36149474c4d6b23e9cad6e8bc92a3f0" dependencies = [ "base64 0.12.3", "bincode", @@ -4928,9 +4964,9 @@ dependencies = [ [[package]] name = "solana-runtime" -version = "1.8.3" +version = "1.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaecba24a2c4694a3d54851630341a92b5dabf83ecc292022aa9f10ed0d74b51" +checksum = "82c10c2984fd0dca4a4265ca5b99c3833bb813c6688b1b2ed4ace0807bdfd6f1" dependencies = [ "arrayref", "bincode", @@ -4981,9 +5017,9 @@ dependencies = [ [[package]] name = "solana-sdk" -version = "1.8.3" +version = "1.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24ef2e449c1e09cb46f3ac1572d125e0bb5f946c87bb34e277354a3edef7806d" +checksum = "35fd9c39ffa29e3ec09bc4553cf892c48df730694e546eacd378900c6a0b59f2" dependencies = [ "assert_matches", "base64 0.13.0", @@ -5034,9 +5070,9 @@ dependencies = [ [[package]] name = "solana-sdk-macro" -version = "1.8.3" +version = "1.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acdcf9dc4236e613c3f173a6de76b1e487d7e8bcc6ba1f6a761b405295fefd5f" +checksum = "91983679137d5a342cc99f56dbb418def7af5712a5edb2636d3637c897962f9b" dependencies = [ "bs58 0.3.1", "proc-macro2 1.0.32", @@ -5047,18 +5083,18 @@ dependencies = [ [[package]] name = "solana-secp256k1-program" -version = "1.8.3" +version = "1.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35b1431a07602feb955ad6995825029af7f34b1407c088bd1d0fdcdb48e6811e" +checksum = "f4f8def349f434902ab4073a7dde49a4f45673004e510c7579c234d3636f6065" dependencies = [ "solana-sdk", ] [[package]] name = "solana-stake-program" -version = "1.8.3" +version = "1.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7783771bca0c8c74ac41e8d3b7f40348ed5e797302cf16fc4e96debccd356178" +checksum = "11034c5ad850bf0993c333fde46d17441e5af156644d5aaab59e13d2130a1064" dependencies = [ "bincode", "log 0.4.14", @@ -5078,9 +5114,9 @@ dependencies = [ [[package]] name = "solana-storage-bigtable" -version = "1.8.3" +version = "1.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c986986ae7f24727726139677b59763a562ed20cfbfe139ac92dc66ad269023c" +checksum = "a090832fe9b2bd8fcfabad3e95574435f6d7b2dd1d8c9b94b97304325b9da5c3" dependencies = [ "arc-swap 0.4.8", "backoff", @@ -5107,9 +5143,9 @@ dependencies = [ [[package]] name = "solana-storage-proto" -version = "1.8.3" +version = "1.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd50ac69db9b68055c64b977b72928d66602974460496b6d137fd5a15e69c1a9" +checksum = "f237e9ad11a06bb17304793c988859654ec913c4491d5a70418f2d66db29c4c1" dependencies = [ "bincode", "bs58 0.3.1", @@ -5124,9 +5160,9 @@ dependencies = [ [[package]] name = "solana-streamer" -version = "1.8.3" +version = "1.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "249008733d515945b32fe0d6cf5e6f13f3a0369b34d2018357ea8b91227aa515" +checksum = "199d3a55367f8ceb1e40fbe707d950a151bf1b4b1643f1c1feb4df103a99bc84" dependencies = [ "itertools 0.10.1", "libc", @@ -5142,9 +5178,9 @@ dependencies = [ [[package]] name = "solana-sys-tuner" -version = "1.8.3" +version = "1.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96b9141c2353ad7120ba58ee8fbf0a9108dd498ba92fae25c7557a66e7e874fb" +checksum = "fae7eb4db152477e1bccd2c1f2928957e82e6fa9a24aa78f1a5ac6b621bee02c" dependencies = [ "clap", "libc", @@ -5160,9 +5196,9 @@ dependencies = [ [[package]] name = "solana-transaction-status" -version = "1.8.3" +version = "1.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63ba792238331049bf79c8ab040579a1efd2bbdefa27fe3ba29fd965a3fad3df" +checksum = "fc9d671057460aab1958a2adefe724bf2be02cf0d4b4a3599356d01b65d0e8ba" dependencies = [ "Inflector", "base64 0.12.3", @@ -5187,9 +5223,9 @@ dependencies = [ [[package]] name = "solana-version" -version = "1.8.3" +version = "1.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bfb96040820dd9ef95dc1be4e50d77ca129e168dfb9f8ade4e8a807a53afee6" +checksum = "e30c29cd46a42e0b58360b3d4559e943e86b281073240f978e10d99fb00fe76e" dependencies = [ "log 0.4.14", "rustc_version 0.2.3", @@ -5203,9 +5239,9 @@ dependencies = [ [[package]] name = "solana-vote-program" -version = "1.8.3" +version = "1.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3610ffd4e47d835c95503908f3a7eb8c74be792180cd6ccc33423e3fc32e88a4" +checksum = "52d4d38344e8c1c383d3a28bf6455d34f0bd48b17f8bf6684b55abf18674a632" dependencies = [ "bincode", "log 0.4.14", diff --git a/accountsdb-plugin-grpc/Cargo.toml b/accountsdb-plugin-grpc/Cargo.toml index 727a324..f636401 100644 --- a/accountsdb-plugin-grpc/Cargo.toml +++ b/accountsdb-plugin-grpc/Cargo.toml @@ -18,10 +18,10 @@ serde = "1.0.130" serde_derive = "1.0.103" serde_json = "1.0.67" -solana-accountsdb-plugin-interface = "=1.8.3" -solana-logger = "=1.8.3" -solana-metrics = "=1.8.3" -solana-sdk = "=1.8.3" +solana-accountsdb-plugin-interface = "=1.8.5" +solana-logger = "=1.8.5" +solana-metrics = "=1.8.5" +solana-sdk = "=1.8.5" tonic = "0.6" prost = "0.9" diff --git a/connector-mango/Cargo.toml b/connector-mango/Cargo.toml index 8e8b6f3..c3003e3 100644 --- a/connector-mango/Cargo.toml +++ b/connector-mango/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" [dependencies] solana-accountsdb-connector-lib = { path = "../lib" } -solana-logger = "=1.8.3" +solana-logger = "=1.8.5" log = "0.4" anyhow = "1.0" toml = "0.5" diff --git a/connector-raw/Cargo.toml b/connector-raw/Cargo.toml index 9e82836..42b5885 100644 --- a/connector-raw/Cargo.toml +++ b/connector-raw/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" [dependencies] solana-accountsdb-connector-lib = { path = "../lib" } -solana-logger = "=1.8.3" +solana-logger = "=1.8.5" log = "0.4" tokio = { version = "1", features = ["full"] } anyhow = "1.0" diff --git a/lib/Cargo.toml b/lib/Cargo.toml index 77581c6..144352c 100644 --- a/lib/Cargo.toml +++ b/lib/Cargo.toml @@ -11,10 +11,10 @@ edition = "2018" jsonrpc-core = "18.0.0" jsonrpc-core-client = { version = "18.0.0", features = ["ws", "http"] } -solana-rpc = "=1.8.3" -solana-client = "=1.8.3" +solana-rpc = "=1.8.5" +solana-client = "=1.8.5" solana-account-decoder = "1.8.2" -solana-sdk = "=1.8.3" +solana-sdk = "=1.8.5" tokio = { version = "1", features = ["full"] } tokio-stream = "0.1"