From 4d1ecf3926b1926bbdca35abf6b2be6e773fe8b1 Mon Sep 17 00:00:00 2001 From: Godmode Galactus Date: Sat, 10 Dec 2022 16:38:51 +0100 Subject: [PATCH] updaing cargo file with the new repo compatible with lite rpc --- Cargo.lock | 368 +++++++++++++---------------------------------------- Cargo.toml | 52 ++++---- 2 files changed, 114 insertions(+), 306 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 46eaba55..e73e8fb6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -125,97 +125,6 @@ version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "983cd8b9d4b02a6dc6ffa557262eb5858a27a0038ffffe21a0f133eaa819a164" -[[package]] -name = "ark-bn254" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea691771ebbb28aea556c044e2e5c5227398d840cee0c34d4d20fa8eb2689e8c" -dependencies = [ - "ark-ec", - "ark-ff", - "ark-std", -] - -[[package]] -name = "ark-ec" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dea978406c4b1ca13c2db2373b05cc55429c3575b8b21f1b9ee859aa5b03dd42" -dependencies = [ - "ark-ff", - "ark-serialize", - "ark-std", - "derivative", - "num-traits", - "zeroize", -] - -[[package]] -name = "ark-ff" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b3235cc41ee7a12aaaf2c575a2ad7b46713a8a50bda2fc3b003a04845c05dd6" -dependencies = [ - "ark-ff-asm", - "ark-ff-macros", - "ark-serialize", - "ark-std", - "derivative", - "num-bigint 0.4.3", - "num-traits", - "paste", - "rustc_version 0.3.3", - "zeroize", -] - -[[package]] -name = "ark-ff-asm" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db02d390bf6643fb404d3d22d31aee1c4bc4459600aef9113833d17e786c6e44" -dependencies = [ - "quote 1.0.21", - "syn 1.0.103", -] - -[[package]] -name = "ark-ff-macros" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db2fd794a08ccb318058009eefdf15bcaaaaf6f8161eb3345f907222bac38b20" -dependencies = [ - "num-bigint 0.4.3", - "num-traits", - "quote 1.0.21", - "syn 1.0.103", -] - -[[package]] -name = "ark-serialize" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d6c2b318ee6e10f8c2853e73a83adc0ccb88995aa978d8a3408d492ab2ee671" -dependencies = [ - "ark-std", - "digest 0.9.0", -] - -[[package]] -name = "ark-std" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1df2c09229cbc5a028b1d70e00fdb2acee28b1055dfb5ca73eea49c5a25c4e7c" -dependencies = [ - "num-traits", - "rand 0.8.5", -] - -[[package]] -name = "array-bytes" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ad284aeb45c13f2fb4f084de4a420ebf447423bdf9386c0540ce33cb3ef4b8c" - [[package]] name = "arrayref" version = "0.3.6" @@ -1169,17 +1078,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e5c37193a1db1d8ed868c03ec7b152175f26160a5b740e5e484143877e0adf0" -[[package]] -name = "derivative" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" -dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.103", -] - [[package]] name = "derive_more" version = "0.99.17" @@ -2384,6 +2282,12 @@ dependencies = [ "cc", ] +[[package]] +name = "linked-hash-map" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + [[package]] name = "linux-raw-sys" version = "0.1.3" @@ -2974,12 +2878,6 @@ dependencies = [ "windows-sys 0.42.0", ] -[[package]] -name = "paste" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1" - [[package]] name = "pbkdf2" version = "0.4.0" @@ -3034,16 +2932,6 @@ dependencies = [ "num", ] -[[package]] -name = "pest" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f400b0f7905bf702f9f3dc3df5a121b16c54e9e8012c082905fdf09a931861a" -dependencies = [ - "thiserror", - "ucd-trie", -] - [[package]] name = "petgraph" version = "0.6.2" @@ -3644,15 +3532,6 @@ dependencies = [ "semver 0.9.0", ] -[[package]] -name = "rustc_version" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" -dependencies = [ - "semver 0.11.0", -] - [[package]] name = "rustc_version" version = "0.4.0" @@ -3829,16 +3708,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" dependencies = [ - "semver-parser 0.7.0", -] - -[[package]] -name = "semver" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" -dependencies = [ - "semver-parser 0.10.2", + "semver-parser", ] [[package]] @@ -3853,15 +3723,6 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" -[[package]] -name = "semver-parser" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" -dependencies = [ - "pest", -] - [[package]] name = "serde" version = "1.0.147" @@ -3916,15 +3777,14 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.9.14" +version = "0.8.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d232d893b10de3eb7258ff01974d6ee20663d8e833263c99409d4b13a0209da" +checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b" dependencies = [ "indexmap", - "itoa 1.0.4", "ryu", "serde", - "unsafe-libyaml", + "yaml-rust", ] [[package]] @@ -4104,7 +3964,7 @@ dependencies = [ [[package]] name = "solana-account-decoder" version = "1.15.0" -source = "git+https://github.com/solana-labs/solana.git#9327658007dd72e3eb5465c7c9f0fe0008ba27e0" +source = "git+https://github.com/blockworks-foundation/solana.git?branch=lite-rpc-compatible#624f5cfcd598a067042be251e45ac74286a5f035" dependencies = [ "Inflector", "base64 0.13.1", @@ -4127,7 +3987,7 @@ dependencies = [ [[package]] name = "solana-address-lookup-table-program" version = "1.15.0" -source = "git+https://github.com/solana-labs/solana.git#9327658007dd72e3eb5465c7c9f0fe0008ba27e0" +source = "git+https://github.com/blockworks-foundation/solana.git?branch=lite-rpc-compatible#624f5cfcd598a067042be251e45ac74286a5f035" dependencies = [ "bincode", "bytemuck", @@ -4147,7 +4007,7 @@ dependencies = [ [[package]] name = "solana-bloom" version = "1.15.0" -source = "git+https://github.com/solana-labs/solana.git#9327658007dd72e3eb5465c7c9f0fe0008ba27e0" +source = "git+https://github.com/blockworks-foundation/solana.git?branch=lite-rpc-compatible#624f5cfcd598a067042be251e45ac74286a5f035" dependencies = [ "bv", "fnv", @@ -4165,13 +4025,14 @@ dependencies = [ [[package]] name = "solana-bpf-loader-program" version = "1.15.0" -source = "git+https://github.com/solana-labs/solana.git#9327658007dd72e3eb5465c7c9f0fe0008ba27e0" +source = "git+https://github.com/blockworks-foundation/solana.git?branch=lite-rpc-compatible#624f5cfcd598a067042be251e45ac74286a5f035" dependencies = [ "bincode", "byteorder", "libsecp256k1", "log", "solana-measure", + "solana-metrics", "solana-program-runtime", "solana-sdk 1.15.0", "solana-zk-token-sdk 1.15.0", @@ -4182,7 +4043,7 @@ dependencies = [ [[package]] name = "solana-bucket-map" version = "1.15.0" -source = "git+https://github.com/solana-labs/solana.git#9327658007dd72e3eb5465c7c9f0fe0008ba27e0" +source = "git+https://github.com/blockworks-foundation/solana.git?branch=lite-rpc-compatible#624f5cfcd598a067042be251e45ac74286a5f035" dependencies = [ "log", "memmap2", @@ -4196,7 +4057,7 @@ dependencies = [ [[package]] name = "solana-clap-utils" version = "1.15.0" -source = "git+https://github.com/solana-labs/solana.git#9327658007dd72e3eb5465c7c9f0fe0008ba27e0" +source = "git+https://github.com/blockworks-foundation/solana.git?branch=lite-rpc-compatible#624f5cfcd598a067042be251e45ac74286a5f035" dependencies = [ "chrono", "clap 2.34.0", @@ -4213,7 +4074,7 @@ dependencies = [ [[package]] name = "solana-cli-config" version = "1.15.0" -source = "git+https://github.com/solana-labs/solana.git#9327658007dd72e3eb5465c7c9f0fe0008ba27e0" +source = "git+https://github.com/blockworks-foundation/solana.git?branch=lite-rpc-compatible#624f5cfcd598a067042be251e45ac74286a5f035" dependencies = [ "dirs-next", "lazy_static", @@ -4228,39 +4089,23 @@ dependencies = [ [[package]] name = "solana-client" version = "1.15.0" -source = "git+https://github.com/solana-labs/solana.git#9327658007dd72e3eb5465c7c9f0fe0008ba27e0" +source = "git+https://github.com/blockworks-foundation/solana.git?branch=lite-rpc-compatible#624f5cfcd598a067042be251e45ac74286a5f035" dependencies = [ - "async-trait", - "bincode", - "enum_dispatch", - "futures 0.3.25", - "futures-util", - "indexmap", - "indicatif", "log", - "rand 0.7.3", - "rayon", "solana-measure", - "solana-metrics", - "solana-net-utils", "solana-pubsub-client", - "solana-quic-client", "solana-rpc-client", "solana-rpc-client-api", "solana-rpc-client-nonce-utils", "solana-sdk 1.15.0", - "solana-streamer", "solana-thin-client", "solana-tpu-client", - "solana-udp-client", - "thiserror", - "tokio", ] [[package]] name = "solana-compute-budget-program" version = "1.15.0" -source = "git+https://github.com/solana-labs/solana.git#9327658007dd72e3eb5465c7c9f0fe0008ba27e0" +source = "git+https://github.com/blockworks-foundation/solana.git?branch=lite-rpc-compatible#624f5cfcd598a067042be251e45ac74286a5f035" dependencies = [ "solana-program-runtime", "solana-sdk 1.15.0", @@ -4269,7 +4114,7 @@ dependencies = [ [[package]] name = "solana-config-program" version = "1.15.0" -source = "git+https://github.com/solana-labs/solana.git#9327658007dd72e3eb5465c7c9f0fe0008ba27e0" +source = "git+https://github.com/blockworks-foundation/solana.git?branch=lite-rpc-compatible#624f5cfcd598a067042be251e45ac74286a5f035" dependencies = [ "bincode", "chrono", @@ -4282,7 +4127,7 @@ dependencies = [ [[package]] name = "solana-entry" version = "1.15.0" -source = "git+https://github.com/solana-labs/solana.git#9327658007dd72e3eb5465c7c9f0fe0008ba27e0" +source = "git+https://github.com/blockworks-foundation/solana.git?branch=lite-rpc-compatible#624f5cfcd598a067042be251e45ac74286a5f035" dependencies = [ "bincode", "crossbeam-channel", @@ -4304,7 +4149,7 @@ dependencies = [ [[package]] name = "solana-faucet" version = "1.15.0" -source = "git+https://github.com/solana-labs/solana.git#9327658007dd72e3eb5465c7c9f0fe0008ba27e0" +source = "git+https://github.com/blockworks-foundation/solana.git?branch=lite-rpc-compatible#624f5cfcd598a067042be251e45ac74286a5f035" dependencies = [ "bincode", "byteorder", @@ -4361,7 +4206,7 @@ dependencies = [ [[package]] name = "solana-frozen-abi" version = "1.15.0" -source = "git+https://github.com/solana-labs/solana.git#9327658007dd72e3eb5465c7c9f0fe0008ba27e0" +source = "git+https://github.com/blockworks-foundation/solana.git?branch=lite-rpc-compatible#624f5cfcd598a067042be251e45ac74286a5f035" dependencies = [ "ahash", "blake3", @@ -4406,7 +4251,7 @@ dependencies = [ [[package]] name = "solana-frozen-abi-macro" version = "1.15.0" -source = "git+https://github.com/solana-labs/solana.git#9327658007dd72e3eb5465c7c9f0fe0008ba27e0" +source = "git+https://github.com/blockworks-foundation/solana.git?branch=lite-rpc-compatible#624f5cfcd598a067042be251e45ac74286a5f035" dependencies = [ "proc-macro2 1.0.47", "quote 1.0.21", @@ -4417,7 +4262,7 @@ dependencies = [ [[package]] name = "solana-gossip" version = "1.15.0" -source = "git+https://github.com/solana-labs/solana.git#9327658007dd72e3eb5465c7c9f0fe0008ba27e0" +source = "git+https://github.com/blockworks-foundation/solana.git?branch=lite-rpc-compatible#624f5cfcd598a067042be251e45ac74286a5f035" dependencies = [ "bincode", "bv", @@ -4439,7 +4284,6 @@ dependencies = [ "serde_derive", "solana-bloom", "solana-clap-utils", - "solana-client", "solana-entry", "solana-frozen-abi 1.15.0", "solana-frozen-abi-macro 1.15.0", @@ -4463,7 +4307,7 @@ dependencies = [ [[package]] name = "solana-ledger" version = "1.15.0" -source = "git+https://github.com/solana-labs/solana.git#9327658007dd72e3eb5465c7c9f0fe0008ba27e0" +source = "git+https://github.com/blockworks-foundation/solana.git?branch=lite-rpc-compatible#624f5cfcd598a067042be251e45ac74286a5f035" dependencies = [ "assert_matches", "bincode", @@ -4533,7 +4377,7 @@ dependencies = [ [[package]] name = "solana-logger" version = "1.15.0" -source = "git+https://github.com/solana-labs/solana.git#9327658007dd72e3eb5465c7c9f0fe0008ba27e0" +source = "git+https://github.com/blockworks-foundation/solana.git?branch=lite-rpc-compatible#624f5cfcd598a067042be251e45ac74286a5f035" dependencies = [ "env_logger", "lazy_static", @@ -4543,7 +4387,7 @@ dependencies = [ [[package]] name = "solana-measure" version = "1.15.0" -source = "git+https://github.com/solana-labs/solana.git#9327658007dd72e3eb5465c7c9f0fe0008ba27e0" +source = "git+https://github.com/blockworks-foundation/solana.git?branch=lite-rpc-compatible#624f5cfcd598a067042be251e45ac74286a5f035" dependencies = [ "log", "solana-sdk 1.15.0", @@ -4552,7 +4396,7 @@ dependencies = [ [[package]] name = "solana-merkle-tree" version = "1.15.0" -source = "git+https://github.com/solana-labs/solana.git#9327658007dd72e3eb5465c7c9f0fe0008ba27e0" +source = "git+https://github.com/blockworks-foundation/solana.git?branch=lite-rpc-compatible#624f5cfcd598a067042be251e45ac74286a5f035" dependencies = [ "fast-math", "matches", @@ -4562,7 +4406,7 @@ dependencies = [ [[package]] name = "solana-metrics" version = "1.15.0" -source = "git+https://github.com/solana-labs/solana.git#9327658007dd72e3eb5465c7c9f0fe0008ba27e0" +source = "git+https://github.com/blockworks-foundation/solana.git?branch=lite-rpc-compatible#624f5cfcd598a067042be251e45ac74286a5f035" dependencies = [ "crossbeam-channel", "gethostname", @@ -4575,7 +4419,7 @@ dependencies = [ [[package]] name = "solana-net-utils" version = "1.15.0" -source = "git+https://github.com/solana-labs/solana.git#9327658007dd72e3eb5465c7c9f0fe0008ba27e0" +source = "git+https://github.com/blockworks-foundation/solana.git?branch=lite-rpc-compatible#624f5cfcd598a067042be251e45ac74286a5f035" dependencies = [ "bincode", "clap 3.2.23", @@ -4596,7 +4440,7 @@ dependencies = [ [[package]] name = "solana-perf" version = "1.15.0" -source = "git+https://github.com/solana-labs/solana.git#9327658007dd72e3eb5465c7c9f0fe0008ba27e0" +source = "git+https://github.com/blockworks-foundation/solana.git?branch=lite-rpc-compatible#624f5cfcd598a067042be251e45ac74286a5f035" dependencies = [ "ahash", "bincode", @@ -4622,7 +4466,7 @@ dependencies = [ [[package]] name = "solana-poh" version = "1.15.0" -source = "git+https://github.com/solana-labs/solana.git#9327658007dd72e3eb5465c7c9f0fe0008ba27e0" +source = "git+https://github.com/blockworks-foundation/solana.git?branch=lite-rpc-compatible#624f5cfcd598a067042be251e45ac74286a5f035" dependencies = [ "core_affinity", "crossbeam-channel", @@ -4689,12 +4533,8 @@ dependencies = [ [[package]] name = "solana-program" version = "1.15.0" -source = "git+https://github.com/solana-labs/solana.git#9327658007dd72e3eb5465c7c9f0fe0008ba27e0" +source = "git+https://github.com/blockworks-foundation/solana.git?branch=lite-rpc-compatible#624f5cfcd598a067042be251e45ac74286a5f035" dependencies = [ - "ark-bn254", - "ark-ec", - "ark-ff", - "array-bytes", "base64 0.13.1", "bincode", "bitflags", @@ -4741,7 +4581,7 @@ dependencies = [ [[package]] name = "solana-program-runtime" version = "1.15.0" -source = "git+https://github.com/solana-labs/solana.git#9327658007dd72e3eb5465c7c9f0fe0008ba27e0" +source = "git+https://github.com/blockworks-foundation/solana.git?branch=lite-rpc-compatible#624f5cfcd598a067042be251e45ac74286a5f035" dependencies = [ "base64 0.13.1", "bincode", @@ -4753,7 +4593,6 @@ dependencies = [ "log", "num-derive", "num-traits", - "rand 0.7.3", "rustc_version 0.4.0", "serde", "solana-frozen-abi 1.15.0", @@ -4761,14 +4600,13 @@ dependencies = [ "solana-measure", "solana-metrics", "solana-sdk 1.15.0", - "solana_rbpf", "thiserror", ] [[package]] name = "solana-pubsub-client" version = "1.15.0" -source = "git+https://github.com/solana-labs/solana.git#9327658007dd72e3eb5465c7c9f0fe0008ba27e0" +source = "git+https://github.com/blockworks-foundation/solana.git?branch=lite-rpc-compatible#624f5cfcd598a067042be251e45ac74286a5f035" dependencies = [ "crossbeam-channel", "futures-util", @@ -4789,36 +4627,10 @@ dependencies = [ "url 2.3.1", ] -[[package]] -name = "solana-quic-client" -version = "1.15.0" -source = "git+https://github.com/solana-labs/solana.git#9327658007dd72e3eb5465c7c9f0fe0008ba27e0" -dependencies = [ - "async-mutex", - "async-trait", - "futures 0.3.25", - "itertools", - "lazy_static", - "log", - "quinn", - "quinn-proto", - "quinn-udp", - "rustls", - "solana-measure", - "solana-metrics", - "solana-net-utils", - "solana-rpc-client-api", - "solana-sdk 1.15.0", - "solana-streamer", - "solana-tpu-client", - "thiserror", - "tokio", -] - [[package]] name = "solana-rayon-threadlimit" version = "1.15.0" -source = "git+https://github.com/solana-labs/solana.git#9327658007dd72e3eb5465c7c9f0fe0008ba27e0" +source = "git+https://github.com/blockworks-foundation/solana.git?branch=lite-rpc-compatible#624f5cfcd598a067042be251e45ac74286a5f035" dependencies = [ "lazy_static", "num_cpus", @@ -4827,7 +4639,7 @@ dependencies = [ [[package]] name = "solana-remote-wallet" version = "1.15.0" -source = "git+https://github.com/solana-labs/solana.git#9327658007dd72e3eb5465c7c9f0fe0008ba27e0" +source = "git+https://github.com/blockworks-foundation/solana.git?branch=lite-rpc-compatible#624f5cfcd598a067042be251e45ac74286a5f035" dependencies = [ "console", "dialoguer", @@ -4845,7 +4657,7 @@ dependencies = [ [[package]] name = "solana-rpc" version = "1.15.0" -source = "git+https://github.com/solana-labs/solana.git#9327658007dd72e3eb5465c7c9f0fe0008ba27e0" +source = "git+https://github.com/blockworks-foundation/solana.git?branch=lite-rpc-compatible#624f5cfcd598a067042be251e45ac74286a5f035" dependencies = [ "base64 0.13.1", "bincode", @@ -4867,7 +4679,6 @@ dependencies = [ "serde_json", "soketto", "solana-account-decoder", - "solana-client", "solana-entry", "solana-faucet", "solana-gossip", @@ -4899,7 +4710,7 @@ dependencies = [ [[package]] name = "solana-rpc-client" version = "1.15.0" -source = "git+https://github.com/solana-labs/solana.git#9327658007dd72e3eb5465c7c9f0fe0008ba27e0" +source = "git+https://github.com/blockworks-foundation/solana.git?branch=lite-rpc-compatible#624f5cfcd598a067042be251e45ac74286a5f035" dependencies = [ "async-trait", "base64 0.13.1", @@ -4924,7 +4735,7 @@ dependencies = [ [[package]] name = "solana-rpc-client-api" version = "1.15.0" -source = "git+https://github.com/solana-labs/solana.git#9327658007dd72e3eb5465c7c9f0fe0008ba27e0" +source = "git+https://github.com/blockworks-foundation/solana.git?branch=lite-rpc-compatible#624f5cfcd598a067042be251e45ac74286a5f035" dependencies = [ "base64 0.13.1", "bs58", @@ -4945,7 +4756,7 @@ dependencies = [ [[package]] name = "solana-rpc-client-nonce-utils" version = "1.15.0" -source = "git+https://github.com/solana-labs/solana.git#9327658007dd72e3eb5465c7c9f0fe0008ba27e0" +source = "git+https://github.com/blockworks-foundation/solana.git?branch=lite-rpc-compatible#624f5cfcd598a067042be251e45ac74286a5f035" dependencies = [ "clap 2.34.0", "solana-clap-utils", @@ -4957,7 +4768,7 @@ dependencies = [ [[package]] name = "solana-runtime" version = "1.15.0" -source = "git+https://github.com/solana-labs/solana.git#9327658007dd72e3eb5465c7c9f0fe0008ba27e0" +source = "git+https://github.com/blockworks-foundation/solana.git?branch=lite-rpc-compatible#624f5cfcd598a067042be251e45ac74286a5f035" dependencies = [ "arrayref", "bincode", @@ -4991,7 +4802,6 @@ dependencies = [ "serde", "serde_derive", "solana-address-lookup-table-program", - "solana-bpf-loader-program", "solana-bucket-map", "solana-compute-budget-program", "solana-config-program", @@ -4999,7 +4809,6 @@ dependencies = [ "solana-frozen-abi-macro 1.15.0", "solana-measure", "solana-metrics", - "solana-perf", "solana-program-runtime", "solana-rayon-threadlimit", "solana-sdk 1.15.0", @@ -5070,7 +4879,7 @@ dependencies = [ [[package]] name = "solana-sdk" version = "1.15.0" -source = "git+https://github.com/solana-labs/solana.git#9327658007dd72e3eb5465c7c9f0fe0008ba27e0" +source = "git+https://github.com/blockworks-foundation/solana.git?branch=lite-rpc-compatible#624f5cfcd598a067042be251e45ac74286a5f035" dependencies = [ "assert_matches", "base64 0.13.1", @@ -5095,7 +4904,6 @@ dependencies = [ "memmap2", "num-derive", "num-traits", - "num_enum", "pbkdf2 0.11.0", "qstring", "rand 0.7.3", @@ -5134,7 +4942,7 @@ dependencies = [ [[package]] name = "solana-sdk-macro" version = "1.15.0" -source = "git+https://github.com/solana-labs/solana.git#9327658007dd72e3eb5465c7c9f0fe0008ba27e0" +source = "git+https://github.com/blockworks-foundation/solana.git?branch=lite-rpc-compatible#624f5cfcd598a067042be251e45ac74286a5f035" dependencies = [ "bs58", "proc-macro2 1.0.47", @@ -5146,11 +4954,10 @@ dependencies = [ [[package]] name = "solana-send-transaction-service" version = "1.15.0" -source = "git+https://github.com/solana-labs/solana.git#9327658007dd72e3eb5465c7c9f0fe0008ba27e0" +source = "git+https://github.com/blockworks-foundation/solana.git?branch=lite-rpc-compatible#624f5cfcd598a067042be251e45ac74286a5f035" dependencies = [ "crossbeam-channel", "log", - "solana-client", "solana-measure", "solana-metrics", "solana-runtime", @@ -5161,21 +4968,29 @@ dependencies = [ [[package]] name = "solana-stake-program" version = "1.15.0" -source = "git+https://github.com/solana-labs/solana.git#9327658007dd72e3eb5465c7c9f0fe0008ba27e0" +source = "git+https://github.com/blockworks-foundation/solana.git?branch=lite-rpc-compatible#624f5cfcd598a067042be251e45ac74286a5f035" dependencies = [ "bincode", "log", + "num-derive", + "num-traits", "rustc_version 0.4.0", + "serde", + "serde_derive", "solana-config-program", + "solana-frozen-abi 1.15.0", + "solana-frozen-abi-macro 1.15.0", + "solana-metrics", "solana-program-runtime", "solana-sdk 1.15.0", "solana-vote-program", + "thiserror", ] [[package]] name = "solana-storage-bigtable" version = "1.15.0" -source = "git+https://github.com/solana-labs/solana.git#9327658007dd72e3eb5465c7c9f0fe0008ba27e0" +source = "git+https://github.com/blockworks-foundation/solana.git?branch=lite-rpc-compatible#624f5cfcd598a067042be251e45ac74286a5f035" dependencies = [ "backoff", "bincode", @@ -5208,7 +5023,7 @@ dependencies = [ [[package]] name = "solana-storage-proto" version = "1.15.0" -source = "git+https://github.com/solana-labs/solana.git#9327658007dd72e3eb5465c7c9f0fe0008ba27e0" +source = "git+https://github.com/blockworks-foundation/solana.git?branch=lite-rpc-compatible#624f5cfcd598a067042be251e45ac74286a5f035" dependencies = [ "bincode", "bs58", @@ -5224,7 +5039,7 @@ dependencies = [ [[package]] name = "solana-streamer" version = "1.15.0" -source = "git+https://github.com/solana-labs/solana.git#9327658007dd72e3eb5465c7c9f0fe0008ba27e0" +source = "git+https://github.com/blockworks-foundation/solana.git?branch=lite-rpc-compatible#624f5cfcd598a067042be251e45ac74286a5f035" dependencies = [ "crossbeam-channel", "futures-util", @@ -5254,7 +5069,7 @@ dependencies = [ [[package]] name = "solana-sys-tuner" version = "1.15.0" -source = "git+https://github.com/solana-labs/solana.git#9327658007dd72e3eb5465c7c9f0fe0008ba27e0" +source = "git+https://github.com/blockworks-foundation/solana.git?branch=lite-rpc-compatible#624f5cfcd598a067042be251e45ac74286a5f035" dependencies = [ "clap 2.34.0", "libc", @@ -5270,7 +5085,7 @@ dependencies = [ [[package]] name = "solana-thin-client" version = "1.15.0" -source = "git+https://github.com/solana-labs/solana.git#9327658007dd72e3eb5465c7c9f0fe0008ba27e0" +source = "git+https://github.com/blockworks-foundation/solana.git?branch=lite-rpc-compatible#624f5cfcd598a067042be251e45ac74286a5f035" dependencies = [ "bincode", "log", @@ -5283,16 +5098,25 @@ dependencies = [ [[package]] name = "solana-tpu-client" version = "1.15.0" -source = "git+https://github.com/solana-labs/solana.git#9327658007dd72e3eb5465c7c9f0fe0008ba27e0" +source = "git+https://github.com/blockworks-foundation/solana.git?branch=lite-rpc-compatible#624f5cfcd598a067042be251e45ac74286a5f035" dependencies = [ + "async-mutex", "async-trait", "bincode", + "enum_dispatch", + "futures 0.3.25", "futures-util", "indexmap", "indicatif", + "itertools", + "lazy_static", "log", + "quinn", + "quinn-proto", + "quinn-udp", "rand 0.7.3", "rayon", + "rustls", "solana-measure", "solana-metrics", "solana-net-utils", @@ -5300,6 +5124,7 @@ dependencies = [ "solana-rpc-client", "solana-rpc-client-api", "solana-sdk 1.15.0", + "solana-streamer", "thiserror", "tokio", ] @@ -5307,7 +5132,7 @@ dependencies = [ [[package]] name = "solana-transaction-status" version = "1.15.0" -source = "git+https://github.com/solana-labs/solana.git#9327658007dd72e3eb5465c7c9f0fe0008ba27e0" +source = "git+https://github.com/blockworks-foundation/solana.git?branch=lite-rpc-compatible#624f5cfcd598a067042be251e45ac74286a5f035" dependencies = [ "Inflector", "base64 0.13.1", @@ -5329,24 +5154,10 @@ dependencies = [ "thiserror", ] -[[package]] -name = "solana-udp-client" -version = "1.15.0" -source = "git+https://github.com/solana-labs/solana.git#9327658007dd72e3eb5465c7c9f0fe0008ba27e0" -dependencies = [ - "async-trait", - "solana-net-utils", - "solana-sdk 1.15.0", - "solana-streamer", - "solana-tpu-client", - "thiserror", - "tokio", -] - [[package]] name = "solana-version" version = "1.15.0" -source = "git+https://github.com/solana-labs/solana.git#9327658007dd72e3eb5465c7c9f0fe0008ba27e0" +source = "git+https://github.com/blockworks-foundation/solana.git?branch=lite-rpc-compatible#624f5cfcd598a067042be251e45ac74286a5f035" dependencies = [ "log", "rustc_version 0.4.0", @@ -5361,7 +5172,7 @@ dependencies = [ [[package]] name = "solana-vote-program" version = "1.15.0" -source = "git+https://github.com/solana-labs/solana.git#9327658007dd72e3eb5465c7c9f0fe0008ba27e0" +source = "git+https://github.com/blockworks-foundation/solana.git?branch=lite-rpc-compatible#624f5cfcd598a067042be251e45ac74286a5f035" dependencies = [ "bincode", "log", @@ -5382,7 +5193,7 @@ dependencies = [ [[package]] name = "solana-zk-token-proof-program" version = "1.15.0" -source = "git+https://github.com/solana-labs/solana.git#9327658007dd72e3eb5465c7c9f0fe0008ba27e0" +source = "git+https://github.com/blockworks-foundation/solana.git?branch=lite-rpc-compatible#624f5cfcd598a067042be251e45ac74286a5f035" dependencies = [ "bytemuck", "getrandom 0.1.16", @@ -5427,7 +5238,7 @@ dependencies = [ [[package]] name = "solana-zk-token-sdk" version = "1.15.0" -source = "git+https://github.com/solana-labs/solana.git#9327658007dd72e3eb5465c7c9f0fe0008ba27e0" +source = "git+https://github.com/blockworks-foundation/solana.git?branch=lite-rpc-compatible#624f5cfcd598a067042be251e45ac74286a5f035" dependencies = [ "aes-gcm-siv", "arrayref", @@ -5456,9 +5267,9 @@ dependencies = [ [[package]] name = "solana_rbpf" -version = "0.2.37" +version = "0.2.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0669f9f5c355899600732451c65cc717d0ef0c53717749f03520337c824fd8a1" +checksum = "334bb11faee82f0306e39944cb4ac85824b7d261f3d99d1f2f8bd09851644f0b" dependencies = [ "byteorder", "combine", @@ -6127,12 +5938,6 @@ version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" -[[package]] -name = "ucd-trie" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81" - [[package]] name = "unicase" version = "2.6.0" @@ -6209,12 +6014,6 @@ dependencies = [ "void", ] -[[package]] -name = "unsafe-libyaml" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1e5fa573d8ac5f1a856f8d7be41d390ee973daf97c806b2c1a465e4e1406e68" - [[package]] name = "untrusted" version = "0.7.1" @@ -6617,6 +6416,15 @@ dependencies = [ "libc", ] +[[package]] +name = "yaml-rust" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" +dependencies = [ + "linked-hash-map", +] + [[package]] name = "yasna" version = "0.5.0" diff --git a/Cargo.toml b/Cargo.toml index 2eb9c47a..66eaa4cd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,32 +6,32 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -solana-client = { git = "https://github.com/solana-labs/solana.git" } -solana-sdk = { git = "https://github.com/solana-labs/solana.git" } -solana-clap-utils = { git = "https://github.com/solana-labs/solana.git" } -solana-cli-config = { git = "https://github.com/solana-labs/solana.git" } -solana-pubsub-client = { git = "https://github.com/solana-labs/solana.git" } -solana-account-decoder = { git = "https://github.com/solana-labs/solana.git" } -solana-entry = { git = "https://github.com/solana-labs/solana.git" } -solana-faucet = { git = "https://github.com/solana-labs/solana.git" } -solana-gossip = { git = "https://github.com/solana-labs/solana.git" } -solana-ledger = { git = "https://github.com/solana-labs/solana.git" } -solana-measure = { git = "https://github.com/solana-labs/solana.git" } -solana-metrics = { git = "https://github.com/solana-labs/solana.git" } -solana-perf = { git = "https://github.com/solana-labs/solana.git" } -solana-poh = { git = "https://github.com/solana-labs/solana.git" } -solana-rayon-threadlimit = { git = "https://github.com/solana-labs/solana.git" } -solana-rpc-client-api = { git = "https://github.com/solana-labs/solana.git" } -solana-runtime = { git = "https://github.com/solana-labs/solana.git" } -solana-send-transaction-service = { git = "https://github.com/solana-labs/solana.git" } -solana-stake-program = { git = "https://github.com/solana-labs/solana.git" } -solana-storage-bigtable = { git = "https://github.com/solana-labs/solana.git" } -solana-streamer = { git = "https://github.com/solana-labs/solana.git" } -solana-tpu-client = { git = "https://github.com/solana-labs/solana.git" } -solana-transaction-status = { git = "https://github.com/solana-labs/solana.git" } -solana-version = { git = "https://github.com/solana-labs/solana.git" } -solana-vote-program = { git = "https://github.com/solana-labs/solana.git" } -solana-rpc = { git = "https://github.com/solana-labs/solana.git" } +solana-client = { git = "https://github.com/blockworks-foundation/solana.git", branch="lite-rpc-compatible" } +solana-sdk = { git = "https://github.com/blockworks-foundation/solana.git", branch="lite-rpc-compatible" } +solana-clap-utils = { git = "https://github.com/blockworks-foundation/solana.git", branch="lite-rpc-compatible" } +solana-cli-config = { git = "https://github.com/blockworks-foundation/solana.git", branch="lite-rpc-compatible" } +solana-pubsub-client = { git = "https://github.com/blockworks-foundation/solana.git", branch="lite-rpc-compatible" } +solana-account-decoder = { git = "https://github.com/blockworks-foundation/solana.git", branch="lite-rpc-compatible" } +solana-entry = { git = "https://github.com/blockworks-foundation/solana.git", branch="lite-rpc-compatible" } +solana-faucet = { git = "https://github.com/blockworks-foundation/solana.git", branch="lite-rpc-compatible" } +solana-gossip = { git = "https://github.com/blockworks-foundation/solana.git", branch="lite-rpc-compatible" } +solana-ledger = { git = "https://github.com/blockworks-foundation/solana.git", branch="lite-rpc-compatible" } +solana-measure = { git = "https://github.com/blockworks-foundation/solana.git", branch="lite-rpc-compatible" } +solana-metrics = { git = "https://github.com/blockworks-foundation/solana.git", branch="lite-rpc-compatible" } +solana-perf = { git = "https://github.com/blockworks-foundation/solana.git", branch="lite-rpc-compatible" } +solana-poh = { git = "https://github.com/blockworks-foundation/solana.git", branch="lite-rpc-compatible" } +solana-rayon-threadlimit = { git = "https://github.com/blockworks-foundation/solana.git", branch="lite-rpc-compatible" } +solana-rpc-client-api = { git = "https://github.com/blockworks-foundation/solana.git", branch="lite-rpc-compatible" } +solana-runtime = { git = "https://github.com/blockworks-foundation/solana.git", branch="lite-rpc-compatible" } +solana-send-transaction-service = { git = "https://github.com/blockworks-foundation/solana.git", branch="lite-rpc-compatible" } +solana-stake-program = { git = "https://github.com/blockworks-foundation/solana.git", branch="lite-rpc-compatible" } +solana-storage-bigtable = { git = "https://github.com/blockworks-foundation/solana.git", branch="lite-rpc-compatible" } +solana-streamer = { git = "https://github.com/blockworks-foundation/solana.git", branch="lite-rpc-compatible" } +solana-tpu-client = { git = "https://github.com/blockworks-foundation/solana.git", branch="lite-rpc-compatible" } +solana-transaction-status = { git = "https://github.com/blockworks-foundation/solana.git", branch="lite-rpc-compatible" } +solana-version = { git = "https://github.com/blockworks-foundation/solana.git", branch="lite-rpc-compatible" } +solana-vote-program = { git = "https://github.com/blockworks-foundation/solana.git", branch="lite-rpc-compatible" } +solana-rpc = { git = "https://github.com/blockworks-foundation/solana.git", branch="lite-rpc-compatible" } tokio = { version = "1.14.1", features = ["full"]} futures = "0.3.25"