From 1a0f08e980e2577a14f8ce352acd940ec9f42383 Mon Sep 17 00:00:00 2001 From: Evgeny Ukhanov Date: Tue, 19 Sep 2023 17:09:34 +0200 Subject: [PATCH 1/7] Set stable toolchain and refactored Cargo.toml and CI --- .github/workflows/rust.yaml | 36 +- .gitignore | 1 + Cargo.lock | 3590 -------------------- Cargo.toml | 1 + res/mock_engine/rust-toolchain.toml | 2 - res/mock_eth_connector/rust-toolchain.toml | 2 - rust-toolchain | 4 - 7 files changed, 34 insertions(+), 3602 deletions(-) delete mode 100644 Cargo.lock delete mode 100644 rust-toolchain diff --git a/.github/workflows/rust.yaml b/.github/workflows/rust.yaml index 247d464..30ae33e 100644 --- a/.github/workflows/rust.yaml +++ b/.github/workflows/rust.yaml @@ -14,9 +14,37 @@ jobs: steps: - name: Checkout sources uses: actions/checkout@v2 - - name: Add toolchain - run: rustup target add wasm32-unknown-unknown - - name: Run checks + - name: Run all checks run: make check + test: + name: Tests + runs-on: [self-hosted, heavy] + steps: + - name: Checkout sources + uses: actions/checkout@v2 + - name: Add toolchain + run: rustup target add wasm32-unknown-unknown + - name: Restore cache + run: | + cache-util restore cargo_git cargo_registry sandbox:${{ env.NEAR_SANDBOX_BIN_PATH }} + - name: Install sandbox + run: | + if [[ ! -f ${{ env.NEAR_SANDBOX_BIN_PATH }} ]]; then + mkdir -p $HOME/bin + rm -rf nearcore + git clone --depth 1 --branch 1.35.0 https://github.com/near/nearcore + cd nearcore + make sandbox-release + cp target/release/near-sandbox $HOME/bin/ + cache-util save sandbox:${{ env.NEAR_SANDBOX_BIN_PATH }} + cd ../ + rm -rf nearcore + fi - name: Run tests - run: make test + run: NEAR_SANDBOX_BIN_PATH=${{ env.NEAR_SANDBOX_BIN_PATH }} make test + - name: Save cache + run: | + cache-util save cargo_git cargo_registry + +env: + NEAR_SANDBOX_BIN_PATH: $HOME/bin/near-sandbox diff --git a/.gitignore b/.gitignore index 45545ed..d67d0c3 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ target/ **/*.rs.bk bin/ .idea +Cargo.lock # MacOS index files .DS_Store diff --git a/Cargo.lock b/Cargo.lock deleted file mode 100644 index d458462..0000000 --- a/Cargo.lock +++ /dev/null @@ -1,3590 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "Inflector" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" - -[[package]] -name = "addr2line" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "ahash" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" -dependencies = [ - "getrandom 0.2.10", - "once_cell", - "version_check", -] - -[[package]] -name = "ahash" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" -dependencies = [ - "cfg-if 1.0.0", - "once_cell", - "version_check", -] - -[[package]] -name = "aho-corasick" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" -dependencies = [ - "memchr", -] - -[[package]] -name = "android-tzdata" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" - -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - -[[package]] -name = "anyhow" -version = "1.0.71" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" - -[[package]] -name = "arrayref" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" - -[[package]] -name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" - -[[package]] -name = "arrayvec" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" - -[[package]] -name = "async-channel" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" -dependencies = [ - "concurrent-queue", - "event-listener", - "futures-core", -] - -[[package]] -name = "async-io" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" -dependencies = [ - "async-lock", - "autocfg", - "cfg-if 1.0.0", - "concurrent-queue", - "futures-lite", - "log", - "parking", - "polling", - "rustix", - "slab", - "socket2", - "waker-fn", -] - -[[package]] -name = "async-lock" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" -dependencies = [ - "event-listener", -] - -[[package]] -name = "async-process" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a9d28b1d97e08915212e2e45310d47854eafa69600756fc735fb788f75199c9" -dependencies = [ - "async-io", - "async-lock", - "autocfg", - "blocking", - "cfg-if 1.0.0", - "event-listener", - "futures-lite", - "rustix", - "signal-hook", - "windows-sys 0.48.0", -] - -[[package]] -name = "async-task" -version = "4.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" - -[[package]] -name = "async-trait" -version = "0.1.68" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.18", -] - -[[package]] -name = "atomic-waker" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" - -[[package]] -name = "aurora-engine-types" -version = "1.0.0" -source = "git+https://github.com/aurora-is-near/aurora-engine.git?branch=develop#9caf85fac1173587f086e8fd04c3489207020998" -dependencies = [ - "base64 0.21.2", - "borsh 0.10.3", - "borsh 0.9.3", - "hex 0.4.3", - "primitive-types 0.12.1", - "rlp", - "serde", - "serde_json", -] - -[[package]] -name = "aurora-workspace-engine" -version = "0.3.0" -dependencies = [ - "anyhow", - "aurora-engine-types", - "aurora-workspace-utils", - "ethereum-types", - "hex 0.4.3", - "lazy_static", - "near-sdk", - "serde", - "serde_json", - "tokio", - "workspaces", -] - -[[package]] -name = "aurora-workspace-eth-connector" -version = "0.3.0" -dependencies = [ - "anyhow", - "aurora-engine-types", - "aurora-workspace-utils", - "hex 0.4.3", - "lazy_static", - "near-contract-standards", - "near-sdk", - "near-units", - "serde", - "serde_json", - "tokio", - "workspaces", -] - -[[package]] -name = "aurora-workspace-utils" -version = "0.3.0" -dependencies = [ - "anyhow", - "aurora-engine-types", - "near-sdk", - "near-units", - "serde", - "tokio", - "workspaces", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "backtrace" -version = "0.3.67" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" -dependencies = [ - "addr2line", - "cc", - "cfg-if 1.0.0", - "libc", - "miniz_oxide 0.6.2", - "object", - "rustc-demangle", -] - -[[package]] -name = "base64" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" - -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - -[[package]] -name = "base64" -version = "0.21.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" - -[[package]] -name = "binary-install" -version = "0.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5bc5f8c50dd6a80d0b303ddab79f42ddcb52fd43d68107ecf622c551fd4cd4" -dependencies = [ - "curl", - "dirs 1.0.5", - "failure", - "flate2", - "hex 0.3.2", - "is_executable", - "siphasher", - "tar", - "zip", -] - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitvec" -version = "0.20.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7774144344a4faa177370406a7ff5f1da24303817368584c6206c8303eb07848" -dependencies = [ - "funty 1.1.0", - "radium 0.6.2", - "tap", - "wyz 0.2.0", -] - -[[package]] -name = "bitvec" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" -dependencies = [ - "funty 2.0.0", - "radium 0.7.0", - "tap", - "wyz 0.5.1", -] - -[[package]] -name = "blake2" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a4e37d16930f5459780f5621038b6382b9bb37c19016f39fb6b5808d831f174" -dependencies = [ - "crypto-mac", - "digest 0.9.0", - "opaque-debug", -] - -[[package]] -name = "blake2b_simd" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" -dependencies = [ - "arrayref", - "arrayvec 0.5.2", - "constant_time_eq", -] - -[[package]] -name = "block-buffer" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -dependencies = [ - "generic-array", -] - -[[package]] -name = "block-buffer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array", -] - -[[package]] -name = "blocking" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65" -dependencies = [ - "async-channel", - "async-lock", - "async-task", - "atomic-waker", - "fastrand", - "futures-lite", - "log", -] - -[[package]] -name = "borsh" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15bf3650200d8bffa99015595e10f1fbd17de07abbc25bb067da79e769939bfa" -dependencies = [ - "borsh-derive 0.9.3", - "hashbrown 0.11.2", -] - -[[package]] -name = "borsh" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4114279215a005bc675e386011e594e1d9b800918cea18fcadadcce864a2046b" -dependencies = [ - "borsh-derive 0.10.3", - "hashbrown 0.13.2", -] - -[[package]] -name = "borsh-derive" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6441c552f230375d18e3cc377677914d2ca2b0d36e52129fe15450a2dce46775" -dependencies = [ - "borsh-derive-internal 0.9.3", - "borsh-schema-derive-internal 0.9.3", - "proc-macro-crate 0.1.5", - "proc-macro2", - "syn 1.0.109", -] - -[[package]] -name = "borsh-derive" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0754613691538d51f329cce9af41d7b7ca150bc973056f1156611489475f54f7" -dependencies = [ - "borsh-derive-internal 0.10.3", - "borsh-schema-derive-internal 0.10.3", - "proc-macro-crate 0.1.5", - "proc-macro2", - "syn 1.0.109", -] - -[[package]] -name = "borsh-derive-internal" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5449c28a7b352f2d1e592a8a28bf139bc71afb0764a14f3c02500935d8c44065" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "borsh-derive-internal" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afb438156919598d2c7bad7e1c0adf3d26ed3840dbc010db1a882a65583ca2fb" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "borsh-schema-derive-internal" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdbd5696d8bfa21d53d9fe39a714a18538bad11492a42d066dbbc395fb1951c0" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "borsh-schema-derive-internal" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634205cc43f74a1b9046ef87c4540ebda95696ec0f315024860cad7c5b0f5ccd" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "bs58" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" - -[[package]] -name = "bumpalo" -version = "3.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" - -[[package]] -name = "byte-slice-cast" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c" - -[[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[package]] -name = "bytes" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" - -[[package]] -name = "bytesize" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38fcc2979eff34a4b84e1cf9a1e3da42a7d44b3b690a40cdcb23e3d556cfb2e5" - -[[package]] -name = "bzip2" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8" -dependencies = [ - "bzip2-sys", - "libc", -] - -[[package]] -name = "bzip2-sys" -version = "0.1.11+1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" -dependencies = [ - "cc", - "libc", - "pkg-config", -] - -[[package]] -name = "c2-chacha" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d27dae93fe7b1e0424dc57179ac396908c26b035a87234809f5c4dfd1b47dc80" -dependencies = [ - "cipher", - "ppv-lite86", -] - -[[package]] -name = "cc" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" - -[[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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "chrono" -version = "0.4.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "js-sys", - "num-traits", - "serde", - "time", - "wasm-bindgen", - "winapi", -] - -[[package]] -name = "cipher" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801" -dependencies = [ - "generic-array", -] - -[[package]] -name = "concurrent-queue" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" -dependencies = [ - "crossbeam-utils", -] - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" - -[[package]] -name = "cpufeatures" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03e69e28e9f7f77debdedbaafa2866e1de9ba56df55a8bd7cfc724c25a09987c" -dependencies = [ - "libc", -] - -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "crunchy" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "typenum", -] - -[[package]] -name = "crypto-mac" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" -dependencies = [ - "generic-array", - "subtle", -] - -[[package]] -name = "curl" -version = "0.4.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "509bd11746c7ac09ebd19f0b17782eae80aadee26237658a6b4808afb5c11a22" -dependencies = [ - "curl-sys", - "libc", - "openssl-probe", - "openssl-sys", - "schannel", - "socket2", - "winapi", -] - -[[package]] -name = "curl-sys" -version = "0.4.63+curl-8.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aeb0fef7046022a1e2ad67a004978f0e3cacb9e3123dc62ce768f92197b771dc" -dependencies = [ - "cc", - "libc", - "libz-sys", - "openssl-sys", - "pkg-config", - "vcpkg", - "winapi", -] - -[[package]] -name = "curve25519-dalek" -version = "3.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90f9d052967f590a76e62eb387bd0bbb1b000182c3cefe5364db6b7211651bc0" -dependencies = [ - "byteorder", - "digest 0.9.0", - "rand_core 0.5.1", - "subtle", - "zeroize", -] - -[[package]] -name = "derive_more" -version = "0.99.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" -dependencies = [ - "convert_case", - "proc-macro2", - "quote", - "rustc_version", - "syn 1.0.109", -] - -[[package]] -name = "digest" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" -dependencies = [ - "generic-array", -] - -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer 0.10.4", - "crypto-common", -] - -[[package]] -name = "dirs" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901" -dependencies = [ - "libc", - "redox_users 0.3.5", - "winapi", -] - -[[package]] -name = "dirs" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" -dependencies = [ - "libc", - "redox_users 0.4.3", - "winapi", -] - -[[package]] -name = "dyn-clone" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30" - -[[package]] -name = "easy-ext" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53aff6fdc1b181225acdcb5b14c47106726fd8e486707315b1b138baed68ee31" - -[[package]] -name = "ed25519" -version = "1.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" -dependencies = [ - "signature", -] - -[[package]] -name = "ed25519-dalek" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" -dependencies = [ - "curve25519-dalek", - "ed25519", - "rand 0.7.3", - "serde", - "sha2 0.9.9", - "zeroize", -] - -[[package]] -name = "encoding_rs" -version = "0.8.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "errno" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" -dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "ethbloom" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c22d4b5885b6aa2fe5e8b9329fb8d232bf739e434e6b87347c63bdd00c120f60" -dependencies = [ - "crunchy", - "fixed-hash 0.8.0", - "impl-serde", - "tiny-keccak", -] - -[[package]] -name = "ethereum-types" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02d215cbf040552efcbe99a38372fe80ab9d00268e20012b79fcd0f073edd8ee" -dependencies = [ - "ethbloom", - "fixed-hash 0.8.0", - "impl-serde", - "primitive-types 0.12.1", - "uint", -] - -[[package]] -name = "event-listener" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - -[[package]] -name = "failure" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" -dependencies = [ - "backtrace", - "failure_derive", -] - -[[package]] -name = "failure_derive" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "synstructure", -] - -[[package]] -name = "fastrand" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - -[[package]] -name = "filetime" -version = "0.2.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "redox_syscall 0.2.16", - "windows-sys 0.48.0", -] - -[[package]] -name = "fixed-hash" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfcf0ed7fe52a17a03854ec54a9f76d6d84508d1c0e66bc1793301c73fc8493c" -dependencies = [ - "byteorder", - "rand 0.8.5", - "rustc-hex", - "static_assertions", -] - -[[package]] -name = "fixed-hash" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534" -dependencies = [ - "byteorder", - "rand 0.8.5", - "rustc-hex", - "static_assertions", -] - -[[package]] -name = "flate2" -version = "1.0.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" -dependencies = [ - "crc32fast", - "miniz_oxide 0.7.1", -] - -[[package]] -name = "fnv" -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.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "fs2" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "funty" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" - -[[package]] -name = "funty" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" - -[[package]] -name = "futures-channel" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" -dependencies = [ - "futures-core", -] - -[[package]] -name = "futures-core" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" - -[[package]] -name = "futures-io" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" - -[[package]] -name = "futures-lite" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" -dependencies = [ - "fastrand", - "futures-core", - "futures-io", - "memchr", - "parking", - "pin-project-lite", - "waker-fn", -] - -[[package]] -name = "futures-sink" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" - -[[package]] -name = "futures-task" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" - -[[package]] -name = "futures-util" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" -dependencies = [ - "futures-core", - "futures-task", - "pin-project-lite", - "pin-utils", -] - -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - -[[package]] -name = "getrandom" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", -] - -[[package]] -name = "gimli" -version = "0.27.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" - -[[package]] -name = "h2" -version = "0.3.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "hashbrown" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" -dependencies = [ - "ahash 0.7.6", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "hashbrown" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" -dependencies = [ - "ahash 0.8.3", -] - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[package]] -name = "hermit-abi" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" - -[[package]] -name = "hex" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77" - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "home" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" -dependencies = [ - "windows-sys 0.48.0", -] - -[[package]] -name = "http" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http-body" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" -dependencies = [ - "bytes", - "http", - "pin-project-lite", -] - -[[package]] -name = "httparse" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" - -[[package]] -name = "httpdate" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" - -[[package]] -name = "hyper" -version = "0.14.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "socket2", - "tokio", - "tower-service", - "tracing", - "want", -] - -[[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 = "iana-time-zone" -version = "0.1.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "windows", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" -dependencies = [ - "cc", -] - -[[package]] -name = "idna" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "impl-codec" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "161ebdfec3c8e3b52bf61c4f3550a1eea4f9579d10dc1b936f3171ebdcd6c443" -dependencies = [ - "parity-scale-codec 2.3.1", -] - -[[package]] -name = "impl-codec" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba6a270039626615617f3f36d15fc827041df3b78c439da2cadfa47455a77f2f" -dependencies = [ - "parity-scale-codec 3.6.1", -] - -[[package]] -name = "impl-rlp" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28220f89297a075ddc7245cd538076ee98b01f2a9c23a53a4f1105d5a322808" -dependencies = [ - "rlp", -] - -[[package]] -name = "impl-serde" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebc88fc67028ae3db0c853baa36269d398d5f45b6982f95549ff5def78c935cd" -dependencies = [ - "serde", -] - -[[package]] -name = "impl-trait-for-tuples" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", -] - -[[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", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi 0.3.1", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "ipnet" -version = "2.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f" - -[[package]] -name = "is_executable" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "302d553b8abc8187beb7d663e34c065ac4570b273bc9511a50e940e99409c577" -dependencies = [ - "winapi", -] - -[[package]] -name = "itoa" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" - -[[package]] -name = "js-sys" -version = "0.3.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "keccak" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940" -dependencies = [ - "cpufeatures", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -dependencies = [ - "spin", -] - -[[package]] -name = "libc" -version = "0.2.146" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" - -[[package]] -name = "libz-sys" -version = "1.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "linux-raw-sys" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - -[[package]] -name = "lock_api" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" - -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "memory_units" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8452105ba047068f40ff7093dd1d9da90898e63dd61736462e9cdda6a90ad3c3" - -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - -[[package]] -name = "miniz_oxide" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" -dependencies = [ - "adler", -] - -[[package]] -name = "miniz_oxide" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" -dependencies = [ - "adler", -] - -[[package]] -name = "mio" -version = "0.8.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" -dependencies = [ - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.48.0", -] - -[[package]] -name = "native-tls" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" -dependencies = [ - "lazy_static", - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - -[[package]] -name = "near-abi" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "885db39b08518fa700b73fa2214e8adbbfba316ba82dd510f50519173eadaf73" -dependencies = [ - "borsh 0.9.3", - "schemars", - "semver", - "serde", -] - -[[package]] -name = "near-account-id" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d258582a1878e6db67400b0504a5099db85718d22c2e07f747fe1706ae7150" -dependencies = [ - "borsh 0.9.3", - "serde", -] - -[[package]] -name = "near-account-id" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d924011380de759c3dc6fdbcda37a19a5c061f56dab69d28a34ecee765e23e4" -dependencies = [ - "borsh 0.9.3", - "serde", -] - -[[package]] -name = "near-chain-configs" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1faf676a95bd1718b06e5957e01a9415fedf7900f32d94d5bcf70abd678b10a2" -dependencies = [ - "anyhow", - "chrono", - "derive_more", - "near-crypto 0.15.0", - "near-primitives 0.15.0", - "num-rational", - "serde", - "serde_json", - "sha2 0.10.7", - "smart-default", - "tracing", -] - -[[package]] -name = "near-contract-standards" -version = "4.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bacc932e79b26472797adfb21689294b6f90960d1570daaf1e0b682b59fcb35" -dependencies = [ - "near-sdk", - "schemars", - "serde", - "serde_json", -] - -[[package]] -name = "near-crypto" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e75673d69fd7365508f3d32483669fe45b03bfb34e4d9363e90adae9dfb416c" -dependencies = [ - "arrayref", - "blake2", - "borsh 0.9.3", - "bs58", - "c2-chacha", - "curve25519-dalek", - "derive_more", - "ed25519-dalek", - "near-account-id 0.14.0", - "once_cell", - "parity-secp256k1", - "primitive-types 0.10.1", - "rand 0.7.3", - "rand_core 0.5.1", - "serde", - "serde_json", - "subtle", - "thiserror", -] - -[[package]] -name = "near-crypto" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7754612b47737d277fb818e9fdbb1406e90f9e57151c55c3584d714421976cb6" -dependencies = [ - "arrayref", - "blake2", - "borsh 0.9.3", - "bs58", - "c2-chacha", - "curve25519-dalek", - "derive_more", - "ed25519-dalek", - "near-account-id 0.15.0", - "once_cell", - "primitive-types 0.10.1", - "rand 0.7.3", - "secp256k1", - "serde", - "serde_json", - "subtle", - "thiserror", -] - -[[package]] -name = "near-jsonrpc-client" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1335ffce1476da6516dcd22b26cece1a495fc725c0e8fec1879073752ac068d" -dependencies = [ - "borsh 0.9.3", - "lazy_static", - "log", - "near-chain-configs", - "near-crypto 0.15.0", - "near-jsonrpc-primitives", - "near-primitives 0.15.0", - "reqwest", - "serde", - "serde_json", - "thiserror", - "uuid", -] - -[[package]] -name = "near-jsonrpc-primitives" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ada226c74f05508c516f109a97b9f23335120d0bfda208f0d187b6bbfe6eef5a" -dependencies = [ - "near-chain-configs", - "near-crypto 0.15.0", - "near-primitives 0.15.0", - "near-rpc-error-macro 0.15.0", - "serde", - "serde_json", - "thiserror", -] - -[[package]] -name = "near-primitives" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ad1a9a1640539c81f065425c31bffcfbf6b31ef1aeaade59ce905f5df6ac860" -dependencies = [ - "borsh 0.9.3", - "byteorder", - "bytesize", - "chrono", - "derive_more", - "easy-ext", - "hex 0.4.3", - "near-crypto 0.14.0", - "near-primitives-core 0.14.0", - "near-rpc-error-macro 0.14.0", - "near-vm-errors 0.14.0", - "num-rational", - "once_cell", - "primitive-types 0.10.1", - "rand 0.7.3", - "reed-solomon-erasure", - "serde", - "serde_json", - "smart-default", - "strum", - "thiserror", -] - -[[package]] -name = "near-primitives" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97670b302dce15f09bba50f24c67aa08130fd01528cc61d4415892401e88e974" -dependencies = [ - "borsh 0.9.3", - "byteorder", - "bytesize", - "cfg-if 1.0.0", - "chrono", - "derive_more", - "easy-ext", - "hex 0.4.3", - "near-crypto 0.15.0", - "near-primitives-core 0.15.0", - "near-rpc-error-macro 0.15.0", - "near-vm-errors 0.15.0", - "num-rational", - "once_cell", - "primitive-types 0.10.1", - "rand 0.7.3", - "reed-solomon-erasure", - "serde", - "serde_json", - "smart-default", - "strum", - "thiserror", -] - -[[package]] -name = "near-primitives-core" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91d508f0fc340f6461e4e256417685720d3c4c00bb5a939b105160e49137caba" -dependencies = [ - "base64 0.11.0", - "borsh 0.9.3", - "bs58", - "derive_more", - "near-account-id 0.14.0", - "num-rational", - "serde", - "sha2 0.10.7", - "strum", -] - -[[package]] -name = "near-primitives-core" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7929e19d862221949734c4a0063a8f55e7069de3a2ebc2d4f4c13497a5e953cb" -dependencies = [ - "base64 0.13.1", - "borsh 0.9.3", - "bs58", - "derive_more", - "near-account-id 0.15.0", - "num-rational", - "serde", - "serde_repr", - "sha2 0.10.7", - "strum", -] - -[[package]] -name = "near-rpc-error-core" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ee0b41c75ef859c193a8ff1dadfa0c8207bc0ac447cc22259721ad769a1408" -dependencies = [ - "quote", - "serde", - "syn 1.0.109", -] - -[[package]] -name = "near-rpc-error-core" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36addf90cc04bd547a627b3a292f59d7de4dd6fb5042115419ae901b93ce6c2d" -dependencies = [ - "quote", - "serde", - "syn 1.0.109", -] - -[[package]] -name = "near-rpc-error-macro" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e837bd4bacd807073ec5ceb85708da7f721b46a4c2a978de86027fb0034ce31" -dependencies = [ - "near-rpc-error-core 0.14.0", - "serde", - "syn 1.0.109", -] - -[[package]] -name = "near-rpc-error-macro" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b5beb352f3b91d8c491646c2fa4fdbbbf463c7b9c0226951c28f0197de44f99" -dependencies = [ - "near-rpc-error-core 0.15.0", - "serde", - "syn 1.0.109", -] - -[[package]] -name = "near-sandbox-utils" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7479b0a2c52890000d410c6e4ba4f851334280530fa7446b78bcaf4683fe69b0" -dependencies = [ - "anyhow", - "async-process", - "binary-install", - "chrono", - "fs2", - "hex 0.3.2", - "home", -] - -[[package]] -name = "near-sdk" -version = "4.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15eb3de2defe3626260cc209a6cdb985c6b27b0bd4619fad97dcfae002c3c5bd" -dependencies = [ - "base64 0.13.1", - "borsh 0.9.3", - "bs58", - "near-abi", - "near-crypto 0.14.0", - "near-primitives 0.14.0", - "near-primitives-core 0.14.0", - "near-sdk-macros", - "near-sys", - "near-vm-logic", - "once_cell", - "schemars", - "serde", - "serde_json", - "wee_alloc", -] - -[[package]] -name = "near-sdk-macros" -version = "4.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4907affc9f5ed559456509188ff0024f1f2099c0830e6bdb66eb61d5b75912c0" -dependencies = [ - "Inflector", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "near-sys" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e307313276eaeced2ca95740b5639e1f3125b7c97f0a1151809d105f1aa8c6d3" - -[[package]] -name = "near-units" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a2b77f295d398589eeee51ad0887905ef1734fb12b45cb6d77bd7e401988b9" -dependencies = [ - "near-units-core", - "near-units-macro", -] - -[[package]] -name = "near-units-core" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89aa2a7985de87a08ca35f28abd8d00f0f901e704257e6e029aadef981386bc6" -dependencies = [ - "num-format", - "regex", -] - -[[package]] -name = "near-units-macro" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ab45d066220846f9bd5c21e9ab88c47c892edd36f962ada78bf8308523171a" -dependencies = [ - "near-units-core", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "near-vm-errors" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0da466a30f0446639cbd788c30865086fac3e8dcb07a79e51d2b0775ed4261e" -dependencies = [ - "borsh 0.9.3", - "near-account-id 0.14.0", - "near-rpc-error-macro 0.14.0", - "serde", -] - -[[package]] -name = "near-vm-errors" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5591c9c8afa83a040cb5c3f29bc52b2efae2c32d4bcaee1bba723738da1a5cf6" -dependencies = [ - "borsh 0.9.3", - "near-account-id 0.15.0", - "near-rpc-error-macro 0.15.0", - "serde", - "strum", -] - -[[package]] -name = "near-vm-logic" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81b534828419bacbf1f7b11ef7b00420f248c548c485d3f0cfda8bb6931152f2" -dependencies = [ - "base64 0.13.1", - "borsh 0.9.3", - "bs58", - "byteorder", - "near-account-id 0.14.0", - "near-crypto 0.14.0", - "near-primitives 0.14.0", - "near-primitives-core 0.14.0", - "near-vm-errors 0.14.0", - "ripemd", - "serde", - "sha2 0.10.7", - "sha3", - "zeropool-bn", -] - -[[package]] -name = "num-bigint" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f6f7833f2cbf2360a6cfd58cd41a53aa7a90bd4c202f5b1c7dd2ed73c57b2c3" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-format" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3" -dependencies = [ - "arrayvec 0.7.4", - "itoa", -] - -[[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" -dependencies = [ - "autocfg", - "num-bigint", - "num-integer", - "num-traits", - "serde", -] - -[[package]] -name = "num-traits" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" -dependencies = [ - "hermit-abi 0.2.6", - "libc", -] - -[[package]] -name = "object" -version = "0.30.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03b4680b86d9cfafba8fc491dc9b6df26b68cf40e9e6cd73909194759a63c385" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" - -[[package]] -name = "opaque-debug" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" - -[[package]] -name = "openssl" -version = "0.10.55" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" -dependencies = [ - "bitflags", - "cfg-if 1.0.0", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.18", -] - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "openssl-sys" -version = "0.9.90" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "parity-scale-codec" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "373b1a4c1338d9cd3d1fa53b3a11bdab5ab6bd80a20f7f7becd76953ae2be909" -dependencies = [ - "arrayvec 0.7.4", - "bitvec 0.20.4", - "byte-slice-cast", - "impl-trait-for-tuples", - "parity-scale-codec-derive 2.3.1", - "serde", -] - -[[package]] -name = "parity-scale-codec" -version = "3.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2287753623c76f953acd29d15d8100bcab84d29db78fb6f352adb3c53e83b967" -dependencies = [ - "arrayvec 0.7.4", - "bitvec 1.0.1", - "byte-slice-cast", - "impl-trait-for-tuples", - "parity-scale-codec-derive 3.6.1", - "serde", -] - -[[package]] -name = "parity-scale-codec-derive" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1557010476e0595c9b568d16dcfb81b93cdeb157612726f5170d31aa707bed27" -dependencies = [ - "proc-macro-crate 1.3.1", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "parity-scale-codec-derive" -version = "3.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b6937b5e67bfba3351b87b040d48352a2fcb6ad72f81855412ce97b45c8f110" -dependencies = [ - "proc-macro-crate 1.3.1", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "parity-secp256k1" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fca4f82fccae37e8bbdaeb949a4a218a1bbc485d11598f193d2a908042e5fc1" -dependencies = [ - "arrayvec 0.5.2", - "cc", - "cfg-if 0.1.10", - "rand 0.7.3", -] - -[[package]] -name = "parking" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "redox_syscall 0.3.5", - "smallvec", - "windows-targets", -] - -[[package]] -name = "percent-encoding" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" - -[[package]] -name = "pin-project" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.18", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pkg-config" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" - -[[package]] -name = "polling" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" -dependencies = [ - "autocfg", - "bitflags", - "cfg-if 1.0.0", - "concurrent-queue", - "libc", - "log", - "pin-project-lite", - "windows-sys 0.48.0", -] - -[[package]] -name = "portpicker" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be97d76faf1bfab666e1375477b23fde79eccf0276e9b63b92a39d676a889ba9" -dependencies = [ - "rand 0.8.5", -] - -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "primitive-types" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05e4722c697a58a99d5d06a08c30821d7c082a4632198de1eaa5a6c22ef42373" -dependencies = [ - "fixed-hash 0.7.0", - "impl-codec 0.5.1", - "uint", -] - -[[package]] -name = "primitive-types" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f3486ccba82358b11a77516035647c34ba167dfa53312630de83b12bd4f3d66" -dependencies = [ - "fixed-hash 0.8.0", - "impl-codec 0.6.0", - "impl-rlp", - "impl-serde", - "uint", -] - -[[package]] -name = "proc-macro-crate" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" -dependencies = [ - "toml", -] - -[[package]] -name = "proc-macro-crate" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" -dependencies = [ - "once_cell", - "toml_edit", -] - -[[package]] -name = "proc-macro2" -version = "1.0.60" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dec2b086b7a862cf4de201096214fa870344cf922b2b30c167badb3af3195406" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "radium" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "643f8f41a8ebc4c5dc4515c82bb8abd397b527fc20fd681b7c011c2aee5d44fb" - -[[package]] -name = "radium" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" - -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom 0.2.10", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "redox_syscall" -version = "0.1.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" - -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags", -] - -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags", -] - -[[package]] -name = "redox_users" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d" -dependencies = [ - "getrandom 0.1.16", - "redox_syscall 0.1.57", - "rust-argon2", -] - -[[package]] -name = "redox_users" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" -dependencies = [ - "getrandom 0.2.10", - "redox_syscall 0.2.16", - "thiserror", -] - -[[package]] -name = "reed-solomon-erasure" -version = "4.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a415a013dd7c5d4221382329a5a3482566da675737494935cbbbcdec04662f9d" -dependencies = [ - "smallvec", -] - -[[package]] -name = "regex" -version = "1.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" - -[[package]] -name = "reqwest" -version = "0.11.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" -dependencies = [ - "base64 0.21.2", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "hyper", - "hyper-tls", - "ipnet", - "js-sys", - "log", - "mime", - "native-tls", - "once_cell", - "percent-encoding", - "pin-project-lite", - "serde", - "serde_json", - "serde_urlencoded", - "tokio", - "tokio-native-tls", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "winreg", -] - -[[package]] -name = "ripemd" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd124222d17ad93a644ed9d011a40f4fb64aa54275c08cc216524a9ea82fb09f" -dependencies = [ - "digest 0.10.7", -] - -[[package]] -name = "rlp" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb919243f34364b6bd2fc10ef797edbfa75f33c252e7998527479c6d6b47e1ec" -dependencies = [ - "bytes", - "rustc-hex", -] - -[[package]] -name = "rust-argon2" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb" -dependencies = [ - "base64 0.13.1", - "blake2b_simd", - "constant_time_eq", - "crossbeam-utils", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" - -[[package]] -name = "rustc-hex" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6" - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver", -] - -[[package]] -name = "rustix" -version = "0.37.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0" -dependencies = [ - "bitflags", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustversion" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" - -[[package]] -name = "ryu" -version = "1.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" - -[[package]] -name = "schannel" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" -dependencies = [ - "windows-sys 0.42.0", -] - -[[package]] -name = "schemars" -version = "0.8.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02c613288622e5f0c3fdc5dbd4db1c5fbe752746b1d1a56a0630b78fd00de44f" -dependencies = [ - "dyn-clone", - "schemars_derive", - "serde", - "serde_json", -] - -[[package]] -name = "schemars_derive" -version = "0.8.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "109da1e6b197438deb6db99952990c7f959572794b80ff93707d55a232545e7c" -dependencies = [ - "proc-macro2", - "quote", - "serde_derive_internals", - "syn 1.0.109", -] - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "secp256k1" -version = "0.24.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b1629c9c557ef9b293568b338dddfc8208c98a18c59d722a9d53f859d9c9b62" -dependencies = [ - "rand 0.8.5", - "secp256k1-sys", -] - -[[package]] -name = "secp256k1-sys" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83080e2c2fc1006e625be82e5d1eb6a43b7fd9578b617fcc55814daf286bba4b" -dependencies = [ - "cc", -] - -[[package]] -name = "security-framework" -version = "2.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" -dependencies = [ - "bitflags", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "semver" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" - -[[package]] -name = "serde" -version = "1.0.164" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.164" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.18", -] - -[[package]] -name = "serde_derive_internals" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "serde_json" -version = "1.0.97" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdf3bf93142acad5821c99197022e170842cdbc1c30482b98750c688c640842a" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_repr" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.18", -] - -[[package]] -name = "serde_urlencoded" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ - "form_urlencoded", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "sha2" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" -dependencies = [ - "block-buffer 0.9.0", - "cfg-if 1.0.0", - "cpufeatures", - "digest 0.9.0", - "opaque-debug", -] - -[[package]] -name = "sha2" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" -dependencies = [ - "cfg-if 1.0.0", - "cpufeatures", - "digest 0.10.7", -] - -[[package]] -name = "sha3" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" -dependencies = [ - "digest 0.10.7", - "keccak", -] - -[[package]] -name = "signal-hook" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9" -dependencies = [ - "libc", - "signal-hook-registry", -] - -[[package]] -name = "signal-hook-registry" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" -dependencies = [ - "libc", -] - -[[package]] -name = "signature" -version = "1.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" - -[[package]] -name = "siphasher" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" - -[[package]] -name = "slab" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" -dependencies = [ - "autocfg", -] - -[[package]] -name = "smallvec" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" - -[[package]] -name = "smart-default" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "133659a15339456eeeb07572eb02a91c91e9815e9cbc89566944d2c8d3efdbf6" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "socket2" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "strum" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" -dependencies = [ - "strum_macros", -] - -[[package]] -name = "strum_macros" -version = "0.24.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "rustversion", - "syn 1.0.109", -] - -[[package]] -name = "subtle" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "synstructure" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "unicode-xid", -] - -[[package]] -name = "tap" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" - -[[package]] -name = "tar" -version = "0.4.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6" -dependencies = [ - "filetime", - "libc", - "xattr", -] - -[[package]] -name = "tempfile" -version = "3.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" -dependencies = [ - "autocfg", - "cfg-if 1.0.0", - "fastrand", - "redox_syscall 0.3.5", - "rustix", - "windows-sys 0.48.0", -] - -[[package]] -name = "thiserror" -version = "1.0.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.18", -] - -[[package]] -name = "time" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", -] - -[[package]] -name = "tiny-keccak" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" -dependencies = [ - "crunchy", -] - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "tokio" -version = "1.28.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2" -dependencies = [ - "autocfg", - "bytes", - "libc", - "mio", - "num_cpus", - "parking_lot", - "pin-project-lite", - "signal-hook-registry", - "socket2", - "tokio-macros", - "windows-sys 0.48.0", -] - -[[package]] -name = "tokio-macros" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.18", -] - -[[package]] -name = "tokio-native-tls" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" -dependencies = [ - "native-tls", - "tokio", -] - -[[package]] -name = "tokio-retry" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f57eb36ecbe0fc510036adff84824dd3c24bb781e21bfa67b69d556aa85214f" -dependencies = [ - "pin-project", - "rand 0.8.5", - "tokio", -] - -[[package]] -name = "tokio-util" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", - "tracing", -] - -[[package]] -name = "toml" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_datetime" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f" - -[[package]] -name = "toml_edit" -version = "0.19.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2380d56e8670370eee6566b0bfd4265f65b3f432e8c6d85623f728d4fa31f739" -dependencies = [ - "indexmap", - "toml_datetime", - "winnow", -] - -[[package]] -name = "tower-service" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" - -[[package]] -name = "tracing" -version = "0.1.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" -dependencies = [ - "cfg-if 1.0.0", - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8803eee176538f94ae9a14b55b2804eb7e1441f8210b1c31290b3bccdccff73b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.18", -] - -[[package]] -name = "tracing-core" -version = "0.1.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" -dependencies = [ - "once_cell", -] - -[[package]] -name = "try-lock" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" - -[[package]] -name = "typenum" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" - -[[package]] -name = "uint" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76f64bba2c53b04fcab63c01a7d7427eadc821e3bc48c34dc9ba29c501164b52" -dependencies = [ - "byteorder", - "crunchy", - "hex 0.4.3", - "static_assertions", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" - -[[package]] -name = "unicode-ident" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" - -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-xid" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - -[[package]] -name = "url" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", - "serde", -] - -[[package]] -name = "uuid" -version = "1.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa2982af2eec27de306107c027578ff7f423d65f7250e40ce0fea8f45248b81" -dependencies = [ - "getrandom 0.2.10", -] - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "waker-fn" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" - -[[package]] -name = "want" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" -dependencies = [ - "try-lock", -] - -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" -dependencies = [ - "cfg-if 1.0.0", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 2.0.18", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" -dependencies = [ - "cfg-if 1.0.0", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.18", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" - -[[package]] -name = "web-sys" -version = "0.3.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "wee_alloc" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb3b5a6b2bb17cb6ad44a2e68a43e8d2722c997da10e928665c72ec6c0a0b8e" -dependencies = [ - "cfg-if 0.1.10", - "libc", - "memory_units", - "winapi", -] - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-targets" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" -dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" - -[[package]] -name = "winnow" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca0ace3845f0d96209f0375e6d367e3eb87eb65d27d445bdc9f1843a26f39448" -dependencies = [ - "memchr", -] - -[[package]] -name = "winreg" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" -dependencies = [ - "winapi", -] - -[[package]] -name = "workspaces" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73b13d249618f197811e3673decc81459730cf5cc09ee7246dc4bede1e9333bc" -dependencies = [ - "async-process", - "async-trait", - "base64 0.13.1", - "borsh 0.9.3", - "bs58", - "chrono", - "dirs 3.0.2", - "hex 0.4.3", - "libc", - "near-account-id 0.15.0", - "near-crypto 0.15.0", - "near-jsonrpc-client", - "near-jsonrpc-primitives", - "near-primitives 0.15.0", - "near-sandbox-utils", - "portpicker", - "rand 0.8.5", - "reqwest", - "serde", - "serde_json", - "thiserror", - "tokio", - "tokio-retry", - "tracing", - "url", -] - -[[package]] -name = "wyz" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" - -[[package]] -name = "wyz" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" -dependencies = [ - "tap", -] - -[[package]] -name = "xattr" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" -dependencies = [ - "libc", -] - -[[package]] -name = "zeroize" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4756f7db3f7b5574938c3eb1c117038b8e07f95ee6718c0efad4ac21508f1efd" -dependencies = [ - "zeroize_derive", -] - -[[package]] -name = "zeroize_derive" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.18", -] - -[[package]] -name = "zeropool-bn" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71e61de68ede9ffdd69c01664f65a178c5188b73f78faa21f0936016a888ff7c" -dependencies = [ - "borsh 0.9.3", - "byteorder", - "crunchy", - "lazy_static", - "rand 0.8.5", - "rustc-hex", -] - -[[package]] -name = "zip" -version = "0.5.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ab48844d61251bb3835145c521d88aa4031d7139e8485990f60ca911fa0815" -dependencies = [ - "byteorder", - "bzip2", - "crc32fast", - "flate2", - "thiserror", - "time", -] diff --git a/Cargo.toml b/Cargo.toml index a4621b6..d781882 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,3 +8,4 @@ exclude = [ "res/mock_engine", "res/mock_eth_connector" ] +resolver = "2" diff --git a/res/mock_engine/rust-toolchain.toml b/res/mock_engine/rust-toolchain.toml index 102f549..990104f 100644 --- a/res/mock_engine/rust-toolchain.toml +++ b/res/mock_engine/rust-toolchain.toml @@ -1,4 +1,2 @@ [toolchain] -channel = "nightly-2023-03-15" -components = [] targets = ["wasm32-unknown-unknown"] diff --git a/res/mock_eth_connector/rust-toolchain.toml b/res/mock_eth_connector/rust-toolchain.toml index 102f549..990104f 100644 --- a/res/mock_eth_connector/rust-toolchain.toml +++ b/res/mock_eth_connector/rust-toolchain.toml @@ -1,4 +1,2 @@ [toolchain] -channel = "nightly-2023-03-15" -components = [] targets = ["wasm32-unknown-unknown"] diff --git a/rust-toolchain b/rust-toolchain deleted file mode 100644 index 102f549..0000000 --- a/rust-toolchain +++ /dev/null @@ -1,4 +0,0 @@ -[toolchain] -channel = "nightly-2023-03-15" -components = [] -targets = ["wasm32-unknown-unknown"] From a6838b11c1ef726938b570f8bcad16c9070887a9 Mon Sep 17 00:00:00 2001 From: Evgeny Ukhanov Date: Wed, 20 Sep 2023 21:47:55 +0200 Subject: [PATCH 2/7] CI - set env variable --- .github/workflows/rust.yaml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/rust.yaml b/.github/workflows/rust.yaml index 30ae33e..444c83d 100644 --- a/.github/workflows/rust.yaml +++ b/.github/workflows/rust.yaml @@ -22,7 +22,7 @@ jobs: steps: - name: Checkout sources uses: actions/checkout@v2 - - name: Add toolchain + - name: Add toolchain target run: rustup target add wasm32-unknown-unknown - name: Restore cache run: | @@ -30,7 +30,6 @@ jobs: - name: Install sandbox run: | if [[ ! -f ${{ env.NEAR_SANDBOX_BIN_PATH }} ]]; then - mkdir -p $HOME/bin rm -rf nearcore git clone --depth 1 --branch 1.35.0 https://github.com/near/nearcore cd nearcore @@ -41,10 +40,10 @@ jobs: rm -rf nearcore fi - name: Run tests - run: NEAR_SANDBOX_BIN_PATH=${{ env.NEAR_SANDBOX_BIN_PATH }} make test + run: make test - name: Save cache run: | cache-util save cargo_git cargo_registry env: - NEAR_SANDBOX_BIN_PATH: $HOME/bin/near-sandbox + NEAR_SANDBOX_BIN_PATH: /usr/local/bin/near-sandbox From 6fa44af5c9da1d4b279659594611e522cae11f73 Mon Sep 17 00:00:00 2001 From: Evgeny Ukhanov Date: Mon, 6 Nov 2023 18:27:50 +0100 Subject: [PATCH 3/7] Update cargo workspace --- Cargo.toml | 19 +++++++++++++++++++ engine/Cargo.toml | 20 ++++++++++---------- engine/src/lib.rs | 4 +--- eth-connector/Cargo.toml | 22 +++++++++++----------- 4 files changed, 41 insertions(+), 24 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index d781882..646413e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,3 +9,22 @@ exclude = [ "res/mock_eth_connector" ] resolver = "2" + +[workspace.package] +authors = ["Aurora Labs "] +edition = "2021" +homepage = "https://github.com/aurora-is-near/aurora-engine" +repository = "https://github.com/aurora-is-near/aurora-engine" +license = "CC0-1.0" +readme = "README.md" +version = "0.3.2" + +[workspace.dependencies] +anyhow = "1" +aurora-engine-types = { git = "https://github.com/aurora-is-near/aurora-engine.git", branch = "develop", default-features = false, features = ["impl-serde", "borsh-compat"] } +near-contract-standards = "4.1" +near-sdk = "4.1" +near-units = "0.2" +serde = { version = "1", features = ["derive"] } +serde_json = "1" +workspaces = "0.7.0" diff --git a/engine/Cargo.toml b/engine/Cargo.toml index 596c2ca..0c4826a 100644 --- a/engine/Cargo.toml +++ b/engine/Cargo.toml @@ -1,20 +1,20 @@ [package] name = "aurora-workspace-engine" -version = "0.3.0" -authors = [ "Aurora " ] -edition = "2021" -readme = "README.md" +version.workspace = true +authors.workspace = true +edition.workspace = true +readme.workspace = true description = "Aurora EVM contract for the Near workspaces library" [dependencies] aurora-workspace-utils = { path = "../utils" } -aurora-engine-types = { git = "https://github.com/aurora-is-near/aurora-engine.git", branch = "develop", default-features = false, features = ["std", "impl-serde", "borsh-compat"] } -anyhow = "1" -near-sdk = "4.1" -serde = { version = "1", features = ["derive"] } -serde_json = "1" -workspaces = "0.7.0" +anyhow.workspace = true +aurora-engine-types.workspace = true +near-sdk.workspace = true +serde.workspace = true +serde_json.workspace = true +workspaces.workspace = true [dev-dependencies] hex = "0.4.3" diff --git a/engine/src/lib.rs b/engine/src/lib.rs index bcf2b35..ba8a5ef 100644 --- a/engine/src/lib.rs +++ b/engine/src/lib.rs @@ -136,9 +136,7 @@ impl EngineContractBuilder { async fn create_accounts(&self, account_id: &AccountId) -> anyhow::Result<(Account, Account)> { let account_id_str = account_id.as_str(); let (sub, root) = match account_id_str.rsplit_once('.') { - Some((sub, root)) if root == "near" => { - (Some(sub), Contract::find_root_account().await?) - } + Some((sub, "near")) => (Some(sub), Contract::find_root_account().await?), Some((sub, root)) => ( Some(sub), Contract::create_root_account(root, self.root_balance).await?, diff --git a/eth-connector/Cargo.toml b/eth-connector/Cargo.toml index 818aa8c..646548f 100644 --- a/eth-connector/Cargo.toml +++ b/eth-connector/Cargo.toml @@ -1,21 +1,21 @@ [package] name = "aurora-workspace-eth-connector" -version = "0.3.0" -authors = [ "Aurora " ] -edition = "2021" +version.workspace = true +authors.workspace = true +edition.workspace = true description = "Aurora Workspace Eth Connector is a library for the Aurora Eth Connector based on NEAR Protocol." [dependencies] aurora-workspace-utils = { path = "../utils" } -anyhow = "1" -aurora-engine-types = { git = "https://github.com/aurora-is-near/aurora-engine.git", branch = "develop", default-features = false, features = ["impl-serde", "borsh-compat"] } -near-contract-standards = "4.1" -near-sdk = "4.1" -near-units = "0.2" -serde = { version = "1", features = ["derive"] } -serde_json = "1" -workspaces = "0.7.0" +anyhow.workspace = true +aurora-engine-types.workspace = true +near-contract-standards.workspace = true +near-sdk.workspace = true +near-units.workspace = true +serde.workspace = true +serde_json.workspace = true +workspaces.workspace = true [dev-dependencies] hex = "0.4.3" From 8b9ff15f3d8257c64981763658ed8d6155b17a15 Mon Sep 17 00:00:00 2001 From: Evgeny Ukhanov Date: Mon, 6 Nov 2023 22:52:53 +0100 Subject: [PATCH 4/7] Moved to near-workspace --- Cargo.toml | 3 ++- engine/Cargo.toml | 2 +- engine/src/contract.rs | 2 +- engine/src/lib.rs | 12 ++++++------ engine/tests/utils.rs | 4 ++-- eth-connector/Cargo.toml | 2 +- eth-connector/src/contract.rs | 2 +- eth-connector/src/lib.rs | 10 +++++----- utils/Cargo.toml | 22 ++++++++++++---------- utils/src/lib.rs | 22 +++++++++++----------- utils/src/macros.rs | 14 +++++++------- utils/src/results.rs | 20 ++++++++++---------- utils/src/transactions.rs | 23 ++++++++++++----------- 13 files changed, 71 insertions(+), 67 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 646413e..f5254f6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,7 +24,8 @@ anyhow = "1" aurora-engine-types = { git = "https://github.com/aurora-is-near/aurora-engine.git", branch = "develop", default-features = false, features = ["impl-serde", "borsh-compat"] } near-contract-standards = "4.1" near-sdk = "4.1" +near-gas = "0.2" near-units = "0.2" serde = { version = "1", features = ["derive"] } serde_json = "1" -workspaces = "0.7.0" +near-workspaces = "0.9" diff --git a/engine/Cargo.toml b/engine/Cargo.toml index 0c4826a..a7f4ae6 100644 --- a/engine/Cargo.toml +++ b/engine/Cargo.toml @@ -14,7 +14,7 @@ aurora-engine-types.workspace = true near-sdk.workspace = true serde.workspace = true serde_json.workspace = true -workspaces.workspace = true +near-workspaces.workspace = true [dev-dependencies] hex = "0.4.3" diff --git a/engine/src/contract.rs b/engine/src/contract.rs index 86cbbc5..79a724e 100644 --- a/engine/src/contract.rs +++ b/engine/src/contract.rs @@ -54,7 +54,7 @@ impl ContractId for EngineContract { &self.contract } - fn id(&self) -> &workspaces::AccountId { + fn id(&self) -> &near_workspaces::AccountId { self.contract.id() } } diff --git a/engine/src/lib.rs b/engine/src/lib.rs index ba8a5ef..301136f 100644 --- a/engine/src/lib.rs +++ b/engine/src/lib.rs @@ -2,7 +2,7 @@ use aurora_engine_types::parameters::connector::FungibleTokenMetadata; use aurora_engine_types::types::address::Address; use aurora_engine_types::U256; use aurora_workspace_utils::Contract; -use workspaces::{Account, AccountId}; +use near_workspaces::{Account, AccountId}; pub use aurora_workspace_utils::{parse_near, ContractId}; pub use contract::EngineContract; @@ -16,13 +16,13 @@ pub mod types { pub use aurora_engine_types::parameters::engine::{SubmitResult, TransactionStatus}; pub use aurora_engine_types::types::Address; pub use aurora_workspace_utils::Contract; - pub use workspaces::result::ExecutionOutcome; - pub use workspaces::types::KeyType; - pub use workspaces::types::SecretKey; - pub use workspaces::{Account, Worker}; + pub use near_workspaces::result::ExecutionOutcome; + pub use near_workspaces::types::KeyType; + pub use near_workspaces::types::SecretKey; + pub use near_workspaces::{Account, Worker}; pub mod network { - pub use workspaces::network::Sandbox; + pub use near_workspaces::network::Sandbox; } } diff --git a/engine/tests/utils.rs b/engine/tests/utils.rs index 6e3dac5..dea4af4 100644 --- a/engine/tests/utils.rs +++ b/engine/tests/utils.rs @@ -1,7 +1,7 @@ use aurora_workspace_engine::EngineContract; use aurora_workspace_utils::Contract; use ethereum_types::U256; -use workspaces::types::{KeyType, SecretKey}; +use near_workspaces::types::{KeyType, SecretKey}; const AURORA_LOCAL_CHAIN_ID: u64 = 1313161556; const AURORA_ACCOUNT_ID: &str = "aurora.test.near"; @@ -9,7 +9,7 @@ const OWNER_ACCOUNT_ID: &str = "owner.test.near"; const WASM_BIN_FILE_PATH: &str = "../bin/mock_engine.wasm"; pub async fn deploy_and_init_contract() -> anyhow::Result { - let worker = workspaces::sandbox() + let worker = near_workspaces::sandbox() .await .map_err(|err| anyhow::anyhow!("Failed init sandbox: {:?}", err))?; let sk = SecretKey::from_random(KeyType::ED25519); diff --git a/eth-connector/Cargo.toml b/eth-connector/Cargo.toml index 646548f..ed0a224 100644 --- a/eth-connector/Cargo.toml +++ b/eth-connector/Cargo.toml @@ -15,7 +15,7 @@ near-sdk.workspace = true near-units.workspace = true serde.workspace = true serde_json.workspace = true -workspaces.workspace = true +near-workspaces.workspace = true [dev-dependencies] hex = "0.4.3" diff --git a/eth-connector/src/contract.rs b/eth-connector/src/contract.rs index 16d93a1..b253778 100644 --- a/eth-connector/src/contract.rs +++ b/eth-connector/src/contract.rs @@ -33,7 +33,7 @@ impl ContractId for EthConnectorContract { &self.contract } - fn id(&self) -> &workspaces::AccountId { + fn id(&self) -> &near_workspaces::AccountId { self.contract.id() } } diff --git a/eth-connector/src/lib.rs b/eth-connector/src/lib.rs index b51d06b..012c7e3 100644 --- a/eth-connector/src/lib.rs +++ b/eth-connector/src/lib.rs @@ -1,8 +1,8 @@ use crate::contract::EthConnectorContract; use aurora_workspace_utils::Contract; +use near_workspaces::types::NearToken; +use near_workspaces::Account; use std::path::Path; -use workspaces::types::Balance; -use workspaces::Account; pub mod contract; pub mod operation; @@ -10,8 +10,8 @@ pub mod types; const ROOT_ACCOUNT: &str = "root"; const ETH_CONNECTOR_ACCOUNT: &str = "eth_connector"; -const ROOT_BALANCE: Balance = near_units::parse_near!("200 N"); -const CONTRACT_BALANCE: Balance = near_units::parse_near!("85 N"); +const ROOT_BALANCE: u128 = near_units::parse_near!("200 N"); +const CONTRACT_BALANCE: u128 = near_units::parse_near!("85 N"); /// Deploy eth-connector contract using provided WASM file. pub async fn deploy + Copy>( @@ -20,7 +20,7 @@ pub async fn deploy + Copy>( let root_account = Contract::create_root_account(ROOT_ACCOUNT, ROOT_BALANCE).await?; let eth_connector = root_account .create_subaccount(ETH_CONNECTOR_ACCOUNT) - .initial_balance(CONTRACT_BALANCE) + .initial_balance(NearToken::from_yoctonear(CONTRACT_BALANCE)) .transact() .await? .into_result()?; diff --git a/utils/Cargo.toml b/utils/Cargo.toml index bde016a..fb4f85f 100644 --- a/utils/Cargo.toml +++ b/utils/Cargo.toml @@ -1,15 +1,17 @@ [package] name = "aurora-workspace-utils" -version = "0.3.0" -authors = [ "Aurora " ] -edition = "2021" -readme = "README.md" +version.workspace = true +authors.workspace = true +edition.workspace = true +readme.workspace = true [dependencies] -anyhow = "1" -aurora-engine-types = { git = "https://github.com/aurora-is-near/aurora-engine.git", branch = "develop", default-features = false, features = ["std", "impl-serde", "borsh-compat"] } -near-sdk = "4.1" -near-units = "0.2" -serde = { version = "1", features = ["derive"] } +anyhow.workspace = true +aurora-engine-types.workspace = true +near-sdk.workspace = true +near-gas.workspace = true +near-units.workspace = true +serde.workspace = true tokio = "1" -workspaces = "0.7" +near-workspaces.workspace = true +borsh = "0.10.3" diff --git a/utils/src/lib.rs b/utils/src/lib.rs index d488d14..0460b5d 100644 --- a/utils/src/lib.rs +++ b/utils/src/lib.rs @@ -1,7 +1,7 @@ use crate::transactions::{CallTransaction, ViewTransaction}; -use workspaces::network::NetworkClient; -use workspaces::types::{KeyType, SecretKey}; -use workspaces::{Account, AccountId, Worker}; +use near_workspaces::network::NetworkClient; +use near_workspaces::types::{KeyType, NearToken, SecretKey}; +use near_workspaces::{Account, AccountId, Worker}; pub use near_units::parse_near; @@ -20,7 +20,7 @@ pub enum AccountKind { contract_id: AccountId, inner: Account, }, - Contract(workspaces::Contract), + Contract(near_workspaces::Contract), } impl AccountKind { @@ -91,7 +91,7 @@ impl Contract { } pub async fn create_account_from_random_seed(account_id: AccountId) -> anyhow::Result { - let worker = workspaces::sandbox() + let worker = near_workspaces::sandbox() .await .map_err(|err| anyhow::anyhow!("Failed init sandbox: {:?}", err))?; let sk = SecretKey::from_random(KeyType::ED25519); @@ -100,7 +100,7 @@ impl Contract { } pub async fn find_root_account() -> anyhow::Result { - let worker = workspaces::sandbox() + let worker = near_workspaces::sandbox() .await .map_err(|err| anyhow::anyhow!("Failed init sandbox: {:?}", err))?; Ok(worker.root_account()?) @@ -110,12 +110,12 @@ impl Contract { root_acc_name: &str, balance: u128, ) -> anyhow::Result { - use workspaces::AccessKey; + use near_workspaces::AccessKey; - let worker = workspaces::sandbox() + let worker = near_workspaces::sandbox() .await .map_err(|err| anyhow::anyhow!("Failed init sandbox: {:?}", err))?; - let testnet = workspaces::testnet() + let testnet = near_workspaces::testnet() .await .map_err(|err| anyhow::anyhow!("Failed init testnet: {:?}", err))?; let registrar: AccountId = "registrar".parse()?; @@ -131,7 +131,7 @@ impl Contract { .batch(&root) .create_account() .add_key(sk.public_key(), AccessKey::full_access()) - .transfer(balance) + .transfer(NearToken::from_yoctonear(balance)) .transact() .await? .into_result()?; @@ -146,7 +146,7 @@ impl Contract { ) -> anyhow::Result { Ok(root_account .create_subaccount(name) - .initial_balance(balance) + .initial_balance(NearToken::from_yoctonear(balance)) .transact() .await? .into_result()?) diff --git a/utils/src/macros.rs b/utils/src/macros.rs index 5a2d7b0..536eb8a 100644 --- a/utils/src/macros.rs +++ b/utils/src/macros.rs @@ -23,7 +23,7 @@ macro_rules! impl_view_return { impl<'a> std::future::IntoFuture for $name<'a> { type Output = anyhow::Result>; - type IntoFuture = workspaces::rpc::BoxFuture<'a, Self::Output>; + type IntoFuture = near_workspaces::rpc::BoxFuture<'a, Self::Output>; fn into_future(self) -> Self::IntoFuture { Box::pin(async { ViewResult::$deser_fn(self.0.await?) }.into_future()) @@ -35,9 +35,9 @@ macro_rules! impl_view_return { #[macro_export] macro_rules! impl_call_return { ($(($name:ident => $return:ty, $fn_name:expr, $deser_fn:ident)),* $(,)?) => { - $(pub struct $name<'a>(CallTransaction<'a>); - impl<'a> $name<'a> { - pub(crate) fn call(contract: &'a Contract) -> Self { + $(pub struct $name(CallTransaction); + impl $name { + pub(crate) fn call(contract: &Contract) -> Self { Self(contract.near_call(&$fn_name)) } pub fn gas(mut self, gas: u64) -> Self { @@ -70,9 +70,9 @@ macro_rules! impl_call_return { })* }; ($(($name:ident, $fn_name:expr)),* $(,)?) => { - $(pub struct $name<'a>(CallTransaction<'a>); - impl<'a> $name<'a> { - pub(crate) fn call(contract: &'a Contract) -> Self { + $(pub struct $name(CallTransaction); + impl $name { + pub(crate) fn call(contract: &Contract) -> Self { Self(contract.near_call(&$fn_name)) } pub fn gas(mut self, gas: u64) -> Self { diff --git a/utils/src/results.rs b/utils/src/results.rs index 04994c4..0713891 100644 --- a/utils/src/results.rs +++ b/utils/src/results.rs @@ -1,11 +1,11 @@ -use aurora_engine_types::borsh::BorshDeserialize; use aurora_engine_types::types::Address; use aurora_engine_types::{H256, U256}; +use borsh::BorshDeserialize; use near_sdk::{json_types::U128, PromiseOrValue}; +use near_workspaces::result::{ExecutionFinalResult, ExecutionOutcome}; +use near_workspaces::types::Gas; use serde::de::DeserializeOwned; use std::borrow::Borrow; -use workspaces::result::{ExecutionFinalResult, ExecutionOutcome}; -use workspaces::types::Gas; #[derive(Debug, Eq, PartialOrd, PartialEq)] pub struct ViewResult { @@ -14,7 +14,7 @@ pub struct ViewResult { } impl ViewResult { - pub fn json(view: workspaces::result::ViewResultDetails) -> anyhow::Result { + pub fn json(view: near_workspaces::result::ViewResultDetails) -> anyhow::Result { Ok(Self { result: view.json()?, logs: view.logs, @@ -23,7 +23,7 @@ impl ViewResult { } impl ViewResult { - pub fn borsh(view: workspaces::result::ViewResultDetails) -> anyhow::Result { + pub fn borsh(view: near_workspaces::result::ViewResultDetails) -> anyhow::Result { Ok(Self { result: view.borsh()?, logs: view.logs, @@ -32,7 +32,7 @@ impl ViewResult { } impl ViewResult> { - pub fn vec(view: workspaces::result::ViewResultDetails) -> anyhow::Result { + pub fn vec(view: near_workspaces::result::ViewResultDetails) -> anyhow::Result { Ok(Self { result: view.result, logs: view.logs, @@ -42,7 +42,7 @@ impl ViewResult> { impl ViewResult { #[allow(non_snake_case)] - pub fn borsh_U256(view: workspaces::result::ViewResultDetails) -> anyhow::Result { + pub fn borsh_U256(view: near_workspaces::result::ViewResultDetails) -> anyhow::Result { let mut buf = [0u8; 32]; buf.copy_from_slice(view.result.as_slice()); Ok(Self { @@ -54,7 +54,7 @@ impl ViewResult { impl ViewResult { #[allow(non_snake_case)] - pub fn borsh_H256(view: workspaces::result::ViewResultDetails) -> anyhow::Result { + pub fn borsh_H256(view: near_workspaces::result::ViewResultDetails) -> anyhow::Result { let mut buf = [0u8; 32]; buf.copy_from_slice(view.result.as_slice()); Ok(Self { @@ -66,7 +66,7 @@ impl ViewResult { #[derive(Debug)] pub struct ExecutionResult { - inner: workspaces::result::ExecutionSuccess, + inner: near_workspaces::result::ExecutionSuccess, value: T, success: bool, } @@ -113,7 +113,7 @@ impl ExecutionResult
{ } impl ExecutionResult { - pub fn new(inner: workspaces::result::ExecutionSuccess, value: T, success: bool) -> Self { + pub fn new(inner: near_workspaces::result::ExecutionSuccess, value: T, success: bool) -> Self { Self { inner, value, diff --git a/utils/src/transactions.rs b/utils/src/transactions.rs index 9aed863..c19f995 100644 --- a/utils/src/transactions.rs +++ b/utils/src/transactions.rs @@ -1,8 +1,9 @@ -use aurora_engine_types::borsh::BorshSerialize; +use borsh::BorshSerialize; +use near_workspaces::result::ExecutionFinalResult; +use near_workspaces::rpc::query::{Query, ViewFunction}; +use near_workspaces::rpc::BoxFuture; +use near_workspaces::types::NearToken; use std::future::IntoFuture; -use workspaces::result::ExecutionFinalResult; -use workspaces::rpc::query::{Query, ViewFunction}; -use workspaces::rpc::BoxFuture; pub struct ViewTransaction<'a> { inner: Query<'a, ViewFunction>, @@ -30,7 +31,7 @@ impl<'a> ViewTransaction<'a> { } impl<'a> IntoFuture for ViewTransaction<'a> { - type Output = anyhow::Result; + type Output = anyhow::Result; type IntoFuture = BoxFuture<'a, Self::Output>; fn into_future(self) -> Self::IntoFuture { @@ -38,12 +39,12 @@ impl<'a> IntoFuture for ViewTransaction<'a> { } } -pub struct CallTransaction<'a> { - inner: workspaces::operations::CallTransaction<'a>, +pub struct CallTransaction { + inner: near_workspaces::operations::CallTransaction, } -impl<'a> CallTransaction<'a> { - pub(crate) fn new(call_tx: workspaces::operations::CallTransaction<'a>) -> Self { +impl CallTransaction { + pub(crate) fn new(call_tx: near_workspaces::operations::CallTransaction) -> Self { Self { inner: call_tx } } @@ -62,7 +63,7 @@ impl<'a> CallTransaction<'a> { self } - pub fn gas(mut self, gas: u64) -> Self { + pub fn gas(mut self, gas: near_gas::NearGas) -> Self { self.inner = self.inner.gas(gas); self } @@ -72,7 +73,7 @@ impl<'a> CallTransaction<'a> { self } - pub fn deposit(mut self, deposit: u128) -> Self { + pub fn deposit(mut self, deposit: NearToken) -> Self { self.inner = self.inner.deposit(deposit); self } From c8b21d176f0b82ff63b56fc8c26b6a63f728bd5c Mon Sep 17 00:00:00 2001 From: Evgeny Ukhanov Date: Tue, 7 Nov 2023 08:37:43 +0100 Subject: [PATCH 5/7] Update dependencies and fix CI --- .github/workflows/rust.yaml | 17 +---------------- Cargo.toml | 5 ++--- engine/src/operation.rs | 1 + engine/tests/fungible_token_tests.rs | 4 ++-- eth-connector/src/lib.rs | 2 +- eth-connector/src/operation.rs | 1 + eth-connector/src/types.rs | 3 ++- eth-connector/tests/fungible_token_tests.rs | 5 +++-- utils/Cargo.toml | 2 -- utils/src/macros.rs | 8 ++++---- utils/src/results.rs | 2 +- utils/src/transactions.rs | 6 +++--- 12 files changed, 21 insertions(+), 35 deletions(-) diff --git a/.github/workflows/rust.yaml b/.github/workflows/rust.yaml index 444c83d..0cabe36 100644 --- a/.github/workflows/rust.yaml +++ b/.github/workflows/rust.yaml @@ -26,24 +26,9 @@ jobs: run: rustup target add wasm32-unknown-unknown - name: Restore cache run: | - cache-util restore cargo_git cargo_registry sandbox:${{ env.NEAR_SANDBOX_BIN_PATH }} - - name: Install sandbox - run: | - if [[ ! -f ${{ env.NEAR_SANDBOX_BIN_PATH }} ]]; then - rm -rf nearcore - git clone --depth 1 --branch 1.35.0 https://github.com/near/nearcore - cd nearcore - make sandbox-release - cp target/release/near-sandbox $HOME/bin/ - cache-util save sandbox:${{ env.NEAR_SANDBOX_BIN_PATH }} - cd ../ - rm -rf nearcore - fi + cache-util restore cargo_git cargo_registry - name: Run tests run: make test - name: Save cache run: | cache-util save cargo_git cargo_registry - -env: - NEAR_SANDBOX_BIN_PATH: /usr/local/bin/near-sandbox diff --git a/Cargo.toml b/Cargo.toml index f5254f6..4b0664e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,14 +17,13 @@ homepage = "https://github.com/aurora-is-near/aurora-engine" repository = "https://github.com/aurora-is-near/aurora-engine" license = "CC0-1.0" readme = "README.md" -version = "0.3.2" +version = "0.4.0" [workspace.dependencies] anyhow = "1" -aurora-engine-types = { git = "https://github.com/aurora-is-near/aurora-engine.git", branch = "develop", default-features = false, features = ["impl-serde", "borsh-compat"] } +aurora-engine-types = { git = "https://github.com/aurora-is-near/aurora-engine.git", branch = "develop", default-features = false, features = ["impl-serde"] } near-contract-standards = "4.1" near-sdk = "4.1" -near-gas = "0.2" near-units = "0.2" serde = { version = "1", features = ["derive"] } serde_json = "1" diff --git a/engine/src/operation.rs b/engine/src/operation.rs index 043d6cc..fbdbdd4 100644 --- a/engine/src/operation.rs +++ b/engine/src/operation.rs @@ -8,6 +8,7 @@ use aurora_workspace_utils::transactions::{CallTransaction, ViewTransaction}; use aurora_workspace_utils::{impl_call_return, impl_view_return, Contract}; use near_sdk::json_types::U128; use near_sdk::PromiseOrValue; +use near_workspaces::types::{Gas, NearToken}; impl_call_return![ (CallNew, Call::New), diff --git a/engine/tests/fungible_token_tests.rs b/engine/tests/fungible_token_tests.rs index be4cb8d..e89cdb2 100644 --- a/engine/tests/fungible_token_tests.rs +++ b/engine/tests/fungible_token_tests.rs @@ -13,7 +13,7 @@ // .as_account() // .ft_transfer("some_account.test", 10, Some("some message".to_string())) // .max_gas() -// .deposit(1) +// .deposit(NearToken::from_yocto(1)) // .transact() // .await // .unwrap(); @@ -51,7 +51,7 @@ // "some message".to_string(), // ) // .max_gas() -// .deposit(1) +// .deposit(NearToken::from_yocto(1)) // .transact() // .await // .unwrap() diff --git a/eth-connector/src/lib.rs b/eth-connector/src/lib.rs index 012c7e3..97b8861 100644 --- a/eth-connector/src/lib.rs +++ b/eth-connector/src/lib.rs @@ -33,7 +33,7 @@ pub async fn deploy + Copy>( })?; assert_eq!( eth_connector.view_account().await?.balance, - CONTRACT_BALANCE + NearToken::from_yoctonear(CONTRACT_BALANCE) ); let contract = Contract::deploy(ð_connector, contract_data).await?; diff --git a/eth-connector/src/operation.rs b/eth-connector/src/operation.rs index a49c74e..c47ba63 100644 --- a/eth-connector/src/operation.rs +++ b/eth-connector/src/operation.rs @@ -8,6 +8,7 @@ use near_contract_standards::{ fungible_token::metadata::FungibleTokenMetadata, storage_management::StorageBalance, }; use near_sdk::{json_types::U128, PromiseOrValue}; +use near_workspaces::types::{Gas, NearToken}; impl_call_return![ (CallNew, Call::New), diff --git a/eth-connector/src/types.rs b/eth-connector/src/types.rs index 8c168b0..ecb385e 100644 --- a/eth-connector/src/types.rs +++ b/eth-connector/src/types.rs @@ -1,6 +1,7 @@ use aurora_engine_types::borsh::{self, BorshDeserialize, BorshSerialize}; use aurora_engine_types::types::Address; -use near_sdk::{AccountId, Balance, StorageUsage}; +use near_sdk::{Balance, StorageUsage}; +use near_workspaces::AccountId; use serde::{Deserialize, Serialize}; use std::collections::HashMap; diff --git a/eth-connector/tests/fungible_token_tests.rs b/eth-connector/tests/fungible_token_tests.rs index 652e87d..a654787 100644 --- a/eth-connector/tests/fungible_token_tests.rs +++ b/eth-connector/tests/fungible_token_tests.rs @@ -9,6 +9,7 @@ use aurora_workspace_utils::ContractId; use near_contract_standards::fungible_token::metadata::{FungibleTokenMetadata, FT_METADATA_SPEC}; use near_sdk::json_types::U128; use near_sdk::PromiseOrValue; +use near_workspaces::types::NearToken; use std::str::FromStr; pub const CUSTODIAN_ADDRESS: &str = "096DE9C2B8A5B8c22cEe3289B101f6960d68E51E"; @@ -56,7 +57,7 @@ async fn test_ft_transfer() { contract .ft_transfer(some_acc, amount, memo) .max_gas() - .deposit(1) + .deposit(NearToken::from_yoctonear(1)) .transact() .await .unwrap(); @@ -73,7 +74,7 @@ async fn test_ft_transfer_call() { let res: PromiseOrValue = contract .ft_transfer_call(some_acc, amount, memo, msg) .max_gas() - .deposit(1) + .deposit(NearToken::from_yoctonear(1)) .transact() .await .unwrap() diff --git a/utils/Cargo.toml b/utils/Cargo.toml index fb4f85f..1ab6241 100644 --- a/utils/Cargo.toml +++ b/utils/Cargo.toml @@ -9,9 +9,7 @@ readme.workspace = true anyhow.workspace = true aurora-engine-types.workspace = true near-sdk.workspace = true -near-gas.workspace = true near-units.workspace = true serde.workspace = true tokio = "1" near-workspaces.workspace = true -borsh = "0.10.3" diff --git a/utils/src/macros.rs b/utils/src/macros.rs index 536eb8a..51c02b4 100644 --- a/utils/src/macros.rs +++ b/utils/src/macros.rs @@ -40,7 +40,7 @@ macro_rules! impl_call_return { pub(crate) fn call(contract: &Contract) -> Self { Self(contract.near_call(&$fn_name)) } - pub fn gas(mut self, gas: u64) -> Self { + pub fn gas(mut self, gas: Gas) -> Self { self.0 = self.0.gas(gas); self } @@ -48,7 +48,7 @@ macro_rules! impl_call_return { self.0 = self.0.max_gas(); self } - pub fn deposit(mut self, deposit: u128) -> Self { + pub fn deposit(mut self, deposit: NearToken) -> Self { self.0 = self.0.deposit(deposit); self } @@ -75,7 +75,7 @@ macro_rules! impl_call_return { pub(crate) fn call(contract: &Contract) -> Self { Self(contract.near_call(&$fn_name)) } - pub fn gas(mut self, gas: u64) -> Self { + pub fn gas(mut self, gas: Gas) -> Self { self.0 = self.0.gas(gas); self } @@ -83,7 +83,7 @@ macro_rules! impl_call_return { self.0 = self.0.max_gas(); self } - pub fn deposit(mut self, deposit: u128) -> Self { + pub fn deposit(mut self, deposit: NearToken) -> Self { self.0 = self.0.deposit(deposit); self } diff --git a/utils/src/results.rs b/utils/src/results.rs index 0713891..4528db6 100644 --- a/utils/src/results.rs +++ b/utils/src/results.rs @@ -1,6 +1,6 @@ +use aurora_engine_types::borsh::BorshDeserialize; use aurora_engine_types::types::Address; use aurora_engine_types::{H256, U256}; -use borsh::BorshDeserialize; use near_sdk::{json_types::U128, PromiseOrValue}; use near_workspaces::result::{ExecutionFinalResult, ExecutionOutcome}; use near_workspaces::types::Gas; diff --git a/utils/src/transactions.rs b/utils/src/transactions.rs index c19f995..53f9db8 100644 --- a/utils/src/transactions.rs +++ b/utils/src/transactions.rs @@ -1,8 +1,8 @@ -use borsh::BorshSerialize; +use aurora_engine_types::borsh::BorshSerialize; use near_workspaces::result::ExecutionFinalResult; use near_workspaces::rpc::query::{Query, ViewFunction}; use near_workspaces::rpc::BoxFuture; -use near_workspaces::types::NearToken; +use near_workspaces::types::{Gas, NearToken}; use std::future::IntoFuture; pub struct ViewTransaction<'a> { @@ -63,7 +63,7 @@ impl CallTransaction { self } - pub fn gas(mut self, gas: near_gas::NearGas) -> Self { + pub fn gas(mut self, gas: Gas) -> Self { self.inner = self.inner.gas(gas); self } From 4d863d6cc8743b8877e111902bd554d2133296e3 Mon Sep 17 00:00:00 2001 From: Evgeny Ukhanov Date: Tue, 7 Nov 2023 13:31:31 +0100 Subject: [PATCH 6/7] Fix NearToken type and fix CI --- .github/workflows/rust.yaml | 23 +++++++++++++++++------ Cargo.toml | 1 - engine/src/lib.rs | 15 ++++++++------- eth-connector/Cargo.toml | 1 - eth-connector/src/lib.rs | 8 ++++---- utils/Cargo.toml | 1 - utils/src/lib.rs | 10 ++++------ 7 files changed, 33 insertions(+), 26 deletions(-) diff --git a/.github/workflows/rust.yaml b/.github/workflows/rust.yaml index 0cabe36..62051d5 100644 --- a/.github/workflows/rust.yaml +++ b/.github/workflows/rust.yaml @@ -12,18 +12,24 @@ jobs: name: Checks runs-on: [self-hosted, heavy] steps: - - name: Checkout sources - uses: actions/checkout@v2 + - name: Install rust + run: | + rustup show + rustup default ${{ env.RUST_VERSION }} + - name: Clone the repository + uses: actions/checkout@v3 - name: Run all checks run: make check test: name: Tests runs-on: [self-hosted, heavy] steps: - - name: Checkout sources - uses: actions/checkout@v2 - - name: Add toolchain target - run: rustup target add wasm32-unknown-unknown + - name: Install rust + run: | + rustup show + rustup default ${{ env.RUST_VERSION }} + - name: Clone the repository + uses: actions/checkout@v3 - name: Restore cache run: | cache-util restore cargo_git cargo_registry @@ -32,3 +38,8 @@ jobs: - name: Save cache run: | cache-util save cargo_git cargo_registry + +env: + RUST_VERSION: 1.73.0 + CARGO_TERM_COLOR: always + CARGO_INCREMENTAL: 0 diff --git a/Cargo.toml b/Cargo.toml index 4b0664e..1465148 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,7 +24,6 @@ anyhow = "1" aurora-engine-types = { git = "https://github.com/aurora-is-near/aurora-engine.git", branch = "develop", default-features = false, features = ["impl-serde"] } near-contract-standards = "4.1" near-sdk = "4.1" -near-units = "0.2" serde = { version = "1", features = ["derive"] } serde_json = "1" near-workspaces = "0.9" diff --git a/engine/src/lib.rs b/engine/src/lib.rs index 301136f..40f749b 100644 --- a/engine/src/lib.rs +++ b/engine/src/lib.rs @@ -2,9 +2,10 @@ use aurora_engine_types::parameters::connector::FungibleTokenMetadata; use aurora_engine_types::types::address::Address; use aurora_engine_types::U256; use aurora_workspace_utils::Contract; +use near_workspaces::types::NearToken; use near_workspaces::{Account, AccountId}; -pub use aurora_workspace_utils::{parse_near, ContractId}; +pub use aurora_workspace_utils::ContractId; pub use contract::EngineContract; pub mod contract; @@ -29,8 +30,8 @@ pub mod types { const AURORA_LOCAL_CHAIN_ID: u64 = 1313161556; const OWNER_ACCOUNT_ID: &str = "aurora.root"; const PROVER_ACCOUNT_ID: &str = "prover.root"; -const ROOT_BALANCE: u128 = parse_near!("400 N"); -const CONTRACT_BALANCE: u128 = parse_near!("200 N"); +const ROOT_BALANCE: NearToken = NearToken::from_near(400); +const CONTRACT_BALANCE: NearToken = NearToken::from_near(200); #[derive(Debug)] pub struct EngineContractBuilder { @@ -40,8 +41,8 @@ pub struct EngineContractBuilder { prover_id: AccountId, custodian_address: Address, upgrade_delay_blocks: u64, - root_balance: u128, - contract_balance: u128, + root_balance: NearToken, + contract_balance: NearToken, ft_metadata: FungibleTokenMetadata, } @@ -95,12 +96,12 @@ impl EngineContractBuilder { self } - pub fn with_root_balance(mut self, balance: u128) -> Self { + pub fn with_root_balance(mut self, balance: NearToken) -> Self { self.root_balance = balance; self } - pub fn with_contract_balance(mut self, balance: u128) -> Self { + pub fn with_contract_balance(mut self, balance: NearToken) -> Self { self.contract_balance = balance; self } diff --git a/eth-connector/Cargo.toml b/eth-connector/Cargo.toml index ed0a224..ed8f8be 100644 --- a/eth-connector/Cargo.toml +++ b/eth-connector/Cargo.toml @@ -12,7 +12,6 @@ anyhow.workspace = true aurora-engine-types.workspace = true near-contract-standards.workspace = true near-sdk.workspace = true -near-units.workspace = true serde.workspace = true serde_json.workspace = true near-workspaces.workspace = true diff --git a/eth-connector/src/lib.rs b/eth-connector/src/lib.rs index 97b8861..ae81e4d 100644 --- a/eth-connector/src/lib.rs +++ b/eth-connector/src/lib.rs @@ -10,8 +10,8 @@ pub mod types; const ROOT_ACCOUNT: &str = "root"; const ETH_CONNECTOR_ACCOUNT: &str = "eth_connector"; -const ROOT_BALANCE: u128 = near_units::parse_near!("200 N"); -const CONTRACT_BALANCE: u128 = near_units::parse_near!("85 N"); +const ROOT_BALANCE: NearToken = NearToken::from_near(200); +const CONTRACT_BALANCE: NearToken = NearToken::from_near(85); /// Deploy eth-connector contract using provided WASM file. pub async fn deploy + Copy>( @@ -20,7 +20,7 @@ pub async fn deploy + Copy>( let root_account = Contract::create_root_account(ROOT_ACCOUNT, ROOT_BALANCE).await?; let eth_connector = root_account .create_subaccount(ETH_CONNECTOR_ACCOUNT) - .initial_balance(NearToken::from_yoctonear(CONTRACT_BALANCE)) + .initial_balance(CONTRACT_BALANCE) .transact() .await? .into_result()?; @@ -33,7 +33,7 @@ pub async fn deploy + Copy>( })?; assert_eq!( eth_connector.view_account().await?.balance, - NearToken::from_yoctonear(CONTRACT_BALANCE) + CONTRACT_BALANCE ); let contract = Contract::deploy(ð_connector, contract_data).await?; diff --git a/utils/Cargo.toml b/utils/Cargo.toml index 1ab6241..4671167 100644 --- a/utils/Cargo.toml +++ b/utils/Cargo.toml @@ -9,7 +9,6 @@ readme.workspace = true anyhow.workspace = true aurora-engine-types.workspace = true near-sdk.workspace = true -near-units.workspace = true serde.workspace = true tokio = "1" near-workspaces.workspace = true diff --git a/utils/src/lib.rs b/utils/src/lib.rs index 0460b5d..02278bd 100644 --- a/utils/src/lib.rs +++ b/utils/src/lib.rs @@ -3,8 +3,6 @@ use near_workspaces::network::NetworkClient; use near_workspaces::types::{KeyType, NearToken, SecretKey}; use near_workspaces::{Account, AccountId, Worker}; -pub use near_units::parse_near; - pub mod macros; pub mod results; pub mod transactions; @@ -108,7 +106,7 @@ impl Contract { pub async fn create_root_account( root_acc_name: &str, - balance: u128, + balance: NearToken, ) -> anyhow::Result { use near_workspaces::AccessKey; @@ -131,7 +129,7 @@ impl Contract { .batch(&root) .create_account() .add_key(sk.public_key(), AccessKey::full_access()) - .transfer(NearToken::from_yoctonear(balance)) + .transfer(balance) .transact() .await? .into_result()?; @@ -142,11 +140,11 @@ impl Contract { pub async fn create_sub_account( root_account: &Account, name: &str, - balance: u128, + balance: NearToken, ) -> anyhow::Result { Ok(root_account .create_subaccount(name) - .initial_balance(NearToken::from_yoctonear(balance)) + .initial_balance(balance) .transact() .await? .into_result()?) From 1461915b14f4ea12c98fcc5f9ccfa7eaaf0e77e3 Mon Sep 17 00:00:00 2001 From: Evgeny Ukhanov Date: Tue, 7 Nov 2023 13:58:26 +0100 Subject: [PATCH 7/7] Set engin version --- .github/workflows/rust.yaml | 4 +-- Cargo.toml | 2 +- res/mock_engine/Cargo.lock | 36 +++++++++++++++++++++---- res/mock_engine/Cargo.toml | 2 +- res/mock_engine/src/lib.rs | 1 + res/mock_eth_connector/Cargo.lock | 44 +++++++++++++++++++++++++++---- res/mock_eth_connector/Cargo.toml | 2 +- 7 files changed, 76 insertions(+), 15 deletions(-) diff --git a/.github/workflows/rust.yaml b/.github/workflows/rust.yaml index 62051d5..f8759ba 100644 --- a/.github/workflows/rust.yaml +++ b/.github/workflows/rust.yaml @@ -17,7 +17,7 @@ jobs: rustup show rustup default ${{ env.RUST_VERSION }} - name: Clone the repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Run all checks run: make check test: @@ -29,7 +29,7 @@ jobs: rustup show rustup default ${{ env.RUST_VERSION }} - name: Clone the repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Restore cache run: | cache-util restore cargo_git cargo_registry diff --git a/Cargo.toml b/Cargo.toml index 1465148..eadc771 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,7 +21,7 @@ version = "0.4.0" [workspace.dependencies] anyhow = "1" -aurora-engine-types = { git = "https://github.com/aurora-is-near/aurora-engine.git", branch = "develop", default-features = false, features = ["impl-serde"] } +aurora-engine-types = { git = "https://github.com/aurora-is-near/aurora-engine.git", tag = "3.3.1", default-features = false, features = ["impl-serde"] } near-contract-standards = "4.1" near-sdk = "4.1" serde = { version = "1", features = ["derive"] } diff --git a/res/mock_engine/Cargo.lock b/res/mock_engine/Cargo.lock index d4aae17..7816e80 100644 --- a/res/mock_engine/Cargo.lock +++ b/res/mock_engine/Cargo.lock @@ -66,11 +66,12 @@ checksum = "8868f09ff8cea88b079da74ae569d9b8c62a23c68c746240b704ee6f7525c89c" [[package]] name = "aurora-engine-types" version = "1.0.0" -source = "git+https://github.com/aurora-is-near/aurora-engine.git?branch=develop#e786d3ee6b3a11163ba5e49d8948df93637e0d93" +source = "git+https://github.com/aurora-is-near/aurora-engine.git?tag=3.3.1#99634869db649e865a67d588024700fe0dcc80b0" dependencies = [ "base64 0.21.2", "borsh 0.10.3", "borsh 0.9.3", + "bs58 0.5.0", "hex", "primitive-types 0.12.1", "rlp", @@ -239,6 +240,16 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" +[[package]] +name = "bs58" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5353f36341f7451062466f0b755b96ac3a9547e4d7f6b70d603fc721a7d7896" +dependencies = [ + "sha2 0.10.6", + "tinyvec", +] + [[package]] name = "bumpalo" version = "3.13.0" @@ -726,7 +737,7 @@ dependencies = [ "arrayref", "blake2", "borsh 0.9.3", - "bs58", + "bs58 0.4.0", "c2-chacha", "curve25519-dalek", "derive_more", @@ -780,7 +791,7 @@ checksum = "91d508f0fc340f6461e4e256417685720d3c4c00bb5a939b105160e49137caba" dependencies = [ "base64 0.11.0", "borsh 0.9.3", - "bs58", + "bs58 0.4.0", "derive_more", "near-account-id", "num-rational", @@ -819,7 +830,7 @@ checksum = "15eb3de2defe3626260cc209a6cdb985c6b27b0bd4619fad97dcfae002c3c5bd" dependencies = [ "base64 0.13.1", "borsh 0.9.3", - "bs58", + "bs58 0.4.0", "near-abi", "near-crypto", "near-primitives", @@ -872,7 +883,7 @@ checksum = "81b534828419bacbf1f7b11ef7b00420f248c548c485d3f0cfda8bb6931152f2" dependencies = [ "base64 0.13.1", "borsh 0.9.3", - "bs58", + "bs58 0.4.0", "byteorder", "near-account-id", "near-crypto", @@ -1405,6 +1416,21 @@ dependencies = [ "winapi", ] +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + [[package]] name = "toml" version = "0.5.11" diff --git a/res/mock_engine/Cargo.toml b/res/mock_engine/Cargo.toml index d808cda..3fa2808 100644 --- a/res/mock_engine/Cargo.toml +++ b/res/mock_engine/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" crate-type = ["cdylib", "rlib"] [dependencies] -aurora-engine-types = { git = "https://github.com/aurora-is-near/aurora-engine.git", branch = "develop", default-features = false, features = ["borsh-compat"] } +aurora-engine-types = { git = "https://github.com/aurora-is-near/aurora-engine.git", tag = "3.3.1", default-features = false, features = ["borsh-compat"] } hex = "0.4.3" near-sdk = "4.1" near-contract-standards = "4.1" diff --git a/res/mock_engine/src/lib.rs b/res/mock_engine/src/lib.rs index bc1184b..ee5f221 100644 --- a/res/mock_engine/src/lib.rs +++ b/res/mock_engine/src/lib.rs @@ -26,6 +26,7 @@ impl MockEngineContract { let input = match input { NewCallArgs::V1(_) => panic!("Wrong version of the init args"), NewCallArgs::V2(args) => args, + _ => todo!(), }; Self { diff --git a/res/mock_eth_connector/Cargo.lock b/res/mock_eth_connector/Cargo.lock index 1a1bdbc..30c3d7e 100644 --- a/res/mock_eth_connector/Cargo.lock +++ b/res/mock_eth_connector/Cargo.lock @@ -66,12 +66,15 @@ checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" [[package]] name = "aurora-engine-types" version = "1.0.0" -source = "git+https://github.com/aurora-is-near/aurora-engine.git?branch=develop#ddbde784cece70de7919ef0addba3f9e59af2f23" +source = "git+https://github.com/aurora-is-near/aurora-engine.git?tag=3.3.1#99634869db649e865a67d588024700fe0dcc80b0" dependencies = [ + "base64 0.21.5", "borsh 0.10.3", "borsh 0.9.3", + "bs58 0.5.0", "hex", "primitive-types 0.12.1", + "rlp", "serde", "serde_json", ] @@ -94,6 +97,12 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +[[package]] +name = "base64" +version = "0.21.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" + [[package]] name = "bitvec" version = "0.20.4" @@ -231,6 +240,16 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" +[[package]] +name = "bs58" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5353f36341f7451062466f0b755b96ac3a9547e4d7f6b70d603fc721a7d7896" +dependencies = [ + "sha2 0.10.6", + "tinyvec", +] + [[package]] name = "bumpalo" version = "3.13.0" @@ -716,7 +735,7 @@ dependencies = [ "arrayref", "blake2", "borsh 0.9.3", - "bs58", + "bs58 0.4.0", "c2-chacha", "curve25519-dalek", "derive_more", @@ -770,7 +789,7 @@ checksum = "91d508f0fc340f6461e4e256417685720d3c4c00bb5a939b105160e49137caba" dependencies = [ "base64 0.11.0", "borsh 0.9.3", - "bs58", + "bs58 0.4.0", "derive_more", "near-account-id", "num-rational", @@ -809,7 +828,7 @@ checksum = "15eb3de2defe3626260cc209a6cdb985c6b27b0bd4619fad97dcfae002c3c5bd" dependencies = [ "base64 0.13.1", "borsh 0.9.3", - "bs58", + "bs58 0.4.0", "near-abi", "near-crypto", "near-primitives", @@ -862,7 +881,7 @@ checksum = "81b534828419bacbf1f7b11ef7b00420f248c548c485d3f0cfda8bb6931152f2" dependencies = [ "base64 0.13.1", "borsh 0.9.3", - "bs58", + "bs58 0.4.0", "byteorder", "near-account-id", "near-crypto", @@ -1395,6 +1414,21 @@ dependencies = [ "winapi", ] +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + [[package]] name = "toml" version = "0.5.11" diff --git a/res/mock_eth_connector/Cargo.toml b/res/mock_eth_connector/Cargo.toml index b8b32a3..5989bb7 100644 --- a/res/mock_eth_connector/Cargo.toml +++ b/res/mock_eth_connector/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" crate-type = ["cdylib", "rlib"] [dependencies] -aurora-engine-types = { git = "https://github.com/aurora-is-near/aurora-engine.git", branch = "develop", default-features = false, features = ["impl-serde", "borsh-compat"] } +aurora-engine-types = { git = "https://github.com/aurora-is-near/aurora-engine.git", tag = "3.3.1", default-features = false, features = ["impl-serde", "borsh-compat"] } near-contract-standards = "4.1" near-sdk = "4.1"