diff --git a/.github/workflows/contracts-near.yml b/.github/workflows/contracts-near.yml index 698f8be94..a276db210 100644 --- a/.github/workflows/contracts-near.yml +++ b/.github/workflows/contracts-near.yml @@ -32,7 +32,7 @@ jobs: cmd: | cd contracts/near/eth-prover ./test.sh - timeout-minutes: 20 + timeout-minutes: 40 - job-name: test eth-client cmd: | diff --git a/contracts/eth/nearbridge/.catalog-info.yaml b/contracts/eth/nearbridge/.catalog-info.yaml index cddc1774c..5ed91d74e 100644 --- a/contracts/eth/nearbridge/.catalog-info.yaml +++ b/contracts/eth/nearbridge/.catalog-info.yaml @@ -42,7 +42,8 @@ spec: lifecycle: production system: bridge-protocol deployedAt: - - contract-deprecated:ethereum/mainnet/0x3be7df8db39996a837041bb8ee0dadf60f767038 - contract:ethereum/mainnet/0x3FEFc5A4B1c02f21cBc8D3613643ba0635b9a873 interactsWith: - relayer:ethereum/mainnet/0x015e634c7c1311a9034220c28d3d12b7f710a3b1 + deprecated: + - contract:ethereum/mainnet/0x3be7df8db39996a837041bb8ee0dadf60f767038 diff --git a/contracts/near/Cargo.lock b/contracts/near/Cargo.lock index feeac7ed5..3f8293a7d 100644 --- a/contracts/near/Cargo.lock +++ b/contracts/near/Cargo.lock @@ -10,9 +10,9 @@ checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" [[package]] name = "addr2line" -version = "0.17.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" +checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" dependencies = [ "gimli", ] @@ -36,16 +36,16 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ - "getrandom 0.2.7", + "getrandom 0.2.8", "once_cell", - "version_check 0.9.2", + "version_check 0.9.4", ] [[package]] name = "aho-corasick" -version = "0.7.18" +version = "0.7.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" dependencies = [ "memchr", ] @@ -55,11 +55,20 @@ name = "amcl" version = "0.3.0" source = "git+https://github.com/sigp/milagro_bls?tag=v1.4.2#16655aa033175a90c10ef02aa144e2835de23aec" +[[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.58" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb07d2053ccdbe10e2af2995a2f116c1330396493dc1269f6a91d0ae82e19704" +checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800" [[package]] name = "arrayref" @@ -78,9 +87,9 @@ dependencies = [ [[package]] name = "arrayvec" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" +checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" [[package]] name = "arrayvec" @@ -96,9 +105,9 @@ checksum = "161cf650099ca1a49d30f8f27efba93ec4239a0370f81f64a5095fbb0ec4e1a8" [[package]] name = "async-channel" -version = "1.6.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2114d64672151c0c5eaa5e131ec84a74f06e1e559830dabba01ca30605d66319" +checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" dependencies = [ "concurrent-queue", "event-listener", @@ -107,38 +116,49 @@ dependencies = [ [[package]] name = "async-io" -version = "1.7.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5e18f61464ae81cde0a23e713ae8fd299580c54d697a35820cfd0625b8b0e07" +checksum = "8c374dda1ed3e7d8f0d9ba58715f924862c63eae6849c92d3a18e7fbde9e2794" dependencies = [ + "async-lock", + "autocfg 1.1.0", "concurrent-queue", "futures-lite", "libc", "log 0.4.17", - "once_cell", "parking", "polling", - "slab 0.4.2", + "slab 0.4.8", "socket2", "waker-fn", - "winapi 0.3.9", + "windows-sys 0.42.0", +] + +[[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.4.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf2c06e30a24e8c78a3987d07f0930edf76ef35e027e7bdb063fccafdad1f60c" +checksum = "6381ead98388605d0d9ff86371043b5aa922a3905824244de40dc263a14fcba4" dependencies = [ "async-io", + "async-lock", + "autocfg 1.1.0", "blocking", "cfg-if 1.0.0", "event-listener", "futures-lite", "libc", - "once_cell", "signal-hook", - "winapi 0.3.9", + "windows-sys 0.42.0", ] [[package]] @@ -149,26 +169,29 @@ checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524" [[package]] name = "async-trait" -version = "0.1.56" +version = "0.1.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96cf8829f67d2eab0b2dfa42c5d0ef737e0724e4a82b01b3e292456202b19716" +checksum = "b84f9ebcc6c1f5b8cb160f6990096a5c127f423fcb6e1ccc46c370cbdfb75dfc" dependencies = [ - "proc-macro2 1.0.39", - "quote 1.0.18", - "syn 1.0.96", + "proc-macro2 1.0.52", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] name = "atomic-waker" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "065374052e7df7ee4047b1160cca5e1467a12351a40b3da123c870ba0b8eda2a" +checksum = "debc29dde2e69f9e47506b525f639ed42300fc014a3e007832592448fa8e4599" [[package]] name = "autocfg" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" +checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78" +dependencies = [ + "autocfg 1.1.0", +] [[package]] name = "autocfg" @@ -178,9 +201,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.66" +version = "0.3.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7" +checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" dependencies = [ "addr2line", "cc", @@ -218,9 +241,15 @@ checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" [[package]] name = "base64" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" [[package]] name = "binary-install" @@ -275,14 +304,14 @@ dependencies = [ [[package]] name = "bitvec" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1489fcb93a5bb47da0462ca93ad252ad6af2145cce58d10d46a83931ba9f016b" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" dependencies = [ "funty 2.0.0", "radium 0.7.0", "tap", - "wyz 0.5.0", + "wyz 0.5.1", ] [[package]] @@ -303,7 +332,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" dependencies = [ "arrayref", - "arrayvec 0.5.1", + "arrayvec 0.5.2", "constant_time_eq", ] @@ -316,7 +345,7 @@ dependencies = [ "block-padding", "byte-tools", "byteorder", - "generic-array 0.12.3", + "generic-array 0.12.4", ] [[package]] @@ -325,16 +354,16 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" dependencies = [ - "generic-array 0.14.4", + "generic-array 0.14.6", ] [[package]] name = "block-buffer" -version = "0.10.2" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf7fe51849ea569fd452f37822f606a5cabb684dc918707a0193fd4664ff324" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" dependencies = [ - "generic-array 0.14.4", + "generic-array 0.14.6", ] [[package]] @@ -348,16 +377,16 @@ dependencies = [ [[package]] name = "blocking" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6ccb65d468978a086b69884437ded69a90faab3bbe6e67f242173ea728acccc" +checksum = "3c67b173a56acffd6d2326fb7ab938ba0b00a71480e14902b2591c87bc5741e8" dependencies = [ "async-channel", + "async-lock", "async-task", "atomic-waker", "fastrand", "futures-lite", - "once_cell", ] [[package]] @@ -369,8 +398,8 @@ dependencies = [ "eth2_serde_utils", "eth2_ssz", "ethereum-types 0.9.2", - "getrandom 0.2.7", - "hex 0.4.2", + "getrandom 0.2.8", + "hex 0.4.3", "milagro_bls", "rand 0.7.3", "serde", @@ -398,8 +427,8 @@ dependencies = [ "borsh-derive-internal", "borsh-schema-derive-internal", "proc-macro-crate 0.1.5", - "proc-macro2 1.0.39", - "syn 1.0.96", + "proc-macro2 1.0.52", + "syn 1.0.109", ] [[package]] @@ -408,9 +437,9 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5449c28a7b352f2d1e592a8a28bf139bc71afb0764a14f3c02500935d8c44065" dependencies = [ - "proc-macro2 1.0.39", - "quote 1.0.18", - "syn 1.0.96", + "proc-macro2 1.0.52", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -419,9 +448,9 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cdbd5696d8bfa21d53d9fe39a714a18538bad11492a42d066dbbc395fb1951c0" dependencies = [ - "proc-macro2 1.0.39", - "quote 1.0.18", - "syn 1.0.96", + "proc-macro2 1.0.52", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -432,9 +461,9 @@ checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" [[package]] name = "bumpalo" -version = "3.10.0" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3" +checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" [[package]] name = "byte-slice-cast" @@ -444,9 +473,9 @@ checksum = "b0a5e3906bcbf133e33c1d4d95afc664ad37fbdb9f6568d8043e7ea8c27d93d3" [[package]] name = "byte-slice-cast" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87c5fdd0166095e1d463fc6cc01aa8ce547ad77a4e84d42eb6762b084e28067e" +checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c" [[package]] name = "byte-tools" @@ -473,21 +502,21 @@ dependencies = [ [[package]] name = "bytes" -version = "1.2.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0b3de4a0c5e67e16066a0715723abd91edc2f9001d09c46e1dca929351e130e" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] name = "bytesize" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c58ec36aac5066d5ca17df51b3e70279f5670a72102f5752cb7e7c856adfc70" +checksum = "38fcc2979eff34a4b84e1cf9a1e3da42a7d44b3b690a40cdcb23e3d556cfb2e5" [[package]] name = "bzip2" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6afcd980b5f3a45017c57e57a2fcccbb351cc43a356ce117ef760ef8052b89b0" +checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8" dependencies = [ "bzip2-sys", "libc", @@ -514,17 +543,11 @@ dependencies = [ "ppv-lite86", ] -[[package]] -name = "cache-padded" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c" - [[package]] name = "cc" -version = "1.0.73" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" [[package]] name = "cfg-if" @@ -540,15 +563,17 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.19" +version = "0.4.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" +checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" dependencies = [ - "libc", + "iana-time-zone", + "js-sys", "num-integer", "num-traits", "serde", "time", + "wasm-bindgen", "winapi 0.3.9", ] @@ -558,7 +583,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801" dependencies = [ - "generic-array 0.14.4", + "generic-array 0.14.6", ] [[package]] @@ -570,30 +595,36 @@ dependencies = [ "bitflags 1.3.2", ] +[[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + [[package]] name = "concurrent-queue" -version = "1.2.4" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af4780a44ab5696ea9e28294517f1fffb421a83a25af521333c838635509db9c" +checksum = "c278839b831783b70278b14df4d45e1beb1aad306c07bb796637de9a0e323e8e" dependencies = [ - "cache-padded", + "crossbeam-utils 0.8.15", ] [[package]] name = "console" -version = "0.11.3" +version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c0994e656bba7b922d8dd1245db90672ffb701e684e45be58f20719d69abc5a" +checksum = "c3d79fbe8970a77e3e34151cc13d3b3e248aa0faaecb9f6091fa07ebefe5ad60" dependencies = [ "encode_unicode", "lazy_static", "libc", - "regex", - "terminal_size", - "termios", "unicode-width", - "winapi 0.3.9", - "winapi-util", + "windows-sys 0.42.0", ] [[package]] @@ -626,19 +657,13 @@ checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" [[package]] name = "cpufeatures" -version = "0.2.2" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59a6001667ab124aebae2a495118e11d30984c3a653e99d86d58971708cf5e4b" +checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" dependencies = [ "libc", ] -[[package]] -name = "cpuid-bool" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634" - [[package]] name = "crc32fast" version = "1.3.2" @@ -698,12 +723,11 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.11" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51887d4adc7b564537b15adcfb307936f8075dfcd5f00dde9a9f1d29383682bc" +checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" dependencies = [ "cfg-if 1.0.0", - "once_cell", ] [[package]] @@ -714,11 +738,11 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] name = "crypto-common" -version = "0.1.3" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57952ca27b5e3606ff4dd79b0020231aaf9d6aa76dc05fd30137538c50bd3ce8" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ - "generic-array 0.14.4", + "generic-array 0.14.6", "typenum", ] @@ -728,7 +752,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" dependencies = [ - "generic-array 0.14.4", + "generic-array 0.14.6", "subtle", ] @@ -749,9 +773,9 @@ dependencies = [ [[package]] name = "curl-sys" -version = "0.4.56+curl-7.83.1" +version = "0.4.60+curl-7.88.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6093e169dd4de29e468fa649fbae11cdcd5551c81fe5bf1b0677adad7ef3d26f" +checksum = "717abe2cb465a5da6ce06617388a3980c9a2844196734bec8ccb8e575250f13f" dependencies = [ "cc", "libc", @@ -775,6 +799,50 @@ dependencies = [ "zeroize", ] +[[package]] +name = "cxx" +version = "1.0.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a140f260e6f3f79013b8bfc65e7ce630c9ab4388c6a89c71e07226f49487b72" +dependencies = [ + "cc", + "cxxbridge-flags", + "cxxbridge-macro", + "link-cplusplus", +] + +[[package]] +name = "cxx-build" +version = "1.0.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da6383f459341ea689374bf0a42979739dc421874f112ff26f829b8040b8e613" +dependencies = [ + "cc", + "codespan-reporting", + "once_cell", + "proc-macro2 1.0.52", + "quote 1.0.26", + "scratch", + "syn 1.0.109", +] + +[[package]] +name = "cxxbridge-flags" +version = "1.0.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90201c1a650e95ccff1c8c0bb5a343213bdd317c6e600a93075bca2eff54ec97" + +[[package]] +name = "cxxbridge-macro" +version = "1.0.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b75aed41bb2e6367cae39e6326ef817a851db13c13e4f3263714ca3cfb8de56" +dependencies = [ + "proc-macro2 1.0.52", + "quote 1.0.26", + "syn 1.0.109", +] + [[package]] name = "darling" version = "0.13.4" @@ -793,10 +861,10 @@ checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.39", - "quote 1.0.18", + "proc-macro2 1.0.52", + "quote 1.0.26", "strsim", - "syn 1.0.96", + "syn 1.0.109", ] [[package]] @@ -806,8 +874,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" dependencies = [ "darling_core", - "quote 1.0.18", - "syn 1.0.96", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -831,10 +899,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ "convert_case", - "proc-macro2 1.0.39", - "quote 1.0.18", + "proc-macro2 1.0.52", + "quote 1.0.26", "rustc_version 0.4.0", - "syn 1.0.96", + "syn 1.0.109", ] [[package]] @@ -843,7 +911,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" dependencies = [ - "generic-array 0.12.3", + "generic-array 0.12.4", ] [[package]] @@ -852,16 +920,16 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" dependencies = [ - "generic-array 0.14.4", + "generic-array 0.14.6", ] [[package]] name = "digest" -version = "0.10.3" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506" +checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" dependencies = [ - "block-buffer 0.10.2", + "block-buffer 0.10.4", "crypto-common", ] @@ -896,21 +964,23 @@ dependencies = [ "winapi 0.3.9", ] +[[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.0" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2a9b11b96248fc9efa0c093e6406fea7e55a7e893c932dbdf47074f34ec52e7" -dependencies = [ - "quote 1.0.18", - "syn 1.0.96", -] +checksum = "53aff6fdc1b181225acdcb5b14c47106726fd8e486707315b1b138baed68ee31" [[package]] name = "ed25519" -version = "1.5.2" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9c280362032ea4203659fc489832d0204ef09f247a0506f170dafcac08c369" +checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" dependencies = [ "signature", ] @@ -925,15 +995,15 @@ dependencies = [ "ed25519", "rand 0.7.3", "serde", - "sha2 0.9.3", + "sha2 0.9.9", "zeroize", ] [[package]] name = "either" -version = "1.5.3" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" [[package]] name = "encode_unicode" @@ -943,20 +1013,41 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] name = "encoding_rs" -version = "0.8.31" +version = "0.8.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" +checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" dependencies = [ "cfg-if 1.0.0", ] +[[package]] +name = "errno" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +dependencies = [ + "errno-dragonfly", + "libc", + "winapi 0.3.9", +] + +[[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 = "error-chain" -version = "0.12.2" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d371106cc88ffdfb1eabd7111e432da544f16f3e2d7bf1dfe8bf575f1df045cd" +checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc" dependencies = [ - "version_check 0.9.2", + "version_check 0.9.4", ] [[package]] @@ -968,7 +1059,7 @@ dependencies = [ "eth-types", "ethash", "futures", - "hex 0.4.2", + "hex 0.4.3", "indicatif", "lazy_static", "near-plugins", @@ -987,7 +1078,7 @@ name = "eth-prover" version = "0.1.0" dependencies = [ "eth-types", - "hex 0.4.2", + "hex 0.4.3", "indicatif", "lazy_static", "near-crypto 0.14.0", @@ -998,7 +1089,7 @@ dependencies = [ "rlp", "serde", "serde_json", - "tokio 1.20.1", + "tokio 1.26.0", "workspaces", ] @@ -1012,7 +1103,7 @@ dependencies = [ "eth2_ssz", "eth2_ssz_derive", "ethereum-types 0.9.2", - "hex 0.4.2", + "hex 0.4.3", "near-sdk", "rlp", "rlp-derive", @@ -1027,13 +1118,13 @@ name = "eth2-client" version = "0.1.0" dependencies = [ "anyhow", - "bitvec 1.0.0", + "bitvec 1.0.1", "bls", "borsh", "eth-types", "eth2-utility", "ethereum-types 0.9.2", - "hex 0.4.2", + "hex 0.4.3", "lazy_static", "merkle_proof", "near-plugins", @@ -1041,7 +1132,7 @@ dependencies = [ "near-sdk", "near-units", "serde_json", - "tokio 1.20.1", + "tokio 1.26.0", "tree_hash", "workspaces", ] @@ -1050,11 +1141,11 @@ dependencies = [ name = "eth2-utility" version = "0.1.0" dependencies = [ - "bitvec 1.0.0", + "bitvec 1.0.1", "borsh", "eth-types", "ethereum-types 0.9.2", - "hex 0.4.2", + "hex 0.4.3", "lazy_static", "merkle_proof", "near-sdk", @@ -1076,7 +1167,7 @@ version = "0.1.1" source = "git+https://github.com/aurora-is-near/lighthouse.git?rev=b624c3f0d3c5bc9ea46faa14c9cb2d90ee1e1dec#b624c3f0d3c5bc9ea46faa14c9cb2d90ee1e1dec" dependencies = [ "ethereum-types 0.9.2", - "hex 0.4.2", + "hex 0.4.3", "serde", "serde_derive", "serde_json", @@ -1088,7 +1179,7 @@ version = "0.4.1" source = "git+https://github.com/aurora-is-near/lighthouse.git?rev=b624c3f0d3c5bc9ea46faa14c9cb2d90ee1e1dec#b624c3f0d3c5bc9ea46faa14c9cb2d90ee1e1dec" dependencies = [ "ethereum-types 0.9.2", - "smallvec 1.8.0", + "smallvec 1.10.0", ] [[package]] @@ -1097,9 +1188,9 @@ version = "0.3.0" source = "git+https://github.com/aurora-is-near/lighthouse.git?rev=b624c3f0d3c5bc9ea46faa14c9cb2d90ee1e1dec#b624c3f0d3c5bc9ea46faa14c9cb2d90ee1e1dec" dependencies = [ "darling", - "proc-macro2 1.0.39", - "quote 1.0.18", - "syn 1.0.96", + "proc-macro2 1.0.52", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -1124,9 +1215,9 @@ source = "git+https://github.com/nearprotocol/rust-ethash#ed163a30dfdd6b1b61a817 dependencies = [ "byteorder", "ethereum-types 0.9.2", - "primitive-types 0.7.2", + "primitive-types 0.7.3", "rlp", - "sha3", + "sha3 0.8.2", ] [[package]] @@ -1179,8 +1270,8 @@ dependencies = [ "fixed-hash 0.6.1", "impl-rlp", "impl-serde 0.3.2", - "primitive-types 0.7.2", - "uint 0.8.3", + "primitive-types 0.7.3", + "uint 0.8.5", ] [[package]] @@ -1205,31 +1296,31 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" dependencies = [ - "proc-macro2 1.0.39", - "quote 1.0.18", - "syn 1.0.96", + "proc-macro2 1.0.52", + "quote 1.0.26", + "syn 1.0.109", "synstructure", ] [[package]] name = "fastrand" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" dependencies = [ "instant", ] [[package]] name = "filetime" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94a7bbaa59354bc20dd75b67f23e2797b4490e9d6928203fb105c79e448c86c" +checksum = "8a3de6e8d11b22ff9edc6d916f890800597d60f8b2da1caf2955c274638d6412" dependencies = [ "cfg-if 1.0.0", "libc", "redox_syscall 0.2.16", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] @@ -1271,9 +1362,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.24" +version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" +checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" dependencies = [ "crc32fast", "miniz_oxide", @@ -1302,12 +1393,11 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" +checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" dependencies = [ - "matches", - "percent-encoding 2.1.0", + "percent-encoding 2.2.0", ] [[package]] @@ -1356,24 +1446,24 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" -version = "0.1.29" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b980f2816d6ee8673b6517b52cb0e808a180efc92e5c19d02cdda79066703ef" +checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" [[package]] name = "futures-channel" -version = "0.3.21" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010" +checksum = "164713a5a0dcc3e7b4b1ed7d3b433cabc18025386f9339346e8daf15963cf7ac" dependencies = [ "futures-core", ] [[package]] name = "futures-core" -version = "0.3.21" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3" +checksum = "86d7a0c1aa76363dac491de0ee99faf6941128376f1cf96f07db7603b7de69dd" [[package]] name = "futures-cpupool" @@ -1387,9 +1477,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.21" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b" +checksum = "89d422fa3cbe3b40dca574ab087abb5bc98258ea57eea3fd6f1fa7162c778b91" [[package]] name = "futures-lite" @@ -1408,21 +1498,21 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.21" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868" +checksum = "ec93083a4aecafb2a80a885c9de1f0ccae9dbd32c2bb54b0c3a65690e0b8d2f2" [[package]] name = "futures-task" -version = "0.3.21" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a" +checksum = "fd65540d33b37b16542a0438c12e6aeead10d4ac5d05bd3f805b8f35ab592879" [[package]] name = "futures-util" -version = "0.3.21" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a" +checksum = "3ef6b17e481503ec85211fed8f39d1970f128935ca1f814cd32ac4a6842e84ab" dependencies = [ "futures-core", "futures-task", @@ -1432,39 +1522,39 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec" +checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd" dependencies = [ "typenum", ] [[package]] name = "generic-array" -version = "0.14.4" +version = "0.14.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817" +checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" dependencies = [ "typenum", - "version_check 0.9.2", + "version_check 0.9.4", ] [[package]] name = "getrandom" -version = "0.1.14" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" +checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "libc", "wasi 0.9.0+wasi-snapshot-preview1", ] [[package]] name = "getrandom" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" +checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -1475,9 +1565,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.26.2" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" +checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" [[package]] name = "h2" @@ -1492,26 +1582,26 @@ dependencies = [ "http 0.1.21", "indexmap", "log 0.4.17", - "slab 0.4.2", + "slab 0.4.8", "string", "tokio-io", ] [[package]] name = "h2" -version = "0.3.13" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37a82c6d637fc9515a4694bbf1cb2457b79d81ce52b3108bdeea58b07dd34a57" +checksum = "5be7b54589b581f624f566bf5d8eb2bab1db736c51528720b6bd36b96b55924d" dependencies = [ - "bytes 1.2.0", + "bytes 1.4.0", "fnv", "futures-core", "futures-sink", "futures-util", - "http 0.2.8", + "http 0.2.9", "indexmap", - "slab 0.4.2", - "tokio 1.20.1", + "slab 0.4.8", + "tokio 1.26.0", "tokio-util", "tracing", ] @@ -1533,9 +1623,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.12.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "607c8a29735385251a339424dd462993c0fed8fa09d378f259377df08c126022" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "heapsize" @@ -1548,15 +1638,15 @@ dependencies = [ [[package]] name = "heck" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.1.14" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9586eedd4ce6b3c498bc3b4dd92fc9f11166aa908a914071953768066c67909" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" dependencies = [ "libc", ] @@ -1569,15 +1659,15 @@ checksum = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77" [[package]] name = "hex" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "644f9158b2f133fd50f5fb3242878846d9eb792e445c893805ff0e3824006e35" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "home" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2456aef2e6b6a9784192ae780c0f15bc57df0e918585282325e8c8ac27737654" +checksum = "747309b4b440c06d57b0b25f2aee03ee9b5e5397d288c60e21fc709bb98a7408" dependencies = [ "winapi 0.3.9", ] @@ -1590,18 +1680,18 @@ checksum = "d6ccf5ede3a895d8856620237b2f02972c1bbc78d2965ad7fe8838d4a0ed41f0" dependencies = [ "bytes 0.4.12", "fnv", - "itoa 0.4.5", + "itoa 0.4.8", ] [[package]] name = "http" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" dependencies = [ - "bytes 1.2.0", + "bytes 1.4.0", "fnv", - "itoa 1.0.2", + "itoa 1.0.6", ] [[package]] @@ -1622,16 +1712,16 @@ version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ - "bytes 1.2.0", - "http 0.2.8", + "bytes 1.4.0", + "http 0.2.9", "pin-project-lite", ] [[package]] name = "httparse" -version = "1.7.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "496ce29bb5a52785b44e0f7ca2847ae0bb839c9bd28f69acac9b99d461c0c04c" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" @@ -1660,9 +1750,9 @@ dependencies = [ [[package]] name = "hyper" -version = "0.12.35" +version = "0.12.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dbe6ed1438e1f8ad955a4701e9a944938e9519f6888d12d8558b645e247d5f6" +checksum = "5c843caf6296fc1f93444735205af9ed4e109a539005abb2564ae1d6fad34c52" dependencies = [ "bytes 0.4.12", "futures", @@ -1672,7 +1762,7 @@ dependencies = [ "http-body 0.1.0", "httparse", "iovec", - "itoa 0.4.5", + "itoa 0.4.8", "log 0.4.17", "net2", "rustc_version 0.2.3", @@ -1690,23 +1780,23 @@ dependencies = [ [[package]] name = "hyper" -version = "0.14.20" +version = "0.14.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02c929dc5c39e335a03c405292728118860721b10190d98c2a0f0efd5baafbac" +checksum = "cc5e554ff619822309ffd57d8734d77cd5ce6238bc956f037ea06c58238c9899" dependencies = [ - "bytes 1.2.0", + "bytes 1.4.0", "futures-channel", "futures-core", "futures-util", - "h2 0.3.13", - "http 0.2.8", + "h2 0.3.16", + "http 0.2.9", "http-body 0.4.5", "httparse", "httpdate", - "itoa 1.0.2", + "itoa 1.0.6", "pin-project-lite", "socket2", - "tokio 1.20.1", + "tokio 1.26.0", "tower-service", "tracing", "want 0.3.0", @@ -1720,7 +1810,7 @@ checksum = "3a800d6aa50af4b5850b2b0f659625ce9504df908e9733b635720483be26174f" dependencies = [ "bytes 0.4.12", "futures", - "hyper 0.12.35", + "hyper 0.12.36", "native-tls", "tokio-io", ] @@ -1731,13 +1821,37 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ - "bytes 1.2.0", - "hyper 0.14.20", + "bytes 1.4.0", + "hyper 0.14.25", "native-tls", - "tokio 1.20.1", + "tokio 1.26.0", "tokio-native-tls", ] +[[package]] +name = "iana-time-zone" +version = "0.1.53" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "winapi 0.3.9", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +dependencies = [ + "cxx", + "cxx-build", +] + [[package]] name = "ident_case" version = "1.0.1" @@ -1757,11 +1871,10 @@ dependencies = [ [[package]] name = "idna" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" dependencies = [ - "matches", "unicode-bidi", "unicode-normalization", ] @@ -1781,7 +1894,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1be51a921b067b0eaca2fad532d9400041561aa922221cc65f95a85641c6bf53" dependencies = [ - "parity-scale-codec 1.3.0", + "parity-scale-codec 1.3.7", ] [[package]] @@ -1826,19 +1939,19 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb" dependencies = [ - "proc-macro2 1.0.39", - "quote 1.0.18", - "syn 1.0.96", + "proc-macro2 1.0.52", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] name = "indexmap" -version = "1.9.1" +version = "1.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" +checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" dependencies = [ "autocfg 1.1.0", - "hashbrown 0.12.2", + "hashbrown 0.12.3", ] [[package]] @@ -1862,6 +1975,16 @@ dependencies = [ "cfg-if 1.0.0", ] +[[package]] +name = "io-lifetimes" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfa919a82ea574332e2de6e74b4c36e74d41982b335080fa59d4ef31be20fdf3" +dependencies = [ + "libc", + "windows-sys 0.45.0", +] + [[package]] name = "iovec" version = "0.1.4" @@ -1873,9 +1996,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.5.0" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b" +checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146" [[package]] name = "is_executable" @@ -1888,21 +2011,21 @@ dependencies = [ [[package]] name = "itoa" -version = "0.4.5" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8b7a7c0c47db5545ed3fef7468ee7bb5b74691498139e4b3f6a20685dc6dd8e" +checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" [[package]] name = "itoa" -version = "1.0.2" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d" +checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" [[package]] name = "js-sys" -version = "0.3.59" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258451ab10b34f8af53416d1fdab72c22e805f0c92a1136d59470ec0b11138b2" +checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" dependencies = [ "wasm-bindgen", ] @@ -1922,9 +2045,12 @@ dependencies = [ [[package]] name = "keccak" -version = "0.1.0" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7" +checksum = "3afef3b6eff9ce9d8ff9b3601125eec7f0c8cbac7abd14f355d053fa56c98768" +dependencies = [ + "cpufeatures", +] [[package]] name = "kernel32-sys" @@ -1947,12 +2073,15 @@ 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.126" +version = "0.2.140" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" +checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" [[package]] name = "libz-sys" @@ -1966,6 +2095,21 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "link-cplusplus" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" +dependencies = [ + "cc", +] + +[[package]] +name = "linux-raw-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" + [[package]] name = "lock_api" version = "0.2.0" @@ -1986,9 +2130,9 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53" +checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" dependencies = [ "autocfg 1.1.0", "scopeguard", @@ -2014,9 +2158,9 @@ dependencies = [ [[package]] name = "matches" -version = "0.1.8" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "maybe-uninit" @@ -2032,9 +2176,9 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memoffset" -version = "0.5.4" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4fc2c02a7e374099d4ee95a193111f72d2110197fe200272371758f6c3643d8" +checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa" dependencies = [ "autocfg 1.1.0", ] @@ -2062,7 +2206,7 @@ version = "1.4.2" source = "git+https://github.com/sigp/milagro_bls?tag=v1.4.2#16655aa033175a90c10ef02aa144e2835de23aec" dependencies = [ "amcl", - "hex 0.4.2", + "hex 0.4.3", "lazy_static", "rand 0.7.3", "zeroize", @@ -2085,18 +2229,18 @@ checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" [[package]] name = "miniz_oxide" -version = "0.5.3" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc" +checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.6.22" +version = "0.6.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fce347092656428bc8eaf6201042cb551b8d67855af7374542a92a0fbfcac430" +checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" dependencies = [ "cfg-if 0.1.10", "fuchsia-zircon", @@ -2107,20 +2251,20 @@ dependencies = [ "log 0.4.17", "miow", "net2", - "slab 0.4.2", + "slab 0.4.8", "winapi 0.2.8", ] [[package]] name = "mio" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf" +checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" dependencies = [ "libc", "log 0.4.17", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] @@ -2131,7 +2275,7 @@ checksum = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0" dependencies = [ "iovec", "libc", - "mio 0.6.22", + "mio 0.6.23", ] [[package]] @@ -2148,9 +2292,9 @@ dependencies = [ [[package]] name = "native-tls" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd7e2f3618557f980e0b17e8856252eee3c97fa12c54dff0ca290fb6266ca4a9" +checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" dependencies = [ "lazy_static", "libc", @@ -2165,12 +2309,14 @@ dependencies = [ ] [[package]] -name = "near-account-id" -version = "0.13.0" +name = "near-abi" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de83d74a9241be8cc4eb3055216966b58bf8c463e8e285c0dc553925acdd19fa" +checksum = "885db39b08518fa700b73fa2214e8adbbfba316ba82dd510f50519173eadaf73" dependencies = [ "borsh", + "schemars", + "semver 1.0.17", "serde", ] @@ -2208,38 +2354,11 @@ dependencies = [ "num-rational", "serde", "serde_json", - "sha2 0.10.2", + "sha2 0.10.6", "smart-default", "tracing", ] -[[package]] -name = "near-crypto" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8ecf0b8b31aa7f4e60f629f72213a2617ca4a5f45cd1ae9ed2cf7cecfebdbb7" -dependencies = [ - "arrayref", - "blake2", - "borsh", - "bs58", - "c2-chacha", - "curve25519-dalek", - "derive_more 0.99.17", - "ed25519-dalek", - "libc", - "near-account-id 0.13.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.14.0" @@ -2293,9 +2412,9 @@ dependencies = [ [[package]] name = "near-jsonrpc-client" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "384356f354bdf85d0ece627c6af6f38febb5406a4ffb32c5d75429b1a1472e29" +checksum = "d1335ffce1476da6516dcd22b26cece1a495fc725c0e8fec1879073752ac068d" dependencies = [ "borsh", "lazy_static", @@ -2344,16 +2463,16 @@ source = "git+https://github.com/aurora-is-near/near-plugins?rev=5579de43c28984d dependencies = [ "darling", "proc-macro-crate 0.1.5", - "proc-macro2 1.0.39", - "quote 1.0.18", - "syn 1.0.96", + "proc-macro2 1.0.52", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] name = "near-primitives" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a2ba19282e79a4485a77736b679d276b09870bbf8042a18e0f0ae36347489c5" +checksum = "8ad1a9a1640539c81f065425c31bffcfbf6b31ef1aeaade59ce905f5df6ac860" dependencies = [ "borsh", "byteorder", @@ -2361,11 +2480,11 @@ dependencies = [ "chrono", "derive_more 0.99.17", "easy-ext", - "hex 0.4.2", - "near-crypto 0.13.0", - "near-primitives-core 0.13.0", - "near-rpc-error-macro 0.13.0", - "near-vm-errors 0.13.0", + "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", @@ -2391,7 +2510,7 @@ dependencies = [ "chrono", "derive_more 0.99.17", "easy-ext", - "hex 0.4.2", + "hex 0.4.3", "near-crypto 0.15.0", "near-primitives-core 0.15.0", "near-rpc-error-macro 0.15.0", @@ -2410,18 +2529,18 @@ dependencies = [ [[package]] name = "near-primitives-core" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb561feb392bb8c4f540256073446e6689af087bf6356e8dddcf75fc279f201f" +checksum = "91d508f0fc340f6461e4e256417685720d3c4c00bb5a939b105160e49137caba" dependencies = [ "base64 0.11.0", "borsh", "bs58", "derive_more 0.99.17", - "near-account-id 0.13.0", + "near-account-id 0.14.0", "num-rational", "serde", - "sha2 0.10.2", + "sha2 0.10.6", "strum", ] @@ -2431,7 +2550,7 @@ version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7929e19d862221949734c4a0063a8f55e7069de3a2ebc2d4f4c13497a5e953cb" dependencies = [ - "base64 0.13.0", + "base64 0.13.1", "borsh", "bs58", "derive_more 0.99.17", @@ -2439,19 +2558,19 @@ dependencies = [ "num-rational", "serde", "serde_repr", - "sha2 0.10.2", + "sha2 0.10.6", "strum", ] [[package]] name = "near-rpc-error-core" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77fdd7ea8d8f786878651c37691515d5053f827ae60894aa40c16882b78f77c9" +checksum = "93ee0b41c75ef859c193a8ff1dadfa0c8207bc0ac447cc22259721ad769a1408" dependencies = [ - "quote 1.0.18", + "quote 1.0.26", "serde", - "syn 1.0.96", + "syn 1.0.109", ] [[package]] @@ -2460,20 +2579,20 @@ version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "36addf90cc04bd547a627b3a292f59d7de4dd6fb5042115419ae901b93ce6c2d" dependencies = [ - "quote 1.0.18", + "quote 1.0.26", "serde", - "syn 1.0.96", + "syn 1.0.109", ] [[package]] name = "near-rpc-error-macro" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e521842b6ae864dfe5391afbbe2df9e9d8427c26e9333b2e0b65cd42094f7607" +checksum = "8e837bd4bacd807073ec5ceb85708da7f721b46a4c2a978de86027fb0034ce31" dependencies = [ - "near-rpc-error-core 0.13.0", + "near-rpc-error-core 0.14.0", "serde", - "syn 1.0.96", + "syn 1.0.109", ] [[package]] @@ -2484,14 +2603,14 @@ checksum = "0b5beb352f3b91d8c491646c2fa4fdbbbf463c7b9c0226951c28f0197de44f99" dependencies = [ "near-rpc-error-core 0.15.0", "serde", - "syn 1.0.96", + "syn 1.0.109", ] [[package]] name = "near-sandbox-utils" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201b7e0c5fcff633fb53e743b16c6aea4110e531764ccaa215ea1382db940b45" +checksum = "a4b2da180a368a12da1949e9940af2457cbce83acb85743b8834b6c9b4111e9f" dependencies = [ "anyhow", "async-process", @@ -2504,19 +2623,22 @@ dependencies = [ [[package]] name = "near-sdk" -version = "4.0.0" +version = "4.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda34e06e28fb9a09ac54efbdc49f0c9308780fc932aaa81c49c493fde974045" +checksum = "15eb3de2defe3626260cc209a6cdb985c6b27b0bd4619fad97dcfae002c3c5bd" dependencies = [ - "base64 0.13.0", + "base64 0.13.1", "borsh", "bs58", - "near-crypto 0.13.0", - "near-primitives 0.13.0", - "near-primitives-core 0.13.0", + "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", @@ -2524,14 +2646,14 @@ dependencies = [ [[package]] name = "near-sdk-macros" -version = "4.0.0" +version = "4.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72064fcc15a623a0d40a6c199ea5cbdc30a83cae4816889d46f218acf31bfba8" +checksum = "4907affc9f5ed559456509188ff0024f1f2099c0830e6bdb66eb61d5b75912c0" dependencies = [ "Inflector", - "proc-macro2 1.0.39", - "quote 1.0.18", - "syn 1.0.96", + "proc-macro2 1.0.52", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -2567,20 +2689,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89ab45d066220846f9bd5c21e9ab88c47c892edd36f962ada78bf8308523171a" dependencies = [ "near-units-core", - "proc-macro2 1.0.39", - "quote 1.0.18", - "syn 1.0.96", + "proc-macro2 1.0.52", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] name = "near-vm-errors" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e02faf2bc1f6ef82b965cfe44389808fb5594f7aca4b596766117f4ce74df20" +checksum = "d0da466a30f0446639cbd788c30865086fac3e8dcb07a79e51d2b0775ed4261e" dependencies = [ "borsh", - "near-account-id 0.13.0", - "near-rpc-error-macro 0.13.0", + "near-account-id 0.14.0", + "near-rpc-error-macro 0.14.0", "serde", ] @@ -2599,30 +2721,31 @@ dependencies = [ [[package]] name = "near-vm-logic" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f024d90451cd3c24d7a0a5cabf3636b192a60eb8e3ff0456f6c18b91152c346d" +checksum = "81b534828419bacbf1f7b11ef7b00420f248c548c485d3f0cfda8bb6931152f2" dependencies = [ - "base64 0.13.0", + "base64 0.13.1", "borsh", "bs58", "byteorder", - "near-account-id 0.13.0", - "near-crypto 0.13.0", - "near-primitives 0.13.0", - "near-primitives-core 0.13.0", - "near-vm-errors 0.13.0", + "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.2", - "sha3", + "sha2 0.10.6", + "sha3 0.10.6", + "zeropool-bn", ] [[package]] name = "net2" -version = "0.2.37" +version = "0.2.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae" +checksum = "74d0df99cfcd2530b2e694f6e17e7f37b8e26bb23983ac530c0c97408837c631" dependencies = [ "cfg-if 0.1.10", "libc", @@ -2637,9 +2760,9 @@ checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" [[package]] name = "num-bigint" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d0a3d5e207573f948a9e5376662aa743a2ea13f7c50a554d7af443a73fbfeba" +checksum = "5f6f7833f2cbf2360a6cfd58cd41a53aa7a90bd4c202f5b1c7dd2ed73c57b2c3" dependencies = [ "autocfg 1.1.0", "num-integer", @@ -2648,19 +2771,19 @@ dependencies = [ [[package]] name = "num-format" -version = "0.4.0" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bafe4179722c2894288ee77a9f044f02811c86af699344c498b0840c698a2465" +checksum = "a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3" dependencies = [ - "arrayvec 0.4.12", - "itoa 0.4.5", + "arrayvec 0.7.2", + "itoa 1.0.6", ] [[package]] name = "num-integer" -version = "0.1.43" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d59457e662d541ba17869cf51cf177c0b5f0cbf476c66bdc90bf1edac4f875b" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" dependencies = [ "autocfg 1.1.0", "num-traits", @@ -2681,18 +2804,18 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.12" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg 1.1.0", ] [[package]] name = "num_cpus" -version = "1.13.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" dependencies = [ "hermit-abi", "libc", @@ -2706,18 +2829,18 @@ checksum = "17b02fc0ff9a9e4b35b3342880f48e896ebf69f2967921fe8646bf5b7125956a" [[package]] name = "object" -version = "0.29.0" +version = "0.30.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" +checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.12.0" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7709cef83f0c1f58f666e746a08b21e0085f7440fa6a29cc194d68aac97a4225" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" [[package]] name = "opaque-debug" @@ -2733,29 +2856,41 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.29" +version = "0.10.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cee6d85f4cb4c4f59a6a85d5b68a233d280c82e29e822913b9c8b129fbf20bdd" +checksum = "b102428fd03bc5edf97f62620f7298614c45cedf287c271e7ed450bbaf83f2e1" dependencies = [ "bitflags 1.3.2", - "cfg-if 0.1.10", + "cfg-if 1.0.0", "foreign-types", - "lazy_static", "libc", + "once_cell", + "openssl-macros", "openssl-sys", ] +[[package]] +name = "openssl-macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" +dependencies = [ + "proc-macro2 1.0.52", + "quote 1.0.26", + "syn 1.0.109", +] + [[package]] name = "openssl-probe" -version = "0.1.2" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.58" +version = "0.9.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a842db4709b604f0fe5d1170ae3565899be2ad3d9cbc72dedc789ac0511f78de" +checksum = "23bbbf7854cd45b83958ebe919f0e8e516793727652e27fda10a8384cfc790b7" dependencies = [ "autocfg 1.1.0", "cc", @@ -2776,11 +2911,11 @@ dependencies = [ [[package]] name = "parity-scale-codec" -version = "1.3.0" +version = "1.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "329c8f7f4244ddb5c37c103641027a76c530e65e8e4b8240b29f81ea40508b17" +checksum = "a4b26b16c7687c3075982af47719e481815df30bc544f7a6690763a25ca16e9d" dependencies = [ - "arrayvec 0.5.1", + "arrayvec 0.5.2", "bitvec 0.17.4", "byte-slice-cast 0.3.5", "serde", @@ -2794,7 +2929,7 @@ checksum = "373b1a4c1338d9cd3d1fa53b3a11bdab5ab6bd80a20f7f7becd76953ae2be909" dependencies = [ "arrayvec 0.7.2", "bitvec 0.20.4", - "byte-slice-cast 1.2.1", + "byte-slice-cast 1.2.2", "impl-trait-for-tuples", "parity-scale-codec-derive", "serde", @@ -2806,10 +2941,10 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1557010476e0595c9b568d16dcfb81b93cdeb157612726f5170d31aa707bed27" dependencies = [ - "proc-macro-crate 1.1.3", - "proc-macro2 1.0.39", - "quote 1.0.18", - "syn 1.0.96", + "proc-macro-crate 1.3.1", + "proc-macro2 1.0.52", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -2818,7 +2953,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fca4f82fccae37e8bbdaeb949a4a218a1bbc485d11598f193d2a908042e5fc1" dependencies = [ - "arrayvec 0.5.1", + "arrayvec 0.5.2", "cc", "cfg-if 0.1.10", "rand 0.7.3", @@ -2848,7 +2983,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252" dependencies = [ "lock_api 0.3.4", - "parking_lot_core 0.6.2", + "parking_lot_core 0.6.3", "rustc_version 0.2.3", ] @@ -2858,8 +2993,8 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ - "lock_api 0.4.7", - "parking_lot_core 0.9.3", + "lock_api 0.4.9", + "parking_lot_core 0.9.7", ] [[package]] @@ -2872,7 +3007,7 @@ dependencies = [ "cloudabi", "libc", "rand 0.6.5", - "redox_syscall 0.1.56", + "redox_syscall 0.1.57", "rustc_version 0.2.3", "smallvec 0.6.14", "winapi 0.3.9", @@ -2880,14 +3015,14 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b" +checksum = "bda66b810a62be75176a80873726630147a5ca780cd33921e0b5709033e66b0a" dependencies = [ "cfg-if 0.1.10", "cloudabi", "libc", - "redox_syscall 0.1.56", + "redox_syscall 0.1.57", "rustc_version 0.2.3", "smallvec 0.6.14", "winapi 0.3.9", @@ -2895,15 +3030,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.3" +version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929" +checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" dependencies = [ "cfg-if 1.0.0", "libc", "redox_syscall 0.2.16", - "smallvec 1.8.0", - "windows-sys", + "smallvec 1.10.0", + "windows-sys 0.45.0", ] [[package]] @@ -2914,28 +3049,28 @@ checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" [[package]] name = "percent-encoding" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" +checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] name = "pin-project" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78203e83c48cffbe01e4a2d35d566ca4de445d79a85372fc64e378bfc812a260" +checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "710faf75e1b33345361201d36d04e98ac1ed8909151a017ed384700836104c74" +checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" dependencies = [ - "proc-macro2 1.0.39", - "quote 1.0.18", - "syn 1.0.96", + "proc-macro2 1.0.52", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -2952,21 +3087,24 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.17" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677" +checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" [[package]] name = "polling" -version = "2.2.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "685404d509889fade3e86fe3a5803bca2ec09b0c0778d5ada6ec8bf7a8de5259" +checksum = "7e1f879b2998099c2d69ab9605d145d5b661195627eccc680002c4918a7fb6fa" dependencies = [ + "autocfg 1.1.0", + "bitflags 1.3.2", "cfg-if 1.0.0", + "concurrent-queue", "libc", "log 0.4.17", - "wepoll-ffi", - "winapi 0.3.9", + "pin-project-lite", + "windows-sys 0.45.0", ] [[package]] @@ -2980,9 +3118,9 @@ dependencies = [ [[package]] name = "ppv-lite86" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "primal" @@ -3046,15 +3184,15 @@ dependencies = [ [[package]] name = "primitive-types" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c55c21c64d0eaa4d7ed885d959ef2d62d9e488c27c0e02d9aa5ce6c877b7d5f8" +checksum = "7dd39dcacf71411ba488570da7bbc89b717225e46478b30ba99b92db6b149809" dependencies = [ "fixed-hash 0.6.1", "impl-codec 0.4.2", "impl-rlp", "impl-serde 0.3.2", - "uint 0.8.3", + "uint 0.8.5", ] [[package]] @@ -3065,7 +3203,7 @@ checksum = "05e4722c697a58a99d5d06a08c30821d7c082a4632198de1eaa5a6c22ef42373" dependencies = [ "fixed-hash 0.7.0", "impl-codec 0.5.1", - "uint 0.9.3", + "uint 0.9.5", ] [[package]] @@ -3079,12 +3217,12 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "1.1.3" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e17d47ce914bf4de440332250b0edd23ce48c005f59fab39d3335866b114f11a" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ - "thiserror", - "toml", + "once_cell", + "toml_edit", ] [[package]] @@ -3098,9 +3236,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.39" +version = "1.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c54b25569025b7fc9651de43004ae593a75ad88543b17178aa5e1b9c4f15f56f" +checksum = "1d0e1ae9e836cc3beddd63db0df682593d7e2d3d891ae8c9083d2113e1744224" dependencies = [ "unicode-ident", ] @@ -3116,11 +3254,11 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.18" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1" +checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" dependencies = [ - "proc-macro2 1.0.39", + "proc-macro2 1.0.52", ] [[package]] @@ -3160,7 +3298,7 @@ version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" dependencies = [ - "autocfg 0.1.7", + "autocfg 0.1.8", "libc", "rand_chacha 0.1.1", "rand_core 0.4.2", @@ -3179,7 +3317,7 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" dependencies = [ - "getrandom 0.1.14", + "getrandom 0.1.16", "libc", "rand_chacha 0.2.2", "rand_core 0.5.1", @@ -3194,7 +3332,7 @@ checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", "rand_chacha 0.3.1", - "rand_core 0.6.3", + "rand_core 0.6.4", ] [[package]] @@ -3203,7 +3341,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" dependencies = [ - "autocfg 0.1.7", + "autocfg 0.1.8", "rand_core 0.3.1", ] @@ -3224,7 +3362,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.3", + "rand_core 0.6.4", ] [[package]] @@ -3248,16 +3386,16 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" dependencies = [ - "getrandom 0.1.14", + "getrandom 0.1.16", ] [[package]] name = "rand_core" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.7", + "getrandom 0.2.8", ] [[package]] @@ -3318,7 +3456,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" dependencies = [ - "autocfg 0.1.7", + "autocfg 0.1.8", "rand_core 0.4.2", ] @@ -3342,9 +3480,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.1.56" +version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" +checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" [[package]] name = "redox_syscall" @@ -3361,8 +3499,8 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d" dependencies = [ - "getrandom 0.1.14", - "redox_syscall 0.1.56", + "getrandom 0.1.16", + "redox_syscall 0.1.57", "rust-argon2", ] @@ -3372,7 +3510,7 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom 0.2.7", + "getrandom 0.2.8", "redox_syscall 0.2.16", "thiserror", ] @@ -3383,14 +3521,14 @@ version = "4.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a415a013dd7c5d4221382329a5a3482566da675737494935cbbbcdec04662f9d" dependencies = [ - "smallvec 1.8.0", + "smallvec 1.10.0", ] [[package]] name = "regex" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" +checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" dependencies = [ "aho-corasick", "memchr", @@ -3399,34 +3537,25 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.27" +version = "0.6.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" - -[[package]] -name = "remove_dir_all" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi 0.3.9", -] +checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" [[package]] name = "reqwest" -version = "0.11.12" +version = "0.11.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "431949c384f4e2ae07605ccaa56d1d9d2ecdb5cadd4f9577ccfab29f2e5149fc" +checksum = "21eed90ec8570952d53b772ecf8f206aa1ec9a3d76b2521c56c42973f2d91ee9" dependencies = [ - "base64 0.13.0", - "bytes 1.2.0", + "base64 0.21.0", + "bytes 1.4.0", "encoding_rs", "futures-core", "futures-util", - "h2 0.3.13", - "http 0.2.8", + "h2 0.3.16", + "http 0.2.9", "http-body 0.4.5", - "hyper 0.14.20", + "hyper 0.14.25", "hyper-tls 0.5.0", "ipnet", "js-sys", @@ -3434,15 +3563,15 @@ dependencies = [ "mime 0.3.16", "native-tls", "once_cell", - "percent-encoding 2.1.0", + "percent-encoding 2.2.0", "pin-project-lite", "serde", "serde_json", "serde_urlencoded", - "tokio 1.20.1", + "tokio 1.26.0", "tokio-native-tls", "tower-service", - "url 2.2.2", + "url 2.3.1", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -3451,18 +3580,18 @@ dependencies = [ [[package]] name = "ripemd" -version = "0.1.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1facec54cb5e0dc08553501fa740091086d0259ad0067e0d4103448e4cb22ed3" +checksum = "bd124222d17ad93a644ed9d011a40f4fb64aa54275c08cc216524a9ea82fb09f" dependencies = [ - "digest 0.10.3", + "digest 0.10.6", ] [[package]] name = "rlp" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a7d3f9bed94764eac15b8f14af59fac420c236adaff743b7bcc88e265cb4345" +checksum = "1190dcc8c3a512f1eef5d09bb8c84c7f39e1054e174d1795482e18f5272f2e73" dependencies = [ "rustc-hex", ] @@ -3473,9 +3602,9 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e33d7b2abe0c340d8797fe2907d3f20d3b5ea5908683618bfe80df7f621f672a" dependencies = [ - "proc-macro2 1.0.39", - "quote 1.0.18", - "syn 1.0.96", + "proc-macro2 1.0.52", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -3484,10 +3613,10 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb" dependencies = [ - "base64 0.13.0", + "base64 0.13.1", "blake2b_simd", "constant_time_eq", - "crossbeam-utils 0.8.11", + "crossbeam-utils 0.8.15", ] [[package]] @@ -3517,20 +3646,34 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.10", + "semver 1.0.17", +] + +[[package]] +name = "rustix" +version = "0.36.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd5c6ff11fecd55b40746d1995a02f2eb375bf8c00d192d521ee09f42bef37bc" +dependencies = [ + "bitflags 1.3.2", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys 0.45.0", ] [[package]] name = "rustversion" -version = "1.0.6" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2cc38e8fa666e2de3c4aba7edeb5ffc5246c1c2ed0e3d17e560aeeba736b23f" +checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" [[package]] name = "ryu" -version = "1.0.5" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" +checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" [[package]] name = "safe_arith" @@ -3545,12 +3688,35 @@ checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" [[package]] name = "schannel" -version = "0.1.19" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" +checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" dependencies = [ - "lazy_static", - "winapi 0.3.9", + "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 1.0.52", + "quote 1.0.26", + "serde_derive_internals", + "syn 1.0.109", ] [[package]] @@ -3565,11 +3731,17 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +[[package]] +name = "scratch" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" + [[package]] name = "secp256k1" -version = "0.24.1" +version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff55dc09d460954e9ef2fa8a7ced735a964be9981fd50e870b2b3b0705e14964" +checksum = "6b1629c9c557ef9b293568b338dddfc8208c98a18c59d722a9d53f859d9c9b62" dependencies = [ "rand 0.8.5", "secp256k1-sys", @@ -3586,9 +3758,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.3.1" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23a2ac85147a3a11d77ecf1bc7166ec0b92febfa4461c37944e180f319ece467" +checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" dependencies = [ "bitflags 1.3.2", "core-foundation", @@ -3599,9 +3771,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.6.1" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" +checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" dependencies = [ "core-foundation-sys", "libc", @@ -3618,9 +3790,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.10" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a41d061efea015927ac527063765e73601444cdc344ba855bc7bd44578b25e1c" +checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" [[package]] name = "semver-parser" @@ -3630,9 +3802,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.147" +version = "1.0.156" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" +checksum = "314b5b092c0ade17c00142951e50ced110ec27cea304b1037c6969246c2469a4" dependencies = [ "serde_derive", ] @@ -3648,35 +3820,46 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.147" +version = "1.0.156" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7e29c4601e36bcec74a223228dce795f4cd3616341a4af93520ca1a837c087d" +dependencies = [ + "proc-macro2 1.0.52", + "quote 1.0.26", + "syn 1.0.109", +] + +[[package]] +name = "serde_derive_internals" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852" +checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c" dependencies = [ - "proc-macro2 1.0.39", - "quote 1.0.18", - "syn 1.0.96", + "proc-macro2 1.0.52", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] name = "serde_json" -version = "1.0.87" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce777b7b150d76b9cf60d28b55f5847135a003f7d7350c6be7a773508ce7d45" +checksum = "1c533a59c9d8a93a09c6ab31f0fd5e5f4dd1b8fc9434804029839884765d04ea" dependencies = [ - "itoa 1.0.2", + "itoa 1.0.6", "ryu", "serde", ] [[package]] name = "serde_repr" -version = "0.1.9" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fe39d9fbb0ebf5eb2c7cb7e2a47e4f462fad1379f1166b8ae49ad9eae89a7ca" +checksum = "395627de918015623b32e7669714206363a7fc00382bf477e72c1f7533e8eafc" dependencies = [ - "proc-macro2 1.0.39", - "quote 1.0.18", - "syn 1.0.96", + "proc-macro2 1.0.52", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -3686,39 +3869,48 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ "form_urlencoded", - "itoa 1.0.2", + "itoa 1.0.6", "ryu", "serde", ] [[package]] name = "sha1" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d" +checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770" +dependencies = [ + "sha1_smol", +] + +[[package]] +name = "sha1_smol" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" [[package]] name = "sha2" -version = "0.9.3" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa827a14b29ab7f44778d14a88d3cb76e949c45083f7dbfa507d0cb699dc12de" +checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" dependencies = [ "block-buffer 0.9.0", "cfg-if 1.0.0", - "cpuid-bool", + "cpufeatures", "digest 0.9.0", "opaque-debug 0.3.0", ] [[package]] name = "sha2" -version = "0.10.2" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55deaec60f81eefe3cce0dc50bda92d6d8e88f2a27df7c5033b42afeb1ed2676" +checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" dependencies = [ "cfg-if 1.0.0", "cpufeatures", - "digest 0.10.3", + "digest 0.10.6", ] [[package]] @@ -3734,11 +3926,21 @@ dependencies = [ "opaque-debug 0.2.3", ] +[[package]] +name = "sha3" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdf0c33fae925bdc080598b84bc15c55e7b9a4a43b3c704da051f977469691c9" +dependencies = [ + "digest 0.10.6", + "keccak", +] + [[package]] name = "signal-hook" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a253b5e89e2698464fc26b545c9edceb338e18a89effeeecfea192c3025be29d" +checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9" dependencies = [ "libc", "signal-hook-registry", @@ -3746,18 +3948,18 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" dependencies = [ "libc", ] [[package]] name = "signature" -version = "1.5.0" +version = "1.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f054c6c1a6e95179d6f23ed974060dcefb2d9388bb7256900badad682c499de4" +checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" [[package]] name = "siphasher" @@ -3773,9 +3975,12 @@ checksum = "17b4fcaed89ab08ef143da37bc52adbcc04d4a69014f4c1208d6b51f0c47bc23" [[package]] name = "slab" -version = "0.4.2" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +dependencies = [ + "autocfg 1.1.0", +] [[package]] name = "smallvec" @@ -3788,9 +3993,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "smart-default" @@ -3798,21 +4003,27 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "133659a15339456eeeb07572eb02a91c91e9815e9cbc89566944d2c8d3efdbf6" dependencies = [ - "proc-macro2 1.0.39", - "quote 1.0.18", - "syn 1.0.96", + "proc-macro2 1.0.52", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] name = "socket2" -version = "0.4.4" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" dependencies = [ "libc", "winapi 0.3.9", ] +[[package]] +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + [[package]] name = "static_assertions" version = "0.2.5" @@ -3851,22 +4062,22 @@ dependencies = [ [[package]] name = "strum_macros" -version = "0.24.1" +version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9550962e7cf70d9980392878dfaf1dcc3ece024f4cf3bf3c46b978d0bad61d6c" +checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" dependencies = [ "heck", - "proc-macro2 1.0.39", - "quote 1.0.18", + "proc-macro2 1.0.52", + "quote 1.0.26", "rustversion", - "syn 1.0.96", + "syn 1.0.109", ] [[package]] name = "subtle" -version = "2.2.3" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "502d53007c02d7605a05df1c1a73ee436952781653da5d0bf57ad608f66932c1" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "syn" @@ -3881,12 +4092,12 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.96" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0748dd251e24453cb8717f0354206b91557e4ec8703673a4b30208f2abaf1ebf" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ - "proc-macro2 1.0.39", - "quote 1.0.18", + "proc-macro2 1.0.52", + "quote 1.0.26", "unicode-ident", ] @@ -3896,10 +4107,10 @@ version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ - "proc-macro2 1.0.39", - "quote 1.0.18", - "syn 1.0.96", - "unicode-xid 0.2.0", + "proc-macro2 1.0.52", + "quote 1.0.26", + "syn 1.0.109", + "unicode-xid 0.2.4", ] [[package]] @@ -3921,64 +4132,54 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.1.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" +checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95" dependencies = [ - "cfg-if 0.1.10", - "libc", - "rand 0.7.3", - "redox_syscall 0.1.56", - "remove_dir_all", - "winapi 0.3.9", -] - -[[package]] -name = "terminal_size" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8038f95fc7a6f351163f4b964af631bd26c9e828f7db085f2a84aca56f70d13b" -dependencies = [ - "libc", - "winapi 0.3.9", + "cfg-if 1.0.0", + "fastrand", + "redox_syscall 0.2.16", + "rustix", + "windows-sys 0.42.0", ] [[package]] -name = "termios" -version = "0.3.2" +name = "termcolor" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0fcee7b24a25675de40d5bb4de6e41b0df07bc9856295e7e2b3a3600c400c2" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" dependencies = [ - "libc", + "winapi-util", ] [[package]] name = "thiserror" -version = "1.0.37" +version = "1.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" +checksum = "a5ab016db510546d856297882807df8da66a16fb8c4101cb8b30054b0d5b2d9c" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.37" +version = "1.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" +checksum = "5420d42e90af0c38c3290abcca25b9b3bdf379fc9f55c528f53a269d9c9a267e" dependencies = [ - "proc-macro2 1.0.39", - "quote 1.0.18", - "syn 1.0.96", + "proc-macro2 1.0.52", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] name = "time" -version = "0.1.43" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" +checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" dependencies = [ "libc", + "wasi 0.10.0+wasi-snapshot-preview1", "winapi 0.3.9", ] @@ -4000,6 +4201,21 @@ 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 = "0.1.22" @@ -4008,7 +4224,7 @@ checksum = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6" dependencies = [ "bytes 0.4.12", "futures", - "mio 0.6.22", + "mio 0.6.23", "num_cpus", "tokio-codec", "tokio-current-thread", @@ -4021,28 +4237,27 @@ dependencies = [ "tokio-threadpool", "tokio-timer 0.2.13", "tokio-udp", - "tokio-uds 0.2.6", + "tokio-uds 0.2.7", ] [[package]] name = "tokio" -version = "1.20.1" +version = "1.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a8325f63a7d4774dd041e363b2409ed1c5cbbd0f867795e661df066b2b0a581" +checksum = "03201d01c3c27a29c8a5cee5b55a93ddae1ccf6f08f65365c2c918f8c1b76f64" dependencies = [ "autocfg 1.1.0", - "bytes 1.2.0", + "bytes 1.4.0", "libc", "memchr", - "mio 0.8.4", + "mio 0.8.6", "num_cpus", - "once_cell", "parking_lot 0.12.1", "pin-project-lite", "signal-hook-registry", "socket2", "tokio-macros", - "winapi 0.3.9", + "windows-sys 0.45.0", ] [[package]] @@ -4069,15 +4284,15 @@ dependencies = [ [[package]] name = "tokio-core" -version = "0.1.17" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aeeffbbb94209023feaef3c196a41cbcdafa06b4a6f893f68779bb5e53796f71" +checksum = "87b1395334443abca552f63d4f61d0486f12377c2ba8b368e523f89e828cffd4" dependencies = [ "bytes 0.4.12", "futures", "iovec", "log 0.4.17", - "mio 0.6.22", + "mio 0.6.23", "scoped-tls", "tokio 0.1.22", "tokio-executor", @@ -4130,23 +4345,23 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "1.8.0" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" +checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" dependencies = [ - "proc-macro2 1.0.39", - "quote 1.0.18", - "syn 1.0.96", + "proc-macro2 1.0.52", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] name = "tokio-native-tls" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" dependencies = [ "native-tls", - "tokio 1.20.1", + "tokio 1.26.0", ] [[package]] @@ -4159,10 +4374,10 @@ dependencies = [ "futures", "lazy_static", "log 0.4.17", - "mio 0.6.22", + "mio 0.6.23", "num_cpus", "parking_lot 0.9.0", - "slab 0.4.2", + "slab 0.4.8", "tokio-executor", "tokio-io", "tokio-sync", @@ -4176,7 +4391,7 @@ checksum = "7f57eb36ecbe0fc510036adff84824dd3c24bb781e21bfa67b69d556aa85214f" dependencies = [ "pin-project", "rand 0.8.5", - "tokio 1.20.1", + "tokio 1.26.0", ] [[package]] @@ -4198,7 +4413,7 @@ dependencies = [ "bytes 0.4.12", "futures", "iovec", - "mio 0.6.22", + "mio 0.6.23", "tokio-io", "tokio-reactor", ] @@ -4216,7 +4431,7 @@ dependencies = [ "lazy_static", "log 0.4.17", "num_cpus", - "slab 0.4.2", + "slab 0.4.8", "tokio-executor", ] @@ -4238,7 +4453,7 @@ checksum = "93044f2d313c95ff1cb7809ce9a7a05735b012288a888b62d4434fd58c94f296" dependencies = [ "crossbeam-utils 0.7.2", "futures", - "slab 0.4.2", + "slab 0.4.8", "tokio-executor", ] @@ -4262,7 +4477,7 @@ dependencies = [ "bytes 0.4.12", "futures", "log 0.4.17", - "mio 0.6.22", + "mio 0.6.23", "tokio-codec", "tokio-io", "tokio-reactor", @@ -4279,7 +4494,7 @@ dependencies = [ "iovec", "libc", "log 0.3.9", - "mio 0.6.22", + "mio 0.6.23", "mio-uds", "tokio-core", "tokio-io", @@ -4287,16 +4502,16 @@ dependencies = [ [[package]] name = "tokio-uds" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5076db410d6fdc6523df7595447629099a1fdc47b3d9f896220780fa48faf798" +checksum = "ab57a4ac4111c8c9dbcf70779f6fc8bc35ae4b2454809febac840ad19bd7e4e0" dependencies = [ "bytes 0.4.12", "futures", "iovec", "libc", "log 0.4.17", - "mio 0.6.22", + "mio 0.6.23", "mio-uds", "tokio-codec", "tokio-io", @@ -4305,27 +4520,44 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.3" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc463cd8deddc3770d20f9852143d50bf6094e640b485cb2e189a2099085ff45" +checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2" dependencies = [ - "bytes 1.2.0", + "bytes 1.4.0", "futures-core", "futures-sink", "pin-project-lite", - "tokio 1.20.1", + "tokio 1.26.0", "tracing", ] [[package]] name = "toml" -version = "0.5.8" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" dependencies = [ "serde", ] +[[package]] +name = "toml_datetime" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" + +[[package]] +name = "toml_edit" +version = "0.19.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08de71aa0d6e348f070457f85af8bd566e2bc452156a423ddf22861b3a953fae" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow", +] + [[package]] name = "tower-service" version = "0.3.2" @@ -4334,9 +4566,9 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.35" +version = "0.1.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a400e31aa60b9d44a52a8ee0343b5b18566b03a8321e0d321f695cf56e940160" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ "cfg-if 1.0.0", "pin-project-lite", @@ -4346,20 +4578,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11c75893af559bc8e10716548bdef5cb2b983f8e637db9d0e15126b61b484ee2" +checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" dependencies = [ - "proc-macro2 1.0.39", - "quote 1.0.18", - "syn 1.0.96", + "proc-macro2 1.0.52", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] name = "tracing-core" -version = "0.1.28" +version = "0.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b7358be39f2f274f322d2aaed611acc57f382e8eb1e5b48cb9ae30933495ce7" +checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" dependencies = [ "once_cell", ] @@ -4377,7 +4609,7 @@ source = "git+https://github.com/aurora-is-near/lighthouse.git?rev=b624c3f0d3c5b dependencies = [ "eth2_hashing", "ethereum-types 0.9.2", - "smallvec 1.8.0", + "smallvec 1.10.0", ] [[package]] @@ -4386,15 +4618,15 @@ version = "0.4.0" source = "git+https://github.com/aurora-is-near/lighthouse.git?rev=b624c3f0d3c5bc9ea46faa14c9cb2d90ee1e1dec#b624c3f0d3c5bc9ea46faa14c9cb2d90ee1e1dec" dependencies = [ "darling", - "quote 1.0.18", - "syn 1.0.96", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] name = "try-lock" -version = "0.2.2" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "typeable" @@ -4404,9 +4636,9 @@ checksum = "1410f6f91f21d1612654e7cc69193b0334f909dcf2c790c4826254fbb86f8887" [[package]] name = "typenum" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "uint" @@ -4422,9 +4654,9 @@ dependencies = [ [[package]] name = "uint" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "173cd16430c206dc1a430af8a89a0e9c076cf15cb42b4aedb10e8cc8fee73681" +checksum = "9db035e67dfaf7edd9aebfe8676afcd63eed53c8a4044fed514c8cccf1835177" dependencies = [ "byteorder", "crunchy", @@ -4434,13 +4666,13 @@ dependencies = [ [[package]] name = "uint" -version = "0.9.3" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12f03af7ccf01dd611cc450a0d10dbc9b745770d096473e2faf0ca6e2d66d1e0" +checksum = "76f64bba2c53b04fcab63c01a7d7427eadc821e3bc48c34dc9ba29c501164b52" dependencies = [ "byteorder", "crunchy", - "hex 0.4.2", + "hex 0.4.3", "static_assertions 1.1.0", ] @@ -4455,33 +4687,30 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.4" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" -dependencies = [ - "matches", -] +checksum = "524b68aca1d05e03fdf03fcdce2c6c94b6daf6d16861ddaa7e4f2b6638a9052c" [[package]] name = "unicode-ident" -version = "1.0.1" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c" +checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" [[package]] name = "unicode-normalization" -version = "0.1.12" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5479532badd04e128284890390c1e876ef7a993d0570b3597ae43dfa1d59afa4" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" dependencies = [ - "smallvec 1.8.0", + "tinyvec", ] [[package]] name = "unicode-width" -version = "0.1.7" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" [[package]] name = "unicode-xid" @@ -4491,9 +4720,9 @@ checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" [[package]] name = "unicode-xid" -version = "0.2.0" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" [[package]] name = "url" @@ -4508,31 +4737,30 @@ dependencies = [ [[package]] name = "url" -version = "2.2.2" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" +checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" dependencies = [ "form_urlencoded", - "idna 0.2.0", - "matches", - "percent-encoding 2.1.0", + "idna 0.3.0", + "percent-encoding 2.2.0", "serde", ] [[package]] name = "uuid" -version = "1.2.1" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feb41e78f93363bb2df8b0e86a2ca30eed7806ea16ea0c790d757cf93f79be83" +checksum = "1674845326ee10d37ca60470760d4288a6f80f304007d92e5c53bab78c9cfd79" dependencies = [ - "getrandom 0.2.7", + "getrandom 0.2.8", ] [[package]] name = "vcpkg" -version = "0.2.10" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6454029bf181f092ad1b853286f23e2c507d8e8194d01d92da4a55c274a5508c" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "version_check" @@ -4542,9 +4770,9 @@ checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" [[package]] name = "version_check" -version = "0.9.2" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "waker-fn" @@ -4579,6 +4807,12 @@ 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" @@ -4587,9 +4821,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.82" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7652e3f6c4706c8d9cd54832c4a4ccb9b5336e2c3bd154d5cccfbf1c1f5f7d" +checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -4597,24 +4831,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.82" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "662cd44805586bd52971b9586b1df85cdbbd9112e4ef4d8f41559c334dc6ac3f" +checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" dependencies = [ "bumpalo", "log 0.4.17", "once_cell", - "proc-macro2 1.0.39", - "quote 1.0.18", - "syn 1.0.96", + "proc-macro2 1.0.52", + "quote 1.0.26", + "syn 1.0.109", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.32" +version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa76fb221a1f8acddf5b54ace85912606980ad661ac7a503b4570ffd3a624dad" +checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -4624,38 +4858,38 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.82" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b260f13d3012071dfb1512849c033b1925038373aea48ced3012c09df952c602" +checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" dependencies = [ - "quote 1.0.18", + "quote 1.0.26", "wasm-bindgen-macro-support", ] [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.82" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be8e654bdd9b79216c2929ab90721aa82faf65c48cdf08bdc4e7f51357b80da" +checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" dependencies = [ - "proc-macro2 1.0.39", - "quote 1.0.18", - "syn 1.0.96", + "proc-macro2 1.0.52", + "quote 1.0.26", + "syn 1.0.109", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.82" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6598dd0bd3c7d51095ff6531a5b23e02acdc81804e30d8f07afb77b7215a140a" +checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" [[package]] name = "web-sys" -version = "0.3.59" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed055ab27f941423197eb86b2035720b1a3ce40504df082cac2ecc6ed73335a1" +checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" dependencies = [ "js-sys", "wasm-bindgen", @@ -4673,7 +4907,7 @@ dependencies = [ "ethabi", "ethereum-types 0.6.0", "futures", - "hyper 0.12.35", + "hyper 0.12.36", "hyper-tls 0.3.2", "jsonrpc-core", "log 0.4.17", @@ -4724,15 +4958,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "wepoll-ffi" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb" -dependencies = [ - "cc", -] - [[package]] name = "winapi" version = "0.2.8" @@ -4778,46 +5003,93 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-sys" -version = "0.36.1" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" dependencies = [ + "windows_aarch64_gnullvm", "windows_aarch64_msvc", "windows_i686_gnu", "windows_i686_msvc", "windows_x86_64_gnu", + "windows_x86_64_gnullvm", "windows_x86_64_msvc", ] +[[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_msvc" -version = "0.36.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_i686_gnu" -version = "0.36.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_msvc" -version = "0.36.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_x86_64_gnu" -version = "0.36.1" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_msvc" -version = "0.36.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "winnow" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee7b2c67f962bf5042bfd8b6a916178df33a26eec343ae064cb8e069f638fa6f" +dependencies = [ + "memchr", +] [[package]] name = "winreg" @@ -4830,18 +5102,18 @@ dependencies = [ [[package]] name = "workspaces" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc74416d48b2deb83004a0fff9d856e46a026c156da4acc4feca044a0a33755" +checksum = "1f54d9286e6dc20dd6d7676de27ace7b0d4f755164fe14c1f07bcbdd08d54052" dependencies = [ "async-process", "async-trait", - "base64 0.13.0", + "base64 0.13.1", "borsh", "bs58", "chrono", "dirs 3.0.2", - "hex 0.4.2", + "hex 0.4.3", "libc", "near-account-id 0.15.0", "near-crypto 0.15.0", @@ -4855,10 +5127,10 @@ dependencies = [ "serde", "serde_json", "thiserror", - "tokio 1.20.1", + "tokio 1.26.0", "tokio-retry", "tracing", - "url 2.2.2", + "url 2.3.1", ] [[package]] @@ -4879,9 +5151,9 @@ checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" [[package]] name = "wyz" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b31594f29d27036c383b53b59ed3476874d518f0efb151b27a4c275141390e" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" dependencies = [ "tap", ] @@ -4897,25 +5169,39 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.5.6" +version = "1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20b578acffd8516a6c3f2a1bdefc1ec37e547bb4e0fb8b6b01a4cafc886b4442" +checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f" dependencies = [ "zeroize_derive", ] [[package]] name = "zeroize_derive" -version = "1.3.2" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f8f187641dad4f680d25c4bfc4225b418165984179f26ca76ec4fb6441d3a17" +checksum = "44bf07cb3e50ea2003396695d58bf46bc9887a1f362260446fad6bc4e79bd36c" dependencies = [ - "proc-macro2 1.0.39", - "quote 1.0.18", - "syn 1.0.96", + "proc-macro2 1.0.52", + "quote 1.0.26", + "syn 1.0.109", "synstructure", ] +[[package]] +name = "zeropool-bn" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71e61de68ede9ffdd69c01664f65a178c5188b73f78faa21f0936016a888ff7c" +dependencies = [ + "borsh", + "byteorder", + "crunchy", + "lazy_static", + "rand 0.8.5", + "rustc-hex", +] + [[package]] name = "zip" version = "0.5.13" diff --git a/contracts/near/eth-client/.catalog-info.yaml b/contracts/near/eth-client/.catalog-info.yaml index 860d853cd..c718efb16 100644 --- a/contracts/near/eth-client/.catalog-info.yaml +++ b/contracts/near/eth-client/.catalog-info.yaml @@ -17,5 +17,6 @@ spec: system: bridge-protocol deployedAt: - contract:near/mainnet/client.bridge.near + - contract:near/mainnet/client-eth2.bridge.near interactsWith: - relayer:near/mainnet/relayer.bridge.near diff --git a/contracts/near/eth-client/src/tests.rs b/contracts/near/eth-client/src/tests.rs index 799ee17c6..97ffb62b7 100644 --- a/contracts/near/eth-client/src/tests.rs +++ b/contracts/near/eth-client/src/tests.rs @@ -156,7 +156,11 @@ use near_sdk::{testing_env, VMContext}; lazy_static! { static ref WEB3RS: web3::Web3 = { let (eloop, transport) = web3::transports::Http::new( - "https://mainnet.infura.io/v3/b5f870422ee5454fb11937e947154cd2", + format!( + "https://mainnet.infura.io/v3/{}", + std::env::var("ETH1_INFURA_API_KEY").unwrap() + ) + .as_str(), ) .unwrap(); eloop.into_remote(); diff --git a/contracts/near/eth-prover/src/tests.rs b/contracts/near/eth-prover/src/tests.rs index 1dae593aa..8d9cccbb3 100644 --- a/contracts/near/eth-prover/src/tests.rs +++ b/contracts/near/eth-prover/src/tests.rs @@ -36,8 +36,10 @@ mod tests { VMContext { current_account_id: "alice.near".parse().unwrap(), signer_account_id: "bob.near".parse().unwrap(), - signer_account_pk: vec![0u8; 33].try_into().unwrap(), - predecessor_account_id: "alice.near".parse().unwrap(), + signer_account_pk: "ed25519:6E8sCci9badyRkXb3JoRpBj5p8C6Tw41ELDZoiihKEtp" + .parse() + .unwrap(), + predecessor_account_id: "carol.near".parse().unwrap(), input, block_index: 0, block_timestamp: 0, @@ -398,7 +400,7 @@ mod tests { let mut vm_config = VMConfig::free(); vm_config.limit_config.max_number_logs = u64::MAX; vm_config.limit_config.max_promises_per_function_call_action = u64::MAX; - testing_env!(get_context(vec![], false), vm_config, Default::default()); + testing_env!(get_context(vec![]), vm_config, Default::default()); let contract = EthProver::init("ethbridge".to_string()); let mut proofs = fs::read_dir(env::var("ETH_PROOF_DIR").unwrap()) @@ -458,12 +460,9 @@ mod tests { bar.finish(); } - use near_sdk::VMConfig; - #[test] pub fn test_verify_proof() { - let vm_config = VMConfig::free(); - testing_env!(get_context(vec![]), vm_config); + testing_env!(get_context(vec![])); let expected_value = "f902a60183af4adfb9010000000000000000000000000000000000000000000000000000000000000000000800010000000000000002000100000000000000000000000000000000000000000000000000000008000008000000000000000000000200000000000000000000000000000000000000000000000000000000000000010000000010000000040000000000000000000000000000000200000000010000000000000000000000000000000000200080000000202000000000000000000000000000004000000000000002000000000000000000000000000000000000080000000000000000000000000000000000000000000200000004000000000000000000000000000000f9019bf89b94a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48f863a0ddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3efa0000000000000000000000000c22df065a81f6e0107e214991b9d7fb179d401b3a000000000000000000000000023ddd3e3692d1861ed57ede224608875809e127fa00000000000000000000000000000000000000000000000000000000005f5e100f8fc9423ddd3e3692d1861ed57ede224608875809e127ff863a0dd85dc56b5b4da387bf69c28ec19b1d66e793e0d51b567882fa31dc50bbd32c5a0000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48a0000000000000000000000000c22df065a81f6e0107e214991b9d7fb179d401b3b8800000000000000000000000000000000000000000000000000000000005f5e1000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000a6d616b6b652e6e65617200000000000000000000000000000000000000000000"; let expected_root = "73733f420161b4189ea48140489bfada55d485fd580ab7e6f0f4b6de229f5177"; diff --git a/contracts/near/eth-prover/test.sh b/contracts/near/eth-prover/test.sh index 540b28c13..dfe4fbc38 100755 --- a/contracts/near/eth-prover/test.sh +++ b/contracts/near/eth-prover/test.sh @@ -1,4 +1,4 @@ #!/usr/bin/env bash -cargo test --no-default-features --jobs 8 --package eth-prover -cargo test --jobs 8 --package eth-prover \ No newline at end of file +RUST_BACKTRACE=1 cargo test --no-default-features --jobs 8 --package eth-prover -- --nocapture +RUST_BACKTRACE=1 cargo test --jobs 8 --package eth-prover -- --nocapture diff --git a/contracts/near/eth-prover/tests/spec.rs b/contracts/near/eth-prover/tests_ignore/spec.rs similarity index 100% rename from contracts/near/eth-prover/tests/spec.rs rename to contracts/near/eth-prover/tests_ignore/spec.rs diff --git a/contracts/near/eth-prover/tests/utils.rs b/contracts/near/eth-prover/tests_ignore/utils.rs similarity index 100% rename from contracts/near/eth-prover/tests/utils.rs rename to contracts/near/eth-prover/tests_ignore/utils.rs diff --git a/contracts/near/eth2-client/test.sh b/contracts/near/eth2-client/test.sh index 6565d4d67..092e6a5d7 100755 --- a/contracts/near/eth2-client/test.sh +++ b/contracts/near/eth2-client/test.sh @@ -1,5 +1,6 @@ #!/usr/bin/env bash +rustup target add wasm32-unknown-unknown cargo build --target wasm32-unknown-unknown --release --no-default-features --features logs RUST_BACKTRACE=1 cargo test --jobs 8 --package eth2-client -- --nocapture diff --git a/eth2near/eth2-contract-init/src/config.rs b/eth2near/eth2-contract-init/src/config.rs index 7e1ff3150..0dc82674c 100644 --- a/eth2near/eth2-contract-init/src/config.rs +++ b/eth2near/eth2-contract-init/src/config.rs @@ -1,6 +1,7 @@ use contract_wrapper::eth_network::EthNetwork; use contract_wrapper::near_network::NearNetwork; use contract_wrapper::near_rpc_client::NearRPCClient; +use eth_rpc_client::beacon_rpc_client; use reqwest::Url; use serde::Deserialize; use std::io::Read; @@ -51,6 +52,9 @@ pub struct Config { /// The trusted block root for checkpoint for contract initialization /// e.g.: 0x9cd0c5a8392d0659426b12384e8440c147510ab93eeaeccb08435a462d7bb1c7 pub init_block_root: Option, + + // Beacon rpc version (V1_1, V1_2) + pub beacon_rpc_version: beacon_rpc_client::BeaconRPCVersion, } impl Config { diff --git a/eth2near/eth2-contract-init/src/init_contract.rs b/eth2near/eth2-contract-init/src/init_contract.rs index 6b8d92b91..4aba0ca48 100644 --- a/eth2near/eth2-contract-init/src/init_contract.rs +++ b/eth2near/eth2-contract-init/src/init_contract.rs @@ -55,6 +55,7 @@ pub fn init_contract( &config.beacon_endpoint, config.eth_requests_timeout_seconds.unwrap_or(10), config.eth_requests_timeout_seconds.unwrap_or(10), + Some(config.beacon_rpc_version.clone()), ); let eth1_rpc_client = Eth1RPCClient::new(&config.eth1_endpoint); @@ -148,7 +149,7 @@ mod tests { use contract_wrapper::eth_client_contract_trait::EthClientContractTrait; use crate::init_contract::init_contract; use contract_wrapper::near_network::NearNetwork; - use eth_rpc_client::beacon_rpc_client::BeaconRPCClient; + use eth_rpc_client::beacon_rpc_client::{BeaconRPCClient, BeaconRPCVersion}; use crate::config_for_tests::ConfigForTests; const ONE_EPOCH_IN_SLOTS: u64 = 32; @@ -184,6 +185,7 @@ mod tests { max_submitted_blocks_by_account: Some(8000), trusted_signer_account_id: Some(eth_client_contract.get_signer_account_id().to_string()), init_block_root: None, + beacon_rpc_version: BeaconRPCVersion::V1_1, } } @@ -240,6 +242,7 @@ mod tests { &init_config.beacon_endpoint, init_config.eth_requests_timeout_seconds.unwrap_or(10), init_config.eth_requests_timeout_seconds.unwrap_or(10), + None, ); let last_finalized_slot_eth_network = beacon_rpc_client diff --git a/eth2near/eth2near-block-relay-rs/Cargo.toml b/eth2near/eth2near-block-relay-rs/Cargo.toml index 3fa35d8f1..db607ea2d 100644 --- a/eth2near/eth2near-block-relay-rs/Cargo.toml +++ b/eth2near/eth2near-block-relay-rs/Cargo.toml @@ -48,4 +48,4 @@ thread = "*" [dev-dependencies] workspaces = "0.5.0" -eth2-contract-init = { path = "../eth2-contract-init" } \ No newline at end of file +eth2-contract-init = { path = "../eth2-contract-init" } diff --git a/eth2near/eth2near-block-relay-rs/src/config.rs b/eth2near/eth2near-block-relay-rs/src/config.rs index 96fc43516..6a946ed7d 100644 --- a/eth2near/eth2near-block-relay-rs/src/config.rs +++ b/eth2near/eth2near-block-relay-rs/src/config.rs @@ -1,4 +1,5 @@ use crate::contract_type::ContractType; +use eth_rpc_client::beacon_rpc_client::BeaconRPCVersion; use contract_wrapper::eth_network::EthNetwork; use contract_wrapper::near_rpc_client::NearRPCClient; use contract_wrapper::near_network::NearNetwork; @@ -82,6 +83,9 @@ pub struct Config { /// Max number of unfinalized blocks allowed to be stored by one submitter account. /// It is used on initialization of the Eth2 client. pub max_submitted_blocks_by_account: Option, + + // Beacon rpc version (V1_1, V1_2) + pub beacon_rpc_version: BeaconRPCVersion, } impl Config { diff --git a/eth2near/eth2near-block-relay-rs/src/contract_type.rs b/eth2near/eth2near-block-relay-rs/src/contract_type.rs index 443df6922..4533029d3 100644 --- a/eth2near/eth2near-block-relay-rs/src/contract_type.rs +++ b/eth2near/eth2near-block-relay-rs/src/contract_type.rs @@ -1,8 +1,8 @@ +use serde::Deserialize; use std::error::Error; use std::fmt; use std::fmt::{Display, Formatter}; use std::str::FromStr; -use serde::Deserialize; #[derive(Debug, Clone, Deserialize)] pub enum ContractType { @@ -34,8 +34,8 @@ impl Display for ContractType { impl ContractType { pub fn as_str(&self) -> &str { match self { - ContractType::Near => "NEAR", - ContractType::Dao => "DAO", + ContractType::Near => "Near", + ContractType::Dao => "Dao", ContractType::File => "File", } } diff --git a/eth2near/eth2near-block-relay-rs/src/eth2near_relay.rs b/eth2near/eth2near-block-relay-rs/src/eth2near_relay.rs index db6d177e7..d6cc444c0 100644 --- a/eth2near/eth2near-block-relay-rs/src/eth2near_relay.rs +++ b/eth2near/eth2near-block-relay-rs/src/eth2near_relay.rs @@ -1,10 +1,5 @@ -use std::cmp; -use eth_rpc_client::beacon_rpc_client::BeaconRPCClient; use crate::config::Config; -use eth_rpc_client::eth1_rpc_client::Eth1RPCClient; -use eth_rpc_client::hand_made_finality_light_client_update::HandMadeFinalityLightClientUpdate; use crate::last_slot_searcher::LastSlotSearcher; -use contract_wrapper::near_rpc_client::NearRPCClient; use crate::prometheus_metrics; use crate::prometheus_metrics::{ CHAIN_EXECUTION_BLOCK_HEIGHT_ON_ETH, CHAIN_EXECUTION_BLOCK_HEIGHT_ON_NEAR, @@ -12,18 +7,23 @@ use crate::prometheus_metrics::{ FAILS_ON_HEADERS_SUBMISSION, FAILS_ON_UPDATES_SUBMISSION, LAST_ETH_SLOT, LAST_ETH_SLOT_ON_NEAR, LAST_FINALIZED_ETH_SLOT, LAST_FINALIZED_ETH_SLOT_ON_NEAR, }; -use eth_rpc_client::errors::NoBlockForSlotError; +use bitvec::macros::internal::funty::Fundamental; use contract_wrapper::eth_client_contract_trait::EthClientContractTrait; +use contract_wrapper::near_rpc_client::NearRPCClient; +use eth_rpc_client::beacon_rpc_client::BeaconRPCClient; +use eth_rpc_client::errors::NoBlockForSlotError; +use eth_rpc_client::eth1_rpc_client::Eth1RPCClient; +use eth_rpc_client::hand_made_finality_light_client_update::HandMadeFinalityLightClientUpdate; use eth_types::eth2::LightClientUpdate; use eth_types::BlockHeader; use log::{debug, info, trace, warn}; use near_primitives::views::FinalExecutionStatus; +use std::cmp; use std::error::Error; use std::thread; use std::thread::sleep; use std::time::Duration; use std::vec::Vec; -use bitvec::macros::internal::funty::Fundamental; use types::Slot; const ONE_EPOCH_IN_SLOTS: u64 = 32; @@ -112,9 +112,11 @@ impl Eth2NearRelay { &config.beacon_endpoint, config.eth_requests_timeout_seconds, config.state_requests_timeout_seconds, + Some(config.beacon_rpc_version.clone()), ); let next_light_client_update = - Self::get_light_client_update_from_file(config, &beacon_rpc_client).expect("Error on parsing light client update"); + Self::get_light_client_update_from_file(config, &beacon_rpc_client) + .expect("Error on parsing light client update"); let max_submitted_blocks_by_account = eth_contract .get_max_submitted_blocks_by_account() @@ -715,12 +717,12 @@ impl Eth2NearRelay { #[cfg(test)] mod tests { - use eth_rpc_client::beacon_rpc_client::BeaconRPCClient; use crate::config_for_tests::ConfigForTests; use crate::eth2near_relay::{Eth2NearRelay, ONE_EPOCH_IN_SLOTS}; - use eth_rpc_client::hand_made_finality_light_client_update::HandMadeFinalityLightClientUpdate; - use eth_rpc_client::errors::NoBlockForSlotError; use crate::test_utils::{get_relay, get_relay_from_slot, get_relay_with_update_from_file}; + use eth_rpc_client::beacon_rpc_client::BeaconRPCClient; + use eth_rpc_client::errors::NoBlockForSlotError; + use eth_rpc_client::hand_made_finality_light_client_update::HandMadeFinalityLightClientUpdate; use eth_types::eth2::LightClientUpdate; use eth_types::BlockHeader; use std::thread::sleep; @@ -1010,6 +1012,7 @@ mod tests { "http://httpstat.us/504/", TIMEOUT_SECONDS, TIMEOUT_STATE_SECONDS, + None, ); if let Err(err) = relay.get_execution_block_by_slot(config_for_test.slot_without_block) { if err.downcast_ref::().is_some() { @@ -1191,6 +1194,7 @@ mod tests { "http://httpstat.us/504/", TIMEOUT_SECONDS, TIMEOUT_STATE_SECONDS, + None, ); relay diff --git a/eth2near/eth2near-block-relay-rs/src/last_slot_searcher.rs b/eth2near/eth2near-block-relay-rs/src/last_slot_searcher.rs index 71d09947c..e59095c64 100644 --- a/eth2near/eth2near-block-relay-rs/src/last_slot_searcher.rs +++ b/eth2near/eth2near-block-relay-rs/src/last_slot_searcher.rs @@ -471,6 +471,7 @@ mod tests { &config_for_test.beacon_endpoint, TIMEOUT_SECONDS, TIMEOUT_STATE_SECONDS, + None, ); let eth1_rpc_client = Eth1RPCClient::new(&config_for_test.eth1_endpoint); let last_slot_searcher = LastSlotSearcher::new(true); @@ -527,6 +528,7 @@ mod tests { &config_for_test.beacon_endpoint, TIMEOUT_SECONDS, TIMEOUT_STATE_SECONDS, + None, ); let eth1_rpc_client = Eth1RPCClient::new(&config_for_test.eth1_endpoint); let last_slot_searcher = LastSlotSearcher::new(true); @@ -603,6 +605,7 @@ mod tests { &config_for_test.beacon_endpoint, TIMEOUT_SECONDS, TIMEOUT_STATE_SECONDS, + None, ); let eth1_rpc_client = Eth1RPCClient::new(&config_for_test.eth1_endpoint); let last_slot_searcher = LastSlotSearcher::new(true); @@ -656,6 +659,7 @@ mod tests { &config_for_test.beacon_endpoint, TIMEOUT_SECONDS, TIMEOUT_STATE_SECONDS, + None, ); let eth1_rpc_client = Eth1RPCClient::new(&config_for_test.eth1_endpoint); let last_slot_searcher = LastSlotSearcher::new(true); @@ -719,6 +723,7 @@ mod tests { &config_for_test.beacon_endpoint, TIMEOUT_SECONDS, TIMEOUT_STATE_SECONDS, + None, ); let eth1_rpc_client = Eth1RPCClient::new(&config_for_test.eth1_endpoint); let last_slot_searcher = LastSlotSearcher::new(true); @@ -794,6 +799,7 @@ mod tests { &config_for_test.beacon_endpoint, TIMEOUT_SECONDS, TIMEOUT_STATE_SECONDS, + None, ); let eth1_rpc_client = Eth1RPCClient::new(&config_for_test.eth1_endpoint); let last_slot_searcher = LastSlotSearcher::new(true); @@ -814,6 +820,7 @@ mod tests { "http://httpstat.us/504/", TIMEOUT_SECONDS, TIMEOUT_STATE_SECONDS, + None, ); last_slot_searcher .linear_slot_search( @@ -835,6 +842,7 @@ mod tests { &config_for_test.beacon_endpoint, TIMEOUT_SECONDS, TIMEOUT_STATE_SECONDS, + None, ); let eth1_rpc_client = Eth1RPCClient::new(&config_for_test.eth1_endpoint); let last_slot_searcher = LastSlotSearcher::new(true); @@ -911,6 +919,7 @@ mod tests { "http://httpstat.us/504/", TIMEOUT_SECONDS, TIMEOUT_STATE_SECONDS, + None, ); if last_slot_searcher .binsearch_slot_range( @@ -937,6 +946,7 @@ mod tests { &config_for_test.beacon_endpoint, TIMEOUT_SECONDS, TIMEOUT_STATE_SECONDS, + None, ); let eth1_rpc_client = Eth1RPCClient::new(&config_for_test.eth1_endpoint); let last_slot_searcher = LastSlotSearcher::new(true); @@ -1014,6 +1024,7 @@ mod tests { "http://httpstat.us/504/", TIMEOUT_SECONDS, TIMEOUT_STATE_SECONDS, + None, ); if last_slot_searcher .binsearch_slot_forward( @@ -1040,6 +1051,7 @@ mod tests { &config_for_test.beacon_endpoint, TIMEOUT_SECONDS, TIMEOUT_STATE_SECONDS, + None, ); let eth1_rpc_client = Eth1RPCClient::new(&config_for_test.eth1_endpoint); let last_slot_searcher = LastSlotSearcher::new(true); @@ -1127,6 +1139,7 @@ mod tests { "http://httpstat.us/504/", TIMEOUT_SECONDS, TIMEOUT_STATE_SECONDS, + None, ); if last_slot_searcher .binary_slot_search( @@ -1151,6 +1164,7 @@ mod tests { &config_for_test.beacon_endpoint, TIMEOUT_SECONDS, TIMEOUT_STATE_SECONDS, + None, ); let eth1_rpc_client = Eth1RPCClient::new(&config_for_test.eth1_endpoint); let mut last_slot_searcher = LastSlotSearcher::new(true); @@ -1196,6 +1210,7 @@ mod tests { "http://httpstat.us/504/", TIMEOUT_SECONDS, TIMEOUT_STATE_SECONDS, + None, ); if last_slot_searcher .get_last_slot( @@ -1218,6 +1233,7 @@ mod tests { &config_for_test.beacon_endpoint, TIMEOUT_SECONDS, TIMEOUT_STATE_SECONDS, + None, ); let eth1_rpc_client = Eth1RPCClient::new(&config_for_test.eth1_endpoint); let mut last_slot_searcher = LastSlotSearcher::new(true); @@ -1264,6 +1280,7 @@ mod tests { "http://httpstat.us/504/", TIMEOUT_SECONDS, TIMEOUT_STATE_SECONDS, + None, ); if last_slot_searcher .get_last_slot( diff --git a/eth2near/eth2near-block-relay-rs/src/main.rs b/eth2near/eth2near-block-relay-rs/src/main.rs index 0b3b85cf0..f7ec8f42b 100644 --- a/eth2near/eth2near-block-relay-rs/src/main.rs +++ b/eth2near/eth2near-block-relay-rs/src/main.rs @@ -6,6 +6,7 @@ use contract_wrapper::{ dao_contract, dao_eth_client_contract, eth_client_contract, file_eth_client_contract, }; use eth2_to_near_relay::config::Config; +use eth2_to_near_relay::contract_type::ContractType; use eth2_to_near_relay::eth2near_relay::Eth2NearRelay; use eth2near_logger::SimpleLogger; use log::LevelFilter; @@ -47,7 +48,8 @@ fn get_dao_contract_wrapper(config: &Config) -> Box { &config.near_endpoint, &config.signer_account_id, &config.path_to_signer_secret_key, - &dao_contract_account_id.expect("No DAO contract account ID provided for relay running in DAO mode"), + &dao_contract_account_id + .expect("No DAO contract account ID provided for relay running in DAO mode"), )) } @@ -55,21 +57,24 @@ fn get_eth_client_contract(config: &Config) -> Box { let eth_contract_wrapper = get_eth_contract_wrapper(config); let eth_client = eth_client_contract::EthClientContract::new(eth_contract_wrapper); - match config.contract_type.as_str() { - "dao" => Box::new(dao_eth_client_contract::DaoEthClientContract::new( + match config.contract_type { + ContractType::Dao => Box::new(dao_eth_client_contract::DaoEthClientContract::new( eth_client, dao_contract::DAOContract::new(get_dao_contract_wrapper(config)), )), - "file" => Box::new(file_eth_client_contract::FileEthClientContract::new( + ContractType::File => Box::new(file_eth_client_contract::FileEthClientContract::new( eth_client, - config.output_dir.clone().expect("No output dir provided for relay running in FILE mode"), + config + .output_dir + .clone() + .expect("No output dir provided for relay running in FILE mode"), )), - _ => Box::new(eth_client), + ContractType::Near => Box::new(eth_client), } } fn init_log(args: &Arguments, config: &Config) { - let log_level_filter = match args.log_level.as_str() { + let log_level_filter = match args.log_level.to_lowercase().as_str() { "trace" => LevelFilter::Trace, "debug" => LevelFilter::Debug, "warn" => LevelFilter::Warn, @@ -90,7 +95,12 @@ fn init_log(args: &Arguments, config: &Config) { fn main() -> Result<(), Box> { let args = Arguments::parse(); - let config = Config::load_from_toml(args.config.clone().try_into().expect("Error on config parsing")); + let config = Config::load_from_toml( + args.config + .clone() + .try_into() + .expect("Error on config parsing"), + ); init_log(&args, &config); let mut eth2near_relay = Eth2NearRelay::init( diff --git a/eth2near/eth2near-block-relay-rs/src/test_utils.rs b/eth2near/eth2near-block-relay-rs/src/test_utils.rs index 5488afcd7..0835b7733 100644 --- a/eth2near/eth2near-block-relay-rs/src/test_utils.rs +++ b/eth2near/eth2near-block-relay-rs/src/test_utils.rs @@ -1,4 +1,4 @@ -use eth_rpc_client::beacon_rpc_client::BeaconRPCClient; +use eth_rpc_client::beacon_rpc_client::{BeaconRPCClient, BeaconRPCVersion}; use crate::config::Config; use crate::config_for_tests::ConfigForTests; use eth_rpc_client::eth1_rpc_client::Eth1RPCClient; @@ -108,7 +108,7 @@ pub fn init_contract_from_specific_slot( .unwrap(); let beacon_rpc_client = - BeaconRPCClient::new(&config_for_test.beacon_endpoint, TIMEOUT, TIMEOUT_STATE); + BeaconRPCClient::new(&config_for_test.beacon_endpoint, TIMEOUT, TIMEOUT_STATE, None); let eth1_rpc_client = Eth1RPCClient::new(&config_for_test.eth1_endpoint); let finality_header = beacon_rpc_client @@ -203,6 +203,7 @@ fn get_config(config_for_test: &ConfigForTests) -> Config { sleep_time_after_submission_secs: 5, hashes_gc_threshold: None, max_submitted_blocks_by_account: None, + beacon_rpc_version: BeaconRPCVersion::V1_1, } } @@ -227,6 +228,7 @@ fn get_init_config( max_submitted_blocks_by_account: Some(8000), trusted_signer_account_id: Some(eth_client_contract.get_signer_account_id().to_string()), init_block_root: None, + beacon_rpc_version: BeaconRPCVersion::V1_1, } } diff --git a/eth2near/eth_rpc_client/src/beacon_rpc_client.rs b/eth2near/eth_rpc_client/src/beacon_rpc_client.rs index 0611baa01..537a73704 100644 --- a/eth2near/eth_rpc_client/src/beacon_rpc_client.rs +++ b/eth2near/eth_rpc_client/src/beacon_rpc_client.rs @@ -1,7 +1,10 @@ +use crate::errors::{ + ErrorOnJsonParse, ExecutionPayloadError, FailOnGettingJson, MissSyncAggregationError, + NoBlockForSlotError, SignatureSlotNotFoundError, +}; use crate::execution_block_proof::ExecutionBlockProof; -use crate::errors::{ErrorOnJsonParse, ExecutionPayloadError, FailOnGettingJson, MissSyncAggregationError, NoBlockForSlotError, SignatureSlotNotFoundError}; -use crate::utils; use crate::light_client_snapshot_with_proof::LightClientSnapshotWithProof; +use crate::utils; use eth_types::eth2::BeaconBlockHeader; use eth_types::eth2::FinalizedHeaderUpdate; use eth_types::eth2::HeaderUpdate; @@ -13,6 +16,7 @@ use eth_types::eth2::SyncCommitteeUpdate; use eth_types::H256; use log::trace; use reqwest::blocking::Client; +use serde::Deserialize; use serde_json::{json, Value}; use std::error::Error; use std::string::String; @@ -20,6 +24,46 @@ use std::time::Duration; use types::MainnetEthSpec; use types::{BeaconBlockBody, BeaconState}; +#[derive(Debug, Clone, Deserialize)] +pub enum BeaconRPCVersion { + V1_1, + V1_2, +} + +struct BeaconRPCRoutes { + pub get_block_header: String, + pub get_block: String, + pub get_light_client_update: String, + pub get_light_client_finality_update: String, + pub get_bootstrap: String, + pub get_state: String, +} + +impl BeaconRPCRoutes { + pub fn new(version: BeaconRPCVersion) -> Self { + match version { + BeaconRPCVersion::V1_1 => Self { + get_block_header: "eth/v1/beacon/headers".to_string(), + get_block: "eth/v2/beacon/blocks".to_string(), + get_light_client_update: "eth/v1/beacon/light_client/updates".to_string(), + get_light_client_finality_update: "eth/v1/beacon/light_client/finality_update/" + .to_string(), + get_bootstrap: "eth/v1/beacon/light_client/bootstrap".to_string(), + get_state: "eth/v2/debug/beacon/states".to_string(), + }, + BeaconRPCVersion::V1_2 => Self { + get_block_header: "eth/v1/beacon/headers".to_string(), + get_block: "eth/v2/beacon/blocks".to_string(), + get_light_client_update: "eth/v1/beacon/light_client/updates".to_string(), + get_light_client_finality_update: "eth/v1/beacon/light_client/finality_update" + .to_string(), + get_bootstrap: "eth/v1/beacon/light_client/bootstrap".to_string(), + get_state: "eth/v2/debug/beacon/states".to_string(), + }, + } + } +} + /// `BeaconRPCClient` allows getting beacon block body, beacon block header /// and light client updates /// using Beacon RPC API (https://ethereum.github.io/beacon-APIs/) @@ -27,22 +71,20 @@ pub struct BeaconRPCClient { endpoint_url: String, client: Client, client_state_request: Client, + routes: BeaconRPCRoutes, } impl BeaconRPCClient { - const URL_HEADER_PATH: &'static str = "eth/v1/beacon/headers"; - const URL_BODY_PATH: &'static str = "eth/v2/beacon/blocks"; - const URL_GET_LIGHT_CLIENT_UPDATE_API: &'static str = "eth/v1/beacon/light_client/updates"; - const URL_FINALITY_LIGHT_CLIENT_UPDATE_PATH: &'static str = - "eth/v1/beacon/light_client/finality_update/"; - const URL_GET_BOOTSTRAP: &'static str = "eth/v1/beacon/light_client/bootstrap"; - const URL_STATE_PATH: &'static str = "eth/v2/debug/beacon/states"; - const SLOTS_PER_EPOCH: u64 = 32; const EPOCHS_PER_PERIOD: u64 = 256; /// Creates `BeaconRPCClient` for the given BeaconAPI `endpoint_url` - pub fn new(endpoint_url: &str, timeout_seconds: u64, timeout_state_seconds: u64) -> Self { + pub fn new( + endpoint_url: &str, + timeout_seconds: u64, + timeout_state_seconds: u64, + version: Option, + ) -> Self { Self { endpoint_url: endpoint_url.to_string(), client: reqwest::blocking::Client::builder() @@ -53,6 +95,7 @@ impl BeaconRPCClient { .timeout(Duration::from_secs(timeout_state_seconds)) .build() .expect("Error on building blocking client for state request."), + routes: BeaconRPCRoutes::new(version.unwrap_or(BeaconRPCVersion::V1_1)), } } @@ -67,7 +110,10 @@ impl BeaconRPCClient { &self, block_id: &str, ) -> Result, Box> { - let url = format!("{}/{}/{}", self.endpoint_url, Self::URL_BODY_PATH, block_id); + let url = format!( + "{}/{}/{}", + self.endpoint_url, self.routes.get_block, block_id + ); let json_str = &self.get_json_from_raw_request(&url)?; @@ -90,9 +136,7 @@ impl BeaconRPCClient { ) -> Result> { let url = format!( "{}/{}/{}", - self.endpoint_url, - Self::URL_HEADER_PATH, - block_id + self.endpoint_url, self.routes.get_block_header, block_id ); let json_str = &self.get_json_from_raw_request(&url)?; @@ -113,9 +157,7 @@ impl BeaconRPCClient { ) -> Result> { let url = format!( "{}/{}?start_period={}&count=1", - self.endpoint_url, - Self::URL_GET_LIGHT_CLIENT_UPDATE_API, - period + self.endpoint_url, self.routes.get_light_client_update, period ); let light_client_update_json_str = self.get_json_from_raw_request(&url)?; @@ -147,9 +189,7 @@ impl BeaconRPCClient { ) -> Result> { let url = format!( "{}/{}/{}", - self.endpoint_url, - Self::URL_GET_BOOTSTRAP, - block_root + self.endpoint_url, self.routes.get_bootstrap, block_root ); let light_client_snapshot_json_str = self.get_json_from_raw_request(&url)?; @@ -200,9 +240,7 @@ impl BeaconRPCClient { let url = format!( "{}/{}/{}", - self.endpoint_url, - Self::URL_BODY_PATH, - beacon_block_hash_str + self.endpoint_url, self.routes.get_block, beacon_block_hash_str ); let block_json_str = &self.get_json_from_raw_request(&url)?; let v: Value = serde_json::from_str(block_json_str)?; @@ -223,8 +261,7 @@ impl BeaconRPCClient { pub fn get_finality_light_client_update(&self) -> Result> { let url = format!( "{}/{}", - self.endpoint_url, - Self::URL_FINALITY_LIGHT_CLIENT_UPDATE_PATH + self.endpoint_url, self.routes.get_light_client_finality_update, ); let light_client_update_json_str = self.get_json_from_raw_request(&url)?; @@ -265,9 +302,7 @@ impl BeaconRPCClient { ) -> Result, Box> { let url_request = format!( "{}/{}/{}", - self.endpoint_url, - Self::URL_STATE_PATH, - state_id + self.endpoint_url, self.routes.get_state, state_id ); let json_str = Self::get_json_from_client(&self.client_state_request, &url_request)?; @@ -486,11 +521,11 @@ mod tests { use crate::beacon_rpc_client::BeaconRPCClient; use crate::config_for_tests::ConfigForTests; use crate::utils::read_json_file_from_data_dir; + use crate::utils::trim_quotes; use serde_json::Value; use types::BeaconBlockBody; use types::BeaconBlockHeader; use types::MainnetEthSpec; - use crate::utils::trim_quotes; const TIMEOUT_SECONDS: u64 = 30; const TIMEOUT_STATE_SECONDS: u64 = 1000; @@ -553,7 +588,8 @@ mod tests { "{}/eth/v2/beacon/blocks/{}", config.beacon_endpoint, config.first_slot ); - let beacon_rpc_client = BeaconRPCClient::new(&url, TIMEOUT_SECONDS, TIMEOUT_STATE_SECONDS); + let beacon_rpc_client = + BeaconRPCClient::new(&url, TIMEOUT_SECONDS, TIMEOUT_STATE_SECONDS, None); let rpc_json_str = beacon_rpc_client.get_json_from_raw_request(&url); assert_eq!(rpc_json_str.unwrap(), file_json_str.trim()); } @@ -566,6 +602,7 @@ mod tests { &config.beacon_endpoint, TIMEOUT_SECONDS, TIMEOUT_STATE_SECONDS, + None, ) .get_beacon_block_body_for_block_id(&config.first_slot.to_string()) .unwrap(); @@ -573,6 +610,7 @@ mod tests { &config.beacon_endpoint, TIMEOUT_SECONDS, TIMEOUT_STATE_SECONDS, + None, ) .get_beacon_block_header_for_block_id(&config.first_slot.to_string()) .unwrap(); @@ -585,6 +623,7 @@ mod tests { &config.beacon_endpoint, TIMEOUT_SECONDS, TIMEOUT_STATE_SECONDS, + None, ) .get_beacon_block_header_for_block_id(&format!("{}", config.first_slot)) .unwrap(); @@ -627,6 +666,7 @@ mod tests { &config.beacon_endpoint, TIMEOUT_SECONDS, TIMEOUT_STATE_SECONDS, + None, ) .get_beacon_block_body_for_block_id(&config.first_slot.to_string()) .unwrap(); @@ -652,7 +692,8 @@ mod tests { assert!(!BeaconRPCClient::new( "https://lodestar-goerli.chainsafe.io", TIMEOUT_SECONDS, - TIMEOUT_STATE_SECONDS + TIMEOUT_STATE_SECONDS, + None ) .is_syncing() .unwrap()); @@ -699,6 +740,7 @@ mod tests { &config.beacon_endpoint, TIMEOUT_SECONDS, TIMEOUT_STATE_SECONDS, + None, ); let file_json_str = std::fs::read_to_string(&config.path_to_light_client_update) .expect("Unable to read file"); diff --git a/eth2near/eth_rpc_client/src/execution_block_proof.rs b/eth2near/eth_rpc_client/src/execution_block_proof.rs index 7ee19d96f..51cb9e24a 100644 --- a/eth2near/eth_rpc_client/src/execution_block_proof.rs +++ b/eth2near/eth_rpc_client/src/execution_block_proof.rs @@ -218,6 +218,7 @@ mod tests { &config.beacon_endpoint, TIMEOUT_SECONDS, TIMEOUT_STATE_SECONDS, + None, ); let beacon_block_body = beacon_rpc_client diff --git a/eth2near/eth_rpc_client/src/hand_made_finality_light_client_update.rs b/eth2near/eth_rpc_client/src/hand_made_finality_light_client_update.rs index bf85821de..74aa4e617 100644 --- a/eth2near/eth_rpc_client/src/hand_made_finality_light_client_update.rs +++ b/eth2near/eth_rpc_client/src/hand_made_finality_light_client_update.rs @@ -373,6 +373,7 @@ mod tests { &config.beacon_endpoint, TIMEOUT_SECONDS, TIMEOUT_STATE_SECONDS, + None, ); let light_client_period = @@ -409,6 +410,7 @@ mod tests { &config.beacon_endpoint, TIMEOUT_SECONDS, TIMEOUT_STATE_SECONDS, + None, ); let hand_made_light_client_update = HandMadeFinalityLightClientUpdate::get_finality_light_client_update_from_file( @@ -435,6 +437,7 @@ mod tests { &config.beacon_endpoint, TIMEOUT_SECONDS, TIMEOUT_STATE_SECONDS, + None, ); let hand_made_light_client_update = HandMadeFinalityLightClientUpdate::get_light_client_update_from_file_with_next_sync_committee(