diff --git a/.cargo/audit.toml b/.cargo/audit.toml index adaf1a646..8dbd2cc87 100644 --- a/.cargo/audit.toml +++ b/.cargo/audit.toml @@ -4,7 +4,7 @@ # RUSTSEC-2020-0071 and RUSTSEC-2020-0159 are low severity vulnerable upstream Solana crates. Ignored for now. [advisories] -ignore = ["RUSTSEC-2020-0071","RUSTSEC-2020-0159"] # advisory IDs to ignore e.g. ["RUSTSEC-2019-0001", ...] +ignore = ["RUSTSEC-2020-0016", "RUSTSEC-2020-0036", "RUSTSEC-2020-0056", "RUSTSEC-2020-0071", "RUSTSEC-2020-0159", "RUSTSEC-2021-0078", "RUSTSEC-2021-0079"] # advisory IDs to ignore e.g. ["RUSTSEC-2019-0001", ...] informational_warnings = ["unmaintained"] # warn for categories of informational advisories severity_threshold = "medium" # CVSS severity ("none", "low", "medium", "high", "critical") diff --git a/.github/workflows/ci-lint-test.yml b/.github/workflows/ci-lint-test.yml index 3fb7aec32..dcadff5eb 100644 --- a/.github/workflows/ci-lint-test.yml +++ b/.github/workflows/ci-lint-test.yml @@ -21,10 +21,12 @@ jobs: lint: name: Lint if: github.actor != 'github-actions[bot]' - runs-on: ubuntu-latest + runs-on: ubuntu-latest steps: - name: Checkout uses: actions/checkout@v2 + - name: Install Linux dependencies + run: sudo apt-get update && sudo apt-get install -y pkg-config build-essential libudev-dev - name: Install Rust nightly uses: actions-rs/toolchain@v1 with: diff --git a/Cargo.lock b/Cargo.lock index c6bc00ecf..5af2d564a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -12,48 +12,21 @@ dependencies = [ "regex", ] +[[package]] +name = "addr2line" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" +dependencies = [ + "gimli", +] + [[package]] name = "adler" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" -[[package]] -name = "aead" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877" -dependencies = [ - "generic-array", -] - -[[package]] -name = "aes" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" -dependencies = [ - "cfg-if 1.0.0", - "cipher 0.3.0", - "cpufeatures", - "opaque-debug", -] - -[[package]] -name = "aes-gcm-siv" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589c637f0e68c877bbd59a4599bbe849cac8e5f3e4b5a3ebae8f528cd218dcdc" -dependencies = [ - "aead", - "aes", - "cipher 0.3.0", - "ctr", - "polyval", - "subtle", - "zeroize", -] - [[package]] name = "ahash" version = "0.7.6" @@ -88,114 +61,114 @@ checksum = "6b2d54853319fd101b8dd81de382bcbf3e03410a64d8928bbee85a3e7dcde483" [[package]] name = "anchor-attribute-access-control" -version = "0.22.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb45cc9d1ce72e5eda341126de495a2c3810108c2333c6f3b4e09d99605f3f48" +checksum = "a9b75d05b6b4ac9d95bb6e3b786b27d3a708c4c5a87c92ffaa25bbe9ae4c5d91" dependencies = [ "anchor-syn", "anyhow", - "proc-macro2 1.0.37", - "quote 1.0.17", + "proc-macro2 1.0.39", + "quote 1.0.18", "regex", - "syn 1.0.91", + "syn 1.0.95", ] [[package]] name = "anchor-attribute-account" -version = "0.22.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16406bd1c27ff4ebdca4f5d5b09b7952f4d161f25094243e09355797c6bddaa6" +checksum = "485351a6d8157750d10d88c8e256f1bf8339262b2220ae9125aed3471309b5de" dependencies = [ "anchor-syn", "anyhow", "bs58 0.4.0", - "proc-macro2 1.0.37", - "quote 1.0.17", + "proc-macro2 1.0.39", + "quote 1.0.18", "rustversion", - "syn 1.0.91", + "syn 1.0.95", ] [[package]] name = "anchor-attribute-constant" -version = "0.22.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d347ce462ceba4473d216bab2c9d0d9702a027d25e93b5376d8d8593d9e13de0" +checksum = "dc632c540913dd051a78b00587cc47f57013d303163ddfaf4fa18717f7ccc1e0" dependencies = [ "anchor-syn", - "proc-macro2 1.0.37", - "syn 1.0.91", + "proc-macro2 1.0.39", + "syn 1.0.95", ] [[package]] name = "anchor-attribute-error" -version = "0.22.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "354582d796f8309252d18f787f0e49df8ab6fdfe48f838f059f001ee2f04b5c8" +checksum = "3b5bd1dcfa7f3bc22dacef233d70a9e0bee269c4ac484510662f257cba2353a1" dependencies = [ "anchor-syn", - "proc-macro2 1.0.37", - "quote 1.0.17", - "syn 1.0.91", + "proc-macro2 1.0.39", + "quote 1.0.18", + "syn 1.0.95", ] [[package]] name = "anchor-attribute-event" -version = "0.22.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a2e218dd8a446993463e38c00159349ae25aa76076191cde0ba460c9c65a180" +checksum = "6c6f9e6ce551ac9a177a45c99a65699a860c9e95fac68675138af1246e2591b0" dependencies = [ "anchor-syn", "anyhow", - "proc-macro2 1.0.37", - "quote 1.0.17", - "syn 1.0.91", + "proc-macro2 1.0.39", + "quote 1.0.18", + "syn 1.0.95", ] [[package]] name = "anchor-attribute-interface" -version = "0.22.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e1e536e15b13e3168cf878a90b1bd2dfff1b4c8c9475be4b87f71b20cf8e85d" +checksum = "d104aa17418cb329ed7418b227e083d5f326a27f26ce98f5d92e33da62a5f459" dependencies = [ "anchor-syn", "anyhow", "heck 0.3.3", - "proc-macro2 1.0.37", - "quote 1.0.17", - "syn 1.0.91", + "proc-macro2 1.0.39", + "quote 1.0.18", + "syn 1.0.95", ] [[package]] name = "anchor-attribute-program" -version = "0.22.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6519b3ac626c1bd9df407fe22ec6a283f4b1067ee7f3be896ca580be510b7196" +checksum = "b6831b920b173c004ddf7ae1167d1d25e9f002ffcb1773bbc5c7ce532a4441e1" dependencies = [ "anchor-syn", "anyhow", - "proc-macro2 1.0.37", - "quote 1.0.17", - "syn 1.0.91", + "proc-macro2 1.0.39", + "quote 1.0.18", + "syn 1.0.95", ] [[package]] name = "anchor-attribute-state" -version = "0.22.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88e6a21070bcb053f092a1a9054924e8a1b5afd68f7317d0138327401ac154e1" +checksum = "cde147b10c71d95dc679785db0b5f3abac0091f789167aa62ac0135e2f54e8b9" dependencies = [ "anchor-syn", "anyhow", - "proc-macro2 1.0.37", - "quote 1.0.17", - "syn 1.0.91", + "proc-macro2 1.0.39", + "quote 1.0.18", + "syn 1.0.95", ] [[package]] name = "anchor-client" -version = "0.22.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95d1dc925cb274be7eecd7de6660e41d9fa2d664a7c088fc378cdd22c8e68fb0" +checksum = "eb1dfd40bbeeb17ff748a0eb9df2d58c70f0e3ac4e11dac08228d3c99ab68976" dependencies = [ "anchor-lang", "anyhow", @@ -205,27 +178,27 @@ dependencies = [ "solana-client", "solana-sdk", "thiserror", - "url 2.2.2", + "url", ] [[package]] name = "anchor-derive-accounts" -version = "0.22.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09a65890c2132f30a3ff160fb83f74e0a0454f904f46f1c9be38d3e94c2d06ed" +checksum = "9cde98a0e1a56046b040ff591dfda391f88917af2b6487d02b45093c05be3514" dependencies = [ "anchor-syn", "anyhow", - "proc-macro2 1.0.37", - "quote 1.0.17", - "syn 1.0.91", + "proc-macro2 1.0.39", + "quote 1.0.18", + "syn 1.0.95", ] [[package]] name = "anchor-lang" -version = "0.22.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef066f4bc0cb4080ff6244b6a66ef31b6077e0302738b365ca894540f5b7dcf8" +checksum = "a85dd2c5e29e20c7f4701a43724d6cd5406d0ee5694705522e43da0f26542a84" dependencies = [ "anchor-attribute-access-control", "anchor-attribute-account", @@ -247,9 +220,9 @@ dependencies = [ [[package]] name = "anchor-spl" -version = "0.22.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcdf03d76450451f6c587098fa0d9775dc7eabf9173c89bd1bb17dd72b49e748" +checksum = "0188c33b4a3c124c4e593f2b440415aaea70a7650fac6ba0772395385d71c003" dependencies = [ "anchor-lang", "solana-program", @@ -259,20 +232,20 @@ dependencies = [ [[package]] name = "anchor-syn" -version = "0.22.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "506cb44e4e895f917566c7a0554e487a001041d82dd3ae9f1f37ae7f20f86222" +checksum = "03549dc2eae0b20beba6333b14520e511822a6321cdb1760f841064a69347316" dependencies = [ "anyhow", "bs58 0.3.1", "heck 0.3.3", - "proc-macro2 1.0.37", + "proc-macro2 1.0.39", "proc-macro2-diagnostics", - "quote 1.0.17", + "quote 1.0.18", "serde", "serde_json", - "sha2 0.9.9", - "syn 1.0.91", + "sha2", + "syn 1.0.95", "thiserror", ] @@ -282,20 +255,14 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" dependencies = [ - "winapi 0.3.9", + "winapi", ] [[package]] name = "anyhow" -version = "1.0.56" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4361135be9122e0870de935d7c439aef945b9f9ddd4199a553b5270b49c82a27" - -[[package]] -name = "arc-swap" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5d78ce20460b82d3fa150275ed9d55e21064fc7951177baacf86a145c4a4b1f" +checksum = "08f9b8508dccb7687a1d6c4ce66b2b0ecef467c94667de27d8d7fe1f8d2a9cdc" [[package]] name = "arrayref" @@ -321,45 +288,15 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" -[[package]] -name = "async-mutex" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479db852db25d9dbf6204e6cb6253698f175c15726470f78af0d918e99d6156e" -dependencies = [ - "event-listener", -] - -[[package]] -name = "async-stream" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dad5c83079eae9969be7fadefe640a1c566901f05ff91ab221de4b6f68d9507e" -dependencies = [ - "async-stream-impl", - "futures-core", -] - -[[package]] -name = "async-stream-impl" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10f203db73a71dfa2fb6dd22763990fa26f3d2625a6da2da900d23b87d26be27" -dependencies = [ - "proc-macro2 1.0.37", - "quote 1.0.17", - "syn 1.0.91", -] - [[package]] name = "async-trait" version = "0.1.53" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed6aa3524a2dfcf9fe180c51eae2b58738348d819517ceadf95789c51fff7600" dependencies = [ - "proc-macro2 1.0.37", - "quote 1.0.17", - "syn 1.0.91", + "proc-macro2 1.0.39", + "quote 1.0.18", + "syn 1.0.95", ] [[package]] @@ -370,7 +307,7 @@ checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ "hermit-abi", "libc", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -379,49 +316,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" -[[package]] -name = "axum" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47594e438a243791dba58124b6669561f5baa14cb12046641d8008bf035e5a25" -dependencies = [ - "async-trait", - "axum-core", - "bitflags", - "bytes", - "futures-util", - "http", - "http-body", - "hyper", - "itoa", - "matchit", - "memchr", - "mime", - "percent-encoding 2.1.0", - "pin-project-lite", - "serde", - "sync_wrapper", - "tokio", - "tower", - "tower-http", - "tower-layer", - "tower-service", -] - -[[package]] -name = "axum-core" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a671c9ae99531afdd5d3ee8340b8da547779430689947144c140fc74a740244" -dependencies = [ - "async-trait", - "bytes", - "futures-util", - "http", - "http-body", - "mime", -] - [[package]] name = "az" version = "1.2.0" @@ -429,24 +323,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f771a5d1f5503f7f4279a30f3643d3421ba149848b89ecaaec0ea2acf04a5ac4" [[package]] -name = "backoff" -version = "0.4.0" +name = "backtrace" +version = "0.3.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" +checksum = "11a17d453482a265fd5f8479f2a3f405566e6ca627837aaddb85af8b1ab8ef61" dependencies = [ - "futures-core", - "getrandom 0.2.6", - "instant", - "pin-project-lite", - "rand 0.8.5", - "tokio", + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", ] [[package]] -name = "base-x" -version = "0.2.8" +name = "base32" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b" +checksum = "23ce669cd6c8588f79e15cf450314f9638f967fc5770ff1c7c1deb0925ea7cfa" [[package]] name = "base64" @@ -460,12 +355,6 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" -[[package]] -name = "base64ct" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dea908e7347a8c64e378c17e30ef880ad73e3b4498346b055c2c00ea342f3179" - [[package]] name = "bincode" version = "1.3.3" @@ -475,40 +364,12 @@ dependencies = [ "serde", ] -[[package]] -name = "bindgen" -version = "0.59.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8" -dependencies = [ - "bitflags", - "cexpr", - "clang-sys", - "lazy_static", - "lazycell", - "peeking_take_while", - "proc-macro2 1.0.37", - "quote 1.0.17", - "regex", - "rustc-hash", - "shlex", -] - [[package]] name = "bitflags" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" -[[package]] -name = "bitmaps" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "031043d04099746d8db04daf1fa424b2bc8bd69d92b25962dcde24da39ab64a2" -dependencies = [ - "typenum", -] - [[package]] name = "blake3" version = "1.3.1" @@ -518,7 +379,7 @@ dependencies = [ "arrayref", "arrayvec", "cc", - "cfg-if 1.0.0", + "cfg-if", "constant_time_eq", "digest 0.10.3", ] @@ -567,8 +428,8 @@ dependencies = [ "borsh-derive-internal", "borsh-schema-derive-internal", "proc-macro-crate 0.1.5", - "proc-macro2 1.0.37", - "syn 1.0.91", + "proc-macro2 1.0.39", + "syn 1.0.95", ] [[package]] @@ -577,9 +438,9 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5449c28a7b352f2d1e592a8a28bf139bc71afb0764a14f3c02500935d8c44065" dependencies = [ - "proc-macro2 1.0.37", - "quote 1.0.17", - "syn 1.0.91", + "proc-macro2 1.0.39", + "quote 1.0.18", + "syn 1.0.95", ] [[package]] @@ -588,9 +449,9 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cdbd5696d8bfa21d53d9fe39a714a18538bad11492a42d066dbbc395fb1951c0" dependencies = [ - "proc-macro2 1.0.37", - "quote 1.0.17", - "syn 1.0.91", + "proc-macro2 1.0.39", + "quote 1.0.18", + "syn 1.0.95", ] [[package]] @@ -605,15 +466,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" -[[package]] -name = "bstr" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" -dependencies = [ - "memchr", -] - [[package]] name = "bumpalo" version = "3.9.1" @@ -645,9 +497,9 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "562e382481975bc61d11275ac5e62a19abd00b0547d99516a415336f183dcd0e" dependencies = [ - "proc-macro2 1.0.37", - "quote 1.0.17", - "syn 1.0.91", + "proc-macro2 1.0.39", + "quote 1.0.18", + "syn 1.0.95", ] [[package]] @@ -703,21 +555,6 @@ dependencies = [ "jobserver", ] -[[package]] -name = "cexpr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -dependencies = [ - "nom", -] - -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - [[package]] name = "cfg-if" version = "1.0.0" @@ -729,9 +566,9 @@ name = "checked_math" version = "0.1.0" dependencies = [ "proc-macro-error", - "proc-macro2 1.0.37", - "quote 1.0.17", - "syn 1.0.91", + "proc-macro2 1.0.39", + "quote 1.0.18", + "syn 1.0.95", "trybuild", ] @@ -745,8 +582,8 @@ dependencies = [ "num-integer", "num-traits", "serde", - "time 0.1.43", - "winapi 0.3.9", + "time", + "winapi", ] [[package]] @@ -758,36 +595,6 @@ dependencies = [ "chrono", ] -[[package]] -name = "cipher" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" -dependencies = [ - "generic-array", -] - -[[package]] -name = "cipher" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1873270f8f7942c191139cb8a40fd228da6c3fd2fc376d7e92d47aa14aeb59e" -dependencies = [ - "crypto-common", - "inout", -] - -[[package]] -name = "clang-sys" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cc00842eed744b858222c4c9faf7243aafc6d33f92f96935263ef4d8a41ce21" -dependencies = [ - "glob", - "libc", - "libloading", -] - [[package]] name = "clap" version = "2.34.0" @@ -805,16 +612,16 @@ dependencies = [ [[package]] name = "clap" -version = "3.1.8" +version = "3.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71c47df61d9e16dc010b55dba1952a57d8c215dbb533fd13cdd13369aac73b1c" +checksum = "d2dbdf4bdacb33466e854ce889eee8dfd5729abf7ccd7664d0a2d60cd384440b" dependencies = [ "atty", "bitflags", "clap_derive", + "clap_lex", "indexmap", "lazy_static", - "os_str_bytes", "strsim 0.10.0", "termcolor", "textwrap 0.15.0", @@ -822,24 +629,24 @@ dependencies = [ [[package]] name = "clap_derive" -version = "3.1.7" +version = "3.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3aab4734e083b809aaf5794e14e756d1c798d2c69c7f7de7a09a2f5214993c1" +checksum = "25320346e922cffe59c0bbc5410c8d8784509efb321488971081313cb1e1a33c" dependencies = [ "heck 0.4.0", "proc-macro-error", - "proc-macro2 1.0.37", - "quote 1.0.17", - "syn 1.0.91", + "proc-macro2 1.0.39", + "quote 1.0.18", + "syn 1.0.95", ] [[package]] -name = "cmake" -version = "0.1.48" +name = "clap_lex" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8ad8cef104ac57b68b89df3208164d228503abbdce70f6880ffa3d970e7443a" +checksum = "a37c35f1112dad5e6e0b1adaff798507497a18fceeb30cceb3bae7d1427b9213" dependencies = [ - "cc", + "os_str_bytes", ] [[package]] @@ -867,7 +674,7 @@ dependencies = [ "regex", "terminal_size", "unicode-width", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -876,7 +683,7 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "wasm-bindgen", ] @@ -890,58 +697,12 @@ dependencies = [ "web-sys", ] -[[package]] -name = "const-oid" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3" - -[[package]] -name = "const_fn" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935" - [[package]] name = "constant_time_eq" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" -[[package]] -name = "convert_case" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" - -[[package]] -name = "core-foundation" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" - -[[package]] -name = "core_affinity" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f8a03115cc34fb0d7c321dd154a3914b3ca082ccc5c11d91bf7117dbbe7171f" -dependencies = [ - "kernel32-sys", - "libc", - "num_cpus", - "winapi 0.2.8", -] - [[package]] name = "cpufeatures" version = "0.2.2" @@ -957,7 +718,7 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -966,7 +727,7 @@ version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5aaa7bd5fb665c6864b5f963dd9097905c54125909c7aa94c9e18507cdbe6c53" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-utils", ] @@ -976,7 +737,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] @@ -988,7 +749,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1145cf131a2c6ba0615079ab6a638f7e1973ac9c2634fcbeaaad6114246efe8c" dependencies = [ "autocfg", - "cfg-if 1.0.0", + "cfg-if", "crossbeam-utils", "lazy_static", "memoffset", @@ -1001,7 +762,7 @@ version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "lazy_static", ] @@ -1032,12 +793,23 @@ dependencies = [ ] [[package]] -name = "ctr" -version = "0.8.0" +name = "crypto-mac" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea" +checksum = "58bcd97a54c7ca5ce2f6eb16f6bede5b0ab5f0055fedc17d2f0b4466e21671ca" dependencies = [ - "cipher 0.3.0", + "generic-array", + "subtle", +] + +[[package]] +name = "crypto-mac" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" +dependencies = [ + "generic-array", + "subtle", ] [[package]] @@ -1049,7 +821,6 @@ dependencies = [ "byteorder", "digest 0.9.0", "rand_core 0.5.1", - "serde", "subtle", "zeroize", ] @@ -1060,46 +831,28 @@ version = "4.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e77a43b28d0668df09411cb0bc9a8c2adc40f9a048afe863e05fd43251e8e39c" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "num_cpus", "rayon", ] -[[package]] -name = "der" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6919815d73839e7ad218de758883aae3a257ba6759ce7a9992501efbb53d705c" -dependencies = [ - "const-oid", -] - [[package]] name = "derivation-path" -version = "0.2.0" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e5c37193a1db1d8ed868c03ec7b152175f26160a5b740e5e484143877e0adf0" - -[[package]] -name = "derive_more" -version = "0.99.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +checksum = "193388a8c8c75a490b604ff61775e236541b8975e98e5ca1f6ea97d122b7e2db" dependencies = [ - "convert_case", - "proc-macro2 1.0.37", - "quote 1.0.17", - "rustc_version 0.4.0", - "syn 1.0.91", + "failure", ] [[package]] name = "dialoguer" -version = "0.10.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349d6b4fabcd9e97e1df1ae15395ac7e49fb144946a0d453959dc2696273b9da" +checksum = "61579ada4ec0c6031cfac3f86fdba0d195a7ebeb5e36693bd53cb5999a25beeb" dependencies = [ "console", + "lazy_static", "tempfile", "zeroize", ] @@ -1139,7 +892,7 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "dirs-sys-next", ] @@ -1151,15 +904,9 @@ checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" dependencies = [ "libc", "redox_users", - "winapi 0.3.9", + "winapi", ] -[[package]] -name = "discard" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" - [[package]] name = "dlopen" version = "0.1.8" @@ -1169,7 +916,7 @@ dependencies = [ "dlopen_derive", "lazy_static", "libc", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -1190,10 +937,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f" [[package]] -name = "ed25519" -version = "1.4.1" +name = "dyn-clone" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d5c4b5e5959dc2c2b89918d8e2cc40fcdd623cef026ed09d2f0ee05199dc8e4" +checksum = "21e50f3adc76d6a43f5ed73b698a87d0760ca74617f60f7c3b879003536fdd28" + +[[package]] +name = "ed25519" +version = "1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9c280362032ea4203659fc489832d0204ef09f247a0506f170dafcac08c369" dependencies = [ "signature", ] @@ -1208,20 +961,21 @@ dependencies = [ "ed25519", "rand 0.7.3", "serde", - "sha2 0.9.9", + "sha2", "zeroize", ] [[package]] name = "ed25519-dalek-bip32" -version = "0.2.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d2be62a4061b872c8c0873ee4fc6f101ce7b889d039f019c5fa2af471a59908" +checksum = "057f328f31294b5ab432e6c39642f54afd1531677d6d4ba2905932844cc242f3" dependencies = [ "derivation-path", "ed25519-dalek", - "hmac 0.12.1", - "sha2 0.10.2", + "failure", + "hmac 0.9.0", + "sha2", ] [[package]] @@ -1231,9 +985,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c07b7cc9cd8c08d10db74fca3b20949b9b6199725c04a0cce6d543496098fcac" dependencies = [ "enum-ordinalize", - "proc-macro2 1.0.37", - "quote 1.0.17", - "syn 1.0.91", + "proc-macro2 1.0.39", + "quote 1.0.18", + "syn 1.0.95", ] [[package]] @@ -1254,27 +1008,7 @@ version = "0.8.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "enum-iterator" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eeac5c5edb79e4e39fe8439ef35207780a11f69c52cbe424ce3dfad4cb78de6" -dependencies = [ - "enum-iterator-derive", -] - -[[package]] -name = "enum-iterator-derive" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c134c37760b27a871ba422106eedbb8247da973a09e82558bf26d619c882b159" -dependencies = [ - "proc-macro2 1.0.37", - "quote 1.0.17", - "syn 1.0.91", + "cfg-if", ] [[package]] @@ -1285,10 +1019,10 @@ checksum = "2170fc0efee383079a8bdd05d6ea2a184d2a0f07a1c1dcabdb2fd5e9f24bc36c" dependencies = [ "num-bigint", "num-traits", - "proc-macro2 1.0.37", - "quote 1.0.17", + "proc-macro2 1.0.39", + "quote 1.0.18", "rustc_version 0.4.0", - "syn 1.0.91", + "syn 1.0.95", ] [[package]] @@ -1306,9 +1040,9 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "946ee94e3dbf58fdd324f9ce245c7b238d46a66f00e86a020b71996349e46cce" dependencies = [ - "proc-macro2 1.0.37", - "quote 1.0.17", - "syn 1.0.91", + "proc-macro2 1.0.39", + "quote 1.0.18", + "syn 1.0.95", ] [[package]] @@ -1345,7 +1079,7 @@ checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" dependencies = [ "errno-dragonfly", "libc", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -1359,18 +1093,25 @@ dependencies = [ ] [[package]] -name = "event-listener" -version = "2.5.2" +name = "failure" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77f3309417938f28bf8228fcff79a4a37103981e3e186d2ccd19c74b38f4eb71" +checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" +dependencies = [ + "backtrace", + "failure_derive", +] [[package]] -name = "fast-math" -version = "0.1.1" +name = "failure_derive" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2465292146cdfc2011350fe3b1c616ac83cf0faeedb33463ba1c332ed8948d66" +checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" dependencies = [ - "ieee754", + "proc-macro2 1.0.39", + "quote 1.0.18", + "syn 1.0.95", + "synstructure", ] [[package]] @@ -1400,14 +1141,14 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "975ccf83d8d9d0d84682850a38c8169027be83368805971cc4f238c2b245bc98" +checksum = "c0408e2626025178a6a7f7ffc05a25bc47103229f19c113755de7bf63816290c" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "redox_syscall", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -1444,9 +1185,9 @@ dependencies = [ "fixed", "paste", "proc-macro-error", - "proc-macro2 1.0.37", - "quote 1.0.17", - "syn 1.0.91", + "proc-macro2 1.0.39", + "quote 1.0.18", + "syn 1.0.95", ] [[package]] @@ -1459,19 +1200,13 @@ dependencies = [ "fixed-macro-impl", ] -[[package]] -name = "fixedbitset" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "279fb028e20b3c4c320317955b77c5e0c9701f05a1d309905d6fc702cdc5053e" - [[package]] name = "flate2" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53f" +checksum = "b39522e96686d38f4bc984b9198e3a0613264abaebaff2c5c918bfa6b6da09af" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crc32fast", "libc", "miniz_oxide", @@ -1483,21 +1218,6 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - [[package]] name = "form_urlencoded" version = "1.0.1" @@ -1505,7 +1225,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" dependencies = [ "matches", - "percent-encoding 2.1.0", + "percent-encoding", ] [[package]] @@ -1514,12 +1234,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394" -[[package]] -name = "futures" -version = "0.1.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" - [[package]] name = "futures" version = "0.3.21" @@ -1560,7 +1274,6 @@ dependencies = [ "futures-core", "futures-task", "futures-util", - "num_cpus", ] [[package]] @@ -1575,9 +1288,9 @@ version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512" dependencies = [ - "proc-macro2 1.0.37", - "quote 1.0.17", - "syn 1.0.91", + "proc-macro2 1.0.39", + "quote 1.0.18", + "syn 1.0.95", ] [[package]] @@ -1598,7 +1311,6 @@ version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a" dependencies = [ - "futures 0.1.31", "futures-channel", "futures-core", "futures-io", @@ -1611,15 +1323,6 @@ dependencies = [ "slab", ] -[[package]] -name = "fxhash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] - [[package]] name = "generic-array" version = "0.14.5" @@ -1638,7 +1341,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e" dependencies = [ "libc", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -1647,7 +1350,7 @@ version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "js-sys", "libc", "wasi 0.9.0+wasi-snapshot-preview1", @@ -1660,49 +1363,23 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "wasi 0.10.2+wasi-snapshot-preview1", ] +[[package]] +name = "gimli" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4" + [[package]] name = "glob" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" -[[package]] -name = "globset" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10463d9ff00a2a068db14231982f5132edebad0d7660cd956a1c30292dbcbfbd" -dependencies = [ - "aho-corasick", - "bstr", - "fnv", - "log", - "regex", -] - -[[package]] -name = "goauth" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f3d68c8343245dc047982651b5afb8bd659c9959ed72efe5a73bf22684e5fd" -dependencies = [ - "arc-swap", - "futures 0.3.21", - "log", - "reqwest", - "serde", - "serde_derive", - "serde_json", - "simpl", - "smpl_jwt", - "time 0.3.9", - "tokio", -] - [[package]] name = "goblin" version = "0.4.3" @@ -1729,7 +1406,7 @@ dependencies = [ "indexmap", "slab", "tokio", - "tokio-util 0.7.1", + "tokio-util 0.7.2", "tracing", ] @@ -1782,10 +1459,15 @@ dependencies = [ ] [[package]] -name = "histogram" -version = "0.6.9" +name = "hidapi" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12cb882ccb290b8646e554b157ab0b71e64e8d5bef775cd66b6531e52d302669" +checksum = "38b1717343691998deb81766bfcd1dce6df0d5d6c37070b5a3de2bb6d39f7822" +dependencies = [ + "cc", + "libc", + "pkg-config", +] [[package]] name = "hmac" @@ -1793,17 +1475,28 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "126888268dcc288495a26bf004b38c5fdbb31682f992c84ceb046a1f0fe38840" dependencies = [ - "crypto-mac", + "crypto-mac 0.8.0", "digest 0.9.0", ] [[package]] name = "hmac" -version = "0.12.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +checksum = "deae6d9dbb35ec2c502d62b8f7b1c000a0822c3b0794ba36b3149c0a1c840dff" dependencies = [ - "digest 0.10.3", + "crypto-mac 0.9.1", + "digest 0.9.0", +] + +[[package]] +name = "hmac" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" +dependencies = [ + "crypto-mac 0.11.1", + "digest 0.9.0", ] [[package]] @@ -1819,9 +1512,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f4c6746584866f0feabcc69893c5b51beef3831656a968ed7ae254cdc4fd03" +checksum = "ff8670570af52249509a86f5e3e18a08c60b177071826898fde8997cf5f6bfbb" dependencies = [ "bytes", "fnv", @@ -1839,17 +1532,11 @@ dependencies = [ "pin-project-lite", ] -[[package]] -name = "http-range-header" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29" - [[package]] name = "httparse" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9100414882e15fb7feccb4897e5f0ff0ff1ca7d1a86a23208ada4d7a18e6c6c4" +checksum = "496ce29bb5a52785b44e0f7ca2847ae0bb839c9bd28f69acac9b99d461c0c04c" [[package]] name = "httpdate" @@ -1900,42 +1587,6 @@ dependencies = [ "tokio-rustls", ] -[[package]] -name = "hyper-timeout" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" -dependencies = [ - "hyper", - "pin-project-lite", - "tokio", - "tokio-io-timeout", -] - -[[package]] -name = "hyper-tls" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" -dependencies = [ - "bytes", - "hyper", - "native-tls", - "tokio", - "tokio-native-tls", -] - -[[package]] -name = "idna" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - [[package]] name = "idna" version = "0.2.3" @@ -1947,28 +1598,6 @@ dependencies = [ "unicode-normalization", ] -[[package]] -name = "ieee754" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9007da9cacbd3e6343da136e98b0d2df013f553d35bdec8b518f07bea768e19c" - -[[package]] -name = "im" -version = "15.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "111c1983f3c5bb72732df25cddacee9b546d08325fb584b5ebd38148be7b0246" -dependencies = [ - "bitmaps", - "rand_core 0.5.1", - "rand_xoshiro", - "rayon", - "serde", - "sized-chunks", - "typenum", - "version_check", -] - [[package]] name = "index_list" version = "0.2.7" @@ -1983,7 +1612,6 @@ checksum = "0f647032dfaa1f8b6dc29bd3edb7bbef4861b8b8007ebb118d6db284fd59f6ee" dependencies = [ "autocfg", "hashbrown", - "rayon", ] [[package]] @@ -1998,29 +1626,20 @@ dependencies = [ "regex", ] -[[package]] -name = "inout" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" -dependencies = [ - "generic-array", -] - [[package]] name = "instant" version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] name = "ipnet" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35e70ee094dc02fd9c13fdad4940090f22dbd6ac7c9e7094a46cf0232a50bc7c" +checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b" [[package]] name = "itertools" @@ -2042,9 +1661,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" +checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d" [[package]] name = "jobserver" @@ -2064,29 +1683,13 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "jsonrpc-client-transports" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b99d4207e2a04fb4581746903c2bb7eb376f88de9c699d0f3e10feeac0cd3a" -dependencies = [ - "derive_more", - "futures 0.3.21", - "jsonrpc-core", - "jsonrpc-pubsub", - "log", - "serde", - "serde_json", - "url 1.7.2", -] - [[package]] name = "jsonrpc-core" version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14f7f76aef2d054868398427f6c54943cf3d1caa9a7ec7d0c38d69df97a965eb" dependencies = [ - "futures 0.3.21", + "futures", "futures-executor", "futures-util", "log", @@ -2095,77 +1698,6 @@ dependencies = [ "serde_json", ] -[[package]] -name = "jsonrpc-core-client" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b51da17abecbdab3e3d4f26b01c5ec075e88d3abe3ab3b05dc9aa69392764ec0" -dependencies = [ - "futures 0.3.21", - "jsonrpc-client-transports", -] - -[[package]] -name = "jsonrpc-derive" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b939a78fa820cdfcb7ee7484466746a7377760970f6f9c6fe19f9edcc8a38d2" -dependencies = [ - "proc-macro-crate 0.1.5", - "proc-macro2 1.0.37", - "quote 1.0.17", - "syn 1.0.91", -] - -[[package]] -name = "jsonrpc-http-server" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1dea6e07251d9ce6a552abfb5d7ad6bc290a4596c8dcc3d795fae2bbdc1f3ff" -dependencies = [ - "futures 0.3.21", - "hyper", - "jsonrpc-core", - "jsonrpc-server-utils", - "log", - "net2", - "parking_lot 0.11.2", - "unicase", -] - -[[package]] -name = "jsonrpc-pubsub" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240f87695e6c6f62fb37f05c02c04953cf68d6408b8c1c89de85c7a0125b1011" -dependencies = [ - "futures 0.3.21", - "jsonrpc-core", - "lazy_static", - "log", - "parking_lot 0.11.2", - "rand 0.7.3", - "serde", -] - -[[package]] -name = "jsonrpc-server-utils" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4fdea130485b572c39a460d50888beb00afb3e35de23ccd7fad8ff19f0e0d4" -dependencies = [ - "bytes", - "futures 0.3.21", - "globset", - "jsonrpc-core", - "lazy_static", - "log", - "tokio", - "tokio-stream", - "tokio-util 0.6.9", - "unicase", -] - [[package]] name = "keccak" version = "0.1.0" @@ -2179,51 +1711,28 @@ dependencies = [ "anchor-client", "anchor-lang", "anyhow", - "clap 3.1.8", + "clap 3.1.18", "dotenv", "env_logger 0.8.4", - "futures 0.3.21", + "futures", "log", "mango-v4", - "serde", - "serde_json", - "shellexpand", - "solana-account-decoder", "solana-client", - "solana-program", - "solana-rpc", "solana-sdk", - "solana-transaction-status", "tokio", ] -[[package]] -name = "kernel32-sys" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" -dependencies = [ - "winapi 0.2.8", - "winapi-build", -] - [[package]] name = "lazy_static" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - [[package]] name = "libc" -version = "0.2.122" +version = "0.2.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec647867e2bf0772e28c8bcde4f0d19a9216916e890543b5a03ed8ef27b8f259" +checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" [[package]] name = "libloading" @@ -2231,28 +1740,8 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd" dependencies = [ - "cfg-if 1.0.0", - "winapi 0.3.9", -] - -[[package]] -name = "libm" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33a33a362ce288760ec6a508b94caaec573ae7d3bbbd91b87aa0bad4456839db" - -[[package]] -name = "librocksdb-sys" -version = "0.6.1+6.28.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bc587013734dadb7cf23468e531aa120788b87243648be42e2d3a072186291" -dependencies = [ - "bindgen", - "bzip2-sys", - "cc", - "glob", - "libc", - "libz-sys", + "cfg-if", + "winapi", ] [[package]] @@ -2270,7 +1759,7 @@ dependencies = [ "libsecp256k1-gen-genmult", "rand 0.7.3", "serde", - "sha2 0.9.9", + "sha2", "typenum", ] @@ -2303,17 +1792,6 @@ dependencies = [ "libsecp256k1-core", ] -[[package]] -name = "libz-sys" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f35facd4a5673cb5a48822be2be1d4236c1c99cb4113cab7061ac720d5bf859" -dependencies = [ - "cc", - "pkg-config", - "vcpkg", -] - [[package]] name = "linked-hash-map" version = "0.5.4" @@ -2332,20 +1810,11 @@ dependencies = [ [[package]] name = "log" -version = "0.4.16" +version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6389c490849ff5bc16be905ae24bc913a9c8892e19b2341dbc175e14c341c2b8" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "lru" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32613e41de4c47ab04970c348ca7ae7382cf116625755af070b008a15516a889" -dependencies = [ - "hashbrown", + "cfg-if", ] [[package]] @@ -2353,8 +1822,8 @@ name = "mango-macro" version = "0.0.1" dependencies = [ "bytemuck", - "quote 1.0.17", - "syn 1.0.91", + "quote 1.0.18", + "syn 1.0.95", ] [[package]] @@ -2377,7 +1846,7 @@ dependencies = [ "mango-macro", "margin-trade", "num_enum", - "pyth-client", + "pyth-sdk-solana", "rand 0.8.5", "serde", "serum_dex", @@ -2405,17 +1874,11 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" -[[package]] -name = "matchit" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73cbba799671b762df5a175adf59ce145165747bb891505c43d09aefbbf38beb" - [[package]] name = "memchr" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memmap2" @@ -2435,130 +1898,31 @@ dependencies = [ "autocfg", ] -[[package]] -name = "merlin" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58c38e2799fc0978b65dfff8023ec7843e2330bb462f19198840b34b6582397d" -dependencies = [ - "byteorder", - "keccak", - "rand_core 0.6.3", - "zeroize", -] - [[package]] name = "mime" version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - [[package]] name = "miniz_oxide" -version = "0.4.4" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" +checksum = "d2b29bd4bc3f33391105ebee3589c19197c4271e3e5a9ec9bfe8127eeff8f082" dependencies = [ "adler", - "autocfg", ] [[package]] name = "mio" -version = "0.7.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc" -dependencies = [ - "libc", - "log", - "miow", - "ntapi", - "winapi 0.3.9", -] - -[[package]] -name = "mio" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52da4364ffb0e4fe33a9841a98a3f3014fb964045ce4f7a45a398243c8d6b0c9" -dependencies = [ - "libc", - "log", - "miow", - "ntapi", - "wasi 0.11.0+wasi-snapshot-preview1", - "winapi 0.3.9", -] - -[[package]] -name = "miow" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "modular-bitfield" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a53d79ba8304ac1c4f9eb3b9d281f21f7be9d4626f72ce7df4ad8fbde4f38a74" -dependencies = [ - "modular-bitfield-impl", - "static_assertions", -] - -[[package]] -name = "modular-bitfield-impl" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a7d5f7076603ebc68de2dc6a650ec331a062a13abaa346975be747bbfa4b789" -dependencies = [ - "proc-macro2 1.0.37", - "quote 1.0.17", - "syn 1.0.91", -] - -[[package]] -name = "multimap" version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" - -[[package]] -name = "native-tls" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd7e2f3618557f980e0b17e8856252eee3c97fa12c54dff0ca290fb6266ca4a9" +checksum = "713d550d9b44d89174e066b7a6217ae06234c10cb47819a88290d2b353c31799" dependencies = [ - "lazy_static", "libc", "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - -[[package]] -name = "net2" -version = "0.2.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae" -dependencies = [ - "cfg-if 0.1.10", - "libc", - "winapi 0.3.9", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys", ] [[package]] @@ -2569,30 +1933,11 @@ checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6" dependencies = [ "bitflags", "cc", - "cfg-if 1.0.0", + "cfg-if", "libc", "memoffset", ] -[[package]] -name = "nom" -version = "7.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" -dependencies = [ - "memchr", - "minimal-lexical", -] - -[[package]] -name = "ntapi" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" -dependencies = [ - "winapi 0.3.9", -] - [[package]] name = "num-bigint" version = "0.4.3" @@ -2610,16 +1955,16 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" dependencies = [ - "proc-macro2 1.0.37", - "quote 1.0.17", - "syn 1.0.91", + "proc-macro2 1.0.39", + "quote 1.0.18", + "syn 1.0.95", ] [[package]] name = "num-integer" -version = "0.1.44" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" dependencies = [ "autocfg", "num-traits", @@ -2627,9 +1972,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg", ] @@ -2660,18 +2005,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce" dependencies = [ "proc-macro-crate 1.1.3", - "proc-macro2 1.0.37", - "quote 1.0.17", - "syn 1.0.91", -] - -[[package]] -name = "num_threads" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aba1801fb138d8e85e11d0fc70baf4fe1cdfffda7c6cd34a854905df588e5ed0" -dependencies = [ - "libc", + "proc-macro2 1.0.39", + "quote 1.0.18", + "syn 1.0.95", ] [[package]] @@ -2680,6 +2016,15 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" +[[package]] +name = "object" +version = "0.28.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e42c982f2d955fac81dd7e1d0e1426a7d702acd9c98d19ab01083a6a0328c424" +dependencies = [ + "memchr", +] + [[package]] name = "once_cell" version = "1.10.0" @@ -2692,49 +2037,6 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" -[[package]] -name = "openssl" -version = "0.10.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c7ae222234c30df141154f159066c5093ff73b63204dcda7121eb082fc56a95" -dependencies = [ - "bitflags", - "cfg-if 1.0.0", - "foreign-types", - "libc", - "once_cell", - "openssl-sys", -] - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "openssl-src" -version = "111.18.0+1.1.1n" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7897a926e1e8d00219127dc020130eca4292e5ca666dd592480d72c3eca2ff6c" -dependencies = [ - "cc", -] - -[[package]] -name = "openssl-sys" -version = "0.9.72" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e46109c383602735fa0a2e48dd2b7c892b048e1bf69e5c3b1d804b7d9c203cb" -dependencies = [ - "autocfg", - "cc", - "libc", - "openssl-src", - "pkg-config", - "vcpkg", -] - [[package]] name = "opentelemetry" version = "0.16.0" @@ -2743,10 +2045,10 @@ checksum = "e1cf9b1c4e9a6c4de793c632496fa490bdc0e1eea73f0c91394f7b6990935d22" dependencies = [ "async-trait", "crossbeam-channel", - "futures 0.3.21", + "futures", "js-sys", "lazy_static", - "percent-encoding 2.1.0", + "percent-encoding", "pin-project", "rand 0.8.5", "thiserror", @@ -2754,18 +2056,15 @@ dependencies = [ [[package]] name = "os_str_bytes" -version = "6.0.0" +version = "6.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64" -dependencies = [ - "memchr", -] +checksum = "029d8d0b2f198229de29dca79676f2738ff952edf3fde542eb8bf94d8c21b435" [[package]] name = "ouroboros" -version = "0.14.2" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71643f290d126e18ac2598876d01e1d57aed164afc78fdb6e2a0c6589a1f6662" +checksum = "f357ef82d1b4db66fbed0b8d542cbd3c22d0bf5b393b3c257b9ba4568e70c9c3" dependencies = [ "aliasable", "ouroboros_macro", @@ -2774,15 +2073,15 @@ dependencies = [ [[package]] name = "ouroboros_macro" -version = "0.14.2" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed9a247206016d424fe8497bc611e510887af5c261fbbf977877c4bb55ca4d82" +checksum = "44a0b52c2cbaef7dffa5fec1a43274afe8bd2a644fa9fc50a9ef4ff0269b1257" dependencies = [ "Inflector", "proc-macro-error", - "proc-macro2 1.0.37", - "quote 1.0.17", - "syn 1.0.91", + "proc-macro2 1.0.39", + "quote 1.0.18", + "syn 1.0.95", ] [[package]] @@ -2803,7 +2102,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58" dependencies = [ "lock_api", - "parking_lot_core 0.9.2", + "parking_lot_core 0.9.3", ] [[package]] @@ -2812,21 +2111,21 @@ version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "instant", "libc", "redox_syscall", "smallvec", - "winapi 0.3.9", + "winapi", ] [[package]] name = "parking_lot_core" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "995f667a6c822200b0433ac218e05582f0e2efa1b922a3fd2fbaadc5f87bab37" +checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "redox_syscall", "smallvec", @@ -2845,39 +2144,18 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "216eaa586a190f0a738f2f918511eecfa90f13295abec0e457cdebcceda80cbd" dependencies = [ - "crypto-mac", + "crypto-mac 0.8.0", ] [[package]] name = "pbkdf2" -version = "0.10.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "271779f35b581956db91a3e55737327a03aa051e90b1c47aeb189508533adfd7" +checksum = "f05894bce6a1ba4be299d0c5f29563e08af2bc18bb7d48313113bed71e904739" dependencies = [ - "digest 0.10.3", + "crypto-mac 0.11.1", ] -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - -[[package]] -name = "pem" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9a3b09a20e374558580a4914d3b7d89bd61b954a5a5e1dcbea98753addb1947" -dependencies = [ - "base64 0.13.0", -] - -[[package]] -name = "percent-encoding" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" - [[package]] name = "percent-encoding" version = "2.1.0" @@ -2893,16 +2171,6 @@ dependencies = [ "ucd-trie", ] -[[package]] -name = "petgraph" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a13a2fa9d0b63e5f22328828741e523766fff0ee9e779316902290dff3f824f" -dependencies = [ - "fixedbitset", - "indexmap", -] - [[package]] name = "pin-project" version = "1.0.10" @@ -2918,16 +2186,16 @@ version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb" dependencies = [ - "proc-macro2 1.0.37", - "quote 1.0.17", - "syn 1.0.91", + "proc-macro2 1.0.39", + "quote 1.0.18", + "syn 1.0.95", ] [[package]] name = "pin-project-lite" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c" +checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" [[package]] name = "pin-utils" @@ -2935,17 +2203,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" -[[package]] -name = "pkcs8" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cabda3fb821068a9a4fab19a683eac3af12edf0f34b94a8be53c4972b8149d0" -dependencies = [ - "der", - "spki", - "zeroize", -] - [[package]] name = "pkg-config" version = "0.3.25" @@ -2958,34 +2215,12 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" -[[package]] -name = "polyval" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8419d2b623c7c0896ff2d5d96e2cb4ede590fed28fcc34934f4c33c036e620a1" -dependencies = [ - "cfg-if 1.0.0", - "cpufeatures", - "opaque-debug", - "universal-hash", -] - [[package]] name = "ppv-lite86" version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" -[[package]] -name = "prettyplease" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b83ec2d0af5c5c556257ff52c9f98934e243b9fd39604bfb2a9b75ec2e97f18" -dependencies = [ - "proc-macro2 1.0.37", - "syn 1.0.91", -] - [[package]] name = "proc-macro-crate" version = "0.1.5" @@ -3012,9 +2247,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.37", - "quote 1.0.17", - "syn 1.0.91", + "proc-macro2 1.0.39", + "quote 1.0.18", + "syn 1.0.95", "version_check", ] @@ -3024,17 +2259,11 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.37", - "quote 1.0.17", + "proc-macro2 1.0.39", + "quote 1.0.18", "version_check", ] -[[package]] -name = "proc-macro-hack" -version = "0.5.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" - [[package]] name = "proc-macro2" version = "0.4.30" @@ -3046,11 +2275,11 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.37" +version = "1.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec757218438d5fda206afc041538b2f6d889286160d649a86a24d37e1235afd1" +checksum = "c54b25569025b7fc9651de43004ae593a75ad88543b17178aa5e1b9c4f15f56f" dependencies = [ - "unicode-xid 0.2.2", + "unicode-ident", ] [[package]] @@ -3059,79 +2288,37 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4bf29726d67464d49fa6224a1d07936a8c08bb3fba727c7493f6cf1616fdaada" dependencies = [ - "proc-macro2 1.0.37", - "quote 1.0.17", - "syn 1.0.91", + "proc-macro2 1.0.39", + "quote 1.0.18", + "syn 1.0.95", "version_check", "yansi", ] [[package]] -name = "prost" -version = "0.10.0" +name = "pyth-sdk" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bd5316aa8f5c82add416dfbc25116b84b748a21153f512917e8143640a71bbd" +checksum = "446ff07d7ef3bd98214f9b4fe6a611a69e36b5aad74b18cdbad5150193c1f204" dependencies = [ - "bytes", - "prost-derive", + "borsh", + "borsh-derive", + "schemars", + "serde", ] [[package]] -name = "prost-build" -version = "0.10.0" +name = "pyth-sdk-solana" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "328f9f29b82409216decb172d81e936415d21245befa79cd34c3f29d87d1c50b" -dependencies = [ - "bytes", - "cfg-if 1.0.0", - "cmake", - "heck 0.4.0", - "itertools 0.10.3", - "lazy_static", - "log", - "multimap", - "petgraph", - "prost", - "prost-types", - "regex", - "tempfile", - "which", -] - -[[package]] -name = "prost-derive" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df35198f0777b75e9ff669737c6da5136b59dba33cf5a010a6d1cc4d56defc6f" -dependencies = [ - "anyhow", - "itertools 0.10.3", - "proc-macro2 1.0.37", - "quote 1.0.17", - "syn 1.0.91", -] - -[[package]] -name = "prost-types" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "926681c118ae6e512a3ccefd4abbe5521a14f4cc1e207356d4d00c0b7f2006fd" -dependencies = [ - "bytes", - "prost", -] - -[[package]] -name = "pyth-client" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f779e98b8c8016d0c1409247a204bd4fcdea8b67ceeef545f04e324d66c49e52" +checksum = "27a648739aa69cab94edd900a0d7ca37d8a789e9c88741b23deec11fab418d16" dependencies = [ "borsh", "borsh-derive", "bytemuck", "num-derive", "num-traits", + "pyth-sdk", "serde", "solana-program", "thiserror", @@ -3143,61 +2330,7 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d464fae65fff2680baf48019211ce37aaec0c78e9264c84a3e484717f965104e" dependencies = [ - "percent-encoding 2.1.0", -] - -[[package]] -name = "quinn" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d147472bc9a09f13b06c044787b6683cdffa02e2865b7f0fb53d67c49ed2988e" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "fxhash", - "quinn-proto", - "quinn-udp", - "rustls", - "thiserror", - "tokio", - "tracing", - "webpki", -] - -[[package]] -name = "quinn-proto" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "359c5eb33845f3ee05c229e65f87cdbc503eea394964b8f1330833d460b4ff3e" -dependencies = [ - "bytes", - "fxhash", - "rand 0.8.5", - "ring", - "rustls", - "rustls-native-certs", - "rustls-pemfile 0.2.1", - "slab", - "thiserror", - "tinyvec", - "tracing", - "webpki", -] - -[[package]] -name = "quinn-udp" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df185e5e5f7611fa6e628ed8f9633df10114b03bbaecab186ec55822c44ac727" -dependencies = [ - "futures-util", - "libc", - "mio 0.7.14", - "quinn-proto", - "socket2", - "tokio", - "tracing", + "percent-encoding", ] [[package]] @@ -3211,11 +2344,11 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "632d02bff7f874a36f33ea8bb416cd484b90cc66c1194b1a1110d067a7013f58" +checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1" dependencies = [ - "proc-macro2 1.0.37", + "proc-macro2 1.0.39", ] [[package]] @@ -3299,20 +2432,11 @@ dependencies = [ "rand_core 0.5.1", ] -[[package]] -name = "rand_xoshiro" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9fcdd2e881d02f1d9390ae47ad8e5696a9e4be7b547a1da2afbc61973217004" -dependencies = [ - "rand_core 0.5.1", -] - [[package]] name = "rayon" -version = "1.5.1" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90" +checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d" dependencies = [ "autocfg", "crossbeam-deque", @@ -3322,29 +2446,16 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.9.1" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e" +checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f" dependencies = [ "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "lazy_static", "num_cpus", ] -[[package]] -name = "rcgen" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7fa2d386df8533b02184941c76ae2e0d0c1d053f5d43339169d80f21275fc5e" -dependencies = [ - "pem", - "ring", - "time 0.3.9", - "yasna", -] - [[package]] name = "redox_syscall" version = "0.2.13" @@ -3365,20 +2476,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "reed-solomon-erasure" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7170bac0d8306941e101df0caaa6518b10bc4232dd36c34f1cb78b8a063024db" -dependencies = [ - "cc", - "libc", - "libm", - "parking_lot 0.11.2", - "smallvec", - "spin 0.9.2", -] - [[package]] name = "regex" version = "1.5.5" @@ -3402,7 +2499,7 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" dependencies = [ - "winapi 0.3.9", + "winapi", ] [[package]] @@ -3421,24 +2518,21 @@ dependencies = [ "http-body", "hyper", "hyper-rustls", - "hyper-tls", "ipnet", "js-sys", "lazy_static", "log", "mime", - "native-tls", - "percent-encoding 2.1.0", + "percent-encoding", "pin-project-lite", "rustls", - "rustls-pemfile 0.3.0", + "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", "tokio", - "tokio-native-tls", "tokio-rustls", - "url 2.2.2", + "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -3455,32 +2549,20 @@ dependencies = [ "cc", "libc", "once_cell", - "spin 0.5.2", + "spin", "untrusted", "web-sys", - "winapi 0.3.9", -] - -[[package]] -name = "rocksdb" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "620f4129485ff1a7128d184bc687470c21c7951b64779ebc9cfdad3dcd920290" -dependencies = [ - "libc", - "librocksdb-sys", + "winapi", ] [[package]] name = "rpassword" -version = "6.0.1" +version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bf099a1888612545b683d2661a1940089f6c2e5a8e38979b2159da876bfd956" +checksum = "ffc936cf8a7ea60c58f030fd36a612a48f440610214dc54bc36431f9ea0c3efb" dependencies = [ "libc", - "serde", - "serde_json", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -3495,15 +2577,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" -[[package]] -name = "rustc_version" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -dependencies = [ - "semver 0.9.0", -] - [[package]] name = "rustc_version" version = "0.3.3" @@ -3519,14 +2592,14 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.7", + "semver 1.0.9", ] [[package]] name = "rustls" -version = "0.20.4" +version = "0.20.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fbfeb8d0ddb84706bc597a5574ab8912817c52a397f819e5b614e2265206921" +checksum = "5aab8ee6c7097ed6057f43c187a62418d0c05a4bd5f18b3571db50ee0f9ce033" dependencies = [ "log", "ring", @@ -3534,27 +2607,6 @@ dependencies = [ "webpki", ] -[[package]] -name = "rustls-native-certs" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca9ebdfa27d3fc180e42879037b5338ab1c040c06affd00d8338598e7800943" -dependencies = [ - "openssl-probe", - "rustls-pemfile 0.2.1", - "schannel", - "security-framework", -] - -[[package]] -name = "rustls-pemfile" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9" -dependencies = [ - "base64 0.13.0", -] - [[package]] name = "rustls-pemfile" version = "0.3.0" @@ -3572,9 +2624,9 @@ checksum = "f2cc38e8fa666e2de3c4aba7edeb5ffc5246c1c2ed0e3d17e560aeeba736b23f" [[package]] name = "ryu" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f" +checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695" [[package]] name = "safe-transmute" @@ -3592,13 +2644,27 @@ dependencies = [ ] [[package]] -name = "schannel" -version = "0.1.19" +name = "schemars" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" +checksum = "1847b767a3d62d95cbf3d8a9f0e421cf57a0d8aa4f411d4b16525afb0284d4ed" dependencies = [ - "lazy_static", - "winapi 0.3.9", + "dyn-clone", + "schemars_derive", + "serde", + "serde_json", +] + +[[package]] +name = "schemars_derive" +version = "0.8.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af4d7e1b012cb3d9129567661a63755ea4b8a7386d339dc945ae187e403c6743" +dependencies = [ + "proc-macro2 1.0.39", + "quote 1.0.18", + "serde_derive_internals", + "syn 1.0.95", ] [[package]] @@ -3622,9 +2688,9 @@ version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aaaae8f38bb311444cfb7f1979af0bc9240d95795f75f9ceddf6a59b79ceffa0" dependencies = [ - "proc-macro2 1.0.37", - "quote 1.0.17", - "syn 1.0.91", + "proc-macro2 1.0.39", + "quote 1.0.18", + "syn 1.0.95", ] [[package]] @@ -3637,58 +2703,20 @@ dependencies = [ "untrusted", ] -[[package]] -name = "security-framework" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dc14f172faf8a0194a3aded622712b0de276821addc574fa54fc0a1167e10dc" -dependencies = [ - "bitflags", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "semver" -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]] name = "semver" -version = "1.0.7" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d65bd28f48be7196d222d95b9243287f48d27aca604e08497513019ff0502cc4" - -[[package]] -name = "semver-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" +checksum = "8cb243bdfdb5936c8dc3c45762a19d12ab4550cdc753bc247637d4ec35a040fd" [[package]] name = "semver-parser" @@ -3701,38 +2729,49 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.136" +version = "1.0.137" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789" +checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1" dependencies = [ "serde_derive", ] [[package]] name = "serde_bytes" -version = "0.11.5" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16ae07dd2f88a366f15bd0632ba725227018c69a1c8550a927324f8eb8368bb9" +checksum = "212e73464ebcde48d723aa02eb270ba62eff38a9b732df31f33f1b4e145f3a54" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.136" +version = "1.0.137" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9" +checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be" dependencies = [ - "proc-macro2 1.0.37", - "quote 1.0.17", - "syn 1.0.91", + "proc-macro2 1.0.39", + "quote 1.0.18", + "syn 1.0.95", +] + +[[package]] +name = "serde_derive_internals" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c" +dependencies = [ + "proc-macro2 1.0.39", + "quote 1.0.18", + "syn 1.0.95", ] [[package]] name = "serde_json" -version = "1.0.79" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e8d9fa5c3b304765ce1fd9c4c8a3de2c8db365a5b91be52f186efc675681d95" +checksum = "9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c" dependencies = [ "itoa", "ryu", @@ -3753,9 +2792,9 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.8.23" +version = "0.8.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a521f2940385c165a24ee286aa8599633d162077a54bdcae2a6fd5a7bfa7a0" +checksum = "707d15895415db6628332b737c838b88c598522e4dc70647e59b72312924aebc" dependencies = [ "indexmap", "ryu", @@ -3793,38 +2832,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6" dependencies = [ "block-buffer 0.9.0", - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest 0.9.0", "opaque-debug", ] -[[package]] -name = "sha-1" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f" -dependencies = [ - "cfg-if 1.0.0", - "cpufeatures", - "digest 0.10.3", -] - -[[package]] -name = "sha1" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770" -dependencies = [ - "sha1_smol", -] - -[[package]] -name = "sha1_smol" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" - [[package]] name = "sha2" version = "0.9.9" @@ -3832,23 +2845,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" dependencies = [ "block-buffer 0.9.0", - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest 0.9.0", "opaque-debug", ] -[[package]] -name = "sha2" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55deaec60f81eefe3cce0dc50bda92d6d8e88f2a27df7c5033b42afeb1ed2676" -dependencies = [ - "cfg-if 1.0.0", - "cpufeatures", - "digest 0.10.3", -] - [[package]] name = "sha3" version = "0.9.1" @@ -3861,16 +2863,6 @@ dependencies = [ "opaque-debug", ] -[[package]] -name = "sha3" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "881bf8156c87b6301fc5ca6b27f11eeb2761224c7081e69b409d5a1951a70c86" -dependencies = [ - "digest 0.10.3", - "keccak", -] - [[package]] name = "sharded-slab" version = "0.1.4" @@ -3880,21 +2872,6 @@ dependencies = [ "lazy_static", ] -[[package]] -name = "shellexpand" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83bdb7831b2d85ddf4a7b148aa19d0587eddbe8671a436b7bd1182eaad0f2829" -dependencies = [ - "dirs-next", -] - -[[package]] -name = "shlex" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" - [[package]] name = "signal-hook-registry" version = "1.4.0" @@ -3910,22 +2887,6 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f054c6c1a6e95179d6f23ed974060dcefb2d9388bb7256900badad682c499de4" -[[package]] -name = "simpl" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a30f10c911c0355f80f1c2faa8096efc4a58cdf8590b954d5b395efa071c711" - -[[package]] -name = "sized-chunks" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16d69225bde7a69b235da73377861095455d298f2b970996eec25ddbb42b3d1e" -dependencies = [ - "bitmaps", - "typenum", -] - [[package]] name = "slab" version = "0.4.6" @@ -3938,22 +2899,6 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" -[[package]] -name = "smpl_jwt" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4370044f8b20f944e05c35d77edd3518e6f21fc4de77e593919f287c6a3f428a" -dependencies = [ - "base64 0.13.0", - "log", - "openssl", - "serde", - "serde_derive", - "serde_json", - "simpl", - "time 0.2.27", -] - [[package]] name = "socket2" version = "0.4.4" @@ -3961,32 +2906,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0" dependencies = [ "libc", - "winapi 0.3.9", -] - -[[package]] -name = "soketto" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d1c5305e39e09653383c2c7244f2f78b3bcae37cf50c64cb4789c9f5096ec2" -dependencies = [ - "base64 0.13.0", - "bytes", - "futures 0.3.21", - "httparse", - "log", - "rand 0.8.5", - "sha-1 0.9.8", + "winapi", ] [[package]] name = "solana-account-decoder" -version = "1.10.7" +version = "1.9.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f941f85590e0bbe11a5b5fe95af2b9fb3d4d309f024658ce1add2c98795e74c" +checksum = "d6b5eac3181f63bcb2f9d20eaaed7eb8866273a848ee79d4ef0727fc0a59f426" dependencies = [ "Inflector", - "base64 0.13.0", + "base64 0.12.3", "bincode", "bs58 0.4.0", "bv", @@ -4004,9 +2934,9 @@ dependencies = [ [[package]] name = "solana-address-lookup-table-program" -version = "1.10.7" +version = "1.9.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bab95e46ceb41278c4b2256b8821296a6ec7f6f17f5512aba79049fa8ba2789" +checksum = "3fabf475c4225c562174f04c04111ef0dbb7aa79da23a25029fc570130a255a9" dependencies = [ "bincode", "bytemuck", @@ -4017,7 +2947,6 @@ dependencies = [ "serde", "solana-frozen-abi", "solana-frozen-abi-macro", - "solana-program", "solana-program-runtime", "solana-sdk", "thiserror", @@ -4025,12 +2954,12 @@ dependencies = [ [[package]] name = "solana-banks-client" -version = "1.10.7" +version = "1.9.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21d9384d1b053f39da50b819717b655468a6d1a8c96cdd7610b2b2e5b949e83e" +checksum = "b4aed40d4231b34b99f809e8080f1db480da4eb1e85ec2206cf75283d390772d" dependencies = [ "borsh", - "futures 0.3.21", + "futures", "solana-banks-interface", "solana-program", "solana-sdk", @@ -4042,9 +2971,9 @@ dependencies = [ [[package]] name = "solana-banks-interface" -version = "1.10.7" +version = "1.9.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c6f987300aa588fc8ffa617300f2d9d4e97762c2e8cccd3e3de9afaa83e874" +checksum = "4210bb524475ea170c0ea703ddd2b2431bbb6893dfac59a138acadb96c04e366" dependencies = [ "serde", "solana-sdk", @@ -4053,13 +2982,12 @@ dependencies = [ [[package]] name = "solana-banks-server" -version = "1.10.7" +version = "1.9.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70cfa46d8d6adb7bb5cb6f087750ab733c873edfc91d5da40a2c7ea308e89e51" +checksum = "c785f8c2031e6d0649592258dd7103ed272f733ee3c772759f264556ae770aef" dependencies = [ "bincode", - "crossbeam-channel", - "futures 0.3.21", + "futures", "solana-banks-interface", "solana-runtime", "solana-sdk", @@ -4072,9 +3000,9 @@ dependencies = [ [[package]] name = "solana-bloom" -version = "1.10.7" +version = "1.9.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a69f639758af8ea7732515f4135f854e136765e6dc48a53394f2311a7836712c" +checksum = "df80d3bdc2a9be76bdcd049657300ad62b4da7132f12252a8f413b64f996b81d" dependencies = [ "bv", "fnv", @@ -4091,9 +3019,9 @@ dependencies = [ [[package]] name = "solana-bpf-loader-program" -version = "1.10.7" +version = "1.9.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43ecfd77fe5ea194c022564e5ca3c588bd5e029a4be43f3cfb1374770807d839" +checksum = "4f7d8ad241b700b10ab73c26f9a09788079e9f531dc9365eb2419e33fc4ac225" dependencies = [ "bincode", "byteorder", @@ -4103,21 +3031,22 @@ dependencies = [ "solana-metrics", "solana-program-runtime", "solana-sdk", - "solana-zk-token-sdk", "solana_rbpf", "thiserror", ] [[package]] name = "solana-bucket-map" -version = "1.10.7" +version = "1.9.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c609650ea5c7ce5aef4859bfe5bda1bdd02c89fa5e579cb9315cd1d05fa9255c" +checksum = "668a632d51fea52f46772dc2d4bf239e82b6914e81f2037b08f11ea99cb5b442" dependencies = [ + "fs_extra", "log", "memmap2", - "modular-bitfield", "rand 0.7.3", + "rayon", + "solana-logger", "solana-measure", "solana-sdk", "tempfile", @@ -4125,9 +3054,9 @@ dependencies = [ [[package]] name = "solana-clap-utils" -version = "1.10.7" +version = "1.9.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d151864e610f549dbaf236cfff8eccdc5c8bf55c1f6e82d87228284d566d7e" +checksum = "01fa6815cd7c814dd30803ba4814b5a6c3435eea5ab9095b7b1c4d0c0d7746f2" dependencies = [ "chrono", "clap 2.34.0", @@ -4138,51 +3067,39 @@ dependencies = [ "thiserror", "tiny-bip39", "uriparse", - "url 2.2.2", + "url", ] [[package]] name = "solana-cli-config" -version = "1.10.7" +version = "1.9.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "602674ac1e225cbc2d14273a2a1c2e885fe10a56944c40ba1906603794baa53a" +checksum = "3212b80d572fadd0b08eddcaab8500e1ec8b379a45539498a17a3ec654f94b32" dependencies = [ "dirs-next", "lazy_static", "serde", "serde_derive", "serde_yaml", - "url 2.2.2", + "url", ] [[package]] name = "solana-client" -version = "1.10.7" +version = "1.9.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b129549d021f408bcfbc80fa1ec33e0244c07bf6b35eb63d991a0ee6a45a717a" +checksum = "ca98b78af855281b51d58f202f56e7129a79e2b95b322c8989ee5689cca1cbab" dependencies = [ - "async-mutex", - "async-trait", "base64 0.13.0", "bincode", "bs58 0.4.0", - "bytes", "clap 2.34.0", - "crossbeam-channel", - "futures 0.3.21", - "futures-util", "indicatif", - "itertools 0.10.3", "jsonrpc-core", - "lazy_static", "log", - "quinn", - "rand 0.7.3", - "rand_chacha 0.2.2", "rayon", "reqwest", - "rustls", - "semver 1.0.7", + "semver 1.0.9", "serde", "serde_derive", "serde_json", @@ -4192,23 +3109,20 @@ dependencies = [ "solana-measure", "solana-net-utils", "solana-sdk", - "solana-streamer", "solana-transaction-status", "solana-version", "solana-vote-program", "thiserror", "tokio", - "tokio-stream", - "tokio-tungstenite", "tungstenite", - "url 2.2.2", + "url", ] [[package]] name = "solana-compute-budget-program" -version = "1.10.7" +version = "1.9.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b01e5ca310e2581da0a33e7605b615b249183d580c9b27555ae1c2f0ec8ca042" +checksum = "d6576c37b7aa0b33180fd3846de6a3b978868f109345c4e1473b76a9b8a64a65" dependencies = [ "solana-program-runtime", "solana-sdk", @@ -4216,9 +3130,9 @@ dependencies = [ [[package]] name = "solana-config-program" -version = "1.10.7" +version = "1.9.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77b3eaca3f411a99cc09e16eac7ff6aed0631fa3d279a3db38090d8d1bb2fb67" +checksum = "0f5936a580565d51bd617915a4ac8ee62b6ed8c82d35d620b977b93b09a4f86e" dependencies = [ "bincode", "chrono", @@ -4228,38 +3142,15 @@ dependencies = [ "solana-sdk", ] -[[package]] -name = "solana-entry" -version = "1.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81d8f76fc7a58f3cb05a7da536c479a9b7d03748b2579cac048b49dfe7195d88" -dependencies = [ - "bincode", - "crossbeam-channel", - "dlopen", - "dlopen_derive", - "log", - "rand 0.7.3", - "rayon", - "serde", - "solana-measure", - "solana-merkle-tree", - "solana-metrics", - "solana-perf", - "solana-rayon-threadlimit", - "solana-sdk", -] - [[package]] name = "solana-faucet" -version = "1.10.7" +version = "1.9.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3bc98b1e0150adb2680a3d7189edbc7856b53c5838bac89018b93a739ccae8f" +checksum = "8fc267d7a23fd6cf9a38e0895d77658d519c49cdb0cc340e807a6ca15b6fb3e3" dependencies = [ "bincode", "byteorder", "clap 2.34.0", - "crossbeam-channel", "log", "serde", "serde_derive", @@ -4276,142 +3167,41 @@ dependencies = [ [[package]] name = "solana-frozen-abi" -version = "1.10.7" +version = "1.9.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4309121d187515bbfb1c31874af740a3682680046470e25236738155371cf996" +checksum = "32bd264fcf01b5e7f6369247a9868164990c3744891901e6657319792ccab29b" dependencies = [ "bs58 0.4.0", "bv", "generic-array", - "im", - "lazy_static", "log", "memmap2", "rustc_version 0.4.0", "serde", - "serde_bytes", "serde_derive", - "sha2 0.10.2", + "sha2", "solana-frozen-abi-macro", + "solana-logger", "thiserror", ] [[package]] name = "solana-frozen-abi-macro" -version = "1.10.7" +version = "1.9.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "489afadc7ef99239ce98a559d15ded7b7a7caf92cb3de6bf6ebe5ce1001ce5c0" +checksum = "f9e3c82d0b3a69f4cdf9db2959b461d087e1d0044b034eaee547234daafcb776" dependencies = [ - "proc-macro2 1.0.37", - "quote 1.0.17", + "proc-macro2 1.0.39", + "quote 1.0.18", "rustc_version 0.4.0", - "syn 1.0.91", -] - -[[package]] -name = "solana-gossip" -version = "1.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c64eb26bdcfb275dd88ad78ed747b131ac86f78bd88fcf252266598fc078847d" -dependencies = [ - "bincode", - "bv", - "clap 2.34.0", - "crossbeam-channel", - "flate2", - "indexmap", - "itertools 0.10.3", - "log", - "lru", - "matches", - "num-traits", - "rand 0.7.3", - "rand_chacha 0.2.2", - "rayon", - "rustc_version 0.4.0", - "serde", - "serde_bytes", - "serde_derive", - "solana-bloom", - "solana-clap-utils", - "solana-client", - "solana-entry", - "solana-frozen-abi", - "solana-frozen-abi-macro", - "solana-ledger", - "solana-logger", - "solana-measure", - "solana-metrics", - "solana-net-utils", - "solana-perf", - "solana-rayon-threadlimit", - "solana-runtime", - "solana-sdk", - "solana-streamer", - "solana-version", - "solana-vote-program", - "thiserror", -] - -[[package]] -name = "solana-ledger" -version = "1.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3f17aef67ff10febb5d21de89dcfe031a73ce7b44d954298b2f4d74e94fdf48" -dependencies = [ - "bincode", - "bitflags", - "byteorder", - "chrono", - "chrono-humanize", - "crossbeam-channel", - "fs_extra", - "futures 0.3.21", - "itertools 0.10.3", - "lazy_static", - "libc", - "log", - "lru", - "num-derive", - "num-traits", - "num_cpus", - "prost", - "rand 0.7.3", - "rand_chacha 0.2.2", - "rayon", - "reed-solomon-erasure", - "rocksdb", - "rustc_version 0.4.0", - "serde", - "serde_bytes", - "sha2 0.10.2", - "solana-bpf-loader-program", - "solana-entry", - "solana-frozen-abi", - "solana-frozen-abi-macro", - "solana-measure", - "solana-metrics", - "solana-perf", - "solana-program-runtime", - "solana-rayon-threadlimit", - "solana-runtime", - "solana-sdk", - "solana-storage-bigtable", - "solana-storage-proto", - "solana-transaction-status", - "solana-vote-program", - "tempfile", - "thiserror", - "tokio", - "tokio-stream", - "trees", + "syn 1.0.95", ] [[package]] name = "solana-logger" -version = "1.10.7" +version = "1.9.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b75bee4762c5db25ae6d665abaddb93d1b5bb97944c0660639431057a3e336e8" +checksum = "5d5620cd1844bf999141323d434092893b28624a6fef15000265ef372868b153" dependencies = [ "env_logger 0.9.0", "lazy_static", @@ -4420,32 +3210,21 @@ dependencies = [ [[package]] name = "solana-measure" -version = "1.10.7" +version = "1.9.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26580a685dc4cd9eabbef91903a2b457b50631d0fbf7fd94581747940d2005dc" +checksum = "0576dd0d57937d8f7fc65a8fa80757b9abfefef32fc30c57a94400d220188692" dependencies = [ "log", "solana-sdk", ] -[[package]] -name = "solana-merkle-tree" -version = "1.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c126f0b5a37753d1f8762acb8ea6363450baa9ed3c8fda269f5eaa740cb5f4e" -dependencies = [ - "fast-math", - "matches", - "solana-program", -] - [[package]] name = "solana-metrics" -version = "1.10.7" +version = "1.9.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "812a5972c79ac86e4754937104c0acc6999a997e58e5011940aaf549a16f2cef" +checksum = "f4a399aeba86cae269b21b27b5940f43b431d802ddfa7e349bc2f7c7c0c12713" dependencies = [ - "crossbeam-channel", + "env_logger 0.9.0", "gethostname", "lazy_static", "log", @@ -4455,13 +3234,12 @@ dependencies = [ [[package]] name = "solana-net-utils" -version = "1.10.7" +version = "1.9.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da87e633efb261bcd877e392c452459dfc00352539d77d78000b4b84fbcdeffb" +checksum = "e3330f04c5bbb620399cb91189d4e0b05bed3600ea7078138bd5bb0c51467571" dependencies = [ "bincode", "clap 2.34.0", - "crossbeam-channel", "log", "nix", "rand 0.7.3", @@ -4472,14 +3250,14 @@ dependencies = [ "solana-sdk", "solana-version", "tokio", - "url 2.2.2", + "url", ] [[package]] name = "solana-perf" -version = "1.10.7" +version = "1.9.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6df2727caf32d69819d350bfa6191efee530b5716d4daf3917059fd738a96d79" +checksum = "9db7d246c7709802267284508099491813824ca877cbb1d3d2077c9fb4d059f3" dependencies = [ "ahash", "bincode", @@ -4496,36 +3274,19 @@ dependencies = [ "rand 0.7.3", "rayon", "serde", + "solana-bloom", + "solana-logger", "solana-metrics", "solana-rayon-threadlimit", "solana-sdk", "solana-vote-program", ] -[[package]] -name = "solana-poh" -version = "1.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c7ca053ca3cd311ac900c038e4a122094a21271783dab5649c8cf62573660aa" -dependencies = [ - "core_affinity", - "crossbeam-channel", - "log", - "solana-entry", - "solana-ledger", - "solana-measure", - "solana-metrics", - "solana-runtime", - "solana-sdk", - "solana-sys-tuner", - "thiserror", -] - [[package]] name = "solana-program" -version = "1.10.7" +version = "1.9.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f056f47278a3dbcb5a984c773df5df3e911fa5f5059069f06d4513eefc6e1f90" +checksum = "9a3894d193b164d62525746d9f06cc377d807f282a78c4f2153de69bbed4fef3" dependencies = [ "base64 0.13.0", "bincode", @@ -4547,17 +3308,18 @@ dependencies = [ "log", "num-derive", "num-traits", - "parking_lot 0.12.0", + "parking_lot 0.11.2", "rand 0.7.3", "rustc_version 0.4.0", "rustversion", "serde", "serde_bytes", "serde_derive", - "sha2 0.10.2", - "sha3 0.10.1", + "sha2", + "sha3", "solana-frozen-abi", "solana-frozen-abi-macro", + "solana-logger", "solana-sdk-macro", "thiserror", "wasm-bindgen", @@ -4565,13 +3327,12 @@ dependencies = [ [[package]] name = "solana-program-runtime" -version = "1.10.7" +version = "1.9.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e658015852f980ccd693c29459c951de4c729f8e34348d058cbb89b0b2a2ef39" +checksum = "429dffedf25c45f7a277c2deea8ebc039a06b07715da544ee01fc9f315a5d9b5" dependencies = [ "base64 0.13.0", "bincode", - "enum-iterator", "itertools 0.10.3", "libc", "libloading", @@ -4582,6 +3343,7 @@ dependencies = [ "serde", "solana-frozen-abi", "solana-frozen-abi-macro", + "solana-logger", "solana-measure", "solana-sdk", "thiserror", @@ -4589,12 +3351,12 @@ dependencies = [ [[package]] name = "solana-program-test" -version = "1.10.7" +version = "1.9.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb058f31ddfa5e13181e27bea1ed9e824b0b84a78e17ba58a58e7cb6a1f9797" +checksum = "3ac8cd55ec23f6078efa2431b57d24fd557b8cdce6942597ebb124a6e0cb9c62" dependencies = [ "async-trait", - "base64 0.13.0", + "base64 0.12.3", "bincode", "chrono-humanize", "log", @@ -4613,9 +3375,9 @@ dependencies = [ [[package]] name = "solana-rayon-threadlimit" -version = "1.10.7" +version = "1.9.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60fdedad14df11a6512b413dc77d00c089c33e94a7cc433e61efb614fb583668" +checksum = "4bf35b1c40b029494fcb5758cea4e91891be0547193811e8c75cc03ab8e2cb9e" dependencies = [ "lazy_static", "num_cpus", @@ -4623,79 +3385,30 @@ dependencies = [ [[package]] name = "solana-remote-wallet" -version = "1.10.7" +version = "1.9.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "981098bb4d5fe38a3e2104e522639d1e0c415aebba252c3be43b351c87328cf7" +checksum = "180c4ebee32bc330f006bb78e76076fefa7efdfbf29fbd0af6faf85365fb398d" dependencies = [ + "base32", "console", "dialoguer", + "hidapi", "log", "num-derive", "num-traits", - "parking_lot 0.12.0", + "parking_lot 0.11.2", "qstring", - "semver 1.0.7", + "semver 1.0.9", "solana-sdk", "thiserror", "uriparse", ] -[[package]] -name = "solana-rpc" -version = "1.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528f7950bb330fedcc1432d76dbbc9994fadf73abda750f6f31a9c137759902a" -dependencies = [ - "base64 0.13.0", - "bincode", - "bs58 0.4.0", - "crossbeam-channel", - "dashmap", - "itertools 0.10.3", - "jsonrpc-core", - "jsonrpc-core-client", - "jsonrpc-derive", - "jsonrpc-http-server", - "jsonrpc-pubsub", - "libc", - "log", - "rayon", - "regex", - "serde", - "serde_derive", - "serde_json", - "soketto", - "solana-account-decoder", - "solana-client", - "solana-entry", - "solana-faucet", - "solana-gossip", - "solana-ledger", - "solana-measure", - "solana-metrics", - "solana-perf", - "solana-poh", - "solana-rayon-threadlimit", - "solana-runtime", - "solana-sdk", - "solana-send-transaction-service", - "solana-storage-bigtable", - "solana-streamer", - "solana-transaction-status", - "solana-version", - "solana-vote-program", - "spl-token", - "stream-cancel", - "thiserror", - "tokio", - "tokio-util 0.6.9", -] - [[package]] name = "solana-runtime" -version = "1.10.7" +version = "1.9.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b62f2a206b1e105c8a3ffdb8ebab688aaad0ac338b433d6dddbaf1301764287" +checksum = "074dad62b090b34c597cfa0a6d294f79262521362a275182dd012efe4f1cf756" dependencies = [ "arrayref", "bincode", @@ -4709,7 +3422,6 @@ dependencies = [ "dir-diff", "flate2", "fnv", - "im", "index_list", "itertools 0.10.3", "lazy_static", @@ -4726,11 +3438,13 @@ dependencies = [ "serde", "serde_derive", "solana-address-lookup-table-program", + "solana-bloom", "solana-bucket-map", "solana-compute-budget-program", "solana-config-program", "solana-frozen-abi", "solana-frozen-abi-macro", + "solana-logger", "solana-measure", "solana-metrics", "solana-program-runtime", @@ -4738,8 +3452,6 @@ dependencies = [ "solana-sdk", "solana-stake-program", "solana-vote-program", - "solana-zk-token-proof-program", - "solana-zk-token-sdk", "symlink", "tar", "tempfile", @@ -4749,9 +3461,9 @@ dependencies = [ [[package]] name = "solana-sdk" -version = "1.10.7" +version = "1.9.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f00ec64dc557a1c0c7a5e0ffa64e4331db02e64a5384b5f9041a84fb4832e17b" +checksum = "c292b183ccde17be94eba9f167d2d142df65ef89a99471fb6abdb0d128995848" dependencies = [ "assert_matches", "base64 0.13.0", @@ -4763,11 +3475,11 @@ dependencies = [ "byteorder", "chrono", "derivation-path", - "digest 0.10.3", + "digest 0.9.0", "ed25519-dalek", "ed25519-dalek-bip32", "generic-array", - "hmac 0.12.1", + "hmac 0.11.0", "itertools 0.10.3", "js-sys", "lazy_static", @@ -4776,7 +3488,7 @@ dependencies = [ "memmap2", "num-derive", "num-traits", - "pbkdf2 0.10.1", + "pbkdf2 0.9.0", "qstring", "rand 0.7.3", "rand_chacha 0.2.2", @@ -4786,8 +3498,8 @@ dependencies = [ "serde_bytes", "serde_derive", "serde_json", - "sha2 0.10.2", - "sha3 0.10.1", + "sha2", + "sha3", "solana-frozen-abi", "solana-frozen-abi-macro", "solana-logger", @@ -4800,27 +3512,25 @@ dependencies = [ [[package]] name = "solana-sdk-macro" -version = "1.10.7" +version = "1.9.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4d800761d52b645fcd86ac080ad366947a5ff04e65ddaa5fb1708dda2a6390f" +checksum = "918b805a36d7c9a82fec5fb8e425539d45cd7e827168b493a5d995ef988a3edf" dependencies = [ "bs58 0.4.0", - "proc-macro2 1.0.37", - "quote 1.0.17", + "proc-macro2 1.0.39", + "quote 1.0.18", "rustversion", - "syn 1.0.91", + "syn 1.0.95", ] [[package]] name = "solana-send-transaction-service" -version = "1.10.7" +version = "1.9.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2543ac2cc6deff15c7cd2cdc00f8788a0828bbd4798ee6484cfa319ec56d334c" +checksum = "f0067a981951ebd8ebb78a6c99fcdb0ff5364c5ab25e9f7f5145dff695906f95" dependencies = [ - "crossbeam-channel", "log", - "solana-client", - "solana-measure", + "solana-logger", "solana-metrics", "solana-runtime", "solana-sdk", @@ -4828,9 +3538,9 @@ dependencies = [ [[package]] name = "solana-stake-program" -version = "1.10.7" +version = "1.9.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a989c154e1058503f95b293dc5dee61915f5a33761344a87e03d7857f5b6325" +checksum = "9c25ab417216af63ed8176c50dc620af56b66af10dedb4ad4b207b02f8f37712" dependencies = [ "bincode", "log", @@ -4849,101 +3559,14 @@ dependencies = [ "thiserror", ] -[[package]] -name = "solana-storage-bigtable" -version = "1.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b181f395ce4e74aeed04e6cccff2363a24ac5b3783038984de64a6d8fd646c2" -dependencies = [ - "backoff", - "bincode", - "bzip2", - "enum-iterator", - "flate2", - "goauth", - "log", - "openssl", - "prost", - "prost-types", - "serde", - "serde_derive", - "smpl_jwt", - "solana-metrics", - "solana-sdk", - "solana-storage-proto", - "solana-transaction-status", - "thiserror", - "tonic", - "zstd", -] - -[[package]] -name = "solana-storage-proto" -version = "1.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd46bb950de3189b126343ed904b862cb46b3d9031ebf1d55139a04d9359d0de" -dependencies = [ - "bincode", - "bs58 0.4.0", - "prost", - "serde", - "solana-account-decoder", - "solana-sdk", - "solana-transaction-status", - "tonic-build", -] - -[[package]] -name = "solana-streamer" -version = "1.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee165fc957267c2d8ea1c8dfac2debd040ffa7eb55522f85190a434c3170d7fa" -dependencies = [ - "crossbeam-channel", - "futures-util", - "histogram", - "itertools 0.10.3", - "libc", - "log", - "nix", - "pem", - "pkcs8", - "quinn", - "rand 0.7.3", - "rcgen", - "rustls", - "solana-metrics", - "solana-perf", - "solana-sdk", - "thiserror", - "tokio", -] - -[[package]] -name = "solana-sys-tuner" -version = "1.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f383814106f44f274c49ed9d947263d7fccbfe33297366a8071964adf9ae7eb3" -dependencies = [ - "clap 2.34.0", - "libc", - "log", - "nix", - "solana-logger", - "solana-version", - "sysctl", - "unix_socket2", - "users", -] - [[package]] name = "solana-transaction-status" -version = "1.10.7" +version = "1.9.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef7bc435ecac652e97f43b273e10668d72637abda9eb47018161a74a22c2bedf" +checksum = "4b040a594f9c422355a1bfa340621d07b6b2424f7bcee08ed8a22198ecbfe703" dependencies = [ "Inflector", - "base64 0.13.0", + "base64 0.12.3", "bincode", "bs58 0.4.0", "lazy_static", @@ -4965,9 +3588,9 @@ dependencies = [ [[package]] name = "solana-version" -version = "1.10.7" +version = "1.9.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98e19516f1be8a16f48cc6d9cbdd61914c71f86df8b6f9a52982db3bd975e224" +checksum = "71b22c44602c47edcdbcb63a1088abbbdcc37ce92994e2256ccab0c70a1bb1b5" dependencies = [ "log", "rustc_version 0.4.0", @@ -4980,9 +3603,9 @@ dependencies = [ [[package]] name = "solana-vote-program" -version = "1.10.7" +version = "1.9.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "639d8c11e8db286fa38a7adc3db81020902ac5369b81c20518305844b78641f7" +checksum = "4e5b39403e24adcdf0d97b10edc39bfde6cd6967dadd2cb26ef9a58ffc1f0899" dependencies = [ "bincode", "log", @@ -4993,57 +3616,13 @@ dependencies = [ "serde_derive", "solana-frozen-abi", "solana-frozen-abi-macro", + "solana-logger", "solana-metrics", "solana-program-runtime", "solana-sdk", "thiserror", ] -[[package]] -name = "solana-zk-token-proof-program" -version = "1.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "298db89d7c81fe8b15d4102555e61757e70919afadb371e9d5ec575e6f2b516f" -dependencies = [ - "bytemuck", - "getrandom 0.1.16", - "num-derive", - "num-traits", - "solana-program-runtime", - "solana-sdk", - "solana-zk-token-sdk", -] - -[[package]] -name = "solana-zk-token-sdk" -version = "1.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e048d26f06eac158d9d0000d4bdcb348e1a693b248d5ab38d9f092d8705464af" -dependencies = [ - "aes-gcm-siv", - "arrayref", - "base64 0.13.0", - "bincode", - "bytemuck", - "byteorder", - "cipher 0.4.3", - "curve25519-dalek", - "getrandom 0.1.16", - "lazy_static", - "merlin", - "num-derive", - "num-traits", - "rand 0.7.3", - "serde", - "serde_json", - "sha3 0.9.1", - "solana-program", - "solana-sdk", - "subtle", - "thiserror", - "zeroize", -] - [[package]] name = "solana_rbpf" version = "0.2.24" @@ -5060,7 +3639,7 @@ dependencies = [ "rustc-demangle", "scroll", "thiserror", - "time 0.1.43", + "time", ] [[package]] @@ -5069,22 +3648,6 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" -[[package]] -name = "spin" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "511254be0c5bcf062b019a6c89c01a664aa359ded62f78aa72c6fc137c0590e5" - -[[package]] -name = "spki" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d01ac02a6ccf3e07db148d2be087da624fea0221a16152ed01f0496a6b0a27" -dependencies = [ - "base64ct", - "der", -] - [[package]] name = "spl-associated-token-account" version = "1.0.3" @@ -5124,81 +3687,12 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" -[[package]] -name = "standback" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" -dependencies = [ - "version_check", -] - [[package]] name = "static_assertions" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" -[[package]] -name = "stdweb" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" -dependencies = [ - "discard", - "rustc_version 0.2.3", - "stdweb-derive", - "stdweb-internal-macros", - "stdweb-internal-runtime", - "wasm-bindgen", -] - -[[package]] -name = "stdweb-derive" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" -dependencies = [ - "proc-macro2 1.0.37", - "quote 1.0.17", - "serde", - "serde_derive", - "syn 1.0.91", -] - -[[package]] -name = "stdweb-internal-macros" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" -dependencies = [ - "base-x", - "proc-macro2 1.0.37", - "quote 1.0.17", - "serde", - "serde_derive", - "serde_json", - "sha1", - "syn 1.0.91", -] - -[[package]] -name = "stdweb-internal-runtime" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" - -[[package]] -name = "stream-cancel" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b0a9eb2715209fb8cc0d942fcdff45674bfc9f0090a0d897e85a22955ad159b" -dependencies = [ - "futures-core", - "pin-project", - "tokio", -] - [[package]] name = "strsim" version = "0.8.0" @@ -5236,44 +3730,25 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.91" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b683b2b825c8eef438b77c36a06dc262294da3d5a5813fac20da149241dcd44d" +checksum = "fbaf6116ab8924f39d52792136fb74fd60a80194cf1b1c6ffa6453eef1c3f942" dependencies = [ - "proc-macro2 1.0.37", - "quote 1.0.17", - "unicode-xid 0.2.2", + "proc-macro2 1.0.39", + "quote 1.0.18", + "unicode-ident", ] -[[package]] -name = "sync_wrapper" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20518fe4a4c9acf048008599e464deb21beeae3d3578418951a189c235a7a9a8" - [[package]] name = "synstructure" version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ - "proc-macro2 1.0.37", - "quote 1.0.17", - "syn 1.0.91", - "unicode-xid 0.2.2", -] - -[[package]] -name = "sysctl" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1123645dfaf2b5eac6b6c88addafc359c789b8ef2a770ecaef758c1ddf363ea4" -dependencies = [ - "bitflags", - "byteorder", - "libc", - "thiserror", - "walkdir", + "proc-macro2 1.0.39", + "quote 1.0.18", + "syn 1.0.95", + "unicode-xid 0.2.3", ] [[package]] @@ -5295,7 +3770,7 @@ checksum = "b85d0a9369a919ba0db919b142a2b704cd207dfc676f7a43c2d105d0bc225487" dependencies = [ "anyhow", "fnv", - "futures 0.3.21", + "futures", "humantime", "opentelemetry", "pin-project", @@ -5306,7 +3781,7 @@ dependencies = [ "thiserror", "tokio", "tokio-serde", - "tokio-util 0.6.9", + "tokio-util 0.6.10", "tracing", "tracing-opentelemetry", ] @@ -5317,9 +3792,9 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ee42b4e559f17bce0385ebf511a7beb67d5cc33c12c96b7f4e9789919d9c10f" dependencies = [ - "proc-macro2 1.0.37", - "quote 1.0.17", - "syn 1.0.91", + "proc-macro2 1.0.39", + "quote 1.0.18", + "syn 1.0.95", ] [[package]] @@ -5328,12 +3803,12 @@ version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "fastrand", "libc", "redox_syscall", "remove_dir_all", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -5352,7 +3827,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df" dependencies = [ "libc", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -5372,22 +3847,22 @@ checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" [[package]] name = "thiserror" -version = "1.0.30" +version = "1.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417" +checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.30" +version = "1.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" +checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a" dependencies = [ - "proc-macro2 1.0.37", - "quote 1.0.17", - "syn 1.0.91", + "proc-macro2 1.0.39", + "quote 1.0.18", + "syn 1.0.95", ] [[package]] @@ -5406,55 +3881,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" dependencies = [ "libc", - "winapi 0.3.9", -] - -[[package]] -name = "time" -version = "0.2.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242" -dependencies = [ - "const_fn", - "libc", - "standback", - "stdweb", - "time-macros", - "version_check", - "winapi 0.3.9", -] - -[[package]] -name = "time" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2702e08a7a860f005826c6815dcac101b19b5eb330c27fe4a5928fec1d20ddd" -dependencies = [ - "libc", - "num_threads", -] - -[[package]] -name = "time-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1" -dependencies = [ - "proc-macro-hack", - "time-macros-impl", -] - -[[package]] -name = "time-macros-impl" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f" -dependencies = [ - "proc-macro-hack", - "proc-macro2 1.0.37", - "quote 1.0.17", - "standback", - "syn 1.0.91", + "winapi", ] [[package]] @@ -5469,7 +3896,7 @@ dependencies = [ "pbkdf2 0.4.0", "rand 0.7.3", "rustc-hash", - "sha2 0.9.9", + "sha2", "thiserror", "unicode-normalization", "wasm-bindgen", @@ -5478,9 +3905,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.5.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" dependencies = [ "tinyvec_macros", ] @@ -5493,14 +3920,14 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.17.0" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2af73ac49756f3f7c01172e34a23e5d0216f6c32333757c2c61feb2bbff5a5ee" +checksum = "4903bf0427cf68dddd5aa6a93220756f8be0c34fcfa9f5e6191e103e15a31395" dependencies = [ "bytes", "libc", "memchr", - "mio 0.8.2", + "mio", "num_cpus", "once_cell", "parking_lot 0.12.0", @@ -5508,17 +3935,7 @@ dependencies = [ "signal-hook-registry", "socket2", "tokio-macros", - "winapi 0.3.9", -] - -[[package]] -name = "tokio-io-timeout" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" -dependencies = [ - "pin-project-lite", - "tokio", + "winapi", ] [[package]] @@ -5527,26 +3944,16 @@ version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7" dependencies = [ - "proc-macro2 1.0.37", - "quote 1.0.17", - "syn 1.0.91", -] - -[[package]] -name = "tokio-native-tls" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" -dependencies = [ - "native-tls", - "tokio", + "proc-macro2 1.0.39", + "quote 1.0.18", + "syn 1.0.95", ] [[package]] name = "tokio-rustls" -version = "0.23.3" +version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4151fda0cf2798550ad0b34bcfc9b9dcc2a9d2471c895c68f3a8818e54f2389e" +checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" dependencies = [ "rustls", "tokio", @@ -5580,31 +3987,14 @@ dependencies = [ "tokio", ] -[[package]] -name = "tokio-tungstenite" -version = "0.17.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06cda1232a49558c46f8a504d5b93101d42c0bf7f911f12a105ba48168f821ae" -dependencies = [ - "futures-util", - "log", - "rustls", - "tokio", - "tokio-rustls", - "tungstenite", - "webpki", - "webpki-roots", -] - [[package]] name = "tokio-util" -version = "0.6.9" +version = "0.6.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e99e1983e5d376cd8eb4b66604d2e99e79f5bd988c3055891dcd8c9e2604cc0" +checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507" dependencies = [ "bytes", "futures-core", - "futures-io", "futures-sink", "log", "pin-project-lite", @@ -5614,9 +4004,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0edfdeb067411dba2044da6d1cb2df793dd35add7888d73c16e3381ded401764" +checksum = "f988a1a1adc2fb21f9c12aa96441da33a1728193ae0b95d2be22dbd17fcb4e5c" dependencies = [ "bytes", "futures-core", @@ -5628,105 +4018,13 @@ dependencies = [ [[package]] name = "toml" -version = "0.5.8" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" +checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" dependencies = [ "serde", ] -[[package]] -name = "tonic" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30fb54bf1e446f44d870d260d99957e7d11fb9d0a0f5bd1a662ad1411cc103f9" -dependencies = [ - "async-stream", - "async-trait", - "axum", - "base64 0.13.0", - "bytes", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "hyper", - "hyper-timeout", - "percent-encoding 2.1.0", - "pin-project", - "prost", - "prost-derive", - "rustls-pemfile 0.3.0", - "tokio", - "tokio-rustls", - "tokio-stream", - "tokio-util 0.7.1", - "tower", - "tower-layer", - "tower-service", - "tracing", - "tracing-futures", -] - -[[package]] -name = "tonic-build" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d17087af5c80e5d5fc8ba9878e60258065a0a757e35efe7a05b7904bece1943" -dependencies = [ - "prettyplease", - "proc-macro2 1.0.37", - "prost-build", - "quote 1.0.17", - "syn 1.0.91", -] - -[[package]] -name = "tower" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a89fd63ad6adf737582df5db40d286574513c69a11dac5214dc3b5603d6713e" -dependencies = [ - "futures-core", - "futures-util", - "indexmap", - "pin-project", - "pin-project-lite", - "rand 0.8.5", - "slab", - "tokio", - "tokio-util 0.7.1", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower-http" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aba3f3efabf7fb41fae8534fc20a817013dd1c12cb45441efb6c82e6556b4cd8" -dependencies = [ - "bitflags", - "bytes", - "futures-core", - "futures-util", - "http", - "http-body", - "http-range-header", - "pin-project-lite", - "tower", - "tower-layer", - "tower-service", -] - -[[package]] -name = "tower-layer" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "343bc9466d3fe6b0f960ef45960509f84480bf4fd96f92901afe7ff3df9d3a62" - [[package]] name = "tower-service" version = "0.3.1" @@ -5735,11 +4033,11 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" [[package]] name = "tracing" -version = "0.1.32" +version = "0.1.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a1bdf54a7c28a2bbf701e1d2233f6c77f473486b94bee4f9678da5a148dca7f" +checksum = "5d0ecdcb44a79f0fe9844f0c4f33a342cbcbb5117de8001e6ba0dc2351327d09" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "log", "pin-project-lite", "tracing-attributes", @@ -5748,35 +4046,25 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.20" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e65ce065b4b5c53e73bb28912318cb8c9e9ad3921f1d669eb0e68b4c8143a2b" +checksum = "cc6b8ad3567499f98a1db7a752b07a7c8c7c7c34c332ec00effb2b0027974b7c" dependencies = [ - "proc-macro2 1.0.37", - "quote 1.0.17", - "syn 1.0.91", + "proc-macro2 1.0.39", + "quote 1.0.18", + "syn 1.0.95", ] [[package]] name = "tracing-core" -version = "0.1.24" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90442985ee2f57c9e1b548ee72ae842f4a9a20e3f417cc38dbc5dc684d9bb4ee" +checksum = "f54c8ca710e81886d498c2fd3331b56c93aa248d49de2222ad2742247c60072f" dependencies = [ "lazy_static", "valuable", ] -[[package]] -name = "tracing-futures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" -dependencies = [ - "pin-project", - "tracing", -] - [[package]] name = "tracing-opentelemetry" version = "0.15.0" @@ -5800,12 +4088,6 @@ dependencies = [ "tracing-core", ] -[[package]] -name = "trees" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0de5f738ceab88e2491a94ddc33c3feeadfa95fedc60363ef110845df12f3878" - [[package]] name = "try-lock" version = "0.2.3" @@ -5814,9 +4096,9 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "trybuild" -version = "1.0.59" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "606ab3fe0065741fdbb51f64bcb6ba76f13fad49f1723030041826c631782764" +checksum = "7fc92f558afb6d1d7c6f175eb8d615b8ef49c227543e68e19c123d4ee43d8a7d" dependencies = [ "glob", "once_cell", @@ -5829,9 +4111,9 @@ dependencies = [ [[package]] name = "tungstenite" -version = "0.17.2" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96a2dea40e7570482f28eb57afbe42d97551905da6a9400acc5c328d24004f5" +checksum = "6ad3713a14ae247f22a728a0456a545df14acf3867f905adff84be99e23b3ad1" dependencies = [ "base64 0.13.0", "byteorder", @@ -5841,9 +4123,9 @@ dependencies = [ "log", "rand 0.8.5", "rustls", - "sha-1 0.10.0", + "sha-1", "thiserror", - "url 2.2.2", + "url", "utf-8", "webpki", "webpki-roots", @@ -5862,19 +4144,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" [[package]] -name = "unicase" -version = "2.6.0" +name = "unicode-bidi" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" -dependencies = [ - "version_check", -] +checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" [[package]] -name = "unicode-bidi" -version = "0.3.7" +name = "unicode-ident" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f" +checksum = "d22af068fba1eb5edcb4aea19d382b2a3deb4c8f9d475c589b6ada9e0fd493ee" [[package]] name = "unicode-normalization" @@ -5905,28 +4184,9 @@ checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" [[package]] name = "unicode-xid" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" - -[[package]] -name = "universal-hash" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05" -dependencies = [ - "generic-array", - "subtle", -] - -[[package]] -name = "unix_socket2" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b57c6eace16c00eccb98a28e85db3370eab0685bdd5e13831d59e2bcb49a1d8a" -dependencies = [ - "libc", -] +checksum = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04" [[package]] name = "unreachable" @@ -5953,17 +4213,6 @@ dependencies = [ "lazy_static", ] -[[package]] -name = "url" -version = "1.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" -dependencies = [ - "idna 0.1.5", - "matches", - "percent-encoding 1.0.1", -] - [[package]] name = "url" version = "2.2.2" @@ -5971,19 +4220,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" dependencies = [ "form_urlencoded", - "idna 0.2.3", + "idna", "matches", - "percent-encoding 2.1.0", -] - -[[package]] -name = "users" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa4227e95324a443c9fcb06e03d4d85e91aabe9a5a02aa818688b6918b6af486" -dependencies = [ - "libc", - "log", + "percent-encoding", ] [[package]] @@ -5998,12 +4237,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - [[package]] name = "vec_map" version = "0.8.2" @@ -6029,7 +4262,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" dependencies = [ "same-file", - "winapi 0.3.9", + "winapi", "winapi-util", ] @@ -6067,7 +4300,7 @@ version = "0.2.80" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27370197c907c55e3f1a9fbe26f44e937fe6451368324e009cba39e139dc08ad" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "wasm-bindgen-macro", ] @@ -6080,9 +4313,9 @@ dependencies = [ "bumpalo", "lazy_static", "log", - "proc-macro2 1.0.37", - "quote 1.0.17", - "syn 1.0.91", + "proc-macro2 1.0.39", + "quote 1.0.18", + "syn 1.0.95", "wasm-bindgen-shared", ] @@ -6092,7 +4325,7 @@ version = "0.4.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6f741de44b75e14c35df886aff5f1eb73aa114fa5d4d00dcd37b5e01259bf3b2" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "js-sys", "wasm-bindgen", "web-sys", @@ -6104,7 +4337,7 @@ version = "0.2.80" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17cae7ff784d7e83a2fe7611cfe766ecf034111b49deb850a3dc7699c08251f5" dependencies = [ - "quote 1.0.17", + "quote 1.0.18", "wasm-bindgen-macro-support", ] @@ -6114,9 +4347,9 @@ version = "0.2.80" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "99ec0dc7a4756fffc231aab1b9f2f578d23cd391390ab27f952ae0c9b3ece20b" dependencies = [ - "proc-macro2 1.0.37", - "quote 1.0.17", - "syn 1.0.91", + "proc-macro2 1.0.39", + "quote 1.0.18", + "syn 1.0.95", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -6156,23 +4389,6 @@ dependencies = [ "webpki", ] -[[package]] -name = "which" -version = "4.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c4fb54e6113b6a8772ee41c3404fb0301ac79604489467e0a9ce1f3e97c24ae" -dependencies = [ - "either", - "lazy_static", - "libc", -] - -[[package]] -name = "winapi" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" - [[package]] name = "winapi" version = "0.3.9" @@ -6183,12 +4399,6 @@ dependencies = [ "winapi-x86_64-pc-windows-gnu", ] -[[package]] -name = "winapi-build" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" - [[package]] name = "winapi-i686-pc-windows-gnu" version = "0.4.0" @@ -6201,7 +4411,7 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" dependencies = [ - "winapi 0.3.9", + "winapi", ] [[package]] @@ -6212,9 +4422,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-sys" -version = "0.34.0" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5acdd78cb4ba54c0045ac14f62d8f94a03d10047904ae2a40afa1e99d8f70825" +checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" dependencies = [ "windows_aarch64_msvc", "windows_i686_gnu", @@ -6225,33 +4435,33 @@ dependencies = [ [[package]] name = "windows_aarch64_msvc" -version = "0.34.0" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d" +checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" [[package]] name = "windows_i686_gnu" -version = "0.34.0" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed" +checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" [[package]] name = "windows_i686_msvc" -version = "0.34.0" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956" +checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" [[package]] name = "windows_x86_64_gnu" -version = "0.34.0" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4" +checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" [[package]] name = "windows_x86_64_msvc" -version = "0.34.0" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9" +checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" [[package]] name = "winreg" @@ -6259,7 +4469,7 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" dependencies = [ - "winapi 0.3.9", + "winapi", ] [[package]] @@ -6273,9 +4483,9 @@ dependencies = [ [[package]] name = "xattr" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "244c3741f4240ef46274860397c7c74e50eb23624996930e484c16679633a54c" +checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" dependencies = [ "libc", ] @@ -6295,15 +4505,6 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" -[[package]] -name = "yasna" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "346d34a236c9d3e5f3b9b74563f238f955bbd05fa0b8b4efa53c130c43982f4c" -dependencies = [ - "time 0.3.9", -] - [[package]] name = "zeroize" version = "1.3.0" @@ -6319,26 +4520,26 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f8f187641dad4f680d25c4bfc4225b418165984179f26ca76ec4fb6441d3a17" dependencies = [ - "proc-macro2 1.0.37", - "quote 1.0.17", - "syn 1.0.91", + "proc-macro2 1.0.39", + "quote 1.0.18", + "syn 1.0.95", "synstructure", ] [[package]] name = "zstd" -version = "0.11.1+zstd.1.5.2" +version = "0.9.2+zstd.1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a16b8414fde0414e90c612eba70985577451c4c504b99885ebed24762cb81a" +checksum = "2390ea1bf6c038c39674f22d95f0564725fc06034a47129179810b2fc58caa54" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "5.0.1+zstd.1.5.2" +version = "4.1.3+zstd.1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c12659121420dd6365c5c3de4901f97145b79651fb1d25814020ed2ed0585ae" +checksum = "e99d81b99fb3c2c2c794e3fe56c305c63d5173a16a46b5850b07c935ffc7db79" dependencies = [ "libc", "zstd-sys", @@ -6346,9 +4547,9 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.1+zstd.1.5.2" +version = "1.6.2+zstd.1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fd07cbbc53846d9145dbffdf6dd09a7a0aa52be46741825f5c97bdd4f73f12b" +checksum = "2daf2f248d9ea44454bfcb2516534e8b8ad2fc91bf818a1885495fc42bc8ac9f" dependencies = [ "cc", "libc", diff --git a/README.md b/README.md index 82f413536..b7407cd5e 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ ### Development - rust version 1.59.0 (9d1b2106e 2022-02-23) -- solana-cli 1.9.5 -- anchor-cli 0.22.0 +- solana-cli 1.9.13 +- anchor-cli 0.24.2 - npm 8.1.2 - node v16.13.1 diff --git a/devnet_setup.sh b/devnet_setup.sh deleted file mode 100755 index da6202356..000000000 --- a/devnet_setup.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env bash - -set -euo pipefail - -# all actions should be idempotent - -# create group - -# register a bunch of tokens - -# create a bunch of serum3 markets - -# create a bunch of perp markets - -# doc on how to find above metadata \ No newline at end of file diff --git a/idl-fixup.sh b/idl-fixup.sh index 7ffb45669..e5b7572db 100755 --- a/idl-fixup.sh +++ b/idl-fixup.sh @@ -7,6 +7,8 @@ for pair_str in \ "TokenIndex u16" \ "Serum3MarketIndex u16" \ "PerpMarketIndex u16" \ + "usize u64" \ + "NodeHandle u32" \ ; do pair=( $pair_str ); perl -0777 -pi -e "s/\{\s*\"defined\":\s*\"${pair[0]}\"\s*\}/\"${pair[1]}\"/g" \ diff --git a/keeper/Cargo.toml b/keeper/Cargo.toml index 6cd59fdb6..6fbd03762 100644 --- a/keeper/Cargo.toml +++ b/keeper/Cargo.toml @@ -6,8 +6,8 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -anchor-client = "0.22.0" -anchor-lang = "0.22.0" +anchor-client = "0.24.2" +anchor-lang = "0.24.2" anyhow = "1.0" clap = { version = "3.1.8", features = ["derive", "env"] } dotenv = "0.15.0" @@ -15,13 +15,9 @@ env_logger = "0.8.4" futures = "0.3.21" log = "0.4.0" mango-v4 = { path = "../programs/mango-v4" } -serde = { version = "1.0", features = ["derive"] } -serde_json = "1.0" -shellexpand = "2.1" -solana-account-decoder = "1.9.5" -solana-client = "1.9.5" -solana-program = "1.9.5" -solana-rpc = "1.9.5" -solana-sdk = "1.9.5" -solana-transaction-status = "1.9.5" -tokio = { version = "1.17", features = ["rt-multi-thread", "time", "macros", "sync"] } \ No newline at end of file +# serde = { version = "1.0", features = ["derive"] } +# serde_json = "1.0" +# shellexpand = "2.1" +solana-client = "~1.9.13" +solana-sdk = "~1.9.13" +tokio = { version = "1.18.2", features = ["rt-multi-thread", "time", "macros", "sync"] } \ No newline at end of file diff --git a/programs/mango-v4/Cargo.toml b/programs/mango-v4/Cargo.toml index 1fb9e504e..d4b38f6ff 100644 --- a/programs/mango-v4/Cargo.toml +++ b/programs/mango-v4/Cargo.toml @@ -20,15 +20,15 @@ test-bpf = [] [dependencies] # todo: when to fix, when to use caret? need a regular chore to bump dependencies # note: possibly need init-if-needed feature -anchor-lang = { version = "0.22.0", features = [] } -anchor-spl = { version = "0.22.0", features = [] } +anchor-lang = { version = "0.24.2", features = [] } +anchor-spl = { version = "0.24.2", features = [] } bytemuck = "^1.7.2" # todo: higher versions don't work fixed = { version = "=1.11.0", features = ["serde", "borsh"] } fixed-macro = "^1.1.1" -pyth-client = {version = "0.5.0", features = ["no-entrypoint"]} +pyth-sdk-solana = "0.1.0" serde = "^1.0" -solana-program = "1.9.5" +solana-program = "~1.9.13" static_assertions = "1.1" serum_dex = { version = "0.4.0", git = "https://github.com/blockworks-foundation/serum-dex.git", default-features=false, features = ["no-entrypoint", "program"] } checked_math = { path = "../../lib/checked_math" } @@ -38,9 +38,9 @@ bincode = "1.3.3" mango-macro = { path = "../../mango-macro" } [dev-dependencies] -solana-sdk = { version = "1.9.5", default-features = false } -solana-program-test = "1.9.5" -solana-logger = "1.9.5" +solana-sdk = { version = "~1.9.13", default-features = false } +solana-program-test = "~1.9.13" +solana-logger = "~1.9.13" spl-token = { version = "^3.0.0", features = ["no-entrypoint"] } spl-associated-token-account = { version = "^1.0.3", features = ["no-entrypoint"] } bincode = "^1.3.1" diff --git a/programs/mango-v4/src/instructions/perp_consume_events.rs b/programs/mango-v4/src/instructions/perp_consume_events.rs index 1a2fd182b..9611dc5e9 100644 --- a/programs/mango-v4/src/instructions/perp_consume_events.rs +++ b/programs/mango-v4/src/instructions/perp_consume_events.rs @@ -2,10 +2,9 @@ use anchor_lang::prelude::*; use bytemuck::cast_ref; use crate::error::MangoError; +use crate::state::EventQueue; use crate::{ - state::{ - EventQueueHeader, EventType, FillEvent, Group, MangoAccount, OutEvent, PerpMarket, Queue, - }, + state::{EventType, FillEvent, Group, MangoAccount, OutEvent, PerpMarket}, util::LoadZeroCopy, }; @@ -20,7 +19,7 @@ pub struct PerpConsumeEvents<'info> { pub perp_market: AccountLoader<'info, PerpMarket>, #[account(mut)] - pub event_queue: AccountLoader<'info, Queue>, + pub event_queue: AccountLoader<'info, EventQueue>, } pub fn perp_consume_events(ctx: Context, limit: usize) -> Result<()> { diff --git a/programs/mango-v4/src/instructions/perp_place_order.rs b/programs/mango-v4/src/instructions/perp_place_order.rs index 1824b3406..4d704d316 100644 --- a/programs/mango-v4/src/instructions/perp_place_order.rs +++ b/programs/mango-v4/src/instructions/perp_place_order.rs @@ -2,7 +2,7 @@ use anchor_lang::prelude::*; use crate::error::*; use crate::state::{ - oracle_price, Book, EventQueueHeader, Group, MangoAccount, OrderType, PerpMarket, Queue, Side, + oracle_price, Book, EventQueue, Group, MangoAccount, OrderType, PerpMarket, Side, }; #[derive(Accounts)] @@ -30,7 +30,7 @@ pub struct PerpPlaceOrder<'info> { #[account(mut)] pub bids: UncheckedAccount<'info>, #[account(mut)] - pub event_queue: AccountLoader<'info, Queue>, + pub event_queue: AccountLoader<'info, EventQueue>, pub oracle: UncheckedAccount<'info>, diff --git a/programs/mango-v4/src/state/mango_account.rs b/programs/mango-v4/src/state/mango_account.rs index e2ec4d1c0..6f580d940 100644 --- a/programs/mango-v4/src/state/mango_account.rs +++ b/programs/mango-v4/src/state/mango_account.rs @@ -2,6 +2,7 @@ use anchor_lang::prelude::*; use checked_math as cm; use fixed::types::I80F48; use static_assertions::const_assert_eq; +use std::cmp::Ordering; use std::mem::size_of; use crate::error::*; @@ -374,12 +375,18 @@ impl PerpAccount { /// Move unrealized funding payments into the quote_position pub fn settle_funding(&mut self, perp_market: &PerpMarket) { - if self.base_position_lots > 0 { - self.quote_position_native -= (perp_market.long_funding - self.long_settled_funding) - * I80F48::from_num(self.base_position_lots); - } else if self.base_position_lots < 0 { - self.quote_position_native -= (perp_market.short_funding - self.short_settled_funding) - * I80F48::from_num(self.base_position_lots); + match self.base_position_lots.cmp(&0) { + Ordering::Greater => { + self.quote_position_native -= (perp_market.long_funding + - self.long_settled_funding) + * I80F48::from_num(self.base_position_lots); + } + Ordering::Less => { + self.quote_position_native -= (perp_market.short_funding + - self.short_settled_funding) + * I80F48::from_num(self.base_position_lots); + } + Ordering::Equal => (), } self.long_settled_funding = perp_market.long_funding; self.short_settled_funding = perp_market.short_funding; diff --git a/programs/mango-v4/src/state/oracle.rs b/programs/mango-v4/src/state/oracle.rs index 10644e997..ba0f9d4cd 100644 --- a/programs/mango-v4/src/state/oracle.rs +++ b/programs/mango-v4/src/state/oracle.rs @@ -26,7 +26,7 @@ const_assert_eq!(size_of::(), 32 + 32 + 16 + 8 + 8); const_assert_eq!(size_of::() % 8, 0); pub fn determine_oracle_type(data: &[u8]) -> Result { - if u32::from_le_bytes(data[0..4].try_into().unwrap()) == pyth_client::MAGIC { + if u32::from_le_bytes(data[0..4].try_into().unwrap()) == pyth_sdk_solana::state::MAGIC { return Ok(OracleType::Pyth); } else if data[0..8] == StubOracle::discriminator() { return Ok(OracleType::Stub); @@ -42,8 +42,8 @@ pub fn oracle_price(acc_info: &AccountInfo) -> Result { Ok(match oracle_type { OracleType::Stub => acc_info.load::()?.price, OracleType::Pyth => { - let price_struct = pyth_client::load_price(data).unwrap(); - I80F48::from_num(price_struct.agg.price) + let price_struct = pyth_sdk_solana::load_price(data).unwrap(); + I80F48::from_num(price_struct.price) } }) } @@ -51,7 +51,6 @@ pub fn oracle_price(acc_info: &AccountInfo) -> Result { #[cfg(test)] mod tests { use super::*; - use pyth_client::load_price; use solana_program_test::{find_file, read_file}; use std::path::PathBuf; @@ -67,9 +66,8 @@ mod tests { let pyth_price_data = read_file(find_file(filename).unwrap()); assert!(determine_oracle_type(&pyth_price_data).unwrap() == OracleType::Pyth); - let price = load_price(pyth_price_data.as_slice()).unwrap(); - assert_eq!(price.valid_slot, 64338667); - assert_eq!(price.agg.price, 32112500000); + let price = pyth_sdk_solana::load_price(pyth_price_data.as_slice()).unwrap(); + assert_eq!(price.price, 32112500000); Ok(()) } diff --git a/programs/mango-v4/src/state/orderbook/book.rs b/programs/mango-v4/src/state/orderbook/book.rs index daa3ce634..b395ba061 100644 --- a/programs/mango-v4/src/state/orderbook/book.rs +++ b/programs/mango-v4/src/state/orderbook/book.rs @@ -410,7 +410,7 @@ impl<'a> Book<'a> { .remove_order(leaf_node.owner_slot as usize, leaf_node.quantity)? }; - limit = limit - 1; + limit -= 1; if limit == 0 { break; } diff --git a/programs/mango-v4/src/state/orderbook/nodes.rs b/programs/mango-v4/src/state/orderbook/nodes.rs index 49f3319ab..4fb6791cc 100644 --- a/programs/mango-v4/src/state/orderbook/nodes.rs +++ b/programs/mango-v4/src/state/orderbook/nodes.rs @@ -161,13 +161,14 @@ pub struct FreeNode { pub(crate) reserve: [u8; NODE_SIZE - 8], } -#[derive(Copy, Clone, Pod)] -#[repr(C)] +#[zero_copy] +#[derive(Pod)] pub struct AnyNode { pub tag: u32, - pub data: [u8; NODE_SIZE - 4], + pub data: [u8; 84], // note: anchor can't parse the struct for IDL when it includes non numbers, NODE_SIZE == 88, 84 == 88 - 4 } +const_assert_eq!(size_of::(), NODE_SIZE); const_assert_eq!(size_of::(), size_of::()); const_assert_eq!(size_of::(), size_of::()); const_assert_eq!(size_of::(), size_of::()); diff --git a/programs/mango-v4/src/state/orderbook/queue.rs b/programs/mango-v4/src/state/orderbook/queue.rs index 1c256950c..d0ed4909f 100644 --- a/programs/mango-v4/src/state/orderbook/queue.rs +++ b/programs/mango-v4/src/state/orderbook/queue.rs @@ -23,12 +23,12 @@ pub trait QueueHeader: bytemuck::Pod { } #[account(zero_copy)] -pub struct Queue { - pub header: H, - pub buf: [H::Item; MAX_NUM_EVENTS], +pub struct EventQueue { + pub header: EventQueueHeader, + pub buf: [AnyEvent; MAX_NUM_EVENTS], } -impl<'a, H: QueueHeader> Queue { +impl EventQueue { pub fn len(&self) -> usize { self.header.count() } @@ -45,7 +45,7 @@ impl<'a, H: QueueHeader> Queue { self.header.count() == 0 } - pub fn push_back(&mut self, value: H::Item) -> std::result::Result<(), H::Item> { + pub fn push_back(&mut self, value: AnyEvent) -> std::result::Result<(), AnyEvent> { if self.full() { return Err(value); } @@ -59,21 +59,21 @@ impl<'a, H: QueueHeader> Queue { Ok(()) } - pub fn peek_front(&self) -> Option<&H::Item> { + pub fn peek_front(&self) -> Option<&AnyEvent> { if self.empty() { return None; } Some(&self.buf[self.header.head()]) } - pub fn peek_front_mut(&mut self) -> Option<&mut H::Item> { + pub fn peek_front_mut(&mut self) -> Option<&mut AnyEvent> { if self.empty() { return None; } Some(&mut self.buf[self.header.head()]) } - pub fn pop_front(&mut self) -> Result { + pub fn pop_front(&mut self) -> Result { require!(!self.empty(), MangoError::SomeError); let value = self.buf[self.header.head()]; @@ -95,21 +95,21 @@ impl<'a, H: QueueHeader> Queue { Ok(()) } - pub fn iter(&self) -> impl Iterator { - QueueIterator { + pub fn iter(&self) -> impl Iterator { + EventQueueIterator { queue: self, index: 0, } } } -struct QueueIterator<'a, H: QueueHeader> { - queue: &'a Queue, +struct EventQueueIterator<'a> { + queue: &'a EventQueue, index: usize, } -impl<'a, H: QueueHeader> Iterator for QueueIterator<'a, H> { - type Item = &'a H::Item; +impl<'a> Iterator for EventQueueIterator<'a> { + type Item = &'a AnyEvent; fn next(&mut self) -> Option { if self.index == self.queue.len() { None @@ -122,7 +122,8 @@ impl<'a, H: QueueHeader> Iterator for QueueIterator<'a, H> { } } -#[account(zero_copy)] +#[zero_copy] +#[derive(Pod)] pub struct EventQueueHeader { head: usize, count: usize, @@ -152,18 +153,19 @@ impl QueueHeader for EventQueueHeader { } } -pub type EventQueue = Queue; const_assert_eq!(std::mem::size_of::(), 8 * 3 + 512 * 200); const_assert_eq!(std::mem::size_of::() % 8, 0); const EVENT_SIZE: usize = 200; -#[derive(Copy, Clone, Debug, Pod)] -#[repr(C)] +#[zero_copy] +#[derive(Debug, Pod)] pub struct AnyEvent { pub event_type: u8, - pub padding: [u8; EVENT_SIZE - 1], + pub padding: [u8; 199], // note: anchor can't parse the struct for IDL when it includes non numbers, EVENT_SIZE == 200, 199 == 200 - 1 } +const_assert_eq!(size_of::(), EVENT_SIZE); + #[derive(Copy, Clone, IntoPrimitive, TryFromPrimitive, Eq, PartialEq)] #[repr(u8)] pub enum EventType { diff --git a/programs/mango-v4/tests/program_test/mango_client.rs b/programs/mango-v4/tests/program_test/mango_client.rs index 577ca889d..b05454cd6 100644 --- a/programs/mango-v4/tests/program_test/mango_client.rs +++ b/programs/mango-v4/tests/program_test/mango_client.rs @@ -9,9 +9,9 @@ use mango_v4::instructions::{ InterestRateParams, Serum3OrderType, Serum3SelfTradeBehavior, Serum3Side, }; use solana_program::instruction::Instruction; -use solana_program_test::BanksClientError; use solana_sdk::instruction; use solana_sdk::signature::{Keypair, Signer}; +use solana_sdk::transport::TransportError; use std::str::FromStr; @@ -38,7 +38,7 @@ impl ClientAccountLoader for &SolanaCookie { pub async fn send_tx( solana: &SolanaCookie, ix: CI, -) -> std::result::Result { +) -> std::result::Result { let (accounts, instruction) = ix.to_instruction(solana).await; let signers = ix.signers(); let instructions = vec![instruction]; diff --git a/programs/mango-v4/tests/program_test/solana.rs b/programs/mango-v4/tests/program_test/solana.rs index 91a4d75bc..ee0eb7315 100644 --- a/programs/mango-v4/tests/program_test/solana.rs +++ b/programs/mango-v4/tests/program_test/solana.rs @@ -5,6 +5,7 @@ use anchor_lang::AccountDeserialize; use anchor_spl::token::TokenAccount; use solana_program::{program_pack::Pack, rent::*, system_instruction}; use solana_program_test::*; +use solana_sdk::transport::TransportError; use solana_sdk::{ account::ReadableAccount, instruction::Instruction, @@ -26,7 +27,7 @@ impl SolanaCookie { &self, instructions: &[Instruction], signers: Option<&[&Keypair]>, - ) -> Result<(), BanksClientError> { + ) -> Result<(), TransportError> { self.program_log.write().unwrap().clear(); let mut context = self.context.borrow_mut(); diff --git a/programs/mango-v4/tests/test_basic.rs b/programs/mango-v4/tests/test_basic.rs index 496d86e1c..e4f8ffbe8 100644 --- a/programs/mango-v4/tests/test_basic.rs +++ b/programs/mango-v4/tests/test_basic.rs @@ -2,7 +2,7 @@ use fixed::types::I80F48; use solana_program_test::*; -use solana_sdk::{signature::Keypair, signature::Signer}; +use solana_sdk::{signature::Keypair, signature::Signer, transport::TransportError}; use mango_v4::state::*; use program_test::*; @@ -12,7 +12,7 @@ mod program_test; // This is an unspecific happy-case test that just runs a few instructions to check // that they work in principle. It should be split up / renamed. #[tokio::test] -async fn test_basic() -> Result<(), BanksClientError> { +async fn test_basic() -> Result<(), TransportError> { let context = TestContext::new().await; let solana = &context.solana.clone(); diff --git a/programs/mango-v4/tests/test_benchmark.rs b/programs/mango-v4/tests/test_benchmark.rs index 6e1b17da6..af7ae39ed 100644 --- a/programs/mango-v4/tests/test_benchmark.rs +++ b/programs/mango-v4/tests/test_benchmark.rs @@ -2,11 +2,12 @@ use program_test::*; use solana_program_test::*; +use solana_sdk::transport::TransportError; mod program_test; #[tokio::test] -async fn test_benchmark() -> Result<(), BanksClientError> { +async fn test_benchmark() -> Result<(), TransportError> { let context = TestContext::new().await; let solana = &context.solana.clone(); diff --git a/programs/mango-v4/tests/test_health_compute.rs b/programs/mango-v4/tests/test_health_compute.rs index e6a6bcb79..e1b29413f 100644 --- a/programs/mango-v4/tests/test_health_compute.rs +++ b/programs/mango-v4/tests/test_health_compute.rs @@ -1,7 +1,7 @@ #![cfg(feature = "test-bpf")] use solana_program_test::*; -use solana_sdk::signature::Keypair; +use solana_sdk::{signature::Keypair, transport::TransportError}; use program_test::*; @@ -9,7 +9,7 @@ mod program_test; // Try to reach compute limits in health checks by having many different tokens in an account #[tokio::test] -async fn test_health_compute_tokens() -> Result<(), BanksClientError> { +async fn test_health_compute_tokens() -> Result<(), TransportError> { let context = TestContext::new().await; let solana = &context.solana.clone(); @@ -72,7 +72,7 @@ async fn test_health_compute_tokens() -> Result<(), BanksClientError> { // Try to reach compute limits in health checks by having many serum markets in an account #[tokio::test] -async fn test_health_compute_serum() -> Result<(), BanksClientError> { +async fn test_health_compute_serum() -> Result<(), TransportError> { let context = TestContext::new().await; let solana = &context.solana.clone(); diff --git a/programs/mango-v4/tests/test_liq_tokens.rs b/programs/mango-v4/tests/test_liq_tokens.rs index 47534d1d8..566b8aca6 100644 --- a/programs/mango-v4/tests/test_liq_tokens.rs +++ b/programs/mango-v4/tests/test_liq_tokens.rs @@ -2,7 +2,7 @@ use fixed::types::I80F48; use solana_program_test::*; -use solana_sdk::signature::Keypair; +use solana_sdk::{signature::Keypair, transport::TransportError}; use mango_v4::{ instructions::{Serum3OrderType, Serum3SelfTradeBehavior, Serum3Side}, @@ -13,7 +13,7 @@ use program_test::*; mod program_test; #[tokio::test] -async fn test_liq_tokens_force_cancel() -> Result<(), BanksClientError> { +async fn test_liq_tokens_force_cancel() -> Result<(), TransportError> { let context = TestContext::new().await; let solana = &context.solana.clone(); @@ -216,7 +216,7 @@ async fn test_liq_tokens_force_cancel() -> Result<(), BanksClientError> { } #[tokio::test] -async fn test_liq_tokens_with_token() -> Result<(), BanksClientError> { +async fn test_liq_tokens_with_token() -> Result<(), TransportError> { let context = TestContext::new().await; let solana = &context.solana.clone(); diff --git a/programs/mango-v4/tests/test_perp.rs b/programs/mango-v4/tests/test_perp.rs index eec2a18a2..508c4fb11 100644 --- a/programs/mango-v4/tests/test_perp.rs +++ b/programs/mango-v4/tests/test_perp.rs @@ -5,12 +5,12 @@ use fixed_macro::types::I80F48; use mango_v4::state::*; use program_test::*; use solana_program_test::*; -use solana_sdk::signature::Keypair; +use solana_sdk::{signature::Keypair, transport::TransportError}; mod program_test; #[tokio::test] -async fn test_perp() -> Result<(), BanksClientError> { +async fn test_perp() -> Result<(), TransportError> { let context = TestContext::new().await; let solana = &context.solana.clone(); diff --git a/programs/mango-v4/tests/test_serum.rs b/programs/mango-v4/tests/test_serum.rs index 157fa8a18..5e0d36bed 100644 --- a/programs/mango-v4/tests/test_serum.rs +++ b/programs/mango-v4/tests/test_serum.rs @@ -1,7 +1,7 @@ #![cfg(feature = "test-bpf")] use solana_program_test::*; -use solana_sdk::signature::Keypair; +use solana_sdk::{signature::Keypair, transport::TransportError}; use mango_v4::{ instructions::{Serum3OrderType, Serum3SelfTradeBehavior, Serum3Side}, @@ -12,7 +12,7 @@ use program_test::*; mod program_test; #[tokio::test] -async fn test_serum() -> Result<(), BanksClientError> { +async fn test_serum() -> Result<(), TransportError> { let context = TestContext::new().await; let solana = &context.solana.clone(); diff --git a/programs/mango-v4/tests/test_update_index.rs b/programs/mango-v4/tests/test_update_index.rs index 7e17b867c..39595cb42 100644 --- a/programs/mango-v4/tests/test_update_index.rs +++ b/programs/mango-v4/tests/test_update_index.rs @@ -2,14 +2,14 @@ use mango_v4::state::Bank; use solana_program_test::*; -use solana_sdk::signature::Keypair; +use solana_sdk::{signature::Keypair, transport::TransportError}; use program_test::*; mod program_test; #[tokio::test] -async fn test_update_index() -> Result<(), BanksClientError> { +async fn test_update_index() -> Result<(), TransportError> { let context = TestContext::new().await; let solana = &context.solana.clone(); diff --git a/programs/margin-trade/Cargo.toml b/programs/margin-trade/Cargo.toml index f9b38707a..d17fd1226 100644 --- a/programs/margin-trade/Cargo.toml +++ b/programs/margin-trade/Cargo.toml @@ -18,6 +18,6 @@ default = [] test-bpf = [] [dependencies] -anchor-lang = { version = "0.22.0", features = [] } -anchor-spl = "0.22.0" -solana-program = "1.9.5" +anchor-lang = { version = "0.24.2", features = [] } +anchor-spl = "0.24.2" +solana-program = "1.9.13" diff --git a/release-to-devnet.sh b/release-to-devnet.sh index 2f40658a0..e34b7414b 100755 --- a/release-to-devnet.sh +++ b/release-to-devnet.sh @@ -15,6 +15,8 @@ anchor build --skip-lint # update types in ts client package cp -v ./target/types/mango_v4.ts ./ts/client/src/mango_v4.ts +(cd ./ts/client && tsc) + if [[ -z "${NO_DEPLOY}" ]]; then # publish program solana --url https://mango.devnet.rpcpool.com program deploy --program-id $PROGRAM_ID \ diff --git a/ts/client/package.json b/ts/client/package.json index 97d614fe4..8886c53f1 100644 --- a/ts/client/package.json +++ b/ts/client/package.json @@ -44,8 +44,8 @@ "trailingComma": "all" }, "dependencies": { - "@project-serum/anchor": "^0.22.0", - "@project-serum/serum": "^0.13.62", + "@project-serum/anchor": "^0.24.2", + "@project-serum/serum": "^0.13.65", "@solana/spl-token": "^0.2.0", "@types/bs58": "^4.0.1", "big.js": "^6.1.1", diff --git a/ts/client/src/client.ts b/ts/client/src/client.ts index a62754042..51ce4d02b 100644 --- a/ts/client/src/client.ts +++ b/ts/client/src/client.ts @@ -1,4 +1,4 @@ -import { BN, Program, Provider } from '@project-serum/anchor'; +import { AnchorProvider, BN, Program, Provider } from '@project-serum/anchor'; import { getFeeRates, getFeeTier, Market } from '@project-serum/serum'; import { Order } from '@project-serum/serum/lib/market'; import * as spl from '@solana/spl-token'; @@ -38,7 +38,7 @@ export class MangoClient { // Group public async createGroup(): Promise { - const adminPk = this.program.provider.wallet.publicKey; + const adminPk = (this.program.provider as AnchorProvider).wallet.publicKey; return await this.program.methods .createGroup() .accounts({ @@ -108,10 +108,10 @@ export class MangoClient { ) .accounts({ group: group.publicKey, - admin: this.program.provider.wallet.publicKey, + admin: (this.program.provider as AnchorProvider).wallet.publicKey, mint: mintPk, oracle: oraclePk, - payer: this.program.provider.wallet.publicKey, + payer: (this.program.provider as AnchorProvider).wallet.publicKey, rent: SYSVAR_RENT_PUBKEY, }) .rpc(); @@ -141,9 +141,9 @@ export class MangoClient { .createStubOracle({ val: I80F48.fromNumber(price).getData() }) .accounts({ group: group.publicKey, - admin: this.program.provider.wallet.publicKey, + admin: (this.program.provider as AnchorProvider).wallet.publicKey, tokenMint: mintPk, - payer: this.program.provider.wallet.publicKey, + payer: (this.program.provider as AnchorProvider).wallet.publicKey, }) .rpc(); } @@ -157,9 +157,9 @@ export class MangoClient { .setStubOracle({ val: I80F48.fromNumber(price).getData() }) .accounts({ group: group.publicKey, - admin: this.program.provider.wallet.publicKey, - tokenMint: mintPk, - payer: this.program.provider.wallet.publicKey, + admin: (this.program.provider as AnchorProvider).wallet.publicKey, + oracle: mintPk, + payer: (this.program.provider as AnchorProvider).wallet.publicKey, }) .rpc(); } @@ -212,8 +212,8 @@ export class MangoClient { .createAccount(accountNumber, name ?? '') .accounts({ group: group.publicKey, - owner: this.program.provider.wallet.publicKey, - payer: this.program.provider.wallet.publicKey, + owner: (this.program.provider as AnchorProvider).wallet.publicKey, + payer: (this.program.provider as AnchorProvider).wallet.publicKey, }) .rpc(); } @@ -256,8 +256,9 @@ export class MangoClient { .closeAccount() .accounts({ account: mangoAccount.publicKey, - owner: this.program.provider.wallet.publicKey, - solDestination: this.program.provider.wallet.publicKey, + owner: (this.program.provider as AnchorProvider).wallet.publicKey, + solDestination: (this.program.provider as AnchorProvider).wallet + .publicKey, }) .rpc(); } @@ -286,7 +287,8 @@ export class MangoClient { bank: bank.publicKey, vault: bank.vault, tokenAccount: tokenAccountPk, - tokenAuthority: this.program.provider.wallet.publicKey, + tokenAuthority: (this.program.provider as AnchorProvider).wallet + .publicKey, }) .remainingAccounts( healthRemainingAccounts.map( @@ -322,7 +324,6 @@ export class MangoClient { bank: bank.publicKey, vault: bank.vault, tokenAccount: tokenAccountPk, - tokenAuthority: this.program.provider.wallet.publicKey, }) .remainingAccounts( healthRemainingAccounts.map( @@ -348,12 +349,12 @@ export class MangoClient { .serum3RegisterMarket(marketIndex, name) .accounts({ group: group.publicKey, - admin: this.program.provider.wallet.publicKey, + admin: (this.program.provider as AnchorProvider).wallet.publicKey, serumProgram: serum3ProgramId, serumMarketExternal: serum3MarketExternalPk, baseBank: baseBank.publicKey, quoteBank: quoteBank.publicKey, - payer: this.program.provider.wallet.publicKey, + payer: (this.program.provider as AnchorProvider).wallet.publicKey, }) .rpc(); } @@ -417,8 +418,8 @@ export class MangoClient { serumMarket: serum3Market.publicKey, serumProgram: serum3Market.serumProgram, serumMarketExternal: serum3Market.serumMarketExternal, - owner: this.program.provider.wallet.publicKey, - payer: this.program.provider.wallet.publicKey, + owner: (this.program.provider as AnchorProvider).wallet.publicKey, + payer: (this.program.provider as AnchorProvider).wallet.publicKey, }) .rpc(); } @@ -493,7 +494,7 @@ export class MangoClient { .accounts({ group: group.publicKey, account: mangoAccount.publicKey, - owner: this.program.provider.wallet.publicKey, + owner: (this.program.provider as AnchorProvider).wallet.publicKey, openOrders: mangoAccount.findSerum3Account(serum3Market.marketIndex) ?.openOrders, serumMarket: serum3Market.publicKey, @@ -555,7 +556,7 @@ export class MangoClient { .accounts({ group: group.publicKey, account: mangoAccount.publicKey, - owner: this.program.provider.wallet.publicKey, + owner: (this.program.provider as AnchorProvider).wallet.publicKey, openOrders: mangoAccount.findSerum3Account(serum3Market.marketIndex) ?.openOrders, serumMarket: serum3Market.publicKey, @@ -650,7 +651,9 @@ export class MangoClient { const asks = new Keypair(); const eventQueue = new Keypair(); - console.log(this.program.provider.wallet.publicKey.toBase58()); + console.log( + (this.program.provider as AnchorProvider).wallet.publicKey.toBase58(), + ); return await this.program.methods .perpCreateMarket( @@ -673,12 +676,12 @@ export class MangoClient { ) .accounts({ group: group.publicKey, - admin: this.program.provider.wallet.publicKey, + admin: (this.program.provider as AnchorProvider).wallet.publicKey, oracle: oraclePk, bids: bids.publicKey, asks: asks.publicKey, eventQueue: eventQueue.publicKey, - payer: this.program.provider.wallet.publicKey, + payer: (this.program.provider as AnchorProvider).wallet.publicKey, }) .preInstructions([ SystemProgram.createAccount({ @@ -688,7 +691,8 @@ export class MangoClient { await this.program.provider.connection.getMinimumBalanceForRentExemption( 90160, ), - fromPubkey: this.program.provider.wallet.publicKey, + fromPubkey: (this.program.provider as AnchorProvider).wallet + .publicKey, newAccountPubkey: bids.publicKey, }), SystemProgram.createAccount({ @@ -698,7 +702,8 @@ export class MangoClient { await this.program.provider.connection.getMinimumBalanceForRentExemption( 90160, ), - fromPubkey: this.program.provider.wallet.publicKey, + fromPubkey: (this.program.provider as AnchorProvider).wallet + .publicKey, newAccountPubkey: asks.publicKey, }), SystemProgram.createAccount({ @@ -708,7 +713,8 @@ export class MangoClient { await this.program.provider.connection.getMinimumBalanceForRentExemption( 102432, ), - fromPubkey: this.program.provider.wallet.publicKey, + fromPubkey: (this.program.provider as AnchorProvider).wallet + .publicKey, newAccountPubkey: eventQueue.publicKey, }), ]) @@ -794,7 +800,7 @@ export class MangoClient { bids: perpMarket.bids, eventQueue: perpMarket.eventQueue, oracle: perpMarket.oracle, - owner: this.program.provider.wallet.publicKey, + owner: (this.program.provider as AnchorProvider).wallet.publicKey, }) .rpc(); } @@ -810,30 +816,6 @@ export class MangoClient { // const idl = await Program.fetchIdl(MANGO_V4_ID, provider); let idl = IDL; - // TODO: remove... - // Temporarily add missing (dummy) type definitions, so we can do new Program(...) below - // without anchor throwing errors. These types come from part of the code we don't yet care about - // in the client. - function addDummyType(idl: MangoV4, typeName: string) { - if (idl.types.find((type) => type.name === typeName)) { - return; - } - (idl.types as any).push({ - name: typeName, - type: { - kind: 'struct', - fields: [], - }, - }); - } - addDummyType(idl, 'usize'); - addDummyType(idl, 'AnyNode'); - addDummyType(idl, 'EventQueueHeader'); - addDummyType(idl, 'AnyEvent'); - addDummyType(idl, 'H'); - addDummyType(idl, 'H::Item'); - addDummyType(idl, 'NodeHandle'); - return new MangoClient( new Program(idl as MangoV4, MANGO_V4_ID, provider), devnet, diff --git a/ts/client/src/mango_v4.ts b/ts/client/src/mango_v4.ts index ff3aa55e0..4029a4628 100644 --- a/ts/client/src/mango_v4.ts +++ b/ts/client/src/mango_v4.ts @@ -519,9 +519,7 @@ export type MangoV4 = { "args": [ { "name": "banksLen", - "type": { - "defined": "usize" - } + "type": "u64" }, { "name": "cpiData", @@ -1522,9 +1520,7 @@ export type MangoV4 = { "args": [ { "name": "limit", - "type": { - "defined": "usize" - } + "type": "u64" } ] }, @@ -1917,33 +1913,23 @@ export type MangoV4 = { }, { "name": "bumpIndex", - "type": { - "defined": "usize" - } + "type": "u64" }, { "name": "freeListLen", - "type": { - "defined": "usize" - } + "type": "u64" }, { "name": "freeListHead", - "type": { - "defined": "NodeHandle" - } + "type": "u32" }, { "name": "rootNode", - "type": { - "defined": "NodeHandle" - } + "type": "u32" }, { "name": "leafCount", - "type": { - "defined": "usize" - } + "type": "u64" }, { "name": "nodes", @@ -1960,14 +1946,14 @@ export type MangoV4 = { } }, { - "name": "queue", + "name": "eventQueue", "type": { "kind": "struct", "fields": [ { "name": "header", "type": { - "defined": "H" + "defined": "EventQueueHeader" } }, { @@ -1975,7 +1961,7 @@ export type MangoV4 = { "type": { "array": [ { - "defined": "H::Item" + "defined": "AnyEvent" }, 512 ] @@ -1984,32 +1970,6 @@ export type MangoV4 = { ] } }, - { - "name": "eventQueueHeader", - "type": { - "kind": "struct", - "fields": [ - { - "name": "head", - "type": { - "defined": "usize" - } - }, - { - "name": "count", - "type": { - "defined": "usize" - } - }, - { - "name": "seqNum", - "type": { - "defined": "usize" - } - } - ] - } - }, { "name": "perpMarket", "type": { @@ -2470,6 +2430,68 @@ export type MangoV4 = { ] } }, + { + "name": "AnyNode", + "type": { + "kind": "struct", + "fields": [ + { + "name": "tag", + "type": "u32" + }, + { + "name": "data", + "type": { + "array": [ + "u8", + 84 + ] + } + } + ] + } + }, + { + "name": "EventQueueHeader", + "type": { + "kind": "struct", + "fields": [ + { + "name": "head", + "type": "u64" + }, + { + "name": "count", + "type": "u64" + }, + { + "name": "seqNum", + "type": "u64" + } + ] + } + }, + { + "name": "AnyEvent", + "type": { + "kind": "struct", + "fields": [ + { + "name": "eventType", + "type": "u8" + }, + { + "name": "padding", + "type": { + "array": [ + "u8", + 199 + ] + } + } + ] + } + }, { "name": "TokenIndex", "type": { @@ -3337,9 +3359,7 @@ export const IDL: MangoV4 = { "args": [ { "name": "banksLen", - "type": { - "defined": "usize" - } + "type": "u64" }, { "name": "cpiData", @@ -4340,9 +4360,7 @@ export const IDL: MangoV4 = { "args": [ { "name": "limit", - "type": { - "defined": "usize" - } + "type": "u64" } ] }, @@ -4735,33 +4753,23 @@ export const IDL: MangoV4 = { }, { "name": "bumpIndex", - "type": { - "defined": "usize" - } + "type": "u64" }, { "name": "freeListLen", - "type": { - "defined": "usize" - } + "type": "u64" }, { "name": "freeListHead", - "type": { - "defined": "NodeHandle" - } + "type": "u32" }, { "name": "rootNode", - "type": { - "defined": "NodeHandle" - } + "type": "u32" }, { "name": "leafCount", - "type": { - "defined": "usize" - } + "type": "u64" }, { "name": "nodes", @@ -4778,14 +4786,14 @@ export const IDL: MangoV4 = { } }, { - "name": "queue", + "name": "eventQueue", "type": { "kind": "struct", "fields": [ { "name": "header", "type": { - "defined": "H" + "defined": "EventQueueHeader" } }, { @@ -4793,7 +4801,7 @@ export const IDL: MangoV4 = { "type": { "array": [ { - "defined": "H::Item" + "defined": "AnyEvent" }, 512 ] @@ -4802,32 +4810,6 @@ export const IDL: MangoV4 = { ] } }, - { - "name": "eventQueueHeader", - "type": { - "kind": "struct", - "fields": [ - { - "name": "head", - "type": { - "defined": "usize" - } - }, - { - "name": "count", - "type": { - "defined": "usize" - } - }, - { - "name": "seqNum", - "type": { - "defined": "usize" - } - } - ] - } - }, { "name": "perpMarket", "type": { @@ -5288,6 +5270,68 @@ export const IDL: MangoV4 = { ] } }, + { + "name": "AnyNode", + "type": { + "kind": "struct", + "fields": [ + { + "name": "tag", + "type": "u32" + }, + { + "name": "data", + "type": { + "array": [ + "u8", + 84 + ] + } + } + ] + } + }, + { + "name": "EventQueueHeader", + "type": { + "kind": "struct", + "fields": [ + { + "name": "head", + "type": "u64" + }, + { + "name": "count", + "type": "u64" + }, + { + "name": "seqNum", + "type": "u64" + } + ] + } + }, + { + "name": "AnyEvent", + "type": { + "kind": "struct", + "fields": [ + { + "name": "eventType", + "type": "u8" + }, + { + "name": "padding", + "type": { + "array": [ + "u8", + 199 + ] + } + } + ] + } + }, { "name": "TokenIndex", "type": { diff --git a/ts/client/src/scripts/example1-admin.ts b/ts/client/src/scripts/example1-admin.ts index 1718c8844..f33f1b906 100644 --- a/ts/client/src/scripts/example1-admin.ts +++ b/ts/client/src/scripts/example1-admin.ts @@ -1,4 +1,4 @@ -import { Provider, Wallet } from '@project-serum/anchor'; +import { AnchorProvider, Wallet } from '@project-serum/anchor'; import { Connection, Keypair, PublicKey } from '@solana/web3.js'; import fs from 'fs'; import { MangoClient } from '../client'; @@ -25,7 +25,7 @@ const DEVNET_ORACLES = new Map([ // * solana airdrop 1 -k ~/.config/solana/admin.json // async function main() { - const options = Provider.defaultOptions(); + const options = AnchorProvider.defaultOptions(); const connection = new Connection( 'https://mango.devnet.rpcpool.com', options, @@ -38,7 +38,7 @@ async function main() { ); const adminWallet = new Wallet(admin); console.log(`Admin ${adminWallet.publicKey.toBase58()}`); - const adminProvider = new Provider(connection, adminWallet, options); + const adminProvider = new AnchorProvider(connection, adminWallet, options); const client = await MangoClient.connect(adminProvider, true); // group diff --git a/ts/client/src/scripts/example1-user.ts b/ts/client/src/scripts/example1-user.ts index ebfa79854..b126fc544 100644 --- a/ts/client/src/scripts/example1-user.ts +++ b/ts/client/src/scripts/example1-user.ts @@ -1,4 +1,4 @@ -import { Provider, Wallet } from '@project-serum/anchor'; +import { AnchorProvider, Wallet } from '@project-serum/anchor'; import { Connection, Keypair } from '@solana/web3.js'; import fs from 'fs'; import { OrderType, Side } from '../accounts/perp'; @@ -17,7 +17,7 @@ import { DEVNET_SERUM3_PROGRAM_ID } from '../constants'; // process.env.ADMIN_KEYPAIR - group admin keypair path (useful for automatically finding the group) // async function main() { - const options = Provider.defaultOptions(); + const options = AnchorProvider.defaultOptions(); const connection = new Connection( 'https://mango.devnet.rpcpool.com', options, @@ -29,7 +29,7 @@ async function main() { ), ); const userWallet = new Wallet(user); - const userProvider = new Provider(connection, userWallet, options); + const userProvider = new AnchorProvider(connection, userWallet, options); const client = await MangoClient.connect(userProvider, true); console.log(`User ${userWallet.publicKey.toBase58()}`); diff --git a/ts/client/yarn.lock b/ts/client/yarn.lock index 2ce643b63..14eb6680e 100644 --- a/ts/client/yarn.lock +++ b/ts/client/yarn.lock @@ -23,17 +23,10 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/runtime@^7.10.5": - version "7.17.8" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.8.tgz#3e56e4aff81befa55ac3ac6a0967349fd1c5bca2" - integrity sha512-dQpEpK0O9o6lj6oPu0gRDbbnk+4LeHlNcBpspf6Olzt3GIX4P1lWF1gS+pHLDFlaJvbR6q7jCfQ08zA4QJBnmA== - dependencies: - regenerator-runtime "^0.13.4" - -"@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5": - version "7.17.2" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.2.tgz#66f68591605e59da47523c631416b18508779941" - integrity sha512-hzeyJyMA1YGdJTuWU0e/j4wKXrU4OMFvY2MSlaI9B7VQb0r5cxTE3EAIS2Q7Tn2RIcDkRvTA/v2JsAEhxe99uw== +"@babel/runtime@^7.10.5", "@babel/runtime@^7.12.5", "@babel/runtime@^7.17.2": + version "7.17.9" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.9.tgz#d19fbf802d01a8cb6cf053a64e472d42c434ba72" + integrity sha512-lSiBBvodq29uShpWGNbgFdKYNiFDo5/HIYsaCEY9ff4sb10x9jizo2+pRrSyF4jKZCXqgzuqBOQKbUm90gQwJg== dependencies: regenerator-runtime "^0.13.4" @@ -52,25 +45,25 @@ minimatch "^3.0.4" strip-json-comments "^3.1.1" -"@ethersproject/bytes@^5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@ethersproject/bytes/-/bytes-5.5.0.tgz#cb11c526de657e7b45d2e0f0246fb3b9d29a601c" - integrity sha512-ABvc7BHWhZU9PNM/tANm/Qx4ostPGadAuQzWTr3doklZOhDlmcBqclrQe/ZXUIj3K8wC28oYeuRa+A37tX9kog== +"@ethersproject/bytes@^5.6.0": + version "5.6.1" + resolved "https://registry.yarnpkg.com/@ethersproject/bytes/-/bytes-5.6.1.tgz#24f916e411f82a8a60412344bf4a813b917eefe7" + integrity sha512-NwQt7cKn5+ZE4uDn+X5RAXLp46E1chXoaMmrxAyA0rblpxz8t58lVkrHXoRIn0lz1joQElQ8410GqhTqMOwc6g== dependencies: - "@ethersproject/logger" "^5.5.0" + "@ethersproject/logger" "^5.6.0" -"@ethersproject/logger@^5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@ethersproject/logger/-/logger-5.5.0.tgz#0c2caebeff98e10aefa5aef27d7441c7fd18cf5d" - integrity sha512-rIY/6WPm7T8n3qS2vuHTUBPdXHl+rGxWxW5okDfo9J4Z0+gRRZT0msvUdIJkE4/HS29GUMziwGaaKO2bWONBrg== +"@ethersproject/logger@^5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/logger/-/logger-5.6.0.tgz#d7db1bfcc22fd2e4ab574cba0bb6ad779a9a3e7a" + integrity sha512-BiBWllUROH9w+P21RzoxJKzqoqpkyM1pRnEKG69bulE9TSQD8SAIvTQqIMZmmCO8pUNkgLP1wndX1gKghSpBmg== "@ethersproject/sha2@^5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@ethersproject/sha2/-/sha2-5.5.0.tgz#a40a054c61f98fd9eee99af2c3cc6ff57ec24db7" - integrity sha512-B5UBoglbCiHamRVPLA110J+2uqsifpZaTmid2/7W5rbtYVz6gus6/hSDieIU/6gaKIDcOj12WnOdiymEUHIAOA== + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/sha2/-/sha2-5.6.0.tgz#364c4c11cc753bda36f31f001628706ebadb64d9" + integrity sha512-1tNWCPFLu1n3JM9t4/kytz35DkuF9MxqkGGEHNauEbaARdm2fafnOyw1s0tIQDPKF/7bkP1u3dbrmjpn5CelyA== dependencies: - "@ethersproject/bytes" "^5.5.0" - "@ethersproject/logger" "^5.5.0" + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/logger" "^5.6.0" hash.js "1.1.7" "@hapi/hoek@^9.0.0": @@ -140,13 +133,13 @@ snake-case "^3.0.4" toml "^3.0.0" -"@project-serum/anchor@^0.22.0": - version "0.22.0" - resolved "https://registry.yarnpkg.com/@project-serum/anchor/-/anchor-0.22.0.tgz#79d182851346fb46d471577c63eabdf6f199c03e" - integrity sha512-EJOE790pAQjm07loh7/JYzfcgfYv3SChBb2b9lhVdjjiimSEQrf3ESy+CGMAqcFAsyr699Ewj5k7RizY1y31cg== +"@project-serum/anchor@^0.24.2": + version "0.24.2" + resolved "https://registry.yarnpkg.com/@project-serum/anchor/-/anchor-0.24.2.tgz#a3c52a99605c80735f446ca9b3a4885034731004" + integrity sha512-0/718g8/DnEuwAidUwh5wLYphUYXhUbiClkuRNhvNoa+1Y8a4g2tJyxoae+emV+PG/Gikd/QUBNMkIcimiIRTA== dependencies: "@project-serum/borsh" "^0.2.5" - "@solana/web3.js" "^1.17.0" + "@solana/web3.js" "^1.36.0" base64-js "^1.5.1" bn.js "^5.1.2" bs58 "^4.0.1" @@ -155,7 +148,6 @@ cross-fetch "^3.1.5" crypto-hash "^1.3.0" eventemitter3 "^4.0.7" - find "^0.3.0" js-sha256 "^0.9.0" pako "^2.0.3" snake-case "^3.0.4" @@ -169,10 +161,10 @@ bn.js "^5.1.2" buffer-layout "^1.2.0" -"@project-serum/serum@^0.13.62": - version "0.13.62" - resolved "https://registry.yarnpkg.com/@project-serum/serum/-/serum-0.13.62.tgz#97bb9134134a2b6d5fbe25f970ca31a1e15a1ca4" - integrity sha512-AsOB83woe48/sAm86KuCubgxauecoawz+CGXT5HYqOkkhfBpppp9+tVR/dAkOgfIZ9Kc1d8MtNRDNXPojXdlow== +"@project-serum/serum@^0.13.65": + version "0.13.65" + resolved "https://registry.yarnpkg.com/@project-serum/serum/-/serum-0.13.65.tgz#6d3cf07912f13985765237f053cca716fe84b0b0" + integrity sha512-BHRqsTqPSfFB5p+MgI2pjvMBAQtO8ibTK2fYY96boIFkCI3TTwXDt2gUmspeChKO2pqHr5aKevmexzAcXxrSRA== dependencies: "@project-serum/anchor" "^0.11.1" "@solana/spl-token" "^0.1.6" @@ -207,13 +199,6 @@ bigint-buffer "^1.1.5" bignumber.js "^9.0.1" -"@solana/buffer-layout@^3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@solana/buffer-layout/-/buffer-layout-3.0.0.tgz#b9353caeb9a1589cb77a1b145bcb1a9a93114326" - integrity sha512-MVdgAKKL39tEs0l8je0hKaXLQFb7Rdfb0Xg2LjFZd8Lfdazkg6xiS98uAZrEKvaoF3i4M95ei9RydkGIDMeo3w== - dependencies: - buffer "~6.0.3" - "@solana/buffer-layout@^4.0.0": version "4.0.0" resolved "https://registry.yarnpkg.com/@solana/buffer-layout/-/buffer-layout-4.0.0.tgz#75b1b11adc487234821c81dfae3119b73a5fd734" @@ -243,39 +228,21 @@ "@solana/web3.js" "^1.32.0" start-server-and-test "^1.14.0" -"@solana/web3.js@^1.17.0": - version "1.35.1" - resolved "https://registry.yarnpkg.com/@solana/web3.js/-/web3.js-1.35.1.tgz#777b039a3b51e63c347712a57c7db87c9d1db832" - integrity sha512-3bDawFFI0KcvgI8Ae4N4hdQ8+Bg9gu6q+IkhPrYxOF6RYnB3U+9A4u+DhHZWLvTvgoTyesi/m5HzlleKtFEqRQ== - dependencies: - "@babel/runtime" "^7.12.5" - "@ethersproject/sha2" "^5.5.0" - "@solana/buffer-layout" "^3.0.0" - bn.js "^5.0.0" - borsh "^0.4.0" - bs58 "^4.0.1" - buffer "6.0.1" - cross-fetch "^3.1.4" - jayson "^3.4.4" - js-sha3 "^0.8.0" - rpc-websockets "^7.4.2" - secp256k1 "^4.0.2" - superstruct "^0.14.2" - tweetnacl "^1.0.0" - -"@solana/web3.js@^1.21.0", "@solana/web3.js@^1.32.0": - version "1.37.0" - resolved "https://registry.yarnpkg.com/@solana/web3.js/-/web3.js-1.37.0.tgz#167b5b5d4aedc151237d9230b6142da068b0af34" - integrity sha512-O2iCcgkGdi2FXwVLztPIZHcBuZXdhbVLavMsG+RdEyFGzFD0tQN1rOJ+Xb5eaexjqtgcqRN+Fyg3wAhLcHJbiA== +"@solana/web3.js@^1.17.0", "@solana/web3.js@^1.21.0", "@solana/web3.js@^1.32.0", "@solana/web3.js@^1.36.0": + version "1.42.0" + resolved "https://registry.yarnpkg.com/@solana/web3.js/-/web3.js-1.42.0.tgz#296e4bbab1fbfc198b3e9c3d94016c3876eb6a2c" + integrity sha512-QqGh5DWzrgsWRx4sCPDQIm3390b7buPR16tZI61slQaQwJ2ymrSXPQCe4PPTJEIlzGjCV3dkn2vpT2R32BfK2Q== dependencies: "@babel/runtime" "^7.12.5" "@ethersproject/sha2" "^5.5.0" "@solana/buffer-layout" "^4.0.0" + "@solana/buffer-layout-utils" "^0.2.0" bn.js "^5.0.0" borsh "^0.7.0" bs58 "^4.0.1" buffer "6.0.1" cross-fetch "^3.1.4" + fast-stable-stringify "^1.0.0" jayson "^3.4.4" js-sha3 "^0.8.0" rpc-websockets "^7.4.2" @@ -288,13 +255,6 @@ resolved "https://registry.yarnpkg.com/@tsconfig/recommended/-/recommended-1.0.1.tgz#7619bad397e06ead1c5182926c944e0ca6177f52" integrity sha512-2xN+iGTbPBEzGSnVp/Hd64vKJCJWxsi9gfs88x4PPMyEjHJoA3o5BY9r5OLPHIZU2pAQxkSAsJFqn6itClP8mQ== -"@types/bn.js@^4.11.5": - version "4.11.6" - resolved "https://registry.yarnpkg.com/@types/bn.js/-/bn.js-4.11.6.tgz#c306c70d9358aaea33cd4eda092a742b9505967c" - integrity sha512-pqr857jrp2kPuO9uRjZ3PwnJTjoQy+fcdxvBTvHm6dkmEL9q+hDD/2j/0ELOBPtPnS8LjCX0gI9nbl8lVkadpg== - dependencies: - "@types/node" "*" - "@types/bs58@^4.0.1": version "4.0.1" resolved "https://registry.yarnpkg.com/@types/bs58/-/bs58-4.0.1.tgz#3d51222aab067786d3bc3740a84a7f5a0effaa37" @@ -334,9 +294,9 @@ integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4= "@types/lodash@^4.14.159": - version "4.14.178" - resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.178.tgz#341f6d2247db528d4a13ddbb374bcdc80406f4f8" - integrity sha512-0d5Wd09ItQWH1qFbEyQ7oTQ3GZrMfth5JkbN3EvTKLXcHLRDSXeLnlvlOn0wvxVIwK5o2M8JzP/OWz7T3NRsbw== + version "4.14.182" + resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.182.tgz#05301a4d5e62963227eaafe0ce04dd77c54ea5c2" + integrity sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q== "@types/mocha@^9.1.0": version "9.1.0" @@ -344,14 +304,14 @@ integrity sha512-QCWHkbMv4Y5U9oW10Uxbr45qMMSzl4OzijsozynUAgx3kEHUdXB00udx2dWDQ7f2TU2a2uuiFaRZjCe3unPpeg== "@types/node@*": - version "17.0.19" - resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.19.tgz#726171367f404bfbe8512ba608a09ebad810c7e6" - integrity sha512-PfeQhvcMR4cPFVuYfBN4ifG7p9c+Dlh3yUZR6k+5yQK7wX3gDgVxBly4/WkBRs9x4dmcy1TVl08SY67wwtEvmA== + version "17.0.34" + resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.34.tgz#3b0b6a50ff797280b8d000c6281d229f9c538cef" + integrity sha512-XImEz7XwTvDBtzlTnm8YvMqGW/ErMWBsKZ+hMTvnDIjGCKxwK5Xpc+c/oQjOauwq8M4OS11hEkpjX8rrI/eEgA== "@types/node@^12.12.54": - version "12.20.46" - resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.46.tgz#7e49dee4c54fd19584e6a9e0da5f3dc2e9136bc7" - integrity sha512-cPjLXj8d6anFPzFvOPxS3fvly3Shm5nTfl6g8X5smexixbuGUf7hfr21J5tX9JW+UPStp/5P5R8qrKL5IyVJ+A== + version "12.20.52" + resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.52.tgz#2fd2dc6bfa185601b15457398d4ba1ef27f81251" + integrity sha512-cfkwWw72849SNYp3Zx0IcIs25vABmFh73xicxhCkTcvtZQeIez15PpwQN8fY3RD7gv1Wrxlc9MEtfMORZDEsGw== "@types/node@^14.14.37": version "14.18.12" @@ -630,16 +590,6 @@ bn.js@^5.0.0, bn.js@^5.1.0, bn.js@^5.1.2, bn.js@^5.2.0: resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.0.tgz#358860674396c6997771a9d051fcc1b57d4ae002" integrity sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw== -borsh@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/borsh/-/borsh-0.4.0.tgz#9dd6defe741627f1315eac2a73df61421f6ddb9f" - integrity sha512-aX6qtLya3K0AkT66CmYWCCDr77qsE9arV05OmdFpmat9qu8Pg9J5tBUPDztAW5fNh/d/MyVG/OYziP52Ndzx1g== - dependencies: - "@types/bn.js" "^4.11.5" - bn.js "^5.0.0" - bs58 "^4.0.0" - text-encoding-utf-8 "^1.0.2" - borsh@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/borsh/-/borsh-0.7.0.tgz#6e9560d719d86d90dc589bca60ffc8a6c51fec2a" @@ -667,7 +617,7 @@ braces@^3.0.1, braces@~3.0.2: brorand@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" - integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8= + integrity sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w== browser-stdout@1.3.1: version "1.3.1" @@ -677,7 +627,7 @@ browser-stdout@1.3.1: bs58@^4.0.0, bs58@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/bs58/-/bs58-4.0.1.tgz#be161e76c354f6f788ae4071f63f34e8c4f0a42a" - integrity sha1-vhYedsNU9veIrkBx9j806MTwpCo= + integrity sha512-Ok3Wdf5vOIlBrgCvTq96gBkJw+JUEzdBgyaza5HLtPm7yTHkjRy8+JzNyHF7BHa0bNWOQIp3m5YF0nnFcOIKLw== dependencies: base-x "^3.0.2" @@ -791,11 +741,6 @@ chokidar@3.5.3: optionalDependencies: fsevents "~2.3.2" -circular-json@^0.5.9: - version "0.5.9" - resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.5.9.tgz#932763ae88f4f7dead7a0d09c8a51a4743a53b1d" - integrity sha512-4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ== - cliui@^7.0.2: version "7.0.4" resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f" @@ -1190,6 +1135,11 @@ fast-levenshtein@^2.0.6: resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= +fast-stable-stringify@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fast-stable-stringify/-/fast-stable-stringify-1.0.0.tgz#5c5543462b22aeeefd36d05b34e51c78cb86d313" + integrity sha1-XFVDRisiru79NtBbNOUceMuG0xM= + fastq@^1.6.0: version "1.13.0" resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz#616760f88a7526bdfc596b7cab8c18938c36b98c" @@ -1777,9 +1727,9 @@ node-fetch@2.6.7: whatwg-url "^5.0.0" node-gyp-build@^4.2.0, node-gyp-build@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.3.0.tgz#9f256b03e5826150be39c764bf51e993946d71a3" - integrity sha512-iWjXZvmboq0ja1pUGULQBexmxq8CV4xBhX7VDOTbL7ZR4FOowwY/VOtRxBN/yKxmdGoIp4j5ysNT4u3S2pDQ3Q== + version "4.4.0" + resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.4.0.tgz#42e99687ce87ddeaf3a10b99dc06abc11021f3f4" + integrity sha512-amJnQCcgtRVw9SvoebO3BKGESClrfXGCUTX9hSn1OuGQTQBOZmVd0Z0OlecpuRksKvbsUqALE8jls/ErClAPuQ== normalize-path@^3.0.0, normalize-path@~3.0.0: version "3.0.0" @@ -1966,15 +1916,14 @@ rimraf@^3.0.2: glob "^7.1.3" rpc-websockets@^7.4.2: - version "7.4.17" - resolved "https://registry.yarnpkg.com/rpc-websockets/-/rpc-websockets-7.4.17.tgz#f38845dd96db0442bff9e15fba9df781beb44cc0" - integrity sha512-eolVi/qlXS13viIUH9aqrde902wzSLAai0IjmOZSRefp5I3CSG/vCnD0c0fDSYCWuEyUoRL1BHQA8K1baEUyow== + version "7.4.18" + resolved "https://registry.yarnpkg.com/rpc-websockets/-/rpc-websockets-7.4.18.tgz#274c825c0efadbf6fe75f10289229ae537fe9ffb" + integrity sha512-bVu+4qM5CkGVlTqJa6FaAxLbb5uRnyH4te7yjFvoCzbnif7PT4BcvXtNTprHlNvsH+/StB81zUQicxMrUrIomA== dependencies: - "@babel/runtime" "^7.11.2" - circular-json "^0.5.9" + "@babel/runtime" "^7.17.2" eventemitter3 "^4.0.7" - uuid "^8.3.0" - ws "^7.4.5" + uuid "^8.3.2" + ws "^8.5.0" optionalDependencies: bufferutil "^4.0.1" utf-8-validate "^5.0.2" @@ -2269,7 +2218,12 @@ tslib@^1.8.1: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== -tslib@^2.0.3, tslib@^2.1.0: +tslib@^2.0.3: + version "2.4.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3" + integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ== + +tslib@^2.1.0: version "2.3.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw== @@ -2327,13 +2281,13 @@ uri-js@^4.2.2: punycode "^2.1.0" utf-8-validate@^5.0.2: - version "5.0.8" - resolved "https://registry.yarnpkg.com/utf-8-validate/-/utf-8-validate-5.0.8.tgz#4a735a61661dbb1c59a0868c397d2fe263f14e58" - integrity sha512-k4dW/Qja1BYDl2qD4tOMB9PFVha/UJtxTc1cXYOe3WwA/2m0Yn4qB7wLMpJyLJ/7DR0XnTut3HsCSzDT4ZvKgA== + version "5.0.9" + resolved "https://registry.yarnpkg.com/utf-8-validate/-/utf-8-validate-5.0.9.tgz#ba16a822fbeedff1a58918f2a6a6b36387493ea3" + integrity sha512-Yek7dAy0v3Kl0orwMlvi7TPtiCNrdfHNd7Gcc/pLq4BLXqfAmd0J7OWMizUQnTTJsyjKn02mU7anqwfmUP4J8Q== dependencies: node-gyp-build "^4.3.0" -uuid@^8.3.0, uuid@^8.3.2: +uuid@^8.3.2: version "8.3.2" resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== @@ -2413,6 +2367,11 @@ ws@^7.4.5: resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.7.tgz#9e0ac77ee50af70d58326ecff7e85eb3fa375e67" integrity sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A== +ws@^8.5.0: + version "8.6.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.6.0.tgz#e5e9f1d9e7ff88083d0c0dd8281ea662a42c9c23" + integrity sha512-AzmM3aH3gk0aX7/rZLYvjdvZooofDu3fFOzGqcSnQ1tOcTWwhM/o+q++E8mAyVVIyUdajrkzWUGftaVSDLn1bw== + y18n@^5.0.5: version "5.0.8" resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" diff --git a/update-local-idl.sh b/update-local-idl.sh index 0ccc4cc7e..22274462c 100755 --- a/update-local-idl.sh +++ b/update-local-idl.sh @@ -2,7 +2,14 @@ set -e pipefail +# TODO fix need for --skip-lint +# build program, anchor build --skip-lint + +# patch types, which we want in rust, but anchor client doesn't support ./idl-fixup.sh + +# update types in ts client package cp -v ./target/types/mango_v4.ts ./ts/client/src/mango_v4.ts + (cd ./ts/client && tsc)