diff --git a/Cargo.lock b/Cargo.lock index 3882bf4d..bf9b5fac 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,5 +1,7 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. +version = 3 + [[package]] name = "Inflector" version = "0.11.4" @@ -25,15 +27,6 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e" -[[package]] -name = "ahash" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217" -dependencies = [ - "const-random", -] - [[package]] name = "ahash" version = "0.4.7" @@ -183,7 +176,7 @@ version = "0.2.1" dependencies = [ "anchor-lang", "solana-program", - "spl-token 3.0.1", + "spl-token 3.1.0", ] [[package]] @@ -370,6 +363,16 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" +[[package]] +name = "borsh" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5a26c53ddf60281f18e7a29b20db7ba3db82a9d81b9650bfaa02d646f50d364" +dependencies = [ + "borsh-derive", + "hashbrown", +] + [[package]] name = "borsh-derive" version = "0.8.1" @@ -456,6 +459,12 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" +[[package]] +name = "bytes" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0dcbc35f504eb6fc275a6d20e4ebcda18cf50d40ba6fabff8c711fa16cb3b16" + [[package]] name = "bytes" version = "1.0.1" @@ -607,28 +616,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "const-random" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f590d95d011aa80b063ffe3253422ed5aa462af4e9867d43ce8337562bac77c4" -dependencies = [ - "const-random-macro", - "proc-macro-hack", -] - -[[package]] -name = "const-random-macro" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "615f6e27d000a2bffbc7f2f6a8669179378fa27ee4d0a509e985dfc0a7defb40" -dependencies = [ - "getrandom 0.2.2", - "lazy_static", - "proc-macro-hack", - "tiny-keccak", -] - [[package]] name = "const_fn" version = "0.4.5" @@ -802,6 +789,16 @@ dependencies = [ "subtle 2.4.0", ] +[[package]] +name = "crypto-mac" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4857fd85a0c34b3c3297875b747c1e02e06b6a0ea32dd892d8192b9ce0813ea6" +dependencies = [ + "generic-array 0.14.4", + "subtle 2.4.0", +] + [[package]] name = "curve25519-dalek" version = "2.1.2" @@ -817,13 +814,13 @@ dependencies = [ [[package]] name = "dashmap" -version = "3.11.10" +version = "4.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f260e2fc850179ef410018660006951c1b55b79e8087e87111a2c388994b9b5" +checksum = "e77a43b28d0668df09411cb0bc9a8c2adc40f9a048afe863e05fd43251e8e39c" dependencies = [ - "ahash 0.3.8", - "cfg-if 0.1.10", + "cfg-if 1.0.0", "num_cpus", + "rayon", ] [[package]] @@ -1253,7 +1250,7 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" dependencies = [ - "ahash 0.4.7", + "ahash", ] [[package]] @@ -1301,6 +1298,16 @@ dependencies = [ "digest 0.8.1", ] +[[package]] +name = "hmac" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1441c6b1e930e2817404b5046f1f989899143a12bf92de603b69f4e0aee1e15" +dependencies = [ + "crypto-mac 0.10.0", + "digest 0.9.0", +] + [[package]] name = "hmac-drbg" version = "0.2.0" @@ -1309,7 +1316,7 @@ checksum = "c6e570451493f10f6581b48cdd530413b63ea9e780f544bfd3bdcaa0d89d1a7b" dependencies = [ "digest 0.8.1", "generic-array 0.12.3", - "hmac", + "hmac 0.7.1", ] [[package]] @@ -1562,9 +1569,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cca32fa0182e8c0989459524dc356b8f2b5c10f1b9eb521b7d182c03cf8c5ff" +checksum = "b7282d924be3275cec7f6756ff4121987bc6481325397dde6ba3e7802b1a8b1c" [[package]] name = "libloading" @@ -1709,12 +1716,25 @@ dependencies = [ "kernel32-sys", "libc", "log", - "miow", + "miow 0.2.2", "net2", "slab", "winapi 0.2.8", ] +[[package]] +name = "mio" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5dede4e2065b3842b8b0af444119f3aa331cc7cc2dd20388bfb0f5d5a38823a" +dependencies = [ + "libc", + "log", + "miow 0.3.6", + "ntapi", + "winapi 0.3.9", +] + [[package]] name = "mio-uds" version = "0.6.8" @@ -1723,7 +1743,7 @@ checksum = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0" dependencies = [ "iovec", "libc", - "mio", + "mio 0.6.23", ] [[package]] @@ -1738,6 +1758,16 @@ dependencies = [ "ws2_32-sys", ] +[[package]] +name = "miow" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a33c1b55807fbed163481b5ba66db4b2fa6cde694a5027be10fb724206c5897" +dependencies = [ + "socket2", + "winapi 0.3.9", +] + [[package]] name = "native-tls" version = "0.2.7" @@ -1779,6 +1809,15 @@ dependencies = [ "libc", ] +[[package]] +name = "ntapi" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44" +dependencies = [ + "winapi 0.3.9", +] + [[package]] name = "num-derive" version = "0.3.3" @@ -2039,6 +2078,15 @@ dependencies = [ "crypto-mac 0.7.0", ] +[[package]] +name = "pbkdf2" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3b8c0d71734018084da0c0354193a5edfb81b20d2d57a92c5b154aefc554a4a" +dependencies = [ + "crypto-mac 0.10.0", +] + [[package]] name = "percent-encoding" version = "2.1.0" @@ -2226,7 +2274,7 @@ checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e" dependencies = [ "libc", "rand_chacha 0.3.0", - "rand_core 0.6.1", + "rand_core 0.6.2", "rand_hc 0.3.0", ] @@ -2247,7 +2295,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d" dependencies = [ "ppv-lite86", - "rand_core 0.6.1", + "rand_core 0.6.2", ] [[package]] @@ -2261,9 +2309,9 @@ dependencies = [ [[package]] name = "rand_core" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c026d7df8b298d90ccbbc5190bd04d85e159eaf5576caeacf8741da93ccbd2e5" +checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7" dependencies = [ "getrandom 0.2.2", ] @@ -2283,7 +2331,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73" dependencies = [ - "rand_core 0.6.1", + "rand_core 0.6.2", ] [[package]] @@ -2775,6 +2823,15 @@ dependencies = [ "dirs-next", ] +[[package]] +name = "signal-hook-registry" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16f1d0fef1604ba8f7a073c7e701f213e056707210e9020af4528e0101ce11a6" +dependencies = [ + "libc", +] + [[package]] name = "signature" version = "1.3.0" @@ -2815,9 +2872,9 @@ dependencies = [ [[package]] name = "solana-account-decoder" -version = "1.5.0" +version = "1.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f615679e600178987fc3d20f68f176c4af5db4b2f1dd52025795196f5a3fb1b" +checksum = "20b2b1e1c061346b2e395b3a28dc26cd1d5dd80b1a58037398d2cd846815ad78" dependencies = [ "Inflector", "base64 0.12.3", @@ -2832,16 +2889,16 @@ dependencies = [ "solana-sdk", "solana-stake-program", "solana-vote-program", - "spl-token 3.0.1", + "spl-token 3.1.0", "thiserror", "zstd", ] [[package]] name = "solana-clap-utils" -version = "1.5.0" +version = "1.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e657fd63ebd8c4d5db21ab10d054890ebfe6df9eacc3c161893752cc0c25e3dd" +checksum = "035cf3e6d6bdac552f213e5428dbec9f9da5c16f350f8618b1018e64151272e5" dependencies = [ "chrono", "clap 2.33.3", @@ -2855,9 +2912,9 @@ dependencies = [ [[package]] name = "solana-client" -version = "1.5.0" +version = "1.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f5ca241545e4c2367ae92084ee0109e284a1e05b39b8dcf978a5207ed88f29e" +checksum = "7591665a30f9ef36d375d5866677b4a62f94a71b26619f2ed3da50a437f014c1" dependencies = [ "base64 0.13.0", "bincode", @@ -2887,13 +2944,14 @@ dependencies = [ [[package]] name = "solana-config-program" -version = "1.5.0" +version = "1.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d0fbe1d82bef9ac50413cd72a65e8547853f936d765ffd0a334b196f1acdc3f" +checksum = "38916f7700290777a0e6127ed198bcb8339a56f98e6880b64d48d19736959514" dependencies = [ "bincode", "chrono", "log", + "rand_core 0.6.2", "serde", "serde_derive", "solana-sdk", @@ -2901,9 +2959,9 @@ dependencies = [ [[package]] name = "solana-crate-features" -version = "1.5.5" +version = "1.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8c91f6006ec135a011bd1239cd5f5c9fd86be6cf1dc0cbad5d9f873c43c6300" +checksum = "a4e0ddd2cb27b7513fa390a3b4f4a8d95388e2787817e81f7da35fa29e683d94" dependencies = [ "backtrace", "bytes 0.4.12", @@ -2925,9 +2983,9 @@ dependencies = [ [[package]] name = "solana-frozen-abi" -version = "1.5.5" +version = "1.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d0c1cf7dafbcf4e1e0a56b7b28848bdf41a5e3065e9763d3aae892027109956" +checksum = "a63a109f991af1c4f83a2bf11e1cb1b6ad61519aaeccd82a45250911e0e03196" dependencies = [ "bs58", "bv", @@ -2945,9 +3003,9 @@ dependencies = [ [[package]] name = "solana-frozen-abi-macro" -version = "1.5.5" +version = "1.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb44325468e78e9e4535c90c656c36c953b42cd34ed4999d39f1d33b8780a545" +checksum = "b8840c1d666f525dd351ad63255a7e2ac810a484d101cb3029282304db0268d7" dependencies = [ "lazy_static", "proc-macro2 1.0.24", @@ -2958,9 +3016,9 @@ dependencies = [ [[package]] name = "solana-logger" -version = "1.5.5" +version = "1.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7a46715d2f6fda4697f640038fbd2a16645b10af81dbf2e5a19048c99b8a546" +checksum = "b3dd89fd485f83fcffdcef4dc7df27847b74ae1e6670c7aaae61459eda363f67" dependencies = [ "env_logger", "lazy_static", @@ -2969,9 +3027,9 @@ dependencies = [ [[package]] name = "solana-measure" -version = "1.5.0" +version = "1.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39228713bf50403f45d6b95c8e6c2bdabaa5dbf0c56a117139f587b646ae5c52" +checksum = "d8ded31da5ed7e9e313284c7d5078b6c54d95ddd725edf611fa08c2b604e15f9" dependencies = [ "jemalloc-ctl", "jemallocator", @@ -2982,9 +3040,9 @@ dependencies = [ [[package]] name = "solana-metrics" -version = "1.5.0" +version = "1.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60fb3d751091e53f3f2f88fdd70fb93617625b4ad0bcd82e6873c4bb3052de1c" +checksum = "cf7407f9cadec14790787d1727f1afac73175859aaf26a59b6f7baf1b8fce060" dependencies = [ "env_logger", "gethostname", @@ -2996,12 +3054,11 @@ dependencies = [ [[package]] name = "solana-net-utils" -version = "1.5.0" +version = "1.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08121e9069e056c2c4c53835ff05ea7642639094f39533f5979d0047614766c" +checksum = "c4adb5645677c58dacde6638b4f1716d6b709f8d0682d58b3bd7da9911cfae25" dependencies = [ "bincode", - "bytes 0.4.12", "clap 2.33.3", "log", "nix", @@ -3012,17 +3069,19 @@ dependencies = [ "solana-clap-utils", "solana-logger", "solana-version", - "tokio 0.1.22", + "tokio 0.3.7", "url", ] [[package]] name = "solana-program" -version = "1.5.0" +version = "1.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a7df63d84d4ba7f67365d179b9994f2690554f313e219f29810b4583077e066" +checksum = "b93a43980a0f71294deefefd0da0eca114ec74f9df1e4e42da8dfc179254addd" dependencies = [ "bincode", + "borsh", + "borsh-derive", "bs58", "bv", "curve25519-dalek", @@ -3038,7 +3097,7 @@ dependencies = [ "serde", "serde_bytes", "serde_derive", - "sha2 0.8.2", + "sha2 0.9.3", "solana-frozen-abi", "solana-frozen-abi-macro", "solana-logger", @@ -3048,9 +3107,9 @@ dependencies = [ [[package]] name = "solana-rayon-threadlimit" -version = "1.5.5" +version = "1.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5925f04042e0591be86cd016c03474e3c5efe57613383b1419662eaed478f216" +checksum = "cf19614a09a7e549e60afcb77a459b0db33f0576b6bcbb35ddd8a964a5083d01" dependencies = [ "lazy_static", "num_cpus", @@ -3058,9 +3117,9 @@ dependencies = [ [[package]] name = "solana-remote-wallet" -version = "1.5.0" +version = "1.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb4851431ec03e4836dd8796a635b21d832b0924393ecd16afecc7760c666ac" +checksum = "d7e98b3b6ec5ceb5430e41a796ce23e3ca4d5241cba9833a68d8280599778e5c" dependencies = [ "base32", "console 0.11.3", @@ -3078,9 +3137,9 @@ dependencies = [ [[package]] name = "solana-runtime" -version = "1.5.0" +version = "1.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a59d25d0f5bb22c6343a2be817efa481fbe0985a213f140ce205d55562d11a96" +checksum = "c6049d5360d796ac78d2bebb06c53350756c14a69accc49427a525c4ec8763f7" dependencies = [ "bincode", "blake3", @@ -3129,9 +3188,9 @@ dependencies = [ [[package]] name = "solana-sdk" -version = "1.5.0" +version = "1.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e37771fa6acdce54c456765d7d247536a4123b1afd0b96efbf164d38a5b08fa2" +checksum = "15290935313514078755390bf33b6c47f99dfe7a0318d8b0ce88b5a60b91ec05" dependencies = [ "assert_matches", "bincode", @@ -3143,7 +3202,7 @@ dependencies = [ "ed25519-dalek", "generic-array 0.14.4", "hex", - "hmac", + "hmac 0.10.1", "itertools", "lazy_static", "libsecp256k1", @@ -3151,7 +3210,7 @@ dependencies = [ "memmap2", "num-derive", "num-traits", - "pbkdf2", + "pbkdf2 0.6.0", "rand 0.7.3", "rand_chacha 0.2.2", "rustc_version", @@ -3160,7 +3219,7 @@ dependencies = [ "serde_bytes", "serde_derive", "serde_json", - "sha2 0.8.2", + "sha2 0.9.3", "sha3", "solana-crate-features", "solana-frozen-abi", @@ -3173,9 +3232,9 @@ dependencies = [ [[package]] name = "solana-sdk-macro" -version = "1.5.5" +version = "1.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d463f2a24e75ca02f065ac2a9ac855f661c8d0f8917090514d65e4f82cdf05ab" +checksum = "ece321c145f2d1c4c2bf50915cae386e92d44ef343f955d81e2a1e159e9d2075" dependencies = [ "bs58", "proc-macro2 1.0.24", @@ -3186,9 +3245,9 @@ dependencies = [ [[package]] name = "solana-secp256k1-program" -version = "1.5.0" +version = "1.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ae342254431819ba2118aa34b50d7b37da296cde90d56af302d9d3df5473ef5" +checksum = "5305262f9c4b97a0af8ecce1f76e8b898d5b8e6fd20e3d4e663a0897bb1bee79" dependencies = [ "bincode", "digest 0.9.0", @@ -3201,9 +3260,9 @@ dependencies = [ [[package]] name = "solana-stake-program" -version = "1.5.0" +version = "1.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b77f387a020aab9f69989172c043b59887a2380f70ae4899ea13ea918ec2412" +checksum = "2c18195e326b112a80ad963cc36595c29f0fb749f39aeb3330e24b0c8101dd35" dependencies = [ "bincode", "log", @@ -3223,9 +3282,9 @@ dependencies = [ [[package]] name = "solana-transaction-status" -version = "1.5.0" +version = "1.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b29b8f38f217384dcaad6790018695cb37b1ed5eb16400cb36a8806b3e5d1b5c" +checksum = "df82c40097601b0337623aec91f2226e2b929ae0a8429895bfb7d1b1a7c6fa0c" dependencies = [ "Inflector", "base64 0.12.3", @@ -3240,16 +3299,17 @@ dependencies = [ "solana-sdk", "solana-stake-program", "solana-vote-program", - "spl-memo", - "spl-token 3.0.1", + "spl-memo 2.0.1", + "spl-memo 3.0.0", + "spl-token 3.1.0", "thiserror", ] [[package]] name = "solana-version" -version = "1.5.0" +version = "1.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "449dfdd4a87520f14f776b4265a61b7908379b1381e772016b6c2d2a4afa8b0b" +checksum = "7c083f2a54d4096b933d0be1dd75eb14df561094d8a37ac2d2c3c8a93b8dde0b" dependencies = [ "log", "rustc_version", @@ -3263,9 +3323,9 @@ dependencies = [ [[package]] name = "solana-vote-program" -version = "1.5.0" +version = "1.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9831d3f343c6acc1a218381969a829f46b77f9e7c2f89241a615dc5c8c27a7d9" +checksum = "da19468f05f349b45f6468e55a4ac271256319f95b5d2dfda4c2e1732d6c702f" dependencies = [ "bincode", "log", @@ -3297,6 +3357,15 @@ dependencies = [ "solana-program", ] +[[package]] +name = "spl-memo" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e76b60c6f58279b5469beb1705744e9778ee94d643c8e3e2ff91874c59bb3c63" +dependencies = [ + "solana-program", +] + [[package]] name = "spl-token" version = "2.0.8" @@ -3314,9 +3383,9 @@ dependencies = [ [[package]] name = "spl-token" -version = "3.0.1" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9774eebb62ff1ff2f5eca112413e476143925a2f5a43cee98fc5d3a6c0eec5c" +checksum = "b795e50d15dfd35aa5460b80a16414503a322be115a417a43db987c5824c6798" dependencies = [ "arrayref", "num-derive", @@ -3513,24 +3582,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b0165e045cc2ae1660270ca65e1676dbaab60feb0f91b10f7d0665e9b47e31f2" dependencies = [ "failure", - "hmac", + "hmac 0.7.1", "once_cell", - "pbkdf2", + "pbkdf2 0.3.0", "rand 0.7.3", "rustc-hash", "sha2 0.8.2", "unicode-normalization", ] -[[package]] -name = "tiny-keccak" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" -dependencies = [ - "crunchy", -] - [[package]] name = "tinyvec" version = "1.1.1" @@ -3554,7 +3614,7 @@ checksum = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6" dependencies = [ "bytes 0.4.12", "futures", - "mio", + "mio 0.6.23", "num_cpus", "tokio-codec", "tokio-current-thread", @@ -3582,12 +3642,34 @@ dependencies = [ "iovec", "lazy_static", "memchr", - "mio", + "mio 0.6.23", "num_cpus", "pin-project-lite 0.1.11", "slab", ] +[[package]] +name = "tokio" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46409491c9375a693ce7032101970a54f8a2010efb77e13f70788f0d84489e39" +dependencies = [ + "autocfg", + "bytes 0.6.0", + "futures-core", + "libc", + "memchr", + "mio 0.7.9", + "num_cpus", + "once_cell", + "parking_lot 0.11.1", + "pin-project-lite 0.2.4", + "signal-hook-registry", + "slab", + "tokio-macros", + "winapi 0.3.9", +] + [[package]] name = "tokio-codec" version = "0.1.2" @@ -3641,6 +3723,17 @@ dependencies = [ "log", ] +[[package]] +name = "tokio-macros" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46dfffa59fc3c8aad216ed61bdc2c263d2b9d87a9c8ac9de0c11a813e51b6db7" +dependencies = [ + "proc-macro2 1.0.24", + "quote 1.0.8", + "syn 1.0.57", +] + [[package]] name = "tokio-reactor" version = "0.1.12" @@ -3651,7 +3744,7 @@ dependencies = [ "futures", "lazy_static", "log", - "mio", + "mio 0.6.23", "num_cpus", "parking_lot 0.9.0", "slab", @@ -3691,7 +3784,7 @@ dependencies = [ "bytes 0.4.12", "futures", "iovec", - "mio", + "mio 0.6.23", "tokio-io", "tokio-reactor", ] @@ -3734,7 +3827,7 @@ dependencies = [ "bytes 0.4.12", "futures", "log", - "mio", + "mio 0.6.23", "tokio-codec", "tokio-io", "tokio-reactor", @@ -3751,7 +3844,7 @@ dependencies = [ "iovec", "libc", "log", - "mio", + "mio 0.6.23", "mio-uds", "tokio-codec", "tokio-io", diff --git a/cli/Cargo.toml b/cli/Cargo.toml index f3e53d2e..fdc77f46 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -19,11 +19,11 @@ shellexpand = "2.1.0" serde_yaml = "0.8" toml = "0.5.8" serde = { version = "1.0", features = ["derive"] } -solana-sdk = "1.5.0" -solana-program = "1.5.0" -solana-client = "1.4.4" +solana-sdk = "1.5.8" +solana-program = "1.5.8" +solana-client = "1.5.8" serum-common = { git = "https://github.com/project-serum/serum-dex", features = ["client"] } dirs = "3.0" heck = "0.3.1" flate2 = "1.0.19" -rand = "0.7.3" \ No newline at end of file +rand = "0.7.3" diff --git a/cli/src/main.rs b/cli/src/main.rs index 2ea21883..0fb91d6a 100644 --- a/cli/src/main.rs +++ b/cli/src/main.rs @@ -306,7 +306,7 @@ fn fetch_idl(program_id: Pubkey) -> Result { let idl_addr = IdlAccount::address(&program_id); let account = client - .get_account_with_commitment(&idl_addr, CommitmentConfig::recent())? + .get_account_with_commitment(&idl_addr, CommitmentConfig::processed())? .value .map_or(Err(anyhow!("Account not found")), Ok)?; @@ -421,7 +421,7 @@ fn idl_set_authority(program_id: Pubkey, new_authority: Pubkey) -> Result<()> { ); client.send_and_confirm_transaction_with_spinner_and_config( &tx, - CommitmentConfig::single(), + CommitmentConfig::confirmed(), RpcSendTransactionConfig { skip_preflight: true, ..RpcSendTransactionConfig::default() @@ -479,7 +479,7 @@ fn idl_clear(cfg: &Config, program_id: &Pubkey) -> Result<()> { ); client.send_and_confirm_transaction_with_spinner_and_config( &tx, - CommitmentConfig::single(), + CommitmentConfig::confirmed(), RpcSendTransactionConfig { skip_preflight: true, ..RpcSendTransactionConfig::default() @@ -539,7 +539,7 @@ fn idl_write(cfg: &Config, program_id: &Pubkey, idl: &Idl) -> Result<()> { ); client.send_and_confirm_transaction_with_spinner_and_config( &tx, - CommitmentConfig::single(), + CommitmentConfig::confirmed(), RpcSendTransactionConfig { skip_preflight: true, ..RpcSendTransactionConfig::default() @@ -953,7 +953,7 @@ fn create_idl_account( ); client.send_and_confirm_transaction_with_spinner_and_config( &tx, - CommitmentConfig::single(), + CommitmentConfig::confirmed(), RpcSendTransactionConfig { skip_preflight: true, ..RpcSendTransactionConfig::default() diff --git a/client/Cargo.toml b/client/Cargo.toml index 34e8c400..2cfc5be9 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -8,6 +8,6 @@ description = "Rust client for Anchor programs" [dependencies] anchor-lang = { path = "../lang", version = "0.2.1" } -solana-client = "1.5.0" -solana-sdk = "1.5.0" -thiserror = "1.0.20" \ No newline at end of file +solana-client = "1.5.8" +solana-sdk = "1.5.8" +thiserror = "1.0.20" diff --git a/client/src/lib.rs b/client/src/lib.rs index 6dc31e16..481e1f28 100644 --- a/client/src/lib.rs +++ b/client/src/lib.rs @@ -92,7 +92,7 @@ impl Program { self.cfg.options.unwrap_or_default(), ); let account = rpc_client - .get_account_with_commitment(&address, CommitmentConfig::recent())? + .get_account_with_commitment(&address, CommitmentConfig::processed())? .value .ok_or(ClientError::AccountNotFound)?; let mut data: &[u8] = &account.data; diff --git a/lang/Cargo.toml b/lang/Cargo.toml index 047bfdea..3e8a2be9 100644 --- a/lang/Cargo.toml +++ b/lang/Cargo.toml @@ -20,5 +20,5 @@ anchor-attribute-state = { path = "./attribute/state", version = "0.2.1" } anchor-attribute-interface = { path = "./attribute/interface", version = "0.2.1" } anchor-derive-accounts = { path = "./derive/accounts", version = "0.2.1" } serum-borsh = "0.8.1-serum.1" -solana-program = "=1.5.0" +solana-program = "1.5.8" thiserror = "1.0.20" diff --git a/spl/Cargo.toml b/spl/Cargo.toml index a31ce5a6..39ac0be4 100644 --- a/spl/Cargo.toml +++ b/spl/Cargo.toml @@ -9,4 +9,4 @@ description = "CPI clients for SPL programs" [dependencies] anchor-lang = { path = "../lang", version = "0.2.1", features = ["derive"] } spl-token = { version = "3.0.1", features = ["no-entrypoint"] } -solana-program = "=1.5.0" \ No newline at end of file +solana-program = "1.5.8"