blockworks-foundation
/
mango-simulation
mirror of https://github.com/blockworks-foundation/mango-simulation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#6 solving merge conflicts

This commit is contained in:
Godmode Galactus 2022-11-22 23:09:46 +01:00
parent c91147c363
commit d2f9961bac
No known key found for this signature in database
GPG Key ID: A04142C71ABB0DEA
4 changed files with 256 additions and 247 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@ -4,4 +4,4 @@
[submodule "deps/solana"] [submodule "deps/solana"]
path = deps/solana path = deps/solana
url = https://github.com/solana-labs/solana url = https://github.com/solana-labs/solana
branch = v1.11.10 branch = v1.14.7

294
Cargo.lock generated
View File

@ -4496,7 +4496,7 @@ dependencies = [
[[package]] [[package]]
name = "solana-account-decoder" name = "solana-account-decoder"
version = "1.14.3" version = "1.14.7"
dependencies = [ dependencies = [
"Inflector", "Inflector",
"base64 0.13.0", "base64 0.13.0",
@ -4507,8 +4507,9 @@ dependencies = [
"serde", "serde",
"serde_derive", "serde_derive",
"serde_json", "serde_json",
"solana-address-lookup-table-program",
"solana-config-program", "solana-config-program",
"solana-sdk 1.14.3", "solana-sdk 1.14.7",
"solana-vote-program", "solana-vote-program",
"spl-token", "spl-token",
"spl-token-2022", "spl-token-2022",
@ -4518,7 +4519,7 @@ dependencies = [
[[package]] [[package]]
name = "solana-address-lookup-table-program" name = "solana-address-lookup-table-program"
version = "1.14.3" version = "1.14.7"
dependencies = [ dependencies = [
"bincode", "bincode",
"bytemuck", "bytemuck",
@ -4527,23 +4528,23 @@ dependencies = [
"num-traits", "num-traits",
"rustc_version 0.4.0", "rustc_version 0.4.0",
"serde", "serde",
"solana-frozen-abi 1.14.3", "solana-frozen-abi 1.14.7",
"solana-frozen-abi-macro 1.14.3", "solana-frozen-abi-macro 1.14.7",
"solana-program 1.14.3", "solana-program 1.14.7",
"solana-program-runtime", "solana-program-runtime",
"solana-sdk 1.14.3", "solana-sdk 1.14.7",
"thiserror", "thiserror",
] ]
[[package]] [[package]]
name = "solana-banks-client" name = "solana-banks-client"
version = "1.14.3" version = "1.14.7"
dependencies = [ dependencies = [
"borsh", "borsh",
"futures 0.3.24", "futures 0.3.24",
"solana-banks-interface", "solana-banks-interface",
"solana-program 1.14.3", "solana-program 1.14.7",
"solana-sdk 1.14.3", "solana-sdk 1.14.7",
"tarpc", "tarpc",
"thiserror", "thiserror",
"tokio", "tokio",
@ -4552,16 +4553,16 @@ dependencies = [
[[package]] [[package]]
name = "solana-banks-interface" name = "solana-banks-interface"
version = "1.14.3" version = "1.14.7"
dependencies = [ dependencies = [
"serde", "serde",
"solana-sdk 1.14.3", "solana-sdk 1.14.7",
"tarpc", "tarpc",
] ]
[[package]] [[package]]
name = "solana-banks-server" name = "solana-banks-server"
version = "1.14.3" version = "1.14.7"
dependencies = [ dependencies = [
"bincode", "bincode",
"crossbeam-channel", "crossbeam-channel",
@ -4569,7 +4570,7 @@ dependencies = [
"solana-banks-interface", "solana-banks-interface",
"solana-client", "solana-client",
"solana-runtime", "solana-runtime",
"solana-sdk 1.14.3", "solana-sdk 1.14.7",
"solana-send-transaction-service", "solana-send-transaction-service",
"tarpc", "tarpc",
"tokio", "tokio",
@ -4608,14 +4609,14 @@ dependencies = [
"solana-genesis", "solana-genesis",
"solana-gossip", "solana-gossip",
"solana-local-cluster", "solana-local-cluster",
"solana-logger 1.14.3", "solana-logger 1.14.7",
"solana-measure", "solana-measure",
"solana-metrics", "solana-metrics",
"solana-net-utils", "solana-net-utils",
"solana-program 1.10.38", "solana-program 1.10.38",
"solana-rpc", "solana-rpc",
"solana-runtime", "solana-runtime",
"solana-sdk 1.14.3", "solana-sdk 1.14.7",
"solana-streamer", "solana-streamer",
"solana-test-validator", "solana-test-validator",
"solana-transaction-status", "solana-transaction-status",
@ -4625,7 +4626,7 @@ dependencies = [
[[package]] [[package]]
name = "solana-bench-tps" name = "solana-bench-tps"
version = "1.14.3" version = "1.14.7"
dependencies = [ dependencies = [
"clap 2.34.0", "clap 2.34.0",
"crossbeam-channel", "crossbeam-channel",
@ -4640,13 +4641,13 @@ dependencies = [
"solana-faucet", "solana-faucet",
"solana-genesis", "solana-genesis",
"solana-gossip", "solana-gossip",
"solana-logger 1.14.3", "solana-logger 1.14.7",
"solana-measure", "solana-measure",
"solana-metrics", "solana-metrics",
"solana-net-utils", "solana-net-utils",
"solana-rpc", "solana-rpc",
"solana-runtime", "solana-runtime",
"solana-sdk 1.14.3", "solana-sdk 1.14.7",
"solana-streamer", "solana-streamer",
"solana-version", "solana-version",
"thiserror", "thiserror",
@ -4654,7 +4655,7 @@ dependencies = [
[[package]] [[package]]
name = "solana-bloom" name = "solana-bloom"
version = "1.14.3" version = "1.14.7"
dependencies = [ dependencies = [
"bv", "bv",
"fnv", "fnv",
@ -4664,14 +4665,14 @@ dependencies = [
"rustc_version 0.4.0", "rustc_version 0.4.0",
"serde", "serde",
"serde_derive", "serde_derive",
"solana-frozen-abi 1.14.3", "solana-frozen-abi 1.14.7",
"solana-frozen-abi-macro 1.14.3", "solana-frozen-abi-macro 1.14.7",
"solana-sdk 1.14.3", "solana-sdk 1.14.7",
] ]
[[package]] [[package]]
name = "solana-bpf-loader-program" name = "solana-bpf-loader-program"
version = "1.14.3" version = "1.14.7"
dependencies = [ dependencies = [
"bincode", "bincode",
"byteorder", "byteorder",
@ -4680,35 +4681,35 @@ dependencies = [
"solana-measure", "solana-measure",
"solana-metrics", "solana-metrics",
"solana-program-runtime", "solana-program-runtime",
"solana-sdk 1.14.3", "solana-sdk 1.14.7",
"solana-zk-token-sdk 1.14.3", "solana-zk-token-sdk 1.14.7",
"solana_rbpf", "solana_rbpf",
"thiserror", "thiserror",
] ]
[[package]] [[package]]
name = "solana-bucket-map" name = "solana-bucket-map"
version = "1.14.3" version = "1.14.7"
dependencies = [ dependencies = [
"log", "log",
"memmap2", "memmap2",
"modular-bitfield", "modular-bitfield",
"rand 0.7.3", "rand 0.7.3",
"solana-measure", "solana-measure",
"solana-sdk 1.14.3", "solana-sdk 1.14.7",
"tempfile", "tempfile",
] ]
[[package]] [[package]]
name = "solana-clap-utils" name = "solana-clap-utils"
version = "1.14.3" version = "1.14.7"
dependencies = [ dependencies = [
"chrono", "chrono",
"clap 2.34.0", "clap 2.34.0",
"rpassword", "rpassword",
"solana-perf", "solana-perf",
"solana-remote-wallet", "solana-remote-wallet",
"solana-sdk 1.14.3", "solana-sdk 1.14.7",
"thiserror", "thiserror",
"tiny-bip39", "tiny-bip39",
"uriparse", "uriparse",
@ -4717,7 +4718,7 @@ dependencies = [
[[package]] [[package]]
name = "solana-cli-config" name = "solana-cli-config"
version = "1.14.3" version = "1.14.7"
dependencies = [ dependencies = [
"dirs-next", "dirs-next",
"lazy_static", "lazy_static",
@ -4725,13 +4726,13 @@ dependencies = [
"serde_derive", "serde_derive",
"serde_yaml", "serde_yaml",
"solana-clap-utils", "solana-clap-utils",
"solana-sdk 1.14.3", "solana-sdk 1.14.7",
"url 2.2.2", "url 2.2.2",
] ]
[[package]] [[package]]
name = "solana-cli-output" name = "solana-cli-output"
version = "1.14.3" version = "1.14.7"
dependencies = [ dependencies = [
"Inflector", "Inflector",
"base64 0.13.0", "base64 0.13.0",
@ -4748,7 +4749,7 @@ dependencies = [
"solana-clap-utils", "solana-clap-utils",
"solana-cli-config", "solana-cli-config",
"solana-client", "solana-client",
"solana-sdk 1.14.3", "solana-sdk 1.14.7",
"solana-transaction-status", "solana-transaction-status",
"solana-vote-program", "solana-vote-program",
"spl-memo", "spl-memo",
@ -4756,7 +4757,7 @@ dependencies = [
[[package]] [[package]]
name = "solana-client" name = "solana-client"
version = "1.14.3" version = "1.14.7"
dependencies = [ dependencies = [
"async-mutex", "async-mutex",
"async-trait", "async-trait",
@ -4792,7 +4793,7 @@ dependencies = [
"solana-measure", "solana-measure",
"solana-metrics", "solana-metrics",
"solana-net-utils", "solana-net-utils",
"solana-sdk 1.14.3", "solana-sdk 1.14.7",
"solana-streamer", "solana-streamer",
"solana-transaction-status", "solana-transaction-status",
"solana-version", "solana-version",
@ -4808,27 +4809,27 @@ dependencies = [
[[package]] [[package]]
name = "solana-compute-budget-program" name = "solana-compute-budget-program"
version = "1.14.3" version = "1.14.7"
dependencies = [ dependencies = [
"solana-program-runtime", "solana-program-runtime",
"solana-sdk 1.14.3", "solana-sdk 1.14.7",
] ]
[[package]] [[package]]
name = "solana-config-program" name = "solana-config-program"
version = "1.14.3" version = "1.14.7"
dependencies = [ dependencies = [
"bincode", "bincode",
"chrono", "chrono",
"serde", "serde",
"serde_derive", "serde_derive",
"solana-program-runtime", "solana-program-runtime",
"solana-sdk 1.14.3", "solana-sdk 1.14.7",
] ]
[[package]] [[package]]
name = "solana-core" name = "solana-core"
version = "1.14.3" version = "1.14.7"
dependencies = [ dependencies = [
"ahash", "ahash",
"base64 0.13.0", "base64 0.13.0",
@ -4846,6 +4847,7 @@ dependencies = [
"log", "log",
"lru", "lru",
"min-max-heap", "min-max-heap",
"num_enum",
"rand 0.7.3", "rand 0.7.3",
"rand_chacha 0.2.2", "rand_chacha 0.2.2",
"rayon", "rayon",
@ -4856,8 +4858,8 @@ dependencies = [
"solana-bloom", "solana-bloom",
"solana-client", "solana-client",
"solana-entry", "solana-entry",
"solana-frozen-abi 1.14.3", "solana-frozen-abi 1.14.7",
"solana-frozen-abi-macro 1.14.3", "solana-frozen-abi-macro 1.14.7",
"solana-geyser-plugin-manager", "solana-geyser-plugin-manager",
"solana-gossip", "solana-gossip",
"solana-ledger", "solana-ledger",
@ -4870,7 +4872,7 @@ dependencies = [
"solana-rayon-threadlimit", "solana-rayon-threadlimit",
"solana-rpc", "solana-rpc",
"solana-runtime", "solana-runtime",
"solana-sdk 1.14.3", "solana-sdk 1.14.7",
"solana-send-transaction-service", "solana-send-transaction-service",
"solana-streamer", "solana-streamer",
"solana-transaction-status", "solana-transaction-status",
@ -4886,7 +4888,7 @@ dependencies = [
[[package]] [[package]]
name = "solana-entry" name = "solana-entry"
version = "1.14.3" version = "1.14.7"
dependencies = [ dependencies = [
"bincode", "bincode",
"crossbeam-channel", "crossbeam-channel",
@ -4902,12 +4904,12 @@ dependencies = [
"solana-metrics", "solana-metrics",
"solana-perf", "solana-perf",
"solana-rayon-threadlimit", "solana-rayon-threadlimit",
"solana-sdk 1.14.3", "solana-sdk 1.14.7",
] ]
[[package]] [[package]]
name = "solana-faucet" name = "solana-faucet"
version = "1.14.3" version = "1.14.7"
dependencies = [ dependencies = [
"bincode", "bincode",
"byteorder", "byteorder",
@ -4918,9 +4920,9 @@ dependencies = [
"serde_derive", "serde_derive",
"solana-clap-utils", "solana-clap-utils",
"solana-cli-config", "solana-cli-config",
"solana-logger 1.14.3", "solana-logger 1.14.7",
"solana-metrics", "solana-metrics",
"solana-sdk 1.14.3", "solana-sdk 1.14.7",
"solana-version", "solana-version",
"spl-memo", "spl-memo",
"thiserror", "thiserror",
@ -4951,7 +4953,7 @@ dependencies = [
[[package]] [[package]]
name = "solana-frozen-abi" name = "solana-frozen-abi"
version = "1.14.3" version = "1.14.7"
dependencies = [ dependencies = [
"ahash", "ahash",
"blake3", "blake3",
@ -4976,7 +4978,7 @@ dependencies = [
"serde_derive", "serde_derive",
"serde_json", "serde_json",
"sha2 0.10.3", "sha2 0.10.3",
"solana-frozen-abi-macro 1.14.3", "solana-frozen-abi-macro 1.14.7",
"subtle", "subtle",
"thiserror", "thiserror",
] ]
@ -4995,7 +4997,7 @@ dependencies = [
[[package]] [[package]]
name = "solana-frozen-abi-macro" name = "solana-frozen-abi-macro"
version = "1.14.3" version = "1.14.7"
dependencies = [ dependencies = [
"proc-macro2 1.0.43", "proc-macro2 1.0.43",
"quote 1.0.21", "quote 1.0.21",
@ -5005,7 +5007,7 @@ dependencies = [
[[package]] [[package]]
name = "solana-genesis" name = "solana-genesis"
version = "1.14.3" version = "1.14.7"
dependencies = [ dependencies = [
"base64 0.13.0", "base64 0.13.0",
"clap 2.34.0", "clap 2.34.0",
@ -5016,9 +5018,9 @@ dependencies = [
"solana-cli-config", "solana-cli-config",
"solana-entry", "solana-entry",
"solana-ledger", "solana-ledger",
"solana-logger 1.14.3", "solana-logger 1.14.7",
"solana-runtime", "solana-runtime",
"solana-sdk 1.14.3", "solana-sdk 1.14.7",
"solana-stake-program", "solana-stake-program",
"solana-version", "solana-version",
"solana-vote-program", "solana-vote-program",
@ -5027,17 +5029,17 @@ dependencies = [
[[package]] [[package]]
name = "solana-geyser-plugin-interface" name = "solana-geyser-plugin-interface"
version = "1.14.3" version = "1.14.7"
dependencies = [ dependencies = [
"log", "log",
"solana-sdk 1.14.3", "solana-sdk 1.14.7",
"solana-transaction-status", "solana-transaction-status",
"thiserror", "thiserror",
] ]
[[package]] [[package]]
name = "solana-geyser-plugin-manager" name = "solana-geyser-plugin-manager"
version = "1.14.3" version = "1.14.7"
dependencies = [ dependencies = [
"bs58 0.4.0", "bs58 0.4.0",
"crossbeam-channel", "crossbeam-channel",
@ -5050,14 +5052,14 @@ dependencies = [
"solana-metrics", "solana-metrics",
"solana-rpc", "solana-rpc",
"solana-runtime", "solana-runtime",
"solana-sdk 1.14.3", "solana-sdk 1.14.7",
"solana-transaction-status", "solana-transaction-status",
"thiserror", "thiserror",
] ]
[[package]] [[package]]
name = "solana-gossip" name = "solana-gossip"
version = "1.14.3" version = "1.14.7"
dependencies = [ dependencies = [
"bincode", "bincode",
"bv", "bv",
@ -5081,17 +5083,17 @@ dependencies = [
"solana-clap-utils", "solana-clap-utils",
"solana-client", "solana-client",
"solana-entry", "solana-entry",
"solana-frozen-abi 1.14.3", "solana-frozen-abi 1.14.7",
"solana-frozen-abi-macro 1.14.3", "solana-frozen-abi-macro 1.14.7",
"solana-ledger", "solana-ledger",
"solana-logger 1.14.3", "solana-logger 1.14.7",
"solana-measure", "solana-measure",
"solana-metrics", "solana-metrics",
"solana-net-utils", "solana-net-utils",
"solana-perf", "solana-perf",
"solana-rayon-threadlimit", "solana-rayon-threadlimit",
"solana-runtime", "solana-runtime",
"solana-sdk 1.14.3", "solana-sdk 1.14.7",
"solana-streamer", "solana-streamer",
"solana-version", "solana-version",
"solana-vote-program", "solana-vote-program",
@ -5100,7 +5102,7 @@ dependencies = [
[[package]] [[package]]
name = "solana-ledger" name = "solana-ledger"
version = "1.14.3" version = "1.14.7"
dependencies = [ dependencies = [
"assert_matches", "assert_matches",
"bincode", "bincode",
@ -5132,15 +5134,15 @@ dependencies = [
"solana-account-decoder", "solana-account-decoder",
"solana-bpf-loader-program", "solana-bpf-loader-program",
"solana-entry", "solana-entry",
"solana-frozen-abi 1.14.3", "solana-frozen-abi 1.14.7",
"solana-frozen-abi-macro 1.14.3", "solana-frozen-abi-macro 1.14.7",
"solana-measure", "solana-measure",
"solana-metrics", "solana-metrics",
"solana-perf", "solana-perf",
"solana-program-runtime", "solana-program-runtime",
"solana-rayon-threadlimit", "solana-rayon-threadlimit",
"solana-runtime", "solana-runtime",
"solana-sdk 1.14.3", "solana-sdk 1.14.7",
"solana-stake-program", "solana-stake-program",
"solana-storage-bigtable", "solana-storage-bigtable",
"solana-storage-proto", "solana-storage-proto",
@ -5158,7 +5160,7 @@ dependencies = [
[[package]] [[package]]
name = "solana-local-cluster" name = "solana-local-cluster"
version = "1.14.3" version = "1.14.7"
dependencies = [ dependencies = [
"crossbeam-channel", "crossbeam-channel",
"fs_extra", "fs_extra",
@ -5173,7 +5175,7 @@ dependencies = [
"solana-gossip", "solana-gossip",
"solana-ledger", "solana-ledger",
"solana-runtime", "solana-runtime",
"solana-sdk 1.14.3", "solana-sdk 1.14.7",
"solana-stake-program", "solana-stake-program",
"solana-streamer", "solana-streamer",
"solana-vote-program", "solana-vote-program",
@ -5193,7 +5195,7 @@ dependencies = [
[[package]] [[package]]
name = "solana-logger" name = "solana-logger"
version = "1.14.3" version = "1.14.7"
dependencies = [ dependencies = [
"env_logger", "env_logger",
"lazy_static", "lazy_static",
@ -5202,36 +5204,36 @@ dependencies = [
[[package]] [[package]]
name = "solana-measure" name = "solana-measure"
version = "1.14.3" version = "1.14.7"
dependencies = [ dependencies = [
"log", "log",
"solana-sdk 1.14.3", "solana-sdk 1.14.7",
] ]
[[package]] [[package]]
name = "solana-merkle-tree" name = "solana-merkle-tree"
version = "1.14.3" version = "1.14.7"
dependencies = [ dependencies = [
"fast-math", "fast-math",
"matches", "matches",
"solana-program 1.14.3", "solana-program 1.14.7",
] ]
[[package]] [[package]]
name = "solana-metrics" name = "solana-metrics"
version = "1.14.3" version = "1.14.7"
dependencies = [ dependencies = [
"crossbeam-channel", "crossbeam-channel",
"gethostname", "gethostname",
"lazy_static", "lazy_static",
"log", "log",
"reqwest", "reqwest",
"solana-sdk 1.14.3", "solana-sdk 1.14.7",
] ]
[[package]] [[package]]
name = "solana-net-utils" name = "solana-net-utils"
version = "1.14.3" version = "1.14.7"
dependencies = [ dependencies = [
"bincode", "bincode",
"clap 3.2.22", "clap 3.2.22",
@ -5242,8 +5244,8 @@ dependencies = [
"serde", "serde",
"serde_derive", "serde_derive",
"socket2", "socket2",
"solana-logger 1.14.3", "solana-logger 1.14.7",
"solana-sdk 1.14.3", "solana-sdk 1.14.7",
"solana-version", "solana-version",
"tokio", "tokio",
"url 2.2.2", "url 2.2.2",
@ -5251,7 +5253,7 @@ dependencies = [
[[package]] [[package]]
name = "solana-perf" name = "solana-perf"
version = "1.14.3" version = "1.14.7"
dependencies = [ dependencies = [
"ahash", "ahash",
"bincode", "bincode",
@ -5270,13 +5272,13 @@ dependencies = [
"serde", "serde",
"solana-metrics", "solana-metrics",
"solana-rayon-threadlimit", "solana-rayon-threadlimit",
"solana-sdk 1.14.3", "solana-sdk 1.14.7",
"solana-vote-program", "solana-vote-program",
] ]
[[package]] [[package]]
name = "solana-poh" name = "solana-poh"
version = "1.14.3" version = "1.14.7"
dependencies = [ dependencies = [
"core_affinity", "core_affinity",
"crossbeam-channel", "crossbeam-channel",
@ -5286,7 +5288,7 @@ dependencies = [
"solana-measure", "solana-measure",
"solana-metrics", "solana-metrics",
"solana-runtime", "solana-runtime",
"solana-sdk 1.14.3", "solana-sdk 1.14.7",
"solana-sys-tuner", "solana-sys-tuner",
"thiserror", "thiserror",
] ]
@ -5335,7 +5337,7 @@ dependencies = [
[[package]] [[package]]
name = "solana-program" name = "solana-program"
version = "1.14.3" version = "1.14.7"
dependencies = [ dependencies = [
"base64 0.13.0", "base64 0.13.0",
"bincode", "bincode",
@ -5371,9 +5373,9 @@ dependencies = [
"serde_json", "serde_json",
"sha2 0.10.3", "sha2 0.10.3",
"sha3 0.10.2", "sha3 0.10.2",
"solana-frozen-abi 1.14.3", "solana-frozen-abi 1.14.7",
"solana-frozen-abi-macro 1.14.3", "solana-frozen-abi-macro 1.14.7",
"solana-sdk-macro 1.14.3", "solana-sdk-macro 1.14.7",
"thiserror", "thiserror",
"tiny-bip39", "tiny-bip39",
"wasm-bindgen", "wasm-bindgen",
@ -5382,7 +5384,7 @@ dependencies = [
[[package]] [[package]]
name = "solana-program-runtime" name = "solana-program-runtime"
version = "1.14.3" version = "1.14.7"
dependencies = [ dependencies = [
"base64 0.13.0", "base64 0.13.0",
"bincode", "bincode",
@ -5394,19 +5396,20 @@ dependencies = [
"log", "log",
"num-derive", "num-derive",
"num-traits", "num-traits",
"rand 0.7.3",
"rustc_version 0.4.0", "rustc_version 0.4.0",
"serde", "serde",
"solana-frozen-abi 1.14.3", "solana-frozen-abi 1.14.7",
"solana-frozen-abi-macro 1.14.3", "solana-frozen-abi-macro 1.14.7",
"solana-measure", "solana-measure",
"solana-metrics", "solana-metrics",
"solana-sdk 1.14.3", "solana-sdk 1.14.7",
"thiserror", "thiserror",
] ]
[[package]] [[package]]
name = "solana-program-test" name = "solana-program-test"
version = "1.14.3" version = "1.14.7"
dependencies = [ dependencies = [
"assert_matches", "assert_matches",
"async-trait", "async-trait",
@ -5418,10 +5421,10 @@ dependencies = [
"solana-banks-client", "solana-banks-client",
"solana-banks-server", "solana-banks-server",
"solana-bpf-loader-program", "solana-bpf-loader-program",
"solana-logger 1.14.3", "solana-logger 1.14.7",
"solana-program-runtime", "solana-program-runtime",
"solana-runtime", "solana-runtime",
"solana-sdk 1.14.3", "solana-sdk 1.14.7",
"solana-vote-program", "solana-vote-program",
"thiserror", "thiserror",
"tokio", "tokio",
@ -5429,7 +5432,7 @@ dependencies = [
[[package]] [[package]]
name = "solana-rayon-threadlimit" name = "solana-rayon-threadlimit"
version = "1.14.3" version = "1.14.7"
dependencies = [ dependencies = [
"lazy_static", "lazy_static",
"num_cpus", "num_cpus",
@ -5437,7 +5440,7 @@ dependencies = [
[[package]] [[package]]
name = "solana-remote-wallet" name = "solana-remote-wallet"
version = "1.14.3" version = "1.14.7"
dependencies = [ dependencies = [
"console", "console",
"dialoguer", "dialoguer",
@ -5447,14 +5450,14 @@ dependencies = [
"parking_lot 0.12.1", "parking_lot 0.12.1",
"qstring", "qstring",
"semver 1.0.13", "semver 1.0.13",
"solana-sdk 1.14.3", "solana-sdk 1.14.7",
"thiserror", "thiserror",
"uriparse", "uriparse",
] ]
[[package]] [[package]]
name = "solana-rpc" name = "solana-rpc"
version = "1.14.3" version = "1.14.7"
dependencies = [ dependencies = [
"base64 0.13.0", "base64 0.13.0",
"bincode", "bincode",
@ -5487,7 +5490,7 @@ dependencies = [
"solana-poh", "solana-poh",
"solana-rayon-threadlimit", "solana-rayon-threadlimit",
"solana-runtime", "solana-runtime",
"solana-sdk 1.14.3", "solana-sdk 1.14.7",
"solana-send-transaction-service", "solana-send-transaction-service",
"solana-stake-program", "solana-stake-program",
"solana-storage-bigtable", "solana-storage-bigtable",
@ -5505,7 +5508,7 @@ dependencies = [
[[package]] [[package]]
name = "solana-runtime" name = "solana-runtime"
version = "1.14.3" version = "1.14.7"
dependencies = [ dependencies = [
"arrayref", "arrayref",
"bincode", "bincode",
@ -5541,17 +5544,17 @@ dependencies = [
"solana-bucket-map", "solana-bucket-map",
"solana-compute-budget-program", "solana-compute-budget-program",
"solana-config-program", "solana-config-program",
"solana-frozen-abi 1.14.3", "solana-frozen-abi 1.14.7",
"solana-frozen-abi-macro 1.14.3", "solana-frozen-abi-macro 1.14.7",
"solana-measure", "solana-measure",
"solana-metrics", "solana-metrics",
"solana-program-runtime", "solana-program-runtime",
"solana-rayon-threadlimit", "solana-rayon-threadlimit",
"solana-sdk 1.14.3", "solana-sdk 1.14.7",
"solana-stake-program", "solana-stake-program",
"solana-vote-program", "solana-vote-program",
"solana-zk-token-proof-program", "solana-zk-token-proof-program",
"solana-zk-token-sdk 1.14.3", "solana-zk-token-sdk 1.14.7",
"strum", "strum",
"strum_macros", "strum_macros",
"symlink", "symlink",
@ -5614,7 +5617,7 @@ dependencies = [
[[package]] [[package]]
name = "solana-sdk" name = "solana-sdk"
version = "1.14.3" version = "1.14.7"
dependencies = [ dependencies = [
"assert_matches", "assert_matches",
"base64 0.13.0", "base64 0.13.0",
@ -5651,11 +5654,11 @@ dependencies = [
"serde_json", "serde_json",
"sha2 0.10.3", "sha2 0.10.3",
"sha3 0.10.2", "sha3 0.10.2",
"solana-frozen-abi 1.14.3", "solana-frozen-abi 1.14.7",
"solana-frozen-abi-macro 1.14.3", "solana-frozen-abi-macro 1.14.7",
"solana-logger 1.14.3", "solana-logger 1.14.7",
"solana-program 1.14.3", "solana-program 1.14.7",
"solana-sdk-macro 1.14.3", "solana-sdk-macro 1.14.7",
"thiserror", "thiserror",
"uriparse", "uriparse",
"wasm-bindgen", "wasm-bindgen",
@ -5676,7 +5679,7 @@ dependencies = [
[[package]] [[package]]
name = "solana-sdk-macro" name = "solana-sdk-macro"
version = "1.14.3" version = "1.14.7"
dependencies = [ dependencies = [
"bs58 0.4.0", "bs58 0.4.0",
"proc-macro2 1.0.43", "proc-macro2 1.0.43",
@ -5687,7 +5690,7 @@ dependencies = [
[[package]] [[package]]
name = "solana-send-transaction-service" name = "solana-send-transaction-service"
version = "1.14.3" version = "1.14.7"
dependencies = [ dependencies = [
"crossbeam-channel", "crossbeam-channel",
"log", "log",
@ -5695,12 +5698,12 @@ dependencies = [
"solana-measure", "solana-measure",
"solana-metrics", "solana-metrics",
"solana-runtime", "solana-runtime",
"solana-sdk 1.14.3", "solana-sdk 1.14.7",
] ]
[[package]] [[package]]
name = "solana-stake-program" name = "solana-stake-program"
version = "1.14.3" version = "1.14.7"
dependencies = [ dependencies = [
"bincode", "bincode",
"log", "log",
@ -5710,18 +5713,18 @@ dependencies = [
"serde", "serde",
"serde_derive", "serde_derive",
"solana-config-program", "solana-config-program",
"solana-frozen-abi 1.14.3", "solana-frozen-abi 1.14.7",
"solana-frozen-abi-macro 1.14.3", "solana-frozen-abi-macro 1.14.7",
"solana-metrics", "solana-metrics",
"solana-program-runtime", "solana-program-runtime",
"solana-sdk 1.14.3", "solana-sdk 1.14.7",
"solana-vote-program", "solana-vote-program",
"thiserror", "thiserror",
] ]
[[package]] [[package]]
name = "solana-storage-bigtable" name = "solana-storage-bigtable"
version = "1.14.3" version = "1.14.7"
dependencies = [ dependencies = [
"backoff", "backoff",
"bincode", "bincode",
@ -5742,7 +5745,7 @@ dependencies = [
"serde_derive", "serde_derive",
"smpl_jwt", "smpl_jwt",
"solana-metrics", "solana-metrics",
"solana-sdk 1.14.3", "solana-sdk 1.14.7",
"solana-storage-proto", "solana-storage-proto",
"solana-transaction-status", "solana-transaction-status",
"thiserror", "thiserror",
@ -5753,7 +5756,7 @@ dependencies = [
[[package]] [[package]]
name = "solana-storage-proto" name = "solana-storage-proto"
version = "1.14.3" version = "1.14.7"
dependencies = [ dependencies = [
"bincode", "bincode",
"bs58 0.4.0", "bs58 0.4.0",
@ -5761,14 +5764,14 @@ dependencies = [
"protobuf-src", "protobuf-src",
"serde", "serde",
"solana-account-decoder", "solana-account-decoder",
"solana-sdk 1.14.3", "solana-sdk 1.14.7",
"solana-transaction-status", "solana-transaction-status",
"tonic-build 0.8.2", "tonic-build 0.8.2",
] ]
[[package]] [[package]]
name = "solana-streamer" name = "solana-streamer"
version = "1.14.3" version = "1.14.7"
dependencies = [ dependencies = [
"crossbeam-channel", "crossbeam-channel",
"futures-util", "futures-util",
@ -5787,7 +5790,7 @@ dependencies = [
"rustls 0.20.6", "rustls 0.20.6",
"solana-metrics", "solana-metrics",
"solana-perf", "solana-perf",
"solana-sdk 1.14.3", "solana-sdk 1.14.7",
"thiserror", "thiserror",
"tokio", "tokio",
"x509-parser", "x509-parser",
@ -5795,13 +5798,13 @@ dependencies = [
[[package]] [[package]]
name = "solana-sys-tuner" name = "solana-sys-tuner"
version = "1.14.3" version = "1.14.7"
dependencies = [ dependencies = [
"clap 2.34.0", "clap 2.34.0",
"libc", "libc",
"log", "log",
"nix", "nix",
"solana-logger 1.14.3", "solana-logger 1.14.7",
"solana-version", "solana-version",
"sysctl", "sysctl",
"unix_socket2", "unix_socket2",
@ -5810,7 +5813,7 @@ dependencies = [
[[package]] [[package]]
name = "solana-test-validator" name = "solana-test-validator"
version = "1.14.3" version = "1.14.7"
dependencies = [ dependencies = [
"base64 0.13.0", "base64 0.13.0",
"log", "log",
@ -5821,20 +5824,20 @@ dependencies = [
"solana-core", "solana-core",
"solana-gossip", "solana-gossip",
"solana-ledger", "solana-ledger",
"solana-logger 1.14.3", "solana-logger 1.14.7",
"solana-net-utils", "solana-net-utils",
"solana-program-runtime", "solana-program-runtime",
"solana-program-test", "solana-program-test",
"solana-rpc", "solana-rpc",
"solana-runtime", "solana-runtime",
"solana-sdk 1.14.3", "solana-sdk 1.14.7",
"solana-streamer", "solana-streamer",
"tokio", "tokio",
] ]
[[package]] [[package]]
name = "solana-transaction-status" name = "solana-transaction-status"
version = "1.14.3" version = "1.14.7"
dependencies = [ dependencies = [
"Inflector", "Inflector",
"base64 0.13.0", "base64 0.13.0",
@ -5847,9 +5850,10 @@ dependencies = [
"serde_derive", "serde_derive",
"serde_json", "serde_json",
"solana-account-decoder", "solana-account-decoder",
"solana-address-lookup-table-program",
"solana-measure", "solana-measure",
"solana-metrics", "solana-metrics",
"solana-sdk 1.14.3", "solana-sdk 1.14.7",
"solana-vote-program", "solana-vote-program",
"spl-associated-token-account", "spl-associated-token-account",
"spl-memo", "spl-memo",
@ -5860,21 +5864,21 @@ dependencies = [
[[package]] [[package]]
name = "solana-version" name = "solana-version"
version = "1.14.3" version = "1.14.7"
dependencies = [ dependencies = [
"log", "log",
"rustc_version 0.4.0", "rustc_version 0.4.0",
"semver 1.0.13", "semver 1.0.13",
"serde", "serde",
"serde_derive", "serde_derive",
"solana-frozen-abi 1.14.3", "solana-frozen-abi 1.14.7",
"solana-frozen-abi-macro 1.14.3", "solana-frozen-abi-macro 1.14.7",
"solana-sdk 1.14.3", "solana-sdk 1.14.7",
] ]
[[package]] [[package]]
name = "solana-vote-program" name = "solana-vote-program"
version = "1.14.3" version = "1.14.7"
dependencies = [ dependencies = [
"bincode", "bincode",
"log", "log",
@ -5883,25 +5887,25 @@ dependencies = [
"rustc_version 0.4.0", "rustc_version 0.4.0",
"serde", "serde",
"serde_derive", "serde_derive",
"solana-frozen-abi 1.14.3", "solana-frozen-abi 1.14.7",
"solana-frozen-abi-macro 1.14.3", "solana-frozen-abi-macro 1.14.7",
"solana-metrics", "solana-metrics",
"solana-program-runtime", "solana-program-runtime",
"solana-sdk 1.14.3", "solana-sdk 1.14.7",
"thiserror", "thiserror",
] ]
[[package]] [[package]]
name = "solana-zk-token-proof-program" name = "solana-zk-token-proof-program"
version = "1.14.3" version = "1.14.7"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"getrandom 0.1.16", "getrandom 0.1.16",
"num-derive", "num-derive",
"num-traits", "num-traits",
"solana-program-runtime", "solana-program-runtime",
"solana-sdk 1.14.3", "solana-sdk 1.14.7",
"solana-zk-token-sdk 1.14.3", "solana-zk-token-sdk 1.14.7",
] ]
[[package]] [[package]]
@ -5936,7 +5940,7 @@ dependencies = [
[[package]] [[package]]
name = "solana-zk-token-sdk" name = "solana-zk-token-sdk"
version = "1.14.3" version = "1.14.7"
dependencies = [ dependencies = [
"aes-gcm-siv", "aes-gcm-siv",
"arrayref", "arrayref",
@ -5956,8 +5960,8 @@ dependencies = [
"serde", "serde",
"serde_json", "serde_json",
"sha3 0.9.1", "sha3 0.9.1",
"solana-program 1.14.3", "solana-program 1.14.7",
"solana-sdk 1.14.3", "solana-sdk 1.14.7",
"subtle", "subtle",
"thiserror", "thiserror",
"zeroize", "zeroize",

2
deps/solana vendored

@ -1 +1 @@
Subproject commit 242c9cb442ec195267c37d30c95273bd8e102daf Subproject commit 030eb5f2caadebeb5d656c1a0b2d2058ea4bd242

205
src/main.rs
View File

@ -7,7 +7,6 @@ use mango::{
state::{MangoCache, MangoGroup, PerpMarket}, state::{MangoCache, MangoGroup, PerpMarket},
}; };
use mango_common::Loadable; use mango_common::Loadable;
use rayon::ThreadBuilder;
use serde::Serialize; use serde::Serialize;
use serde_json; use serde_json;
mod rotating_queue; mod rotating_queue;
@ -29,20 +28,16 @@ use solana_sdk::{
hash::Hash, hash::Hash,
instruction::Instruction, instruction::Instruction,
message::Message, message::Message,
pubkey::Pubkey,
signature::{Keypair, Signature, Signer}, signature::{Keypair, Signature, Signer},
stake::instruction,
transaction::Transaction, transaction::Transaction,
}; };
use solana_transaction_status::{EncodedConfirmedBlock, TransactionDetails, UiTransactionEncoding};
use core::time; use solana_program::pubkey::Pubkey;
use std::{ use std::{
cell::Ref,
collections::HashMap, collections::HashMap,
collections::{HashSet, VecDeque},
fs, fs,
ops::{Add, Div, Mul}, ops::{Div, Mul},
str::FromStr, str::FromStr,
sync::{ sync::{
atomic::{AtomicBool, AtomicU64, Ordering}, atomic::{AtomicBool, AtomicU64, Ordering},
@ -55,8 +50,41 @@ use std::{
use csv; use csv;
// as there are similar modules solana_sdk and solana_program
// solana internals use solana_sdk but external dependancies like mango use solana program
// that is why we have some helper methods
fn to_sdk_pk(pubkey: &Pubkey) -> solana_sdk::pubkey::Pubkey {
solana_sdk::pubkey::Pubkey::from(pubkey.to_bytes())
}
fn to_sp_pk(pubkey: &solana_sdk::pubkey::Pubkey) -> Pubkey {
Pubkey::new_from_array(pubkey.to_bytes())
}
fn to_sdk_accountmetas(
vec: Vec<solana_program::instruction::AccountMeta>,
) -> Vec<solana_sdk::instruction::AccountMeta> {
vec.iter()
.map(|x| solana_sdk::instruction::AccountMeta {
pubkey: to_sdk_pk(&x.pubkey),
is_signer: x.is_signer,
is_writable: x.is_writable,
})
.collect::<Vec<solana_sdk::instruction::AccountMeta>>()
}
fn to_sdk_instruction(
instruction: solana_program::instruction::Instruction,
) -> solana_sdk::instruction::Instruction {
solana_sdk::instruction::Instruction {
program_id: to_sdk_pk(&instruction.program_id),
accounts: to_sdk_accountmetas(instruction.accounts),
data: instruction.data,
}
}
fn load_from_rpc<T: Loadable>(rpc_client: &RpcClient, pk: &Pubkey) -> T { fn load_from_rpc<T: Loadable>(rpc_client: &RpcClient, pk: &Pubkey) -> T {
let acc = rpc_client.get_account(pk).unwrap(); let acc = rpc_client.get_account(&to_sdk_pk(pk)).unwrap();
return T::load_from_bytes(acc.data.as_slice()).unwrap().clone(); return T::load_from_bytes(acc.data.as_slice()).unwrap().clone();
} }
@ -127,14 +155,14 @@ struct PerpMarketCache {
pub perp_market: PerpMarket, pub perp_market: PerpMarket,
} }
struct TransactionInfo { struct _TransactionInfo {
pub signature: Signature, pub signature: Signature,
pub transactionSendTime: DateTime<Utc>, pub transaction_send_time: DateTime<Utc>,
pub send_slot: Slot, pub send_slot: Slot,
pub confirmationRetries: u32, pub confirmation_retries: u32,
pub error: String, pub error: String,
pub confirmationBlockHash: Pubkey, pub confirmation_blockhash: Pubkey,
pub leaderConfirmingTransaction: Pubkey, pub leader_confirming_transaction: Pubkey,
pub timeout: bool, pub timeout: bool,
pub market_maker: Pubkey, pub market_maker: Pubkey,
pub market: Pubkey, pub market: Pubkey,
@ -145,7 +173,6 @@ fn poll_blockhash_and_slot(
blockhash: Arc<RwLock<Hash>>, blockhash: Arc<RwLock<Hash>>,
slot: &AtomicU64, slot: &AtomicU64,
client: &Arc<RpcClient>, client: &Arc<RpcClient>,
_id: &Pubkey,
) { ) {
let mut blockhash_last_updated = Instant::now(); let mut blockhash_last_updated = Instant::now();
//let mut last_error_log = Instant::now(); //let mut last_error_log = Instant::now();
@ -175,14 +202,6 @@ fn poll_blockhash_and_slot(
} }
} }
fn pk_from_str(str: &str) -> solana_program::pubkey::Pubkey {
return solana_program::pubkey::Pubkey::from_str(str).unwrap();
}
fn pk_from_str_like<T: ToString>(str_like: T) -> solana_program::pubkey::Pubkey {
return pk_from_str(&str_like.to_string());
}
fn seconds_since(dt: DateTime<Utc>) -> i64 { fn seconds_since(dt: DateTime<Utc>) -> i64 {
Utc::now().signed_duration_since(dt).num_seconds() Utc::now().signed_duration_since(dt).num_seconds()
} }
@ -198,85 +217,74 @@ fn create_ask_bid_transaction(
"price:{:?} price_quote_lots:{:?} order_base_lots:{:?} offset:{:?} spread:{:?}", "price:{:?} price_quote_lots:{:?} order_base_lots:{:?} offset:{:?} spread:{:?}",
c.price, c.price_quote_lots, c.order_base_lots, offset, spread c.price, c.price_quote_lots, c.order_base_lots, offset, spread
); );
let cancel_ix: Instruction = serde_json::from_str( let cancel_ix: Instruction = to_sdk_instruction(
&serde_json::to_string( cancel_all_perp_orders(
&cancel_all_perp_orders( &c.mango_program_pk,
&pk_from_str_like(&c.mango_program_pk), &c.mango_group_pk,
&pk_from_str_like(&c.mango_group_pk), &mango_account_pk,
&pk_from_str_like(&mango_account_pk), &mango_account_signer_pk,
&(pk_from_str_like(&mango_account_signer_pk)), &c.perp_market_pk,
&(pk_from_str_like(&c.perp_market_pk)), &c.perp_market.bids,
&c.perp_market.bids, &c.perp_market.asks,
&c.perp_market.asks, 10,
10,
)
.unwrap(),
) )
.unwrap(), .unwrap(),
) );
.unwrap();
let place_bid_ix: Instruction = serde_json::from_str( let place_bid_ix: Instruction = to_sdk_instruction(
&serde_json::to_string( place_perp_order2(
&place_perp_order2( &c.mango_program_pk,
&pk_from_str_like(&c.mango_program_pk), &c.mango_group_pk,
&pk_from_str_like(&c.mango_group_pk), &mango_account_pk,
&pk_from_str_like(&mango_account_pk), &mango_account_signer_pk,
&(pk_from_str_like(&mango_account_signer_pk)), &c.mango_cache_pk,
&pk_from_str_like(&c.mango_cache_pk), &c.perp_market_pk,
&(pk_from_str_like(&c.perp_market_pk)), &c.perp_market.bids,
&c.perp_market.bids, &c.perp_market.asks,
&c.perp_market.asks, &c.perp_market.event_queue,
&c.perp_market.event_queue, None,
None, &[],
&[], Side::Bid,
Side::Bid, c.price_quote_lots + offset - spread,
c.price_quote_lots + offset - spread, c.order_base_lots,
c.order_base_lots, i64::MAX,
i64::MAX, 1,
1, mango::matching::OrderType::Limit,
mango::matching::OrderType::Limit, false,
false, None,
None, 64,
64, mango::matching::ExpiryType::Absolute,
mango::matching::ExpiryType::Absolute,
)
.unwrap(),
) )
.unwrap(), .unwrap(),
) );
.unwrap();
let place_ask_ix: Instruction = serde_json::from_str( let place_ask_ix: Instruction = to_sdk_instruction(
&serde_json::to_string( place_perp_order2(
&place_perp_order2( &c.mango_program_pk,
&pk_from_str_like(&c.mango_program_pk), &c.mango_group_pk,
&pk_from_str_like(&c.mango_group_pk), &mango_account_pk,
&pk_from_str_like(&mango_account_pk), &mango_account_signer_pk,
&(pk_from_str_like(&mango_account_signer_pk)), &c.mango_cache_pk,
&pk_from_str_like(&c.mango_cache_pk), &c.perp_market_pk,
&(pk_from_str_like(&c.perp_market_pk)), &c.perp_market.bids,
&c.perp_market.bids, &c.perp_market.asks,
&c.perp_market.asks, &c.perp_market.event_queue,
&c.perp_market.event_queue, None,
None, &[],
&[], Side::Ask,
Side::Ask, c.price_quote_lots + offset + spread,
c.price_quote_lots + offset + spread, c.order_base_lots,
c.order_base_lots, i64::MAX,
i64::MAX, 2,
2, mango::matching::OrderType::Limit,
mango::matching::OrderType::Limit, false,
false, None,
None, 64,
64, mango::matching::ExpiryType::Absolute,
mango::matching::ExpiryType::Absolute,
)
.unwrap(),
) )
.unwrap(), .unwrap(),
) );
.unwrap();
Transaction::new_unsigned(Message::new( Transaction::new_unsigned(Message::new(
&[cancel_ix, place_bid_ix, place_ask_ix], &[cancel_ix, place_bid_ix, place_ask_ix],
Some(&mango_account_signer_pk), Some(&mango_account_signer_pk),
@ -293,6 +301,7 @@ fn send_mm_transactions(
blockhash: Arc<RwLock<Hash>>, blockhash: Arc<RwLock<Hash>>,
slot: &AtomicU64, slot: &AtomicU64,
) { ) {
let mango_account_signer_pk = to_sp_pk(&mango_account_signer.pubkey());
// update quotes 2x per second // update quotes 2x per second
for _ in 0..quotes_per_second { for _ in 0..quotes_per_second {
for c in perp_market_caches.iter() { for c in perp_market_caches.iter() {
@ -308,7 +317,7 @@ fn send_mm_transactions(
signature: tx.signatures[0], signature: tx.signatures[0],
sent_at: Utc::now(), sent_at: Utc::now(),
sent_slot: slot.load(Ordering::Acquire), sent_slot: slot.load(Ordering::Acquire),
market_maker: mango_account_signer.pubkey(), market_maker: mango_account_signer_pk,
market: c.perp_market_pk, market: c.perp_market_pk,
}); });
if sent.is_err() { if sent.is_err() {
@ -455,7 +464,6 @@ fn confirmation_by_querying_rpc(
tx_timeout_records: Arc<RwLock<Vec<TransactionSendRecord>>>, tx_timeout_records: Arc<RwLock<Vec<TransactionSendRecord>>>,
) { ) {
const TIMEOUT: u64 = 30; const TIMEOUT: u64 = 30;
let mut error: bool = false;
let mut recv_until_confirm = recv_limit; let mut recv_until_confirm = recv_limit;
let not_confirmed: Arc<RwLock<Vec<TransactionSendRecord>>> = Arc::new(RwLock::new(Vec::new())); let not_confirmed: Arc<RwLock<Vec<TransactionSendRecord>>> = Arc::new(RwLock::new(Vec::new()));
loop { loop {
@ -543,7 +551,6 @@ fn confirmation_by_querying_rpc(
info!("channel disconnected {}", recv_until_confirm); info!("channel disconnected {}", recv_until_confirm);
} }
debug!("channel disconnected"); debug!("channel disconnected");
error = true;
break; // still confirm remaining transctions break; // still confirm remaining transctions
} }
} }
@ -636,7 +643,7 @@ fn confirmations_by_blocks(
for slot in slot_batch { for slot in slot_batch {
// retry search for block 10 times // retry search for block 10 times
let mut block = None; let mut block = None;
for i in 0..=10 { for _i in 0..=10 {
let block_res = client let block_res = client
.get_block_with_config( .get_block_with_config(
slot, slot,
@ -931,7 +938,6 @@ fn main() {
let exit_signal = exit_signal.clone(); let exit_signal = exit_signal.clone();
let blockhash = blockhash.clone(); let blockhash = blockhash.clone();
let client = rpc_client.clone(); let client = rpc_client.clone();
let id = id.pubkey();
let current_slot = current_slot.clone(); let current_slot = current_slot.clone();
Builder::new() Builder::new()
.name("solana-blockhash-poller".to_string()) .name("solana-blockhash-poller".to_string())
@ -941,7 +947,6 @@ fn main() {
blockhash.clone(), blockhash.clone(),
current_slot.as_ref(), current_slot.as_ref(),
&client, &client,
&id,
); );
}) })
.unwrap() .unwrap()