From a333b92993ff4dabd49daf9652b2c92b63f2cda6 Mon Sep 17 00:00:00 2001 From: Sasha Syrotenko Date: Fri, 22 Nov 2024 13:48:31 +0200 Subject: [PATCH 01/40] FastNEAR indexer, by @firatsertgoz --- Cargo.lock | 1281 +++++++++++++++++++++++---------------- Cargo.toml | 2 +- indexer/Cargo.toml | 1 + indexer/src/errors.rs | 10 +- indexer/src/fastnear.rs | 195 ++++++ indexer/src/main.rs | 1 + indexer/src/types.rs | 54 +- 7 files changed, 1025 insertions(+), 519 deletions(-) create mode 100644 indexer/src/fastnear.rs diff --git a/Cargo.lock b/Cargo.lock index d4e162bc..2318db0e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -105,7 +105,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb" dependencies = [ "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -244,7 +244,7 @@ dependencies = [ "actix-router", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -255,7 +255,7 @@ checksum = "b6ac1e58cded18cb28ddc17143c4dea5345b3ad575e14f32f66e4054a56eb271" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -343,9 +343,9 @@ dependencies = [ [[package]] name = "allocator-api2" -version = "0.2.18" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" +checksum = "45862d1c77f2228b9e10bc609d5bc203d86ebc9b87ad8d5d5167a6c9abf739d9" [[package]] name = "alloy" @@ -379,9 +379,9 @@ dependencies = [ [[package]] name = "alloy-chains" -version = "0.1.38" +version = "0.1.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "156bfc5dcd52ef9a5f33381701fa03310317e14c65093a9430d3e3557b08dcd3" +checksum = "18c5c520273946ecf715c0010b4e3503d7eba9893cd9ce6b7fff5654c4a3c470" dependencies = [ "alloy-primitives", "num_enum", @@ -422,14 +422,14 @@ dependencies = [ "alloy-transport", "futures", "futures-util", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "alloy-core" -version = "0.8.8" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a54c7158ea4a394bef220d82d8fdd412fb9b1ca2d6024db539070b7bc01b6401" +checksum = "9c8316d83e590f4163b221b8180008f302bda5cf5451202855cdd323e588849c" dependencies = [ "alloy-dyn-abi", "alloy-json-abi", @@ -440,9 +440,9 @@ dependencies = [ [[package]] name = "alloy-dyn-abi" -version = "0.8.8" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6228abfc751a29cde117b0879b805a3e0b3b641358f063272c83ca459a56886" +checksum = "ef2364c782a245cf8725ea6dbfca5f530162702b5d685992ea03ce64529136cc" dependencies = [ "alloy-json-abi", "alloy-primitives", @@ -510,9 +510,9 @@ dependencies = [ [[package]] name = "alloy-json-abi" -version = "0.8.8" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d46eb5871592c216d39192499c95a99f7175cb94104f88c307e6dc960676d9f1" +checksum = "b84c506bf264110fa7e90d9924f742f40ef53c6572ea56a0b0bd714a567ed389" dependencies = [ "alloy-primitives", "alloy-sol-type-parser", @@ -530,7 +530,7 @@ dependencies = [ "alloy-sol-types", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", "tracing", ] @@ -552,7 +552,7 @@ dependencies = [ "async-trait", "auto_impl", "futures-utils-wasm", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -580,16 +580,16 @@ dependencies = [ "rand", "serde_json", "tempfile", - "thiserror", + "thiserror 1.0.69", "tracing", "url", ] [[package]] name = "alloy-primitives" -version = "0.8.8" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f35429a652765189c1c5092870d8360ee7b7769b09b06d89ebaefd34676446" +checksum = "9fce5dbd6a4f118eecc4719eaa9c7ffc31c315e6c5ccde3642db927802312425" dependencies = [ "alloy-rlp", "bytes", @@ -597,7 +597,7 @@ dependencies = [ "const-hex", "derive_more 1.0.0", "foldhash", - "hashbrown 0.15.0", + "hashbrown 0.15.1", "hex-literal", "indexmap 2.6.0", "itoa", @@ -644,11 +644,11 @@ dependencies = [ "futures", "futures-utils-wasm", "lru 0.12.5", - "pin-project 1.1.6", - "reqwest 0.12.8", + "pin-project 1.1.7", + "reqwest 0.12.9", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", "tokio", "tracing", "url", @@ -675,24 +675,24 @@ dependencies = [ [[package]] name = "alloy-rlp" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26154390b1d205a4a7ac7352aa2eb4f81f391399d4e2f546fb81a2f8bb383f62" +checksum = "da0822426598f95e45dd1ea32a738dac057529a709ee645fcc516ffa4cbde08f" dependencies = [ "alloy-rlp-derive", - "arrayvec 0.7.6", + "arrayvec", "bytes", ] [[package]] name = "alloy-rlp-derive" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d0f2d905ebd295e7effec65e5f6868d153936130ae718352771de3e7d03c75c" +checksum = "2b09cae092c27b6f1bde952653a22708691802e57bfef4a2973b80bea21efd3f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -709,8 +709,8 @@ dependencies = [ "alloy-transport-ipc", "alloy-transport-ws", "futures", - "pin-project 1.1.6", - "reqwest 0.12.8", + "pin-project 1.1.7", + "reqwest 0.12.9", "serde", "serde_json", "tokio", @@ -789,7 +789,7 @@ dependencies = [ "alloy-serde", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -816,7 +816,7 @@ dependencies = [ "auto_impl", "elliptic-curve", "k256", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -833,7 +833,7 @@ dependencies = [ "aws-sdk-kms", "k256", "spki", - "thiserror", + "thiserror 1.0.69", "tracing", ] @@ -851,7 +851,7 @@ dependencies = [ "gcloud-sdk", "k256", "spki", - "thiserror", + "thiserror 1.0.69", "tracing", ] @@ -871,7 +871,7 @@ dependencies = [ "coins-ledger", "futures-util", "semver 1.0.23", - "thiserror", + "thiserror 1.0.69", "tracing", ] @@ -888,28 +888,28 @@ dependencies = [ "async-trait", "k256", "rand", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "alloy-sol-macro" -version = "0.8.8" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b2395336745358cc47207442127c47c63801a7065ecc0aa928da844f8bb5576" +checksum = "9343289b4a7461ed8bab8618504c995c049c082b70c7332efd7b32125633dc05" dependencies = [ "alloy-sol-macro-expander", "alloy-sol-macro-input", "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] name = "alloy-sol-macro-expander" -version = "0.8.8" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed5047c9a241df94327879c2b0729155b58b941eae7805a7ada2e19436e6b39" +checksum = "4222d70bec485ceccc5d8fd4f2909edd65b5d5e43d4aca0b5dcee65d519ae98f" dependencies = [ "alloy-json-abi", "alloy-sol-macro-input", @@ -919,16 +919,16 @@ dependencies = [ "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", "syn-solidity", "tiny-keccak", ] [[package]] name = "alloy-sol-macro-input" -version = "0.8.8" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dee02a81f529c415082235129f0df8b8e60aa1601b9c9298ffe54d75f57210b" +checksum = "2e17f2677369571b976e51ea1430eb41c3690d344fef567b840bfc0b01b6f83a" dependencies = [ "alloy-json-abi", "const-hex", @@ -937,15 +937,15 @@ dependencies = [ "proc-macro2", "quote", "serde_json", - "syn 2.0.79", + "syn 2.0.89", "syn-solidity", ] [[package]] name = "alloy-sol-type-parser" -version = "0.8.8" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f631f0bd9a9d79619b27c91b6b1ab2c4ef4e606a65192369a1ee05d40dcf81cc" +checksum = "aa64d80ae58ffaafdff9d5d84f58d03775f66c84433916dc9a64ed16af5755da" dependencies = [ "serde", "winnow", @@ -953,9 +953,9 @@ dependencies = [ [[package]] name = "alloy-sol-types" -version = "0.8.8" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2841af22d99e2c0f82a78fe107b6481be3dd20b89bfb067290092794734343a" +checksum = "6520d427d4a8eb7aa803d852d7a52ceb0c519e784c292f64bb339e636918cf27" dependencies = [ "alloy-json-abi", "alloy-primitives", @@ -976,7 +976,7 @@ dependencies = [ "futures-utils-wasm", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", "tokio", "tower 0.5.1", "tracing", @@ -991,7 +991,7 @@ checksum = "b367dcccada5b28987c2296717ee04b9a5637aacd78eacb1726ef211678b5212" dependencies = [ "alloy-json-rpc", "alloy-transport", - "reqwest 0.12.8", + "reqwest 0.12.9", "serde_json", "tower 0.5.1", "tracing", @@ -1010,7 +1010,7 @@ dependencies = [ "bytes", "futures", "interprocess", - "pin-project 1.1.6", + "pin-project 1.1.7", "serde_json", "tokio", "tokio-util", @@ -1100,9 +1100,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.15" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" +checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b" dependencies = [ "anstyle", "anstyle-parse", @@ -1115,49 +1115,49 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.8" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" +checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" [[package]] name = "anstyle-parse" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" +checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" +checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.4" +version = "3.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" +checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125" dependencies = [ "anstyle", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "anyhow" -version = "1.0.89" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" +checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775" [[package]] name = "arbitrary" -version = "1.3.2" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" +checksum = "dde20b3d026af13f561bdd0f15edf01fc734f0dafcedbaf42bba506a9517f223" dependencies = [ "derive_arbitrary", ] @@ -1293,16 +1293,16 @@ dependencies = [ ] [[package]] -name = "arrayref" -version = "0.3.9" +name = "arraydeque" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" +checksum = "7d902e3d592a523def97af8f317b08ce16b7ab854c1985a0c671e6f15cebc236" [[package]] -name = "arrayvec" -version = "0.5.2" +name = "arrayref" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" +checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" [[package]] name = "arrayvec" @@ -1322,7 +1322,7 @@ dependencies = [ "nom", "num-traits", "rusticata-macros", - "thiserror", + "thiserror 1.0.69", "time", ] @@ -1334,7 +1334,7 @@ checksum = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", "synstructure", ] @@ -1346,7 +1346,7 @@ checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -1398,8 +1398,8 @@ checksum = "30ca9a001c1e8ba5149f91a74362376cc6bc5b919d92d988668657bd570bdcec" dependencies = [ "async-task", "concurrent-queue", - "fastrand 2.1.1", - "futures-lite 2.3.0", + "fastrand 2.2.0", + "futures-lite 2.5.0", "slab", ] @@ -1411,10 +1411,10 @@ checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c" dependencies = [ "async-channel", "async-executor", - "async-io 2.3.4", + "async-io 2.4.0", "async-lock 3.4.0", "blocking", - "futures-lite 2.3.0", + "futures-lite 2.5.0", "once_cell", ] @@ -1451,18 +1451,18 @@ dependencies = [ [[package]] name = "async-io" -version = "2.3.4" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8" +checksum = "43a2b323ccce0a1d90b449fd71f2a06ca7faa7c54c2751f06c9bd851fc061059" dependencies = [ "async-lock 3.4.0", "cfg-if 1.0.0", "concurrent-queue", "futures-io", - "futures-lite 2.3.0", + "futures-lite 2.5.0", "parking", - "polling 3.7.3", - "rustix 0.38.37", + "polling 3.7.4", + "rustix 0.38.41", "slab", "tracing", "windows-sys 0.59.0", @@ -1519,7 +1519,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -1536,7 +1536,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -1580,7 +1580,7 @@ checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -1646,7 +1646,7 @@ dependencies = [ "rust-ini 0.18.0", "serde", "serde-xml-rs", - "thiserror", + "thiserror 1.0.69", "time", "url", ] @@ -1657,7 +1657,7 @@ version = "0.25.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e9aed3f9c7eac9be28662fdb3b0f4d1951e812f7c64fed4f0327ba702f459b3b" dependencies = [ - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -1675,7 +1675,7 @@ dependencies = [ "aws-smithy-types", "aws-types", "bytes", - "fastrand 2.1.1", + "fastrand 2.2.0", "http 0.2.12", "http-body 0.4.6", "once_cell", @@ -1687,9 +1687,9 @@ dependencies = [ [[package]] name = "aws-sdk-kms" -version = "1.47.0" +version = "1.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "564a597a3c71a957d60a2e4c62c93d78ee5a0d636531e15b760acad983a5c18e" +checksum = "bfd059dacda4dfd5b57f2bd453fc6555f9acb496cb77508d517da24cf5d73167" dependencies = [ "aws-credential-types", "aws-runtime", @@ -1709,9 +1709,9 @@ dependencies = [ [[package]] name = "aws-sigv4" -version = "1.2.4" +version = "1.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc8db6904450bafe7473c6ca9123f88cc11089e41a025408f992db4e22d3be68" +checksum = "5619742a0d8f253be760bfbb8e8e8368c69e3587e4637af5754e488a611499b1" dependencies = [ "aws-credential-types", "aws-smithy-http", @@ -1772,16 +1772,16 @@ dependencies = [ [[package]] name = "aws-smithy-runtime" -version = "1.7.2" +version = "1.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a065c0fe6fdbdf9f11817eb68582b2ab4aff9e9c39e986ae48f7ec576c6322db" +checksum = "be28bd063fa91fd871d131fc8b68d7cd4c5fa0869bea68daca50dcb1cbd76be2" dependencies = [ "aws-smithy-async", "aws-smithy-http", "aws-smithy-runtime-api", "aws-smithy-types", "bytes", - "fastrand 2.1.1", + "fastrand 2.2.0", "http 0.2.12", "http-body 0.4.6", "http-body 1.0.1", @@ -1795,9 +1795,9 @@ dependencies = [ [[package]] name = "aws-smithy-runtime-api" -version = "1.7.2" +version = "1.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e086682a53d3aa241192aa110fa8dfce98f2f5ac2ead0de84d41582c7e8fdb96" +checksum = "92165296a47a812b267b4f41032ff8069ab7ff783696d217f0994a0d7ab585cd" dependencies = [ "aws-smithy-async", "aws-smithy-types", @@ -1812,9 +1812,9 @@ dependencies = [ [[package]] name = "aws-smithy-types" -version = "1.2.7" +version = "1.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147100a7bea70fa20ef224a6bad700358305f5dc0f84649c53769761395b355b" +checksum = "4fbd94a32b3a7d55d3806fe27d98d3ad393050439dd05eb53ece36ec5e3d3510" dependencies = [ "base64-simd", "bytes", @@ -1860,7 +1860,7 @@ dependencies = [ "futures-util", "http 0.2.12", "http-body 0.4.6", - "hyper 0.14.30", + "hyper 0.14.31", "itoa", "matchit", "memchr", @@ -1877,9 +1877,9 @@ dependencies = [ [[package]] name = "axum" -version = "0.7.7" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "504e3947307ac8326a5437504c517c4b56716c9d98fac0028c2acc7ca47d70ae" +checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f" dependencies = [ "async-trait", "axum-core 0.4.5", @@ -1888,7 +1888,7 @@ dependencies = [ "http 1.1.0", "http-body 1.0.1", "http-body-util", - "hyper 1.4.1", + "hyper 1.5.1", "hyper-util", "itoa", "matchit", @@ -1901,7 +1901,7 @@ dependencies = [ "serde_json", "serde_path_to_error", "serde_urlencoded", - "sync_wrapper 1.0.1", + "sync_wrapper 1.0.2", "tokio", "tower 0.5.1", "tower-layer", @@ -1941,7 +1941,7 @@ dependencies = [ "mime", "pin-project-lite", "rustversion", - "sync_wrapper 1.0.1", + "sync_wrapper 1.0.2", "tower-layer", "tower-service", "tracing", @@ -2041,7 +2041,7 @@ dependencies = [ "regex", "rustc-hash 1.1.0", "shlex", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -2106,17 +2106,15 @@ dependencies = [ [[package]] name = "blake3" -version = "0.3.8" +version = "1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b64485778c4f16a6a5a9d335e80d449ac6c70cdd6a06d2af18a6f6f775a125b3" +checksum = "d82033247fd8e890df8f740e407ad4d038debb9eb1f40533fffb32e7d17dc6f7" dependencies = [ "arrayref", - "arrayvec 0.5.2", + "arrayvec", "cc", - "cfg-if 0.1.10", + "cfg-if 1.0.0", "constant_time_eq", - "crypto-mac", - "digest 0.9.0", ] [[package]] @@ -2156,7 +2154,7 @@ dependencies = [ "async-channel", "async-task", "futures-io", - "futures-lite 2.3.0", + "futures-lite 2.5.0", "piper", ] @@ -2192,7 +2190,7 @@ dependencies = [ "sha2", "sha3", "subtle", - "thiserror", + "thiserror 1.0.69", "uint-zigzag", "vsss-rs", "zeroize", @@ -2240,11 +2238,11 @@ dependencies = [ [[package]] name = "borsh" -version = "1.5.1" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6362ed55def622cddc70a4746a68554d7b687713770de539e59a739b249f8ed" +checksum = "2506947f73ad44e344215ccd6403ac2ae18cd8e046e581a441bf8d199f257f03" dependencies = [ - "borsh-derive 1.5.1", + "borsh-derive 1.5.3", "cfg_aliases", ] @@ -2263,16 +2261,15 @@ dependencies = [ [[package]] name = "borsh-derive" -version = "1.5.1" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3ef8005764f53cd4dca619f5bf64cafd4664dada50ece25e4d81de54c80cc0b" +checksum = "c2593a3b8b938bd68373196c9832f516be11fa487ef4ae745eb282e6a56a7244" dependencies = [ "once_cell", "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.79", - "syn_derive", + "syn 2.0.89", ] [[package]] @@ -2366,9 +2363,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.7.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" +checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" dependencies = [ "serde", ] @@ -2438,9 +2435,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.30" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16803a61b81d9eabb7eae2588776c4c1e584b738ede45fdbb4c972cec1e9945" +checksum = "fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47" dependencies = [ "jobserver", "libc", @@ -2512,9 +2509,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.20" +version = "4.5.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8" +checksum = "fb3b4b9e5a7c7514dfa52869339ee98b3156b0bfb4e8a77c4ff4babb64b1604f" dependencies = [ "clap_builder", "clap_derive", @@ -2522,9 +2519,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.20" +version = "4.5.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54" +checksum = "b17a95aa67cc7b5ebd32aa5370189aa0d79069ef1c64ce893bd30fb24bff20ec" dependencies = [ "anstream", "anstyle", @@ -2541,14 +2538,14 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] name = "clap_lex" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" +checksum = "afb84c814227b90d6895e01398aee0d8033c00e7466aca416fb6a8e0eb19d8a7" [[package]] name = "cloud-storage" @@ -2610,7 +2607,7 @@ dependencies = [ "log", "nix 0.26.4", "once_cell", - "thiserror", + "thiserror 1.0.69", "tokio", "tracing", "wasm-bindgen", @@ -2619,9 +2616,9 @@ dependencies = [ [[package]] name = "colorchoice" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" +checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" [[package]] name = "concurrent-queue" @@ -2634,22 +2631,21 @@ dependencies = [ [[package]] name = "config" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7328b20597b53c2454f0b1919720c25c7339051c02b72b7e05409e00b14132be" +checksum = "68578f196d2a33ff61b27fae256c3164f65e36382648e30666dde05b8cc9dfdf" dependencies = [ "async-trait", "convert_case 0.6.0", "json5", - "lazy_static", "nom", "pathdiff", "ron", - "rust-ini 0.19.0", + "rust-ini 0.20.0", "serde", "serde_json", "toml 0.8.19", - "yaml-rust", + "yaml-rust2", ] [[package]] @@ -2667,9 +2663,9 @@ dependencies = [ [[package]] name = "const-hex" -version = "1.13.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0121754e84117e65f9d90648ee6aa4882a6e63110307ab73967a4c5e7e69e586" +checksum = "487981fa1af147182687064d0a2c336586d337a606595ced9ffb0c685c250c73" dependencies = [ "cfg-if 1.0.0", "cpufeatures", @@ -2706,9 +2702,9 @@ dependencies = [ [[package]] name = "constant_time_eq" -version = "0.1.5" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" +checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" [[package]] name = "convert_case" @@ -2752,6 +2748,16 @@ dependencies = [ "libc", ] +[[package]] +name = "core-foundation" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "core-foundation-sys" version = "0.8.7" @@ -2778,9 +2784,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.14" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" +checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3" dependencies = [ "libc", ] @@ -3002,16 +3008,6 @@ dependencies = [ "typenum", ] -[[package]] -name = "crypto-mac" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" -dependencies = [ - "generic-array 0.14.7", - "subtle", -] - [[package]] name = "curve25519-dalek" version = "4.1.3" @@ -3036,7 +3032,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -3060,7 +3056,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -3071,7 +3067,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -3170,7 +3166,7 @@ checksum = "8034092389675178f570469e6c3b0465d3d30b4505c294a6550db47f3c17ad18" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -3202,18 +3198,18 @@ checksum = "62d671cc41a825ebabc75757b62d3d168c577f9149b2d49ece1dad1f72119d25" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] name = "derive_arbitrary" -version = "1.3.2" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" +checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -3226,7 +3222,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version 0.4.1", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -3246,7 +3242,7 @@ checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", "unicode-xid", ] @@ -3317,7 +3313,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -3495,9 +3491,9 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] name = "encoding_rs" -version = "0.8.34" +version = "0.8.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" +checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" dependencies = [ "cfg-if 1.0.0", ] @@ -3519,7 +3515,7 @@ checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -3540,7 +3536,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -3643,9 +3639,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" +checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4" [[package]] name = "fastrlp" @@ -3653,7 +3649,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "139834ddba373bbdd213dffe02c8d110508dcf1726c2be27e8d1f7d7e1856418" dependencies = [ - "arrayvec 0.7.6", + "arrayvec", "auto_impl", "bytes", ] @@ -3685,7 +3681,7 @@ dependencies = [ "dissimilar", "num-traits", "prefix-sum-vec", - "thiserror", + "thiserror 1.0.69", "wasm-encoder 0.27.0", "wasmparser 0.105.0", "wasmprinter", @@ -3720,9 +3716,9 @@ checksum = "b3ea1ec5f8307826a5b71094dd91fc04d4ae75d5709b20ad351c7fb4815c86ec" [[package]] name = "flate2" -version = "1.0.34" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" +checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" dependencies = [ "crc32fast", "miniz_oxide", @@ -3730,9 +3726,9 @@ dependencies = [ [[package]] name = "flume" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" +checksum = "da0e4dd2a88388a1f4ccc7c9ce104604dab68d9f408dc34cd45823d5a9069095" dependencies = [ "futures-core", "futures-sink", @@ -3846,11 +3842,11 @@ dependencies = [ [[package]] name = "futures-lite" -version = "2.3.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" +checksum = "cef40d21ae2c515b51041df9ed313ed21e572df340ea58a922a0aefe7e8891a1" dependencies = [ - "fastrand 2.1.1", + "fastrand 2.2.0", "futures-core", "futures-io", "parking", @@ -3865,7 +3861,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -3928,20 +3924,20 @@ dependencies = [ [[package]] name = "gcloud-sdk" -version = "0.25.7" +version = "0.25.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a1130d4e37435a63bd9d968a33c11b64bf35a2013779a353e29cd3598989d39" +checksum = "0775bfa745cdf7287ae9765a685a813b91049b6b6d5ca3de20a3d5d16a80d8b2" dependencies = [ "async-trait", "bytes", "chrono", "futures", - "hyper 1.4.1", + "hyper 1.5.1", "jsonwebtoken 9.3.0", "once_cell", "prost 0.13.3", "prost-types", - "reqwest 0.12.8", + "reqwest 0.12.9", "secret-vault-value", "serde", "serde_json", @@ -4053,9 +4049,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" +checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e" dependencies = [ "atomic-waker", "bytes", @@ -4104,13 +4100,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash 0.8.11", + "allocator-api2", ] [[package]] name = "hashbrown" -version = "0.15.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" +checksum = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3" dependencies = [ "allocator-api2", "equivalent", @@ -4118,6 +4115,15 @@ dependencies = [ "serde", ] +[[package]] +name = "hashlink" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" +dependencies = [ + "hashbrown 0.14.5", +] + [[package]] name = "heck" version = "0.4.1" @@ -4266,9 +4272,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hyper" -version = "0.14.30" +version = "0.14.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" +checksum = "8c08302e8fa335b151b788c775ff56e7a03ae64ff85c548ee820fecb70356e85" dependencies = [ "bytes", "futures-channel", @@ -4290,14 +4296,14 @@ dependencies = [ [[package]] name = "hyper" -version = "1.4.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" +checksum = "97818827ef4f364230e16705d4706e2897df2bb60617d6ca15d598025a3c481f" dependencies = [ "bytes", "futures-channel", "futures-util", - "h2 0.4.6", + "h2 0.4.7", "http 1.1.0", "http-body 1.0.1", "httparse", @@ -4317,10 +4323,10 @@ checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" dependencies = [ "futures-util", "http 1.1.0", - "hyper 1.4.1", + "hyper 1.5.1", "hyper-util", "rustls", - "rustls-native-certs 0.8.0", + "rustls-native-certs 0.8.1", "rustls-pki-types", "tokio", "tokio-rustls", @@ -4333,7 +4339,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" dependencies = [ - "hyper 0.14.30", + "hyper 0.14.31", "pin-project-lite", "tokio", "tokio-io-timeout", @@ -4341,11 +4347,11 @@ dependencies = [ [[package]] name = "hyper-timeout" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3203a961e5c83b6f5498933e78b6b263e208c197b63e9c6c53cc82ffd3f63793" +checksum = "2b90d566bffbce6a75bd8b09a05aa8c2cb1fabb6cb348f8840c9e4c90a0d83b0" dependencies = [ - "hyper 1.4.1", + "hyper 1.5.1", "hyper-util", "pin-project-lite", "tokio", @@ -4359,7 +4365,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ "bytes", - "hyper 0.14.30", + "hyper 0.14.31", "native-tls", "tokio", "tokio-native-tls", @@ -4373,7 +4379,7 @@ checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" dependencies = [ "bytes", "http-body-util", - "hyper 1.4.1", + "hyper 1.5.1", "hyper-util", "native-tls", "tokio", @@ -4383,16 +4389,16 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b" +checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4" dependencies = [ "bytes", "futures-channel", "futures-util", "http 1.1.0", "http-body 1.0.1", - "hyper 1.4.1", + "hyper 1.5.1", "pin-project-lite", "socket2 0.5.7", "tokio", @@ -4423,6 +4429,124 @@ dependencies = [ "cc", ] +[[package]] +name = "icu_collections" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locid" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_locid_transform" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_locid_transform_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" + +[[package]] +name = "icu_normalizer" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "utf16_iter", + "utf8_iter", + "write16", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" + +[[package]] +name = "icu_properties" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_locid_transform", + "icu_properties_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" + +[[package]] +name = "icu_provider" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_provider_macros", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_provider_macros" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.89", +] + [[package]] name = "ident_case" version = "1.0.1" @@ -4431,12 +4555,23 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "0.5.0" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" +dependencies = [ + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" dependencies = [ - "unicode-bidi", - "unicode-normalization", + "icu_normalizer", + "icu_properties", ] [[package]] @@ -4464,19 +4599,19 @@ dependencies = [ [[package]] name = "impl-more" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "206ca75c9c03ba3d4ace2460e57b189f39f43de612c2f85836e65c929701bb2d" +checksum = "aae21c3177a27788957044151cc2800043d127acaa460a47ebb9b84dfa2c6aa0" [[package]] name = "impl-trait-for-tuples" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb" +checksum = "a0eb5a3343abf848c0984fe4604b2b105da9539376e24fc0a3b0007411ae4fd9" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.89", ] [[package]] @@ -4492,7 +4627,7 @@ dependencies = [ "actix", "actix-web", "anyhow", - "borsh 1.5.1", + "borsh 1.5.3", "clap", "deadpool", "deadpool-lapin", @@ -4506,10 +4641,11 @@ dependencies = [ "near-o11y", "openssl-probe", "prometheus", + "reqwest 0.12.9", "serde", "serde_json", "serde_yaml", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-executor-trait", "tokio-reactor-trait", @@ -4534,7 +4670,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "equivalent", - "hashbrown 0.15.0", + "hashbrown 0.15.1", "serde", ] @@ -4637,9 +4773,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.11" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" +checksum = "540654e97a3f4470a492cd30ff187bc95d89557a903a2bbf112e2fae98104ef2" [[package]] name = "jobserver" @@ -4788,9 +4924,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.159" +version = "0.2.164" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" +checksum = "433bfe06b8c75da9b2e3fbea6e5329ff87748f0b144ef75306e674c3f6f7c13f" [[package]] name = "libloading" @@ -4804,9 +4940,9 @@ dependencies = [ [[package]] name = "libm" -version = "0.2.8" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" +checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" [[package]] name = "libredox" @@ -4858,12 +4994,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "linked-hash-map" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" - [[package]] name = "linux-raw-sys" version = "0.3.8" @@ -4876,6 +5006,12 @@ version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" +[[package]] +name = "litemap" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" + [[package]] name = "local-channel" version = "0.1.5" @@ -4933,7 +5069,7 @@ version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" dependencies = [ - "hashbrown 0.15.0", + "hashbrown 0.15.1", ] [[package]] @@ -4998,7 +5134,7 @@ checksum = "5cf92c10c7e361d6b99666ec1c6f9805b0bea2c3bd8c78dc6fe98ac5bd78db11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -5029,7 +5165,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2cffa4ad52c6f791f4f8b15f0c05f9824b2ced1160e88cc393d64fff9a8ac64" dependencies = [ - "rustix 0.38.37", + "rustix 0.38.41", ] [[package]] @@ -5170,7 +5306,7 @@ dependencies = [ "openssl-probe", "openssl-sys", "schannel", - "security-framework", + "security-framework 2.11.1", "security-framework-sys", "tempfile", ] @@ -5181,7 +5317,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35cbb989542587b47205e608324ddd391f0cee1c22b4b64ae49f458334b95907" dependencies = [ - "borsh 1.5.1", + "borsh 1.5.3", "serde", ] @@ -5212,7 +5348,7 @@ source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff4 dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -5230,7 +5366,7 @@ source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff4 dependencies = [ "actix", "assert_matches", - "borsh 1.5.1", + "borsh 1.5.3", "bytesize", "chrono", "crossbeam-channel", @@ -5266,7 +5402,7 @@ dependencies = [ "serde", "strum 0.24.1", "tempfile", - "thiserror", + "thiserror 1.0.69", "time", "tracing", "yansi", @@ -5304,7 +5440,7 @@ dependencies = [ "near-crypto", "near-primitives", "near-time", - "thiserror", + "thiserror 1.0.69", "time", "tracing", ] @@ -5315,7 +5451,7 @@ version = "2.3.0-rc.1" source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "actix", - "borsh 1.5.1", + "borsh 1.5.3", "chrono", "derive_more 0.99.18", "futures", @@ -5359,7 +5495,7 @@ dependencies = [ "actix-rt", "anyhow", "async-trait", - "borsh 1.5.1", + "borsh 1.5.3", "bytesize", "chrono", "cloud-storage", @@ -5401,7 +5537,7 @@ dependencies = [ "strum 0.24.1", "sysinfo", "tempfile", - "thiserror", + "thiserror 1.0.69", "time", "tokio", "tracing", @@ -5424,7 +5560,7 @@ dependencies = [ "serde", "serde_json", "strum 0.24.1", - "thiserror", + "thiserror 1.0.69", "time", "tracing", "yansi", @@ -5437,7 +5573,7 @@ source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff4 dependencies = [ "anyhow", "json_comments", - "thiserror", + "thiserror 1.0.69", "tracing", ] @@ -5447,7 +5583,7 @@ version = "2.3.0-rc.1" source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "blake2", - "borsh 1.5.1", + "borsh 1.5.3", "bs58", "curve25519-dalek", "derive_more 0.99.18", @@ -5463,7 +5599,7 @@ dependencies = [ "serde", "serde_json", "subtle", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -5480,7 +5616,7 @@ dependencies = [ "prometheus", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", "tokio", "tracing", ] @@ -5490,7 +5626,7 @@ name = "near-epoch-manager" version = "2.3.0-rc.1" source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ - "borsh 1.5.1", + "borsh 1.5.3", "itertools 0.10.5", "near-cache", "near-chain-configs", @@ -5613,7 +5749,7 @@ dependencies = [ "near-schema-checker-lib", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", "time", ] @@ -5637,7 +5773,7 @@ dependencies = [ "anyhow", "arc-swap", "async-trait", - "borsh 1.5.1", + "borsh 1.5.3", "bytes", "bytesize", "chrono", @@ -5661,8 +5797,8 @@ dependencies = [ "near-store", "opentelemetry", "parking_lot 0.12.3", - "pin-project 1.1.6", - "protobuf 3.6.0", + "pin-project 1.1.7", + "protobuf 3.7.1", "protobuf-codegen", "rand", "rayon", @@ -5672,7 +5808,7 @@ dependencies = [ "smart-default", "strum 0.24.1", "stun", - "thiserror", + "thiserror 1.0.69", "time", "tokio", "tokio-stream", @@ -5697,7 +5833,7 @@ dependencies = [ "prometheus", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", "tokio", "tracing", "tracing-appender", @@ -5710,7 +5846,7 @@ name = "near-parameters" version = "2.3.0-rc.1" source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ - "borsh 1.5.1", + "borsh 1.5.3", "enum-map", "near-account-id", "near-primitives-core", @@ -5720,7 +5856,7 @@ dependencies = [ "serde_repr", "serde_yaml", "strum 0.24.1", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -5744,7 +5880,7 @@ version = "2.3.0-rc.1" source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -5752,7 +5888,7 @@ name = "near-pool" version = "2.3.0-rc.1" source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ - "borsh 1.5.1", + "borsh 1.5.3", "near-crypto", "near-o11y", "near-primitives", @@ -5767,7 +5903,7 @@ dependencies = [ "arbitrary", "base64 0.21.7", "bitvec", - "borsh 1.5.1", + "borsh 1.5.3", "bytes", "bytesize", "cfg-if 1.0.0", @@ -5796,7 +5932,7 @@ dependencies = [ "sha3", "smart-default", "strum 0.24.1", - "thiserror", + "thiserror 1.0.69", "tracing", "zstd", ] @@ -5808,7 +5944,7 @@ source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff4 dependencies = [ "arbitrary", "base64 0.21.7", - "borsh 1.5.1", + "borsh 1.5.3", "bs58", "derive_more 0.99.18", "enum-map", @@ -5818,7 +5954,7 @@ dependencies = [ "serde", "serde_repr", "sha2", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -5848,7 +5984,7 @@ dependencies = [ "serde", "serde_json", "strum 0.24.1", - "thiserror", + "thiserror 1.0.69", "tokio", ] @@ -5884,7 +6020,7 @@ dependencies = [ "actix", "actix-rt", "anyhow", - "borsh 1.5.1", + "borsh 1.5.3", "bytesize", "crossbeam", "derive-where", @@ -5915,7 +6051,7 @@ dependencies = [ "smallvec", "strum 0.24.1", "tempfile", - "thiserror", + "thiserror 1.0.69", "tokio", "tracing", ] @@ -5960,7 +6096,7 @@ dependencies = [ "near-vm-vm", "rkyv", "target-lexicon 0.12.16", - "thiserror", + "thiserror 1.0.69", "tracing", "wasmparser 0.99.0", ] @@ -6001,9 +6137,9 @@ dependencies = [ "region", "rkyv", "rustc-demangle", - "rustix 0.38.37", + "rustix 0.38.41", "target-lexicon 0.12.16", - "thiserror", + "thiserror 1.0.69", "tracing", ] @@ -6014,7 +6150,7 @@ source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff4 dependencies = [ "anyhow", "blst", - "borsh 1.5.1", + "borsh 1.5.3", "bytesize", "ed25519-dalek", "enum-map", @@ -6040,14 +6176,14 @@ dependencies = [ "pwasm-utils", "rayon", "ripemd", - "rustix 0.38.37", + "rustix 0.38.41", "serde", "serde_repr", "sha2", "sha3", "strum 0.24.1", "tempfile", - "thiserror", + "thiserror 1.0.69", "tracing", "wasm-encoder 0.27.0", "wasmer-compiler-near", @@ -6071,7 +6207,7 @@ dependencies = [ "indexmap 1.9.3", "num-traits", "rkyv", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -6090,7 +6226,7 @@ dependencies = [ "near-vm-types", "region", "rkyv", - "thiserror", + "thiserror 1.0.69", "tracing", "winapi", ] @@ -6115,7 +6251,7 @@ dependencies = [ "actix-web", "anyhow", "awc", - "borsh 1.5.1", + "borsh 1.5.3", "bytesize", "chrono", "cloud-storage", @@ -6123,7 +6259,7 @@ dependencies = [ "easy-ext", "futures", "hex", - "hyper 0.14.30", + "hyper 0.14.31", "hyper-tls 0.5.0", "indicatif", "near-async", @@ -6163,7 +6299,7 @@ dependencies = [ "smart-default", "strum 0.24.1", "tempfile", - "thiserror", + "thiserror 1.0.69", "tokio", "tracing", "xz2", @@ -6212,7 +6348,7 @@ name = "node-runtime" version = "2.3.0-rc.1" source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ - "borsh 1.5.1", + "borsh 1.5.3", "near-crypto", "near-o11y", "near-parameters", @@ -6227,7 +6363,7 @@ dependencies = [ "rayon", "serde_json", "sha2", - "thiserror", + "thiserror 1.0.69", "tracing", ] @@ -6357,7 +6493,7 @@ checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -6392,7 +6528,7 @@ name = "offchain" version = "0.1.0" dependencies = [ "alloy", - "axum 0.7.7", + "axum 0.7.9", "blsful", "bytes", "config", @@ -6401,7 +6537,7 @@ dependencies = [ "http-body-util", "log", "project-root", - "reqwest 0.12.8", + "reqwest 0.12.9", "serde", "serde_json", "tempfile", @@ -6429,9 +6565,9 @@ checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "openssl" -version = "0.10.66" +version = "0.10.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" +checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" dependencies = [ "bitflags 2.6.0", "cfg-if 1.0.0", @@ -6450,7 +6586,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -6461,18 +6597,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "300.3.2+3.3.2" +version = "300.4.1+3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a211a18d945ef7e648cc6e0058f4c548ee46aab922ea203e0d30e966ea23647b" +checksum = "faa4eac4138c62414b5622d1b31c5c304f34b406b013c079c2bbc652fdd6678c" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.103" +version = "0.9.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" +checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" dependencies = [ "cc", "libc", @@ -6492,7 +6628,7 @@ dependencies = [ "js-sys", "once_cell", "pin-project-lite", - "thiserror", + "thiserror 1.0.69", "urlencoding", ] @@ -6510,7 +6646,7 @@ dependencies = [ "opentelemetry-semantic-conventions", "opentelemetry_sdk", "prost 0.12.6", - "thiserror", + "thiserror 1.0.69", "tokio", "tonic 0.11.0", ] @@ -6550,18 +6686,18 @@ dependencies = [ "ordered-float", "percent-encoding", "rand", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-stream", ] [[package]] name = "ordered-float" -version = "4.3.0" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d501f1a72f71d3c063a6bbc8f7271fa73aa09fe5d6283b6571e2ed176a2537" +checksum = "c65ee1f9701bf938026630b455d5315f490640234259037edb259798b3bcf85e" dependencies = [ - "borsh 1.5.1", + "borsh 1.5.3", "num-traits", "rand", "serde", @@ -6579,12 +6715,12 @@ dependencies = [ [[package]] name = "ordered-multimap" -version = "0.6.0" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ed8acf08e98e744e5384c8bc63ceb0364e68a6854187221c18df61c4797690e" +checksum = "49203cdcae0030493bad186b28da2fa25645fa276a51b6fec8010d281e02ef79" dependencies = [ "dlv-list 0.5.2", - "hashbrown 0.13.2", + "hashbrown 0.14.5", ] [[package]] @@ -6617,7 +6753,7 @@ dependencies = [ "rc2", "sha1", "sha2", - "thiserror", + "thiserror 1.0.69", "x509-parser", ] @@ -6657,7 +6793,7 @@ dependencies = [ "serde_derive", "serde_json", "serde_yaml", - "thiserror", + "thiserror 1.0.69", "url", ] @@ -6692,7 +6828,7 @@ dependencies = [ "serde", "serde_json", "serde_yaml", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -6715,28 +6851,29 @@ dependencies = [ [[package]] name = "parity-scale-codec" -version = "3.6.12" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "306800abfa29c7f16596b5970a588435e3d5b3149683d00c12b699cc19f895ee" +checksum = "8be4817d39f3272f69c59fe05d0535ae6456c2dc2fa1ba02910296c7e0a5c590" dependencies = [ - "arrayvec 0.7.6", + "arrayvec", "bitvec", "byte-slice-cast", "impl-trait-for-tuples", "parity-scale-codec-derive", + "rustversion", "serde", ] [[package]] name = "parity-scale-codec-derive" -version = "3.6.12" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d830939c76d294956402033aee57a6da7b438f2294eb94864c37b0569053a42c" +checksum = "8781a75c6205af67215f382092b6e0a4ff3734798523e69073d4bcd294ec767b" dependencies = [ "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.89", ] [[package]] @@ -6900,7 +7037,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "879952a81a83930934cbf1786752d6dedc3b1f29e8f8fb2ad1d0a36f377cf442" dependencies = [ "memchr", - "thiserror", + "thiserror 1.0.69", "ucd-trie", ] @@ -6924,7 +7061,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -6959,11 +7096,11 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.6" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf123a161dde1e524adf36f90bc5d8d3462824a9c43553ad07a8183161189ec" +checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95" dependencies = [ - "pin-project-internal 1.1.6", + "pin-project-internal 1.1.7", ] [[package]] @@ -6979,20 +7116,20 @@ dependencies = [ [[package]] name = "pin-project-internal" -version = "1.1.6" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4502d8515ca9f32f1fb543d987f63d95a14934883db45bdb48060b6b69257f8" +checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] name = "pin-project-lite" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" +checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" [[package]] name = "pin-utils" @@ -7019,7 +7156,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" dependencies = [ "atomic-waker", - "fastrand 2.1.1", + "fastrand 2.2.0", "futures-io", ] @@ -7087,15 +7224,15 @@ dependencies = [ [[package]] name = "polling" -version = "3.7.3" +version = "3.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511" +checksum = "a604568c3202727d1507653cb121dbd627a58684eb09a820fd746bee38b4442f" dependencies = [ "cfg-if 1.0.0", "concurrent-queue", "hermit-abi 0.4.0", "pin-project-lite", - "rustix 0.38.37", + "rustix 0.38.41", "tracing", "windows-sys 0.59.0", ] @@ -7123,12 +7260,12 @@ checksum = "aa06bd51638b6e76ac9ba9b6afb4164fa647bd2916d722f2623fbb6d1ed8bdba" [[package]] name = "prettyplease" -version = "0.2.22" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" +checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033" dependencies = [ "proc-macro2", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -7213,14 +7350,14 @@ dependencies = [ "proc-macro-error-attr2", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] name = "proc-macro2" -version = "1.0.87" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] @@ -7243,7 +7380,7 @@ dependencies = [ "memchr", "parking_lot 0.12.3", "protobuf 2.28.0", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -7296,7 +7433,7 @@ dependencies = [ "itertools 0.12.1", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -7309,7 +7446,7 @@ dependencies = [ "itertools 0.13.0", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -7329,60 +7466,60 @@ checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94" [[package]] name = "protobuf" -version = "3.6.0" +version = "3.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3018844a02746180074f621e847703737d27d89d7f0721a7a4da317f88b16385" +checksum = "a3a7c64d9bf75b1b8d981124c14c179074e8caa7dfe7b6a12e6222ddcd0c8f72" dependencies = [ "once_cell", "protobuf-support", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "protobuf-codegen" -version = "3.6.0" +version = "3.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "411c15a212b4de05eb8bc989fd066a74c86bd3c04e27d6e86bd7703b806d7734" +checksum = "e26b833f144769a30e04b1db0146b2aaa53fd2fd83acf10a6b5f996606c18144" dependencies = [ "anyhow", "once_cell", - "protobuf 3.6.0", + "protobuf 3.7.1", "protobuf-parse", "regex", "tempfile", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "protobuf-parse" -version = "3.6.0" +version = "3.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06f45f16b522d92336e839b5e40680095a045e36a1e7f742ba682ddc85236772" +checksum = "322330e133eab455718444b4e033ebfac7c6528972c784fcde28d2cc783c6257" dependencies = [ "anyhow", "indexmap 2.6.0", "log", - "protobuf 3.6.0", + "protobuf 3.7.1", "protobuf-support", "tempfile", - "thiserror", + "thiserror 1.0.69", "which", ] [[package]] name = "protobuf-support" -version = "3.6.0" +version = "3.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faf96d872914fcda2b66d66ea3fff2be7c66865d31c7bb2790cff32c0e714880" +checksum = "b088fd20b938a875ea00843b6faf48579462630015c3788d397ad6a786663252" dependencies = [ - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "psm" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa37f80ca58604976033fae9515a8a2989fc13797d953f7c04fb8fa36a11f205" +checksum = "200b9ff220857e53e184257720a14553b2f4aa02577d2ed9842d45d4b9654810" dependencies = [ "cc", ] @@ -7426,9 +7563,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quinn" -version = "0.11.5" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684" +checksum = "62e96808277ec6f97351a2380e6c25114bc9e67037775464979f3037c92d05ef" dependencies = [ "bytes", "pin-project-lite", @@ -7437,34 +7574,38 @@ dependencies = [ "rustc-hash 2.0.0", "rustls", "socket2 0.5.7", - "thiserror", + "thiserror 2.0.3", "tokio", "tracing", ] [[package]] name = "quinn-proto" -version = "0.11.8" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6" +checksum = "a2fe5ef3495d7d2e377ff17b1a8ce2ee2ec2a18cde8b6ad6619d65d0701c135d" dependencies = [ "bytes", + "getrandom", "rand", "ring 0.17.8", "rustc-hash 2.0.0", "rustls", + "rustls-pki-types", "slab", - "thiserror", + "thiserror 2.0.3", "tinyvec", "tracing", + "web-time", ] [[package]] name = "quinn-udp" -version = "0.5.5" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fe68c2e9e1a1234e218683dbdf9f9dfcb094113c5ac2b938dfcb9bab4c4140b" +checksum = "7d5a626c6807713b15cac82a6acaccd6043c9a5408c24baae07611fec3f243da" dependencies = [ + "cfg_aliases", "libc", "once_cell", "socket2 0.5.7", @@ -7624,7 +7765,7 @@ checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", "libredox", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -7655,13 +7796,13 @@ dependencies = [ [[package]] name = "regex" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.8", + "regex-automata 0.4.9", "regex-syntax 0.8.5", ] @@ -7676,9 +7817,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ "aho-corasick", "memchr", @@ -7738,7 +7879,7 @@ dependencies = [ "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", - "hyper 0.14.30", + "hyper 0.14.31", "hyper-tls 0.5.0", "ipnet", "js-sys", @@ -7768,9 +7909,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.12.8" +version = "0.12.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f713147fbe92361e52392c73b8c9e48c04c6625bce969ef54dc901e58e042a7b" +checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f" dependencies = [ "async-compression", "base64 0.22.1", @@ -7778,11 +7919,11 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2 0.4.6", + "h2 0.4.7", "http 1.1.0", "http-body 1.0.1", "http-body-util", - "hyper 1.4.1", + "hyper 1.5.1", "hyper-rustls", "hyper-tls 0.6.0", "hyper-util", @@ -7797,13 +7938,13 @@ dependencies = [ "pin-project-lite", "quinn", "rustls", - "rustls-native-certs 0.8.0", + "rustls-native-certs 0.8.1", "rustls-pemfile 2.2.0", "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", - "sync_wrapper 1.0.1", + "sync_wrapper 1.0.2", "system-configuration 0.6.1", "tokio", "tokio-native-tls", @@ -7989,12 +8130,12 @@ dependencies = [ [[package]] name = "rust-ini" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e2a3bcec1f113553ef1c88aae6c020a369d03d55b58de9869a0908930385091" +checksum = "3e0698206bcb8882bf2a9ecb4c1e7785db57ff052297085a6efd4fe42302068a" dependencies = [ "cfg-if 1.0.0", - "ordered-multimap 0.6.0", + "ordered-multimap 0.7.3", ] [[package]] @@ -8022,7 +8163,7 @@ dependencies = [ "serde-xml-rs", "serde_derive", "sha2", - "thiserror", + "thiserror 1.0.69", "time", "tokio", "tokio-stream", @@ -8105,9 +8246,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.37" +version = "0.38.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" +checksum = "d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6" dependencies = [ "bitflags 2.6.0", "errno 0.3.9", @@ -8118,9 +8259,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.14" +version = "0.23.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "415d9944693cb90382053259f89fbb077ea730ad7273047ec63b19bc9b160ba8" +checksum = "7f1a745511c54ba6d4465e8d5dfbd81b45791756de28d4981af70d6dca128f1e" dependencies = [ "log", "once_cell", @@ -8154,20 +8295,19 @@ dependencies = [ "rustls-pemfile 2.2.0", "rustls-pki-types", "schannel", - "security-framework", + "security-framework 2.11.1", ] [[package]] name = "rustls-native-certs" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a" +checksum = "7fcff2dd52b58a8d98a70243663a0d234c4e2b79235637849d15913394a247d3" dependencies = [ "openssl-probe", - "rustls-pemfile 2.2.0", "rustls-pki-types", "schannel", - "security-framework", + "security-framework 3.0.1", ] [[package]] @@ -8193,6 +8333,9 @@ name = "rustls-pki-types" version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" +dependencies = [ + "web-time", +] [[package]] name = "rustls-webpki" @@ -8257,9 +8400,9 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1" +checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d" dependencies = [ "windows-sys 0.59.0", ] @@ -8340,7 +8483,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ "bitflags 2.6.0", - "core-foundation", + "core-foundation 0.9.4", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1415a607e92bec364ea2cf9264646dcce0f91e6d65281bd6f2819cca3bf39c8" +dependencies = [ + "bitflags 2.6.0", + "core-foundation 0.10.0", "core-foundation-sys", "libc", "security-framework-sys", @@ -8348,9 +8504,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.12.0" +version = "2.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" +checksum = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2" dependencies = [ "core-foundation-sys", "libc", @@ -8371,7 +8527,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" dependencies = [ - "semver-parser 0.10.2", + "semver-parser 0.10.3", ] [[package]] @@ -8388,9 +8544,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "semver-parser" -version = "0.10.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" +checksum = "9900206b54a3527fdc7b8a938bffd94a568bac4f4aa8113b209df75a09c0dec2" dependencies = [ "pest", ] @@ -8403,9 +8559,9 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" [[package]] name = "serde" -version = "1.0.210" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" +checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" dependencies = [ "serde_derive", ] @@ -8428,7 +8584,7 @@ checksum = "65162e9059be2f6a3421ebbb4fef3e74b7d9e7c60c50a0e292c6239f19f1edfa" dependencies = [ "log", "serde", - "thiserror", + "thiserror 1.0.69", "xml-rs", ] @@ -8452,13 +8608,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.210" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" +checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -8472,9 +8628,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.128" +version = "1.0.133" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" dependencies = [ "itoa", "memchr", @@ -8500,7 +8656,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -8551,7 +8707,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -8668,7 +8824,7 @@ checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085" dependencies = [ "num-bigint 0.4.6", "num-traits", - "thiserror", + "thiserror 1.0.69", "time", ] @@ -8835,7 +8991,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -8851,7 +9007,7 @@ dependencies = [ "rand", "ring 0.16.20", "subtle", - "thiserror", + "thiserror 1.0.69", "tokio", "url", "webrtc-util", @@ -8876,9 +9032,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.79" +version = "2.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" +checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" dependencies = [ "proc-macro2", "quote", @@ -8887,26 +9043,14 @@ dependencies = [ [[package]] name = "syn-solidity" -version = "0.8.8" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebfc1bfd06acc78f16d8fd3ef846bc222ee7002468d10a7dce8d703d6eab89a3" +checksum = "f76fe0a3e1476bdaa0775b9aec5b869ed9520c2b2fedfe9c6df3618f8ea6290b" dependencies = [ "paste", "proc-macro2", "quote", - "syn 2.0.79", -] - -[[package]] -name = "syn_derive" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b" -dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -8917,9 +9061,9 @@ checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] name = "sync_wrapper" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" dependencies = [ "futures-core", ] @@ -8932,7 +9076,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -8957,7 +9101,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" dependencies = [ "bitflags 1.3.2", - "core-foundation", + "core-foundation 0.9.4", "system-configuration-sys 0.5.0", ] @@ -8968,7 +9112,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" dependencies = [ "bitflags 2.6.0", - "core-foundation", + "core-foundation 0.9.4", "system-configuration-sys 0.6.0", ] @@ -9024,35 +9168,55 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.13.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" +checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c" dependencies = [ "cfg-if 1.0.0", - "fastrand 2.1.1", + "fastrand 2.2.0", "once_cell", - "rustix 0.38.37", + "rustix 0.38.41", "windows-sys 0.59.0", ] [[package]] name = "thiserror" -version = "1.0.64" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" +dependencies = [ + "thiserror-impl 1.0.69", +] + +[[package]] +name = "thiserror" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" +checksum = "c006c85c7651b3cf2ada4584faa36773bd07bac24acfb39f3c431b36d7e667aa" dependencies = [ - "thiserror-impl", + "thiserror-impl 2.0.3", ] [[package]] name = "thiserror-impl" -version = "1.0.64" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", +] + +[[package]] +name = "thiserror-impl" +version = "2.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f077553d607adc1caf65430528a576c757a71ed73944b66ebb58ef2bbd243568" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.89", ] [[package]] @@ -9144,6 +9308,16 @@ dependencies = [ "crunchy", ] +[[package]] +name = "tinystr" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" +dependencies = [ + "displaydoc", + "zerovec", +] + [[package]] name = "tinyvec" version = "1.8.0" @@ -9161,9 +9335,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.40.0" +version = "1.41.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" +checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33" dependencies = [ "backtrace", "bytes", @@ -9206,7 +9380,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -9353,10 +9527,10 @@ dependencies = [ "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", - "hyper 0.14.30", + "hyper 0.14.31", "hyper-timeout 0.4.1", "percent-encoding", - "pin-project 1.1.6", + "pin-project 1.1.7", "prost 0.12.6", "tokio", "tokio-stream", @@ -9374,20 +9548,20 @@ checksum = "877c5b330756d856ffcc4553ab34a5684481ade925ecc54bcd1bf02b1d0d4d52" dependencies = [ "async-stream", "async-trait", - "axum 0.7.7", + "axum 0.7.9", "base64 0.22.1", "bytes", - "h2 0.4.6", + "h2 0.4.7", "http 1.1.0", "http-body 1.0.1", "http-body-util", - "hyper 1.4.1", - "hyper-timeout 0.5.1", + "hyper 1.5.1", + "hyper-timeout 0.5.2", "hyper-util", "percent-encoding", - "pin-project 1.1.6", + "pin-project 1.1.7", "prost 0.13.3", - "rustls-native-certs 0.8.0", + "rustls-native-certs 0.8.1", "rustls-pemfile 2.2.0", "socket2 0.5.7", "tokio", @@ -9408,7 +9582,7 @@ dependencies = [ "futures-core", "futures-util", "indexmap 1.9.3", - "pin-project 1.1.6", + "pin-project 1.1.7", "pin-project-lite", "rand", "slab", @@ -9478,7 +9652,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3566e8ce28cc0a3fe42519fc80e6b4c943cc4c8cef275620eb8dac2d3d4e06cf" dependencies = [ "crossbeam-channel", - "thiserror", + "thiserror 1.0.69", "time", "tracing-subscriber", ] @@ -9491,7 +9665,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -9573,7 +9747,7 @@ dependencies = [ "rustls", "rustls-pki-types", "sha1", - "thiserror", + "thiserror 1.0.69", "utf-8", ] @@ -9618,33 +9792,15 @@ checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" [[package]] name = "unicase" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" -dependencies = [ - "version_check", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.17" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" +checksum = "7e51b68083f157f853b6379db119d1c1be0e6e4dec98101079dec41f6f5cf6df" [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" - -[[package]] -name = "unicode-normalization" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" -dependencies = [ - "tinyvec", -] +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unicode-segmentation" @@ -9684,9 +9840,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.2" +version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +checksum = "8d157f1b96d14500ffdc1f10ba712e780825526c03d9a49b4d0324b0d9113ada" dependencies = [ "form_urlencoded", "idna", @@ -9705,6 +9861,18 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" +[[package]] +name = "utf16_iter" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" + +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + [[package]] name = "utf8parse" version = "0.2.2" @@ -9713,9 +9881,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" +checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" [[package]] name = "valuable" @@ -9815,7 +9983,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", "wasm-bindgen-shared", ] @@ -9849,7 +10017,7 @@ checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -9880,9 +10048,9 @@ dependencies = [ [[package]] name = "wasm-streams" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e072d4e72f700fb3443d8fe94a39315df013eef1104903cdb0a2abd322bbecd" +checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65" dependencies = [ "futures-util", "js-sys", @@ -9901,7 +10069,7 @@ dependencies = [ "rkyv", "smallvec", "target-lexicon 0.12.16", - "thiserror", + "thiserror 1.0.69", "wasmer-types-near", "wasmer-vm-near", "wasmparser 0.78.2", @@ -9939,7 +10107,7 @@ dependencies = [ "more-asserts", "rustc-demangle", "target-lexicon 0.12.16", - "thiserror", + "thiserror 1.0.69", "wasmer-compiler-near", "wasmer-types-near", "wasmer-vm-near", @@ -9956,7 +10124,7 @@ dependencies = [ "leb128", "region", "rkyv", - "thiserror", + "thiserror 1.0.69", "wasmer-compiler-near", "wasmer-engine-near", "wasmer-types-near", @@ -9966,18 +10134,18 @@ dependencies = [ [[package]] name = "wasmer-runtime-core-near" -version = "0.18.3" +version = "0.18.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3fac37da3c625e98708c5dd92d3f642aaf700fd077168d3d0fff277ec6a165" +checksum = "af9c54899b847f8bab6d47295487c9827f14cc411bd70b168e87a4ea017ccd7e" dependencies = [ "bincode", "blake3", - "borsh 0.9.3", + "borsh 1.5.3", "cc", "digest 0.8.1", "errno 0.2.8", "hex", - "indexmap 1.9.3", + "indexmap 2.6.0", "lazy_static", "libc", "nix 0.15.0", @@ -10010,12 +10178,12 @@ dependencies = [ [[package]] name = "wasmer-singlepass-backend-near" -version = "0.18.1" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f6edd0ba6c0bcf9b279186d4dbe81649dda3e5ef38f586865943de4dcd653f8" +checksum = "9358673d39c3b4a15374fba0536bfe5e50485e7c826de50d2dbef8c96df07674" dependencies = [ "bincode", - "borsh 0.9.3", + "borsh 1.5.3", "byteorder", "dynasm 1.2.3", "dynasmrt 1.2.3", @@ -10036,7 +10204,7 @@ checksum = "1ba154adffb0fbd33f5dabd3788a1744d846b43e6e090d44269c7ee8fa5743e4" dependencies = [ "indexmap 1.9.3", "rkyv", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -10054,7 +10222,7 @@ dependencies = [ "more-asserts", "region", "rkyv", - "thiserror", + "thiserror 1.0.69", "wasmer-types-near", "winapi", ] @@ -10169,7 +10337,7 @@ dependencies = [ "log", "object 0.32.2", "target-lexicon 0.12.16", - "thiserror", + "thiserror 1.0.69", "wasmparser 0.115.0", "wasmtime-cranelift-shared", "wasmtime-environ", @@ -10207,7 +10375,7 @@ dependencies = [ "serde", "serde_derive", "target-lexicon 0.12.16", - "thiserror", + "thiserror 1.0.69", "wasmparser 0.115.0", "wasmtime-types", ] @@ -10227,7 +10395,7 @@ dependencies = [ "log", "object 0.32.2", "rustc-demangle", - "rustix 0.38.37", + "rustix 0.38.41", "serde", "serde_derive", "target-lexicon 0.12.16", @@ -10275,7 +10443,7 @@ dependencies = [ "memoffset 0.9.1", "paste", "rand", - "rustix 0.38.37", + "rustix 0.38.41", "sptr", "wasm-encoder 0.35.0", "wasmtime-asm-macros", @@ -10295,7 +10463,7 @@ dependencies = [ "cranelift-entity", "serde", "serde_derive", - "thiserror", + "thiserror 1.0.69", "wasmparser 0.115.0", ] @@ -10307,7 +10475,7 @@ checksum = "09b5575a75e711ca6c36bb9ad647c93541cdc8e34218031acba5da3f35919dd3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -10338,9 +10506,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.6" +version = "0.26.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958" +checksum = "5d642ff16b7e79272ae451b7322067cdc17cadf68c23264be9d94a32319efe7e" dependencies = [ "rustls-pki-types", ] @@ -10361,7 +10529,7 @@ dependencies = [ "log", "nix 0.24.3", "rand", - "thiserror", + "thiserror 1.0.69", "tokio", "winapi", ] @@ -10375,7 +10543,7 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.37", + "rustix 0.38.41", ] [[package]] @@ -10631,7 +10799,7 @@ dependencies = [ "futures", "http 1.1.0", "http-body-util", - "hyper 1.4.1", + "hyper 1.5.1", "hyper-util", "log", "once_cell", @@ -10642,6 +10810,18 @@ dependencies = [ "url", ] +[[package]] +name = "write16" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" + +[[package]] +name = "writeable" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" + [[package]] name = "ws_stream_wasm" version = "0.7.4" @@ -10655,7 +10835,7 @@ dependencies = [ "pharos", "rustc_version 0.4.1", "send_wrapper", - "thiserror", + "thiserror 1.0.69", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -10694,15 +10874,15 @@ dependencies = [ "nom", "oid-registry", "rusticata-macros", - "thiserror", + "thiserror 1.0.69", "time", ] [[package]] name = "xml-rs" -version = "0.8.22" +version = "0.8.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af4e2e2f7cba5a093896c1e150fbfe177d1883e7448200efb81d40b9d339ef26" +checksum = "af310deaae937e48a26602b730250b4949e125f468f11e6990be3e5304ddd96f" [[package]] name = "xz2" @@ -10714,12 +10894,14 @@ dependencies = [ ] [[package]] -name = "yaml-rust" -version = "0.4.5" +name = "yaml-rust2" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" +checksum = "8902160c4e6f2fb145dbe9d6760a75e3c9522d8bf796ed7047c85919ac7115f8" dependencies = [ - "linked-hash-map", + "arraydeque", + "encoding_rs", + "hashlink", ] [[package]] @@ -10728,6 +10910,30 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" +[[package]] +name = "yoke" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.89", + "synstructure", +] + [[package]] name = "zerocopy" version = "0.7.35" @@ -10746,7 +10952,28 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", +] + +[[package]] +name = "zerofrom" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.89", + "synstructure", ] [[package]] @@ -10766,7 +10993,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -10783,6 +11010,28 @@ dependencies = [ "rustc-hex", ] +[[package]] +name = "zerovec" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.89", +] + [[package]] name = "zstd" version = "0.13.2" diff --git a/Cargo.toml b/Cargo.toml index 6667c961..8236e316 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,7 +28,7 @@ eyre = "0.6" futures-util = "0.3.30" log = "0.4" prometheus = "0.13" -reqwest = "0.12.8" +reqwest = { version = "0.12.8", features = ["json"] } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" serde_yaml = "0.9" diff --git a/indexer/Cargo.toml b/indexer/Cargo.toml index 047b5e69..66745698 100644 --- a/indexer/Cargo.toml +++ b/indexer/Cargo.toml @@ -33,6 +33,7 @@ near-config-utils = { git = "https://github.com/near/nearcore", rev = "93073d762 near-client-primitives = { git = "https://github.com/near/nearcore", rev = "93073d762ff377382ebf54e7cbff448b492e72c6" } borsh = { version = "1.0.0", features = ["derive", "rc"] } serde_yaml = "0.9.34" +reqwest = { workspace = true } [dev-dependencies] near-crypto = { git = "https://github.com/near/nearcore", rev = "93073d762ff377382ebf54e7cbff448b492e72c6" } diff --git a/indexer/src/errors.rs b/indexer/src/errors.rs index 74bb65db..1ea58678 100644 --- a/indexer/src/errors.rs +++ b/indexer/src/errors.rs @@ -30,6 +30,14 @@ pub enum Error { ActixErrorKind(std::io::ErrorKind), #[error{"0"}] JoinError(#[from] tokio::task::JoinError), + #[error("Indexer not initialized")] + IndexerNotInitialized, + #[error("Network error: {0}")] + NetworkError(String), + #[error("API error: {0}")] + ApiError(String), + #[error("Deserialize jsonerror: {0}")] + DeserializeJsonError(String), } impl From> for Error { @@ -57,4 +65,4 @@ impl From for Error { } } -pub type Result = std::result::Result; +pub type Result = std::result::Result; \ No newline at end of file diff --git a/indexer/src/fastnear.rs b/indexer/src/fastnear.rs new file mode 100644 index 00000000..adb515c1 --- /dev/null +++ b/indexer/src/fastnear.rs @@ -0,0 +1,195 @@ +use std::collections::HashMap; +use near_indexer::near_primitives::{types::AccountId, views::{ActionView, ExecutionStatusView, ReceiptEnumView}}; +use reqwest::Client; +use tokio::sync::{mpsc::{Sender, Receiver}, mpsc}; +use tracing::{info, error, debug, trace}; + +use crate::{errors::Error, rmq_publisher::{get_routing_key, PublishData, PublishOptions, PublishPayload, PublisherContext}, types::{BlockWithTxHashes, IndexerExecutionOutcomeWithReceiptAndTxHash, PartialCandidateData, PartialCandidateDataWithBlockTxHash}}; + +const FASTNEAR_ENDPOINT: &str = "https://testnet.neardata.xyz/v0/last_block/final"; + +#[derive(Debug)] +pub struct FastNearIndexer { + client: Client, + addresses_to_rollup_ids: HashMap, +} + +impl FastNearIndexer { + pub(crate) fn new(addresses_to_rollup_ids: HashMap) -> Self { + debug!(target: "fastnear_indexer", "Creating new FastNearIndexer"); + Self { + client: Client::new(), + addresses_to_rollup_ids, + } + } + + pub fn run(&self) -> Receiver { + info!(target: "fastnear_indexer", "Starting FastNearIndexer"); + let block_receiver = self.stream_latest_blocks(); + let (publish_sender, publish_receiver) = mpsc::channel(100); + + let addresses_to_rollup_ids = self.addresses_to_rollup_ids.clone(); + + tokio::spawn(async move { + Self::process_blocks(block_receiver, publish_sender, addresses_to_rollup_ids).await; + }); + + publish_receiver + } + + async fn process_blocks( + mut block_receiver: Receiver, + publish_sender: Sender, + addresses_to_rollup_ids: HashMap, + ) { + debug!(target: "fastnear_indexer", "Starting block processing"); + while let Some(block) = block_receiver.recv().await { + trace!(target: "fastnear_indexer", "Received block: {:?}", block.block.header.height); + if let Err(e) = Self::parse_and_publish_block(block, &publish_sender, &addresses_to_rollup_ids).await { + error!(target: "fastnear_indexer", "Error parsing and publishing block: {:?}", e); + } + } + } + + async fn parse_and_publish_block( + block: BlockWithTxHashes, + publish_sender: &Sender, + addresses_to_rollup_ids: &HashMap, + ) -> Result<(), Error> { + debug!(target: "fastnear_indexer", "Parsing block: {:?}", block.block.header.height); + for shard in block.shards { + for receipt_execution_outcome in shard.receipt_execution_outcomes { + let receiver_id = &receipt_execution_outcome.receipt.receiver_id; + debug!(target: "fastnear_indexer", "Processing receipt for receiver_id: {}", receiver_id); + if let Some(rollup_id) = addresses_to_rollup_ids.get(receiver_id) { + trace!(target: "fastnear_indexer", "Processing receipt for rollup_id: {}", rollup_id); + if !Self::is_successful_execution(&receipt_execution_outcome) { + trace!(target: "fastnear_indexer", "Skipping unsuccessful execution for rollup_id: {}", rollup_id); + continue; + } + + let partial_candidate_data = Self::receipt_filter_map( + receipt_execution_outcome.receipt.receipt, + *rollup_id + ); + + if let (Some(partial_data), Some(tx_hash)) = (partial_candidate_data, receipt_execution_outcome.tx_hash) { + let candidate_data = PartialCandidateDataWithBlockTxHash { + rollup_id: *rollup_id, + payloads: partial_data.payloads, + tx_hash, + block_hash: block.block.header.hash, + }; + debug!(target: "fastnear_indexer", "Sending candidate data for rollup_id: {}", rollup_id); + Self::send(&candidate_data, publish_sender).await?; + } + } + } + } + + Ok(()) + } + + pub fn stream_latest_blocks(&self) -> mpsc::Receiver { + info!(target: "fastnear_indexer", "Starting block stream"); + let (block_sender, block_receiver) = mpsc::channel(100); + let client = self.client.clone(); + + tokio::spawn(async move { + loop { + match Self::fetch_latest_block(&client).await { + Ok(block) => { + if block_sender.send(block.clone()).await.is_err() { + error!(target: "fastnear_indexer", "Failed to send block to channel"); + break; + } + info!(target: "fastnear_indexer", "Successfully fetched and sent latest block with id: {}", block.block.header.height); + } + Err(e) => error!(target: "fastnear_indexer", "Error fetching latest block: {:?}", e), + } + tokio::time::sleep(std::time::Duration::from_secs(1)).await; + } + }); + + block_receiver + } + + async fn fetch_latest_block(client: &Client) -> Result { + debug!(target: "fastnear_indexer", "Fetching latest block"); + let response = client.get(FASTNEAR_ENDPOINT) + .send() + .await + .and_then(|r| r.error_for_status()) + .map_err(|e| Error::NetworkError(e.to_string()))?; + + response.json::() + .await + .map_err(|e| Error::DeserializeJsonError(e.to_string())) + } + + async fn send(candidate_data: &PartialCandidateDataWithBlockTxHash, sender: &Sender) -> Result<(), Error> { + trace!(target: "fastnear_indexer", "Sending candidate data: {:?}", candidate_data); + for data in candidate_data.clone().payloads { + let publish_data = PublishData { + publish_options: PublishOptions { + routing_key: get_routing_key(candidate_data.rollup_id), + ..PublishOptions::default() + }, + cx: PublisherContext { + block_hash: candidate_data.block_hash, + }, + payload: PublishPayload { + transaction_id: candidate_data.tx_hash, + data, + }, + }; + sender.send(publish_data).await? + } + + Ok(()) + } + + fn is_successful_execution(receipt_execution_outcome: &IndexerExecutionOutcomeWithReceiptAndTxHash) -> bool { + let is_successful = matches!( + receipt_execution_outcome.execution_outcome.outcome.status, + ExecutionStatusView::SuccessValue(ref value) if value.is_empty() + ); + trace!(target: "fastnear_indexer", "Execution successful: {}", is_successful); + is_successful + } + + fn receipt_filter_map(receipt_enum_view: ReceiptEnumView, rollup_id: u32) -> Option { + trace!(target: "fastnear_indexer", "Filtering receipt for rollup_id: {}", rollup_id); + let payloads = match receipt_enum_view { + ReceiptEnumView::Action { actions, .. } => { + actions.into_iter() + .filter_map(Self::extract_args) + .collect::>>() + } + _ => return None, + }; + + if payloads.is_empty() { + trace!(target: "fastnear_indexer", "No payloads found for rollup_id: {}", rollup_id); + return None; + } + + Some(PartialCandidateData { + rollup_id, + payloads, + }) + } + + fn extract_args(action: ActionView) -> Option> { + match action { + ActionView::FunctionCall { method_name, args, .. } if method_name == "submit" => { + trace!(target: "fastnear_indexer", "Extracted args for 'submit' method"); + Some(args.into()) + }, + _ => { + trace!(target: "fastnear_indexer", "Skipped non-'submit' method"); + None + }, + } + } +} \ No newline at end of file diff --git a/indexer/src/main.rs b/indexer/src/main.rs index feeb98fc..3925dd24 100644 --- a/indexer/src/main.rs +++ b/indexer/src/main.rs @@ -17,6 +17,7 @@ mod metrics; mod metrics_server; mod rmq_publisher; mod types; +mod fastnear; const INDEXER: &str = "indexer"; diff --git a/indexer/src/types.rs b/indexer/src/types.rs index 7552b95e..77694afa 100644 --- a/indexer/src/types.rs +++ b/indexer/src/types.rs @@ -2,6 +2,8 @@ use std::collections::VecDeque; use std::fmt::Formatter; use std::{fmt, sync}; use tokio::sync::Mutex; +use near_indexer::{near_primitives::{hash::CryptoHash, types::ShardId, views::{BlockView, ExecutionOutcomeWithIdView, ReceiptView, StateChangeWithCauseView}}, IndexerChunkView, StreamerMessage}; +use tokio::sync::mpsc::Receiver; pub(crate) type ProtectedQueue = sync::Arc>>; @@ -11,6 +13,56 @@ pub(crate) struct CandidateData { pub transaction: near_indexer::IndexerTransactionWithOutcome, pub payloads: Vec>, } +#[derive(Clone, Debug)] +pub (crate) struct PartialCandidateData { + pub rollup_id: u32, + pub payloads: Vec>, +} +#[derive(Clone, Debug)] +pub(crate) struct PartialCandidateDataWithBlockTxHash { + pub rollup_id: u32, + pub payloads: Vec>, + pub tx_hash: CryptoHash, + pub block_hash: CryptoHash, +} +#[derive(Debug, serde::Serialize, serde::Deserialize, Clone)] +pub struct BlockWithTxHashes { + pub block: BlockView, + pub shards: Vec, +} + +#[derive(Debug, serde::Serialize, serde::Deserialize, Clone)] +pub struct IndexerShardWithTxHashes { + pub shard_id: ShardId, + pub chunk: Option, + pub receipt_execution_outcomes: Vec, + pub state_changes: Vec, +} + +pub enum IndexerStream { + StreamerMessage(Receiver), + BlockWithTxHashes(Receiver), +} + +impl From> for IndexerStream { + fn from(value: Receiver) -> Self { + IndexerStream::StreamerMessage(value) + } +} + +impl From> for IndexerStream { + fn from(value: Receiver) -> Self { + IndexerStream::BlockWithTxHashes(value) + } +} + +#[derive(Clone, Debug, serde::Serialize, serde::Deserialize)] +pub struct IndexerExecutionOutcomeWithReceiptAndTxHash { + pub execution_outcome: ExecutionOutcomeWithIdView, + pub receipt: ReceiptView, + pub tx_hash: Option, +} + impl fmt::Display for CandidateData { fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result { @@ -22,4 +74,4 @@ impl fmt::Display for CandidateData { self.transaction.transaction.receiver_id )) } -} +} \ No newline at end of file From b5d38beb0b9e037ad3efb8292a1d4e25f361461c Mon Sep 17 00:00:00 2001 From: Sasha Syrotenko Date: Mon, 25 Nov 2024 11:53:02 +0200 Subject: [PATCH 02/40] Finish fastnear setup for indexer --- Cargo.lock | 18 +++++------ indexer/Cargo.toml | 3 ++ indexer/FastIndexer.dockerfile | 47 +++++++++++++++++++++++++++ indexer/README.md | 14 +++++++- indexer/src/main.rs | 59 ++++++++++++++++++++-------------- indexer/src/metrics.rs | 2 +- 6 files changed, 107 insertions(+), 36 deletions(-) create mode 100644 indexer/FastIndexer.dockerfile diff --git a/Cargo.lock b/Cargo.lock index 45e1cb3b..9e640786 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2241,7 +2241,7 @@ dependencies = [ "home", "http 1.1.0", "http-body-util", - "hyper 1.4.1", + "hyper 1.5.1", "hyper-named-pipe", "hyper-rustls", "hyper-util", @@ -2257,7 +2257,7 @@ dependencies = [ "serde_json", "serde_repr", "serde_urlencoded", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-util", "tower-service", @@ -4416,7 +4416,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73b7d8abf35697b81a825e386fc151e0d503e8cb5fcb93cc8669c376dfd6f278" dependencies = [ "hex", - "hyper 1.4.1", + "hyper 1.5.1", "hyper-util", "pin-project-lite", "tokio", @@ -4523,7 +4523,7 @@ checksum = "986c5ce3b994526b3cd75578e62554abd09f0899d6206de48b3e96ab34ccc8c7" dependencies = [ "hex", "http-body-util", - "hyper 1.4.1", + "hyper 1.5.1", "hyper-util", "pin-project-lite", "tokio", @@ -7113,7 +7113,7 @@ dependencies = [ "regex", "regex-syntax 0.8.5", "structmeta", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -9118,7 +9118,7 @@ dependencies = [ "proc-macro2", "quote", "structmeta-derive", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -9129,7 +9129,7 @@ checksum = "152a0b65a590ff6c3da95cabe2353ee04e6167c896b28e3b14478c2636c922fc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -9382,7 +9382,7 @@ dependencies = [ "serde", "serde_json", "serde_with", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-stream", "tokio-tar", @@ -11122,7 +11122,7 @@ checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", "linux-raw-sys 0.4.14", - "rustix 0.38.37", + "rustix 0.38.41", ] [[package]] diff --git a/indexer/Cargo.toml b/indexer/Cargo.toml index 66745698..ed436027 100644 --- a/indexer/Cargo.toml +++ b/indexer/Cargo.toml @@ -37,3 +37,6 @@ reqwest = { workspace = true } [dev-dependencies] near-crypto = { git = "https://github.com/near/nearcore", rev = "93073d762ff377382ebf54e7cbff448b492e72c6" } + +[features] +use_fastnear = [] diff --git a/indexer/FastIndexer.dockerfile b/indexer/FastIndexer.dockerfile new file mode 100644 index 00000000..5d66cf55 --- /dev/null +++ b/indexer/FastIndexer.dockerfile @@ -0,0 +1,47 @@ +FROM rust:1.81-bookworm AS builder +WORKDIR /tmp/indexer + +# Copy from nearcore: +# https://github.com/near/nearcore/blob/master/Dockerfile +RUN apt-get update -qq && \ + apt-get install -y \ + git \ + cmake \ + g++ \ + pkg-config \ + libssl-dev \ + curl \ + llvm \ + clang + +COPY ./Cargo.toml . +RUN mkdir ./src && echo "fn main() {}" > ./src/main.rs +RUN cargo build --release -p indexer --features use_fastnear + +COPY . . +RUN touch ./src/main.rs + +RUN cargo build --release -p indexer --features use_fastnear + +FROM debian:bookworm-slim as runtime +WORKDIR /indexer-app + +RUN apt update && apt install -yy openssl ca-certificates jq curl + +COPY --from=builder /tmp/indexer/target/release/indexer . +COPY entrypoint.sh ./entrypoint.sh +RUN chmod +x ./entrypoint.sh + +EXPOSE 3030 + +HEALTHCHECK --interval=20s --timeout=30s --retries=10000 \ + CMD (curl -f -s -X POST -H "Content-Type: application/json" \ + -d '{"jsonrpc":"2.0","method":"block","params":{"finality":"optimistic"},"id":"dontcare"}' \ + http://localhost:3030 | \ + jq -es 'if . == [] then null else .[] | (now - (.result.header.timestamp / 1000000000)) < 10 end') && \ + (curl -f -s -X POST -H "Content-Type: application/json" \ + -d '{"jsonrpc":"2.0","method":"status","params":[],"id":"dontcare"}' \ + http://localhost:3030 | \ + jq -es 'if . == [] then null else .[] | .result.sync_info.syncing == false end') + +ENTRYPOINT [ "./entrypoint.sh" ] \ No newline at end of file diff --git a/indexer/README.md b/indexer/README.md index c400320b..ba2c128e 100644 --- a/indexer/README.md +++ b/indexer/README.md @@ -21,4 +21,16 @@ $ cargo run --release -- --home-dir ~/.near/localnet/ run --da-contract-id "da.t Now the node have started, and we listen to "submit" method in DA contract. -Use [near-cli](https://github.com/near/near-shell) to "submit" calldata. \ No newline at end of file +Use [near-cli](https://github.com/near/near-shell) to "submit" calldata. + +### FastNear Mode + +To run the Indexer using FastNear endpoints, use the following command: + +```bash +$ cargo run --features use_fastnear -p indexer --release -- --home-dir ~/.near/testnet run --da-contract-ids da.testnet --rollup-ids 2 +``` + +This command will start the indexer using FastNEAR endpoints to fetch NEAR blocks more efficiently. The `--features use_fastnear` flag enables the FastNEAR mode. + +Note: FastNEAR will only work with NEAR mainnet and testnet. For local testing it is recommended to use a local NEAR node. \ No newline at end of file diff --git a/indexer/src/main.rs b/indexer/src/main.rs index 3925dd24..c4f6ab03 100644 --- a/indexer/src/main.rs +++ b/indexer/src/main.rs @@ -2,11 +2,15 @@ use clap::Parser; use configs::{Opts, SubCommand}; use prometheus::Registry; use tracing::{error, info}; +use tokio::sync::mpsc::Receiver; +use crate::rmq_publisher::PublishData; use crate::{ candidates_validator::CandidatesValidator, configs::RunConfigArgs, errors::Error, errors::Result, indexer_wrapper::IndexerWrapper, metrics::Metricable, metrics_server::MetricsServer, rmq_publisher::RmqPublisher, }; +use crate::fastnear::FastNearIndexer; +use crate::metrics::INDEXER_NAMESPACE; mod block_listener; mod candidates_validator; @@ -38,30 +42,39 @@ fn run(home_dir: std::path::PathBuf, config: RunConfigArgs) -> Result<()> { } else { None }; - - // TODO: refactor + // TODO[sasha/firat]: refactor, added some logic to handle the case when fastnear is enabled. + // Needs tests and maybe refactoring for base case let block_res = system.block_on(async move { - let mut indexer = IndexerWrapper::new(indexer_config, addresses_to_rollup_ids); - if let Some(_) = config.metrics_ip_port_address { - indexer.enable_metrics(registry.clone())?; - } - - let (view_client, _) = indexer.client_actors(); - let (block_handle, candidates_stream) = indexer.run(); - let mut candidates_validator = CandidatesValidator::new(view_client); - if let Some(_) = config.metrics_ip_port_address { - candidates_validator.enable_metrics(registry.clone())?; + let validated_stream: Receiver; + if cfg!(feature = "use_fastnear") { + let fastnear_indexer = FastNearIndexer::new(addresses_to_rollup_ids); + validated_stream = fastnear_indexer.run(); + } else { + let mut indexer = IndexerWrapper::new(indexer_config, addresses_to_rollup_ids); + if config.metrics_ip_port_address.is_some() { + indexer.enable_metrics(registry.clone())?; + } + + let (view_client, _) = indexer.client_actors(); + let (block_handle, candidates_stream) = indexer.run(); + let mut candidates_validator = CandidatesValidator::new(view_client); + if config.metrics_ip_port_address.is_some() { + candidates_validator.enable_metrics(registry.clone())?; + } + + validated_stream = candidates_validator.run(candidates_stream); + + // TODO: Handle block_handle whether cancelled or panics + block_handle.await?; } - let validated_stream = candidates_validator.run(candidates_stream); let mut rmq_publisher = RmqPublisher::new(&config.rmq_address)?; - if let Some(_) = config.metrics_ip_port_address { + if config.metrics_ip_port_address.is_some() { rmq_publisher.enable_metrics(registry.clone())?; } rmq_publisher.run(validated_stream); - // TODO: block_handle wether cancelled or Panics. Can handle - Ok::<_, Error>(block_handle.await?) + Ok::<_, Error>(()) }); if let Some(handle) = server_handle { @@ -85,16 +98,12 @@ fn read_config( let config_str = std::fs::read_to_string(config_path)?; serde_yaml::from_str(&config_str).map_err(Into::into) } else { - if let Some(config_args) = config_args { - Ok(config_args) - } else { - panic!("Either config_path or config_args must be provided") - } + config_args.ok_or_else(|| Error::AnyhowError(anyhow::anyhow!("Either config_path or config_args must be provided"))) } } fn main() -> Result<()> { - info!(target: "sffl_indexer", "Starting..."); + info!(target: INDEXER_NAMESPACE, "Starting..."); // We use it to automatically search the for root certificates to perform HTTPS calls // (sending telemetry and downloading genesis) @@ -102,12 +111,12 @@ fn main() -> Result<()> { let env_filter = near_o11y::tracing_subscriber::EnvFilter::new( "nearcore=info,publisher=info,indexer=info,candidates_validator=info,\ metrics=info,tokio_reactor=info,near=info,stats=info,telemetry=info,\ - near-performance-metrics=info", + near-performance-metrics=info,fastnear_indexer=info", ); let _subscriber = near_o11y::default_subscriber(env_filter, &Default::default()).global(); let opts: Opts = Opts::parse(); - let home_dir = opts.home_dir.unwrap_or(near_indexer::get_default_home()); + let home_dir = opts.home_dir.unwrap_or_else(near_indexer::get_default_home); match opts.subcmd { SubCommand::Init(params) => { near_indexer::indexer_init_configs(&home_dir, read_config(params.config, params.args)?.into())?; @@ -115,4 +124,4 @@ fn main() -> Result<()> { } SubCommand::Run(params) => run(home_dir, read_config(params.config, params.run_config_args)?), } -} +} \ No newline at end of file diff --git a/indexer/src/metrics.rs b/indexer/src/metrics.rs index 398e6b3a..90210828 100644 --- a/indexer/src/metrics.rs +++ b/indexer/src/metrics.rs @@ -3,7 +3,7 @@ use prometheus::core::GenericGauge; use crate::errors::Result; -const INDEXER_NAMESPACE: &str = "sffl_indexer"; +pub const INDEXER_NAMESPACE: &str = "nffl_indexer"; const CANDIDATES_SUBSYSTEM: &str = "candidates_validator"; const LISTENER_SUBSYSTEM: &str = "block_listener"; const PUBLISHER_SUBSYSTEM: &str = "rabbit_publisher"; From bd7a4ab9e337bb8e8ac533c66ab7acbc00d20466 Mon Sep 17 00:00:00 2001 From: Sasha Syrotenko Date: Wed, 20 Nov 2024 15:12:01 +0200 Subject: [PATCH 03/40] Update nearcore to v2.4.0-rc1 --- Cargo.lock | 3919 +++++-------------------------------------- indexer/Cargo.toml | 10 +- indexer/Dockerfile | 2 +- rust-toolchain.toml | 2 +- 4 files changed, 412 insertions(+), 3521 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9e640786..1199a615 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -52,7 +52,7 @@ checksum = "0346d8c1f762b41b458ed3145eea914966bb9ad20b9be0d6d463b20d45586370" dependencies = [ "actix-utils", "actix-web", - "derive_more 0.99.18", + "derive_more", "futures-util", "log", "once_cell", @@ -75,11 +75,11 @@ dependencies = [ "brotli", "bytes", "bytestring", - "derive_more 0.99.18", + "derive_more", "encoding_rs", "flate2", "futures-core", - "h2 0.3.26", + "h2", "http 0.2.12", "httparse", "httpdate", @@ -105,7 +105,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb" dependencies = [ "quote", - "syn 2.0.89", + "syn 2.0.87", ] [[package]] @@ -213,7 +213,7 @@ dependencies = [ "bytestring", "cfg-if 1.0.0", "cookie", - "derive_more 0.99.18", + "derive_more", "encoding_rs", "futures-core", "futures-util", @@ -244,7 +244,7 @@ dependencies = [ "actix-router", "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.87", ] [[package]] @@ -255,7 +255,7 @@ checksum = "b6ac1e58cded18cb28ddc17143c4dea5345b3ad575e14f32f66e4054a56eb271" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.87", ] [[package]] @@ -347,694 +347,6 @@ version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "45862d1c77f2228b9e10bc609d5bc203d86ebc9b87ad8d5d5167a6c9abf739d9" -[[package]] -name = "alloy" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "056f2c01b2aed86e15b43c47d109bfc8b82553dc34e66452875e51247ec31ab2" -dependencies = [ - "alloy-consensus", - "alloy-contract", - "alloy-core", - "alloy-eips", - "alloy-genesis", - "alloy-json-rpc", - "alloy-network", - "alloy-node-bindings", - "alloy-provider", - "alloy-pubsub", - "alloy-rpc-client", - "alloy-rpc-types", - "alloy-serde", - "alloy-signer", - "alloy-signer-aws", - "alloy-signer-gcp", - "alloy-signer-ledger", - "alloy-signer-local", - "alloy-transport", - "alloy-transport-http", - "alloy-transport-ipc", - "alloy-transport-ws", -] - -[[package]] -name = "alloy-chains" -version = "0.1.47" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18c5c520273946ecf715c0010b4e3503d7eba9893cd9ce6b7fff5654c4a3c470" -dependencies = [ - "alloy-primitives", - "num_enum", - "strum 0.26.3", -] - -[[package]] -name = "alloy-consensus" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "705687d5bfd019fee57cf9e206b27b30a9a9617535d5590a02b171e813208f8e" -dependencies = [ - "alloy-eips", - "alloy-primitives", - "alloy-rlp", - "alloy-serde", - "auto_impl", - "c-kzg", - "derive_more 1.0.0", - "serde", -] - -[[package]] -name = "alloy-contract" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "917f7d12cf3971dc8c11c9972f732b35ccb9aaaf5f28f2f87e9e6523bee3a8ad" -dependencies = [ - "alloy-dyn-abi", - "alloy-json-abi", - "alloy-network", - "alloy-network-primitives", - "alloy-primitives", - "alloy-provider", - "alloy-pubsub", - "alloy-rpc-types-eth", - "alloy-sol-types", - "alloy-transport", - "futures", - "futures-util", - "thiserror 1.0.69", -] - -[[package]] -name = "alloy-core" -version = "0.8.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8316d83e590f4163b221b8180008f302bda5cf5451202855cdd323e588849c" -dependencies = [ - "alloy-dyn-abi", - "alloy-json-abi", - "alloy-primitives", - "alloy-rlp", - "alloy-sol-types", -] - -[[package]] -name = "alloy-dyn-abi" -version = "0.8.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef2364c782a245cf8725ea6dbfca5f530162702b5d685992ea03ce64529136cc" -dependencies = [ - "alloy-json-abi", - "alloy-primitives", - "alloy-sol-type-parser", - "alloy-sol-types", - "const-hex", - "derive_more 1.0.0", - "itoa", - "serde", - "serde_json", - "winnow", -] - -[[package]] -name = "alloy-eip2930" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0069cf0642457f87a01a014f6dc29d5d893cd4fd8fddf0c3cdfad1bb3ebafc41" -dependencies = [ - "alloy-primitives", - "alloy-rlp", - "serde", -] - -[[package]] -name = "alloy-eip7702" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea59dc42102bc9a1905dc57901edc6dd48b9f38115df86c7d252acba70d71d04" -dependencies = [ - "alloy-primitives", - "alloy-rlp", - "k256", - "serde", -] - -[[package]] -name = "alloy-eips" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ffb906284a1e1f63c4607da2068c8197458a352d0b3e9796e67353d72a9be85" -dependencies = [ - "alloy-eip2930", - "alloy-eip7702", - "alloy-primitives", - "alloy-rlp", - "alloy-serde", - "c-kzg", - "derive_more 1.0.0", - "once_cell", - "serde", - "sha2", -] - -[[package]] -name = "alloy-genesis" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8429cf4554eed9b40feec7f4451113e76596086447550275e3def933faf47ce3" -dependencies = [ - "alloy-primitives", - "alloy-serde", - "serde", -] - -[[package]] -name = "alloy-json-abi" -version = "0.8.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b84c506bf264110fa7e90d9924f742f40ef53c6572ea56a0b0bd714a567ed389" -dependencies = [ - "alloy-primitives", - "alloy-sol-type-parser", - "serde", - "serde_json", -] - -[[package]] -name = "alloy-json-rpc" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8fa8a1a3c4cbd221f2b8e3693aeb328fca79a757fe556ed08e47bbbc2a70db7" -dependencies = [ - "alloy-primitives", - "alloy-sol-types", - "serde", - "serde_json", - "thiserror 1.0.69", - "tracing", -] - -[[package]] -name = "alloy-network" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85fa23a6a9d612b52e402c995f2d582c25165ec03ac6edf64c861a76bc5b87cd" -dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-json-rpc", - "alloy-network-primitives", - "alloy-primitives", - "alloy-rpc-types-eth", - "alloy-serde", - "alloy-signer", - "alloy-sol-types", - "async-trait", - "auto_impl", - "futures-utils-wasm", - "thiserror 1.0.69", -] - -[[package]] -name = "alloy-network-primitives" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "801492711d4392b2ccf5fc0bc69e299fa1aab15167d74dcaa9aab96a54f684bd" -dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-primitives", - "alloy-serde", - "serde", -] - -[[package]] -name = "alloy-node-bindings" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f1334a738aa1710cb8227441b3fcc319202ce78e967ef37406940242df4a454" -dependencies = [ - "alloy-genesis", - "alloy-primitives", - "k256", - "rand", - "serde_json", - "tempfile", - "thiserror 1.0.69", - "tracing", - "url", -] - -[[package]] -name = "alloy-primitives" -version = "0.8.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fce5dbd6a4f118eecc4719eaa9c7ffc31c315e6c5ccde3642db927802312425" -dependencies = [ - "alloy-rlp", - "bytes", - "cfg-if 1.0.0", - "const-hex", - "derive_more 1.0.0", - "foldhash", - "hashbrown 0.15.1", - "hex-literal", - "indexmap 2.6.0", - "itoa", - "k256", - "keccak-asm", - "paste", - "proptest", - "rand", - "ruint", - "rustc-hash 2.0.0", - "serde", - "sha3", - "tiny-keccak", -] - -[[package]] -name = "alloy-provider" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcfaa4ffec0af04e3555686b8aacbcdf7d13638133a0672749209069750f78a6" -dependencies = [ - "alloy-chains", - "alloy-consensus", - "alloy-eips", - "alloy-json-rpc", - "alloy-network", - "alloy-network-primitives", - "alloy-node-bindings", - "alloy-primitives", - "alloy-pubsub", - "alloy-rpc-client", - "alloy-rpc-types-anvil", - "alloy-rpc-types-eth", - "alloy-rpc-types-trace", - "alloy-signer-local", - "alloy-transport", - "alloy-transport-http", - "alloy-transport-ipc", - "alloy-transport-ws", - "async-stream", - "async-trait", - "auto_impl", - "dashmap", - "futures", - "futures-utils-wasm", - "lru 0.12.5", - "pin-project 1.1.7", - "reqwest 0.12.9", - "serde", - "serde_json", - "thiserror 1.0.69", - "tokio", - "tracing", - "url", -] - -[[package]] -name = "alloy-pubsub" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f32cef487122ae75c91eb50154c70801d71fabdb976fec6c49e0af5e6486ab15" -dependencies = [ - "alloy-json-rpc", - "alloy-primitives", - "alloy-transport", - "bimap", - "futures", - "serde", - "serde_json", - "tokio", - "tokio-stream", - "tower 0.5.1", - "tracing", -] - -[[package]] -name = "alloy-rlp" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0822426598f95e45dd1ea32a738dac057529a709ee645fcc516ffa4cbde08f" -dependencies = [ - "alloy-rlp-derive", - "arrayvec", - "bytes", -] - -[[package]] -name = "alloy-rlp-derive" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b09cae092c27b6f1bde952653a22708691802e57bfef4a2973b80bea21efd3f" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.89", -] - -[[package]] -name = "alloy-rpc-client" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "370143ed581aace6e663342d21d209c6b2e34ee6142f7d6675adb518deeaf0dc" -dependencies = [ - "alloy-json-rpc", - "alloy-primitives", - "alloy-pubsub", - "alloy-transport", - "alloy-transport-http", - "alloy-transport-ipc", - "alloy-transport-ws", - "futures", - "pin-project 1.1.7", - "reqwest 0.12.9", - "serde", - "serde_json", - "tokio", - "tokio-stream", - "tower 0.5.1", - "tracing", - "url", -] - -[[package]] -name = "alloy-rpc-types" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ffc534b7919e18f35e3aa1f507b6f3d9d92ec298463a9f6beaac112809d8d06" -dependencies = [ - "alloy-primitives", - "alloy-rpc-types-engine", - "alloy-rpc-types-eth", - "alloy-rpc-types-trace", - "alloy-serde", - "serde", -] - -[[package]] -name = "alloy-rpc-types-anvil" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d780adaa5d95b07ad92006b2feb68ecfa7e2015f7d5976ceaac4c906c73ebd07" -dependencies = [ - "alloy-primitives", - "alloy-serde", - "serde", -] - -[[package]] -name = "alloy-rpc-types-engine" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0285c4c09f838ab830048b780d7f4a4f460f309aa1194bb049843309524c64c" -dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-primitives", - "alloy-rlp", - "derive_more 1.0.0", - "strum 0.26.3", -] - -[[package]] -name = "alloy-rpc-types-eth" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413f4aa3ccf2c3e4234a047c5fa4727916d7daf25a89f9b765df0ba09784fd87" -dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-network-primitives", - "alloy-primitives", - "alloy-rlp", - "alloy-serde", - "alloy-sol-types", - "derive_more 1.0.0", - "itertools 0.13.0", - "serde", - "serde_json", -] - -[[package]] -name = "alloy-rpc-types-trace" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "017cad3e5793c5613588c1f9732bcbad77e820ba7d0feaba3527749f856fdbc5" -dependencies = [ - "alloy-primitives", - "alloy-rpc-types-eth", - "alloy-serde", - "serde", - "serde_json", - "thiserror 1.0.69", -] - -[[package]] -name = "alloy-serde" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dff0ab1cdd43ca001e324dc27ee0e8606bd2161d6623c63e0e0b8c4dfc13600" -dependencies = [ - "alloy-primitives", - "serde", - "serde_json", -] - -[[package]] -name = "alloy-signer" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fd4e0ad79c81a27ca659be5d176ca12399141659fef2bcbfdc848da478f4504" -dependencies = [ - "alloy-dyn-abi", - "alloy-primitives", - "alloy-sol-types", - "async-trait", - "auto_impl", - "elliptic-curve", - "k256", - "thiserror 1.0.69", -] - -[[package]] -name = "alloy-signer-aws" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "417e19d9844350d11f7426d4920a5df777f8c2abbb7a70d9de6f1faf284db15b" -dependencies = [ - "alloy-consensus", - "alloy-network", - "alloy-primitives", - "alloy-signer", - "async-trait", - "aws-sdk-kms", - "k256", - "spki", - "thiserror 1.0.69", - "tracing", -] - -[[package]] -name = "alloy-signer-gcp" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6fd12ae28e8330766821058ed9a6a06ae4f9b12c776e8a7cfb16e3a954f508e" -dependencies = [ - "alloy-consensus", - "alloy-network", - "alloy-primitives", - "alloy-signer", - "async-trait", - "gcloud-sdk", - "k256", - "spki", - "thiserror 1.0.69", - "tracing", -] - -[[package]] -name = "alloy-signer-ledger" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3a02400dea370022151f07581b73a836115c88ce4df350206653493bec024e2" -dependencies = [ - "alloy-consensus", - "alloy-dyn-abi", - "alloy-network", - "alloy-primitives", - "alloy-signer", - "alloy-sol-types", - "async-trait", - "coins-ledger", - "futures-util", - "semver 1.0.23", - "thiserror 1.0.69", - "tracing", -] - -[[package]] -name = "alloy-signer-local" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "494e0a256f3e99f2426f994bcd1be312c02cb8f88260088dacb33a8b8936475f" -dependencies = [ - "alloy-consensus", - "alloy-network", - "alloy-primitives", - "alloy-signer", - "async-trait", - "k256", - "rand", - "thiserror 1.0.69", -] - -[[package]] -name = "alloy-sol-macro" -version = "0.8.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9343289b4a7461ed8bab8618504c995c049c082b70c7332efd7b32125633dc05" -dependencies = [ - "alloy-sol-macro-expander", - "alloy-sol-macro-input", - "proc-macro-error2", - "proc-macro2", - "quote", - "syn 2.0.89", -] - -[[package]] -name = "alloy-sol-macro-expander" -version = "0.8.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4222d70bec485ceccc5d8fd4f2909edd65b5d5e43d4aca0b5dcee65d519ae98f" -dependencies = [ - "alloy-json-abi", - "alloy-sol-macro-input", - "const-hex", - "heck 0.5.0", - "indexmap 2.6.0", - "proc-macro-error2", - "proc-macro2", - "quote", - "syn 2.0.89", - "syn-solidity", - "tiny-keccak", -] - -[[package]] -name = "alloy-sol-macro-input" -version = "0.8.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e17f2677369571b976e51ea1430eb41c3690d344fef567b840bfc0b01b6f83a" -dependencies = [ - "alloy-json-abi", - "const-hex", - "dunce", - "heck 0.5.0", - "proc-macro2", - "quote", - "serde_json", - "syn 2.0.89", - "syn-solidity", -] - -[[package]] -name = "alloy-sol-type-parser" -version = "0.8.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa64d80ae58ffaafdff9d5d84f58d03775f66c84433916dc9a64ed16af5755da" -dependencies = [ - "serde", - "winnow", -] - -[[package]] -name = "alloy-sol-types" -version = "0.8.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6520d427d4a8eb7aa803d852d7a52ceb0c519e784c292f64bb339e636918cf27" -dependencies = [ - "alloy-json-abi", - "alloy-primitives", - "alloy-sol-macro", - "const-hex", - "serde", -] - -[[package]] -name = "alloy-transport" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ac3e97dad3d31770db0fc89bd6a63b789fbae78963086733f960cf32c483904" -dependencies = [ - "alloy-json-rpc", - "base64 0.22.1", - "futures-util", - "futures-utils-wasm", - "serde", - "serde_json", - "thiserror 1.0.69", - "tokio", - "tower 0.5.1", - "tracing", - "url", -] - -[[package]] -name = "alloy-transport-http" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b367dcccada5b28987c2296717ee04b9a5637aacd78eacb1726ef211678b5212" -dependencies = [ - "alloy-json-rpc", - "alloy-transport", - "reqwest 0.12.9", - "serde_json", - "tower 0.5.1", - "tracing", - "url", -] - -[[package]] -name = "alloy-transport-ipc" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b90cf9cde7f2fce617da52768ee28f522264b282d148384a4ca0ea85af04fa3a" -dependencies = [ - "alloy-json-rpc", - "alloy-pubsub", - "alloy-transport", - "bytes", - "futures", - "interprocess", - "pin-project 1.1.7", - "serde_json", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "alloy-transport-ws" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7153b88690de6a50bba81c11e1d706bc41dbb90126d607404d60b763f6a3947f" -dependencies = [ - "alloy-pubsub", - "alloy-transport", - "futures", - "http 1.1.0", - "rustls", - "serde_json", - "tokio", - "tokio-tungstenite", - "tracing", - "ws_stream_wasm", -] - [[package]] name = "amq-protocol" version = "7.2.2" @@ -1168,136 +480,6 @@ version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" -[[package]] -name = "ark-ff" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b3235cc41ee7a12aaaf2c575a2ad7b46713a8a50bda2fc3b003a04845c05dd6" -dependencies = [ - "ark-ff-asm 0.3.0", - "ark-ff-macros 0.3.0", - "ark-serialize 0.3.0", - "ark-std 0.3.0", - "derivative", - "num-bigint 0.4.6", - "num-traits", - "paste", - "rustc_version 0.3.3", - "zeroize", -] - -[[package]] -name = "ark-ff" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec847af850f44ad29048935519032c33da8aa03340876d351dfab5660d2966ba" -dependencies = [ - "ark-ff-asm 0.4.2", - "ark-ff-macros 0.4.2", - "ark-serialize 0.4.2", - "ark-std 0.4.0", - "derivative", - "digest 0.10.7", - "itertools 0.10.5", - "num-bigint 0.4.6", - "num-traits", - "paste", - "rustc_version 0.4.1", - "zeroize", -] - -[[package]] -name = "ark-ff-asm" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db02d390bf6643fb404d3d22d31aee1c4bc4459600aef9113833d17e786c6e44" -dependencies = [ - "quote", - "syn 1.0.109", -] - -[[package]] -name = "ark-ff-asm" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed4aa4fe255d0bc6d79373f7e31d2ea147bcf486cba1be5ba7ea85abdb92348" -dependencies = [ - "quote", - "syn 1.0.109", -] - -[[package]] -name = "ark-ff-macros" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db2fd794a08ccb318058009eefdf15bcaaaaf6f8161eb3345f907222bac38b20" -dependencies = [ - "num-bigint 0.4.6", - "num-traits", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "ark-ff-macros" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7abe79b0e4288889c4574159ab790824d0033b9fdcb2a112a3182fac2e514565" -dependencies = [ - "num-bigint 0.4.6", - "num-traits", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "ark-serialize" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d6c2b318ee6e10f8c2853e73a83adc0ccb88995aa978d8a3408d492ab2ee671" -dependencies = [ - "ark-std 0.3.0", - "digest 0.9.0", -] - -[[package]] -name = "ark-serialize" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adb7b85a02b83d2f22f89bd5cac66c9c89474240cb6207cb1efc16d098e822a5" -dependencies = [ - "ark-std 0.4.0", - "digest 0.10.7", - "num-bigint 0.4.6", -] - -[[package]] -name = "ark-std" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1df2c09229cbc5a028b1d70e00fdb2acee28b1055dfb5ca73eea49c5a25c4e7c" -dependencies = [ - "num-traits", - "rand", -] - -[[package]] -name = "ark-std" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185" -dependencies = [ - "num-traits", - "rand", -] - -[[package]] -name = "arraydeque" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d902e3d592a523def97af8f317b08ce16b7ab854c1985a0c671e6f15cebc236" - [[package]] name = "arrayref" version = "0.3.9" @@ -1334,7 +516,7 @@ checksum = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.87", "synstructure", ] @@ -1346,17 +528,7 @@ checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", -] - -[[package]] -name = "assert-json-diff" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47e4f2b81832e72834d7518d8487a0396a28cc408186a2e8854c0f98011faf12" -dependencies = [ - "serde", - "serde_json", + "syn 2.0.87", ] [[package]] @@ -1377,19 +549,6 @@ dependencies = [ "pin-project-lite", ] -[[package]] -name = "async-compression" -version = "0.4.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cb8f1d480b0ea3783ab015936d2a55c87e219676f0c0b7dec61494043f21857" -dependencies = [ - "flate2", - "futures-core", - "memchr", - "pin-project-lite", - "tokio", -] - [[package]] name = "async-executor" version = "1.13.1" @@ -1519,7 +678,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.87", ] [[package]] @@ -1536,18 +695,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", -] - -[[package]] -name = "async_io_stream" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6d7b9decdf35d8908a7e3ef02f64c5e9b1695e230154c0e8de3969142d9b94c" -dependencies = [ - "futures", - "pharos", - "rustc_version 0.4.1", + "syn 2.0.87", ] [[package]] @@ -1572,17 +720,6 @@ dependencies = [ "wildmatch", ] -[[package]] -name = "auto_impl" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.89", -] - [[package]] name = "autocfg" version = "1.4.0" @@ -1605,10 +742,10 @@ dependencies = [ "bytes", "cfg-if 1.0.0", "cookie", - "derive_more 0.99.18", + "derive_more", "futures-core", "futures-util", - "h2 0.3.26", + "h2", "http 0.2.12", "itoa", "log", @@ -1623,18 +760,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "aws-credential-types" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60e8f6b615cb5fc60a98132268508ad104310f0cfb25a1c22eee76efdf9154da" -dependencies = [ - "aws-smithy-async", - "aws-smithy-runtime-api", - "aws-smithy-types", - "zeroize", -] - [[package]] name = "aws-creds" version = "0.30.0" @@ -1643,208 +768,21 @@ checksum = "5aeeee1a5defa63cba39097a510dfe63ef53658fc8995202a610f6a8a4d03639" dependencies = [ "attohttpc", "dirs", - "rust-ini 0.18.0", + "rust-ini", "serde", "serde-xml-rs", "thiserror 1.0.69", "time", - "url", -] - -[[package]] -name = "aws-region" -version = "0.25.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9aed3f9c7eac9be28662fdb3b0f4d1951e812f7c64fed4f0327ba702f459b3b" -dependencies = [ - "thiserror 1.0.69", -] - -[[package]] -name = "aws-runtime" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a10d5c055aa540164d9561a0e2e74ad30f0dcf7393c3a92f6733ddf9c5762468" -dependencies = [ - "aws-credential-types", - "aws-sigv4", - "aws-smithy-async", - "aws-smithy-http", - "aws-smithy-runtime", - "aws-smithy-runtime-api", - "aws-smithy-types", - "aws-types", - "bytes", - "fastrand 2.2.0", - "http 0.2.12", - "http-body 0.4.6", - "once_cell", - "percent-encoding", - "pin-project-lite", - "tracing", - "uuid", -] - -[[package]] -name = "aws-sdk-kms" -version = "1.50.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfd059dacda4dfd5b57f2bd453fc6555f9acb496cb77508d517da24cf5d73167" -dependencies = [ - "aws-credential-types", - "aws-runtime", - "aws-smithy-async", - "aws-smithy-http", - "aws-smithy-json", - "aws-smithy-runtime", - "aws-smithy-runtime-api", - "aws-smithy-types", - "aws-types", - "bytes", - "http 0.2.12", - "once_cell", - "regex-lite", - "tracing", -] - -[[package]] -name = "aws-sigv4" -version = "1.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5619742a0d8f253be760bfbb8e8e8368c69e3587e4637af5754e488a611499b1" -dependencies = [ - "aws-credential-types", - "aws-smithy-http", - "aws-smithy-runtime-api", - "aws-smithy-types", - "bytes", - "form_urlencoded", - "hex", - "hmac", - "http 0.2.12", - "http 1.1.0", - "once_cell", - "percent-encoding", - "sha2", - "time", - "tracing", -] - -[[package]] -name = "aws-smithy-async" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62220bc6e97f946ddd51b5f1361f78996e704677afc518a4ff66b7a72ea1378c" -dependencies = [ - "futures-util", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "aws-smithy-http" -version = "0.60.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c8bc3e8fdc6b8d07d976e301c02fe553f72a39b7a9fea820e023268467d7ab6" -dependencies = [ - "aws-smithy-runtime-api", - "aws-smithy-types", - "bytes", - "bytes-utils", - "futures-core", - "http 0.2.12", - "http-body 0.4.6", - "once_cell", - "percent-encoding", - "pin-project-lite", - "pin-utils", - "tracing", -] - -[[package]] -name = "aws-smithy-json" -version = "0.60.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4683df9469ef09468dad3473d129960119a0d3593617542b7d52086c8486f2d6" -dependencies = [ - "aws-smithy-types", -] - -[[package]] -name = "aws-smithy-runtime" -version = "1.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be28bd063fa91fd871d131fc8b68d7cd4c5fa0869bea68daca50dcb1cbd76be2" -dependencies = [ - "aws-smithy-async", - "aws-smithy-http", - "aws-smithy-runtime-api", - "aws-smithy-types", - "bytes", - "fastrand 2.2.0", - "http 0.2.12", - "http-body 0.4.6", - "http-body 1.0.1", - "httparse", - "once_cell", - "pin-project-lite", - "pin-utils", - "tokio", - "tracing", -] - -[[package]] -name = "aws-smithy-runtime-api" -version = "1.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92165296a47a812b267b4f41032ff8069ab7ff783696d217f0994a0d7ab585cd" -dependencies = [ - "aws-smithy-async", - "aws-smithy-types", - "bytes", - "http 0.2.12", - "http 1.1.0", - "pin-project-lite", - "tokio", - "tracing", - "zeroize", -] - -[[package]] -name = "aws-smithy-types" -version = "1.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fbd94a32b3a7d55d3806fe27d98d3ad393050439dd05eb53ece36ec5e3d3510" -dependencies = [ - "base64-simd", - "bytes", - "bytes-utils", - "http 0.2.12", - "http 1.1.0", - "http-body 0.4.6", - "http-body 1.0.1", - "http-body-util", - "itoa", - "num-integer", - "pin-project-lite", - "pin-utils", - "ryu", - "serde", - "time", + "url", ] [[package]] -name = "aws-types" -version = "1.3.3" +name = "aws-region" +version = "0.25.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5221b91b3e441e6675310829fd8984801b772cb1546ef6c0e54dec9f1ac13fef" +checksum = "e9aed3f9c7eac9be28662fdb3b0f4d1951e812f7c64fed4f0327ba702f459b3b" dependencies = [ - "aws-credential-types", - "aws-smithy-async", - "aws-smithy-runtime-api", - "aws-smithy-types", - "rustc_version 0.4.1", - "tracing", + "thiserror 1.0.69", ] [[package]] @@ -1854,42 +792,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" dependencies = [ "async-trait", - "axum-core 0.3.4", + "axum-core", "bitflags 1.3.2", "bytes", "futures-util", "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.31", - "itoa", - "matchit", - "memchr", - "mime", - "percent-encoding", - "pin-project-lite", - "rustversion", - "serde", - "sync_wrapper 0.1.2", - "tower 0.4.13", - "tower-layer", - "tower-service", -] - -[[package]] -name = "axum" -version = "0.7.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f" -dependencies = [ - "async-trait", - "axum-core 0.4.5", - "bytes", - "futures-util", - "http 1.1.0", - "http-body 1.0.1", - "http-body-util", - "hyper 1.5.1", - "hyper-util", + "http-body", + "hyper", "itoa", "matchit", "memchr", @@ -1898,15 +807,10 @@ dependencies = [ "pin-project-lite", "rustversion", "serde", - "serde_json", - "serde_path_to_error", - "serde_urlencoded", - "sync_wrapper 1.0.2", - "tokio", - "tower 0.5.1", + "sync_wrapper", + "tower", "tower-layer", "tower-service", - "tracing", ] [[package]] @@ -1919,32 +823,11 @@ dependencies = [ "bytes", "futures-util", "http 0.2.12", - "http-body 0.4.6", - "mime", - "rustversion", - "tower-layer", - "tower-service", -] - -[[package]] -name = "axum-core" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199" -dependencies = [ - "async-trait", - "bytes", - "futures-util", - "http 1.1.0", - "http-body 1.0.1", - "http-body-util", + "http-body", "mime", - "pin-project-lite", "rustversion", - "sync_wrapper 1.0.2", "tower-layer", "tower-service", - "tracing", ] [[package]] @@ -1962,12 +845,6 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "base16ct" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" - [[package]] name = "base64" version = "0.12.3" @@ -1992,28 +869,12 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" -[[package]] -name = "base64-simd" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "339abbe78e73178762e23bea9dfd08e697eb3f3301cd4be981c0f78ba5859195" -dependencies = [ - "outref", - "vsimd", -] - [[package]] name = "base64ct" version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" -[[package]] -name = "bimap" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "230c5f1ca6a325a32553f8640d31ac9b49f2411e901e427570154868b46da4f7" - [[package]] name = "bincode" version = "1.3.3" @@ -2039,26 +900,11 @@ dependencies = [ "proc-macro2", "quote", "regex", - "rustc-hash 1.1.0", + "rustc-hash", "shlex", - "syn 2.0.89", -] - -[[package]] -name = "bit-set" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" -dependencies = [ - "bit-vec", + "syn 2.0.87", ] -[[package]] -name = "bit-vec" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" - [[package]] name = "bitflags" version = "1.3.2" @@ -2070,9 +916,6 @@ name = "bitflags" version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" -dependencies = [ - "serde", -] [[package]] name = "bitmaps" @@ -2169,38 +1012,11 @@ dependencies = [ "zeropool-bn", ] -[[package]] -name = "blsful" -version = "2.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a676ce0f93ae20ca6defc223b5ac459a6f071bd88c03100a14cb93604a5e994c" -dependencies = [ - "anyhow", - "arrayref", - "blstrs_plus", - "hex", - "hkdf", - "merlin", - "pairing", - "rand", - "rand_chacha", - "rand_core", - "serde", - "serde_bare", - "sha2", - "sha3", - "subtle", - "thiserror 1.0.69", - "uint-zigzag", - "vsss-rs", - "zeroize", -] - [[package]] name = "blst" -version = "0.3.12" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62dc83a094a71d43eeadd254b1ec2d24cb6a0bb6cadce00df51f0db594711a32" +checksum = "4378725facc195f1a538864863f6de233b500a8862747e7f165078a419d5e874" dependencies = [ "cc", "glob", @@ -2208,74 +1024,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "blstrs_plus" -version = "0.8.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a16dd4b0d6b4538e1fa0388843acb186363082713a8fc8416d802a04d013818" -dependencies = [ - "arrayref", - "blst", - "elliptic-curve", - "ff", - "group", - "pairing", - "rand_core", - "serde", - "subtle", - "zeroize", -] - -[[package]] -name = "bollard" -version = "0.17.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d41711ad46fda47cd701f6908e59d1bd6b9a2b7464c0d0aeab95c6d37096ff8a" -dependencies = [ - "base64 0.22.1", - "bollard-stubs", - "bytes", - "futures-core", - "futures-util", - "hex", - "home", - "http 1.1.0", - "http-body-util", - "hyper 1.5.1", - "hyper-named-pipe", - "hyper-rustls", - "hyper-util", - "hyperlocal", - "log", - "pin-project-lite", - "rustls", - "rustls-native-certs 0.7.3", - "rustls-pemfile 2.2.0", - "rustls-pki-types", - "serde", - "serde_derive", - "serde_json", - "serde_repr", - "serde_urlencoded", - "thiserror 1.0.69", - "tokio", - "tokio-util", - "tower-service", - "url", - "winapi", -] - -[[package]] -name = "bollard-stubs" -version = "1.45.0-rc.26.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d7c5415e3a6bc6d3e99eff6268e488fd4ee25e7b28c10f08fa6760bd9de16e4" -dependencies = [ - "serde", - "serde_repr", - "serde_with", -] - [[package]] name = "borsh" version = "0.9.3" @@ -2319,7 +1067,7 @@ dependencies = [ "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.87", ] [[package]] @@ -2377,12 +1125,6 @@ version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" -[[package]] -name = "byte-slice-cast" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c" - [[package]] name = "bytecheck" version = "0.6.12" @@ -2416,19 +1158,6 @@ name = "bytes" version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" -dependencies = [ - "serde", -] - -[[package]] -name = "bytes-utils" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dafe3a8757b027e2be6e4e5601ed563c55989fcf1546e933c66c8eb3a058d35" -dependencies = [ - "bytes", - "either", -] [[package]] name = "bytesize" @@ -2459,21 +1188,6 @@ dependencies = [ "pkg-config", ] -[[package]] -name = "c-kzg" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0307f72feab3300336fb803a57134159f6e20139af1357f36c54cb90d8e8928" -dependencies = [ - "blst", - "cc", - "glob", - "hex", - "libc", - "once_cell", - "serde", -] - [[package]] name = "cbc" version = "0.1.2" @@ -2588,7 +1302,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.87", ] [[package]] @@ -2610,11 +1324,11 @@ dependencies = [ "dotenv", "futures-util", "hex", - "jsonwebtoken 7.2.0", + "jsonwebtoken", "lazy_static", "openssl", "percent-encoding", - "reqwest 0.11.27", + "reqwest", "serde", "serde_json", "tokio", @@ -2641,29 +1355,6 @@ dependencies = [ "x509-cert", ] -[[package]] -name = "coins-ledger" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab9bc0994d0aa0f4ade5f3a9baf4a8d936f250278c85a1124b401860454246ab" -dependencies = [ - "async-trait", - "byteorder", - "cfg-if 1.0.0", - "const-hex", - "getrandom", - "hidapi-rusb", - "js-sys", - "log", - "nix 0.26.4", - "once_cell", - "thiserror 1.0.69", - "tokio", - "tracing", - "wasm-bindgen", - "wasm-bindgen-futures", -] - [[package]] name = "colorchoice" version = "1.0.3" @@ -2679,25 +1370,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "config" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68578f196d2a33ff61b27fae256c3164f65e36382648e30666dde05b8cc9dfdf" -dependencies = [ - "async-trait", - "convert_case 0.6.0", - "json5", - "nom", - "pathdiff", - "ron", - "rust-ini 0.20.0", - "serde", - "serde_json", - "toml 0.8.19", - "yaml-rust2", -] - [[package]] name = "console" version = "0.15.8" @@ -2711,45 +1383,12 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "const-hex" -version = "1.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487981fa1af147182687064d0a2c336586d337a606595ced9ffb0c685c250c73" -dependencies = [ - "cfg-if 1.0.0", - "cpufeatures", - "hex", - "proptest", - "serde", -] - [[package]] name = "const-oid" version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" -[[package]] -name = "const-random" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359" -dependencies = [ - "const-random-macro", -] - -[[package]] -name = "const-random-macro" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" -dependencies = [ - "getrandom", - "once_cell", - "tiny-keccak", -] - [[package]] name = "constant_time_eq" version = "0.3.1" @@ -2762,15 +1401,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" -[[package]] -name = "convert_case" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" -dependencies = [ - "unicode-segmentation", -] - [[package]] name = "cookie" version = "0.16.2" @@ -2798,31 +1428,12 @@ dependencies = [ "libc", ] -[[package]] -name = "core-foundation" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63" -dependencies = [ - "core-foundation-sys", - "libc", -] - [[package]] name = "core-foundation-sys" version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" -[[package]] -name = "core2" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b49ba7ef1ad6107f8824dbe97de947cbaac53c44e7f9756a1fba0d37c1eec505" -dependencies = [ - "memchr", -] - [[package]] name = "cpp_demangle" version = "0.3.5" @@ -2834,9 +1445,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.16" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3" +checksum = "0ca741a962e1b0bff6d724a1a0958b686406e853bb14061f218562e1896f95e6" dependencies = [ "libc", ] @@ -3031,22 +1642,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] -name = "crunchy" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - -[[package]] -name = "crypto-bigint" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" -dependencies = [ - "generic-array 0.14.7", - "rand_core", - "subtle", - "zeroize", -] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] name = "crypto-common" @@ -3082,7 +1681,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.87", ] [[package]] @@ -3106,7 +1705,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.89", + "syn 2.0.87", ] [[package]] @@ -3117,21 +1716,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.89", -] - -[[package]] -name = "dashmap" -version = "6.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-utils", - "hashbrown 0.14.5", - "lock_api 0.4.12", - "once_cell", - "parking_lot_core 0.9.10", + "syn 2.0.87", ] [[package]] @@ -3216,7 +1801,7 @@ checksum = "8034092389675178f570469e6c3b0465d3d30b4505c294a6550db47f3c17ad18" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.87", ] [[package]] @@ -3229,17 +1814,6 @@ dependencies = [ "serde", ] -[[package]] -name = "derivative" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "derive-where" version = "1.2.7" @@ -3248,7 +1822,7 @@ checksum = "62d671cc41a825ebabc75757b62d3d168c577f9149b2d49ece1dad1f72119d25" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.87", ] [[package]] @@ -3259,7 +1833,7 @@ checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.87", ] [[package]] @@ -3268,32 +1842,11 @@ version = "0.99.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" dependencies = [ - "convert_case 0.4.0", + "convert_case", "proc-macro2", "quote", "rustc_version 0.4.1", - "syn 2.0.89", -] - -[[package]] -name = "derive_more" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05" -dependencies = [ - "derive_more-impl", -] - -[[package]] -name = "derive_more-impl" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.89", - "unicode-xid", + "syn 2.0.87", ] [[package]] @@ -3314,15 +1867,6 @@ dependencies = [ "generic-array 0.12.4", ] -[[package]] -name = "digest" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" -dependencies = [ - "generic-array 0.14.7", -] - [[package]] name = "digest" version = "0.10.7" @@ -3330,7 +1874,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer", - "const-oid", "crypto-common", "subtle", ] @@ -3363,7 +1906,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.87", ] [[package]] @@ -3378,50 +1921,18 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0688c2a7f92e427f44895cd63841bff7b29f8d7a1648b9e7e07a4a365b2e1257" -[[package]] -name = "dlv-list" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "442039f5147480ba31067cb00ada1adae6892028e40e45fc5de7b7df6dcc1b5f" -dependencies = [ - "const-random", -] - [[package]] name = "doc-comment" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" -[[package]] -name = "docker_credential" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31951f49556e34d90ed28342e1df7e1cb7a229c4cab0aecc627b5d91edd41d07" -dependencies = [ - "base64 0.21.7", - "serde", - "serde_json", -] - -[[package]] -name = "doctest-file" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aac81fa3e28d21450aa4d2ac065992ba96a1d7303efbce51a95f4fd175b67562" - [[package]] name = "dotenv" version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f" -[[package]] -name = "dunce" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" - [[package]] name = "dynasm" version = "1.2.3" @@ -3475,36 +1986,12 @@ dependencies = [ "memmap2", ] -[[package]] -name = "e2e_tests" -version = "0.0.1" -dependencies = [ - "eyre", - "testcontainers", - "testcontainers-modules", - "tokio", -] - [[package]] name = "easy-ext" version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53aff6fdc1b181225acdcb5b14c47106726fd8e486707315b1b138baed68ee31" -[[package]] -name = "ecdsa" -version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" -dependencies = [ - "der", - "digest 0.10.7", - "elliptic-curve", - "rfc6979", - "signature", - "spki", -] - [[package]] name = "ed25519" version = "2.2.3" @@ -3533,27 +2020,6 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" -[[package]] -name = "elliptic-curve" -version = "0.13.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" -dependencies = [ - "base16ct", - "crypto-bigint", - "digest 0.10.7", - "ff", - "generic-array 0.14.7", - "group", - "hkdf", - "pem-rfc7468", - "pkcs8", - "rand_core", - "sec1", - "subtle", - "zeroize", -] - [[package]] name = "encode_unicode" version = "0.3.6" @@ -3586,7 +2052,7 @@ checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.87", ] [[package]] @@ -3607,7 +2073,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.87", ] [[package]] @@ -3647,17 +2113,6 @@ dependencies = [ "libc", ] -[[package]] -name = "etcetera" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" -dependencies = [ - "cfg-if 1.0.0", - "home", - "windows-sys 0.48.0", -] - [[package]] name = "event-listener" version = "2.5.3" @@ -3694,16 +2149,6 @@ dependencies = [ "async-trait", ] -[[package]] -name = "eyre" -version = "0.6.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec" -dependencies = [ - "indenter", - "once_cell", -] - [[package]] name = "fallible-iterator" version = "0.3.0" @@ -3725,46 +2170,12 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4" -[[package]] -name = "fastrlp" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "139834ddba373bbdd213dffe02c8d110508dcf1726c2be27e8d1f7d7e1856418" -dependencies = [ - "arrayvec", - "auto_impl", - "bytes", -] - -[[package]] -name = "ff" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" -dependencies = [ - "bitvec", - "rand_core", - "subtle", -] - [[package]] name = "fiat-crypto" version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" -[[package]] -name = "filetime" -version = "0.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "libredox", - "windows-sys 0.59.0", -] - [[package]] name = "finite-wasm" version = "0.5.0" @@ -3790,18 +2201,6 @@ dependencies = [ "static_assertions", ] -[[package]] -name = "fixed-hash" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534" -dependencies = [ - "byteorder", - "rand", - "rustc-hex", - "static_assertions", -] - [[package]] name = "flagset" version = "0.4.6" @@ -3955,7 +2354,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.87", ] [[package]] @@ -3988,12 +2387,6 @@ dependencies = [ "slab", ] -[[package]] -name = "futures-utils-wasm" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42012b0f064e01aa58b545fe3727f90f7dd4020f4a3ea735b50344965f5a57e9" - [[package]] name = "fxhash" version = "0.2.1" @@ -4016,34 +2409,6 @@ dependencies = [ "serde_json", ] -[[package]] -name = "gcloud-sdk" -version = "0.25.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0775bfa745cdf7287ae9765a685a813b91049b6b6d5ca3de20a3d5d16a80d8b2" -dependencies = [ - "async-trait", - "bytes", - "chrono", - "futures", - "hyper 1.5.1", - "jsonwebtoken 9.3.0", - "once_cell", - "prost 0.13.3", - "prost-types", - "reqwest 0.12.9", - "secret-vault-value", - "serde", - "serde_json", - "tokio", - "tonic 0.12.3", - "tower 0.5.1", - "tower-layer", - "tower-util", - "tracing", - "url", -] - [[package]] name = "generic-array" version = "0.12.4" @@ -4061,16 +2426,6 @@ checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", - "zeroize", -] - -[[package]] -name = "generic-array" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96512db27971c2c3eece70a1e106fbe6c87760234e31e8f7e5634912fe52794a" -dependencies = [ - "typenum", ] [[package]] @@ -4080,10 +2435,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if 1.0.0", - "js-sys", "libc", "wasi", - "wasm-bindgen", ] [[package]] @@ -4109,19 +2462,6 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" -[[package]] -name = "group" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" -dependencies = [ - "ff", - "rand", - "rand_core", - "rand_xorshift", - "subtle", -] - [[package]] name = "h2" version = "0.3.26" @@ -4141,25 +2481,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "h2" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e" -dependencies = [ - "atomic-waker", - "bytes", - "fnv", - "futures-core", - "futures-sink", - "http 1.1.0", - "indexmap 2.6.0", - "slab", - "tokio", - "tokio-util", - "tracing", -] - [[package]] name = "hashbrown" version = "0.11.2" @@ -4194,7 +2515,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash 0.8.11", - "allocator-api2", ] [[package]] @@ -4206,16 +2526,6 @@ dependencies = [ "allocator-api2", "equivalent", "foldhash", - "serde", -] - -[[package]] -name = "hashlink" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" -dependencies = [ - "hashbrown 0.14.5", ] [[package]] @@ -4251,33 +2561,6 @@ dependencies = [ "serde", ] -[[package]] -name = "hex-literal" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" - -[[package]] -name = "hidapi-rusb" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efdc2ec354929a6e8f3c6b6923a4d97427ec2f764cfee8cd4bfe890946cdf08b" -dependencies = [ - "cc", - "libc", - "pkg-config", - "rusb", -] - -[[package]] -name = "hkdf" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" -dependencies = [ - "hmac", -] - [[package]] name = "hmac" version = "0.12.1" @@ -4319,36 +2602,13 @@ dependencies = [ ] [[package]] -name = "http-body" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" -dependencies = [ - "bytes", - "http 0.2.12", - "pin-project-lite", -] - -[[package]] -name = "http-body" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" -dependencies = [ - "bytes", - "http 1.1.0", -] - -[[package]] -name = "http-body-util" -version = "0.1.2" +name = "http-body" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", - "futures-util", - "http 1.1.0", - "http-body 1.0.1", + "http 0.2.12", "pin-project-lite", ] @@ -4374,9 +2634,9 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2 0.3.26", + "h2", "http 0.2.12", - "http-body 0.4.6", + "http-body", "httparse", "httpdate", "itoa", @@ -4388,85 +2648,18 @@ dependencies = [ "want", ] -[[package]] -name = "hyper" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97818827ef4f364230e16705d4706e2897df2bb60617d6ca15d598025a3c481f" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "h2 0.4.7", - "http 1.1.0", - "http-body 1.0.1", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "smallvec", - "tokio", - "want", -] - -[[package]] -name = "hyper-named-pipe" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73b7d8abf35697b81a825e386fc151e0d503e8cb5fcb93cc8669c376dfd6f278" -dependencies = [ - "hex", - "hyper 1.5.1", - "hyper-util", - "pin-project-lite", - "tokio", - "tower-service", - "winapi", -] - -[[package]] -name = "hyper-rustls" -version = "0.27.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" -dependencies = [ - "futures-util", - "http 1.1.0", - "hyper 1.5.1", - "hyper-util", - "rustls", - "rustls-native-certs 0.8.1", - "rustls-pki-types", - "tokio", - "tokio-rustls", - "tower-service", -] - [[package]] name = "hyper-timeout" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" dependencies = [ - "hyper 0.14.31", + "hyper", "pin-project-lite", "tokio", "tokio-io-timeout", ] -[[package]] -name = "hyper-timeout" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b90d566bffbce6a75bd8b09a05aa8c2cb1fabb6cb348f8840c9e4c90a0d83b0" -dependencies = [ - "hyper 1.5.1", - "hyper-util", - "pin-project-lite", - "tokio", - "tower-service", -] - [[package]] name = "hyper-tls" version = "0.5.0" @@ -4474,60 +2667,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ "bytes", - "hyper 0.14.31", - "native-tls", - "tokio", - "tokio-native-tls", -] - -[[package]] -name = "hyper-tls" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" -dependencies = [ - "bytes", - "http-body-util", - "hyper 1.5.1", - "hyper-util", + "hyper", "native-tls", "tokio", "tokio-native-tls", - "tower-service", -] - -[[package]] -name = "hyper-util" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "http 1.1.0", - "http-body 1.0.1", - "hyper 1.5.1", - "pin-project-lite", - "socket2 0.5.7", - "tokio", - "tower-service", - "tracing", -] - -[[package]] -name = "hyperlocal" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "986c5ce3b994526b3cd75578e62554abd09f0899d6206de48b3e96ab34ccc8c7" -dependencies = [ - "hex", - "http-body-util", - "hyper 1.5.1", - "hyper-util", - "pin-project-lite", - "tokio", - "tower-service", ] [[package]] @@ -4668,7 +2811,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.87", ] [[package]] @@ -4712,38 +2855,12 @@ dependencies = [ "version_check", ] -[[package]] -name = "impl-codec" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba6a270039626615617f3f36d15fc827041df3b78c439da2cadfa47455a77f2f" -dependencies = [ - "parity-scale-codec", -] - [[package]] name = "impl-more" version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aae21c3177a27788957044151cc2800043d127acaa460a47ebb9b84dfa2c6aa0" -[[package]] -name = "impl-trait-for-tuples" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0eb5a3343abf848c0984fe4604b2b105da9539376e24fc0a3b0007411ae4fd9" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.89", -] - -[[package]] -name = "indenter" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" - [[package]] name = "indexer" version = "0.0.1" @@ -4759,13 +2876,12 @@ dependencies = [ "lapin", "near-client", "near-client-primitives", - "near-config-utils", - "near-crypto", + "near-config-utils 2.4.0-rc.1", + "near-crypto 2.3.0-rc.1", "near-indexer", "near-o11y", "openssl-probe", "prometheus", - "reqwest 0.12.9", "serde", "serde_json", "serde_yaml", @@ -4830,21 +2946,6 @@ dependencies = [ "cfg-if 1.0.0", ] -[[package]] -name = "interprocess" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2f4e4a06d42fab3e85ab1b419ad32b09eab58b901d40c57935ff92db3287a13" -dependencies = [ - "doctest-file", - "futures-core", - "libc", - "recvmsg", - "tokio", - "widestring", - "windows-sys 0.52.0", -] - [[package]] name = "io-lifetimes" version = "1.0.11" @@ -4886,20 +2987,11 @@ dependencies = [ "either", ] -[[package]] -name = "itertools" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" -dependencies = [ - "either", -] - [[package]] name = "itoa" -version = "1.0.13" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "540654e97a3f4470a492cd30ff187bc95d89557a903a2bbf112e2fae98104ef2" +checksum = "7a73e9fe3c49d7afb2ace819fa181a287ce54a0983eda4e0eb05c22f82ffe534" [[package]] name = "jobserver" @@ -4919,17 +3011,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "json5" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96b0db21af676c1ce64250b5f40f3ce2cf27e4e47cb91ed91eb6fe9350b430c1" -dependencies = [ - "pest", - "pest_derive", - "serde", -] - [[package]] name = "json_comments" version = "0.2.2" @@ -4943,39 +3024,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "afabcc15e437a6484fc4f12d0fd63068fe457bf93f1c148d3d9649c60b103f32" dependencies = [ "base64 0.12.3", - "pem 0.8.3", + "pem", "ring 0.16.20", "serde", "serde_json", - "simple_asn1 0.4.1", -] - -[[package]] -name = "jsonwebtoken" -version = "9.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ae10193d25051e74945f1ea2d0b42e03cc3b890f7e4cc5faa44997d808193f" -dependencies = [ - "base64 0.21.7", - "js-sys", - "pem 3.0.4", - "ring 0.17.8", - "serde", - "serde_json", - "simple_asn1 0.6.2", -] - -[[package]] -name = "k256" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6e3919bbaa2945715f0bb6d3934a173d1e9a59ac23767fbaaef277265a7411b" -dependencies = [ - "cfg-if 1.0.0", - "ecdsa", - "elliptic-curve", - "once_cell", - "sha2", + "simple_asn1", ] [[package]] @@ -4987,16 +3040,6 @@ dependencies = [ "cpufeatures", ] -[[package]] -name = "keccak-asm" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "505d1856a39b200489082f90d897c3f07c455563880bc5952e38eabf731c83b6" -dependencies = [ - "digest 0.10.7", - "sha3-asm", -] - [[package]] name = "language-tags" version = "0.3.2" @@ -5076,7 +3119,6 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ "bitflags 2.6.0", "libc", - "redox_syscall 0.5.7", ] [[package]] @@ -5096,18 +3138,6 @@ dependencies = [ "zstd-sys", ] -[[package]] -name = "libusb1-sys" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da050ade7ac4ff1ba5379af847a10a10a8e284181e060105bf8d86960ce9ce0f" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - [[package]] name = "libz-sys" version = "1.1.20" @@ -5259,7 +3289,7 @@ checksum = "5cf92c10c7e361d6b99666ec1c6f9805b0bea2c3bd8c78dc6fe98ac5bd78db11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.87", ] [[package]] @@ -5321,15 +3351,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "memoffset" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] - [[package]] name = "memoffset" version = "0.8.0" @@ -5348,18 +3369,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "merlin" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58c38e2799fc0978b65dfff8023ec7843e2330bb462f19198840b34b6582397d" -dependencies = [ - "byteorder", - "keccak", - "rand_core", - "zeroize", -] - [[package]] name = "mime" version = "0.3.17" @@ -5431,7 +3440,7 @@ dependencies = [ "openssl-probe", "openssl-sys", "schannel", - "security-framework 2.11.1", + "security-framework", "security-framework-sys", "tempfile", ] @@ -5448,11 +3457,11 @@ dependencies = [ [[package]] name = "near-async" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "actix", - "derive_more 0.99.18", + "derive_more", "futures", "near-async-derive", "near-o11y", @@ -5468,26 +3477,26 @@ dependencies = [ [[package]] name = "near-async-derive" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.87", ] [[package]] name = "near-cache" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "lru 0.12.5", ] [[package]] name = "near-chain" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "actix", "assert_matches", @@ -5500,12 +3509,13 @@ dependencies = [ "itertools 0.10.5", "itoa", "lru 0.12.5", + "more-asserts", "near-async", "near-cache", "near-chain-configs", "near-chain-primitives", "near-client-primitives", - "near-crypto", + "near-crypto 2.4.0-rc.1", "near-epoch-manager", "near-mainnet-res", "near-network", @@ -5515,7 +3525,7 @@ dependencies = [ "near-performance-metrics-macros", "near-pool", "near-primitives", - "near-schema-checker-lib", + "near-schema-checker-lib 2.4.0-rc.1", "near-store", "near-vm-runner", "node-runtime", @@ -5525,25 +3535,25 @@ dependencies = [ "rand_chacha", "rayon", "serde", - "strum 0.24.1", + "strum", "tempfile", - "thiserror 1.0.69", + "thiserror 2.0.3", "time", + "tokio", "tracing", - "yansi", ] [[package]] name = "near-chain-configs" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "anyhow", "bytesize", "chrono", - "derive_more 0.99.18", - "near-config-utils", - "near-crypto", + "derive_more", + "near-config-utils 2.4.0-rc.1", + "near-crypto 2.4.0-rc.1", "near-o11y", "near-parameters", "near-primitives", @@ -5559,26 +3569,26 @@ dependencies = [ [[package]] name = "near-chain-primitives" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ - "near-crypto", + "near-crypto 2.4.0-rc.1", "near-primitives", "near-time", - "thiserror 1.0.69", + "thiserror 2.0.3", "time", "tracing", ] [[package]] name = "near-chunks" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "actix", "borsh 1.5.3", "chrono", - "derive_more 0.99.18", + "derive_more", "futures", "itertools 0.10.5", "lru 0.12.5", @@ -5586,7 +3596,7 @@ dependencies = [ "near-chain", "near-chain-configs", "near-chunks-primitives", - "near-crypto", + "near-crypto 2.4.0-rc.1", "near-epoch-manager", "near-network", "near-o11y", @@ -5597,15 +3607,15 @@ dependencies = [ "near-store", "rand", "reed-solomon-erasure", - "strum 0.24.1", + "strum", "time", "tracing", ] [[package]] name = "near-chunks-primitives" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "near-chain-primitives", "near-primitives", @@ -5613,8 +3623,8 @@ dependencies = [ [[package]] name = "near-client" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "actix", "actix-rt", @@ -5624,7 +3634,7 @@ dependencies = [ "bytesize", "chrono", "cloud-storage", - "derive_more 0.99.18", + "derive_more", "futures", "itertools 0.10.5", "lru 0.12.5", @@ -5635,7 +3645,7 @@ dependencies = [ "near-chain-primitives", "near-chunks", "near-client-primitives", - "near-crypto", + "near-crypto 2.4.0-rc.1", "near-dyn-configs", "near-epoch-manager", "near-network", @@ -5655,40 +3665,41 @@ dependencies = [ "rayon", "reed-solomon-erasure", "regex", - "reqwest 0.11.27", + "reqwest", "rust-s3", "serde", "serde_json", - "strum 0.24.1", + "strum", "sysinfo", "tempfile", - "thiserror 1.0.69", + "thiserror 2.0.3", "time", "tokio", + "tokio-stream", + "tokio-util", "tracing", "yansi", ] [[package]] name = "near-client-primitives" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "actix", "chrono", "near-chain-configs", "near-chain-primitives", "near-chunks-primitives", - "near-crypto", + "near-crypto 2.4.0-rc.1", "near-primitives", "near-time", "serde", "serde_json", - "strum 0.24.1", - "thiserror 1.0.69", + "strum", + "thiserror 2.0.3", "time", "tracing", - "yansi", ] [[package]] @@ -5702,6 +3713,17 @@ dependencies = [ "tracing", ] +[[package]] +name = "near-config-utils" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" +dependencies = [ + "anyhow", + "json_comments", + "thiserror 2.0.3", + "tracing", +] + [[package]] name = "near-crypto" version = "2.3.0-rc.1" @@ -5711,14 +3733,14 @@ dependencies = [ "borsh 1.5.3", "bs58", "curve25519-dalek", - "derive_more 0.99.18", + "derive_more", "ed25519-dalek", "hex", "near-account-id", - "near-config-utils", - "near-schema-checker-lib", - "near-stdx", - "primitive-types 0.10.1", + "near-config-utils 2.3.0-rc.1", + "near-schema-checker-lib 2.3.0-rc.1", + "near-stdx 2.3.0-rc.1", + "primitive-types", "rand", "secp256k1", "serde", @@ -5727,43 +3749,68 @@ dependencies = [ "thiserror 1.0.69", ] +[[package]] +name = "near-crypto" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" +dependencies = [ + "blake2", + "borsh 1.5.3", + "bs58", + "curve25519-dalek", + "derive_more", + "ed25519-dalek", + "hex", + "near-account-id", + "near-config-utils 2.4.0-rc.1", + "near-schema-checker-lib 2.4.0-rc.1", + "near-stdx 2.4.0-rc.1", + "primitive-types", + "rand", + "secp256k1", + "serde", + "serde_json", + "subtle", + "thiserror 2.0.3", +] + [[package]] name = "near-dyn-configs" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "anyhow", "near-chain-configs", - "near-crypto", + "near-crypto 2.4.0-rc.1", "near-o11y", "near-primitives", "near-time", "prometheus", "serde", "serde_json", - "thiserror 1.0.69", + "thiserror 2.0.3", "tokio", "tracing", ] [[package]] name = "near-epoch-manager" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "borsh 1.5.3", "itertools 0.10.5", "near-cache", "near-chain-configs", "near-chain-primitives", - "near-crypto", + "near-crypto 2.4.0-rc.1", "near-o11y", "near-primitives", - "near-schema-checker-lib", + "near-schema-checker-lib 2.4.0-rc.1", "near-store", "num-bigint 0.3.3", "num-rational", - "primitive-types 0.10.1", + "primitive-types", "rand", "rand_hc", "serde", @@ -5774,24 +3821,24 @@ dependencies = [ [[package]] name = "near-fmt" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "near-primitives-core", ] [[package]] name = "near-indexer" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "actix", "anyhow", "futures", "near-chain-configs", "near-client", - "near-config-utils", - "near-crypto", + "near-config-utils 2.4.0-rc.1", + "near-crypto 2.4.0-rc.1", "near-dyn-configs", "near-indexer-primitives", "near-o11y", @@ -5809,8 +3856,8 @@ dependencies = [ [[package]] name = "near-indexer-primitives" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "near-primitives", "serde", @@ -5819,14 +3866,14 @@ dependencies = [ [[package]] name = "near-jsonrpc" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "actix", "actix-cors", "actix-web", "bs58", - "derive_more 0.99.18", + "derive_more", "easy-ext", "futures", "hex", @@ -5849,8 +3896,8 @@ dependencies = [ [[package]] name = "near-jsonrpc-client" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "actix-http", "awc", @@ -5863,25 +3910,25 @@ dependencies = [ [[package]] name = "near-jsonrpc-primitives" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "arbitrary", "near-chain-configs", "near-client-primitives", - "near-crypto", + "near-crypto 2.4.0-rc.1", "near-primitives", - "near-schema-checker-lib", + "near-schema-checker-lib 2.4.0-rc.1", "serde", "serde_json", - "thiserror 1.0.69", + "thiserror 2.0.3", "time", ] [[package]] name = "near-mainnet-res" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "near-account-id", "near-chain-configs", @@ -5891,8 +3938,8 @@ dependencies = [ [[package]] name = "near-network" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "actix", "anyhow", @@ -5903,7 +3950,7 @@ dependencies = [ "bytesize", "chrono", "crossbeam-channel", - "derive_more 0.99.18", + "derive_more", "enum-map", "futures", "futures-util", @@ -5912,17 +3959,17 @@ dependencies = [ "lru 0.12.5", "near-async", "near-chain-configs", - "near-crypto", + "near-crypto 2.4.0-rc.1", "near-fmt", "near-o11y", "near-performance-metrics", "near-performance-metrics-macros", "near-primitives", - "near-schema-checker-lib", + "near-schema-checker-lib 2.4.0-rc.1", "near-store", "opentelemetry", "parking_lot 0.12.3", - "pin-project 1.1.7", + "pin-project", "protobuf 3.7.1", "protobuf-codegen", "rand", @@ -5931,9 +3978,9 @@ dependencies = [ "serde", "sha2", "smart-default", - "strum 0.24.1", + "strum", "stun", - "thiserror 1.0.69", + "thiserror 2.0.3", "time", "tokio", "tokio-stream", @@ -5943,13 +3990,13 @@ dependencies = [ [[package]] name = "near-o11y" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "actix", "base64 0.21.7", "clap", - "near-crypto", + "near-crypto 2.4.0-rc.1", "near-primitives-core", "opentelemetry", "opentelemetry-otlp", @@ -5958,7 +4005,7 @@ dependencies = [ "prometheus", "serde", "serde_json", - "thiserror 1.0.69", + "thiserror 2.0.3", "tokio", "tracing", "tracing-appender", @@ -5968,26 +4015,26 @@ dependencies = [ [[package]] name = "near-parameters" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "borsh 1.5.3", "enum-map", "near-account-id", "near-primitives-core", - "near-schema-checker-lib", + "near-schema-checker-lib 2.4.0-rc.1", "num-rational", "serde", "serde_repr", "serde_yaml", - "strum 0.24.1", - "thiserror 1.0.69", + "strum", + "thiserror 2.0.3", ] [[package]] name = "near-performance-metrics" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "actix", "bitflags 1.3.2", @@ -6001,20 +4048,20 @@ dependencies = [ [[package]] name = "near-performance-metrics-macros" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "quote", - "syn 2.0.89", + "syn 2.0.87", ] [[package]] name = "near-pool" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "borsh 1.5.3", - "near-crypto", + "near-crypto 2.4.0-rc.1", "near-o11y", "near-primitives", "rand", @@ -6022,8 +4069,8 @@ dependencies = [ [[package]] name = "near-primitives" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "arbitrary", "base64 0.21.7", @@ -6033,21 +4080,21 @@ dependencies = [ "bytesize", "cfg-if 1.0.0", "chrono", - "derive_more 0.99.18", + "derive_more", "easy-ext", "enum-map", "hex", "itertools 0.10.5", - "near-crypto", + "near-crypto 2.4.0-rc.1", "near-fmt", "near-parameters", "near-primitives-core", - "near-schema-checker-lib", - "near-stdx", + "near-schema-checker-lib 2.4.0-rc.1", + "near-stdx 2.4.0-rc.1", "near-time", "num-rational", "ordered-float", - "primitive-types 0.10.1", + "primitive-types", "rand", "rand_chacha", "reed-solomon-erasure", @@ -6056,50 +4103,50 @@ dependencies = [ "serde_with", "sha3", "smart-default", - "strum 0.24.1", - "thiserror 1.0.69", + "strum", + "thiserror 2.0.3", "tracing", "zstd", ] [[package]] name = "near-primitives-core" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "arbitrary", "base64 0.21.7", "borsh 1.5.3", "bs58", - "derive_more 0.99.18", + "derive_more", "enum-map", "near-account-id", - "near-schema-checker-lib", + "near-schema-checker-lib 2.4.0-rc.1", "num-rational", "serde", "serde_repr", "sha2", - "thiserror 1.0.69", + "thiserror 2.0.3", ] [[package]] name = "near-rosetta-rpc" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "actix", "actix-cors", "actix-http", "actix-web", "awc", - "derive_more 0.99.18", + "derive_more", "futures", "hex", "near-account-id", "near-chain-configs", "near-client", "near-client-primitives", - "near-crypto", + "near-crypto 2.4.0-rc.1", "near-network", "near-o11y", "near-parameters", @@ -6108,8 +4155,8 @@ dependencies = [ "paperclip", "serde", "serde_json", - "strum 0.24.1", - "thiserror 1.0.69", + "strum", + "thiserror 2.0.3", "tokio", ] @@ -6118,13 +4165,27 @@ name = "near-schema-checker-core" version = "2.3.0-rc.1" source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +[[package]] +name = "near-schema-checker-core" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" + [[package]] name = "near-schema-checker-lib" version = "2.3.0-rc.1" source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ - "near-schema-checker-core", - "near-schema-checker-macro", + "near-schema-checker-core 2.3.0-rc.1", + "near-schema-checker-macro 2.3.0-rc.1", +] + +[[package]] +name = "near-schema-checker-lib" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" +dependencies = [ + "near-schema-checker-core 2.4.0-rc.1", + "near-schema-checker-macro 2.4.0-rc.1", ] [[package]] @@ -6132,15 +4193,25 @@ name = "near-schema-checker-macro" version = "2.3.0-rc.1" source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +[[package]] +name = "near-schema-checker-macro" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" + [[package]] name = "near-stdx" version = "2.3.0-rc.1" source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +[[package]] +name = "near-stdx" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" + [[package]] name = "near-store" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "actix", "actix-rt", @@ -6149,20 +4220,20 @@ dependencies = [ "bytesize", "crossbeam", "derive-where", - "derive_more 0.99.18", + "derive_more", "enum-map", "hex", "itertools 0.10.5", "itoa", "lru 0.12.5", "near-chain-configs", - "near-crypto", + "near-crypto 2.4.0-rc.1", "near-fmt", "near-o11y", "near-parameters", "near-primitives", - "near-schema-checker-lib", - "near-stdx", + "near-schema-checker-lib 2.4.0-rc.1", + "near-stdx 2.4.0-rc.1", "near-time", "near-vm-runner", "num_cpus", @@ -6174,17 +4245,17 @@ dependencies = [ "serde", "serde_json", "smallvec", - "strum 0.24.1", + "strum", "tempfile", - "thiserror 1.0.69", + "thiserror 2.0.3", "tokio", "tracing", ] [[package]] name = "near-telemetry" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "actix", "awc", @@ -6202,8 +4273,8 @@ dependencies = [ [[package]] name = "near-time" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "serde", "time", @@ -6212,8 +4283,8 @@ dependencies = [ [[package]] name = "near-vm-compiler" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "enumset", "finite-wasm", @@ -6221,15 +4292,15 @@ dependencies = [ "near-vm-vm", "rkyv", "target-lexicon 0.12.16", - "thiserror 1.0.69", + "thiserror 2.0.3", "tracing", "wasmparser 0.99.0", ] [[package]] name = "near-vm-compiler-singlepass" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "dynasm 2.0.0", "dynasmrt 2.0.0", @@ -6242,14 +4313,14 @@ dependencies = [ "near-vm-vm", "rayon", "smallvec", - "strum 0.24.1", + "strum", "tracing", ] [[package]] name = "near-vm-engine" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "backtrace", "cfg-if 1.0.0", @@ -6264,14 +4335,14 @@ dependencies = [ "rustc-demangle", "rustix 0.38.41", "target-lexicon 0.12.16", - "thiserror 1.0.69", + "thiserror 2.0.3", "tracing", ] [[package]] name = "near-vm-runner" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "anyhow", "blst", @@ -6282,12 +4353,12 @@ dependencies = [ "finite-wasm", "lru 0.12.5", "memoffset 0.8.0", - "near-crypto", + "near-crypto 2.4.0-rc.1", "near-o11y", "near-parameters", "near-primitives-core", - "near-schema-checker-lib", - "near-stdx", + "near-schema-checker-lib 2.4.0-rc.1", + "near-stdx 2.4.0-rc.1", "near-vm-compiler", "near-vm-compiler-singlepass", "near-vm-engine", @@ -6306,9 +4377,9 @@ dependencies = [ "serde_repr", "sha2", "sha3", - "strum 0.24.1", + "strum", "tempfile", - "thiserror 1.0.69", + "thiserror 2.0.3", "tracing", "wasm-encoder 0.27.0", "wasmer-compiler-near", @@ -6326,19 +4397,19 @@ dependencies = [ [[package]] name = "near-vm-types" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "indexmap 1.9.3", "num-traits", "rkyv", - "thiserror 1.0.69", + "thiserror 2.0.3", ] [[package]] name = "near-vm-vm" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "backtrace", "cc", @@ -6351,15 +4422,15 @@ dependencies = [ "near-vm-types", "region", "rkyv", - "thiserror 1.0.69", + "thiserror 2.0.3", "tracing", "winapi", ] [[package]] name = "near-wallet-contract" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "anyhow", "near-primitives-core", @@ -6368,8 +4439,8 @@ dependencies = [ [[package]] name = "nearcore" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "actix", "actix-rt", @@ -6384,17 +4455,18 @@ dependencies = [ "easy-ext", "futures", "hex", - "hyper 0.14.31", - "hyper-tls 0.5.0", + "hyper", + "hyper-tls", "indicatif", + "itertools 0.10.5", "near-async", "near-chain", "near-chain-configs", "near-chunks", "near-client", "near-client-primitives", - "near-config-utils", - "near-crypto", + "near-config-utils 2.4.0-rc.1", + "near-crypto 2.4.0-rc.1", "near-dyn-configs", "near-epoch-manager", "near-jsonrpc", @@ -6415,16 +4487,16 @@ dependencies = [ "rand", "rayon", "regex", - "reqwest 0.11.27", + "reqwest", "rlimit", "rust-s3", "serde", "serde_ignored", "serde_json", "smart-default", - "strum 0.24.1", + "strum", "tempfile", - "thiserror 1.0.69", + "thiserror 2.0.3", "tokio", "tracing", "xz2", @@ -6455,26 +4527,13 @@ dependencies = [ "memoffset 0.6.5", ] -[[package]] -name = "nix" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" -dependencies = [ - "bitflags 1.3.2", - "cfg-if 1.0.0", - "libc", - "memoffset 0.7.1", - "pin-utils", -] - [[package]] name = "node-runtime" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "borsh 1.5.3", - "near-crypto", + "near-crypto 2.4.0-rc.1", "near-o11y", "near-parameters", "near-primitives", @@ -6488,7 +4547,7 @@ dependencies = [ "rayon", "serde_json", "sha2", - "thiserror 1.0.69", + "thiserror 2.0.3", "tracing", ] @@ -6588,7 +4647,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", - "libm", ] [[package]] @@ -6601,26 +4659,6 @@ dependencies = [ "libc", ] -[[package]] -name = "num_enum" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" -dependencies = [ - "num_enum_derive", -] - -[[package]] -name = "num_enum_derive" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.89", -] - [[package]] name = "number_prefix" version = "0.3.0" @@ -6648,31 +4686,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "offchain" -version = "0.1.0" -dependencies = [ - "alloy", - "axum 0.7.9", - "blsful", - "bytes", - "config", - "eyre", - "futures", - "http-body-util", - "log", - "project-root", - "reqwest 0.12.9", - "serde", - "serde_json", - "tempfile", - "tokio", - "tokio-tungstenite", - "tracing", - "tracing-subscriber", - "wiremock", -] - [[package]] name = "oid-registry" version = "0.7.1" @@ -6711,7 +4724,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.87", ] [[package]] @@ -6770,10 +4783,10 @@ dependencies = [ "opentelemetry-proto", "opentelemetry-semantic-conventions", "opentelemetry_sdk", - "prost 0.12.6", + "prost", "thiserror 1.0.69", "tokio", - "tonic 0.11.0", + "tonic", ] [[package]] @@ -6784,8 +4797,8 @@ checksum = "3a8fddc9b68f5b80dae9d6f510b88e02396f006ad48cac349411fbecc80caae4" dependencies = [ "opentelemetry", "opentelemetry_sdk", - "prost 0.12.6", - "tonic 0.11.0", + "prost", + "tonic", ] [[package]] @@ -6834,26 +4847,10 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ccd746e37177e1711c20dd619a1620f34f5c8b569c53590a72dedd5344d8924a" dependencies = [ - "dlv-list 0.3.0", + "dlv-list", "hashbrown 0.12.3", ] -[[package]] -name = "ordered-multimap" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49203cdcae0030493bad186b28da2fa25645fa276a51b6fec8010d281e02ef79" -dependencies = [ - "dlv-list 0.5.2", - "hashbrown 0.14.5", -] - -[[package]] -name = "outref" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4030760ffd992bef45b0ae3f10ce1aba99e33464c90d14dd7c039884963ddc7a" - [[package]] name = "overload" version = "0.1.1" @@ -6892,15 +4889,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "pairing" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fec4625e73cf41ef4bb6846cafa6d44736525f442ba45e407c4a000a13996f" -dependencies = [ - "group", -] - [[package]] name = "paperclip" version = "0.8.2" @@ -6969,38 +4957,11 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "strum 0.24.1", - "strum_macros 0.24.3", + "strum", + "strum_macros", "syn 1.0.109", ] -[[package]] -name = "parity-scale-codec" -version = "3.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8be4817d39f3272f69c59fe05d0535ae6456c2dc2fa1ba02910296c7e0a5c590" -dependencies = [ - "arrayvec", - "bitvec", - "byte-slice-cast", - "impl-trait-for-tuples", - "parity-scale-codec-derive", - "rustversion", - "serde", -] - -[[package]] -name = "parity-scale-codec-derive" -version = "3.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8781a75c6205af67215f382092b6e0a4ff3734798523e69073d4bcd294ec767b" -dependencies = [ - "proc-macro-crate 3.2.0", - "proc-macro2", - "quote", - "syn 2.0.89", -] - [[package]] name = "parity-wasm" version = "0.41.0" @@ -7091,43 +5052,12 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "parse-display" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "914a1c2265c98e2446911282c6ac86d8524f495792c38c5bd884f80499c7538a" -dependencies = [ - "parse-display-derive", - "regex", - "regex-syntax 0.8.5", -] - -[[package]] -name = "parse-display-derive" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ae7800a4c974efd12df917266338e79a7a74415173caf7e70aa0a0707345281" -dependencies = [ - "proc-macro2", - "quote", - "regex", - "regex-syntax 0.8.5", - "structmeta", - "syn 2.0.89", -] - [[package]] name = "paste" version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" -[[package]] -name = "pathdiff" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c5ce1153ab5b689d0c074c4e7fc613e942dfb7dd9eea5ab202d2ad91fe361" - [[package]] name = "pbkdf2" version = "0.12.2" @@ -7139,110 +5069,36 @@ dependencies = [ ] [[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - -[[package]] -name = "pem" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd56cbd21fea48d0c440b41cd69c589faacade08c992d9a54e471b79d0fd13eb" -dependencies = [ - "base64 0.13.1", - "once_cell", - "regex", -] - -[[package]] -name = "pem" -version = "3.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae" -dependencies = [ - "base64 0.22.1", - "serde", -] - -[[package]] -name = "pem-rfc7468" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" -dependencies = [ - "base64ct", -] - -[[package]] -name = "percent-encoding" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - -[[package]] -name = "pest" -version = "2.7.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "879952a81a83930934cbf1786752d6dedc3b1f29e8f8fb2ad1d0a36f377cf442" -dependencies = [ - "memchr", - "thiserror 1.0.69", - "ucd-trie", -] - -[[package]] -name = "pest_derive" -version = "2.7.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d214365f632b123a47fd913301e14c946c61d1c183ee245fa76eb752e59a02dd" -dependencies = [ - "pest", - "pest_generator", -] - -[[package]] -name = "pest_generator" -version = "2.7.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb55586734301717aea2ac313f50b2eb8f60d2fc3dc01d190eefa2e625f60c4e" -dependencies = [ - "pest", - "pest_meta", - "proc-macro2", - "quote", - "syn 2.0.89", -] +name = "peeking_take_while" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] -name = "pest_meta" -version = "2.7.14" +name = "pem" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b75da2a70cf4d9cb76833c990ac9cd3923c9a8905a8929789ce347c84564d03d" +checksum = "fd56cbd21fea48d0c440b41cd69c589faacade08c992d9a54e471b79d0fd13eb" dependencies = [ + "base64 0.13.1", "once_cell", - "pest", - "sha2", + "regex", ] [[package]] -name = "pharos" -version = "0.5.3" +name = "pem-rfc7468" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9567389417feee6ce15dd6527a8a1ecac205ef62c2932bcf3d9f6fc5b78b414" +checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" dependencies = [ - "futures", - "rustc_version 0.4.1", + "base64ct", ] [[package]] -name = "pin-project" -version = "0.4.30" +name = "percent-encoding" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ef0f924a5ee7ea9cbcea77529dba45f8a9ba9f622419fe3386ca581a3ae9d5a" -dependencies = [ - "pin-project-internal 0.4.30", -] +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pin-project" @@ -7250,18 +5106,7 @@ version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95" dependencies = [ - "pin-project-internal 1.1.7", -] - -[[package]] -name = "pin-project-internal" -version = "0.4.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "851c8d0ce9bebe43790dedfc86614c23494ac9f423dd618d3a61fc693eafe61e" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", + "pin-project-internal", ] [[package]] @@ -7272,7 +5117,7 @@ checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.87", ] [[package]] @@ -7340,16 +5185,6 @@ dependencies = [ "spki", ] -[[package]] -name = "pkcs8" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" -dependencies = [ - "der", - "spki", -] - [[package]] name = "pkg-config" version = "0.3.31" @@ -7415,7 +5250,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033" dependencies = [ "proc-macro2", - "syn 2.0.89", + "syn 2.0.87", ] [[package]] @@ -7424,18 +5259,7 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05e4722c697a58a99d5d06a08c30821d7c082a4632198de1eaa5a6c22ef42373" dependencies = [ - "fixed-hash 0.7.0", - "uint", -] - -[[package]] -name = "primitive-types" -version = "0.12.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b34d9fd68ae0b74a41b21c03c2f62847aa0ffea044eee893b4c140b37e244e2" -dependencies = [ - "fixed-hash 0.8.0", - "impl-codec", + "fixed-hash", "uint", ] @@ -7445,7 +5269,7 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" dependencies = [ - "toml 0.5.11", + "toml", ] [[package]] @@ -7481,43 +5305,15 @@ dependencies = [ "version_check", ] -[[package]] -name = "proc-macro-error-attr2" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5" -dependencies = [ - "proc-macro2", - "quote", -] - -[[package]] -name = "proc-macro-error2" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802" -dependencies = [ - "proc-macro-error-attr2", - "proc-macro2", - "quote", - "syn 2.0.89", -] - [[package]] name = "proc-macro2" -version = "1.0.92" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" +checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e" dependencies = [ "unicode-ident", ] -[[package]] -name = "project-root" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bccbff07d5ed689c4087d20d7307a52ab6141edeedf487c3876a55b86cf63df" - [[package]] name = "prometheus" version = "0.13.4" @@ -7533,26 +5329,6 @@ dependencies = [ "thiserror 1.0.69", ] -[[package]] -name = "proptest" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4c2511913b88df1637da85cc8d96ec8e43a3f8bb8ccb71ee1ac240d6f3df58d" -dependencies = [ - "bit-set", - "bit-vec", - "bitflags 2.6.0", - "lazy_static", - "num-traits", - "rand", - "rand_chacha", - "rand_xorshift", - "regex-syntax 0.8.5", - "rusty-fork", - "tempfile", - "unarray", -] - [[package]] name = "prost" version = "0.12.6" @@ -7560,17 +5336,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" dependencies = [ "bytes", - "prost-derive 0.12.6", -] - -[[package]] -name = "prost" -version = "0.13.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b0487d90e047de87f984913713b85c601c05609aad5b0df4b4573fbf69aa13f" -dependencies = [ - "bytes", - "prost-derive 0.13.3", + "prost-derive", ] [[package]] @@ -7583,29 +5349,7 @@ dependencies = [ "itertools 0.12.1", "proc-macro2", "quote", - "syn 2.0.89", -] - -[[package]] -name = "prost-derive" -version = "0.13.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9552f850d5f0964a4e4d0bf306459ac29323ddfbae05e35a7c0d35cb0803cc5" -dependencies = [ - "anyhow", - "itertools 0.13.0", - "proc-macro2", - "quote", - "syn 2.0.89", -] - -[[package]] -name = "prost-types" -version = "0.13.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4759aa0d3a6232fb8dbdb97b61de2c20047c68aca932c7ed76da9d788508d670" -dependencies = [ - "prost 0.13.3", + "syn 2.0.87", ] [[package]] @@ -7705,64 +5449,6 @@ dependencies = [ "parity-wasm 0.41.0", ] -[[package]] -name = "quick-error" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - -[[package]] -name = "quinn" -version = "0.11.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62e96808277ec6f97351a2380e6c25114bc9e67037775464979f3037c92d05ef" -dependencies = [ - "bytes", - "pin-project-lite", - "quinn-proto", - "quinn-udp", - "rustc-hash 2.0.0", - "rustls", - "socket2 0.5.7", - "thiserror 2.0.3", - "tokio", - "tracing", -] - -[[package]] -name = "quinn-proto" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2fe5ef3495d7d2e377ff17b1a8ce2ee2ec2a18cde8b6ad6619d65d0701c135d" -dependencies = [ - "bytes", - "getrandom", - "rand", - "ring 0.17.8", - "rustc-hash 2.0.0", - "rustls", - "rustls-pki-types", - "slab", - "thiserror 2.0.3", - "tinyvec", - "tracing", - "web-time", -] - -[[package]] -name = "quinn-udp" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d5a626c6807713b15cac82a6acaccd6043c9a5408c24baae07611fec3f243da" -dependencies = [ - "cfg_aliases", - "libc", - "once_cell", - "socket2 0.5.7", - "tracing", - "windows-sys 0.59.0", -] - [[package]] name = "quote" version = "1.0.37" @@ -7819,15 +5505,6 @@ dependencies = [ "rand_core", ] -[[package]] -name = "rand_xorshift" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f" -dependencies = [ - "rand_core", -] - [[package]] name = "rand_xoshiro" version = "0.6.0" @@ -7877,12 +5554,6 @@ dependencies = [ "futures-io", ] -[[package]] -name = "recvmsg" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3edd4d5d42c92f0a659926464d4cce56b562761267ecf0f469d85b7de384175" - [[package]] name = "redox_syscall" version = "0.1.57" @@ -7898,15 +5569,6 @@ dependencies = [ "bitflags 1.3.2", ] -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "redox_syscall" version = "0.5.7" @@ -7948,7 +5610,7 @@ checksum = "ad156d539c879b7a24a363a2016d77961786e71f48f2e2fc8302a92abd2429a6" dependencies = [ "hashbrown 0.13.2", "log", - "rustc-hash 1.1.0", + "rustc-hash", "slice-group-by", "smallvec", ] @@ -8035,11 +5697,11 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2 0.3.26", + "h2", "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.31", - "hyper-tls 0.5.0", + "http-body", + "hyper", + "hyper-tls", "ipnet", "js-sys", "log", @@ -8052,8 +5714,8 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "sync_wrapper 0.1.2", - "system-configuration 0.5.1", + "sync_wrapper", + "system-configuration", "tokio", "tokio-native-tls", "tokio-util", @@ -8066,68 +5728,6 @@ dependencies = [ "winreg", ] -[[package]] -name = "reqwest" -version = "0.12.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f" -dependencies = [ - "async-compression", - "base64 0.22.1", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2 0.4.7", - "http 1.1.0", - "http-body 1.0.1", - "http-body-util", - "hyper 1.5.1", - "hyper-rustls", - "hyper-tls 0.6.0", - "hyper-util", - "ipnet", - "js-sys", - "log", - "mime", - "mime_guess", - "native-tls", - "once_cell", - "percent-encoding", - "pin-project-lite", - "quinn", - "rustls", - "rustls-native-certs 0.8.1", - "rustls-pemfile 2.2.0", - "rustls-pki-types", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper 1.0.2", - "system-configuration 0.6.1", - "tokio", - "tokio-native-tls", - "tokio-rustls", - "tokio-util", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-streams", - "web-sys", - "windows-registry", -] - -[[package]] -name = "rfc6979" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" -dependencies = [ - "hmac", - "subtle", -] - [[package]] name = "ring" version = "0.16.20" @@ -8186,115 +5786,43 @@ dependencies = [ ] [[package]] -name = "rkyv_derive" -version = "0.7.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "503d1d27590a2b0a3a4ca4c94755aa2875657196ecbf401a42eff41d7de532c0" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "rlimit" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "347703a5ae47adf1e693144157be231dde38c72bd485925cae7407ad3e52480b" -dependencies = [ - "libc", -] - -[[package]] -name = "rlp" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb919243f34364b6bd2fc10ef797edbfa75f33c252e7998527479c6d6b47e1ec" -dependencies = [ - "bytes", - "rustc-hex", -] - -[[package]] -name = "rocksdb" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb6f170a4041d50a0ce04b0d2e14916d6ca863ea2e422689a5b694395d299ffe" -dependencies = [ - "libc", - "librocksdb-sys", -] - -[[package]] -name = "ron" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" -dependencies = [ - "base64 0.21.7", - "bitflags 2.6.0", - "serde", - "serde_derive", -] - -[[package]] -name = "ruint" -version = "1.12.3" +name = "rkyv_derive" +version = "0.7.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c3cc4c2511671f327125da14133d0c5c5d137f006a1017a16f557bc85b16286" +checksum = "503d1d27590a2b0a3a4ca4c94755aa2875657196ecbf401a42eff41d7de532c0" dependencies = [ - "alloy-rlp", - "ark-ff 0.3.0", - "ark-ff 0.4.2", - "bytes", - "fastrlp", - "num-bigint 0.4.6", - "num-traits", - "parity-scale-codec", - "primitive-types 0.12.2", - "proptest", - "rand", - "rlp", - "ruint-macro", - "serde", - "valuable", - "zeroize", + "proc-macro2", + "quote", + "syn 1.0.109", ] [[package]] -name = "ruint-macro" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48fd7bd8a6377e15ad9d42a8ec25371b94ddc67abe7c8b9127bec79bebaaae18" - -[[package]] -name = "rusb" -version = "0.9.4" +name = "rlimit" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab9f9ff05b63a786553a4c02943b74b34a988448671001e9a27e2f0565cc05a4" +checksum = "347703a5ae47adf1e693144157be231dde38c72bd485925cae7407ad3e52480b" dependencies = [ "libc", - "libusb1-sys", ] [[package]] -name = "rust-ini" -version = "0.18.0" +name = "rocksdb" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6d5f2436026b4f6e79dc829837d467cc7e9a55ee40e750d716713540715a2df" +checksum = "bb6f170a4041d50a0ce04b0d2e14916d6ca863ea2e422689a5b694395d299ffe" dependencies = [ - "cfg-if 1.0.0", - "ordered-multimap 0.4.3", + "libc", + "librocksdb-sys", ] [[package]] name = "rust-ini" -version = "0.20.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e0698206bcb8882bf2a9ecb4c1e7785db57ff052297085a6efd4fe42302068a" +checksum = "f6d5f2436026b4f6e79dc829837d467cc7e9a55ee40e750d716713540715a2df" dependencies = [ "cfg-if 1.0.0", - "ordered-multimap 0.7.3", + "ordered-multimap", ] [[package]] @@ -8317,7 +5845,7 @@ dependencies = [ "md5", "minidom", "percent-encoding", - "reqwest 0.11.27", + "reqwest", "serde", "serde-xml-rs", "serde_derive", @@ -8341,12 +5869,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" -[[package]] -name = "rustc-hash" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" - [[package]] name = "rustc-hex" version = "2.1.0" @@ -8362,15 +5884,6 @@ dependencies = [ "semver 0.9.0", ] -[[package]] -name = "rustc_version" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" -dependencies = [ - "semver 0.11.0", -] - [[package]] name = "rustc_version" version = "0.4.1" @@ -8422,7 +5935,6 @@ version = "0.23.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f1a745511c54ba6d4465e8d5dfbd81b45791756de28d4981af70d6dca128f1e" dependencies = [ - "log", "once_cell", "ring 0.17.8", "rustls-pki-types", @@ -8439,7 +5951,7 @@ checksum = "2a980454b497c439c274f2feae2523ed8138bbd3d323684e1435fec62f800481" dependencies = [ "log", "rustls", - "rustls-native-certs 0.7.3", + "rustls-native-certs", "rustls-pki-types", "rustls-webpki", ] @@ -8454,19 +5966,7 @@ dependencies = [ "rustls-pemfile 2.2.0", "rustls-pki-types", "schannel", - "security-framework 2.11.1", -] - -[[package]] -name = "rustls-native-certs" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcff2dd52b58a8d98a70243663a0d234c4e2b79235637849d15913394a247d3" -dependencies = [ - "openssl-probe", - "rustls-pki-types", - "schannel", - "security-framework 3.0.1", + "security-framework", ] [[package]] @@ -8492,9 +5992,6 @@ name = "rustls-pki-types" version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" -dependencies = [ - "web-time", -] [[package]] name = "rustls-webpki" @@ -8513,18 +6010,6 @@ version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248" -[[package]] -name = "rusty-fork" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f" -dependencies = [ - "fnv", - "quick-error", - "tempfile", - "wait-timeout", -] - [[package]] name = "rxml" version = "0.9.1" @@ -8589,20 +6074,6 @@ version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" -[[package]] -name = "sec1" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" -dependencies = [ - "base16ct", - "der", - "generic-array 0.14.7", - "pkcs8", - "subtle", - "zeroize", -] - [[package]] name = "secp256k1" version = "0.27.0" @@ -8622,19 +6093,6 @@ dependencies = [ "cc", ] -[[package]] -name = "secret-vault-value" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc32a777b53b3433b974c9c26b6d502a50037f8da94e46cb8ce2ced2cfdfaea0" -dependencies = [ - "prost 0.13.3", - "prost-types", - "serde", - "serde_json", - "zeroize", -] - [[package]] name = "security-framework" version = "2.11.1" @@ -8642,20 +6100,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ "bitflags 2.6.0", - "core-foundation 0.9.4", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1415a607e92bec364ea2cf9264646dcce0f91e6d65281bd6f2819cca3bf39c8" -dependencies = [ - "bitflags 2.6.0", - "core-foundation 0.10.0", + "core-foundation", "core-foundation-sys", "libc", "security-framework-sys", @@ -8677,16 +6122,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" dependencies = [ - "semver-parser 0.7.0", -] - -[[package]] -name = "semver" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" -dependencies = [ - "semver-parser 0.10.3", + "semver-parser", ] [[package]] @@ -8701,21 +6137,6 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" -[[package]] -name = "semver-parser" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9900206b54a3527fdc7b8a938bffd94a568bac4f4aa8113b209df75a09c0dec2" -dependencies = [ - "pest", -] - -[[package]] -name = "send_wrapper" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" - [[package]] name = "serde" version = "1.0.215" @@ -8747,15 +6168,6 @@ dependencies = [ "xml-rs", ] -[[package]] -name = "serde_bare" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51c55386eed0f1ae957b091dc2ca8122f287b60c79c774cbe3d5f2b69fded660" -dependencies = [ - "serde", -] - [[package]] name = "serde_bytes" version = "0.11.15" @@ -8773,7 +6185,7 @@ checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.87", ] [[package]] @@ -8797,16 +6209,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_path_to_error" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6" -dependencies = [ - "itoa", - "serde", -] - [[package]] name = "serde_repr" version = "0.1.19" @@ -8815,16 +6217,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", -] - -[[package]] -name = "serde_spanned" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" -dependencies = [ - "serde", + "syn 2.0.87", ] [[package]] @@ -8866,7 +6259,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.87", ] [[package]] @@ -8914,16 +6307,6 @@ dependencies = [ "keccak", ] -[[package]] -name = "sha3-asm" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28efc5e327c837aa837c59eae585fc250715ef939ac32881bcc11677cd02d46" -dependencies = [ - "cc", - "cfg-if 1.0.0", -] - [[package]] name = "sharded-slab" version = "0.1.7" @@ -8953,10 +6336,6 @@ name = "signature" version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" -dependencies = [ - "digest 0.10.7", - "rand_core", -] [[package]] name = "simdutf8" @@ -8975,18 +6354,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "simple_asn1" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085" -dependencies = [ - "num-bigint 0.4.6", - "num-traits", - "thiserror 1.0.69", - "time", -] - [[package]] name = "sized-chunks" version = "0.6.5" @@ -9109,45 +6476,13 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" -[[package]] -name = "structmeta" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e1575d8d40908d70f6fd05537266b90ae71b15dbbe7a8b7dffa2b759306d329" -dependencies = [ - "proc-macro2", - "quote", - "structmeta-derive", - "syn 2.0.89", -] - -[[package]] -name = "structmeta-derive" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "152a0b65a590ff6c3da95cabe2353ee04e6167c896b28e3b14478c2636c922fc" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.89", -] - [[package]] name = "strum" version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" dependencies = [ - "strum_macros 0.24.3", -] - -[[package]] -name = "strum" -version = "0.26.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" -dependencies = [ - "strum_macros 0.26.4", + "strum_macros", ] [[package]] @@ -9163,19 +6498,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "strum_macros" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" -dependencies = [ - "heck 0.5.0", - "proc-macro2", - "quote", - "rustversion", - "syn 2.0.89", -] - [[package]] name = "stun" version = "0.4.4" @@ -9214,42 +6536,21 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.89" +version = "2.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" +checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] -[[package]] -name = "syn-solidity" -version = "0.8.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f76fe0a3e1476bdaa0775b9aec5b869ed9520c2b2fedfe9c6df3618f8ea6290b" -dependencies = [ - "paste", - "proc-macro2", - "quote", - "syn 2.0.89", -] - [[package]] name = "sync_wrapper" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" -[[package]] -name = "sync_wrapper" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" -dependencies = [ - "futures-core", -] - [[package]] name = "synstructure" version = "0.13.1" @@ -9258,7 +6559,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.87", ] [[package]] @@ -9283,19 +6584,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" dependencies = [ "bitflags 1.3.2", - "core-foundation 0.9.4", - "system-configuration-sys 0.5.0", -] - -[[package]] -name = "system-configuration" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" -dependencies = [ - "bitflags 2.6.0", - "core-foundation 0.9.4", - "system-configuration-sys 0.6.0", + "core-foundation", + "system-configuration-sys", ] [[package]] @@ -9308,16 +6598,6 @@ dependencies = [ "libc", ] -[[package]] -name = "system-configuration-sys" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" -dependencies = [ - "core-foundation-sys", - "libc", -] - [[package]] name = "tap" version = "1.0.1" @@ -9349,54 +6629,16 @@ dependencies = [ ] [[package]] -name = "tempfile" -version = "3.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c" -dependencies = [ - "cfg-if 1.0.0", - "fastrand 2.2.0", - "once_cell", - "rustix 0.38.41", - "windows-sys 0.59.0", -] - -[[package]] -name = "testcontainers" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f40cc2bd72e17f328faf8ca7687fe337e61bccd8acf9674fa78dd3792b045e1" -dependencies = [ - "async-trait", - "bollard", - "bollard-stubs", - "bytes", - "docker_credential", - "either", - "etcetera", - "futures", - "log", - "memchr", - "parse-display", - "pin-project-lite", - "serde", - "serde_json", - "serde_with", - "thiserror 1.0.69", - "tokio", - "tokio-stream", - "tokio-tar", - "tokio-util", - "url", -] - -[[package]] -name = "testcontainers-modules" -version = "0.11.4" +name = "tempfile" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "064a2677e164cad39ef3c1abddb044d5a25c49d27005804563d8c4227aac8bd0" +checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c" dependencies = [ - "testcontainers", + "cfg-if 1.0.0", + "fastrand 2.2.0", + "once_cell", + "rustix 0.38.41", + "windows-sys 0.59.0", ] [[package]] @@ -9425,7 +6667,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.87", ] [[package]] @@ -9436,27 +6678,7 @@ checksum = "f077553d607adc1caf65430528a576c757a71ed73944b66ebb58ef2bbd243568" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", -] - -[[package]] -name = "thiserror-impl-no-std" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58e6318948b519ba6dc2b442a6d0b904ebfb8d411a3ad3e07843615a72249758" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "thiserror-no-std" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3ad459d94dd517257cc96add8a43190ee620011bb6e6cdc82dafd97dfafafea" -dependencies = [ - "thiserror-impl-no-std", + "syn 2.0.87", ] [[package]] @@ -9519,15 +6741,6 @@ dependencies = [ "time-core", ] -[[package]] -name = "tiny-keccak" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" -dependencies = [ - "crunchy", -] - [[package]] name = "tinystr" version = "0.7.6" @@ -9600,7 +6813,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.87", ] [[package]] @@ -9638,17 +6851,6 @@ dependencies = [ "tokio-stream", ] -[[package]] -name = "tokio-rustls" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" -dependencies = [ - "rustls", - "rustls-pki-types", - "tokio", -] - [[package]] name = "tokio-stream" version = "0.1.16" @@ -9658,38 +6860,6 @@ dependencies = [ "futures-core", "pin-project-lite", "tokio", - "tokio-util", -] - -[[package]] -name = "tokio-tar" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5714c010ca3e5c27114c1cdeb9d14641ace49874aa5626d7149e47aedace75" -dependencies = [ - "filetime", - "futures-core", - "libc", - "redox_syscall 0.3.5", - "tokio", - "tokio-stream", - "xattr", -] - -[[package]] -name = "tokio-tungstenite" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edc5f74e248dc973e0dbb7b74c7e0d6fcc301c694ff50049504004ef4d0cdcd9" -dependencies = [ - "futures-util", - "log", - "rustls", - "rustls-pki-types", - "tokio", - "tokio-rustls", - "tungstenite", - "webpki-roots", ] [[package]] @@ -9714,26 +6884,11 @@ dependencies = [ "serde", ] -[[package]] -name = "toml" -version = "0.8.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", -] - [[package]] name = "toml_datetime" version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" -dependencies = [ - "serde", -] [[package]] name = "toml_edit" @@ -9742,8 +6897,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ "indexmap 2.6.0", - "serde", - "serde_spanned", "toml_datetime", "winnow", ] @@ -9756,53 +6909,20 @@ checksum = "76c4eb7a4e9ef9d4763600161f12f5070b92a578e1b634db88a6887844c91a13" dependencies = [ "async-stream", "async-trait", - "axum 0.6.20", + "axum", "base64 0.21.7", "bytes", - "h2 0.3.26", + "h2", "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.31", - "hyper-timeout 0.4.1", - "percent-encoding", - "pin-project 1.1.7", - "prost 0.12.6", - "tokio", - "tokio-stream", - "tower 0.4.13", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tonic" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877c5b330756d856ffcc4553ab34a5684481ade925ecc54bcd1bf02b1d0d4d52" -dependencies = [ - "async-stream", - "async-trait", - "axum 0.7.9", - "base64 0.22.1", - "bytes", - "h2 0.4.7", - "http 1.1.0", - "http-body 1.0.1", - "http-body-util", - "hyper 1.5.1", - "hyper-timeout 0.5.2", - "hyper-util", + "http-body", + "hyper", + "hyper-timeout", "percent-encoding", - "pin-project 1.1.7", - "prost 0.13.3", - "rustls-native-certs 0.8.1", - "rustls-pemfile 2.2.0", - "socket2 0.5.7", + "pin-project", + "prost", "tokio", - "tokio-rustls", "tokio-stream", - "tower 0.4.13", + "tower", "tower-layer", "tower-service", "tracing", @@ -9817,7 +6937,7 @@ dependencies = [ "futures-core", "futures-util", "indexmap 1.9.3", - "pin-project 1.1.7", + "pin-project", "pin-project-lite", "rand", "slab", @@ -9828,22 +6948,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "tower" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f" -dependencies = [ - "futures-core", - "futures-util", - "pin-project-lite", - "sync_wrapper 0.1.2", - "tokio", - "tower-layer", - "tower-service", - "tracing", -] - [[package]] name = "tower-layer" version = "0.3.3" @@ -9856,18 +6960,6 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" -[[package]] -name = "tower-util" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1093c19826d33807c72511e68f73b4a0469a3f22c2bd5f7d5212178b4b89674" -dependencies = [ - "futures-core", - "futures-util", - "pin-project 0.4.30", - "tower-service", -] - [[package]] name = "tracing" version = "0.1.40" @@ -9900,7 +6992,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.87", ] [[package]] @@ -9966,38 +7058,12 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" -[[package]] -name = "tungstenite" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18e5b8366ee7a95b16d32197d0b2604b43a0be89dc5fac9f8e96ccafbaedda8a" -dependencies = [ - "byteorder", - "bytes", - "data-encoding", - "http 1.1.0", - "httparse", - "log", - "rand", - "rustls", - "rustls-pki-types", - "sha1", - "thiserror 1.0.69", - "utf-8", -] - [[package]] name = "typenum" version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" -[[package]] -name = "ucd-trie" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971" - [[package]] name = "uint" version = "0.9.5" @@ -10010,21 +7076,6 @@ dependencies = [ "static_assertions", ] -[[package]] -name = "uint-zigzag" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abbf77aed65cb885a8ba07138c365879be3d9a93dce82bf6cc50feca9138ec15" -dependencies = [ - "core2", -] - -[[package]] -name = "unarray" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" - [[package]] name = "unicase" version = "2.8.0" @@ -10037,24 +7088,12 @@ version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" -[[package]] -name = "unicode-segmentation" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" - [[package]] name = "unicode-width" version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" -[[package]] -name = "unicode-xid" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" - [[package]] name = "unsafe-libyaml" version = "0.2.11" @@ -10082,7 +7121,6 @@ dependencies = [ "form_urlencoded", "idna", "percent-encoding", - "serde", ] [[package]] @@ -10091,12 +7129,6 @@ version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" -[[package]] -name = "utf-8" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" - [[package]] name = "utf16_iter" version = "1.0.5" @@ -10145,37 +7177,6 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" -[[package]] -name = "vsimd" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64" - -[[package]] -name = "vsss-rs" -version = "4.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fabeca519a296f0b39428cfe496b600c0179c9498687986449d61fa40e60806" -dependencies = [ - "crypto-bigint", - "elliptic-curve", - "generic-array 1.1.0", - "rand_core", - "serde", - "sha3", - "subtle", - "thiserror-no-std", -] - -[[package]] -name = "wait-timeout" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" -dependencies = [ - "libc", -] - [[package]] name = "waker-fn" version = "1.2.0" @@ -10219,7 +7220,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.87", "wasm-bindgen-shared", ] @@ -10253,7 +7254,7 @@ checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.87", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -10711,7 +7712,7 @@ checksum = "09b5575a75e711ca6c36bb9ad647c93541cdc8e34218031acba5da3f35919dd3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.87", ] [[package]] @@ -10740,15 +7741,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "webpki-roots" -version = "0.26.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d642ff16b7e79272ae451b7322067cdc17cadf68c23264be9d94a32319efe7e" -dependencies = [ - "rustls-pki-types", -] - [[package]] name = "webrtc-util" version = "0.7.0" @@ -10782,12 +7774,6 @@ dependencies = [ "rustix 0.38.41", ] -[[package]] -name = "widestring" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" - [[package]] name = "wildmatch" version = "2.4.0" @@ -10825,36 +7811,6 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "windows-registry" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" -dependencies = [ - "windows-result", - "windows-strings", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-result" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-strings" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" -dependencies = [ - "windows-result", - "windows-targets 0.52.6", -] - [[package]] name = "windows-sys" version = "0.48.0" @@ -11022,30 +7978,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "wiremock" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fff469918e7ca034884c7fd8f93fe27bacb7fcb599fd879df6c7b429a29b646" -dependencies = [ - "assert-json-diff", - "async-trait", - "base64 0.22.1", - "deadpool", - "futures", - "http 1.1.0", - "http-body-util", - "hyper 1.5.1", - "hyper-util", - "log", - "once_cell", - "regex", - "serde", - "serde_json", - "tokio", - "url", -] - [[package]] name = "write16" version = "1.0.0" @@ -11058,25 +7990,6 @@ version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" -[[package]] -name = "ws_stream_wasm" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7999f5f4217fe3818726b66257a4475f71e74ffd190776ad053fa159e50737f5" -dependencies = [ - "async_io_stream", - "futures", - "js-sys", - "log", - "pharos", - "rustc_version 0.4.1", - "send_wrapper", - "thiserror 1.0.69", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - [[package]] name = "wyz" version = "0.5.1" @@ -11114,17 +8027,6 @@ dependencies = [ "time", ] -[[package]] -name = "xattr" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" -dependencies = [ - "libc", - "linux-raw-sys 0.4.14", - "rustix 0.38.41", -] - [[package]] name = "xml-rs" version = "0.8.23" @@ -11140,17 +8042,6 @@ dependencies = [ "lzma-sys", ] -[[package]] -name = "yaml-rust2" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8902160c4e6f2fb145dbe9d6760a75e3c9522d8bf796ed7047c85919ac7115f8" -dependencies = [ - "arraydeque", - "encoding_rs", - "hashlink", -] - [[package]] name = "yansi" version = "0.5.1" @@ -11177,7 +8068,7 @@ checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.87", "synstructure", ] @@ -11199,7 +8090,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.87", ] [[package]] @@ -11219,7 +8110,7 @@ checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.87", "synstructure", ] @@ -11240,7 +8131,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.87", ] [[package]] @@ -11276,7 +8167,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.87", ] [[package]] diff --git a/indexer/Cargo.toml b/indexer/Cargo.toml index ed436027..8ca478c8 100644 --- a/indexer/Cargo.toml +++ b/indexer/Cargo.toml @@ -26,11 +26,11 @@ tracing = { version = "0.1.36", features = ["std"] } thiserror = "1.0.56" anyhow = "1.0.79" -near-indexer = { git = "https://github.com/near/nearcore", rev = "93073d762ff377382ebf54e7cbff448b492e72c6" } -near-client = { git = "https://github.com/near/nearcore", rev = "93073d762ff377382ebf54e7cbff448b492e72c6" } -near-o11y = { git = "https://github.com/near/nearcore", rev = "93073d762ff377382ebf54e7cbff448b492e72c6" } -near-config-utils = { git = "https://github.com/near/nearcore", rev = "93073d762ff377382ebf54e7cbff448b492e72c6" } -near-client-primitives = { git = "https://github.com/near/nearcore", rev = "93073d762ff377382ebf54e7cbff448b492e72c6" } +near-indexer = { git = "https://github.com/near/nearcore", rev = "a83c18490cf4dafaedca01458f365dc5871bd293" } +near-client = { git = "https://github.com/near/nearcore", rev = "a83c18490cf4dafaedca01458f365dc5871bd293" } +near-o11y = { git = "https://github.com/near/nearcore", rev = "a83c18490cf4dafaedca01458f365dc5871bd293" } +near-config-utils = { git = "https://github.com/near/nearcore", rev = "a83c18490cf4dafaedca01458f365dc5871bd293" } +near-client-primitives = { git = "https://github.com/near/nearcore", rev = "a83c18490cf4dafaedca01458f365dc5871bd293" } borsh = { version = "1.0.0", features = ["derive", "rc"] } serde_yaml = "0.9.34" reqwest = { workspace = true } diff --git a/indexer/Dockerfile b/indexer/Dockerfile index bc59c88d..e3198029 100644 --- a/indexer/Dockerfile +++ b/indexer/Dockerfile @@ -1,4 +1,4 @@ -FROM rust:1.81 AS builder +FROM rust:1.82 AS builder WORKDIR /tmp/indexer # Copy from nearcore: diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 316bc155..225a008d 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -2,6 +2,6 @@ # This specifies the version of Rust we use to build. # Individual crates in the workspace may support a lower version, as indicated by `rust-version` field in each crate's `Cargo.toml`. # The version specified below, should be at least as high as the maximum `rust-version` within the workspace. -channel = "1.81.0" +channel = "1.82.0" components = [ "rustfmt", "clippy" ] targets = [ "wasm32-unknown-unknown" ] From 9a7847777a3ada4f19b24ead8ce6165abee26ab8 Mon Sep 17 00:00:00 2001 From: Sasha Syrotenko Date: Mon, 25 Nov 2024 12:46:37 +0200 Subject: [PATCH 04/40] Correct docker build --- Cargo.lock | 3632 ++++++++++++++++++++++++++++++-- Makefile | 2 + indexer/Cargo.toml | 2 +- indexer/FastIndexer.dockerfile | 8 +- 4 files changed, 3409 insertions(+), 235 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1199a615..c9143924 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -52,7 +52,7 @@ checksum = "0346d8c1f762b41b458ed3145eea914966bb9ad20b9be0d6d463b20d45586370" dependencies = [ "actix-utils", "actix-web", - "derive_more", + "derive_more 0.99.18", "futures-util", "log", "once_cell", @@ -75,11 +75,11 @@ dependencies = [ "brotli", "bytes", "bytestring", - "derive_more", + "derive_more 0.99.18", "encoding_rs", "flate2", "futures-core", - "h2", + "h2 0.3.26", "http 0.2.12", "httparse", "httpdate", @@ -105,7 +105,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb" dependencies = [ "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -213,7 +213,7 @@ dependencies = [ "bytestring", "cfg-if 1.0.0", "cookie", - "derive_more", + "derive_more 0.99.18", "encoding_rs", "futures-core", "futures-util", @@ -244,7 +244,7 @@ dependencies = [ "actix-router", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -255,7 +255,7 @@ checksum = "b6ac1e58cded18cb28ddc17143c4dea5345b3ad575e14f32f66e4054a56eb271" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -347,6 +347,694 @@ version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "45862d1c77f2228b9e10bc609d5bc203d86ebc9b87ad8d5d5167a6c9abf739d9" +[[package]] +name = "alloy" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "056f2c01b2aed86e15b43c47d109bfc8b82553dc34e66452875e51247ec31ab2" +dependencies = [ + "alloy-consensus", + "alloy-contract", + "alloy-core", + "alloy-eips", + "alloy-genesis", + "alloy-json-rpc", + "alloy-network", + "alloy-node-bindings", + "alloy-provider", + "alloy-pubsub", + "alloy-rpc-client", + "alloy-rpc-types", + "alloy-serde", + "alloy-signer", + "alloy-signer-aws", + "alloy-signer-gcp", + "alloy-signer-ledger", + "alloy-signer-local", + "alloy-transport", + "alloy-transport-http", + "alloy-transport-ipc", + "alloy-transport-ws", +] + +[[package]] +name = "alloy-chains" +version = "0.1.47" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18c5c520273946ecf715c0010b4e3503d7eba9893cd9ce6b7fff5654c4a3c470" +dependencies = [ + "alloy-primitives", + "num_enum", + "strum 0.26.3", +] + +[[package]] +name = "alloy-consensus" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "705687d5bfd019fee57cf9e206b27b30a9a9617535d5590a02b171e813208f8e" +dependencies = [ + "alloy-eips", + "alloy-primitives", + "alloy-rlp", + "alloy-serde", + "auto_impl", + "c-kzg", + "derive_more 1.0.0", + "serde", +] + +[[package]] +name = "alloy-contract" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "917f7d12cf3971dc8c11c9972f732b35ccb9aaaf5f28f2f87e9e6523bee3a8ad" +dependencies = [ + "alloy-dyn-abi", + "alloy-json-abi", + "alloy-network", + "alloy-network-primitives", + "alloy-primitives", + "alloy-provider", + "alloy-pubsub", + "alloy-rpc-types-eth", + "alloy-sol-types", + "alloy-transport", + "futures", + "futures-util", + "thiserror 1.0.69", +] + +[[package]] +name = "alloy-core" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8316d83e590f4163b221b8180008f302bda5cf5451202855cdd323e588849c" +dependencies = [ + "alloy-dyn-abi", + "alloy-json-abi", + "alloy-primitives", + "alloy-rlp", + "alloy-sol-types", +] + +[[package]] +name = "alloy-dyn-abi" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef2364c782a245cf8725ea6dbfca5f530162702b5d685992ea03ce64529136cc" +dependencies = [ + "alloy-json-abi", + "alloy-primitives", + "alloy-sol-type-parser", + "alloy-sol-types", + "const-hex", + "derive_more 1.0.0", + "itoa", + "serde", + "serde_json", + "winnow", +] + +[[package]] +name = "alloy-eip2930" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0069cf0642457f87a01a014f6dc29d5d893cd4fd8fddf0c3cdfad1bb3ebafc41" +dependencies = [ + "alloy-primitives", + "alloy-rlp", + "serde", +] + +[[package]] +name = "alloy-eip7702" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea59dc42102bc9a1905dc57901edc6dd48b9f38115df86c7d252acba70d71d04" +dependencies = [ + "alloy-primitives", + "alloy-rlp", + "k256", + "serde", +] + +[[package]] +name = "alloy-eips" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ffb906284a1e1f63c4607da2068c8197458a352d0b3e9796e67353d72a9be85" +dependencies = [ + "alloy-eip2930", + "alloy-eip7702", + "alloy-primitives", + "alloy-rlp", + "alloy-serde", + "c-kzg", + "derive_more 1.0.0", + "once_cell", + "serde", + "sha2", +] + +[[package]] +name = "alloy-genesis" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8429cf4554eed9b40feec7f4451113e76596086447550275e3def933faf47ce3" +dependencies = [ + "alloy-primitives", + "alloy-serde", + "serde", +] + +[[package]] +name = "alloy-json-abi" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b84c506bf264110fa7e90d9924f742f40ef53c6572ea56a0b0bd714a567ed389" +dependencies = [ + "alloy-primitives", + "alloy-sol-type-parser", + "serde", + "serde_json", +] + +[[package]] +name = "alloy-json-rpc" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8fa8a1a3c4cbd221f2b8e3693aeb328fca79a757fe556ed08e47bbbc2a70db7" +dependencies = [ + "alloy-primitives", + "alloy-sol-types", + "serde", + "serde_json", + "thiserror 1.0.69", + "tracing", +] + +[[package]] +name = "alloy-network" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85fa23a6a9d612b52e402c995f2d582c25165ec03ac6edf64c861a76bc5b87cd" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-json-rpc", + "alloy-network-primitives", + "alloy-primitives", + "alloy-rpc-types-eth", + "alloy-serde", + "alloy-signer", + "alloy-sol-types", + "async-trait", + "auto_impl", + "futures-utils-wasm", + "thiserror 1.0.69", +] + +[[package]] +name = "alloy-network-primitives" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "801492711d4392b2ccf5fc0bc69e299fa1aab15167d74dcaa9aab96a54f684bd" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-primitives", + "alloy-serde", + "serde", +] + +[[package]] +name = "alloy-node-bindings" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f1334a738aa1710cb8227441b3fcc319202ce78e967ef37406940242df4a454" +dependencies = [ + "alloy-genesis", + "alloy-primitives", + "k256", + "rand", + "serde_json", + "tempfile", + "thiserror 1.0.69", + "tracing", + "url", +] + +[[package]] +name = "alloy-primitives" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fce5dbd6a4f118eecc4719eaa9c7ffc31c315e6c5ccde3642db927802312425" +dependencies = [ + "alloy-rlp", + "bytes", + "cfg-if 1.0.0", + "const-hex", + "derive_more 1.0.0", + "foldhash", + "hashbrown 0.15.2", + "hex-literal", + "indexmap 2.6.0", + "itoa", + "k256", + "keccak-asm", + "paste", + "proptest", + "rand", + "ruint", + "rustc-hash 2.0.0", + "serde", + "sha3", + "tiny-keccak", +] + +[[package]] +name = "alloy-provider" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcfaa4ffec0af04e3555686b8aacbcdf7d13638133a0672749209069750f78a6" +dependencies = [ + "alloy-chains", + "alloy-consensus", + "alloy-eips", + "alloy-json-rpc", + "alloy-network", + "alloy-network-primitives", + "alloy-node-bindings", + "alloy-primitives", + "alloy-pubsub", + "alloy-rpc-client", + "alloy-rpc-types-anvil", + "alloy-rpc-types-eth", + "alloy-rpc-types-trace", + "alloy-signer-local", + "alloy-transport", + "alloy-transport-http", + "alloy-transport-ipc", + "alloy-transport-ws", + "async-stream", + "async-trait", + "auto_impl", + "dashmap", + "futures", + "futures-utils-wasm", + "lru 0.12.5", + "pin-project 1.1.7", + "reqwest 0.12.9", + "serde", + "serde_json", + "thiserror 1.0.69", + "tokio", + "tracing", + "url", +] + +[[package]] +name = "alloy-pubsub" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f32cef487122ae75c91eb50154c70801d71fabdb976fec6c49e0af5e6486ab15" +dependencies = [ + "alloy-json-rpc", + "alloy-primitives", + "alloy-transport", + "bimap", + "futures", + "serde", + "serde_json", + "tokio", + "tokio-stream", + "tower 0.5.1", + "tracing", +] + +[[package]] +name = "alloy-rlp" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da0822426598f95e45dd1ea32a738dac057529a709ee645fcc516ffa4cbde08f" +dependencies = [ + "alloy-rlp-derive", + "arrayvec", + "bytes", +] + +[[package]] +name = "alloy-rlp-derive" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b09cae092c27b6f1bde952653a22708691802e57bfef4a2973b80bea21efd3f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.89", +] + +[[package]] +name = "alloy-rpc-client" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "370143ed581aace6e663342d21d209c6b2e34ee6142f7d6675adb518deeaf0dc" +dependencies = [ + "alloy-json-rpc", + "alloy-primitives", + "alloy-pubsub", + "alloy-transport", + "alloy-transport-http", + "alloy-transport-ipc", + "alloy-transport-ws", + "futures", + "pin-project 1.1.7", + "reqwest 0.12.9", + "serde", + "serde_json", + "tokio", + "tokio-stream", + "tower 0.5.1", + "tracing", + "url", +] + +[[package]] +name = "alloy-rpc-types" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ffc534b7919e18f35e3aa1f507b6f3d9d92ec298463a9f6beaac112809d8d06" +dependencies = [ + "alloy-primitives", + "alloy-rpc-types-engine", + "alloy-rpc-types-eth", + "alloy-rpc-types-trace", + "alloy-serde", + "serde", +] + +[[package]] +name = "alloy-rpc-types-anvil" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d780adaa5d95b07ad92006b2feb68ecfa7e2015f7d5976ceaac4c906c73ebd07" +dependencies = [ + "alloy-primitives", + "alloy-serde", + "serde", +] + +[[package]] +name = "alloy-rpc-types-engine" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0285c4c09f838ab830048b780d7f4a4f460f309aa1194bb049843309524c64c" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-primitives", + "alloy-rlp", + "derive_more 1.0.0", + "strum 0.26.3", +] + +[[package]] +name = "alloy-rpc-types-eth" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413f4aa3ccf2c3e4234a047c5fa4727916d7daf25a89f9b765df0ba09784fd87" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-network-primitives", + "alloy-primitives", + "alloy-rlp", + "alloy-serde", + "alloy-sol-types", + "derive_more 1.0.0", + "itertools 0.13.0", + "serde", + "serde_json", +] + +[[package]] +name = "alloy-rpc-types-trace" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "017cad3e5793c5613588c1f9732bcbad77e820ba7d0feaba3527749f856fdbc5" +dependencies = [ + "alloy-primitives", + "alloy-rpc-types-eth", + "alloy-serde", + "serde", + "serde_json", + "thiserror 1.0.69", +] + +[[package]] +name = "alloy-serde" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9dff0ab1cdd43ca001e324dc27ee0e8606bd2161d6623c63e0e0b8c4dfc13600" +dependencies = [ + "alloy-primitives", + "serde", + "serde_json", +] + +[[package]] +name = "alloy-signer" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fd4e0ad79c81a27ca659be5d176ca12399141659fef2bcbfdc848da478f4504" +dependencies = [ + "alloy-dyn-abi", + "alloy-primitives", + "alloy-sol-types", + "async-trait", + "auto_impl", + "elliptic-curve", + "k256", + "thiserror 1.0.69", +] + +[[package]] +name = "alloy-signer-aws" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "417e19d9844350d11f7426d4920a5df777f8c2abbb7a70d9de6f1faf284db15b" +dependencies = [ + "alloy-consensus", + "alloy-network", + "alloy-primitives", + "alloy-signer", + "async-trait", + "aws-sdk-kms", + "k256", + "spki", + "thiserror 1.0.69", + "tracing", +] + +[[package]] +name = "alloy-signer-gcp" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6fd12ae28e8330766821058ed9a6a06ae4f9b12c776e8a7cfb16e3a954f508e" +dependencies = [ + "alloy-consensus", + "alloy-network", + "alloy-primitives", + "alloy-signer", + "async-trait", + "gcloud-sdk", + "k256", + "spki", + "thiserror 1.0.69", + "tracing", +] + +[[package]] +name = "alloy-signer-ledger" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3a02400dea370022151f07581b73a836115c88ce4df350206653493bec024e2" +dependencies = [ + "alloy-consensus", + "alloy-dyn-abi", + "alloy-network", + "alloy-primitives", + "alloy-signer", + "alloy-sol-types", + "async-trait", + "coins-ledger", + "futures-util", + "semver 1.0.23", + "thiserror 1.0.69", + "tracing", +] + +[[package]] +name = "alloy-signer-local" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "494e0a256f3e99f2426f994bcd1be312c02cb8f88260088dacb33a8b8936475f" +dependencies = [ + "alloy-consensus", + "alloy-network", + "alloy-primitives", + "alloy-signer", + "async-trait", + "k256", + "rand", + "thiserror 1.0.69", +] + +[[package]] +name = "alloy-sol-macro" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9343289b4a7461ed8bab8618504c995c049c082b70c7332efd7b32125633dc05" +dependencies = [ + "alloy-sol-macro-expander", + "alloy-sol-macro-input", + "proc-macro-error2", + "proc-macro2", + "quote", + "syn 2.0.89", +] + +[[package]] +name = "alloy-sol-macro-expander" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4222d70bec485ceccc5d8fd4f2909edd65b5d5e43d4aca0b5dcee65d519ae98f" +dependencies = [ + "alloy-json-abi", + "alloy-sol-macro-input", + "const-hex", + "heck 0.5.0", + "indexmap 2.6.0", + "proc-macro-error2", + "proc-macro2", + "quote", + "syn 2.0.89", + "syn-solidity", + "tiny-keccak", +] + +[[package]] +name = "alloy-sol-macro-input" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e17f2677369571b976e51ea1430eb41c3690d344fef567b840bfc0b01b6f83a" +dependencies = [ + "alloy-json-abi", + "const-hex", + "dunce", + "heck 0.5.0", + "proc-macro2", + "quote", + "serde_json", + "syn 2.0.89", + "syn-solidity", +] + +[[package]] +name = "alloy-sol-type-parser" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa64d80ae58ffaafdff9d5d84f58d03775f66c84433916dc9a64ed16af5755da" +dependencies = [ + "serde", + "winnow", +] + +[[package]] +name = "alloy-sol-types" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6520d427d4a8eb7aa803d852d7a52ceb0c519e784c292f64bb339e636918cf27" +dependencies = [ + "alloy-json-abi", + "alloy-primitives", + "alloy-sol-macro", + "const-hex", + "serde", +] + +[[package]] +name = "alloy-transport" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ac3e97dad3d31770db0fc89bd6a63b789fbae78963086733f960cf32c483904" +dependencies = [ + "alloy-json-rpc", + "base64 0.22.1", + "futures-util", + "futures-utils-wasm", + "serde", + "serde_json", + "thiserror 1.0.69", + "tokio", + "tower 0.5.1", + "tracing", + "url", +] + +[[package]] +name = "alloy-transport-http" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b367dcccada5b28987c2296717ee04b9a5637aacd78eacb1726ef211678b5212" +dependencies = [ + "alloy-json-rpc", + "alloy-transport", + "reqwest 0.12.9", + "serde_json", + "tower 0.5.1", + "tracing", + "url", +] + +[[package]] +name = "alloy-transport-ipc" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b90cf9cde7f2fce617da52768ee28f522264b282d148384a4ca0ea85af04fa3a" +dependencies = [ + "alloy-json-rpc", + "alloy-pubsub", + "alloy-transport", + "bytes", + "futures", + "interprocess", + "pin-project 1.1.7", + "serde_json", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "alloy-transport-ws" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7153b88690de6a50bba81c11e1d706bc41dbb90126d607404d60b763f6a3947f" +dependencies = [ + "alloy-pubsub", + "alloy-transport", + "futures", + "http 1.1.0", + "rustls", + "serde_json", + "tokio", + "tokio-tungstenite", + "tracing", + "ws_stream_wasm", +] + [[package]] name = "amq-protocol" version = "7.2.2" @@ -480,6 +1168,136 @@ version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" +[[package]] +name = "ark-ff" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b3235cc41ee7a12aaaf2c575a2ad7b46713a8a50bda2fc3b003a04845c05dd6" +dependencies = [ + "ark-ff-asm 0.3.0", + "ark-ff-macros 0.3.0", + "ark-serialize 0.3.0", + "ark-std 0.3.0", + "derivative", + "num-bigint 0.4.6", + "num-traits", + "paste", + "rustc_version 0.3.3", + "zeroize", +] + +[[package]] +name = "ark-ff" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec847af850f44ad29048935519032c33da8aa03340876d351dfab5660d2966ba" +dependencies = [ + "ark-ff-asm 0.4.2", + "ark-ff-macros 0.4.2", + "ark-serialize 0.4.2", + "ark-std 0.4.0", + "derivative", + "digest 0.10.7", + "itertools 0.10.5", + "num-bigint 0.4.6", + "num-traits", + "paste", + "rustc_version 0.4.1", + "zeroize", +] + +[[package]] +name = "ark-ff-asm" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db02d390bf6643fb404d3d22d31aee1c4bc4459600aef9113833d17e786c6e44" +dependencies = [ + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ark-ff-asm" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ed4aa4fe255d0bc6d79373f7e31d2ea147bcf486cba1be5ba7ea85abdb92348" +dependencies = [ + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ark-ff-macros" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2fd794a08ccb318058009eefdf15bcaaaaf6f8161eb3345f907222bac38b20" +dependencies = [ + "num-bigint 0.4.6", + "num-traits", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ark-ff-macros" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7abe79b0e4288889c4574159ab790824d0033b9fdcb2a112a3182fac2e514565" +dependencies = [ + "num-bigint 0.4.6", + "num-traits", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ark-serialize" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d6c2b318ee6e10f8c2853e73a83adc0ccb88995aa978d8a3408d492ab2ee671" +dependencies = [ + "ark-std 0.3.0", + "digest 0.9.0", +] + +[[package]] +name = "ark-serialize" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adb7b85a02b83d2f22f89bd5cac66c9c89474240cb6207cb1efc16d098e822a5" +dependencies = [ + "ark-std 0.4.0", + "digest 0.10.7", + "num-bigint 0.4.6", +] + +[[package]] +name = "ark-std" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1df2c09229cbc5a028b1d70e00fdb2acee28b1055dfb5ca73eea49c5a25c4e7c" +dependencies = [ + "num-traits", + "rand", +] + +[[package]] +name = "ark-std" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185" +dependencies = [ + "num-traits", + "rand", +] + +[[package]] +name = "arraydeque" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d902e3d592a523def97af8f317b08ce16b7ab854c1985a0c671e6f15cebc236" + [[package]] name = "arrayref" version = "0.3.9" @@ -516,7 +1334,7 @@ checksum = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", "synstructure", ] @@ -528,7 +1346,17 @@ checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", +] + +[[package]] +name = "assert-json-diff" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47e4f2b81832e72834d7518d8487a0396a28cc408186a2e8854c0f98011faf12" +dependencies = [ + "serde", + "serde_json", ] [[package]] @@ -549,6 +1377,19 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "async-compression" +version = "0.4.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df895a515f70646414f4b45c0b79082783b80552b373a68283012928df56f522" +dependencies = [ + "flate2", + "futures-core", + "memchr", + "pin-project-lite", + "tokio", +] + [[package]] name = "async-executor" version = "1.13.1" @@ -678,7 +1519,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -695,7 +1536,18 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", +] + +[[package]] +name = "async_io_stream" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6d7b9decdf35d8908a7e3ef02f64c5e9b1695e230154c0e8de3969142d9b94c" +dependencies = [ + "futures", + "pharos", + "rustc_version 0.4.1", ] [[package]] @@ -720,6 +1572,17 @@ dependencies = [ "wildmatch", ] +[[package]] +name = "auto_impl" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.89", +] + [[package]] name = "autocfg" version = "1.4.0" @@ -742,10 +1605,10 @@ dependencies = [ "bytes", "cfg-if 1.0.0", "cookie", - "derive_more", + "derive_more 0.99.18", "futures-core", "futures-util", - "h2", + "h2 0.3.26", "http 0.2.12", "itoa", "log", @@ -760,6 +1623,18 @@ dependencies = [ "tokio", ] +[[package]] +name = "aws-credential-types" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60e8f6b615cb5fc60a98132268508ad104310f0cfb25a1c22eee76efdf9154da" +dependencies = [ + "aws-smithy-async", + "aws-smithy-runtime-api", + "aws-smithy-types", + "zeroize", +] + [[package]] name = "aws-creds" version = "0.30.0" @@ -768,7 +1643,7 @@ checksum = "5aeeee1a5defa63cba39097a510dfe63ef53658fc8995202a610f6a8a4d03639" dependencies = [ "attohttpc", "dirs", - "rust-ini", + "rust-ini 0.18.0", "serde", "serde-xml-rs", "thiserror 1.0.69", @@ -785,6 +1660,193 @@ dependencies = [ "thiserror 1.0.69", ] +[[package]] +name = "aws-runtime" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a10d5c055aa540164d9561a0e2e74ad30f0dcf7393c3a92f6733ddf9c5762468" +dependencies = [ + "aws-credential-types", + "aws-sigv4", + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-types", + "bytes", + "fastrand 2.2.0", + "http 0.2.12", + "http-body 0.4.6", + "once_cell", + "percent-encoding", + "pin-project-lite", + "tracing", + "uuid", +] + +[[package]] +name = "aws-sdk-kms" +version = "1.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfd059dacda4dfd5b57f2bd453fc6555f9acb496cb77508d517da24cf5d73167" +dependencies = [ + "aws-credential-types", + "aws-runtime", + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-types", + "bytes", + "http 0.2.12", + "once_cell", + "regex-lite", + "tracing", +] + +[[package]] +name = "aws-sigv4" +version = "1.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5619742a0d8f253be760bfbb8e8e8368c69e3587e4637af5754e488a611499b1" +dependencies = [ + "aws-credential-types", + "aws-smithy-http", + "aws-smithy-runtime-api", + "aws-smithy-types", + "bytes", + "form_urlencoded", + "hex", + "hmac", + "http 0.2.12", + "http 1.1.0", + "once_cell", + "percent-encoding", + "sha2", + "time", + "tracing", +] + +[[package]] +name = "aws-smithy-async" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62220bc6e97f946ddd51b5f1361f78996e704677afc518a4ff66b7a72ea1378c" +dependencies = [ + "futures-util", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "aws-smithy-http" +version = "0.60.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c8bc3e8fdc6b8d07d976e301c02fe553f72a39b7a9fea820e023268467d7ab6" +dependencies = [ + "aws-smithy-runtime-api", + "aws-smithy-types", + "bytes", + "bytes-utils", + "futures-core", + "http 0.2.12", + "http-body 0.4.6", + "once_cell", + "percent-encoding", + "pin-project-lite", + "pin-utils", + "tracing", +] + +[[package]] +name = "aws-smithy-json" +version = "0.60.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4683df9469ef09468dad3473d129960119a0d3593617542b7d52086c8486f2d6" +dependencies = [ + "aws-smithy-types", +] + +[[package]] +name = "aws-smithy-runtime" +version = "1.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be28bd063fa91fd871d131fc8b68d7cd4c5fa0869bea68daca50dcb1cbd76be2" +dependencies = [ + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-runtime-api", + "aws-smithy-types", + "bytes", + "fastrand 2.2.0", + "http 0.2.12", + "http-body 0.4.6", + "http-body 1.0.1", + "httparse", + "once_cell", + "pin-project-lite", + "pin-utils", + "tokio", + "tracing", +] + +[[package]] +name = "aws-smithy-runtime-api" +version = "1.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92165296a47a812b267b4f41032ff8069ab7ff783696d217f0994a0d7ab585cd" +dependencies = [ + "aws-smithy-async", + "aws-smithy-types", + "bytes", + "http 0.2.12", + "http 1.1.0", + "pin-project-lite", + "tokio", + "tracing", + "zeroize", +] + +[[package]] +name = "aws-smithy-types" +version = "1.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fbd94a32b3a7d55d3806fe27d98d3ad393050439dd05eb53ece36ec5e3d3510" +dependencies = [ + "base64-simd", + "bytes", + "bytes-utils", + "http 0.2.12", + "http 1.1.0", + "http-body 0.4.6", + "http-body 1.0.1", + "http-body-util", + "itoa", + "num-integer", + "pin-project-lite", + "pin-utils", + "ryu", + "serde", + "time", +] + +[[package]] +name = "aws-types" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5221b91b3e441e6675310829fd8984801b772cb1546ef6c0e54dec9f1ac13fef" +dependencies = [ + "aws-credential-types", + "aws-smithy-async", + "aws-smithy-runtime-api", + "aws-smithy-types", + "rustc_version 0.4.1", + "tracing", +] + [[package]] name = "axum" version = "0.6.20" @@ -792,13 +1854,42 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" dependencies = [ "async-trait", - "axum-core", + "axum-core 0.3.4", "bitflags 1.3.2", "bytes", "futures-util", "http 0.2.12", - "http-body", - "hyper", + "http-body 0.4.6", + "hyper 0.14.31", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "sync_wrapper 0.1.2", + "tower 0.4.13", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f" +dependencies = [ + "async-trait", + "axum-core 0.4.5", + "bytes", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", + "hyper 1.5.1", + "hyper-util", "itoa", "matchit", "memchr", @@ -807,10 +1898,15 @@ dependencies = [ "pin-project-lite", "rustversion", "serde", - "sync_wrapper", - "tower", + "serde_json", + "serde_path_to_error", + "serde_urlencoded", + "sync_wrapper 1.0.2", + "tokio", + "tower 0.5.1", "tower-layer", "tower-service", + "tracing", ] [[package]] @@ -823,11 +1919,32 @@ dependencies = [ "bytes", "futures-util", "http 0.2.12", - "http-body", + "http-body 0.4.6", + "mime", + "rustversion", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum-core" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", "mime", + "pin-project-lite", "rustversion", + "sync_wrapper 1.0.2", "tower-layer", "tower-service", + "tracing", ] [[package]] @@ -845,6 +1962,12 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "base16ct" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" + [[package]] name = "base64" version = "0.12.3" @@ -869,12 +1992,28 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" +[[package]] +name = "base64-simd" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "339abbe78e73178762e23bea9dfd08e697eb3f3301cd4be981c0f78ba5859195" +dependencies = [ + "outref", + "vsimd", +] + [[package]] name = "base64ct" version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" +[[package]] +name = "bimap" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "230c5f1ca6a325a32553f8640d31ac9b49f2411e901e427570154868b46da4f7" + [[package]] name = "bincode" version = "1.3.3" @@ -900,11 +2039,26 @@ dependencies = [ "proc-macro2", "quote", "regex", - "rustc-hash", + "rustc-hash 1.1.0", "shlex", - "syn 2.0.87", + "syn 2.0.89", +] + +[[package]] +name = "bit-set" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +dependencies = [ + "bit-vec", ] +[[package]] +name = "bit-vec" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" + [[package]] name = "bitflags" version = "1.3.2" @@ -916,6 +2070,9 @@ name = "bitflags" version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +dependencies = [ + "serde", +] [[package]] name = "bitmaps" @@ -979,49 +2136,144 @@ dependencies = [ ] [[package]] -name = "block_on_proc" -version = "0.2.0" +name = "block_on_proc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b872f3528eeeb4370ee73b51194dc1cd93680c2d0eb6c7a223889038d2c1a167" +dependencies = [ + "quote", + "syn 1.0.109", +] + +[[package]] +name = "blocking" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" +dependencies = [ + "async-channel", + "async-task", + "futures-io", + "futures-lite 2.5.0", + "piper", +] + +[[package]] +name = "bls-utils" +version = "0.1.0" +dependencies = [ + "clap", + "rand", + "serde", + "serde_json", + "zeropool-bn", +] + +[[package]] +name = "blsful" +version = "2.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a676ce0f93ae20ca6defc223b5ac459a6f071bd88c03100a14cb93604a5e994c" +dependencies = [ + "anyhow", + "arrayref", + "blstrs_plus", + "hex", + "hkdf", + "merlin", + "pairing", + "rand", + "rand_chacha", + "rand_core", + "serde", + "serde_bare", + "sha2", + "sha3", + "subtle", + "thiserror 1.0.69", + "uint-zigzag", + "vsss-rs", + "zeroize", +] + +[[package]] +name = "blst" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b872f3528eeeb4370ee73b51194dc1cd93680c2d0eb6c7a223889038d2c1a167" +checksum = "62dc83a094a71d43eeadd254b1ec2d24cb6a0bb6cadce00df51f0db594711a32" dependencies = [ - "quote", - "syn 1.0.109", + "cc", + "glob", + "threadpool", + "zeroize", ] [[package]] -name = "blocking" -version = "1.6.1" +name = "blstrs_plus" +version = "0.8.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" +checksum = "4a16dd4b0d6b4538e1fa0388843acb186363082713a8fc8416d802a04d013818" dependencies = [ - "async-channel", - "async-task", - "futures-io", - "futures-lite 2.5.0", - "piper", + "arrayref", + "blst", + "elliptic-curve", + "ff", + "group", + "pairing", + "rand_core", + "serde", + "subtle", + "zeroize", ] [[package]] -name = "bls-utils" -version = "0.1.0" +name = "bollard" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d41711ad46fda47cd701f6908e59d1bd6b9a2b7464c0d0aeab95c6d37096ff8a" dependencies = [ - "clap", - "rand", + "base64 0.22.1", + "bollard-stubs", + "bytes", + "futures-core", + "futures-util", + "hex", + "home", + "http 1.1.0", + "http-body-util", + "hyper 1.5.1", + "hyper-named-pipe", + "hyper-rustls", + "hyper-util", + "hyperlocal", + "log", + "pin-project-lite", + "rustls", + "rustls-native-certs 0.7.3", + "rustls-pemfile 2.2.0", + "rustls-pki-types", "serde", + "serde_derive", "serde_json", - "zeropool-bn", + "serde_repr", + "serde_urlencoded", + "thiserror 1.0.69", + "tokio", + "tokio-util", + "tower-service", + "url", + "winapi", ] [[package]] -name = "blst" -version = "0.3.13" +name = "bollard-stubs" +version = "1.45.0-rc.26.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4378725facc195f1a538864863f6de233b500a8862747e7f165078a419d5e874" +checksum = "6d7c5415e3a6bc6d3e99eff6268e488fd4ee25e7b28c10f08fa6760bd9de16e4" dependencies = [ - "cc", - "glob", - "threadpool", - "zeroize", + "serde", + "serde_repr", + "serde_with", ] [[package]] @@ -1067,7 +2319,7 @@ dependencies = [ "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -1125,6 +2377,12 @@ version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" +[[package]] +name = "byte-slice-cast" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c" + [[package]] name = "bytecheck" version = "0.6.12" @@ -1158,6 +2416,19 @@ name = "bytes" version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" +dependencies = [ + "serde", +] + +[[package]] +name = "bytes-utils" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dafe3a8757b027e2be6e4e5601ed563c55989fcf1546e933c66c8eb3a058d35" +dependencies = [ + "bytes", + "either", +] [[package]] name = "bytesize" @@ -1170,9 +2441,9 @@ dependencies = [ [[package]] name = "bytestring" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d80203ea6b29df88012294f62733de21cfeab47f17b41af3a38bc30a03ee72" +checksum = "e465647ae23b2823b0753f50decb2d5a86d2bb2cac04788fafd1f80e45378e5f" dependencies = [ "bytes", ] @@ -1188,6 +2459,21 @@ dependencies = [ "pkg-config", ] +[[package]] +name = "c-kzg" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0307f72feab3300336fb803a57134159f6e20139af1357f36c54cb90d8e8928" +dependencies = [ + "blst", + "cc", + "glob", + "hex", + "libc", + "once_cell", + "serde", +] + [[package]] name = "cbc" version = "0.1.2" @@ -1302,7 +2588,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -1324,11 +2610,11 @@ dependencies = [ "dotenv", "futures-util", "hex", - "jsonwebtoken", + "jsonwebtoken 7.2.0", "lazy_static", "openssl", "percent-encoding", - "reqwest", + "reqwest 0.11.27", "serde", "serde_json", "tokio", @@ -1355,6 +2641,29 @@ dependencies = [ "x509-cert", ] +[[package]] +name = "coins-ledger" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab9bc0994d0aa0f4ade5f3a9baf4a8d936f250278c85a1124b401860454246ab" +dependencies = [ + "async-trait", + "byteorder", + "cfg-if 1.0.0", + "const-hex", + "getrandom", + "hidapi-rusb", + "js-sys", + "log", + "nix 0.26.4", + "once_cell", + "thiserror 1.0.69", + "tokio", + "tracing", + "wasm-bindgen", + "wasm-bindgen-futures", +] + [[package]] name = "colorchoice" version = "1.0.3" @@ -1370,6 +2679,25 @@ dependencies = [ "crossbeam-utils", ] +[[package]] +name = "config" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68578f196d2a33ff61b27fae256c3164f65e36382648e30666dde05b8cc9dfdf" +dependencies = [ + "async-trait", + "convert_case 0.6.0", + "json5", + "nom", + "pathdiff", + "ron", + "rust-ini 0.20.0", + "serde", + "serde_json", + "toml 0.8.19", + "yaml-rust2", +] + [[package]] name = "console" version = "0.15.8" @@ -1383,12 +2711,45 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "const-hex" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "487981fa1af147182687064d0a2c336586d337a606595ced9ffb0c685c250c73" +dependencies = [ + "cfg-if 1.0.0", + "cpufeatures", + "hex", + "proptest", + "serde", +] + [[package]] name = "const-oid" version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" +[[package]] +name = "const-random" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359" +dependencies = [ + "const-random-macro", +] + +[[package]] +name = "const-random-macro" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" +dependencies = [ + "getrandom", + "once_cell", + "tiny-keccak", +] + [[package]] name = "constant_time_eq" version = "0.3.1" @@ -1401,6 +2762,15 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" +[[package]] +name = "convert_case" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" +dependencies = [ + "unicode-segmentation", +] + [[package]] name = "cookie" version = "0.16.2" @@ -1428,12 +2798,31 @@ dependencies = [ "libc", ] +[[package]] +name = "core-foundation" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "core-foundation-sys" version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" +[[package]] +name = "core2" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b49ba7ef1ad6107f8824dbe97de947cbaac53c44e7f9756a1fba0d37c1eec505" +dependencies = [ + "memchr", +] + [[package]] name = "cpp_demangle" version = "0.3.5" @@ -1445,9 +2834,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca741a962e1b0bff6d724a1a0958b686406e853bb14061f218562e1896f95e6" +checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3" dependencies = [ "libc", ] @@ -1647,6 +3036,18 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" +[[package]] +name = "crypto-bigint" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" +dependencies = [ + "generic-array 0.14.7", + "rand_core", + "subtle", + "zeroize", +] + [[package]] name = "crypto-common" version = "0.1.6" @@ -1681,7 +3082,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -1705,7 +3106,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -1716,7 +3117,21 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.87", + "syn 2.0.89", +] + +[[package]] +name = "dashmap" +version = "6.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-utils", + "hashbrown 0.14.5", + "lock_api 0.4.12", + "once_cell", + "parking_lot_core 0.9.10", ] [[package]] @@ -1801,7 +3216,7 @@ checksum = "8034092389675178f570469e6c3b0465d3d30b4505c294a6550db47f3c17ad18" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -1814,6 +3229,17 @@ dependencies = [ "serde", ] +[[package]] +name = "derivative" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "derive-where" version = "1.2.7" @@ -1822,7 +3248,7 @@ checksum = "62d671cc41a825ebabc75757b62d3d168c577f9149b2d49ece1dad1f72119d25" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -1833,7 +3259,7 @@ checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -1842,11 +3268,32 @@ version = "0.99.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" dependencies = [ - "convert_case", + "convert_case 0.4.0", "proc-macro2", "quote", "rustc_version 0.4.1", - "syn 2.0.87", + "syn 2.0.89", +] + +[[package]] +name = "derive_more" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05" +dependencies = [ + "derive_more-impl", +] + +[[package]] +name = "derive_more-impl" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.89", + "unicode-xid", ] [[package]] @@ -1867,6 +3314,15 @@ dependencies = [ "generic-array 0.12.4", ] +[[package]] +name = "digest" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" +dependencies = [ + "generic-array 0.14.7", +] + [[package]] name = "digest" version = "0.10.7" @@ -1874,6 +3330,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer", + "const-oid", "crypto-common", "subtle", ] @@ -1906,7 +3363,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -1921,18 +3378,50 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0688c2a7f92e427f44895cd63841bff7b29f8d7a1648b9e7e07a4a365b2e1257" +[[package]] +name = "dlv-list" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "442039f5147480ba31067cb00ada1adae6892028e40e45fc5de7b7df6dcc1b5f" +dependencies = [ + "const-random", +] + [[package]] name = "doc-comment" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" +[[package]] +name = "docker_credential" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31951f49556e34d90ed28342e1df7e1cb7a229c4cab0aecc627b5d91edd41d07" +dependencies = [ + "base64 0.21.7", + "serde", + "serde_json", +] + +[[package]] +name = "doctest-file" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aac81fa3e28d21450aa4d2ac065992ba96a1d7303efbce51a95f4fd175b67562" + [[package]] name = "dotenv" version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f" +[[package]] +name = "dunce" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" + [[package]] name = "dynasm" version = "1.2.3" @@ -1986,12 +3475,36 @@ dependencies = [ "memmap2", ] +[[package]] +name = "e2e_tests" +version = "0.0.1" +dependencies = [ + "eyre", + "testcontainers", + "testcontainers-modules", + "tokio", +] + [[package]] name = "easy-ext" version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53aff6fdc1b181225acdcb5b14c47106726fd8e486707315b1b138baed68ee31" +[[package]] +name = "ecdsa" +version = "0.16.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" +dependencies = [ + "der", + "digest 0.10.7", + "elliptic-curve", + "rfc6979", + "signature", + "spki", +] + [[package]] name = "ed25519" version = "2.2.3" @@ -2020,6 +3533,27 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" +[[package]] +name = "elliptic-curve" +version = "0.13.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" +dependencies = [ + "base16ct", + "crypto-bigint", + "digest 0.10.7", + "ff", + "generic-array 0.14.7", + "group", + "hkdf", + "pem-rfc7468", + "pkcs8", + "rand_core", + "sec1", + "subtle", + "zeroize", +] + [[package]] name = "encode_unicode" version = "0.3.6" @@ -2052,7 +3586,7 @@ checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -2073,7 +3607,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -2113,6 +3647,17 @@ dependencies = [ "libc", ] +[[package]] +name = "etcetera" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" +dependencies = [ + "cfg-if 1.0.0", + "home", + "windows-sys 0.48.0", +] + [[package]] name = "event-listener" version = "2.5.3" @@ -2149,6 +3694,16 @@ dependencies = [ "async-trait", ] +[[package]] +name = "eyre" +version = "0.6.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec" +dependencies = [ + "indenter", + "once_cell", +] + [[package]] name = "fallible-iterator" version = "0.3.0" @@ -2170,12 +3725,46 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4" +[[package]] +name = "fastrlp" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "139834ddba373bbdd213dffe02c8d110508dcf1726c2be27e8d1f7d7e1856418" +dependencies = [ + "arrayvec", + "auto_impl", + "bytes", +] + +[[package]] +name = "ff" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" +dependencies = [ + "bitvec", + "rand_core", + "subtle", +] + [[package]] name = "fiat-crypto" version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" +[[package]] +name = "filetime" +version = "0.2.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "libredox", + "windows-sys 0.59.0", +] + [[package]] name = "finite-wasm" version = "0.5.0" @@ -2201,6 +3790,18 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "fixed-hash" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534" +dependencies = [ + "byteorder", + "rand", + "rustc-hex", + "static_assertions", +] + [[package]] name = "flagset" version = "0.4.6" @@ -2354,7 +3955,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -2387,6 +3988,12 @@ dependencies = [ "slab", ] +[[package]] +name = "futures-utils-wasm" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42012b0f064e01aa58b545fe3727f90f7dd4020f4a3ea735b50344965f5a57e9" + [[package]] name = "fxhash" version = "0.2.1" @@ -2409,6 +4016,34 @@ dependencies = [ "serde_json", ] +[[package]] +name = "gcloud-sdk" +version = "0.25.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0775bfa745cdf7287ae9765a685a813b91049b6b6d5ca3de20a3d5d16a80d8b2" +dependencies = [ + "async-trait", + "bytes", + "chrono", + "futures", + "hyper 1.5.1", + "jsonwebtoken 9.3.0", + "once_cell", + "prost 0.13.3", + "prost-types", + "reqwest 0.12.9", + "secret-vault-value", + "serde", + "serde_json", + "tokio", + "tonic 0.12.3", + "tower 0.5.1", + "tower-layer", + "tower-util", + "tracing", + "url", +] + [[package]] name = "generic-array" version = "0.12.4" @@ -2426,6 +4061,16 @@ checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", + "zeroize", +] + +[[package]] +name = "generic-array" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2cb8bc4c28d15ade99c7e90b219f30da4be5c88e586277e8cbe886beeb868ab2" +dependencies = [ + "typenum", ] [[package]] @@ -2435,8 +4080,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if 1.0.0", + "js-sys", "libc", "wasi", + "wasm-bindgen", ] [[package]] @@ -2462,6 +4109,19 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" +[[package]] +name = "group" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" +dependencies = [ + "ff", + "rand", + "rand_core", + "rand_xorshift", + "subtle", +] + [[package]] name = "h2" version = "0.3.26" @@ -2481,6 +4141,25 @@ dependencies = [ "tracing", ] +[[package]] +name = "h2" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http 1.1.0", + "indexmap 2.6.0", + "slab", + "tokio", + "tokio-util", + "tracing", +] + [[package]] name = "hashbrown" version = "0.11.2" @@ -2515,17 +4194,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash 0.8.11", + "allocator-api2", ] [[package]] name = "hashbrown" -version = "0.15.1" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3" +checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" dependencies = [ "allocator-api2", "equivalent", "foldhash", + "serde", +] + +[[package]] +name = "hashlink" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" +dependencies = [ + "hashbrown 0.14.5", ] [[package]] @@ -2561,6 +4251,33 @@ dependencies = [ "serde", ] +[[package]] +name = "hex-literal" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" + +[[package]] +name = "hidapi-rusb" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efdc2ec354929a6e8f3c6b6923a4d97427ec2f764cfee8cd4bfe890946cdf08b" +dependencies = [ + "cc", + "libc", + "pkg-config", + "rusb", +] + +[[package]] +name = "hkdf" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" +dependencies = [ + "hmac", +] + [[package]] name = "hmac" version = "0.12.1" @@ -2612,6 +4329,29 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "http-body" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +dependencies = [ + "bytes", + "http 1.1.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +dependencies = [ + "bytes", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", + "pin-project-lite", +] + [[package]] name = "httparse" version = "1.9.5" @@ -2634,9 +4374,9 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2", + "h2 0.3.26", "http 0.2.12", - "http-body", + "http-body 0.4.6", "httparse", "httpdate", "itoa", @@ -2648,29 +4388,146 @@ dependencies = [ "want", ] +[[package]] +name = "hyper" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97818827ef4f364230e16705d4706e2897df2bb60617d6ca15d598025a3c481f" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2 0.4.7", + "http 1.1.0", + "http-body 1.0.1", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + +[[package]] +name = "hyper-named-pipe" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73b7d8abf35697b81a825e386fc151e0d503e8cb5fcb93cc8669c376dfd6f278" +dependencies = [ + "hex", + "hyper 1.5.1", + "hyper-util", + "pin-project-lite", + "tokio", + "tower-service", + "winapi", +] + +[[package]] +name = "hyper-rustls" +version = "0.27.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" +dependencies = [ + "futures-util", + "http 1.1.0", + "hyper 1.5.1", + "hyper-util", + "rustls", + "rustls-native-certs 0.8.1", + "rustls-pki-types", + "tokio", + "tokio-rustls", + "tower-service", +] + [[package]] name = "hyper-timeout" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" dependencies = [ - "hyper", + "hyper 0.14.31", "pin-project-lite", "tokio", "tokio-io-timeout", ] +[[package]] +name = "hyper-timeout" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b90d566bffbce6a75bd8b09a05aa8c2cb1fabb6cb348f8840c9e4c90a0d83b0" +dependencies = [ + "hyper 1.5.1", + "hyper-util", + "pin-project-lite", + "tokio", + "tower-service", +] + [[package]] name = "hyper-tls" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +dependencies = [ + "bytes", + "hyper 0.14.31", + "native-tls", + "tokio", + "tokio-native-tls", +] + +[[package]] +name = "hyper-tls" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" +dependencies = [ + "bytes", + "http-body-util", + "hyper 1.5.1", + "hyper-util", + "native-tls", + "tokio", + "tokio-native-tls", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", + "hyper 1.5.1", + "pin-project-lite", + "socket2 0.5.7", + "tokio", + "tower-service", + "tracing", +] + +[[package]] +name = "hyperlocal" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "986c5ce3b994526b3cd75578e62554abd09f0899d6206de48b3e96ab34ccc8c7" dependencies = [ - "bytes", - "hyper", - "native-tls", + "hex", + "http-body-util", + "hyper 1.5.1", + "hyper-util", + "pin-project-lite", "tokio", - "tokio-native-tls", + "tower-service", ] [[package]] @@ -2811,7 +4668,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -2855,12 +4712,38 @@ dependencies = [ "version_check", ] +[[package]] +name = "impl-codec" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba6a270039626615617f3f36d15fc827041df3b78c439da2cadfa47455a77f2f" +dependencies = [ + "parity-scale-codec", +] + [[package]] name = "impl-more" version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aae21c3177a27788957044151cc2800043d127acaa460a47ebb9b84dfa2c6aa0" +[[package]] +name = "impl-trait-for-tuples" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0eb5a3343abf848c0984fe4604b2b105da9539376e24fc0a3b0007411ae4fd9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.89", +] + +[[package]] +name = "indenter" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" + [[package]] name = "indexer" version = "0.0.1" @@ -2882,6 +4765,7 @@ dependencies = [ "near-o11y", "openssl-probe", "prometheus", + "reqwest 0.12.9", "serde", "serde_json", "serde_yaml", @@ -2910,7 +4794,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "equivalent", - "hashbrown 0.15.1", + "hashbrown 0.15.2", "serde", ] @@ -2946,6 +4830,21 @@ dependencies = [ "cfg-if 1.0.0", ] +[[package]] +name = "interprocess" +version = "2.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "894148491d817cb36b6f778017b8ac46b17408d522dd90f539d677ea938362eb" +dependencies = [ + "doctest-file", + "futures-core", + "libc", + "recvmsg", + "tokio", + "widestring", + "windows-sys 0.52.0", +] + [[package]] name = "io-lifetimes" version = "1.0.11" @@ -2987,11 +4886,20 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + [[package]] name = "itoa" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a73e9fe3c49d7afb2ace819fa181a287ce54a0983eda4e0eb05c22f82ffe534" +checksum = "540654e97a3f4470a492cd30ff187bc95d89557a903a2bbf112e2fae98104ef2" [[package]] name = "jobserver" @@ -3011,6 +4919,17 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "json5" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96b0db21af676c1ce64250b5f40f3ce2cf27e4e47cb91ed91eb6fe9350b430c1" +dependencies = [ + "pest", + "pest_derive", + "serde", +] + [[package]] name = "json_comments" version = "0.2.2" @@ -3024,11 +4943,39 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "afabcc15e437a6484fc4f12d0fd63068fe457bf93f1c148d3d9649c60b103f32" dependencies = [ "base64 0.12.3", - "pem", + "pem 0.8.3", "ring 0.16.20", "serde", "serde_json", - "simple_asn1", + "simple_asn1 0.4.1", +] + +[[package]] +name = "jsonwebtoken" +version = "9.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9ae10193d25051e74945f1ea2d0b42e03cc3b890f7e4cc5faa44997d808193f" +dependencies = [ + "base64 0.21.7", + "js-sys", + "pem 3.0.4", + "ring 0.17.8", + "serde", + "serde_json", + "simple_asn1 0.6.2", +] + +[[package]] +name = "k256" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6e3919bbaa2945715f0bb6d3934a173d1e9a59ac23767fbaaef277265a7411b" +dependencies = [ + "cfg-if 1.0.0", + "ecdsa", + "elliptic-curve", + "once_cell", + "sha2", ] [[package]] @@ -3040,6 +4987,16 @@ dependencies = [ "cpufeatures", ] +[[package]] +name = "keccak-asm" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "505d1856a39b200489082f90d897c3f07c455563880bc5952e38eabf731c83b6" +dependencies = [ + "digest 0.10.7", + "sha3-asm", +] + [[package]] name = "language-tags" version = "0.3.2" @@ -3119,6 +5076,7 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ "bitflags 2.6.0", "libc", + "redox_syscall 0.5.7", ] [[package]] @@ -3138,6 +5096,18 @@ dependencies = [ "zstd-sys", ] +[[package]] +name = "libusb1-sys" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da050ade7ac4ff1ba5379af847a10a10a8e284181e060105bf8d86960ce9ce0f" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + [[package]] name = "libz-sys" version = "1.1.20" @@ -3163,9 +5133,9 @@ checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "litemap" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" +checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104" [[package]] name = "local-channel" @@ -3224,7 +5194,7 @@ version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" dependencies = [ - "hashbrown 0.15.1", + "hashbrown 0.15.2", ] [[package]] @@ -3289,7 +5259,7 @@ checksum = "5cf92c10c7e361d6b99666ec1c6f9805b0bea2c3bd8c78dc6fe98ac5bd78db11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -3351,6 +5321,15 @@ dependencies = [ "autocfg", ] +[[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + [[package]] name = "memoffset" version = "0.8.0" @@ -3369,6 +5348,18 @@ dependencies = [ "autocfg", ] +[[package]] +name = "merlin" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58c38e2799fc0978b65dfff8023ec7843e2330bb462f19198840b34b6582397d" +dependencies = [ + "byteorder", + "keccak", + "rand_core", + "zeroize", +] + [[package]] name = "mime" version = "0.3.17" @@ -3440,7 +5431,7 @@ dependencies = [ "openssl-probe", "openssl-sys", "schannel", - "security-framework", + "security-framework 2.11.1", "security-framework-sys", "tempfile", ] @@ -3461,7 +5452,7 @@ version = "2.4.0-rc.1" source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "actix", - "derive_more", + "derive_more 0.99.18", "futures", "near-async-derive", "near-o11y", @@ -3482,7 +5473,7 @@ source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365 dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -3535,7 +5526,7 @@ dependencies = [ "rand_chacha", "rayon", "serde", - "strum", + "strum 0.24.1", "tempfile", "thiserror 2.0.3", "time", @@ -3551,7 +5542,7 @@ dependencies = [ "anyhow", "bytesize", "chrono", - "derive_more", + "derive_more 0.99.18", "near-config-utils 2.4.0-rc.1", "near-crypto 2.4.0-rc.1", "near-o11y", @@ -3588,7 +5579,7 @@ dependencies = [ "actix", "borsh 1.5.3", "chrono", - "derive_more", + "derive_more 0.99.18", "futures", "itertools 0.10.5", "lru 0.12.5", @@ -3607,7 +5598,7 @@ dependencies = [ "near-store", "rand", "reed-solomon-erasure", - "strum", + "strum 0.24.1", "time", "tracing", ] @@ -3634,7 +5625,7 @@ dependencies = [ "bytesize", "chrono", "cloud-storage", - "derive_more", + "derive_more 0.99.18", "futures", "itertools 0.10.5", "lru 0.12.5", @@ -3665,11 +5656,11 @@ dependencies = [ "rayon", "reed-solomon-erasure", "regex", - "reqwest", + "reqwest 0.11.27", "rust-s3", "serde", "serde_json", - "strum", + "strum 0.24.1", "sysinfo", "tempfile", "thiserror 2.0.3", @@ -3696,7 +5687,7 @@ dependencies = [ "near-time", "serde", "serde_json", - "strum", + "strum 0.24.1", "thiserror 2.0.3", "time", "tracing", @@ -3733,14 +5724,14 @@ dependencies = [ "borsh 1.5.3", "bs58", "curve25519-dalek", - "derive_more", + "derive_more 0.99.18", "ed25519-dalek", "hex", "near-account-id", "near-config-utils 2.3.0-rc.1", "near-schema-checker-lib 2.3.0-rc.1", "near-stdx 2.3.0-rc.1", - "primitive-types", + "primitive-types 0.10.1", "rand", "secp256k1", "serde", @@ -3758,14 +5749,14 @@ dependencies = [ "borsh 1.5.3", "bs58", "curve25519-dalek", - "derive_more", + "derive_more 0.99.18", "ed25519-dalek", "hex", "near-account-id", "near-config-utils 2.4.0-rc.1", "near-schema-checker-lib 2.4.0-rc.1", "near-stdx 2.4.0-rc.1", - "primitive-types", + "primitive-types 0.10.1", "rand", "secp256k1", "serde", @@ -3810,7 +5801,7 @@ dependencies = [ "near-store", "num-bigint 0.3.3", "num-rational", - "primitive-types", + "primitive-types 0.10.1", "rand", "rand_hc", "serde", @@ -3873,7 +5864,7 @@ dependencies = [ "actix-cors", "actix-web", "bs58", - "derive_more", + "derive_more 0.99.18", "easy-ext", "futures", "hex", @@ -3950,7 +5941,7 @@ dependencies = [ "bytesize", "chrono", "crossbeam-channel", - "derive_more", + "derive_more 0.99.18", "enum-map", "futures", "futures-util", @@ -3969,7 +5960,7 @@ dependencies = [ "near-store", "opentelemetry", "parking_lot 0.12.3", - "pin-project", + "pin-project 1.1.7", "protobuf 3.7.1", "protobuf-codegen", "rand", @@ -3978,7 +5969,7 @@ dependencies = [ "serde", "sha2", "smart-default", - "strum", + "strum 0.24.1", "stun", "thiserror 2.0.3", "time", @@ -4027,7 +6018,7 @@ dependencies = [ "serde", "serde_repr", "serde_yaml", - "strum", + "strum 0.24.1", "thiserror 2.0.3", ] @@ -4052,7 +6043,7 @@ version = "2.4.0-rc.1" source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -4080,7 +6071,7 @@ dependencies = [ "bytesize", "cfg-if 1.0.0", "chrono", - "derive_more", + "derive_more 0.99.18", "easy-ext", "enum-map", "hex", @@ -4094,7 +6085,7 @@ dependencies = [ "near-time", "num-rational", "ordered-float", - "primitive-types", + "primitive-types 0.10.1", "rand", "rand_chacha", "reed-solomon-erasure", @@ -4103,7 +6094,7 @@ dependencies = [ "serde_with", "sha3", "smart-default", - "strum", + "strum 0.24.1", "thiserror 2.0.3", "tracing", "zstd", @@ -4118,7 +6109,7 @@ dependencies = [ "base64 0.21.7", "borsh 1.5.3", "bs58", - "derive_more", + "derive_more 0.99.18", "enum-map", "near-account-id", "near-schema-checker-lib 2.4.0-rc.1", @@ -4139,7 +6130,7 @@ dependencies = [ "actix-http", "actix-web", "awc", - "derive_more", + "derive_more 0.99.18", "futures", "hex", "near-account-id", @@ -4155,7 +6146,7 @@ dependencies = [ "paperclip", "serde", "serde_json", - "strum", + "strum 0.24.1", "thiserror 2.0.3", "tokio", ] @@ -4220,7 +6211,7 @@ dependencies = [ "bytesize", "crossbeam", "derive-where", - "derive_more", + "derive_more 0.99.18", "enum-map", "hex", "itertools 0.10.5", @@ -4245,7 +6236,7 @@ dependencies = [ "serde", "serde_json", "smallvec", - "strum", + "strum 0.24.1", "tempfile", "thiserror 2.0.3", "tokio", @@ -4313,7 +6304,7 @@ dependencies = [ "near-vm-vm", "rayon", "smallvec", - "strum", + "strum 0.24.1", "tracing", ] @@ -4377,7 +6368,7 @@ dependencies = [ "serde_repr", "sha2", "sha3", - "strum", + "strum 0.24.1", "tempfile", "thiserror 2.0.3", "tracing", @@ -4455,8 +6446,8 @@ dependencies = [ "easy-ext", "futures", "hex", - "hyper", - "hyper-tls", + "hyper 0.14.31", + "hyper-tls 0.5.0", "indicatif", "itertools 0.10.5", "near-async", @@ -4487,14 +6478,14 @@ dependencies = [ "rand", "rayon", "regex", - "reqwest", + "reqwest 0.11.27", "rlimit", "rust-s3", "serde", "serde_ignored", "serde_json", "smart-default", - "strum", + "strum 0.24.1", "tempfile", "thiserror 2.0.3", "tokio", @@ -4527,6 +6518,19 @@ dependencies = [ "memoffset 0.6.5", ] +[[package]] +name = "nix" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +dependencies = [ + "bitflags 1.3.2", + "cfg-if 1.0.0", + "libc", + "memoffset 0.7.1", + "pin-utils", +] + [[package]] name = "node-runtime" version = "2.4.0-rc.1" @@ -4647,6 +6651,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", + "libm", ] [[package]] @@ -4659,6 +6664,26 @@ dependencies = [ "libc", ] +[[package]] +name = "num_enum" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" +dependencies = [ + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.89", +] + [[package]] name = "number_prefix" version = "0.3.0" @@ -4686,6 +6711,31 @@ dependencies = [ "memchr", ] +[[package]] +name = "offchain" +version = "0.1.0" +dependencies = [ + "alloy", + "axum 0.7.9", + "blsful", + "bytes", + "config", + "eyre", + "futures", + "http-body-util", + "log", + "project-root", + "reqwest 0.12.9", + "serde", + "serde_json", + "tempfile", + "tokio", + "tokio-tungstenite", + "tracing", + "tracing-subscriber", + "wiremock", +] + [[package]] name = "oid-registry" version = "0.7.1" @@ -4724,7 +6774,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -4783,10 +6833,10 @@ dependencies = [ "opentelemetry-proto", "opentelemetry-semantic-conventions", "opentelemetry_sdk", - "prost", + "prost 0.12.6", "thiserror 1.0.69", "tokio", - "tonic", + "tonic 0.11.0", ] [[package]] @@ -4797,8 +6847,8 @@ checksum = "3a8fddc9b68f5b80dae9d6f510b88e02396f006ad48cac349411fbecc80caae4" dependencies = [ "opentelemetry", "opentelemetry_sdk", - "prost", - "tonic", + "prost 0.12.6", + "tonic 0.11.0", ] [[package]] @@ -4847,10 +6897,26 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ccd746e37177e1711c20dd619a1620f34f5c8b569c53590a72dedd5344d8924a" dependencies = [ - "dlv-list", + "dlv-list 0.3.0", "hashbrown 0.12.3", ] +[[package]] +name = "ordered-multimap" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49203cdcae0030493bad186b28da2fa25645fa276a51b6fec8010d281e02ef79" +dependencies = [ + "dlv-list 0.5.2", + "hashbrown 0.14.5", +] + +[[package]] +name = "outref" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4030760ffd992bef45b0ae3f10ce1aba99e33464c90d14dd7c039884963ddc7a" + [[package]] name = "overload" version = "0.1.1" @@ -4889,6 +6955,15 @@ dependencies = [ "winapi", ] +[[package]] +name = "pairing" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81fec4625e73cf41ef4bb6846cafa6d44736525f442ba45e407c4a000a13996f" +dependencies = [ + "group", +] + [[package]] name = "paperclip" version = "0.8.2" @@ -4957,11 +7032,38 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "strum", - "strum_macros", + "strum 0.24.1", + "strum_macros 0.24.3", "syn 1.0.109", ] +[[package]] +name = "parity-scale-codec" +version = "3.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8be4817d39f3272f69c59fe05d0535ae6456c2dc2fa1ba02910296c7e0a5c590" +dependencies = [ + "arrayvec", + "bitvec", + "byte-slice-cast", + "impl-trait-for-tuples", + "parity-scale-codec-derive", + "rustversion", + "serde", +] + +[[package]] +name = "parity-scale-codec-derive" +version = "3.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8781a75c6205af67215f382092b6e0a4ff3734798523e69073d4bcd294ec767b" +dependencies = [ + "proc-macro-crate 3.2.0", + "proc-macro2", + "quote", + "syn 2.0.89", +] + [[package]] name = "parity-wasm" version = "0.41.0" @@ -5052,53 +7154,158 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "parse-display" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "914a1c2265c98e2446911282c6ac86d8524f495792c38c5bd884f80499c7538a" +dependencies = [ + "parse-display-derive", + "regex", + "regex-syntax 0.8.5", +] + +[[package]] +name = "parse-display-derive" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ae7800a4c974efd12df917266338e79a7a74415173caf7e70aa0a0707345281" +dependencies = [ + "proc-macro2", + "quote", + "regex", + "regex-syntax 0.8.5", + "structmeta", + "syn 2.0.89", +] + [[package]] name = "paste" version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" + +[[package]] +name = "pathdiff" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d61c5ce1153ab5b689d0c074c4e7fc613e942dfb7dd9eea5ab202d2ad91fe361" + +[[package]] +name = "pbkdf2" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" +dependencies = [ + "digest 0.10.7", + "hmac", +] + +[[package]] +name = "peeking_take_while" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" + +[[package]] +name = "pem" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd56cbd21fea48d0c440b41cd69c589faacade08c992d9a54e471b79d0fd13eb" +dependencies = [ + "base64 0.13.1", + "once_cell", + "regex", +] + +[[package]] +name = "pem" +version = "3.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae" +dependencies = [ + "base64 0.22.1", + "serde", +] + +[[package]] +name = "pem-rfc7468" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" +dependencies = [ + "base64ct", +] + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "pest" +version = "2.7.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "879952a81a83930934cbf1786752d6dedc3b1f29e8f8fb2ad1d0a36f377cf442" +dependencies = [ + "memchr", + "thiserror 1.0.69", + "ucd-trie", +] [[package]] -name = "pbkdf2" -version = "0.12.2" +name = "pest_derive" +version = "2.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" +checksum = "d214365f632b123a47fd913301e14c946c61d1c183ee245fa76eb752e59a02dd" dependencies = [ - "digest 0.10.7", - "hmac", + "pest", + "pest_generator", ] [[package]] -name = "peeking_take_while" -version = "0.1.2" +name = "pest_generator" +version = "2.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" +checksum = "eb55586734301717aea2ac313f50b2eb8f60d2fc3dc01d190eefa2e625f60c4e" +dependencies = [ + "pest", + "pest_meta", + "proc-macro2", + "quote", + "syn 2.0.89", +] [[package]] -name = "pem" -version = "0.8.3" +name = "pest_meta" +version = "2.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd56cbd21fea48d0c440b41cd69c589faacade08c992d9a54e471b79d0fd13eb" +checksum = "b75da2a70cf4d9cb76833c990ac9cd3923c9a8905a8929789ce347c84564d03d" dependencies = [ - "base64 0.13.1", "once_cell", - "regex", + "pest", + "sha2", ] [[package]] -name = "pem-rfc7468" -version = "0.7.0" +name = "pharos" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" +checksum = "e9567389417feee6ce15dd6527a8a1ecac205ef62c2932bcf3d9f6fc5b78b414" dependencies = [ - "base64ct", + "futures", + "rustc_version 0.4.1", ] [[package]] -name = "percent-encoding" -version = "2.3.1" +name = "pin-project" +version = "0.4.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" +checksum = "3ef0f924a5ee7ea9cbcea77529dba45f8a9ba9f622419fe3386ca581a3ae9d5a" +dependencies = [ + "pin-project-internal 0.4.30", +] [[package]] name = "pin-project" @@ -5106,7 +7313,18 @@ version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95" dependencies = [ - "pin-project-internal", + "pin-project-internal 1.1.7", +] + +[[package]] +name = "pin-project-internal" +version = "0.4.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "851c8d0ce9bebe43790dedfc86614c23494ac9f423dd618d3a61fc693eafe61e" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", ] [[package]] @@ -5117,7 +7335,7 @@ checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -5185,6 +7403,16 @@ dependencies = [ "spki", ] +[[package]] +name = "pkcs8" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der", + "spki", +] + [[package]] name = "pkg-config" version = "0.3.31" @@ -5250,7 +7478,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033" dependencies = [ "proc-macro2", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -5259,7 +7487,18 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05e4722c697a58a99d5d06a08c30821d7c082a4632198de1eaa5a6c22ef42373" dependencies = [ - "fixed-hash", + "fixed-hash 0.7.0", + "uint", +] + +[[package]] +name = "primitive-types" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b34d9fd68ae0b74a41b21c03c2f62847aa0ffea044eee893b4c140b37e244e2" +dependencies = [ + "fixed-hash 0.8.0", + "impl-codec", "uint", ] @@ -5269,7 +7508,7 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" dependencies = [ - "toml", + "toml 0.5.11", ] [[package]] @@ -5305,15 +7544,43 @@ dependencies = [ "version_check", ] +[[package]] +name = "proc-macro-error-attr2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5" +dependencies = [ + "proc-macro2", + "quote", +] + +[[package]] +name = "proc-macro-error2" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802" +dependencies = [ + "proc-macro-error-attr2", + "proc-macro2", + "quote", + "syn 2.0.89", +] + [[package]] name = "proc-macro2" -version = "1.0.89" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] +[[package]] +name = "project-root" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bccbff07d5ed689c4087d20d7307a52ab6141edeedf487c3876a55b86cf63df" + [[package]] name = "prometheus" version = "0.13.4" @@ -5329,6 +7596,26 @@ dependencies = [ "thiserror 1.0.69", ] +[[package]] +name = "proptest" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4c2511913b88df1637da85cc8d96ec8e43a3f8bb8ccb71ee1ac240d6f3df58d" +dependencies = [ + "bit-set", + "bit-vec", + "bitflags 2.6.0", + "lazy_static", + "num-traits", + "rand", + "rand_chacha", + "rand_xorshift", + "regex-syntax 0.8.5", + "rusty-fork", + "tempfile", + "unarray", +] + [[package]] name = "prost" version = "0.12.6" @@ -5336,7 +7623,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" dependencies = [ "bytes", - "prost-derive", + "prost-derive 0.12.6", +] + +[[package]] +name = "prost" +version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b0487d90e047de87f984913713b85c601c05609aad5b0df4b4573fbf69aa13f" +dependencies = [ + "bytes", + "prost-derive 0.13.3", ] [[package]] @@ -5349,7 +7646,29 @@ dependencies = [ "itertools 0.12.1", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", +] + +[[package]] +name = "prost-derive" +version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9552f850d5f0964a4e4d0bf306459ac29323ddfbae05e35a7c0d35cb0803cc5" +dependencies = [ + "anyhow", + "itertools 0.13.0", + "proc-macro2", + "quote", + "syn 2.0.89", +] + +[[package]] +name = "prost-types" +version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4759aa0d3a6232fb8dbdb97b61de2c20047c68aca932c7ed76da9d788508d670" +dependencies = [ + "prost 0.13.3", ] [[package]] @@ -5449,6 +7768,64 @@ dependencies = [ "parity-wasm 0.41.0", ] +[[package]] +name = "quick-error" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" + +[[package]] +name = "quinn" +version = "0.11.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62e96808277ec6f97351a2380e6c25114bc9e67037775464979f3037c92d05ef" +dependencies = [ + "bytes", + "pin-project-lite", + "quinn-proto", + "quinn-udp", + "rustc-hash 2.0.0", + "rustls", + "socket2 0.5.7", + "thiserror 2.0.3", + "tokio", + "tracing", +] + +[[package]] +name = "quinn-proto" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2fe5ef3495d7d2e377ff17b1a8ce2ee2ec2a18cde8b6ad6619d65d0701c135d" +dependencies = [ + "bytes", + "getrandom", + "rand", + "ring 0.17.8", + "rustc-hash 2.0.0", + "rustls", + "rustls-pki-types", + "slab", + "thiserror 2.0.3", + "tinyvec", + "tracing", + "web-time", +] + +[[package]] +name = "quinn-udp" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d5a626c6807713b15cac82a6acaccd6043c9a5408c24baae07611fec3f243da" +dependencies = [ + "cfg_aliases", + "libc", + "once_cell", + "socket2 0.5.7", + "tracing", + "windows-sys 0.59.0", +] + [[package]] name = "quote" version = "1.0.37" @@ -5505,6 +7882,15 @@ dependencies = [ "rand_core", ] +[[package]] +name = "rand_xorshift" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f" +dependencies = [ + "rand_core", +] + [[package]] name = "rand_xoshiro" version = "0.6.0" @@ -5554,6 +7940,12 @@ dependencies = [ "futures-io", ] +[[package]] +name = "recvmsg" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3edd4d5d42c92f0a659926464d4cce56b562761267ecf0f469d85b7de384175" + [[package]] name = "redox_syscall" version = "0.1.57" @@ -5569,6 +7961,15 @@ dependencies = [ "bitflags 1.3.2", ] +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags 1.3.2", +] + [[package]] name = "redox_syscall" version = "0.5.7" @@ -5610,7 +8011,7 @@ checksum = "ad156d539c879b7a24a363a2016d77961786e71f48f2e2fc8302a92abd2429a6" dependencies = [ "hashbrown 0.13.2", "log", - "rustc-hash", + "rustc-hash 1.1.0", "slice-group-by", "smallvec", ] @@ -5697,11 +8098,11 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2", + "h2 0.3.26", "http 0.2.12", - "http-body", - "hyper", - "hyper-tls", + "http-body 0.4.6", + "hyper 0.14.31", + "hyper-tls 0.5.0", "ipnet", "js-sys", "log", @@ -5714,8 +8115,8 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "sync_wrapper", - "system-configuration", + "sync_wrapper 0.1.2", + "system-configuration 0.5.1", "tokio", "tokio-native-tls", "tokio-util", @@ -5728,6 +8129,68 @@ dependencies = [ "winreg", ] +[[package]] +name = "reqwest" +version = "0.12.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f" +dependencies = [ + "async-compression", + "base64 0.22.1", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2 0.4.7", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", + "hyper 1.5.1", + "hyper-rustls", + "hyper-tls 0.6.0", + "hyper-util", + "ipnet", + "js-sys", + "log", + "mime", + "mime_guess", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "quinn", + "rustls", + "rustls-native-certs 0.8.1", + "rustls-pemfile 2.2.0", + "rustls-pki-types", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper 1.0.2", + "system-configuration 0.6.1", + "tokio", + "tokio-native-tls", + "tokio-rustls", + "tokio-util", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-streams", + "web-sys", + "windows-registry", +] + +[[package]] +name = "rfc6979" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" +dependencies = [ + "hmac", + "subtle", +] + [[package]] name = "ring" version = "0.16.20" @@ -5786,33 +8249,95 @@ dependencies = [ ] [[package]] -name = "rkyv_derive" -version = "0.7.45" +name = "rkyv_derive" +version = "0.7.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "503d1d27590a2b0a3a4ca4c94755aa2875657196ecbf401a42eff41d7de532c0" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "rlimit" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "347703a5ae47adf1e693144157be231dde38c72bd485925cae7407ad3e52480b" +dependencies = [ + "libc", +] + +[[package]] +name = "rlp" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb919243f34364b6bd2fc10ef797edbfa75f33c252e7998527479c6d6b47e1ec" +dependencies = [ + "bytes", + "rustc-hex", +] + +[[package]] +name = "rocksdb" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb6f170a4041d50a0ce04b0d2e14916d6ca863ea2e422689a5b694395d299ffe" +dependencies = [ + "libc", + "librocksdb-sys", +] + +[[package]] +name = "ron" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "503d1d27590a2b0a3a4ca4c94755aa2875657196ecbf401a42eff41d7de532c0" +checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", + "base64 0.21.7", + "bitflags 2.6.0", + "serde", + "serde_derive", ] [[package]] -name = "rlimit" -version = "0.7.0" +name = "ruint" +version = "1.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "347703a5ae47adf1e693144157be231dde38c72bd485925cae7407ad3e52480b" +checksum = "2c3cc4c2511671f327125da14133d0c5c5d137f006a1017a16f557bc85b16286" dependencies = [ - "libc", + "alloy-rlp", + "ark-ff 0.3.0", + "ark-ff 0.4.2", + "bytes", + "fastrlp", + "num-bigint 0.4.6", + "num-traits", + "parity-scale-codec", + "primitive-types 0.12.2", + "proptest", + "rand", + "rlp", + "ruint-macro", + "serde", + "valuable", + "zeroize", ] [[package]] -name = "rocksdb" -version = "0.21.0" +name = "ruint-macro" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb6f170a4041d50a0ce04b0d2e14916d6ca863ea2e422689a5b694395d299ffe" +checksum = "48fd7bd8a6377e15ad9d42a8ec25371b94ddc67abe7c8b9127bec79bebaaae18" + +[[package]] +name = "rusb" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab9f9ff05b63a786553a4c02943b74b34a988448671001e9a27e2f0565cc05a4" dependencies = [ "libc", - "librocksdb-sys", + "libusb1-sys", ] [[package]] @@ -5822,7 +8347,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6d5f2436026b4f6e79dc829837d467cc7e9a55ee40e750d716713540715a2df" dependencies = [ "cfg-if 1.0.0", - "ordered-multimap", + "ordered-multimap 0.4.3", +] + +[[package]] +name = "rust-ini" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e0698206bcb8882bf2a9ecb4c1e7785db57ff052297085a6efd4fe42302068a" +dependencies = [ + "cfg-if 1.0.0", + "ordered-multimap 0.7.3", ] [[package]] @@ -5845,7 +8380,7 @@ dependencies = [ "md5", "minidom", "percent-encoding", - "reqwest", + "reqwest 0.11.27", "serde", "serde-xml-rs", "serde_derive", @@ -5869,6 +8404,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +[[package]] +name = "rustc-hash" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" + [[package]] name = "rustc-hex" version = "2.1.0" @@ -5884,6 +8425,15 @@ dependencies = [ "semver 0.9.0", ] +[[package]] +name = "rustc_version" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" +dependencies = [ + "semver 0.11.0", +] + [[package]] name = "rustc_version" version = "0.4.1" @@ -5931,10 +8481,11 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.17" +version = "0.23.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f1a745511c54ba6d4465e8d5dfbd81b45791756de28d4981af70d6dca128f1e" +checksum = "9c9cc1d47e243d655ace55ed38201c19ae02c148ae56412ab8750e8f0166ab7f" dependencies = [ + "log", "once_cell", "ring 0.17.8", "rustls-pki-types", @@ -5951,7 +8502,7 @@ checksum = "2a980454b497c439c274f2feae2523ed8138bbd3d323684e1435fec62f800481" dependencies = [ "log", "rustls", - "rustls-native-certs", + "rustls-native-certs 0.7.3", "rustls-pki-types", "rustls-webpki", ] @@ -5966,7 +8517,19 @@ dependencies = [ "rustls-pemfile 2.2.0", "rustls-pki-types", "schannel", - "security-framework", + "security-framework 2.11.1", +] + +[[package]] +name = "rustls-native-certs" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fcff2dd52b58a8d98a70243663a0d234c4e2b79235637849d15913394a247d3" +dependencies = [ + "openssl-probe", + "rustls-pki-types", + "schannel", + "security-framework 3.0.1", ] [[package]] @@ -5992,6 +8555,9 @@ name = "rustls-pki-types" version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" +dependencies = [ + "web-time", +] [[package]] name = "rustls-webpki" @@ -6010,6 +8576,18 @@ version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248" +[[package]] +name = "rusty-fork" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f" +dependencies = [ + "fnv", + "quick-error", + "tempfile", + "wait-timeout", +] + [[package]] name = "rxml" version = "0.9.1" @@ -6074,6 +8652,20 @@ version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" +[[package]] +name = "sec1" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" +dependencies = [ + "base16ct", + "der", + "generic-array 0.14.7", + "pkcs8", + "subtle", + "zeroize", +] + [[package]] name = "secp256k1" version = "0.27.0" @@ -6093,6 +8685,19 @@ dependencies = [ "cc", ] +[[package]] +name = "secret-vault-value" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc32a777b53b3433b974c9c26b6d502a50037f8da94e46cb8ce2ced2cfdfaea0" +dependencies = [ + "prost 0.13.3", + "prost-types", + "serde", + "serde_json", + "zeroize", +] + [[package]] name = "security-framework" version = "2.11.1" @@ -6100,7 +8705,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ "bitflags 2.6.0", - "core-foundation", + "core-foundation 0.9.4", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1415a607e92bec364ea2cf9264646dcce0f91e6d65281bd6f2819cca3bf39c8" +dependencies = [ + "bitflags 2.6.0", + "core-foundation 0.10.0", "core-foundation-sys", "libc", "security-framework-sys", @@ -6122,7 +8740,16 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" dependencies = [ - "semver-parser", + "semver-parser 0.7.0", +] + +[[package]] +name = "semver" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" +dependencies = [ + "semver-parser 0.10.3", ] [[package]] @@ -6137,6 +8764,21 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" +[[package]] +name = "semver-parser" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9900206b54a3527fdc7b8a938bffd94a568bac4f4aa8113b209df75a09c0dec2" +dependencies = [ + "pest", +] + +[[package]] +name = "send_wrapper" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" + [[package]] name = "serde" version = "1.0.215" @@ -6168,6 +8810,15 @@ dependencies = [ "xml-rs", ] +[[package]] +name = "serde_bare" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51c55386eed0f1ae957b091dc2ca8122f287b60c79c774cbe3d5f2b69fded660" +dependencies = [ + "serde", +] + [[package]] name = "serde_bytes" version = "0.11.15" @@ -6185,7 +8836,7 @@ checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -6209,6 +8860,16 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_path_to_error" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6" +dependencies = [ + "itoa", + "serde", +] + [[package]] name = "serde_repr" version = "0.1.19" @@ -6217,7 +8878,16 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", +] + +[[package]] +name = "serde_spanned" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" +dependencies = [ + "serde", ] [[package]] @@ -6259,7 +8929,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -6307,6 +8977,16 @@ dependencies = [ "keccak", ] +[[package]] +name = "sha3-asm" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28efc5e327c837aa837c59eae585fc250715ef939ac32881bcc11677cd02d46" +dependencies = [ + "cc", + "cfg-if 1.0.0", +] + [[package]] name = "sharded-slab" version = "0.1.7" @@ -6336,6 +9016,10 @@ name = "signature" version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" +dependencies = [ + "digest 0.10.7", + "rand_core", +] [[package]] name = "simdutf8" @@ -6354,6 +9038,18 @@ dependencies = [ "num-traits", ] +[[package]] +name = "simple_asn1" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085" +dependencies = [ + "num-bigint 0.4.6", + "num-traits", + "thiserror 1.0.69", + "time", +] + [[package]] name = "sized-chunks" version = "0.6.5" @@ -6476,13 +9172,45 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" +[[package]] +name = "structmeta" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e1575d8d40908d70f6fd05537266b90ae71b15dbbe7a8b7dffa2b759306d329" +dependencies = [ + "proc-macro2", + "quote", + "structmeta-derive", + "syn 2.0.89", +] + +[[package]] +name = "structmeta-derive" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "152a0b65a590ff6c3da95cabe2353ee04e6167c896b28e3b14478c2636c922fc" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.89", +] + [[package]] name = "strum" version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" dependencies = [ - "strum_macros", + "strum_macros 0.24.3", +] + +[[package]] +name = "strum" +version = "0.26.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" +dependencies = [ + "strum_macros 0.26.4", ] [[package]] @@ -6498,6 +9226,19 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "strum_macros" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.89", +] + [[package]] name = "stun" version = "0.4.4" @@ -6536,21 +9277,42 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.87" +version = "2.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d" +checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] +[[package]] +name = "syn-solidity" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f76fe0a3e1476bdaa0775b9aec5b869ed9520c2b2fedfe9c6df3618f8ea6290b" +dependencies = [ + "paste", + "proc-macro2", + "quote", + "syn 2.0.89", +] + [[package]] name = "sync_wrapper" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +[[package]] +name = "sync_wrapper" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" +dependencies = [ + "futures-core", +] + [[package]] name = "synstructure" version = "0.13.1" @@ -6559,7 +9321,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -6584,8 +9346,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" dependencies = [ "bitflags 1.3.2", - "core-foundation", - "system-configuration-sys", + "core-foundation 0.9.4", + "system-configuration-sys 0.5.0", +] + +[[package]] +name = "system-configuration" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" +dependencies = [ + "bitflags 2.6.0", + "core-foundation 0.9.4", + "system-configuration-sys 0.6.0", ] [[package]] @@ -6598,6 +9371,16 @@ dependencies = [ "libc", ] +[[package]] +name = "system-configuration-sys" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "tap" version = "1.0.1" @@ -6641,6 +9424,44 @@ dependencies = [ "windows-sys 0.59.0", ] +[[package]] +name = "testcontainers" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f40cc2bd72e17f328faf8ca7687fe337e61bccd8acf9674fa78dd3792b045e1" +dependencies = [ + "async-trait", + "bollard", + "bollard-stubs", + "bytes", + "docker_credential", + "either", + "etcetera", + "futures", + "log", + "memchr", + "parse-display", + "pin-project-lite", + "serde", + "serde_json", + "serde_with", + "thiserror 1.0.69", + "tokio", + "tokio-stream", + "tokio-tar", + "tokio-util", + "url", +] + +[[package]] +name = "testcontainers-modules" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "064a2677e164cad39ef3c1abddb044d5a25c49d27005804563d8c4227aac8bd0" +dependencies = [ + "testcontainers", +] + [[package]] name = "thiserror" version = "1.0.69" @@ -6667,7 +9488,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -6678,7 +9499,27 @@ checksum = "f077553d607adc1caf65430528a576c757a71ed73944b66ebb58ef2bbd243568" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", +] + +[[package]] +name = "thiserror-impl-no-std" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58e6318948b519ba6dc2b442a6d0b904ebfb8d411a3ad3e07843615a72249758" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "thiserror-no-std" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3ad459d94dd517257cc96add8a43190ee620011bb6e6cdc82dafd97dfafafea" +dependencies = [ + "thiserror-impl-no-std", ] [[package]] @@ -6741,6 +9582,15 @@ dependencies = [ "time-core", ] +[[package]] +name = "tiny-keccak" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" +dependencies = [ + "crunchy", +] + [[package]] name = "tinystr" version = "0.7.6" @@ -6813,7 +9663,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -6851,6 +9701,17 @@ dependencies = [ "tokio-stream", ] +[[package]] +name = "tokio-rustls" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" +dependencies = [ + "rustls", + "rustls-pki-types", + "tokio", +] + [[package]] name = "tokio-stream" version = "0.1.16" @@ -6860,6 +9721,38 @@ dependencies = [ "futures-core", "pin-project-lite", "tokio", + "tokio-util", +] + +[[package]] +name = "tokio-tar" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d5714c010ca3e5c27114c1cdeb9d14641ace49874aa5626d7149e47aedace75" +dependencies = [ + "filetime", + "futures-core", + "libc", + "redox_syscall 0.3.5", + "tokio", + "tokio-stream", + "xattr", +] + +[[package]] +name = "tokio-tungstenite" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edc5f74e248dc973e0dbb7b74c7e0d6fcc301c694ff50049504004ef4d0cdcd9" +dependencies = [ + "futures-util", + "log", + "rustls", + "rustls-pki-types", + "tokio", + "tokio-rustls", + "tungstenite", + "webpki-roots", ] [[package]] @@ -6884,11 +9777,26 @@ dependencies = [ "serde", ] +[[package]] +name = "toml" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + [[package]] name = "toml_datetime" version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" +dependencies = [ + "serde", +] [[package]] name = "toml_edit" @@ -6897,6 +9805,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ "indexmap 2.6.0", + "serde", + "serde_spanned", "toml_datetime", "winnow", ] @@ -6909,20 +9819,53 @@ checksum = "76c4eb7a4e9ef9d4763600161f12f5070b92a578e1b634db88a6887844c91a13" dependencies = [ "async-stream", "async-trait", - "axum", + "axum 0.6.20", "base64 0.21.7", "bytes", - "h2", + "h2 0.3.26", "http 0.2.12", - "http-body", - "hyper", - "hyper-timeout", + "http-body 0.4.6", + "hyper 0.14.31", + "hyper-timeout 0.4.1", + "percent-encoding", + "pin-project 1.1.7", + "prost 0.12.6", + "tokio", + "tokio-stream", + "tower 0.4.13", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tonic" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "877c5b330756d856ffcc4553ab34a5684481ade925ecc54bcd1bf02b1d0d4d52" +dependencies = [ + "async-stream", + "async-trait", + "axum 0.7.9", + "base64 0.22.1", + "bytes", + "h2 0.4.7", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", + "hyper 1.5.1", + "hyper-timeout 0.5.2", + "hyper-util", "percent-encoding", - "pin-project", - "prost", + "pin-project 1.1.7", + "prost 0.13.3", + "rustls-native-certs 0.8.1", + "rustls-pemfile 2.2.0", + "socket2 0.5.7", "tokio", + "tokio-rustls", "tokio-stream", - "tower", + "tower 0.4.13", "tower-layer", "tower-service", "tracing", @@ -6937,7 +9880,7 @@ dependencies = [ "futures-core", "futures-util", "indexmap 1.9.3", - "pin-project", + "pin-project 1.1.7", "pin-project-lite", "rand", "slab", @@ -6948,6 +9891,22 @@ dependencies = [ "tracing", ] +[[package]] +name = "tower" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f" +dependencies = [ + "futures-core", + "futures-util", + "pin-project-lite", + "sync_wrapper 0.1.2", + "tokio", + "tower-layer", + "tower-service", + "tracing", +] + [[package]] name = "tower-layer" version = "0.3.3" @@ -6960,6 +9919,18 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" +[[package]] +name = "tower-util" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1093c19826d33807c72511e68f73b4a0469a3f22c2bd5f7d5212178b4b89674" +dependencies = [ + "futures-core", + "futures-util", + "pin-project 0.4.30", + "tower-service", +] + [[package]] name = "tracing" version = "0.1.40" @@ -6992,7 +9963,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -7058,12 +10029,38 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" +[[package]] +name = "tungstenite" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18e5b8366ee7a95b16d32197d0b2604b43a0be89dc5fac9f8e96ccafbaedda8a" +dependencies = [ + "byteorder", + "bytes", + "data-encoding", + "http 1.1.0", + "httparse", + "log", + "rand", + "rustls", + "rustls-pki-types", + "sha1", + "thiserror 1.0.69", + "utf-8", +] + [[package]] name = "typenum" version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" +[[package]] +name = "ucd-trie" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971" + [[package]] name = "uint" version = "0.9.5" @@ -7076,6 +10073,21 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "uint-zigzag" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abbf77aed65cb885a8ba07138c365879be3d9a93dce82bf6cc50feca9138ec15" +dependencies = [ + "core2", +] + +[[package]] +name = "unarray" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" + [[package]] name = "unicase" version = "2.8.0" @@ -7088,12 +10100,24 @@ version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" +[[package]] +name = "unicode-segmentation" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" + [[package]] name = "unicode-width" version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" +[[package]] +name = "unicode-xid" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" + [[package]] name = "unsafe-libyaml" version = "0.2.11" @@ -7114,13 +10138,14 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.3" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d157f1b96d14500ffdc1f10ba712e780825526c03d9a49b4d0324b0d9113ada" +checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" dependencies = [ "form_urlencoded", "idna", "percent-encoding", + "serde", ] [[package]] @@ -7129,6 +10154,12 @@ version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" +[[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + [[package]] name = "utf16_iter" version = "1.0.5" @@ -7177,6 +10208,37 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" +[[package]] +name = "vsimd" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64" + +[[package]] +name = "vsss-rs" +version = "4.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fabeca519a296f0b39428cfe496b600c0179c9498687986449d61fa40e60806" +dependencies = [ + "crypto-bigint", + "elliptic-curve", + "generic-array 1.1.1", + "rand_core", + "serde", + "sha3", + "subtle", + "thiserror-no-std", +] + +[[package]] +name = "wait-timeout" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" +dependencies = [ + "libc", +] + [[package]] name = "waker-fn" version = "1.2.0" @@ -7220,7 +10282,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", "wasm-bindgen-shared", ] @@ -7254,7 +10316,7 @@ checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -7712,7 +10774,7 @@ checksum = "09b5575a75e711ca6c36bb9ad647c93541cdc8e34218031acba5da3f35919dd3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -7741,6 +10803,15 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "webpki-roots" +version = "0.26.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d642ff16b7e79272ae451b7322067cdc17cadf68c23264be9d94a32319efe7e" +dependencies = [ + "rustls-pki-types", +] + [[package]] name = "webrtc-util" version = "0.7.0" @@ -7774,6 +10845,12 @@ dependencies = [ "rustix 0.38.41", ] +[[package]] +name = "widestring" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" + [[package]] name = "wildmatch" version = "2.4.0" @@ -7811,6 +10888,36 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-registry" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" +dependencies = [ + "windows-result", + "windows-strings", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result", + "windows-targets 0.52.6", +] + [[package]] name = "windows-sys" version = "0.48.0" @@ -7978,6 +11085,30 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "wiremock" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fff469918e7ca034884c7fd8f93fe27bacb7fcb599fd879df6c7b429a29b646" +dependencies = [ + "assert-json-diff", + "async-trait", + "base64 0.22.1", + "deadpool", + "futures", + "http 1.1.0", + "http-body-util", + "hyper 1.5.1", + "hyper-util", + "log", + "once_cell", + "regex", + "serde", + "serde_json", + "tokio", + "url", +] + [[package]] name = "write16" version = "1.0.0" @@ -7990,6 +11121,25 @@ version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" +[[package]] +name = "ws_stream_wasm" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7999f5f4217fe3818726b66257a4475f71e74ffd190776ad053fa159e50737f5" +dependencies = [ + "async_io_stream", + "futures", + "js-sys", + "log", + "pharos", + "rustc_version 0.4.1", + "send_wrapper", + "thiserror 1.0.69", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + [[package]] name = "wyz" version = "0.5.1" @@ -8027,6 +11177,17 @@ dependencies = [ "time", ] +[[package]] +name = "xattr" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" +dependencies = [ + "libc", + "linux-raw-sys 0.4.14", + "rustix 0.38.41", +] + [[package]] name = "xml-rs" version = "0.8.23" @@ -8042,6 +11203,17 @@ dependencies = [ "lzma-sys", ] +[[package]] +name = "yaml-rust2" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8902160c4e6f2fb145dbe9d6760a75e3c9522d8bf796ed7047c85919ac7115f8" +dependencies = [ + "arraydeque", + "encoding_rs", + "hashlink", +] + [[package]] name = "yansi" version = "0.5.1" @@ -8050,9 +11222,9 @@ checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" [[package]] name = "yoke" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" +checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40" dependencies = [ "serde", "stable_deref_trait", @@ -8062,13 +11234,13 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" +checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", "synstructure", ] @@ -8090,27 +11262,27 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] name = "zerofrom" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" +checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e" dependencies = [ "zerofrom-derive", ] [[package]] name = "zerofrom-derive" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" +checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", "synstructure", ] @@ -8131,7 +11303,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -8167,7 +11339,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] diff --git a/Makefile b/Makefile index 8da0ddbe..972d6d39 100644 --- a/Makefile +++ b/Makefile @@ -50,6 +50,8 @@ bindings: ## generates contract bindings ___DOCKER___: ## docker-build-indexer: docker build -t nffl-indexer -f ./indexer/Dockerfile . +docker-build-fastnear-indexer: + docker build -t nffl-indexer -f ./indexer/FastIndexer.dockerfile . docker-build-relayer: docker build -t nffl-test-relayer -f ./relayer/cmd/Dockerfile . docker-build-aggregator: diff --git a/indexer/Cargo.toml b/indexer/Cargo.toml index 8ca478c8..b4cd0a6e 100644 --- a/indexer/Cargo.toml +++ b/indexer/Cargo.toml @@ -33,7 +33,7 @@ near-config-utils = { git = "https://github.com/near/nearcore", rev = "a83c18490 near-client-primitives = { git = "https://github.com/near/nearcore", rev = "a83c18490cf4dafaedca01458f365dc5871bd293" } borsh = { version = "1.0.0", features = ["derive", "rc"] } serde_yaml = "0.9.34" -reqwest = { workspace = true } +reqwest = { version = "0.12.9", features = ["json"] } [dev-dependencies] near-crypto = { git = "https://github.com/near/nearcore", rev = "93073d762ff377382ebf54e7cbff448b492e72c6" } diff --git a/indexer/FastIndexer.dockerfile b/indexer/FastIndexer.dockerfile index 5d66cf55..bfac23dd 100644 --- a/indexer/FastIndexer.dockerfile +++ b/indexer/FastIndexer.dockerfile @@ -1,4 +1,4 @@ -FROM rust:1.81-bookworm AS builder +FROM rust:1.82-bookworm AS builder WORKDIR /tmp/indexer # Copy from nearcore: @@ -14,11 +14,11 @@ RUN apt-get update -qq && \ llvm \ clang -COPY ./Cargo.toml . +COPY ./indexer/Cargo.toml . RUN mkdir ./src && echo "fn main() {}" > ./src/main.rs RUN cargo build --release -p indexer --features use_fastnear -COPY . . +COPY ./indexer . RUN touch ./src/main.rs RUN cargo build --release -p indexer --features use_fastnear @@ -29,7 +29,7 @@ WORKDIR /indexer-app RUN apt update && apt install -yy openssl ca-certificates jq curl COPY --from=builder /tmp/indexer/target/release/indexer . -COPY entrypoint.sh ./entrypoint.sh +COPY ./indexer/entrypoint.sh ./entrypoint.sh RUN chmod +x ./entrypoint.sh EXPOSE 3030 From 18ec0c2bf358295dc01e204adce44d022939a8a0 Mon Sep 17 00:00:00 2001 From: Sasha Syrotenko Date: Mon, 25 Nov 2024 13:00:22 +0200 Subject: [PATCH 05/40] Rename for better recognition --- indexer/src/{fastnear.rs => fastnear_indexer.rs} | 0 indexer/src/main.rs | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename indexer/src/{fastnear.rs => fastnear_indexer.rs} (100%) diff --git a/indexer/src/fastnear.rs b/indexer/src/fastnear_indexer.rs similarity index 100% rename from indexer/src/fastnear.rs rename to indexer/src/fastnear_indexer.rs diff --git a/indexer/src/main.rs b/indexer/src/main.rs index c4f6ab03..1270c408 100644 --- a/indexer/src/main.rs +++ b/indexer/src/main.rs @@ -9,7 +9,7 @@ use crate::{ candidates_validator::CandidatesValidator, configs::RunConfigArgs, errors::Error, errors::Result, indexer_wrapper::IndexerWrapper, metrics::Metricable, metrics_server::MetricsServer, rmq_publisher::RmqPublisher, }; -use crate::fastnear::FastNearIndexer; +use crate::fastnear_indexer::FastNearIndexer; use crate::metrics::INDEXER_NAMESPACE; mod block_listener; @@ -21,7 +21,7 @@ mod metrics; mod metrics_server; mod rmq_publisher; mod types; -mod fastnear; +mod fastnear_indexer; const INDEXER: &str = "indexer"; From 3a5c3294993997944a72dd5377560573593232e8 Mon Sep 17 00:00:00 2001 From: Sasha Syrotenko Date: Mon, 25 Nov 2024 13:18:01 +0200 Subject: [PATCH 06/40] Setup compose file for fast Near indexer --- .github/workflows/compose-test.yml | 4 ++-- Makefile | 4 ++-- docker-compose.yml | 35 ++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 4 deletions(-) diff --git a/.github/workflows/compose-test.yml b/.github/workflows/compose-test.yml index a12fb5cd..9842bc9e 100644 --- a/.github/workflows/compose-test.yml +++ b/.github/workflows/compose-test.yml @@ -63,7 +63,7 @@ jobs: cache-to: type=gha,mode=max,scope=operator - name: Build and start Docker Compose services - run: docker-compose -f ./docker-compose.yml up --build -d + run: docker-compose --profile default-indexer -f ./docker-compose.yml up --build -d - name: Wait for 5 minutes run: sleep 300 @@ -125,4 +125,4 @@ jobs: done - name: Tear down Docker Compose services - run: docker-compose -f ./docker-compose.yml down + run: docker-compose --profile default-indexer -f ./docker-compose.yml down diff --git a/Makefile b/Makefile index 972d6d39..3fa56e2a 100644 --- a/Makefile +++ b/Makefile @@ -51,7 +51,7 @@ ___DOCKER___: ## docker-build-indexer: docker build -t nffl-indexer -f ./indexer/Dockerfile . docker-build-fastnear-indexer: - docker build -t nffl-indexer -f ./indexer/FastIndexer.dockerfile . + docker build -t nffl-fast-indexer -f ./indexer/FastIndexer.dockerfile . docker-build-relayer: docker build -t nffl-test-relayer -f ./relayer/cmd/Dockerfile . docker-build-aggregator: @@ -62,7 +62,7 @@ docker-build-plugin: docker build -t nffl-operator-plugin -f ./plugin/cmd/Dockerfile . docker-build-images: docker-build-indexer docker-build-relayer docker-build-aggregator docker-build-operator docker-build-plugin ## builds and publishes indexer, operator and aggregator docker images docker-start-everything: docker-build-images ## starts aggregator and operator docker containers - docker compose up + docker compose --profile default-indexer up __CLI__: ## diff --git a/docker-compose.yml b/docker-compose.yml index 52fe708b..cc52a3b2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -142,6 +142,41 @@ services: indexer: image: nffl-indexer:latest container_name: nffl-indexer + profiles: ["1default-indexer"] + depends_on: + rmq: + condition: service_healthy + mainnet-anvil-setup: + condition: service_completed_successfully + indexer-setup: + condition: service_completed_successfully + ports: + - "3030:3030" + expose: + - 9090 # prometheus port + volumes: + - near_cli_data:/root/.near + - near_cli_keys:/root/.near-credentials + command: + - --rmq-address + - amqp://rmq:5672 + - --da-contract-ids + - da2.test.near + - --da-contract-ids + - da3.test.near + - --rollup-ids + - "2" + - --rollup-ids + - "3" + - --metrics-ip-port-address + - "0.0.0.0:9090" + networks: + - nffl + + fastnear-indexer: + image: nffl-fast-indexer:latest + container_name: nffl-fast-indexer + profiles: ["fast-indexer"] depends_on: rmq: condition: service_healthy From 3997ea4acfaef91ab4548e5bd2bd35b02d66c5ee Mon Sep 17 00:00:00 2001 From: Sasha Syrotenko Date: Mon, 25 Nov 2024 13:19:52 +0200 Subject: [PATCH 07/40] Clean DCE'd code --- tests/e2e/e2e_tests/tests/containers.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/e2e/e2e_tests/tests/containers.rs b/tests/e2e/e2e_tests/tests/containers.rs index 18656180..f64d8f79 100644 --- a/tests/e2e/e2e_tests/tests/containers.rs +++ b/tests/e2e/e2e_tests/tests/containers.rs @@ -6,7 +6,6 @@ const SHELL_ENTRYPOINT: &str = "sh"; const ANVIL_ENTRYPOINT: &str = "anvil"; const NETWORK_NAME: &str = "nffl"; const ANVIL_STATE_PATH: &str = "../../anvil/data/avs-and-eigenlayer-deployed-anvil-state.json"; -const NEAR_KEYS: &str = "near_cli_keys"; const CURRENT_DIR: &str = "./"; #[cfg(test)] From f922c05e894ba6f08fa4470c3b13d01eb408e5f1 Mon Sep 17 00:00:00 2001 From: Sasha Syrotenko Date: Mon, 25 Nov 2024 13:30:34 +0200 Subject: [PATCH 08/40] Update forgotten test dependency --- .github/workflows/unit-tests.yml | 2 +- Cargo.lock | 142 +++++++++---------------------- indexer/Cargo.toml | 2 +- indexer/src/block_listener.rs | 2 +- 4 files changed, 44 insertions(+), 104 deletions(-) diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 6f58e2cf..95bb3464 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -32,4 +32,4 @@ jobs: - 'offchain/**' - uses: actions-rust-lang/setup-rust-toolchain@v1 if: steps.filter.outputs.rust == 'true' - - run: cargo test --all-features + - run: cargo test diff --git a/Cargo.lock b/Cargo.lock index c9143924..ee0e62da 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4759,8 +4759,8 @@ dependencies = [ "lapin", "near-client", "near-client-primitives", - "near-config-utils 2.4.0-rc.1", - "near-crypto 2.3.0-rc.1", + "near-config-utils", + "near-crypto", "near-indexer", "near-o11y", "openssl-probe", @@ -5506,7 +5506,7 @@ dependencies = [ "near-chain-configs", "near-chain-primitives", "near-client-primitives", - "near-crypto 2.4.0-rc.1", + "near-crypto", "near-epoch-manager", "near-mainnet-res", "near-network", @@ -5516,7 +5516,7 @@ dependencies = [ "near-performance-metrics-macros", "near-pool", "near-primitives", - "near-schema-checker-lib 2.4.0-rc.1", + "near-schema-checker-lib", "near-store", "near-vm-runner", "node-runtime", @@ -5543,8 +5543,8 @@ dependencies = [ "bytesize", "chrono", "derive_more 0.99.18", - "near-config-utils 2.4.0-rc.1", - "near-crypto 2.4.0-rc.1", + "near-config-utils", + "near-crypto", "near-o11y", "near-parameters", "near-primitives", @@ -5563,7 +5563,7 @@ name = "near-chain-primitives" version = "2.4.0-rc.1" source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ - "near-crypto 2.4.0-rc.1", + "near-crypto", "near-primitives", "near-time", "thiserror 2.0.3", @@ -5587,7 +5587,7 @@ dependencies = [ "near-chain", "near-chain-configs", "near-chunks-primitives", - "near-crypto 2.4.0-rc.1", + "near-crypto", "near-epoch-manager", "near-network", "near-o11y", @@ -5636,7 +5636,7 @@ dependencies = [ "near-chain-primitives", "near-chunks", "near-client-primitives", - "near-crypto 2.4.0-rc.1", + "near-crypto", "near-dyn-configs", "near-epoch-manager", "near-network", @@ -5682,7 +5682,7 @@ dependencies = [ "near-chain-configs", "near-chain-primitives", "near-chunks-primitives", - "near-crypto 2.4.0-rc.1", + "near-crypto", "near-primitives", "near-time", "serde", @@ -5693,17 +5693,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "near-config-utils" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" -dependencies = [ - "anyhow", - "json_comments", - "thiserror 1.0.69", - "tracing", -] - [[package]] name = "near-config-utils" version = "2.4.0-rc.1" @@ -5715,31 +5704,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "near-crypto" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" -dependencies = [ - "blake2", - "borsh 1.5.3", - "bs58", - "curve25519-dalek", - "derive_more 0.99.18", - "ed25519-dalek", - "hex", - "near-account-id", - "near-config-utils 2.3.0-rc.1", - "near-schema-checker-lib 2.3.0-rc.1", - "near-stdx 2.3.0-rc.1", - "primitive-types 0.10.1", - "rand", - "secp256k1", - "serde", - "serde_json", - "subtle", - "thiserror 1.0.69", -] - [[package]] name = "near-crypto" version = "2.4.0-rc.1" @@ -5753,9 +5717,9 @@ dependencies = [ "ed25519-dalek", "hex", "near-account-id", - "near-config-utils 2.4.0-rc.1", - "near-schema-checker-lib 2.4.0-rc.1", - "near-stdx 2.4.0-rc.1", + "near-config-utils", + "near-schema-checker-lib", + "near-stdx", "primitive-types 0.10.1", "rand", "secp256k1", @@ -5772,7 +5736,7 @@ source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365 dependencies = [ "anyhow", "near-chain-configs", - "near-crypto 2.4.0-rc.1", + "near-crypto", "near-o11y", "near-primitives", "near-time", @@ -5794,10 +5758,10 @@ dependencies = [ "near-cache", "near-chain-configs", "near-chain-primitives", - "near-crypto 2.4.0-rc.1", + "near-crypto", "near-o11y", "near-primitives", - "near-schema-checker-lib 2.4.0-rc.1", + "near-schema-checker-lib", "near-store", "num-bigint 0.3.3", "num-rational", @@ -5828,8 +5792,8 @@ dependencies = [ "futures", "near-chain-configs", "near-client", - "near-config-utils 2.4.0-rc.1", - "near-crypto 2.4.0-rc.1", + "near-config-utils", + "near-crypto", "near-dyn-configs", "near-indexer-primitives", "near-o11y", @@ -5907,9 +5871,9 @@ dependencies = [ "arbitrary", "near-chain-configs", "near-client-primitives", - "near-crypto 2.4.0-rc.1", + "near-crypto", "near-primitives", - "near-schema-checker-lib 2.4.0-rc.1", + "near-schema-checker-lib", "serde", "serde_json", "thiserror 2.0.3", @@ -5950,13 +5914,13 @@ dependencies = [ "lru 0.12.5", "near-async", "near-chain-configs", - "near-crypto 2.4.0-rc.1", + "near-crypto", "near-fmt", "near-o11y", "near-performance-metrics", "near-performance-metrics-macros", "near-primitives", - "near-schema-checker-lib 2.4.0-rc.1", + "near-schema-checker-lib", "near-store", "opentelemetry", "parking_lot 0.12.3", @@ -5987,7 +5951,7 @@ dependencies = [ "actix", "base64 0.21.7", "clap", - "near-crypto 2.4.0-rc.1", + "near-crypto", "near-primitives-core", "opentelemetry", "opentelemetry-otlp", @@ -6013,7 +5977,7 @@ dependencies = [ "enum-map", "near-account-id", "near-primitives-core", - "near-schema-checker-lib 2.4.0-rc.1", + "near-schema-checker-lib", "num-rational", "serde", "serde_repr", @@ -6052,7 +6016,7 @@ version = "2.4.0-rc.1" source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "borsh 1.5.3", - "near-crypto 2.4.0-rc.1", + "near-crypto", "near-o11y", "near-primitives", "rand", @@ -6076,12 +6040,12 @@ dependencies = [ "enum-map", "hex", "itertools 0.10.5", - "near-crypto 2.4.0-rc.1", + "near-crypto", "near-fmt", "near-parameters", "near-primitives-core", - "near-schema-checker-lib 2.4.0-rc.1", - "near-stdx 2.4.0-rc.1", + "near-schema-checker-lib", + "near-stdx", "near-time", "num-rational", "ordered-float", @@ -6112,7 +6076,7 @@ dependencies = [ "derive_more 0.99.18", "enum-map", "near-account-id", - "near-schema-checker-lib 2.4.0-rc.1", + "near-schema-checker-lib", "num-rational", "serde", "serde_repr", @@ -6137,7 +6101,7 @@ dependencies = [ "near-chain-configs", "near-client", "near-client-primitives", - "near-crypto 2.4.0-rc.1", + "near-crypto", "near-network", "near-o11y", "near-parameters", @@ -6151,49 +6115,25 @@ dependencies = [ "tokio", ] -[[package]] -name = "near-schema-checker-core" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" - [[package]] name = "near-schema-checker-core" version = "2.4.0-rc.1" source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" -[[package]] -name = "near-schema-checker-lib" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" -dependencies = [ - "near-schema-checker-core 2.3.0-rc.1", - "near-schema-checker-macro 2.3.0-rc.1", -] - [[package]] name = "near-schema-checker-lib" version = "2.4.0-rc.1" source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ - "near-schema-checker-core 2.4.0-rc.1", - "near-schema-checker-macro 2.4.0-rc.1", + "near-schema-checker-core", + "near-schema-checker-macro", ] -[[package]] -name = "near-schema-checker-macro" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" - [[package]] name = "near-schema-checker-macro" version = "2.4.0-rc.1" source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" -[[package]] -name = "near-stdx" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" - [[package]] name = "near-stdx" version = "2.4.0-rc.1" @@ -6218,13 +6158,13 @@ dependencies = [ "itoa", "lru 0.12.5", "near-chain-configs", - "near-crypto 2.4.0-rc.1", + "near-crypto", "near-fmt", "near-o11y", "near-parameters", "near-primitives", - "near-schema-checker-lib 2.4.0-rc.1", - "near-stdx 2.4.0-rc.1", + "near-schema-checker-lib", + "near-stdx", "near-time", "near-vm-runner", "num_cpus", @@ -6344,12 +6284,12 @@ dependencies = [ "finite-wasm", "lru 0.12.5", "memoffset 0.8.0", - "near-crypto 2.4.0-rc.1", + "near-crypto", "near-o11y", "near-parameters", "near-primitives-core", - "near-schema-checker-lib 2.4.0-rc.1", - "near-stdx 2.4.0-rc.1", + "near-schema-checker-lib", + "near-stdx", "near-vm-compiler", "near-vm-compiler-singlepass", "near-vm-engine", @@ -6456,8 +6396,8 @@ dependencies = [ "near-chunks", "near-client", "near-client-primitives", - "near-config-utils 2.4.0-rc.1", - "near-crypto 2.4.0-rc.1", + "near-config-utils", + "near-crypto", "near-dyn-configs", "near-epoch-manager", "near-jsonrpc", @@ -6537,7 +6477,7 @@ version = "2.4.0-rc.1" source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "borsh 1.5.3", - "near-crypto 2.4.0-rc.1", + "near-crypto", "near-o11y", "near-parameters", "near-primitives", diff --git a/indexer/Cargo.toml b/indexer/Cargo.toml index b4cd0a6e..349d088b 100644 --- a/indexer/Cargo.toml +++ b/indexer/Cargo.toml @@ -36,7 +36,7 @@ serde_yaml = "0.9.34" reqwest = { version = "0.12.9", features = ["json"] } [dev-dependencies] -near-crypto = { git = "https://github.com/near/nearcore", rev = "93073d762ff377382ebf54e7cbff448b492e72c6" } +near-crypto = { git = "https://github.com/near/nearcore", rev = "a83c18490cf4dafaedca01458f365dc5871bd293" } [features] use_fastnear = [] diff --git a/indexer/src/block_listener.rs b/indexer/src/block_listener.rs index b5941855..166f1edd 100644 --- a/indexer/src/block_listener.rs +++ b/indexer/src/block_listener.rs @@ -575,4 +575,4 @@ mod tests { // The rest shall be expired assert_eq!(Err(TryRecvError::Empty), candidates_receiver.try_recv()); } -} +} \ No newline at end of file From 6719a4998f861ea5f172680a16a80010769f779b Mon Sep 17 00:00:00 2001 From: Sasha Syrotenko Date: Mon, 25 Nov 2024 16:14:31 +0200 Subject: [PATCH 09/40] Fix typo and allow dead code temporarily --- .github/workflows/unit-tests.yml | 2 +- docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 95bb3464..a7b6e582 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -32,4 +32,4 @@ jobs: - 'offchain/**' - uses: actions-rust-lang/setup-rust-toolchain@v1 if: steps.filter.outputs.rust == 'true' - - run: cargo test + - run: RUSTFLAGS="$RUSTFLAGS -A dead_code" cargo test # Allow 'dead code' since most containers are not used in unit tests diff --git a/docker-compose.yml b/docker-compose.yml index cc52a3b2..886982d8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -142,7 +142,7 @@ services: indexer: image: nffl-indexer:latest container_name: nffl-indexer - profiles: ["1default-indexer"] + profiles: ["default-indexer"] depends_on: rmq: condition: service_healthy From 822ae74533154a14f85b755639452d6ff7e3312b Mon Sep 17 00:00:00 2001 From: Sasha Syrotenko Date: Mon, 25 Nov 2024 16:30:45 +0200 Subject: [PATCH 10/40] Enhance docker compose liveness test --- .github/workflows/compose-test.yml | 84 ++++++++++++++++++++++++++++-- docker-compose.yml | 19 +++---- 2 files changed, 91 insertions(+), 12 deletions(-) diff --git a/.github/workflows/compose-test.yml b/.github/workflows/compose-test.yml index 9842bc9e..9972212b 100644 --- a/.github/workflows/compose-test.yml +++ b/.github/workflows/compose-test.yml @@ -7,7 +7,7 @@ on: pull_request: jobs: - run-docker-compose: + run-docker-compose-default-indexer: runs-on: ubuntu-latest steps: @@ -22,6 +22,16 @@ jobs: sudo apt-get update sudo apt-get install docker-compose -y + - name: Build FastNear indexer container + uses: docker/build-push-action@v5 + with: + load: true + context: . + file: ./indexer/FastIndexer.dockerfile + tags: nffl-fast-indexer + cache-from: type=gha,scope=indexer + cache-to: type=gha,mode=max,scope=indexer + - name: Build indexer container uses: docker/build-push-action@v5 with: @@ -65,8 +75,8 @@ jobs: - name: Build and start Docker Compose services run: docker-compose --profile default-indexer -f ./docker-compose.yml up --build -d - - name: Wait for 5 minutes - run: sleep 300 + - name: Wait for ~3 minutes + run: sleep 200 - name: List running containers run: | @@ -126,3 +136,71 @@ jobs: - name: Tear down Docker Compose services run: docker-compose --profile default-indexer -f ./docker-compose.yml down + + - name: Wait for 15 seconds + run: sleep 15 + + - name: Build and start Docker Compose services with FastNear indexer + run: docker-compose --profile fast-indexer -f ./docker-compose.yml up --build -d + + - name: Wait for 2 minutes + run: sleep 120 + + - name: List running containers + run: | + echo "Running containers:" + docker ps --format "{{.Names}}" + + - name: Ensure containers are running + run: | + containers=( + "nffl_operator1-health_1" + "nffl-operator1" + "nffl_operator0-health_1" + "nffl-operator0" + "rollup1-relayer" + "rollup0-relayer" + "nffl-fast-indexer" + "nffl-aggregator" + "nffl_agreator-health_1" + "mainnet-anvil" + "prometheus" + "rollup0-anvil" + "rmq" + "rollup1-anvil" + "grafana" + ) # List of container names + for container in "${containers[@]}"; do + if docker inspect -f '{{.State.Running}}' "$container" >/dev/null 2>&1; then + echo "$container is running" + else + echo "$container is not running" + exit 1 + fi + done + + + - name: Check health status + run: | + services=( + "nffl_operator1-health_1" + "nffl_operator0-health_1" + "nffl_agreator-health_1" + "rollup1-anvil" + "rollup0-anvil" + "mainnet-anvil" + "rmq" + ) # List of services names + for service in "${services[@]}"; do + status=$(docker inspect -f '{{.State.Health.Status}}' $service) + if [ "$status" != "healthy" ]; then + echo "Service $service is not healthy" + docker-compose -f ./docker-compose.yml logs $service + exit 1 + else + echo "Service $service is healthy" + fi + done + + - name: Tear down Docker Compose services + run: docker-compose --profile fast-indexer -f ./docker-compose.yml down \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 886982d8..4cda25fb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,6 @@ version: "3" networks: nffl: - name: nffl driver: bridge services: @@ -139,10 +138,10 @@ services: networks: - nffl - indexer: - image: nffl-indexer:latest - container_name: nffl-indexer - profiles: ["default-indexer"] + fastnear-indexer: + image: nffl-fast-indexer:latest + container_name: nffl-fast-indexer + profiles: ["fast-indexer"] depends_on: rmq: condition: service_healthy @@ -173,10 +172,10 @@ services: networks: - nffl - fastnear-indexer: - image: nffl-fast-indexer:latest - container_name: nffl-fast-indexer - profiles: ["fast-indexer"] + indexer: + image: nffl-indexer:latest + container_name: nffl-indexer + profiles: ["default-indexer"] depends_on: rmq: condition: service_healthy @@ -210,6 +209,7 @@ services: indexer-setup: image: debian:bookworm container_name: nffl-indexer-setup + profiles: ["default-indexer"] volumes: - near_cli_data:/near-cli - near_cli_keys:/root/.near-credentials @@ -225,6 +225,7 @@ services: near-da-deploy: image: node:16 container_name: nffl-near-da-deploy + profiles: ["default-indexer"] depends_on: indexer: condition: service_healthy From 73a78a8c459186c412d1de3dff1a2c0a7e467d14 Mon Sep 17 00:00:00 2001 From: Sasha Syrotenko Date: Mon, 25 Nov 2024 16:32:29 +0200 Subject: [PATCH 11/40] Mark 'unused' imports --- tests/e2e/e2e_tests/tests/ctr_availability_test.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/e2e/e2e_tests/tests/ctr_availability_test.rs b/tests/e2e/e2e_tests/tests/ctr_availability_test.rs index c4bcd1aa..158bf8da 100644 --- a/tests/e2e/e2e_tests/tests/ctr_availability_test.rs +++ b/tests/e2e/e2e_tests/tests/ctr_availability_test.rs @@ -10,7 +10,9 @@ /// but manual cleanup may be required if tests fail mod containers; +#[allow(unused_imports)] use testcontainers::runners::AsyncRunner; +#[allow(unused_imports)] use crate::containers::*; #[cfg(all(test, feature = "it-tests"))] From ab574d40df25767a651a027b939ddf0fa1723257 Mon Sep 17 00:00:00 2001 From: Sasha Syrotenko Date: Mon, 25 Nov 2024 18:09:41 +0200 Subject: [PATCH 12/40] Even more test enhancements --- .github/workflows/compose-test.yml | 12 +++--------- .github/workflows/contracts-tests.yml | 3 +++ .github/workflows/unit-tests.yml | 8 ++++++++ docker-compose.yml | 3 +-- tests/integration/integration_test.go | 2 +- 5 files changed, 16 insertions(+), 12 deletions(-) diff --git a/.github/workflows/compose-test.yml b/.github/workflows/compose-test.yml index 9972212b..fe5c60c1 100644 --- a/.github/workflows/compose-test.yml +++ b/.github/workflows/compose-test.yml @@ -7,7 +7,7 @@ on: pull_request: jobs: - run-docker-compose-default-indexer: + run-docker-compose-test: runs-on: ubuntu-latest steps: @@ -73,10 +73,7 @@ jobs: cache-to: type=gha,mode=max,scope=operator - name: Build and start Docker Compose services - run: docker-compose --profile default-indexer -f ./docker-compose.yml up --build -d - - - name: Wait for ~3 minutes - run: sleep 200 + run: docker-compose --profile default-indexer -f ./docker-compose.yml up --build -d --wait --wait-timeout 150 - name: List running containers run: | @@ -141,10 +138,7 @@ jobs: run: sleep 15 - name: Build and start Docker Compose services with FastNear indexer - run: docker-compose --profile fast-indexer -f ./docker-compose.yml up --build -d - - - name: Wait for 2 minutes - run: sleep 120 + run: docker-compose --profile fast-indexer -f ./docker-compose.yml up --build -d --wait --wait-timeout 150 - name: List running containers run: | diff --git a/.github/workflows/contracts-tests.yml b/.github/workflows/contracts-tests.yml index 7ff9e2b4..31dd4a5a 100644 --- a/.github/workflows/contracts-tests.yml +++ b/.github/workflows/contracts-tests.yml @@ -5,6 +5,9 @@ on: branches: - main pull_request: + paths: + - 'bindings/**' + - 'contracts/**' jobs: Test: diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index a7b6e582..3a85d92e 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -5,6 +5,14 @@ on: branches: - main pull_request: + paths: + - 'aggregator/**' + - 'core/**' + - 'indexer/**' + - 'offchain/**' + - 'operator/**' + - 'plugin/**' + - 'relayer/**' jobs: go_test: diff --git a/docker-compose.yml b/docker-compose.yml index 4cda25fb..74459ee3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,6 +2,7 @@ version: "3" networks: nffl: + name: nffl driver: bridge services: @@ -147,8 +148,6 @@ services: condition: service_healthy mainnet-anvil-setup: condition: service_completed_successfully - indexer-setup: - condition: service_completed_successfully ports: - "3030:3030" expose: diff --git a/tests/integration/integration_test.go b/tests/integration/integration_test.go index 9549a8a9..7310168b 100644 --- a/tests/integration/integration_test.go +++ b/tests/integration/integration_test.go @@ -96,7 +96,7 @@ func TestIntegration(t *testing.T) { newOperatorConfig, _, _ := genOperatorConfig(t, ctx, "4", setup.mainnetAnvil, setup.rollupAnvils, setup.rabbitMq) newOperator := startOperator(t, ctx, newOperatorConfig) - time.Sleep(50 * time.Second) + time.Sleep(40 * time.Second) // Check if operator set was updated on rollups for _, registryRollup := range setup.registryRollups { From 598dbb8763b18c6646d5d0779661c8ec8b002eab Mon Sep 17 00:00:00 2001 From: Sasha Syrotenko Date: Mon, 25 Nov 2024 19:44:41 +0200 Subject: [PATCH 13/40] Revert upgrade to latest nearcore --- .github/workflows/compose-test.yml | 4 +- .github/workflows/docs-test.yml | 2 + Cargo.lock | 235 ++++++++++++++--------------- indexer/Cargo.toml | 12 +- indexer/Dockerfile | 2 +- indexer/FastIndexer.dockerfile | 2 +- 6 files changed, 128 insertions(+), 129 deletions(-) diff --git a/.github/workflows/compose-test.yml b/.github/workflows/compose-test.yml index fe5c60c1..c3523fc3 100644 --- a/.github/workflows/compose-test.yml +++ b/.github/workflows/compose-test.yml @@ -73,7 +73,7 @@ jobs: cache-to: type=gha,mode=max,scope=operator - name: Build and start Docker Compose services - run: docker-compose --profile default-indexer -f ./docker-compose.yml up --build -d --wait --wait-timeout 150 + run: docker-compose -f ./docker-compose.yml up --build -d --wait --wait-timeout 150 - name: List running containers run: | @@ -138,7 +138,7 @@ jobs: run: sleep 15 - name: Build and start Docker Compose services with FastNear indexer - run: docker-compose --profile fast-indexer -f ./docker-compose.yml up --build -d --wait --wait-timeout 150 + run: docker-compose -f ./docker-compose.yml up --profile fast-indexer --build -d --wait --wait-timeout 150 - name: List running containers run: | diff --git a/.github/workflows/docs-test.yml b/.github/workflows/docs-test.yml index d945b632..a1d0f1e0 100644 --- a/.github/workflows/docs-test.yml +++ b/.github/workflows/docs-test.yml @@ -4,6 +4,8 @@ on: pull_request: branches: - main + paths: + - 'docs/**' jobs: test-deploy: diff --git a/Cargo.lock b/Cargo.lock index ee0e62da..6dce34d3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5448,8 +5448,8 @@ dependencies = [ [[package]] name = "near-async" -version = "2.4.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "actix", "derive_more 0.99.18", @@ -5468,8 +5468,8 @@ dependencies = [ [[package]] name = "near-async-derive" -version = "2.4.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "proc-macro2", "quote", @@ -5478,16 +5478,16 @@ dependencies = [ [[package]] name = "near-cache" -version = "2.4.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "lru 0.12.5", ] [[package]] name = "near-chain" -version = "2.4.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "actix", "assert_matches", @@ -5500,7 +5500,6 @@ dependencies = [ "itertools 0.10.5", "itoa", "lru 0.12.5", - "more-asserts", "near-async", "near-cache", "near-chain-configs", @@ -5528,16 +5527,16 @@ dependencies = [ "serde", "strum 0.24.1", "tempfile", - "thiserror 2.0.3", + "thiserror 1.0.69", "time", - "tokio", "tracing", + "yansi", ] [[package]] name = "near-chain-configs" -version = "2.4.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "anyhow", "bytesize", @@ -5560,21 +5559,21 @@ dependencies = [ [[package]] name = "near-chain-primitives" -version = "2.4.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "near-crypto", "near-primitives", "near-time", - "thiserror 2.0.3", + "thiserror 1.0.69", "time", "tracing", ] [[package]] name = "near-chunks" -version = "2.4.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "actix", "borsh 1.5.3", @@ -5605,8 +5604,8 @@ dependencies = [ [[package]] name = "near-chunks-primitives" -version = "2.4.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "near-chain-primitives", "near-primitives", @@ -5614,8 +5613,8 @@ dependencies = [ [[package]] name = "near-client" -version = "2.4.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "actix", "actix-rt", @@ -5663,19 +5662,17 @@ dependencies = [ "strum 0.24.1", "sysinfo", "tempfile", - "thiserror 2.0.3", + "thiserror 1.0.69", "time", "tokio", - "tokio-stream", - "tokio-util", "tracing", "yansi", ] [[package]] name = "near-client-primitives" -version = "2.4.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "actix", "chrono", @@ -5688,26 +5685,27 @@ dependencies = [ "serde", "serde_json", "strum 0.24.1", - "thiserror 2.0.3", + "thiserror 1.0.69", "time", "tracing", + "yansi", ] [[package]] name = "near-config-utils" -version = "2.4.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "anyhow", "json_comments", - "thiserror 2.0.3", + "thiserror 1.0.69", "tracing", ] [[package]] name = "near-crypto" -version = "2.4.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "blake2", "borsh 1.5.3", @@ -5726,13 +5724,13 @@ dependencies = [ "serde", "serde_json", "subtle", - "thiserror 2.0.3", + "thiserror 1.0.69", ] [[package]] name = "near-dyn-configs" -version = "2.4.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "anyhow", "near-chain-configs", @@ -5743,15 +5741,15 @@ dependencies = [ "prometheus", "serde", "serde_json", - "thiserror 2.0.3", + "thiserror 1.0.69", "tokio", "tracing", ] [[package]] name = "near-epoch-manager" -version = "2.4.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "borsh 1.5.3", "itertools 0.10.5", @@ -5776,16 +5774,16 @@ dependencies = [ [[package]] name = "near-fmt" -version = "2.4.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "near-primitives-core", ] [[package]] name = "near-indexer" -version = "2.4.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "actix", "anyhow", @@ -5811,8 +5809,8 @@ dependencies = [ [[package]] name = "near-indexer-primitives" -version = "2.4.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "near-primitives", "serde", @@ -5821,8 +5819,8 @@ dependencies = [ [[package]] name = "near-jsonrpc" -version = "2.4.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "actix", "actix-cors", @@ -5851,8 +5849,8 @@ dependencies = [ [[package]] name = "near-jsonrpc-client" -version = "2.4.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "actix-http", "awc", @@ -5865,8 +5863,8 @@ dependencies = [ [[package]] name = "near-jsonrpc-primitives" -version = "2.4.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "arbitrary", "near-chain-configs", @@ -5876,14 +5874,14 @@ dependencies = [ "near-schema-checker-lib", "serde", "serde_json", - "thiserror 2.0.3", + "thiserror 1.0.69", "time", ] [[package]] name = "near-mainnet-res" -version = "2.4.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "near-account-id", "near-chain-configs", @@ -5893,8 +5891,8 @@ dependencies = [ [[package]] name = "near-network" -version = "2.4.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "actix", "anyhow", @@ -5935,7 +5933,7 @@ dependencies = [ "smart-default", "strum 0.24.1", "stun", - "thiserror 2.0.3", + "thiserror 1.0.69", "time", "tokio", "tokio-stream", @@ -5945,8 +5943,8 @@ dependencies = [ [[package]] name = "near-o11y" -version = "2.4.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "actix", "base64 0.21.7", @@ -5960,7 +5958,7 @@ dependencies = [ "prometheus", "serde", "serde_json", - "thiserror 2.0.3", + "thiserror 1.0.69", "tokio", "tracing", "tracing-appender", @@ -5970,8 +5968,8 @@ dependencies = [ [[package]] name = "near-parameters" -version = "2.4.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "borsh 1.5.3", "enum-map", @@ -5983,13 +5981,13 @@ dependencies = [ "serde_repr", "serde_yaml", "strum 0.24.1", - "thiserror 2.0.3", + "thiserror 1.0.69", ] [[package]] name = "near-performance-metrics" -version = "2.4.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "actix", "bitflags 1.3.2", @@ -6003,8 +6001,8 @@ dependencies = [ [[package]] name = "near-performance-metrics-macros" -version = "2.4.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "quote", "syn 2.0.89", @@ -6012,8 +6010,8 @@ dependencies = [ [[package]] name = "near-pool" -version = "2.4.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "borsh 1.5.3", "near-crypto", @@ -6024,8 +6022,8 @@ dependencies = [ [[package]] name = "near-primitives" -version = "2.4.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "arbitrary", "base64 0.21.7", @@ -6059,15 +6057,15 @@ dependencies = [ "sha3", "smart-default", "strum 0.24.1", - "thiserror 2.0.3", + "thiserror 1.0.69", "tracing", "zstd", ] [[package]] name = "near-primitives-core" -version = "2.4.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "arbitrary", "base64 0.21.7", @@ -6081,13 +6079,13 @@ dependencies = [ "serde", "serde_repr", "sha2", - "thiserror 2.0.3", + "thiserror 1.0.69", ] [[package]] name = "near-rosetta-rpc" -version = "2.4.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "actix", "actix-cors", @@ -6111,19 +6109,19 @@ dependencies = [ "serde", "serde_json", "strum 0.24.1", - "thiserror 2.0.3", + "thiserror 1.0.69", "tokio", ] [[package]] name = "near-schema-checker-core" -version = "2.4.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" [[package]] name = "near-schema-checker-lib" -version = "2.4.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "near-schema-checker-core", "near-schema-checker-macro", @@ -6131,18 +6129,18 @@ dependencies = [ [[package]] name = "near-schema-checker-macro" -version = "2.4.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" [[package]] name = "near-stdx" -version = "2.4.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" [[package]] name = "near-store" -version = "2.4.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "actix", "actix-rt", @@ -6178,15 +6176,15 @@ dependencies = [ "smallvec", "strum 0.24.1", "tempfile", - "thiserror 2.0.3", + "thiserror 1.0.69", "tokio", "tracing", ] [[package]] name = "near-telemetry" -version = "2.4.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "actix", "awc", @@ -6204,8 +6202,8 @@ dependencies = [ [[package]] name = "near-time" -version = "2.4.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "serde", "time", @@ -6214,8 +6212,8 @@ dependencies = [ [[package]] name = "near-vm-compiler" -version = "2.4.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "enumset", "finite-wasm", @@ -6223,15 +6221,15 @@ dependencies = [ "near-vm-vm", "rkyv", "target-lexicon 0.12.16", - "thiserror 2.0.3", + "thiserror 1.0.69", "tracing", "wasmparser 0.99.0", ] [[package]] name = "near-vm-compiler-singlepass" -version = "2.4.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "dynasm 2.0.0", "dynasmrt 2.0.0", @@ -6250,8 +6248,8 @@ dependencies = [ [[package]] name = "near-vm-engine" -version = "2.4.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "backtrace", "cfg-if 1.0.0", @@ -6266,14 +6264,14 @@ dependencies = [ "rustc-demangle", "rustix 0.38.41", "target-lexicon 0.12.16", - "thiserror 2.0.3", + "thiserror 1.0.69", "tracing", ] [[package]] name = "near-vm-runner" -version = "2.4.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "anyhow", "blst", @@ -6310,7 +6308,7 @@ dependencies = [ "sha3", "strum 0.24.1", "tempfile", - "thiserror 2.0.3", + "thiserror 1.0.69", "tracing", "wasm-encoder 0.27.0", "wasmer-compiler-near", @@ -6328,19 +6326,19 @@ dependencies = [ [[package]] name = "near-vm-types" -version = "2.4.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "indexmap 1.9.3", "num-traits", "rkyv", - "thiserror 2.0.3", + "thiserror 1.0.69", ] [[package]] name = "near-vm-vm" -version = "2.4.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "backtrace", "cc", @@ -6353,15 +6351,15 @@ dependencies = [ "near-vm-types", "region", "rkyv", - "thiserror 2.0.3", + "thiserror 1.0.69", "tracing", "winapi", ] [[package]] name = "near-wallet-contract" -version = "2.4.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "anyhow", "near-primitives-core", @@ -6370,8 +6368,8 @@ dependencies = [ [[package]] name = "nearcore" -version = "2.4.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "actix", "actix-rt", @@ -6389,7 +6387,6 @@ dependencies = [ "hyper 0.14.31", "hyper-tls 0.5.0", "indicatif", - "itertools 0.10.5", "near-async", "near-chain", "near-chain-configs", @@ -6427,7 +6424,7 @@ dependencies = [ "smart-default", "strum 0.24.1", "tempfile", - "thiserror 2.0.3", + "thiserror 1.0.69", "tokio", "tracing", "xz2", @@ -6473,8 +6470,8 @@ dependencies = [ [[package]] name = "node-runtime" -version = "2.4.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "borsh 1.5.3", "near-crypto", @@ -6491,7 +6488,7 @@ dependencies = [ "rayon", "serde_json", "sha2", - "thiserror 2.0.3", + "thiserror 1.0.69", "tracing", ] diff --git a/indexer/Cargo.toml b/indexer/Cargo.toml index 349d088b..6e875cbe 100644 --- a/indexer/Cargo.toml +++ b/indexer/Cargo.toml @@ -26,17 +26,17 @@ tracing = { version = "0.1.36", features = ["std"] } thiserror = "1.0.56" anyhow = "1.0.79" -near-indexer = { git = "https://github.com/near/nearcore", rev = "a83c18490cf4dafaedca01458f365dc5871bd293" } -near-client = { git = "https://github.com/near/nearcore", rev = "a83c18490cf4dafaedca01458f365dc5871bd293" } -near-o11y = { git = "https://github.com/near/nearcore", rev = "a83c18490cf4dafaedca01458f365dc5871bd293" } -near-config-utils = { git = "https://github.com/near/nearcore", rev = "a83c18490cf4dafaedca01458f365dc5871bd293" } -near-client-primitives = { git = "https://github.com/near/nearcore", rev = "a83c18490cf4dafaedca01458f365dc5871bd293" } +near-indexer = { git = "https://github.com/near/nearcore", rev = "93073d762ff377382ebf54e7cbff448b492e72c6" } +near-client = { git = "https://github.com/near/nearcore", rev = "93073d762ff377382ebf54e7cbff448b492e72c6" } +near-o11y = { git = "https://github.com/near/nearcore", rev = "93073d762ff377382ebf54e7cbff448b492e72c6" } +near-config-utils = { git = "https://github.com/near/nearcore", rev = "93073d762ff377382ebf54e7cbff448b492e72c6" } +near-client-primitives = { git = "https://github.com/near/nearcore", rev = "93073d762ff377382ebf54e7cbff448b492e72c6" } borsh = { version = "1.0.0", features = ["derive", "rc"] } serde_yaml = "0.9.34" reqwest = { version = "0.12.9", features = ["json"] } [dev-dependencies] -near-crypto = { git = "https://github.com/near/nearcore", rev = "a83c18490cf4dafaedca01458f365dc5871bd293" } +near-crypto = { git = "https://github.com/near/nearcore", rev = "93073d762ff377382ebf54e7cbff448b492e72c6" } [features] use_fastnear = [] diff --git a/indexer/Dockerfile b/indexer/Dockerfile index e3198029..4efa4d9f 100644 --- a/indexer/Dockerfile +++ b/indexer/Dockerfile @@ -1,4 +1,4 @@ -FROM rust:1.82 AS builder +FROM rust:1.81 AS builder WORKDIR /tmp/indexer # Copy from nearcore: diff --git a/indexer/FastIndexer.dockerfile b/indexer/FastIndexer.dockerfile index bfac23dd..10dc4e9b 100644 --- a/indexer/FastIndexer.dockerfile +++ b/indexer/FastIndexer.dockerfile @@ -1,4 +1,4 @@ -FROM rust:1.82-bookworm AS builder +FROM rust:1.81-bookworm AS builder WORKDIR /tmp/indexer # Copy from nearcore: From 077014b32feaaba155e5dae6273e71117764f9b5 Mon Sep 17 00:00:00 2001 From: Sasha Syrotenko Date: Mon, 25 Nov 2024 20:03:01 +0200 Subject: [PATCH 14/40] Introduce CI action for FastNear --- .github/workflows/compose-fastnear-test.yml | 127 +++++++ .github/workflows/compose-test.yml | 81 +---- docker-compose-fastnear.yml | 365 ++++++++++++++++++++ docker-compose.yml | 35 -- 4 files changed, 495 insertions(+), 113 deletions(-) create mode 100644 .github/workflows/compose-fastnear-test.yml create mode 100644 docker-compose-fastnear.yml diff --git a/.github/workflows/compose-fastnear-test.yml b/.github/workflows/compose-fastnear-test.yml new file mode 100644 index 00000000..9e80522f --- /dev/null +++ b/.github/workflows/compose-fastnear-test.yml @@ -0,0 +1,127 @@ +name: Docker Compose Test With FastNear + +on: + push: + branches: + - main + pull_request: + paths: + - 'indexer/**' # Temporarily util it become prime way to obtain NEAR DA blocks. + +jobs: + run-docker-compose-fastnear: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v3 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Set up Docker Compose + run: | + sudo apt-get update + sudo apt-get install docker-compose -y + + - name: Build indexer container + uses: docker/build-push-action@v5 + with: + load: true + context: . + file: ./indexer/FastIndexer.dockerfile + tags: nffl-fast-indexer + cache-from: type=gha,scope=indexer + cache-to: type=gha,mode=max,scope=indexer + + - name: Build relayer container + uses: docker/build-push-action@v5 + with: + load: true + context: . + file: ./relayer/cmd/Dockerfile + tags: nffl-test-relayer + cache-from: type=gha,scope=relayer + cache-to: type=gha,mode=max,scope=relayer + + - name: Build aggregator container + uses: docker/build-push-action@v5 + with: + load: true + context: . + file: ./aggregator/cmd/Dockerfile + tags: nffl-aggregator + cache-from: type=gha,scope=aggregator + cache-to: type=gha,mode=max,scope=aggregator + + - name: Build operator container + uses: docker/build-push-action@v5 + with: + load: true + context: . + file: ./operator/cmd/Dockerfile + tags: nffl-operator + cache-from: type=gha,scope=operator + cache-to: type=gha,mode=max,scope=operator + + - name: Build and start Docker Compose services + run: docker-compose -f ./docker-compose-fastnear.yml up --build -d --wait --wait-timeout 150 + + - name: List running containers + run: | + echo "Running containers:" + docker ps --format "{{.Names}}" + + - name: Ensure containers are running + run: | + containers=( + "nffl_operator1-health_1" + "nffl-operator1" + "nffl_operator0-health_1" + "nffl-operator0" + "rollup1-relayer" + "rollup0-relayer" + "nffl-fast-indexer" + "nffl-aggregator" + "nffl_agreator-health_1" + "mainnet-anvil" + "prometheus" + "rollup0-anvil" + "rmq" + "rollup1-anvil" + "grafana" + ) # List of container names + for container in "${containers[@]}"; do + if docker inspect -f '{{.State.Running}}' "$container" >/dev/null 2>&1; then + echo "$container is running" + else + echo "$container is not running" + exit 1 + fi + done + + + - name: Check health status + run: | + services=( + "nffl_operator1-health_1" + "nffl_operator0-health_1" + "nffl_agreator-health_1" + "rollup1-anvil" + "rollup0-anvil" + "mainnet-anvil" + "rmq" + ) # List of services names + for service in "${services[@]}"; do + status=$(docker inspect -f '{{.State.Health.Status}}' $service) + if [ "$status" != "healthy" ]; then + echo "Service $service is not healthy" + docker-compose -f ./docker-compose-fastnear.yml logs $service + exit 1 + else + echo "Service $service is healthy" + fi + done + + - name: Tear down Docker Compose services + run: docker-compose -f ./docker-compose-fastnear.yml down \ No newline at end of file diff --git a/.github/workflows/compose-test.yml b/.github/workflows/compose-test.yml index c3523fc3..9cf3663d 100644 --- a/.github/workflows/compose-test.yml +++ b/.github/workflows/compose-test.yml @@ -1,4 +1,4 @@ -name: Docker Compose Test +name: Docker Compose Test on: push: @@ -7,7 +7,7 @@ on: pull_request: jobs: - run-docker-compose-test: + run-docker-compose: runs-on: ubuntu-latest steps: @@ -22,16 +22,6 @@ jobs: sudo apt-get update sudo apt-get install docker-compose -y - - name: Build FastNear indexer container - uses: docker/build-push-action@v5 - with: - load: true - context: . - file: ./indexer/FastIndexer.dockerfile - tags: nffl-fast-indexer - cache-from: type=gha,scope=indexer - cache-to: type=gha,mode=max,scope=indexer - - name: Build indexer container uses: docker/build-push-action@v5 with: @@ -132,69 +122,4 @@ jobs: done - name: Tear down Docker Compose services - run: docker-compose --profile default-indexer -f ./docker-compose.yml down - - - name: Wait for 15 seconds - run: sleep 15 - - - name: Build and start Docker Compose services with FastNear indexer - run: docker-compose -f ./docker-compose.yml up --profile fast-indexer --build -d --wait --wait-timeout 150 - - - name: List running containers - run: | - echo "Running containers:" - docker ps --format "{{.Names}}" - - - name: Ensure containers are running - run: | - containers=( - "nffl_operator1-health_1" - "nffl-operator1" - "nffl_operator0-health_1" - "nffl-operator0" - "rollup1-relayer" - "rollup0-relayer" - "nffl-fast-indexer" - "nffl-aggregator" - "nffl_agreator-health_1" - "mainnet-anvil" - "prometheus" - "rollup0-anvil" - "rmq" - "rollup1-anvil" - "grafana" - ) # List of container names - for container in "${containers[@]}"; do - if docker inspect -f '{{.State.Running}}' "$container" >/dev/null 2>&1; then - echo "$container is running" - else - echo "$container is not running" - exit 1 - fi - done - - - - name: Check health status - run: | - services=( - "nffl_operator1-health_1" - "nffl_operator0-health_1" - "nffl_agreator-health_1" - "rollup1-anvil" - "rollup0-anvil" - "mainnet-anvil" - "rmq" - ) # List of services names - for service in "${services[@]}"; do - status=$(docker inspect -f '{{.State.Health.Status}}' $service) - if [ "$status" != "healthy" ]; then - echo "Service $service is not healthy" - docker-compose -f ./docker-compose.yml logs $service - exit 1 - else - echo "Service $service is healthy" - fi - done - - - name: Tear down Docker Compose services - run: docker-compose --profile fast-indexer -f ./docker-compose.yml down \ No newline at end of file + run: docker-compose -f ./docker-compose.yml down \ No newline at end of file diff --git a/docker-compose-fastnear.yml b/docker-compose-fastnear.yml new file mode 100644 index 00000000..7c9f65b1 --- /dev/null +++ b/docker-compose-fastnear.yml @@ -0,0 +1,365 @@ +version: "3" + +networks: + nffl: + name: nffl + driver: bridge + +services: + rmq: + image: rabbitmq:3-management-alpine + container_name: rmq + user: rabbitmq + ports: + - "5672:5672" + - "15672:15672" + environment: + - RABBITMQ_DEFAULT_USER=guest + - RABBITMQ_DEFAULT_PASS=guest + healthcheck: + test: rabbitmq-diagnostics check_port_connectivity + interval: 1s + timeout: 3s + retries: 30 + networks: + - nffl + + mainnet-anvil: + image: ghcr.io/foundry-rs/foundry:latest@sha256:8b843eb65cc7b155303b316f65d27173c862b37719dc095ef3a2ef27ce8d3c00 + container_name: mainnet-anvil + ports: + - "8545:8545" + entrypoint: anvil + volumes: + - ./tests/anvil/data/avs-and-eigenlayer-deployed-anvil-state.json:/root/.anvil/state.json + command: --host 0.0.0.0 --port 8545 --chain-id 1 --block-time 5 --load-state /root/.anvil/state.json + healthcheck: + test: ["CMD", "nc", "-zv", "0.0.0.0", "8545"] + interval: 15s + timeout: 10s + retries: 5 + networks: + - nffl + + mainnet-anvil-setup: + image: ghcr.io/foundry-rs/foundry:latest@sha256:8b843eb65cc7b155303b316f65d27173c862b37719dc095ef3a2ef27ce8d3c00 + container_name: mainnet-anvil-setup + depends_on: + mainnet-anvil: + condition: service_healthy + entrypoint: sh + command: + - -c + - | + cast rpc anvil_setBalance 0xD5A0359da7B310917d7760385516B2426E86ab7f 0x8ac7230489e80000 + cast rpc anvil_setBalance 0x9441540E8183d416f2Dc1901AB2034600f17B65a 0x8ac7230489e80000 + environment: + - ETH_RPC_URL=http://mainnet-anvil:8545 + networks: + - nffl + + rollup0-anvil: + image: ghcr.io/foundry-rs/foundry:latest@sha256:8b843eb65cc7b155303b316f65d27173c862b37719dc095ef3a2ef27ce8d3c00 + container_name: rollup0-anvil + ports: + - "8546:8546" + entrypoint: anvil + volumes: + - ./tests/anvil/data/rollup-avs-deployed-anvil-state.json:/root/.anvil/state.json + command: --host 0.0.0.0 --port 8546 --chain-id 2 --block-time 5 --load-state /root/.anvil/state.json + healthcheck: + test: ["CMD", "nc", "-zv", "0.0.0.0", "8546"] + interval: 15s + timeout: 10s + retries: 5 + networks: + - nffl + + rollup0-relayer: + image: nffl-test-relayer:latest + container_name: rollup0-relayer + depends_on: + rollup0-anvil: + condition: service_healthy + near-da-deploy: + condition: service_completed_successfully + expose: + - 9091 + volumes: + - near_cli_keys:/root/.near-credentials + command: + - run-args + - --rpc-url + - ws://rollup0-anvil:8546 + - --da-account-id + - da2.test.near + - --key-path + - /root/.near-credentials/localnet/da2.test.near.json + - --network + - http://nffl-indexer:3030 + - --metrics-ip-port-address + - rollup0-relayer:9091 + networks: + - nffl + + rollup1-anvil: + image: ghcr.io/foundry-rs/foundry:latest@sha256:8b843eb65cc7b155303b316f65d27173c862b37719dc095ef3a2ef27ce8d3c00 + container_name: rollup1-anvil + ports: + - "8547:8547" + entrypoint: anvil + volumes: + - ./tests/anvil/data/rollup-avs-deployed-anvil-state.json:/root/.anvil/state.json + command: --host 0.0.0.0 --port 8547 --chain-id 3 --block-time 5 --load-state /root/.anvil/state.json + healthcheck: + test: ["CMD", "nc", "-zv", "0.0.0.0", "8547"] + interval: 2s + timeout: 30s + retries: 15 + networks: + - nffl + + rollup1-relayer: + image: nffl-test-relayer:latest + container_name: rollup1-relayer + depends_on: + rollup1-anvil: + condition: service_healthy + near-da-deploy: + condition: service_completed_successfully + expose: + - 9091 + volumes: + - near_cli_keys:/root/.near-credentials + - ./config-files:/etc/relayer + command: + - run-config + - --path + - /etc/relayer/relayer1-docker-compose.yaml + networks: + - nffl + + fastnear-indexer: + image: nffl-fast-indexer:latest + container_name: nffl-fast-indexer + depends_on: + rmq: + condition: service_healthy + mainnet-anvil-setup: + condition: service_completed_successfully + indexer-setup: + condition: service_completed_successfully + ports: + - "3030:3030" + volumes: + - near_cli_data:/root/.near + - near_cli_keys:/root/.near-credentials + command: + - --rmq-address + - amqp://rmq:5672 + - --da-contract-ids + - da2.test.near + - --da-contract-ids + - da3.test.near + - --rollup-ids + - "2" + - --rollup-ids + - "3" + networks: + - nffl + + indexer-setup: + image: debian:bookworm + container_name: nffl-indexer-setup + volumes: + - near_cli_data:/near-cli + - near_cli_keys:/root/.near-credentials + entrypoint: sh + command: + - -c + - | + rm -rf /near-cli/* + rm -rf /root/.near-credentials/* + networks: + - nffl + + near-da-deploy: + image: node:16 + container_name: nffl-near-da-deploy + depends_on: + indexer: + condition: service_healthy + volumes: + - ./:/nffl/ + - near_cli_data:/near-cli + - near_cli_keys:/root/.near-credentials + entrypoint: sh + command: + - -c + - | + npm i -g near-cli@3.0.0 + near create-account da2.test.near --masterAccount test.near + near deploy da2.test.near /nffl/tests/near/near_da_blob_store.wasm --initFunction new --initArgs {} --masterAccount test.near -f + near create-account da3.test.near --masterAccount test.near + near deploy da3.test.near /nffl/tests/near/near_da_blob_store.wasm --initFunction new --initArgs {} --masterAccount test.near -f + environment: + - NEAR_ENV=localnet + - NEAR_CLI_LOCALNET_NETWORK_ID=localnet + - NEAR_HELPER_ACCOUNT=near + - NEAR_CLI_LOCALNET_KEY_PATH=/near-cli/validator_key.json + - NEAR_NODE_URL=http://nffl-indexer:3030 + networks: + - nffl + + aggregator: + image: nffl-aggregator + container_name: nffl-aggregator + depends_on: + mainnet-anvil-setup: + condition: service_completed_successfully + expose: + - 9091 + volumes: + - ./:/nffl/ + working_dir: /nffl + command: + - --config + - config-files/aggregator-docker-compose.yaml + - --nffl-deployment + - contracts/evm/script/output/31337/sffl_avs_deployment_output.json + - --ecdsa-private-key + - "0x2a871d0798f97d79848a013d4936a73bf4cc922c825d33c1cf7073dff6d409c6" + networks: + - nffl + + agreator-health: + image: debian:bookworm + depends_on: + aggregator: + condition: service_started + command: sh -c "apt update && apt install -y netcat-traditional && sleep infinity" + healthcheck: + test: ["CMD", "nc", "-zv", "nffl-aggregator", "9091"] + interval: 15s + timeout: 10s + retries: 5 + networks: + - nffl + + operator0: + image: nffl-operator + container_name: nffl-operator0 + depends_on: + rmq: + condition: service_healthy + mainnet-anvil-setup: + condition: service_completed_successfully + aggregator: + condition: service_started + expose: + - 9090 # prometheus metrics port (defined in operator0-docker-compose.anvil.yaml file) + volumes: + - ./:/nffl/ + working_dir: /nffl + environment: + - OPERATOR_BLS_KEY_PASSWORD=fDUMDLmBROwlzzPXyIcy + - OPERATOR_ECDSA_KEY_PASSWORD=EnJuncq01CiVk9UbuBYl + command: --config config-files/operator0-docker-compose.anvil.yaml + networks: + - nffl + + operator0-health: + image: debian:bookworm + depends_on: + operator0: + condition: service_started + command: sh -c "apt update && apt install -y netcat-traditional && sleep infinity" + healthcheck: + test: ["CMD", "nc", "-zv", "nffl-operator0", "9090"] + interval: 15s + timeout: 10s + retries: 5 + networks: + - nffl + + operator1: + image: nffl-operator + container_name: nffl-operator1 + depends_on: + operator0-health: + condition: service_healthy + expose: + - 9091 # prometheus metrics port (defined in operator1-docker-compose.anvil.yaml file) + volumes: + - ./:/nffl/ + working_dir: /nffl + environment: + - OPERATOR_BLS_KEY_PASSWORD=2EVEUyHCrHZdfdo8lp29 + - OPERATOR_ECDSA_KEY_PASSWORD=isru1gvtykIavuk1Fg1Q + command: --config config-files/operator1-docker-compose.anvil.yaml + networks: + - nffl + + operator1-health: + image: debian:bookworm + depends_on: + operator1: + condition: service_started + command: sh -c "apt update && apt install -y netcat-traditional && sleep infinity" + healthcheck: + test: ["CMD", "nc", "-zv", "nffl-operator1", "9091"] + interval: 15s + timeout: 10s + retries: 5 + networks: + - nffl + + # METRICS RELATED + grafana: + image: grafana/grafana:9.4.1 + container_name: grafana + volumes: + - grafana_data:/var/lib/grafana + - ./grafana/provisioning:/etc/grafana/provisioning + environment: + # See https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/#override-configuration-with-environment-variables + # and https://grafana.com/docs/grafana/latest/setup-grafana/configure-docker/ + # They recommend using env vars instead of overwriting config.ini + - GF_SECURITY_ADMIN_USER=${ADMIN_USER:-admin} + - GF_SECURITY_ADMIN_PASSWORD=${ADMIN_PASSWORD:-admin} + - GF_USERS_ALLOW_SIGN_UP=false + restart: unless-stopped + ports: + - 3000:3000 + networks: + - nffl + + prometheus: + image: prom/prometheus:v2.42.0 + container_name: prometheus + volumes: + - ./prometheus:/etc/prometheus + - prometheus_data:/prometheus + command: + - "--config.file=/etc/prometheus/prometheus.yml" + - "--storage.tsdb.path=/prometheus" + - "--web.console.libraries=/etc/prometheus/console_libraries" + - "--web.console.templates=/etc/prometheus/consoles" + - "--storage.tsdb.retention.time=200h" + - "--web.enable-lifecycle" + - --web.enable-remote-write-receiver + restart: unless-stopped + ports: + - 9090:9090 + networks: + - nffl + # so that we can access the host from within the container + # needed to get the metrics from host.docker.internal:9184/metrics + extra_hosts: + - "host.docker.internal:host-gateway" + +volumes: + prometheus_data: + grafana_data: + near_cli_data: + near_cli_keys: diff --git a/docker-compose.yml b/docker-compose.yml index 74459ee3..52fe708b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -139,42 +139,9 @@ services: networks: - nffl - fastnear-indexer: - image: nffl-fast-indexer:latest - container_name: nffl-fast-indexer - profiles: ["fast-indexer"] - depends_on: - rmq: - condition: service_healthy - mainnet-anvil-setup: - condition: service_completed_successfully - ports: - - "3030:3030" - expose: - - 9090 # prometheus port - volumes: - - near_cli_data:/root/.near - - near_cli_keys:/root/.near-credentials - command: - - --rmq-address - - amqp://rmq:5672 - - --da-contract-ids - - da2.test.near - - --da-contract-ids - - da3.test.near - - --rollup-ids - - "2" - - --rollup-ids - - "3" - - --metrics-ip-port-address - - "0.0.0.0:9090" - networks: - - nffl - indexer: image: nffl-indexer:latest container_name: nffl-indexer - profiles: ["default-indexer"] depends_on: rmq: condition: service_healthy @@ -208,7 +175,6 @@ services: indexer-setup: image: debian:bookworm container_name: nffl-indexer-setup - profiles: ["default-indexer"] volumes: - near_cli_data:/near-cli - near_cli_keys:/root/.near-credentials @@ -224,7 +190,6 @@ services: near-da-deploy: image: node:16 container_name: nffl-near-da-deploy - profiles: ["default-indexer"] depends_on: indexer: condition: service_healthy From 3ae6ec8095e71c3b84d64155a0a3e8be36946a38 Mon Sep 17 00:00:00 2001 From: Sasha Syrotenko Date: Mon, 25 Nov 2024 21:53:10 +0200 Subject: [PATCH 15/40] Separate default and fastnear indexers --- .github/workflows/compose-fastnear-test.yml | 7 +++++-- .github/workflows/compose-test.yml | 5 ++++- docker-compose-fastnear.yml | 4 ++-- indexer/Dockerfile | 14 +++++++++++--- indexer/FastIndexer.dockerfile | 15 ++++++++++----- 5 files changed, 32 insertions(+), 13 deletions(-) diff --git a/.github/workflows/compose-fastnear-test.yml b/.github/workflows/compose-fastnear-test.yml index 9e80522f..58bdbbc7 100644 --- a/.github/workflows/compose-fastnear-test.yml +++ b/.github/workflows/compose-fastnear-test.yml @@ -6,7 +6,7 @@ on: - main pull_request: paths: - - 'indexer/**' # Temporarily util it become prime way to obtain NEAR DA blocks. + - 'indexer/**' # Temporarily util it becomes prime way to obtain NEAR DA blocks. jobs: run-docker-compose-fastnear: @@ -33,6 +33,9 @@ jobs: tags: nffl-fast-indexer cache-from: type=gha,scope=indexer cache-to: type=gha,mode=max,scope=indexer + build-args: | + - TARGET="debug" + - COMPILATION_MODE="" - name: Build relayer container uses: docker/build-push-action@v5 @@ -65,7 +68,7 @@ jobs: cache-to: type=gha,mode=max,scope=operator - name: Build and start Docker Compose services - run: docker-compose -f ./docker-compose-fastnear.yml up --build -d --wait --wait-timeout 150 + run: docker-compose -f ./docker-compose-fastnear.yml up --build -d --wait --wait-timeout 300 - name: List running containers run: | diff --git a/.github/workflows/compose-test.yml b/.github/workflows/compose-test.yml index 9cf3663d..d01d3d64 100644 --- a/.github/workflows/compose-test.yml +++ b/.github/workflows/compose-test.yml @@ -31,6 +31,9 @@ jobs: tags: nffl-indexer cache-from: type=gha,scope=indexer cache-to: type=gha,mode=max,scope=indexer + build-args: | + - TARGET="debug" + - COMPILATION_MODE="" - name: Build relayer container uses: docker/build-push-action@v5 @@ -63,7 +66,7 @@ jobs: cache-to: type=gha,mode=max,scope=operator - name: Build and start Docker Compose services - run: docker-compose -f ./docker-compose.yml up --build -d --wait --wait-timeout 150 + run: docker-compose -f ./docker-compose.yml up --build -d --wait --wait-timeout 300 - name: List running containers run: | diff --git a/docker-compose-fastnear.yml b/docker-compose-fastnear.yml index 7c9f65b1..b962c9a3 100644 --- a/docker-compose-fastnear.yml +++ b/docker-compose-fastnear.yml @@ -139,9 +139,9 @@ services: networks: - nffl - fastnear-indexer: + indexer: image: nffl-fast-indexer:latest - container_name: nffl-fast-indexer + container_name: nffl-indexer depends_on: rmq: condition: service_healthy diff --git a/indexer/Dockerfile b/indexer/Dockerfile index 4efa4d9f..d02c5960 100644 --- a/indexer/Dockerfile +++ b/indexer/Dockerfile @@ -1,6 +1,9 @@ FROM rust:1.81 AS builder WORKDIR /tmp/indexer +ARG TARGET="release" +ARG COMPILATION_MODE="--${TARGET}" + # Copy from nearcore: # https://github.com/near/nearcore/blob/master/Dockerfile RUN apt-get update -qq && \ @@ -16,19 +19,24 @@ RUN apt-get update -qq && \ COPY ./indexer/Cargo.toml . RUN mkdir ./src && echo "fn main() {}" > ./src/main.rs -RUN cargo build --release -p indexer + +# Hacky approach to cache dependencies +# RUN cargo build ${COMPILATION_MODE} -p indexer COPY ./indexer . RUN touch ./src/main.rs -RUN cargo build --release -p indexer +RUN cargo build ${COMPILATION_MODE} -p indexer FROM debian:bookworm-slim as runtime WORKDIR /indexer-app +ARG TARGET="release" + +RUN echo ${TARGET} RUN apt update && apt install -yy openssl ca-certificates jq curl -COPY --from=builder /tmp/indexer/target/release/indexer . +COPY --from=builder /tmp/indexer/target/${TARGET}/indexer . COPY ./indexer/entrypoint.sh ./entrypoint.sh RUN chmod +x ./entrypoint.sh diff --git a/indexer/FastIndexer.dockerfile b/indexer/FastIndexer.dockerfile index 10dc4e9b..22209b25 100644 --- a/indexer/FastIndexer.dockerfile +++ b/indexer/FastIndexer.dockerfile @@ -1,6 +1,8 @@ -FROM rust:1.81-bookworm AS builder +FROM rust:1.81 AS builder WORKDIR /tmp/indexer +ARG COMPILATION_MODE="--release" + # Copy from nearcore: # https://github.com/near/nearcore/blob/master/Dockerfile RUN apt-get update -qq && \ @@ -16,19 +18,22 @@ RUN apt-get update -qq && \ COPY ./indexer/Cargo.toml . RUN mkdir ./src && echo "fn main() {}" > ./src/main.rs -RUN cargo build --release -p indexer --features use_fastnear + +# Hacky approach to cache dependencies +# RUN cargo build ${COMPILATION_MODE} -p indexer --features use_fastnear COPY ./indexer . RUN touch ./src/main.rs -RUN cargo build --release -p indexer --features use_fastnear +RUN cargo build ${COMPILATION_MODE} -p indexer --features use_fastnear FROM debian:bookworm-slim as runtime WORKDIR /indexer-app +ARG TARGET="release" RUN apt update && apt install -yy openssl ca-certificates jq curl -COPY --from=builder /tmp/indexer/target/release/indexer . +COPY --from=builder /tmp/indexer/target/${TARGET}/indexer . COPY ./indexer/entrypoint.sh ./entrypoint.sh RUN chmod +x ./entrypoint.sh @@ -44,4 +49,4 @@ HEALTHCHECK --interval=20s --timeout=30s --retries=10000 \ http://localhost:3030 | \ jq -es 'if . == [] then null else .[] | .result.sync_info.syncing == false end') -ENTRYPOINT [ "./entrypoint.sh" ] \ No newline at end of file +ENTRYPOINT [ "./entrypoint.sh" ] From 499f3251ae8a33d67d41e2145cfc576023106edc Mon Sep 17 00:00:00 2001 From: Sasha Syrotenko Date: Mon, 25 Nov 2024 22:45:33 +0200 Subject: [PATCH 16/40] Please work --- .github/workflows/compose-fastnear-test.yml | 3 +++ .github/workflows/compose-test.yml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/.github/workflows/compose-fastnear-test.yml b/.github/workflows/compose-fastnear-test.yml index 58bdbbc7..d59fd1e8 100644 --- a/.github/workflows/compose-fastnear-test.yml +++ b/.github/workflows/compose-fastnear-test.yml @@ -70,6 +70,9 @@ jobs: - name: Build and start Docker Compose services run: docker-compose -f ./docker-compose-fastnear.yml up --build -d --wait --wait-timeout 300 + - name: Wait for a 1 minute + run: sleep 60 + - name: List running containers run: | echo "Running containers:" diff --git a/.github/workflows/compose-test.yml b/.github/workflows/compose-test.yml index d01d3d64..4d50690b 100644 --- a/.github/workflows/compose-test.yml +++ b/.github/workflows/compose-test.yml @@ -68,6 +68,9 @@ jobs: - name: Build and start Docker Compose services run: docker-compose -f ./docker-compose.yml up --build -d --wait --wait-timeout 300 + - name: Wait for a 1 minute + run: sleep 60 + - name: List running containers run: | echo "Running containers:" From 342d8f11cd258fc27976f089fe3988ce3b6be200 Mon Sep 17 00:00:00 2001 From: Sasha Syrotenko Date: Mon, 25 Nov 2024 23:09:58 +0200 Subject: [PATCH 17/40] Please work-2 --- .github/workflows/compose-fastnear-test.yml | 6 +++--- .github/workflows/compose-test.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/compose-fastnear-test.yml b/.github/workflows/compose-fastnear-test.yml index d59fd1e8..01ac1f0b 100644 --- a/.github/workflows/compose-fastnear-test.yml +++ b/.github/workflows/compose-fastnear-test.yml @@ -68,10 +68,10 @@ jobs: cache-to: type=gha,mode=max,scope=operator - name: Build and start Docker Compose services - run: docker-compose -f ./docker-compose-fastnear.yml up --build -d --wait --wait-timeout 300 + run: docker-compose -f ./docker-compose-fastnear.yml up --build -d - - name: Wait for a 1 minute - run: sleep 60 + - name: Wait for a 3 minutes + run: sleep 180 - name: List running containers run: | diff --git a/.github/workflows/compose-test.yml b/.github/workflows/compose-test.yml index 4d50690b..22bc61cd 100644 --- a/.github/workflows/compose-test.yml +++ b/.github/workflows/compose-test.yml @@ -66,10 +66,10 @@ jobs: cache-to: type=gha,mode=max,scope=operator - name: Build and start Docker Compose services - run: docker-compose -f ./docker-compose.yml up --build -d --wait --wait-timeout 300 + run: docker-compose -f ./docker-compose.yml up --build -d - - name: Wait for a 1 minute - run: sleep 60 + - name: Wait for a 3 minutes + run: sleep 180 - name: List running containers run: | From 0d09358fe00ff06c081b5b7444255968d48ca950 Mon Sep 17 00:00:00 2001 From: Sasha Syrotenko Date: Mon, 25 Nov 2024 23:48:24 +0200 Subject: [PATCH 18/40] Update integration_test.go --- tests/integration/integration_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integration/integration_test.go b/tests/integration/integration_test.go index 7310168b..23232620 100644 --- a/tests/integration/integration_test.go +++ b/tests/integration/integration_test.go @@ -96,7 +96,7 @@ func TestIntegration(t *testing.T) { newOperatorConfig, _, _ := genOperatorConfig(t, ctx, "4", setup.mainnetAnvil, setup.rollupAnvils, setup.rabbitMq) newOperator := startOperator(t, ctx, newOperatorConfig) - time.Sleep(40 * time.Second) + time.Sleep(60 * time.Second) // Check if operator set was updated on rollups for _, registryRollup := range setup.registryRollups { From a0d7873fbcf293a524b689a7d0ea90713381c91e Mon Sep 17 00:00:00 2001 From: Sasha Syrotenko Date: Tue, 26 Nov 2024 06:44:12 +0200 Subject: [PATCH 19/40] Please work-3 --- .github/workflows/compose-fastnear-test.yml | 10 +++++----- .github/workflows/compose-test.yml | 4 ++-- docker-compose-fastnear.yml | 2 +- docker-compose.yml | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/compose-fastnear-test.yml b/.github/workflows/compose-fastnear-test.yml index 01ac1f0b..b4c2a5ff 100644 --- a/.github/workflows/compose-fastnear-test.yml +++ b/.github/workflows/compose-fastnear-test.yml @@ -1,4 +1,4 @@ -name: Docker Compose Test With FastNear +name: Docker Compose Test With FastNear Indexer on: push: @@ -9,7 +9,7 @@ on: - 'indexer/**' # Temporarily util it becomes prime way to obtain NEAR DA blocks. jobs: - run-docker-compose-fastnear: + run-docker-compose: runs-on: ubuntu-latest steps: @@ -24,7 +24,7 @@ jobs: sudo apt-get update sudo apt-get install docker-compose -y - - name: Build indexer container + - name: Build fastnear indexer container uses: docker/build-push-action@v5 with: load: true @@ -89,7 +89,7 @@ jobs: "rollup0-relayer" "nffl-fast-indexer" "nffl-aggregator" - "nffl_agreator-health_1" + "nffl_aggregator-health_1" "mainnet-anvil" "prometheus" "rollup0-anvil" @@ -112,7 +112,7 @@ jobs: services=( "nffl_operator1-health_1" "nffl_operator0-health_1" - "nffl_agreator-health_1" + "nffl_aggregator-health_1" "rollup1-anvil" "rollup0-anvil" "mainnet-anvil" diff --git a/.github/workflows/compose-test.yml b/.github/workflows/compose-test.yml index 22bc61cd..447806dc 100644 --- a/.github/workflows/compose-test.yml +++ b/.github/workflows/compose-test.yml @@ -87,7 +87,7 @@ jobs: "rollup0-relayer" "nffl-indexer" "nffl-aggregator" - "nffl_agreator-health_1" + "nffl_aggregator-health_1" "mainnet-anvil" "prometheus" "rollup0-anvil" @@ -110,7 +110,7 @@ jobs: services=( "nffl_operator1-health_1" "nffl_operator0-health_1" - "nffl_agreator-health_1" + "nffl_aggregator-health_1" "rollup1-anvil" "rollup0-anvil" "mainnet-anvil" diff --git a/docker-compose-fastnear.yml b/docker-compose-fastnear.yml index b962c9a3..a54d3430 100644 --- a/docker-compose-fastnear.yml +++ b/docker-compose-fastnear.yml @@ -232,7 +232,7 @@ services: networks: - nffl - agreator-health: + aggregator-health: image: debian:bookworm depends_on: aggregator: diff --git a/docker-compose.yml b/docker-compose.yml index 52fe708b..b0bdd0a2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -236,7 +236,7 @@ services: networks: - nffl - agreator-health: + aggregator-health: image: debian:bookworm depends_on: aggregator: From 8dfca709cbc1c847f3600eaac5161c74f86c912e Mon Sep 17 00:00:00 2001 From: Sasha Syrotenko Date: Tue, 26 Nov 2024 12:42:03 +0200 Subject: [PATCH 20/40] Remove healthcheck from fast indexer docker image, upgrade version where necessary --- Cargo.lock | 16 ++++++++-------- Cargo.toml | 2 +- docker-compose-fastnear.yml | 2 ++ indexer/Cargo.toml | 9 +++++---- indexer/FastIndexer.dockerfile | 18 +++++++++--------- indexer/src/main.rs | 18 +++++++++--------- indexer/test_data/config/example.yaml | 2 +- 7 files changed, 35 insertions(+), 32 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6dce34d3..13d05748 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4897,9 +4897,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "540654e97a3f4470a492cd30ff187bc95d89557a903a2bbf112e2fae98104ef2" +checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" [[package]] name = "jobserver" @@ -5048,9 +5048,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.164" +version = "0.2.165" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "433bfe06b8c75da9b2e3fbea6e5329ff87748f0b144ef75306e674c3f6f7c13f" +checksum = "fcb4d3d38eab6c5239a362fa8bae48c03baf980a6e7079f063942d563ef3533e" [[package]] name = "libloading" @@ -7124,9 +7124,9 @@ checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pathdiff" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c5ce1153ab5b689d0c074c4e7fc613e942dfb7dd9eea5ab202d2ad91fe361" +checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3" [[package]] name = "pbkdf2" @@ -9905,9 +9905,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.32" +version = "0.1.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" dependencies = [ "once_cell", "valuable", diff --git a/Cargo.toml b/Cargo.toml index a44ca561..68d9d3b4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,7 +29,7 @@ eyre = "0.6" futures-util = "0.3.30" log = "0.4" prometheus = "0.13" -reqwest = { version = "0.12.8", features = ["json"] } +reqwest = { version = "0.12.9", features = ["json"] } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" serde_yaml = "0.9" diff --git a/docker-compose-fastnear.yml b/docker-compose-fastnear.yml index a54d3430..89c2cb32 100644 --- a/docker-compose-fastnear.yml +++ b/docker-compose-fastnear.yml @@ -165,6 +165,8 @@ services: - "2" - --rollup-ids - "3" + - --metrics-ip-port-address + - "0.0.0.0:9090" networks: - nffl diff --git a/indexer/Cargo.toml b/indexer/Cargo.toml index 6e875cbe..6d9b5d7b 100644 --- a/indexer/Cargo.toml +++ b/indexer/Cargo.toml @@ -9,7 +9,7 @@ edition = "2021" actix = "0.13.1" actix-web = "4.5.1" futures = "0.3.5" -tokio = { version = "1.28.2", features = ["sync", "time"] } +tokio = { version = "1", features = ["sync", "time"] } deadpool = "0.10.0" lapin = "2.3.1" deadpool-lapin = "0.11.0" @@ -17,13 +17,13 @@ tokio-executor-trait = "2.1.0" tokio-reactor-trait = "1.1.0" prometheus = "0.13.3" -clap = { version = "4.4.11", features = ["color", "derive", "env"] } +clap = { version = "4.5.21", features = ["color", "derive", "env"] } openssl-probe = "0.1.4" serde = { version = "1", features = ["derive"] } serde_json = "1.0.68" -tracing = { version = "0.1.36", features = ["std"] } -thiserror = "1.0.56" +tracing = { version = "0.1.40", features = ["std"] } +thiserror = "1.0.69" anyhow = "1.0.79" near-indexer = { git = "https://github.com/near/nearcore", rev = "93073d762ff377382ebf54e7cbff448b492e72c6" } @@ -33,6 +33,7 @@ near-config-utils = { git = "https://github.com/near/nearcore", rev = "93073d762 near-client-primitives = { git = "https://github.com/near/nearcore", rev = "93073d762ff377382ebf54e7cbff448b492e72c6" } borsh = { version = "1.0.0", features = ["derive", "rc"] } serde_yaml = "0.9.34" +#reqwest = {workspace = true} reqwest = { version = "0.12.9", features = ["json"] } [dev-dependencies] diff --git a/indexer/FastIndexer.dockerfile b/indexer/FastIndexer.dockerfile index 22209b25..e31e3eb8 100644 --- a/indexer/FastIndexer.dockerfile +++ b/indexer/FastIndexer.dockerfile @@ -39,14 +39,14 @@ RUN chmod +x ./entrypoint.sh EXPOSE 3030 -HEALTHCHECK --interval=20s --timeout=30s --retries=10000 \ - CMD (curl -f -s -X POST -H "Content-Type: application/json" \ - -d '{"jsonrpc":"2.0","method":"block","params":{"finality":"optimistic"},"id":"dontcare"}' \ - http://localhost:3030 | \ - jq -es 'if . == [] then null else .[] | (now - (.result.header.timestamp / 1000000000)) < 10 end') && \ - (curl -f -s -X POST -H "Content-Type: application/json" \ - -d '{"jsonrpc":"2.0","method":"status","params":[],"id":"dontcare"}' \ - http://localhost:3030 | \ - jq -es 'if . == [] then null else .[] | .result.sync_info.syncing == false end') +#HEALTHCHECK --interval=20s --timeout=30s --retries=10000 \ +# CMD (curl -f -s -X POST -H "Content-Type: application/json" \ +# -d '{"jsonrpc":"2.0","method":"block","params":{"finality":"optimistic"},"id":"dontcare"}' \ +# http://localhost:3030 | \ +# jq -es 'if . == [] then null else .[] | (now - (.result.header.timestamp / 1000000000)) < 10 end') && \ +# (curl -f -s -X POST -H "Content-Type: application/json" \ +# -d '{"jsonrpc":"2.0","method":"status","params":[],"id":"dontcare"}' \ +# http://localhost:3030 | \ +# jq -es 'if . == [] then null else .[] | .result.sync_info.syncing == false end') ENTRYPOINT [ "./entrypoint.sh" ] diff --git a/indexer/src/main.rs b/indexer/src/main.rs index 1270c408..22e4aead 100644 --- a/indexer/src/main.rs +++ b/indexer/src/main.rs @@ -27,13 +27,6 @@ const INDEXER: &str = "indexer"; fn run(home_dir: std::path::PathBuf, config: RunConfigArgs) -> Result<()> { let addresses_to_rollup_ids = config.compile_addresses_to_ids_map()?; - let indexer_config = near_indexer::IndexerConfig { - home_dir, - sync_mode: near_indexer::SyncModeEnum::LatestSynced, - await_for_node_synced: near_indexer::AwaitForNodeSyncedEnum::WaitForFullSync, - validate_genesis: true, - }; - let system = actix::System::new(); let registry = Registry::new(); let server_handle = if let Some(metrics_addr) = config.metrics_ip_port_address { @@ -42,14 +35,21 @@ fn run(home_dir: std::path::PathBuf, config: RunConfigArgs) -> Result<()> { } else { None }; - // TODO[sasha/firat]: refactor, added some logic to handle the case when fastnear is enabled. - // Needs tests and maybe refactoring for base case + + // TODO[sasha/firat]: refactor and tests. let block_res = system.block_on(async move { let validated_stream: Receiver; if cfg!(feature = "use_fastnear") { let fastnear_indexer = FastNearIndexer::new(addresses_to_rollup_ids); validated_stream = fastnear_indexer.run(); } else { + let indexer_config = near_indexer::IndexerConfig { + home_dir, + sync_mode: near_indexer::SyncModeEnum::LatestSynced, + await_for_node_synced: near_indexer::AwaitForNodeSyncedEnum::WaitForFullSync, + validate_genesis: true, + }; + let mut indexer = IndexerWrapper::new(indexer_config, addresses_to_rollup_ids); if config.metrics_ip_port_address.is_some() { indexer.enable_metrics(registry.clone())?; diff --git a/indexer/test_data/config/example.yaml b/indexer/test_data/config/example.yaml index e32b5133..77a52cd4 100644 --- a/indexer/test_data/config/example.yaml +++ b/indexer/test_data/config/example.yaml @@ -34,4 +34,4 @@ download_config: false # boot_nodes: # Specify a custom max_gas_burnt_view limit. -# max_gas_burnt_view: +# max_gas_burnt_view: \ No newline at end of file From 37202359770856b24e0fb696adb8176c478a6aa1 Mon Sep 17 00:00:00 2001 From: Sasha Syrotenko Date: Tue, 26 Nov 2024 13:24:52 +0200 Subject: [PATCH 21/40] Please work-4 --- .github/workflows/compose-fastnear-test.yml | 8 ++++---- Makefile | 2 +- docker-compose-fastnear.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/compose-fastnear-test.yml b/.github/workflows/compose-fastnear-test.yml index b4c2a5ff..25d5b05b 100644 --- a/.github/workflows/compose-fastnear-test.yml +++ b/.github/workflows/compose-fastnear-test.yml @@ -68,10 +68,10 @@ jobs: cache-to: type=gha,mode=max,scope=operator - name: Build and start Docker Compose services - run: docker-compose -f ./docker-compose-fastnear.yml up --build -d + run: docker-compose -f ./docker-compose-fastnear.yml up --build -d --wait --wait-timeout 180 - - name: Wait for a 3 minutes - run: sleep 180 + - name: Wait for a minute + run: sleep 60 - name: List running containers run: | @@ -87,7 +87,7 @@ jobs: "nffl-operator0" "rollup1-relayer" "rollup0-relayer" - "nffl-fast-indexer" + "nffl-indexer" "nffl-aggregator" "nffl_aggregator-health_1" "mainnet-anvil" diff --git a/Makefile b/Makefile index 3fa56e2a..d905377a 100644 --- a/Makefile +++ b/Makefile @@ -62,7 +62,7 @@ docker-build-plugin: docker build -t nffl-operator-plugin -f ./plugin/cmd/Dockerfile . docker-build-images: docker-build-indexer docker-build-relayer docker-build-aggregator docker-build-operator docker-build-plugin ## builds and publishes indexer, operator and aggregator docker images docker-start-everything: docker-build-images ## starts aggregator and operator docker containers - docker compose --profile default-indexer up + docker compose up __CLI__: ## diff --git a/docker-compose-fastnear.yml b/docker-compose-fastnear.yml index 89c2cb32..d1a7d1a9 100644 --- a/docker-compose-fastnear.yml +++ b/docker-compose-fastnear.yml @@ -190,7 +190,7 @@ services: container_name: nffl-near-da-deploy depends_on: indexer: - condition: service_healthy + condition: service_started volumes: - ./:/nffl/ - near_cli_data:/near-cli From bed8ef2a0d06a1a5a92c0c19cdb057832f8d66a8 Mon Sep 17 00:00:00 2001 From: Sasha Syrotenko Date: Tue, 26 Nov 2024 13:31:37 +0200 Subject: [PATCH 22/40] Update compose-fastnear-test.yml --- .github/workflows/compose-fastnear-test.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/compose-fastnear-test.yml b/.github/workflows/compose-fastnear-test.yml index 25d5b05b..780da442 100644 --- a/.github/workflows/compose-fastnear-test.yml +++ b/.github/workflows/compose-fastnear-test.yml @@ -68,10 +68,10 @@ jobs: cache-to: type=gha,mode=max,scope=operator - name: Build and start Docker Compose services - run: docker-compose -f ./docker-compose-fastnear.yml up --build -d --wait --wait-timeout 180 + run: docker-compose -f ./docker-compose-fastnear.yml up --build -d - - name: Wait for a minute - run: sleep 60 + - name: Wait for a 3 minutes + run: sleep 180 - name: List running containers run: | @@ -130,4 +130,4 @@ jobs: done - name: Tear down Docker Compose services - run: docker-compose -f ./docker-compose-fastnear.yml down \ No newline at end of file + run: docker-compose -f ./docker-compose-fastnear.yml down From 24c2f2564f81204b21786227df7abf47c76e4842 Mon Sep 17 00:00:00 2001 From: Sasha Syrotenko Date: Tue, 26 Nov 2024 16:56:42 +0200 Subject: [PATCH 23/40] Try now? --- .github/workflows/compose-fastnear-test.yml | 2 +- docker-compose-fastnear.yml | 4 ++-- indexer/FastIndexer.dockerfile | 15 ++++----------- indexer/src/fastnear_indexer.rs | 14 +++++++++++++- 4 files changed, 20 insertions(+), 15 deletions(-) diff --git a/.github/workflows/compose-fastnear-test.yml b/.github/workflows/compose-fastnear-test.yml index 780da442..7682893f 100644 --- a/.github/workflows/compose-fastnear-test.yml +++ b/.github/workflows/compose-fastnear-test.yml @@ -9,7 +9,7 @@ on: - 'indexer/**' # Temporarily util it becomes prime way to obtain NEAR DA blocks. jobs: - run-docker-compose: + run-docker-compose-with-fastnear: runs-on: ubuntu-latest steps: diff --git a/docker-compose-fastnear.yml b/docker-compose-fastnear.yml index d1a7d1a9..c0a27dea 100644 --- a/docker-compose-fastnear.yml +++ b/docker-compose-fastnear.yml @@ -186,11 +186,11 @@ services: - nffl near-da-deploy: - image: node:16 + image: node:18 container_name: nffl-near-da-deploy depends_on: indexer: - condition: service_started + condition: service_healthy volumes: - ./:/nffl/ - near_cli_data:/near-cli diff --git a/indexer/FastIndexer.dockerfile b/indexer/FastIndexer.dockerfile index e31e3eb8..149ae80a 100644 --- a/indexer/FastIndexer.dockerfile +++ b/indexer/FastIndexer.dockerfile @@ -12,7 +12,7 @@ RUN apt-get update -qq && \ g++ \ pkg-config \ libssl-dev \ - curl \ + wget \ llvm \ clang @@ -20,7 +20,7 @@ COPY ./indexer/Cargo.toml . RUN mkdir ./src && echo "fn main() {}" > ./src/main.rs # Hacky approach to cache dependencies -# RUN cargo build ${COMPILATION_MODE} -p indexer --features use_fastnear +RUN cargo build ${COMPILATION_MODE} -p indexer --features use_fastnear COPY ./indexer . RUN touch ./src/main.rs @@ -39,14 +39,7 @@ RUN chmod +x ./entrypoint.sh EXPOSE 3030 -#HEALTHCHECK --interval=20s --timeout=30s --retries=10000 \ -# CMD (curl -f -s -X POST -H "Content-Type: application/json" \ -# -d '{"jsonrpc":"2.0","method":"block","params":{"finality":"optimistic"},"id":"dontcare"}' \ -# http://localhost:3030 | \ -# jq -es 'if . == [] then null else .[] | (now - (.result.header.timestamp / 1000000000)) < 10 end') && \ -# (curl -f -s -X POST -H "Content-Type: application/json" \ -# -d '{"jsonrpc":"2.0","method":"status","params":[],"id":"dontcare"}' \ -# http://localhost:3030 | \ -# jq -es 'if . == [] then null else .[] | .result.sync_info.syncing == false end') +HEALTHCHECK --interval=20s --timeout=30s --retries=50 \ + CMD (wget http://localhost:3030 2>&1 | grep -q "connected" && echo "true" || echo "false" == "true") ENTRYPOINT [ "./entrypoint.sh" ] diff --git a/indexer/src/fastnear_indexer.rs b/indexer/src/fastnear_indexer.rs index adb515c1..f57f3fb4 100644 --- a/indexer/src/fastnear_indexer.rs +++ b/indexer/src/fastnear_indexer.rs @@ -5,13 +5,15 @@ use tokio::sync::{mpsc::{Sender, Receiver}, mpsc}; use tracing::{info, error, debug, trace}; use crate::{errors::Error, rmq_publisher::{get_routing_key, PublishData, PublishOptions, PublishPayload, PublisherContext}, types::{BlockWithTxHashes, IndexerExecutionOutcomeWithReceiptAndTxHash, PartialCandidateData, PartialCandidateDataWithBlockTxHash}}; +use crate::metrics::{make_block_listener_metrics, BlockEventListener, Metricable}; +use crate::errors::Result; const FASTNEAR_ENDPOINT: &str = "https://testnet.neardata.xyz/v0/last_block/final"; -#[derive(Debug)] pub struct FastNearIndexer { client: Client, addresses_to_rollup_ids: HashMap, + listener: Option, } impl FastNearIndexer { @@ -20,6 +22,7 @@ impl FastNearIndexer { Self { client: Client::new(), addresses_to_rollup_ids, + listener: None, } } @@ -192,4 +195,13 @@ impl FastNearIndexer { }, } } +} + +impl Metricable for FastNearIndexer { + fn enable_metrics(&mut self, registry: prometheus::Registry) -> Result<()> { + let listener = make_block_listener_metrics(registry)?; + self.listener = Some(listener); + + Ok(()) + } } \ No newline at end of file From 1dcadcda9ea4973b85357f61a29503f2f2de5cec Mon Sep 17 00:00:00 2001 From: Sasha Syrotenko Date: Tue, 26 Nov 2024 18:33:13 +0200 Subject: [PATCH 24/40] Modify healthcheck --- .github/workflows/compose-fastnear-test.yml | 4 +- Makefile | 6 + indexer/FastIndexer.dockerfile | 4 +- .../integration/integration_fastnear_test.go | 771 ++++++++++++++++++ 4 files changed, 781 insertions(+), 4 deletions(-) create mode 100644 tests/integration/integration_fastnear_test.go diff --git a/.github/workflows/compose-fastnear-test.yml b/.github/workflows/compose-fastnear-test.yml index 7682893f..9fd5f82e 100644 --- a/.github/workflows/compose-fastnear-test.yml +++ b/.github/workflows/compose-fastnear-test.yml @@ -70,8 +70,8 @@ jobs: - name: Build and start Docker Compose services run: docker-compose -f ./docker-compose-fastnear.yml up --build -d - - name: Wait for a 3 minutes - run: sleep 180 + - name: Wait for a couple of minutes + run: sleep 240 - name: List running containers run: | diff --git a/Makefile b/Makefile index d905377a..ff96da79 100644 --- a/Makefile +++ b/Makefile @@ -48,6 +48,10 @@ bindings: ## generates contract bindings cd contracts && ./generate-go-bindings.sh ___DOCKER___: ## +docker-fast-build-indexer: + docker build -t nffl-indexer -f ./indexer/Dockerfile --build-arg COMPILATION_MODE="" --build-arg TARGET="debug" . +docker-fast-build-fastnear-indexer: + docker build -t nffl-fast-indexer -f ./indexer/FastIndexer.dockerfile --build-arg COMPILATION_MODE="" --build-arg TARGET="debug" . docker-build-indexer: docker build -t nffl-indexer -f ./indexer/Dockerfile . docker-build-fastnear-indexer: @@ -138,6 +142,8 @@ near-da-rpc-sys: tests-integration: ## runs all integration tests go test ./tests/integration/integration_test.go -v -count=1 go test ./tests/integration/registration_test.go -v -race -count=1 +test-integration-fastnear: ## runs all integration tests + go test ./tests/integration/integration_fastnear_test.go -v -count=1 ## runs slither for solidity files ## You can install Slither by following the guide at https://github.com/crytic/slither/tree/master?tab=readme-ov-file#how-to-install diff --git a/indexer/FastIndexer.dockerfile b/indexer/FastIndexer.dockerfile index 149ae80a..77c3509c 100644 --- a/indexer/FastIndexer.dockerfile +++ b/indexer/FastIndexer.dockerfile @@ -39,7 +39,7 @@ RUN chmod +x ./entrypoint.sh EXPOSE 3030 -HEALTHCHECK --interval=20s --timeout=30s --retries=50 \ - CMD (wget http://localhost:3030 2>&1 | grep -q "connected" && echo "true" || echo "false" == "true") +HEALTHCHECK --interval=5m --timeout=10s \ + CMD (nc -z -v localhost 3030 || exit 1) ENTRYPOINT [ "./entrypoint.sh" ] diff --git a/tests/integration/integration_fastnear_test.go b/tests/integration/integration_fastnear_test.go new file mode 100644 index 00000000..40ca385d --- /dev/null +++ b/tests/integration/integration_fastnear_test.go @@ -0,0 +1,771 @@ +package integration_fastnear + +import ( + "context" + "crypto/ecdsa" + "encoding/json" + "fmt" + "io" + "io/fs" + "io/ioutil" + "log" + "math/big" + "net/http" + "os" + "os/exec" + "path/filepath" + "strings" + "testing" + "time" + + "github.com/Layr-Labs/eigensdk-go/crypto/bls" + sdkEcdsa "github.com/Layr-Labs/eigensdk-go/crypto/ecdsa" + sdklogging "github.com/Layr-Labs/eigensdk-go/logging" + sdkutils "github.com/Layr-Labs/eigensdk-go/utils" + "github.com/ethereum/go-ethereum/accounts/abi/bind" + "github.com/ethereum/go-ethereum/common" + "github.com/ethereum/go-ethereum/crypto" + "github.com/prometheus/client_golang/prometheus" + "github.com/stretchr/testify/assert" + "github.com/testcontainers/testcontainers-go" + "github.com/testcontainers/testcontainers-go/modules/rabbitmq" + "github.com/testcontainers/testcontainers-go/wait" + + "github.com/Nuffle-Labs/nffl/aggregator" + restserver "github.com/Nuffle-Labs/nffl/aggregator/rest_server" + rpcserver "github.com/Nuffle-Labs/nffl/aggregator/rpc_server" + aggtypes "github.com/Nuffle-Labs/nffl/aggregator/types" + registryrollup "github.com/Nuffle-Labs/nffl/contracts/bindings/SFFLRegistryRollup" + transparentproxy "github.com/Nuffle-Labs/nffl/contracts/bindings/TransparentUpgradeableProxy" + "github.com/Nuffle-Labs/nffl/core/chainio" + "github.com/Nuffle-Labs/nffl/core/config" + "github.com/Nuffle-Labs/nffl/core/types" + "github.com/Nuffle-Labs/nffl/operator" + optypes "github.com/Nuffle-Labs/nffl/operator/types" + "github.com/Nuffle-Labs/nffl/tests/integration/utils" +) + +const ( + TEST_DATA_DIR = "../../test_data" + BLS_KEYS_DIR = "../keys/bls" + ECDSA_KEYS_DIR = "../keys/ecdsa" +) + +func TestIntegration(t *testing.T) { + ctx, cancel := context.WithTimeout(context.Background(), 250*time.Second) + setup := setupTestEnv(t, ctx) + t.Cleanup(func() { + cancel() + + setup.cleanup() + }) + + time.Sleep(55 * time.Second) + + taskHash, err := setup.avsReader.AvsServiceBindings.TaskManager.AllCheckpointTaskHashes(&bind.CallOpts{}, 0) + if err != nil { + t.Fatalf("Cannot get task hash: %s", err.Error()) + } + if taskHash == [32]byte{} { + t.Fatalf("Task hash is empty") + } + + taskResponseHash, err := setup.avsReader.AvsServiceBindings.TaskManager.AllCheckpointTaskResponses(&bind.CallOpts{}, 0) + log.Printf("taskResponseHash: %v", taskResponseHash) + if err != nil { + t.Fatalf("Cannot get task response hash: %s", err.Error()) + } + if taskResponseHash == [32]byte{} { + t.Fatalf("Task response hash is empty") + } + + stateRootHeight, err := setup.rollupAnvils[1].HttpClient.BlockNumber(ctx) + if err != nil { + t.Fatalf("Cannot get current block height: %s", err.Error()) + } + + stateRootUpdate, err := getStateRootUpdateAggregation(setup.aggregatorRestUrl, uint32(setup.rollupAnvils[0].ChainID.Uint64()), stateRootHeight-1) + if err != nil { + t.Fatalf("Cannot get state root update: %s", err.Error()) + } + _, err = setup.registryRollups[1].UpdateStateRoot(setup.registryRollupAuths[1], registryrollup.StateRootUpdateMessage(stateRootUpdate.Message.ToBinding()), stateRootUpdate.Aggregation.ExtractBindingRollup()) + if err != nil { + t.Fatalf("Error updating state root: %s", err.Error()) + } + + newOperatorConfig, _, _ := genOperatorConfig(t, ctx, "4", setup.mainnetAnvil, setup.rollupAnvils, setup.rabbitMq) + newOperator := startOperator(t, ctx, newOperatorConfig) + + time.Sleep(60 * time.Second) + + // Check if operator set was updated on rollups + for _, registryRollup := range setup.registryRollups { + nextOperatorSetUpdateId, err := registryRollup.NextOperatorUpdateId(&bind.CallOpts{}) + if err != nil { + t.Fatalf("Error getting next operator set update ID: %s", err.Error()) + } + + if nextOperatorSetUpdateId != 2 { + t.Fatalf("Wrong next operator set update ID: expected %d, got %d", 2, nextOperatorSetUpdateId) + } + } + + stateRootHeight = uint64(16) + stateRootUpdate, err = getStateRootUpdateAggregation(setup.aggregatorRestUrl, uint32(setup.rollupAnvils[0].ChainID.Uint64()), stateRootHeight) + if err != nil { + t.Fatalf("Cannot get state root update: %s", err.Error()) + } + _, err = setup.registryRollups[1].UpdateStateRoot(setup.registryRollupAuths[1], registryrollup.StateRootUpdateMessage(stateRootUpdate.Message.ToBinding()), stateRootUpdate.Aggregation.ExtractBindingRollup()) + if err != nil { + t.Fatalf("Error updating state root: %s", err.Error()) + } + + operatorSetUpdateCount, err := setup.avsReader.AvsServiceBindings.OperatorSetUpdateRegistry.GetOperatorSetUpdateCount(&bind.CallOpts{}) + if err != nil { + t.Fatalf("Error getting operator set update count: %s", err.Error()) + } + if operatorSetUpdateCount != 2 { + t.Fatalf("Wrong operator set update count") + } + + stateRootHeight, err = setup.rollupAnvils[1].HttpClient.BlockNumber(ctx) + if err != nil { + t.Fatalf("Cannot get current block height: %s", err.Error()) + } + + stateRootUpdate, err = getStateRootUpdateAggregation(setup.aggregatorRestUrl, uint32(setup.rollupAnvils[0].ChainID.Uint64()), stateRootHeight-1) + if err != nil { + t.Fatalf("Cannot get state root update: %s", err.Error()) + } + + // Check if operator sets are same on rollups + _, err = setup.registryRollups[1].UpdateStateRoot(setup.registryRollupAuths[1], registryrollup.StateRootUpdateMessage(stateRootUpdate.Message.ToBinding()), stateRootUpdate.Aggregation.ExtractBindingRollup()) + if err != nil { + t.Fatalf("Error updating state root: %s", err.Error()) + } + + operatorSetUpdate, err := getOperatorSetUpdateAggregation(setup.aggregatorRestUrl, operatorSetUpdateCount-1) + if err != nil { + t.Fatalf("Error getting operator set update: %s", err.Error()) + } + + expectedUpdatedOperators := []types.RollupOperator{ + { + Pubkey: newOperator.BlsPubkeyG1(), + Weight: big.NewInt(1000), + }, + } + assert.Equal(t, expectedUpdatedOperators, operatorSetUpdate.Message.Operators) + + t.Log("Done") + <-ctx.Done() +} + +type testEnv struct { + mainnetAnvil *utils.AnvilInstance + rollupAnvils []*utils.AnvilInstance + rabbitMq *rabbitmq.RabbitMQContainer + indexerContainer testcontainers.Container + operator *operator.Operator + aggregator *aggregator.Aggregator + aggregatorRestUrl string + avsReader *chainio.AvsReader + registryRollups []*registryrollup.ContractSFFLRegistryRollup + registryRollupAuths []*bind.TransactOpts + cleanup func() +} + +func setupTestEnv(t *testing.T, ctx context.Context) *testEnv { + containersCtx, cancelContainersCtx := context.WithCancel(context.Background()) + + networkName := "nffl" + net, err := testcontainers.GenericNetwork(containersCtx, testcontainers.GenericNetworkRequest{ + NetworkRequest: testcontainers.NetworkRequest{ + Driver: "bridge", + Name: networkName, + CheckDuplicate: true, + Attachable: true, + }, + }) + if err != nil { + t.Fatalf("Cannot create network: %s", err.Error()) + } + + indexerContainerName := "indexer" + mainnetAnvilContainerName := "mainnet-anvil" + rollup0AnvilContainerName := "rollup0-anvil" + rollup1AnvilContainerName := "rollup1-anvil" + rmqContainerName := "rmq" + + mainnetAnvil := utils.StartAnvilTestContainer(t, containersCtx, mainnetAnvilContainerName, "8545", "1", true, networkName) + rollupAnvils := []*utils.AnvilInstance{ + utils.StartAnvilTestContainer(t, containersCtx, rollup0AnvilContainerName, "8546", "2", false, networkName), + utils.StartAnvilTestContainer(t, containersCtx, rollup1AnvilContainerName, "8547", "3", false, networkName), + } + rabbitMq := startRabbitMqContainer(t, containersCtx, rmqContainerName, networkName) + indexerContainer, relayers := startIndexer(t, containersCtx, indexerContainerName, rollupAnvils, rabbitMq, networkName) + + sfflDeploymentRaw := readSfflDeploymentRaw() + + configRaw := buildConfigRaw(mainnetAnvil, rollupAnvils) + logger, err := sdklogging.NewZapLogger(configRaw.Environment) + if err != nil { + t.Fatalf("Failed to create logger: %s", err.Error()) + } + + nodeConfig, _, _ := genOperatorConfig(t, ctx, "3", mainnetAnvil, rollupAnvils, rabbitMq) + + addresses, registryRollups, registryRollupAuths, _ := deployRegistryRollups(t, rollupAnvils) + operator := startOperator(t, ctx, nodeConfig) + + config := buildConfig(t, sfflDeploymentRaw, addresses, rollupAnvils, configRaw) + aggregator := startAggregator(t, ctx, config, logger) + + avsReader, err := chainio.BuildAvsReader(common.HexToAddress(sfflDeploymentRaw.Addresses.RegistryCoordinatorAddr), common.HexToAddress(sfflDeploymentRaw.Addresses.OperatorStateRetrieverAddr), mainnetAnvil.HttpClient, logger) + if err != nil { + t.Fatalf("Cannot create AVS Reader: %s", err.Error()) + } + + cleanup := func() { + if err := os.RemoveAll(TEST_DATA_DIR); err != nil { + t.Fatalf("Error cleaning test data dir: %s", err.Error()) + } + + time.Sleep(5 * time.Second) + + if err := mainnetAnvil.Container.Terminate(containersCtx); err != nil { + t.Fatalf("Error terminating container: %s", err.Error()) + } + for _, rollupAnvil := range rollupAnvils { + if err := rollupAnvil.Container.Terminate(containersCtx); err != nil { + t.Fatalf("Error terminating container: %s", err.Error()) + } + } + + if err := rabbitMq.Terminate(containersCtx); err != nil { + t.Fatalf("Error terminating container: %s", err.Error()) + } + if err := indexerContainer.Terminate(containersCtx); err != nil { + t.Fatalf("Error terminating container: %s", err.Error()) + } + for _, relayer := range relayers { + if err := relayer.Terminate(containersCtx); err != nil { + t.Fatalf("Error terminating container: %s", err.Error()) + } + } + + if err := net.Remove(containersCtx); err != nil { + t.Fatalf("Error removing network: %s", err.Error()) + } + + cancelContainersCtx() + } + + return &testEnv{ + mainnetAnvil: mainnetAnvil, + rollupAnvils: rollupAnvils, + rabbitMq: rabbitMq, + indexerContainer: indexerContainer, + operator: operator, + aggregator: aggregator, + aggregatorRestUrl: "http://" + config.AggregatorRestServerIpPortAddr, + avsReader: avsReader, + registryRollups: registryRollups, + registryRollupAuths: registryRollupAuths, + cleanup: cleanup, + } +} + +func startOperator(t *testing.T, ctx context.Context, nodeConfig optypes.NodeConfig) *operator.Operator { + operator, err := operator.NewOperatorFromConfig(nodeConfig) + if err != nil { + t.Fatalf("Failed to create operator: %s", err.Error()) + } + + go operator.Start(ctx) + + t.Log("Started operator. Sleeping 15 seconds to give it time to register...") + time.Sleep(15 * time.Second) + + return operator +} + +func startAggregator(t *testing.T, ctx context.Context, config *config.Config, logger sdklogging.Logger) *aggregator.Aggregator { + t.Log("starting aggregator for integration tests") + + var optRegistry *prometheus.Registry + if config.EnableMetrics { + optRegistry = prometheus.NewRegistry() + } + agg, err := aggregator.NewAggregator(ctx, config, nil, logger) + if err != nil { + t.Fatalf("Failed to create aggregator: %s", err.Error()) + } + + rpcServer := rpcserver.NewRpcServer(config.AggregatorServerIpPortAddr, agg, logger) + if optRegistry != nil { + err = rpcServer.EnableMetrics(optRegistry) + if err != nil { + t.Fatalf("Failed to create metrics for rpc server: %s", err.Error()) + } + } + go rpcServer.Start() + + restServer := restserver.NewRestServer(config.AggregatorRestServerIpPortAddr, agg, logger) + if optRegistry != nil { + err = restServer.EnableMetrics(optRegistry) + if err != nil { + t.Fatalf("Failed to create metrics for rest server: %s", err.Error()) + } + } + go restServer.Start() + + go agg.Start(ctx) + + t.Log("Started aggregator. Sleeping 20 seconds to give operator time to answer task 1...") + time.Sleep(20 * time.Second) + + return agg +} + +func startRabbitMqContainer(t *testing.T, ctx context.Context, name, networkName string) *rabbitmq.RabbitMQContainer { + rabbitMqC, err := rabbitmq.RunContainer( + ctx, + testcontainers.WithImage("rabbitmq:latest"), + func() testcontainers.CustomizeRequestOption { + return func(req *testcontainers.GenericContainerRequest) { + req.Name = name + req.Networks = []string{networkName} + } + }(), + ) + if err != nil { + t.Fatalf("Error starting RMQ container: %s", err.Error()) + } + + return rabbitMqC +} + +func readSfflDeploymentRaw() config.SFFLDeploymentRaw { + var sfflDeploymentRaw config.SFFLDeploymentRaw + sfflDeploymentFilePath := "../../contracts/evm/script/output/31337/sffl_avs_deployment_output.json" + sdkutils.ReadJsonConfig(sfflDeploymentFilePath, &sfflDeploymentRaw) + + return sfflDeploymentRaw +} + +func genOperatorConfig(t *testing.T, ctx context.Context, keyId string, mainnetAnvil *utils.AnvilInstance, rollupAnvils []*utils.AnvilInstance, rabbitMq *rabbitmq.RabbitMQContainer) (optypes.NodeConfig, *bls.KeyPair, *ecdsa.PrivateKey) { + nodeConfig := optypes.NodeConfig{} + nodeConfigFilePath := "../../config-files/operator.anvil.yaml" + err := sdkutils.ReadYamlConfig(nodeConfigFilePath, &nodeConfig) + if err != nil { + t.Fatalf("Failed to read yaml config: %s", err.Error()) + } + + log.Println("starting operator for integration tests") + + os.Setenv("OPERATOR_BLS_KEY_PASSWORD", "") + os.Setenv("OPERATOR_ECDSA_KEY_PASSWORD", "") + + nodeConfig.BlsPrivateKeyStorePath, err = filepath.Abs(filepath.Join(BLS_KEYS_DIR, keyId, "key.json")) + if err != nil { + t.Fatalf("Failed to get BLS key dir: %s", err.Error()) + } + passwordPath := filepath.Join(BLS_KEYS_DIR, keyId, "password.txt") + password, err := os.ReadFile(passwordPath) + if err != nil { + t.Fatalf("Failed to read BLS password: %s", err.Error()) + } + if string(password) != "" { + t.Fatalf("Password is not empty: '%s'", password) + } + keyPair, err := bls.ReadPrivateKeyFromFile(nodeConfig.BlsPrivateKeyStorePath, string(password)) + if err != nil { + t.Fatalf("Failed to generate operator BLS keys: %s", err.Error()) + } + + nodeConfig.EcdsaPrivateKeyStorePath, err = filepath.Abs(filepath.Join(ECDSA_KEYS_DIR, keyId, "key.json")) + if err != nil { + t.Fatalf("Failed to get ECDSA key dir: %s", err.Error()) + } + passwordPath = filepath.Join(ECDSA_KEYS_DIR, keyId, "password.txt") + password, err = os.ReadFile(passwordPath) + if err != nil { + t.Fatalf("Failed to read ECDSA password: %s", err.Error()) + } + if string(password) != "" { + t.Fatalf("Password is not empty: '%s'", password) + } + ecdsaKey, err := sdkEcdsa.ReadKey(nodeConfig.EcdsaPrivateKeyStorePath, string(password)) + if err != nil { + t.Fatalf("Failed to generate operator ECDSA keys: %s", err.Error()) + } + + address := crypto.PubkeyToAddress(ecdsaKey.PublicKey) + + t.Logf("Generated config for operator: %s", address.String()) + + nodeConfig.OperatorAddress = address.String() + nodeConfig.RegisterOperatorOnStartup = true + nodeConfig.EthRpcUrl = mainnetAnvil.HttpUrl + nodeConfig.EthWsUrl = mainnetAnvil.WsUrl + nodeConfig.RollupIdsToRpcUrls = make(map[uint32]string) + nodeConfig.NearDaIndexerRollupIds = make([]uint32, 0, len(rollupAnvils)) + for _, rollupAnvil := range rollupAnvils { + nodeConfig.RollupIdsToRpcUrls[uint32(rollupAnvil.ChainID.Uint64())] = rollupAnvil.WsUrl + nodeConfig.NearDaIndexerRollupIds = append(nodeConfig.NearDaIndexerRollupIds, uint32(rollupAnvil.ChainID.Uint64())) + } + nodeConfig.EnableNodeApi = false + nodeConfig.NodeApiIpPortAddress = "0.0.0.0:0" + if keyId == "4" { + // TODO: fix, Now impossible because of eigensdk + nodeConfig.EnableMetrics = false + nodeConfig.EigenMetricsIpPortAddress = "0.0.0.0:0" + } + + nodeConfig.NearDaIndexerRmqIpPortAddress, err = rabbitMq.AmqpURL(ctx) + if err != nil { + t.Fatalf("Error getting AMQP URL: %s", err.Error()) + } + + mainnetAnvil.SetBalance(address, big.NewInt(1e18)) + + return nodeConfig, keyPair, ecdsaKey +} + +func buildConfigRaw(mainnetAnvil *utils.AnvilInstance, rollupAnvils []*utils.AnvilInstance) config.ConfigRaw { + var configRaw config.ConfigRaw + aggConfigFilePath := "../../config-files/aggregator.yaml" + sdkutils.ReadYamlConfig(aggConfigFilePath, &configRaw) + configRaw.EthRpcUrl = mainnetAnvil.HttpUrl + configRaw.EthWsUrl = mainnetAnvil.WsUrl + configRaw.AggregatorDatabasePath = "" + + configRaw.RollupIdsToRpcUrls = map[uint32]string{} + for _, el := range rollupAnvils { + cleanedUrl := strings.TrimPrefix(el.HttpUrl, "http://") + configRaw.RollupIdsToRpcUrls[uint32(el.ChainID.Uint64())] = cleanedUrl + } + + return configRaw +} + +func buildConfig(t *testing.T, sfflDeploymentRaw config.SFFLDeploymentRaw, addresses []common.Address, rollupAnvils []*utils.AnvilInstance, aggConfigRaw config.ConfigRaw) *config.Config { + aggregatorEcdsaPrivateKeyString := "0x2a871d0798f97d79848a013d4936a73bf4cc922c825d33c1cf7073dff6d409c6" + if aggregatorEcdsaPrivateKeyString[:2] == "0x" { + aggregatorEcdsaPrivateKeyString = aggregatorEcdsaPrivateKeyString[2:] + } + aggregatorEcdsaPrivateKey, err := crypto.HexToECDSA(aggregatorEcdsaPrivateKeyString) + if err != nil { + t.Fatalf("Cannot parse ecdsa private key: %s", err.Error()) + } + aggregatorAddr, err := sdkutils.EcdsaPrivateKeyToAddress(aggregatorEcdsaPrivateKey) + if err != nil { + t.Fatalf("Cannot get operator address: %s", err.Error()) + } + + rollupsInfo := make(map[uint32]config.RollupInfo) + for i, addr := range addresses { + rollupsInfo[uint32(rollupAnvils[i].ChainID.Int64())] = config.RollupInfo{SFFLRegistryRollupAddr: addr, RpcUrl: rollupAnvils[i].WsUrl} + } + + return &config.Config{ + EcdsaPrivateKey: aggregatorEcdsaPrivateKey, + EthHttpRpcUrl: aggConfigRaw.EthRpcUrl, + EthWsRpcUrl: aggConfigRaw.EthWsUrl, + OperatorStateRetrieverAddr: common.HexToAddress(sfflDeploymentRaw.Addresses.OperatorStateRetrieverAddr), + SFFLRegistryCoordinatorAddr: common.HexToAddress(sfflDeploymentRaw.Addresses.RegistryCoordinatorAddr), + AggregatorServerIpPortAddr: aggConfigRaw.AggregatorServerIpPortAddr, + AggregatorRestServerIpPortAddr: aggConfigRaw.AggregatorRestServerIpPortAddr, + AggregatorDatabasePath: aggConfigRaw.AggregatorDatabasePath, + AggregatorCheckpointInterval: time.Duration(aggConfigRaw.AggregatorCheckpointInterval) * time.Millisecond, + RegisterOperatorOnStartup: aggConfigRaw.RegisterOperatorOnStartup, + AggregatorAddress: aggregatorAddr, + RollupsInfo: rollupsInfo, + EnableMetrics: false, + MetricsIpPortAddress: aggConfigRaw.MetricsIpPortAddress, + } +} + +func deployRegistryRollups(t *testing.T, anvils []*utils.AnvilInstance) ([]common.Address, []*registryrollup.ContractSFFLRegistryRollup, []*bind.TransactOpts, []*bind.TransactOpts) { + var registryRollups []*registryrollup.ContractSFFLRegistryRollup + var ownerAuths []*bind.TransactOpts + var proxyAdminAuths []*bind.TransactOpts + var addresses []common.Address + + for _, anvil := range anvils { + addr, registryRollup, ownerAuth, proxyAdminAuth := deployRegistryRollup(t, anvil) + + addresses = append(addresses, addr) + registryRollups = append(registryRollups, registryRollup) + ownerAuths = append(ownerAuths, ownerAuth) + proxyAdminAuths = append(proxyAdminAuths, proxyAdminAuth) + } + + return addresses, registryRollups, ownerAuths, proxyAdminAuths +} + +func deployRegistryRollup(t *testing.T, anvil *utils.AnvilInstance) (common.Address, *registryrollup.ContractSFFLRegistryRollup, *bind.TransactOpts, *bind.TransactOpts) { + t.Logf("Deploying RegistryRollup to chain %s", anvil.ChainID.String()) + + ownerPrivateKeyString := "ac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80" + ownerKeyPair, err := crypto.HexToECDSA(ownerPrivateKeyString) + if err != nil { + t.Fatalf("Error generating private key: %s", err.Error()) + } + ownerAddr := crypto.PubkeyToAddress(ownerKeyPair.PublicKey) + + aggregatorAddr := common.HexToAddress("0xa0Ee7A142d267C1f36714E4a8F75612F20a79720") + + ownerAuth, err := bind.NewKeyedTransactorWithChainID(ownerKeyPair, anvil.ChainID) + if err != nil { + t.Fatalf("Error generating transactor: %s", err.Error()) + } + + implAddr, _, _, err := registryrollup.DeployContractSFFLRegistryRollup(ownerAuth, anvil.WsClient) + if err != nil { + t.Fatalf("Error deploying RegistryRollup: %s", err.Error()) + } + + abi, err := registryrollup.ContractSFFLRegistryRollupMetaData.GetAbi() + if err != nil { + t.Fatalf("Error getting RegistryRollup ABI: %s", err.Error()) + } + + mockPauserRegistryAddr := common.HexToAddress("0x000000000000000000000000000000000000001") + + initCall, err := abi.Pack("initialize", big.NewInt(66), ownerAddr, aggregatorAddr, mockPauserRegistryAddr) + if err != nil { + t.Fatalf("Error encoding RegistryRollup initialize call: %s", err.Error()) + } + + // using a separate account as proxy admin since it cannot access the fallback + proxyAdminPrivateKeyString := "59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d" + proxyAdminKeyPair, err := crypto.HexToECDSA(proxyAdminPrivateKeyString) + if err != nil { + t.Fatalf("Error generating private key: %s", err.Error()) + } + proxyAdminAddr := crypto.PubkeyToAddress(proxyAdminKeyPair.PublicKey) + + proxyAdminAuth, err := bind.NewKeyedTransactorWithChainID(proxyAdminKeyPair, anvil.ChainID) + if err != nil { + t.Fatalf("Error generating transactor: %s", err.Error()) + } + + proxyAddr, _, _, err := transparentproxy.DeployContractTransparentUpgradeableProxy( + proxyAdminAuth, + anvil.WsClient, + implAddr, + proxyAdminAddr, + initCall, + ) + if err != nil { + t.Fatalf("Error deploying RegistryRollup proxy: %s", err.Error()) + } + + registry, err := registryrollup.NewContractSFFLRegistryRollup(proxyAddr, anvil.WsClient) + if err != nil { + t.Fatalf("Error creating RegistryRollup instance: %s", err.Error()) + } + + return proxyAddr, registry, ownerAuth, proxyAdminAuth +} + +func startIndexer(t *testing.T, ctx context.Context, name string, rollupAnvils []*utils.AnvilInstance, rabbitMq *rabbitmq.RabbitMQContainer, networkName string) (testcontainers.Container, []testcontainers.Container) { + rmqName, err := rabbitMq.Name(ctx) + if err != nil { + t.Fatalf("Error getting RabbitMQ container name: %s", err.Error()) + } + rmqName = strings.TrimPrefix(rmqName, "/") + + amqpUrl, err := rabbitMq.AmqpURL(ctx) + if err != nil { + t.Fatalf("Error getting RabbitMQ container URL: %s", err.Error()) + } + amqpUrl = strings.Split(amqpUrl, "@")[0] + "@" + rmqName + ":" + "5672" + + var rollupArgs []string + for _, rollupAnvil := range rollupAnvils { + rollupArgs = append(rollupArgs, "--da-contract-ids", utils.GetDaContractAccountId(rollupAnvil)) + } + for _, rollupAnvil := range rollupAnvils { + rollupArgs = append(rollupArgs, "--rollup-ids", rollupAnvil.ChainID.String()) + } + + req := testcontainers.ContainerRequest{ + Image: "nffl-fast-indexer", + Name: name, + Cmd: append([]string{"--rmq-address", amqpUrl}, rollupArgs...), + ExposedPorts: []string{"3030/tcp"}, + WaitingFor: wait.ForLog("Starting Streamer..."), + Networks: []string{networkName}, + } + + genericReq := testcontainers.GenericContainerRequest{ + ContainerRequest: req, + Started: true, + } + + indexerContainer, err := testcontainers.GenericContainer(ctx, genericReq) + + if err != nil { + t.Fatalf("Error starting indexer container: %s", err.Error()) + } + + relayers := setupNearDa(t, ctx, indexerContainer, rollupAnvils) + return indexerContainer, relayers +} + +func setupNearDa(t *testing.T, ctx context.Context, indexerContainer testcontainers.Container, rollupAnvils []*utils.AnvilInstance) []testcontainers.Container { + integrationDir, err := os.Getwd() + if err != nil { + panic(err) + } + + indexerUrl, err := indexerContainer.Endpoint(ctx, "http") + if err != nil { + t.Fatalf("Error getting indexer endpoint: %s", err.Error()) + } + + indexerContainerIp, err := indexerContainer.ContainerIP(ctx) + if err != nil { + t.Fatalf("Error getting indxer container IP: %s", err.Error()) + } + + hostNearCfgPath := getNearCliConfigPath(t) + hostNearKeyPath := filepath.Join(hostNearCfgPath, "validator_key.json") + containerNearCfgPath := "/root/.near" + + time.Sleep(5 * time.Second) + + copyFileFromContainer(ctx, indexerContainer, filepath.Join(containerNearCfgPath, "validator_key.json"), hostNearKeyPath, 0770) + + var relayers []testcontainers.Container + nearCliEnv := []string{"NEAR_ENV=" + utils.NearNetworkId, "NEAR_CLI_LOCALNET_NETWORK_ID=" + utils.NearNetworkId, "NEAR_HELPER_ACCOUNT=near", "NEAR_CLI_LOCALNET_KEY_PATH=" + hostNearKeyPath, "NEAR_NODE_URL=" + indexerUrl} + for _, rollupAnvil := range rollupAnvils { + accountId := utils.GetDaContractAccountId(rollupAnvil) + + err := execCommand(t, "near", + []string{"create-account", accountId, "--masterAccount", "test.near"}, + append(os.Environ(), nearCliEnv...), + true, + ) + if err != nil { + t.Fatalf("Error creating NEAR DA account: %s", err.Error()) + } + + relayer, err := utils.StartRelayer(t, ctx, accountId, indexerContainerIp, rollupAnvil) + if err != nil { + t.Fatalf("Error creating realayer: #%s", err.Error()) + } + relayers = append(relayers, relayer) + + err = execCommand(t, "near", + []string{"deploy", accountId, filepath.Join(integrationDir, "../near/near_da_blob_store.wasm"), "--initFunction", "new", "--initArgs", "{}", "--masterAccount", "test.near"}, + append(os.Environ(), nearCliEnv...), + true, + ) + if err != nil { + t.Fatalf("Error deploying NEAR DA contract: %s", err.Error()) + } + } + + return relayers +} + +func execCommand(t *testing.T, name string, arg, env []string, shouldLog bool) error { + cmd := exec.Command(name, arg...) + cmd.Env = env + out, err := cmd.CombinedOutput() + if shouldLog { + t.Log(string(out)) + } + return err +} + +func getStateRootUpdateAggregation(addr string, rollupID uint32, blockHeight uint64) (*aggtypes.GetStateRootUpdateAggregationResponse, error) { + url := fmt.Sprintf("%s/aggregation/state-root-update?rollupId=%d&blockHeight=%d", addr, rollupID, blockHeight) + + resp, err := http.Get(url) + if err != nil { + return nil, err + } + defer resp.Body.Close() + + if resp.StatusCode != http.StatusOK { + bodyBytes, errRead := ioutil.ReadAll(resp.Body) + if errRead != nil { + return nil, fmt.Errorf("failed to read response body for error: %v", errRead) + } + + return nil, fmt.Errorf("error: %s, message: %s", resp.Status, string(bodyBytes)) + } + + var response aggtypes.GetStateRootUpdateAggregationResponse + if err := json.NewDecoder(resp.Body).Decode(&response); err != nil { + return nil, err + } + + return &response, nil +} + +func getOperatorSetUpdateAggregation(addr string, id uint64) (*aggtypes.GetOperatorSetUpdateAggregationResponse, error) { + url := fmt.Sprintf("%s/aggregation/operator-set-update?id=%d", addr, id) + + resp, err := http.Get(url) + if err != nil { + return nil, err + } + defer resp.Body.Close() + + if resp.StatusCode != http.StatusOK { + body, errRead := ioutil.ReadAll(resp.Body) + if errRead != nil { + return nil, fmt.Errorf("error: %s, message: %s", resp.Status, string(body)) + } + + return nil, fmt.Errorf("error: %s", resp.Status) + } + + var response aggtypes.GetOperatorSetUpdateAggregationResponse + err = json.NewDecoder(resp.Body).Decode(&response) + if err != nil { + return nil, err + } + + return &response, err +} + +func copyFileFromContainer(ctx context.Context, container testcontainers.Container, sourcePath, destinationPath string, destinationPermissions fs.FileMode) error { + reader, err := container.CopyFileFromContainer(ctx, sourcePath) + if err != nil { + return err + } + defer reader.Close() + + err = os.MkdirAll(filepath.Dir(destinationPath), destinationPermissions) + if err != nil { + return err + } + + file, err := os.Create(destinationPath) + if err != nil { + return err + } + defer file.Close() + + _, err = io.Copy(file, reader) + if err != nil { + return err + } + + return nil +} + +func getNearCliConfigPath(t *testing.T) string { + path, err := filepath.Abs(filepath.Join(TEST_DATA_DIR, "sffl_test_localnet")) + if err != nil { + t.Fatalf("Error getting near-cli config path: %s", err.Error()) + } + return path +} From 73a6faa67fc0d4023d2289b2b208118723d1296a Mon Sep 17 00:00:00 2001 From: Sasha Syrotenko Date: Tue, 26 Nov 2024 19:54:15 +0200 Subject: [PATCH 25/40] Tweak the code --- Makefile | 4 +- docker-compose-fastnear.yml | 2 +- indexer/Dockerfile | 4 +- indexer/FastIndexer.dockerfile | 4 +- indexer/src/main.rs | 42 ++++++++++--------- ...tion_fastnear_test.go => fastnear_test.go} | 4 +- 6 files changed, 30 insertions(+), 30 deletions(-) rename tests/integration/{integration_fastnear_test.go => fastnear_test.go} (99%) diff --git a/Makefile b/Makefile index ff96da79..76dcc012 100644 --- a/Makefile +++ b/Makefile @@ -142,8 +142,8 @@ near-da-rpc-sys: tests-integration: ## runs all integration tests go test ./tests/integration/integration_test.go -v -count=1 go test ./tests/integration/registration_test.go -v -race -count=1 -test-integration-fastnear: ## runs all integration tests - go test ./tests/integration/integration_fastnear_test.go -v -count=1 +test-integration-fastnear: ## runs fastnear integration test + go test ./tests/integration/fastnear_test.go -v -count=1 ## runs slither for solidity files ## You can install Slither by following the guide at https://github.com/crytic/slither/tree/master?tab=readme-ov-file#how-to-install diff --git a/docker-compose-fastnear.yml b/docker-compose-fastnear.yml index c0a27dea..89c2cb32 100644 --- a/docker-compose-fastnear.yml +++ b/docker-compose-fastnear.yml @@ -186,7 +186,7 @@ services: - nffl near-da-deploy: - image: node:18 + image: node:16 container_name: nffl-near-da-deploy depends_on: indexer: diff --git a/indexer/Dockerfile b/indexer/Dockerfile index d02c5960..bc28c511 100644 --- a/indexer/Dockerfile +++ b/indexer/Dockerfile @@ -21,7 +21,7 @@ COPY ./indexer/Cargo.toml . RUN mkdir ./src && echo "fn main() {}" > ./src/main.rs # Hacky approach to cache dependencies -# RUN cargo build ${COMPILATION_MODE} -p indexer +RUN cargo build ${COMPILATION_MODE} -p indexer COPY ./indexer . RUN touch ./src/main.rs @@ -32,8 +32,6 @@ FROM debian:bookworm-slim as runtime WORKDIR /indexer-app ARG TARGET="release" -RUN echo ${TARGET} - RUN apt update && apt install -yy openssl ca-certificates jq curl COPY --from=builder /tmp/indexer/target/${TARGET}/indexer . diff --git a/indexer/FastIndexer.dockerfile b/indexer/FastIndexer.dockerfile index 77c3509c..0a23f12a 100644 --- a/indexer/FastIndexer.dockerfile +++ b/indexer/FastIndexer.dockerfile @@ -39,7 +39,7 @@ RUN chmod +x ./entrypoint.sh EXPOSE 3030 -HEALTHCHECK --interval=5m --timeout=10s \ - CMD (nc -z -v localhost 3030 || exit 1) +HEALTHCHECK \ + CMD (nc -z -v 0.0.0.0 3030 || exit 1) ENTRYPOINT [ "./entrypoint.sh" ] diff --git a/indexer/src/main.rs b/indexer/src/main.rs index 22e4aead..3cd170c3 100644 --- a/indexer/src/main.rs +++ b/indexer/src/main.rs @@ -35,14 +35,24 @@ fn run(home_dir: std::path::PathBuf, config: RunConfigArgs) -> Result<()> { } else { None }; - - // TODO[sasha/firat]: refactor and tests. - let block_res = system.block_on(async move { - let validated_stream: Receiver; - if cfg!(feature = "use_fastnear") { + + let mut rmq_publisher = RmqPublisher::new(&config.rmq_address)?; + if config.metrics_ip_port_address.is_some() { + rmq_publisher.enable_metrics(registry.clone())?; + } + + let block_res: Result<(), Error>; + if cfg!(feature = "use_fastnear") { + block_res = system.block_on(async move { let fastnear_indexer = FastNearIndexer::new(addresses_to_rollup_ids); - validated_stream = fastnear_indexer.run(); - } else { + let validated_stream = fastnear_indexer.run(); + + rmq_publisher.run(validated_stream); + + Ok::<_, Error>(()) + }); + } else { + block_res = system.block_on(async move { let indexer_config = near_indexer::IndexerConfig { home_dir, sync_mode: near_indexer::SyncModeEnum::LatestSynced, @@ -62,20 +72,12 @@ fn run(home_dir: std::path::PathBuf, config: RunConfigArgs) -> Result<()> { candidates_validator.enable_metrics(registry.clone())?; } - validated_stream = candidates_validator.run(candidates_stream); + let validated_stream = candidates_validator.run(candidates_stream); + rmq_publisher.run(validated_stream); - // TODO: Handle block_handle whether cancelled or panics - block_handle.await?; - } - - let mut rmq_publisher = RmqPublisher::new(&config.rmq_address)?; - if config.metrics_ip_port_address.is_some() { - rmq_publisher.enable_metrics(registry.clone())?; - } - rmq_publisher.run(validated_stream); - - Ok::<_, Error>(()) - }); + Ok::<_, Error>(block_handle.await?) + }); + } if let Some(handle) = server_handle { handle.abort(); diff --git a/tests/integration/integration_fastnear_test.go b/tests/integration/fastnear_test.go similarity index 99% rename from tests/integration/integration_fastnear_test.go rename to tests/integration/fastnear_test.go index 40ca385d..be8d3ce5 100644 --- a/tests/integration/integration_fastnear_test.go +++ b/tests/integration/fastnear_test.go @@ -1,4 +1,4 @@ -package integration_fastnear +package integration import ( "context" @@ -597,7 +597,7 @@ func startIndexer(t *testing.T, ctx context.Context, name string, rollupAnvils [ Name: name, Cmd: append([]string{"--rmq-address", amqpUrl}, rollupArgs...), ExposedPorts: []string{"3030/tcp"}, - WaitingFor: wait.ForLog("Starting Streamer..."), + WaitingFor: wait.ForLog("Starting block stream"), Networks: []string{networkName}, } From 62e7a992071140eff75e0fd3e5b8fbe3a44c9580 Mon Sep 17 00:00:00 2001 From: Sasha Syrotenko Date: Tue, 26 Nov 2024 22:11:20 +0200 Subject: [PATCH 26/40] Revert code changes --- indexer/src/main.rs | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/indexer/src/main.rs b/indexer/src/main.rs index 3cd170c3..22e4aead 100644 --- a/indexer/src/main.rs +++ b/indexer/src/main.rs @@ -35,24 +35,14 @@ fn run(home_dir: std::path::PathBuf, config: RunConfigArgs) -> Result<()> { } else { None }; - - let mut rmq_publisher = RmqPublisher::new(&config.rmq_address)?; - if config.metrics_ip_port_address.is_some() { - rmq_publisher.enable_metrics(registry.clone())?; - } - - let block_res: Result<(), Error>; - if cfg!(feature = "use_fastnear") { - block_res = system.block_on(async move { + + // TODO[sasha/firat]: refactor and tests. + let block_res = system.block_on(async move { + let validated_stream: Receiver; + if cfg!(feature = "use_fastnear") { let fastnear_indexer = FastNearIndexer::new(addresses_to_rollup_ids); - let validated_stream = fastnear_indexer.run(); - - rmq_publisher.run(validated_stream); - - Ok::<_, Error>(()) - }); - } else { - block_res = system.block_on(async move { + validated_stream = fastnear_indexer.run(); + } else { let indexer_config = near_indexer::IndexerConfig { home_dir, sync_mode: near_indexer::SyncModeEnum::LatestSynced, @@ -72,12 +62,20 @@ fn run(home_dir: std::path::PathBuf, config: RunConfigArgs) -> Result<()> { candidates_validator.enable_metrics(registry.clone())?; } - let validated_stream = candidates_validator.run(candidates_stream); - rmq_publisher.run(validated_stream); + validated_stream = candidates_validator.run(candidates_stream); - Ok::<_, Error>(block_handle.await?) - }); - } + // TODO: Handle block_handle whether cancelled or panics + block_handle.await?; + } + + let mut rmq_publisher = RmqPublisher::new(&config.rmq_address)?; + if config.metrics_ip_port_address.is_some() { + rmq_publisher.enable_metrics(registry.clone())?; + } + rmq_publisher.run(validated_stream); + + Ok::<_, Error>(()) + }); if let Some(handle) = server_handle { handle.abort(); From fc0d6cda92208d9adb920c0213a16b93ea097058 Mon Sep 17 00:00:00 2001 From: Sasha Syrotenko Date: Tue, 26 Nov 2024 22:36:02 +0200 Subject: [PATCH 27/40] Try to revert? --- indexer/src/main.rs | 65 +++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 38 deletions(-) diff --git a/indexer/src/main.rs b/indexer/src/main.rs index 22e4aead..c92cd794 100644 --- a/indexer/src/main.rs +++ b/indexer/src/main.rs @@ -2,14 +2,11 @@ use clap::Parser; use configs::{Opts, SubCommand}; use prometheus::Registry; use tracing::{error, info}; -use tokio::sync::mpsc::Receiver; -use crate::rmq_publisher::PublishData; use crate::{ candidates_validator::CandidatesValidator, configs::RunConfigArgs, errors::Error, errors::Result, indexer_wrapper::IndexerWrapper, metrics::Metricable, metrics_server::MetricsServer, rmq_publisher::RmqPublisher, }; -use crate::fastnear_indexer::FastNearIndexer; use crate::metrics::INDEXER_NAMESPACE; mod block_listener; @@ -21,12 +18,12 @@ mod metrics; mod metrics_server; mod rmq_publisher; mod types; -mod fastnear_indexer; const INDEXER: &str = "indexer"; fn run(home_dir: std::path::PathBuf, config: RunConfigArgs) -> Result<()> { let addresses_to_rollup_ids = config.compile_addresses_to_ids_map()?; + let system = actix::System::new(); let registry = Registry::new(); let server_handle = if let Some(metrics_addr) = config.metrics_ip_port_address { @@ -35,46 +32,36 @@ fn run(home_dir: std::path::PathBuf, config: RunConfigArgs) -> Result<()> { } else { None }; - - // TODO[sasha/firat]: refactor and tests. + + // TODO: refactor let block_res = system.block_on(async move { - let validated_stream: Receiver; - if cfg!(feature = "use_fastnear") { - let fastnear_indexer = FastNearIndexer::new(addresses_to_rollup_ids); - validated_stream = fastnear_indexer.run(); - } else { - let indexer_config = near_indexer::IndexerConfig { - home_dir, - sync_mode: near_indexer::SyncModeEnum::LatestSynced, - await_for_node_synced: near_indexer::AwaitForNodeSyncedEnum::WaitForFullSync, - validate_genesis: true, - }; - - let mut indexer = IndexerWrapper::new(indexer_config, addresses_to_rollup_ids); - if config.metrics_ip_port_address.is_some() { - indexer.enable_metrics(registry.clone())?; - } - - let (view_client, _) = indexer.client_actors(); - let (block_handle, candidates_stream) = indexer.run(); - let mut candidates_validator = CandidatesValidator::new(view_client); - if config.metrics_ip_port_address.is_some() { - candidates_validator.enable_metrics(registry.clone())?; - } - - validated_stream = candidates_validator.run(candidates_stream); - - // TODO: Handle block_handle whether cancelled or panics - block_handle.await?; + let indexer_config = near_indexer::IndexerConfig { + home_dir, + sync_mode: near_indexer::SyncModeEnum::LatestSynced, + await_for_node_synced: near_indexer::AwaitForNodeSyncedEnum::WaitForFullSync, + validate_genesis: true, + }; + + let mut indexer = IndexerWrapper::new(indexer_config, addresses_to_rollup_ids); + if let Some(_) = config.metrics_ip_port_address { + indexer.enable_metrics(registry.clone())?; + } + + let (view_client, _) = indexer.client_actors(); + let (block_handle, candidates_stream) = indexer.run(); + let mut candidates_validator = CandidatesValidator::new(view_client); + if config.metrics_ip_port_address.is_some() { + candidates_validator.enable_metrics(registry.clone())?; } + let validated_stream = candidates_validator.run(candidates_stream); let mut rmq_publisher = RmqPublisher::new(&config.rmq_address)?; if config.metrics_ip_port_address.is_some() { rmq_publisher.enable_metrics(registry.clone())?; } rmq_publisher.run(validated_stream); - Ok::<_, Error>(()) + Ok::<_, Error>(block_handle.await?) }); if let Some(handle) = server_handle { @@ -97,8 +84,10 @@ fn read_config( if let Some(config_path) = config_path { let config_str = std::fs::read_to_string(config_path)?; serde_yaml::from_str(&config_str).map_err(Into::into) + } else if let Some(config_args) = config_args { + Ok(config_args) } else { - config_args.ok_or_else(|| Error::AnyhowError(anyhow::anyhow!("Either config_path or config_args must be provided"))) + panic!("Either config_path or config_args must be provided") } } @@ -111,12 +100,12 @@ fn main() -> Result<()> { let env_filter = near_o11y::tracing_subscriber::EnvFilter::new( "nearcore=info,publisher=info,indexer=info,candidates_validator=info,\ metrics=info,tokio_reactor=info,near=info,stats=info,telemetry=info,\ - near-performance-metrics=info,fastnear_indexer=info", + near-performance-metrics=info", ); let _subscriber = near_o11y::default_subscriber(env_filter, &Default::default()).global(); let opts: Opts = Opts::parse(); - let home_dir = opts.home_dir.unwrap_or_else(near_indexer::get_default_home); + let home_dir = opts.home_dir.unwrap_or(near_indexer::get_default_home()); match opts.subcmd { SubCommand::Init(params) => { near_indexer::indexer_init_configs(&home_dir, read_config(params.config, params.args)?.into())?; From 50ba61b2babcd7d5ff26a2555ff1a77840ea9a6a Mon Sep 17 00:00:00 2001 From: Sasha Syrotenko Date: Wed, 27 Nov 2024 11:01:16 +0200 Subject: [PATCH 28/40] Merge --- .github/workflows/compose-fastnear-test.yml | 6 +++--- Makefile | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/compose-fastnear-test.yml b/.github/workflows/compose-fastnear-test.yml index 9fd5f82e..e68e6dd4 100644 --- a/.github/workflows/compose-fastnear-test.yml +++ b/.github/workflows/compose-fastnear-test.yml @@ -1,4 +1,4 @@ -name: Docker Compose Test With FastNear Indexer +name: Docker Compose Fastnear Liveness Test on: push: @@ -68,7 +68,7 @@ jobs: cache-to: type=gha,mode=max,scope=operator - name: Build and start Docker Compose services - run: docker-compose -f ./docker-compose-fastnear.yml up --build -d + run: docker-compose -f ./docker-compose.yml up --build -d - name: Wait for a couple of minutes run: sleep 240 @@ -130,4 +130,4 @@ jobs: done - name: Tear down Docker Compose services - run: docker-compose -f ./docker-compose-fastnear.yml down + run: docker-compose down \ No newline at end of file diff --git a/Makefile b/Makefile index 76dcc012..d74ed84c 100644 --- a/Makefile +++ b/Makefile @@ -66,7 +66,7 @@ docker-build-plugin: docker build -t nffl-operator-plugin -f ./plugin/cmd/Dockerfile . docker-build-images: docker-build-indexer docker-build-relayer docker-build-aggregator docker-build-operator docker-build-plugin ## builds and publishes indexer, operator and aggregator docker images docker-start-everything: docker-build-images ## starts aggregator and operator docker containers - docker compose up + docker compose -f ./docker-compose.yml up __CLI__: ## From 2a795e74944edafd50313bf15126c3e83e4c9a2e Mon Sep 17 00:00:00 2001 From: Sasha Syrotenko Date: Wed, 27 Nov 2024 14:17:09 +0200 Subject: [PATCH 29/40] WIP --- indexer/Cargo.toml | 13 +++--- indexer/Dockerfile | 2 +- indexer/FastIndexer.dockerfile | 2 +- indexer/src/main.rs | 72 +++++++++++++++++++--------------- 4 files changed, 49 insertions(+), 40 deletions(-) diff --git a/indexer/Cargo.toml b/indexer/Cargo.toml index 6d9b5d7b..de3cb4af 100644 --- a/indexer/Cargo.toml +++ b/indexer/Cargo.toml @@ -8,6 +8,7 @@ edition = "2021" [dependencies] actix = "0.13.1" actix-web = "4.5.1" +async-std = { version = "1", features = ["attributes", "tokio1"] } futures = "0.3.5" tokio = { version = "1", features = ["sync", "time"] } deadpool = "0.10.0" @@ -26,18 +27,18 @@ tracing = { version = "0.1.40", features = ["std"] } thiserror = "1.0.69" anyhow = "1.0.79" -near-indexer = { git = "https://github.com/near/nearcore", rev = "93073d762ff377382ebf54e7cbff448b492e72c6" } -near-client = { git = "https://github.com/near/nearcore", rev = "93073d762ff377382ebf54e7cbff448b492e72c6" } -near-o11y = { git = "https://github.com/near/nearcore", rev = "93073d762ff377382ebf54e7cbff448b492e72c6" } -near-config-utils = { git = "https://github.com/near/nearcore", rev = "93073d762ff377382ebf54e7cbff448b492e72c6" } -near-client-primitives = { git = "https://github.com/near/nearcore", rev = "93073d762ff377382ebf54e7cbff448b492e72c6" } +near-indexer = { git = "https://github.com/near/nearcore", rev = "a83c18490cf4dafaedca01458f365dc5871bd293" } +near-client = { git = "https://github.com/near/nearcore", rev = "a83c18490cf4dafaedca01458f365dc5871bd293" } +near-o11y = { git = "https://github.com/near/nearcore", rev = "a83c18490cf4dafaedca01458f365dc5871bd293" } +near-config-utils = { git = "https://github.com/near/nearcore", rev = "a83c18490cf4dafaedca01458f365dc5871bd293" } +near-client-primitives = { git = "https://github.com/near/nearcore", rev = "a83c18490cf4dafaedca01458f365dc5871bd293" } borsh = { version = "1.0.0", features = ["derive", "rc"] } serde_yaml = "0.9.34" #reqwest = {workspace = true} reqwest = { version = "0.12.9", features = ["json"] } [dev-dependencies] -near-crypto = { git = "https://github.com/near/nearcore", rev = "93073d762ff377382ebf54e7cbff448b492e72c6" } +near-crypto = { git = "https://github.com/near/nearcore", rev = "a83c18490cf4dafaedca01458f365dc5871bd293" } [features] use_fastnear = [] diff --git a/indexer/Dockerfile b/indexer/Dockerfile index bc28c511..f16cb361 100644 --- a/indexer/Dockerfile +++ b/indexer/Dockerfile @@ -1,4 +1,4 @@ -FROM rust:1.81 AS builder +FROM rust:1.82 AS builder WORKDIR /tmp/indexer ARG TARGET="release" diff --git a/indexer/FastIndexer.dockerfile b/indexer/FastIndexer.dockerfile index 0a23f12a..9aa52148 100644 --- a/indexer/FastIndexer.dockerfile +++ b/indexer/FastIndexer.dockerfile @@ -1,4 +1,4 @@ -FROM rust:1.81 AS builder +FROM rust:1.82 AS builder WORKDIR /tmp/indexer ARG COMPILATION_MODE="--release" diff --git a/indexer/src/main.rs b/indexer/src/main.rs index c92cd794..93b50ef0 100644 --- a/indexer/src/main.rs +++ b/indexer/src/main.rs @@ -1,5 +1,6 @@ use clap::Parser; use configs::{Opts, SubCommand}; +use fastnear_indexer::FastNearIndexer; use prometheus::Registry; use tracing::{error, info}; @@ -18,6 +19,7 @@ mod metrics; mod metrics_server; mod rmq_publisher; mod types; +mod fastnear_indexer; const INDEXER: &str = "indexer"; @@ -33,35 +35,43 @@ fn run(home_dir: std::path::PathBuf, config: RunConfigArgs) -> Result<()> { None }; - // TODO: refactor - let block_res = system.block_on(async move { - let indexer_config = near_indexer::IndexerConfig { - home_dir, - sync_mode: near_indexer::SyncModeEnum::LatestSynced, - await_for_node_synced: near_indexer::AwaitForNodeSyncedEnum::WaitForFullSync, - validate_genesis: true, - }; - - let mut indexer = IndexerWrapper::new(indexer_config, addresses_to_rollup_ids); - if let Some(_) = config.metrics_ip_port_address { - indexer.enable_metrics(registry.clone())?; - } - - let (view_client, _) = indexer.client_actors(); - let (block_handle, candidates_stream) = indexer.run(); - let mut candidates_validator = CandidatesValidator::new(view_client); - if config.metrics_ip_port_address.is_some() { - candidates_validator.enable_metrics(registry.clone())?; - } + let mut rmq_publisher = RmqPublisher::new(&config.rmq_address)?; + if config.metrics_ip_port_address.is_some() { + rmq_publisher.enable_metrics(registry.clone())?; + } - let validated_stream = candidates_validator.run(candidates_stream); - let mut rmq_publisher = RmqPublisher::new(&config.rmq_address)?; - if config.metrics_ip_port_address.is_some() { - rmq_publisher.enable_metrics(registry.clone())?; + let block_res = system.block_on(async move { + if cfg!(feature = "use_fastnear") { + let mut fastnear_indexer = FastNearIndexer::new(addresses_to_rollup_ids); + if config.metrics_ip_port_address.is_some() { + fastnear_indexer.enable_metrics(registry.clone())?; + } + rmq_publisher.run(fastnear_indexer.run()); + + Ok::<_, Error>(()) + } else { + let indexer_config = near_indexer::IndexerConfig { + home_dir, + sync_mode: near_indexer::SyncModeEnum::LatestSynced, + await_for_node_synced: near_indexer::AwaitForNodeSyncedEnum::WaitForFullSync, + validate_genesis: true, + }; + + let mut indexer = IndexerWrapper::new(indexer_config, addresses_to_rollup_ids); + if config.metrics_ip_port_address.is_some() { + indexer.enable_metrics(registry.clone())?; + } + + let (view_client, _) = indexer.client_actors(); + let (block_handle, candidates_stream) = indexer.run(); + let mut candidates_validator = CandidatesValidator::new(view_client); + if config.metrics_ip_port_address.is_some() { + candidates_validator.enable_metrics(registry.clone())?; + } + + rmq_publisher.run(candidates_validator.run(candidates_stream)); + Ok::<_, Error>(block_handle.await?) } - rmq_publisher.run(validated_stream); - - Ok::<_, Error>(block_handle.await?) }); if let Some(handle) = server_handle { @@ -84,10 +94,8 @@ fn read_config( if let Some(config_path) = config_path { let config_str = std::fs::read_to_string(config_path)?; serde_yaml::from_str(&config_str).map_err(Into::into) - } else if let Some(config_args) = config_args { - Ok(config_args) } else { - panic!("Either config_path or config_args must be provided") + config_args.ok_or_else(|| Error::AnyhowError(anyhow::anyhow!("Either config_path or config_args must be provided"))) } } @@ -100,12 +108,12 @@ fn main() -> Result<()> { let env_filter = near_o11y::tracing_subscriber::EnvFilter::new( "nearcore=info,publisher=info,indexer=info,candidates_validator=info,\ metrics=info,tokio_reactor=info,near=info,stats=info,telemetry=info,\ - near-performance-metrics=info", + near-performance-metrics=info,fastnear_indexer=info", ); let _subscriber = near_o11y::default_subscriber(env_filter, &Default::default()).global(); let opts: Opts = Opts::parse(); - let home_dir = opts.home_dir.unwrap_or(near_indexer::get_default_home()); + let home_dir = opts.home_dir.unwrap_or_else(near_indexer::get_default_home); match opts.subcmd { SubCommand::Init(params) => { near_indexer::indexer_init_configs(&home_dir, read_config(params.config, params.args)?.into())?; From 53c94df04e2fb0b6f10e0110c66ee1226e3b91d7 Mon Sep 17 00:00:00 2001 From: Sasha Syrotenko Date: Wed, 27 Nov 2024 15:38:26 +0200 Subject: [PATCH 30/40] Try to test on CI --- Cargo.lock | 371 +++++++++++++++++++++++++++----------------- Makefile | 5 +- indexer/src/main.rs | 28 ++-- 3 files changed, 245 insertions(+), 159 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 13d05748..efa00259 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -427,9 +427,9 @@ dependencies = [ [[package]] name = "alloy-core" -version = "0.8.12" +version = "0.8.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8316d83e590f4163b221b8180008f302bda5cf5451202855cdd323e588849c" +checksum = "e8d22df68fa7d9744be0b1a9be3260e9aa089fbf41903ab182328333061ed186" dependencies = [ "alloy-dyn-abi", "alloy-json-abi", @@ -440,9 +440,9 @@ dependencies = [ [[package]] name = "alloy-dyn-abi" -version = "0.8.12" +version = "0.8.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef2364c782a245cf8725ea6dbfca5f530162702b5d685992ea03ce64529136cc" +checksum = "1cf633ae9a1f0c82fdb9e559ed2be1c8e415c3e48fc47e1feaf32c6078ec0cdd" dependencies = [ "alloy-json-abi", "alloy-primitives", @@ -510,9 +510,9 @@ dependencies = [ [[package]] name = "alloy-json-abi" -version = "0.8.12" +version = "0.8.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b84c506bf264110fa7e90d9924f742f40ef53c6572ea56a0b0bd714a567ed389" +checksum = "1a500037938085feed8a20dbfc8fce58c599db68c948cfae711147175dee392c" dependencies = [ "alloy-primitives", "alloy-sol-type-parser", @@ -587,9 +587,9 @@ dependencies = [ [[package]] name = "alloy-primitives" -version = "0.8.12" +version = "0.8.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fce5dbd6a4f118eecc4719eaa9c7ffc31c315e6c5ccde3642db927802312425" +checksum = "3aeeb5825c2fc8c2662167058347cd0cafc3cb15bcb5cdb1758a63c2dca0409e" dependencies = [ "alloy-rlp", "bytes", @@ -893,9 +893,9 @@ dependencies = [ [[package]] name = "alloy-sol-macro" -version = "0.8.12" +version = "0.8.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9343289b4a7461ed8bab8618504c995c049c082b70c7332efd7b32125633dc05" +checksum = "5c0279d09463a4695788a3622fd95443625f7be307422deba4b55dd491a9c7a1" dependencies = [ "alloy-sol-macro-expander", "alloy-sol-macro-input", @@ -907,9 +907,9 @@ dependencies = [ [[package]] name = "alloy-sol-macro-expander" -version = "0.8.12" +version = "0.8.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4222d70bec485ceccc5d8fd4f2909edd65b5d5e43d4aca0b5dcee65d519ae98f" +checksum = "4feea540fc8233df2ad1156efd744b2075372f43a8f942a68b3b19c8a00e2c12" dependencies = [ "alloy-json-abi", "alloy-sol-macro-input", @@ -926,9 +926,9 @@ dependencies = [ [[package]] name = "alloy-sol-macro-input" -version = "0.8.12" +version = "0.8.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e17f2677369571b976e51ea1430eb41c3690d344fef567b840bfc0b01b6f83a" +checksum = "2a0ad281f3d1b613af814b66977ee698e443d4644a1510962d0241f26e0e53ae" dependencies = [ "alloy-json-abi", "const-hex", @@ -943,9 +943,9 @@ dependencies = [ [[package]] name = "alloy-sol-type-parser" -version = "0.8.12" +version = "0.8.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa64d80ae58ffaafdff9d5d84f58d03775f66c84433916dc9a64ed16af5755da" +checksum = "96eff16c797438add6c37bb335839d015b186c5421ee5626f5559a7bfeb38ef5" dependencies = [ "serde", "winnow", @@ -953,9 +953,9 @@ dependencies = [ [[package]] name = "alloy-sol-types" -version = "0.8.12" +version = "0.8.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6520d427d4a8eb7aa803d852d7a52ceb0c519e784c292f64bb339e636918cf27" +checksum = "cff34e0682d6665da243a3e81da96f07a2dd50f7e64073e382b1a141f5a2a2f6" dependencies = [ "alloy-json-abi", "alloy-primitives", @@ -1365,6 +1365,27 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" +[[package]] +name = "async-attributes" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3203e79f4dd9bdda415ed03cf14dae5a2bf775c683a00f94e9cd1faf0f596e5" +dependencies = [ + "quote", + "syn 1.0.109", +] + +[[package]] +name = "async-channel" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" +dependencies = [ + "concurrent-queue", + "event-listener 2.5.3", + "futures-core", +] + [[package]] name = "async-channel" version = "2.3.1" @@ -1409,13 +1430,14 @@ version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c" dependencies = [ - "async-channel", + "async-channel 2.3.1", "async-executor", "async-io 2.4.0", "async-lock 3.4.0", "blocking", "futures-lite 2.5.0", "once_cell", + "tokio", ] [[package]] @@ -1500,6 +1522,33 @@ dependencies = [ "reactor-trait", ] +[[package]] +name = "async-std" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c634475f29802fde2b8f0b505b1bd00dfe4df7d4a000f0b36f7671197d5c3615" +dependencies = [ + "async-attributes", + "async-channel 1.9.0", + "async-global-executor", + "async-io 2.4.0", + "async-lock 3.4.0", + "crossbeam-utils", + "futures-channel", + "futures-core", + "futures-io", + "futures-lite 2.5.0", + "gloo-timers", + "kv-log-macro", + "log", + "memchr", + "once_cell", + "pin-project-lite", + "pin-utils", + "slab", + "wasm-bindgen-futures", +] + [[package]] name = "async-stream" version = "0.3.6" @@ -2106,9 +2155,9 @@ dependencies = [ [[package]] name = "blake3" -version = "1.5.4" +version = "1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d82033247fd8e890df8f740e407ad4d038debb9eb1f40533fffb32e7d17dc6f7" +checksum = "b8ee0c1824c4dea5b5f81736aff91bae041d2c07ee1192bec91054e10e3e601e" dependencies = [ "arrayref", "arrayvec", @@ -2151,7 +2200,7 @@ version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" dependencies = [ - "async-channel", + "async-channel 2.3.1", "async-task", "futures-io", "futures-lite 2.5.0", @@ -4109,6 +4158,18 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" +[[package]] +name = "gloo-timers" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994" +dependencies = [ + "futures-channel", + "futures-core", + "js-sys", + "wasm-bindgen", +] + [[package]] name = "group" version = "0.13.0" @@ -4751,6 +4812,7 @@ dependencies = [ "actix", "actix-web", "anyhow", + "async-std", "borsh 1.5.3", "clap", "deadpool", @@ -4997,6 +5059,15 @@ dependencies = [ "sha3-asm", ] +[[package]] +name = "kv-log-macro" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f" +dependencies = [ + "log", +] + [[package]] name = "language-tags" version = "0.3.2" @@ -5048,9 +5119,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.165" +version = "0.2.166" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb4d3d38eab6c5239a362fa8bae48c03baf980a6e7079f063942d563ef3533e" +checksum = "c2ccc108bbc0b1331bd061864e7cd823c0cab660bbe6970e66e2c0614decde36" [[package]] name = "libloading" @@ -5178,6 +5249,9 @@ name = "log" version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +dependencies = [ + "value-bag", +] [[package]] name = "lru" @@ -5448,8 +5522,8 @@ dependencies = [ [[package]] name = "near-async" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "actix", "derive_more 0.99.18", @@ -5468,8 +5542,8 @@ dependencies = [ [[package]] name = "near-async-derive" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "proc-macro2", "quote", @@ -5478,16 +5552,16 @@ dependencies = [ [[package]] name = "near-cache" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "lru 0.12.5", ] [[package]] name = "near-chain" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "actix", "assert_matches", @@ -5500,6 +5574,7 @@ dependencies = [ "itertools 0.10.5", "itoa", "lru 0.12.5", + "more-asserts", "near-async", "near-cache", "near-chain-configs", @@ -5527,16 +5602,16 @@ dependencies = [ "serde", "strum 0.24.1", "tempfile", - "thiserror 1.0.69", + "thiserror 2.0.3", "time", + "tokio", "tracing", - "yansi", ] [[package]] name = "near-chain-configs" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "anyhow", "bytesize", @@ -5559,21 +5634,21 @@ dependencies = [ [[package]] name = "near-chain-primitives" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "near-crypto", "near-primitives", "near-time", - "thiserror 1.0.69", + "thiserror 2.0.3", "time", "tracing", ] [[package]] name = "near-chunks" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "actix", "borsh 1.5.3", @@ -5604,8 +5679,8 @@ dependencies = [ [[package]] name = "near-chunks-primitives" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "near-chain-primitives", "near-primitives", @@ -5613,8 +5688,8 @@ dependencies = [ [[package]] name = "near-client" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "actix", "actix-rt", @@ -5662,17 +5737,19 @@ dependencies = [ "strum 0.24.1", "sysinfo", "tempfile", - "thiserror 1.0.69", + "thiserror 2.0.3", "time", "tokio", + "tokio-stream", + "tokio-util", "tracing", "yansi", ] [[package]] name = "near-client-primitives" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "actix", "chrono", @@ -5685,27 +5762,26 @@ dependencies = [ "serde", "serde_json", "strum 0.24.1", - "thiserror 1.0.69", + "thiserror 2.0.3", "time", "tracing", - "yansi", ] [[package]] name = "near-config-utils" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "anyhow", "json_comments", - "thiserror 1.0.69", + "thiserror 2.0.3", "tracing", ] [[package]] name = "near-crypto" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "blake2", "borsh 1.5.3", @@ -5724,13 +5800,13 @@ dependencies = [ "serde", "serde_json", "subtle", - "thiserror 1.0.69", + "thiserror 2.0.3", ] [[package]] name = "near-dyn-configs" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "anyhow", "near-chain-configs", @@ -5741,15 +5817,15 @@ dependencies = [ "prometheus", "serde", "serde_json", - "thiserror 1.0.69", + "thiserror 2.0.3", "tokio", "tracing", ] [[package]] name = "near-epoch-manager" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "borsh 1.5.3", "itertools 0.10.5", @@ -5774,16 +5850,16 @@ dependencies = [ [[package]] name = "near-fmt" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "near-primitives-core", ] [[package]] name = "near-indexer" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "actix", "anyhow", @@ -5809,8 +5885,8 @@ dependencies = [ [[package]] name = "near-indexer-primitives" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "near-primitives", "serde", @@ -5819,8 +5895,8 @@ dependencies = [ [[package]] name = "near-jsonrpc" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "actix", "actix-cors", @@ -5849,8 +5925,8 @@ dependencies = [ [[package]] name = "near-jsonrpc-client" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "actix-http", "awc", @@ -5863,8 +5939,8 @@ dependencies = [ [[package]] name = "near-jsonrpc-primitives" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "arbitrary", "near-chain-configs", @@ -5874,14 +5950,14 @@ dependencies = [ "near-schema-checker-lib", "serde", "serde_json", - "thiserror 1.0.69", + "thiserror 2.0.3", "time", ] [[package]] name = "near-mainnet-res" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "near-account-id", "near-chain-configs", @@ -5891,8 +5967,8 @@ dependencies = [ [[package]] name = "near-network" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "actix", "anyhow", @@ -5933,7 +6009,7 @@ dependencies = [ "smart-default", "strum 0.24.1", "stun", - "thiserror 1.0.69", + "thiserror 2.0.3", "time", "tokio", "tokio-stream", @@ -5943,8 +6019,8 @@ dependencies = [ [[package]] name = "near-o11y" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "actix", "base64 0.21.7", @@ -5958,7 +6034,7 @@ dependencies = [ "prometheus", "serde", "serde_json", - "thiserror 1.0.69", + "thiserror 2.0.3", "tokio", "tracing", "tracing-appender", @@ -5968,8 +6044,8 @@ dependencies = [ [[package]] name = "near-parameters" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "borsh 1.5.3", "enum-map", @@ -5981,13 +6057,13 @@ dependencies = [ "serde_repr", "serde_yaml", "strum 0.24.1", - "thiserror 1.0.69", + "thiserror 2.0.3", ] [[package]] name = "near-performance-metrics" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "actix", "bitflags 1.3.2", @@ -6001,8 +6077,8 @@ dependencies = [ [[package]] name = "near-performance-metrics-macros" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "quote", "syn 2.0.89", @@ -6010,8 +6086,8 @@ dependencies = [ [[package]] name = "near-pool" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "borsh 1.5.3", "near-crypto", @@ -6022,8 +6098,8 @@ dependencies = [ [[package]] name = "near-primitives" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "arbitrary", "base64 0.21.7", @@ -6057,15 +6133,15 @@ dependencies = [ "sha3", "smart-default", "strum 0.24.1", - "thiserror 1.0.69", + "thiserror 2.0.3", "tracing", "zstd", ] [[package]] name = "near-primitives-core" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "arbitrary", "base64 0.21.7", @@ -6079,13 +6155,13 @@ dependencies = [ "serde", "serde_repr", "sha2", - "thiserror 1.0.69", + "thiserror 2.0.3", ] [[package]] name = "near-rosetta-rpc" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "actix", "actix-cors", @@ -6109,19 +6185,19 @@ dependencies = [ "serde", "serde_json", "strum 0.24.1", - "thiserror 1.0.69", + "thiserror 2.0.3", "tokio", ] [[package]] name = "near-schema-checker-core" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" [[package]] name = "near-schema-checker-lib" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "near-schema-checker-core", "near-schema-checker-macro", @@ -6129,18 +6205,18 @@ dependencies = [ [[package]] name = "near-schema-checker-macro" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" [[package]] name = "near-stdx" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" [[package]] name = "near-store" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "actix", "actix-rt", @@ -6176,15 +6252,15 @@ dependencies = [ "smallvec", "strum 0.24.1", "tempfile", - "thiserror 1.0.69", + "thiserror 2.0.3", "tokio", "tracing", ] [[package]] name = "near-telemetry" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "actix", "awc", @@ -6202,8 +6278,8 @@ dependencies = [ [[package]] name = "near-time" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "serde", "time", @@ -6212,8 +6288,8 @@ dependencies = [ [[package]] name = "near-vm-compiler" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "enumset", "finite-wasm", @@ -6221,15 +6297,15 @@ dependencies = [ "near-vm-vm", "rkyv", "target-lexicon 0.12.16", - "thiserror 1.0.69", + "thiserror 2.0.3", "tracing", "wasmparser 0.99.0", ] [[package]] name = "near-vm-compiler-singlepass" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "dynasm 2.0.0", "dynasmrt 2.0.0", @@ -6248,8 +6324,8 @@ dependencies = [ [[package]] name = "near-vm-engine" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "backtrace", "cfg-if 1.0.0", @@ -6264,14 +6340,14 @@ dependencies = [ "rustc-demangle", "rustix 0.38.41", "target-lexicon 0.12.16", - "thiserror 1.0.69", + "thiserror 2.0.3", "tracing", ] [[package]] name = "near-vm-runner" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "anyhow", "blst", @@ -6308,7 +6384,7 @@ dependencies = [ "sha3", "strum 0.24.1", "tempfile", - "thiserror 1.0.69", + "thiserror 2.0.3", "tracing", "wasm-encoder 0.27.0", "wasmer-compiler-near", @@ -6326,19 +6402,19 @@ dependencies = [ [[package]] name = "near-vm-types" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "indexmap 1.9.3", "num-traits", "rkyv", - "thiserror 1.0.69", + "thiserror 2.0.3", ] [[package]] name = "near-vm-vm" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "backtrace", "cc", @@ -6351,15 +6427,15 @@ dependencies = [ "near-vm-types", "region", "rkyv", - "thiserror 1.0.69", + "thiserror 2.0.3", "tracing", "winapi", ] [[package]] name = "near-wallet-contract" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "anyhow", "near-primitives-core", @@ -6368,8 +6444,8 @@ dependencies = [ [[package]] name = "nearcore" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "actix", "actix-rt", @@ -6387,6 +6463,7 @@ dependencies = [ "hyper 0.14.31", "hyper-tls 0.5.0", "indicatif", + "itertools 0.10.5", "near-async", "near-chain", "near-chain-configs", @@ -6424,7 +6501,7 @@ dependencies = [ "smart-default", "strum 0.24.1", "tempfile", - "thiserror 1.0.69", + "thiserror 2.0.3", "tokio", "tracing", "xz2", @@ -6470,8 +6547,8 @@ dependencies = [ [[package]] name = "node-runtime" -version = "2.3.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "borsh 1.5.3", "near-crypto", @@ -6488,7 +6565,7 @@ dependencies = [ "rayon", "serde_json", "sha2", - "thiserror 1.0.69", + "thiserror 2.0.3", "tracing", ] @@ -9225,9 +9302,9 @@ dependencies = [ [[package]] name = "syn-solidity" -version = "0.8.12" +version = "0.8.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f76fe0a3e1476bdaa0775b9aec5b869ed9520c2b2fedfe9c6df3618f8ea6290b" +checksum = "6bdaa7b9e815582ba343a20c66627437cf45f1c6fba7f69772cbfd1358c7e197" dependencies = [ "paste", "proc-macro2", @@ -9894,9 +9971,9 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.27" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ "proc-macro2", "quote", @@ -10127,6 +10204,12 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" +[[package]] +name = "value-bag" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ef4c4aa54d5d05a279399bfa921ec387b7aba77caf7a682ae8d86785b8fdad2" + [[package]] name = "vcpkg" version = "0.2.15" diff --git a/Makefile b/Makefile index d74ed84c..41e6d602 100644 --- a/Makefile +++ b/Makefile @@ -65,7 +65,8 @@ docker-build-operator: docker-build-plugin: docker build -t nffl-operator-plugin -f ./plugin/cmd/Dockerfile . docker-build-images: docker-build-indexer docker-build-relayer docker-build-aggregator docker-build-operator docker-build-plugin ## builds and publishes indexer, operator and aggregator docker images -docker-start-everything: docker-build-images ## starts aggregator and operator docker containers +docker-fast-build-images: docker-fast-build-indexer docker-build-relayer docker-build-aggregator docker-build-operator docker-build-plugin ## builds and publishes indexer, operator and aggregator docker images +docker-start-everything: docker-fast-build-images ## starts aggregator and operator docker containers docker compose -f ./docker-compose.yml up __CLI__: ## @@ -141,7 +142,7 @@ near-da-rpc-sys: # TODO: Currently we cannot use the race detector with `integration_test.go` tests-integration: ## runs all integration tests go test ./tests/integration/integration_test.go -v -count=1 - go test ./tests/integration/registration_test.go -v -race -count=1 + #go test ./tests/integration/registration_test.go -v -race -count=1 test-integration-fastnear: ## runs fastnear integration test go test ./tests/integration/fastnear_test.go -v -count=1 diff --git a/indexer/src/main.rs b/indexer/src/main.rs index 93b50ef0..bcebcc6e 100644 --- a/indexer/src/main.rs +++ b/indexer/src/main.rs @@ -1,6 +1,5 @@ use clap::Parser; use configs::{Opts, SubCommand}; -use fastnear_indexer::FastNearIndexer; use prometheus::Registry; use tracing::{error, info}; @@ -8,6 +7,7 @@ use crate::{ candidates_validator::CandidatesValidator, configs::RunConfigArgs, errors::Error, errors::Result, indexer_wrapper::IndexerWrapper, metrics::Metricable, metrics_server::MetricsServer, rmq_publisher::RmqPublisher, }; +use crate::fastnear_indexer::FastNearIndexer; use crate::metrics::INDEXER_NAMESPACE; mod block_listener; @@ -25,7 +25,6 @@ const INDEXER: &str = "indexer"; fn run(home_dir: std::path::PathBuf, config: RunConfigArgs) -> Result<()> { let addresses_to_rollup_ids = config.compile_addresses_to_ids_map()?; - let system = actix::System::new(); let registry = Registry::new(); let server_handle = if let Some(metrics_addr) = config.metrics_ip_port_address { @@ -35,18 +34,17 @@ fn run(home_dir: std::path::PathBuf, config: RunConfigArgs) -> Result<()> { None }; - let mut rmq_publisher = RmqPublisher::new(&config.rmq_address)?; - if config.metrics_ip_port_address.is_some() { - rmq_publisher.enable_metrics(registry.clone())?; - } - let block_res = system.block_on(async move { + let mut rmq_publisher = RmqPublisher::new(&config.rmq_address)?; + if config.metrics_ip_port_address.is_some() { + rmq_publisher.enable_metrics(registry.clone())?; + } + if cfg!(feature = "use_fastnear") { - let mut fastnear_indexer = FastNearIndexer::new(addresses_to_rollup_ids); - if config.metrics_ip_port_address.is_some() { - fastnear_indexer.enable_metrics(registry.clone())?; - } - rmq_publisher.run(fastnear_indexer.run()); + let fastnear_indexer = FastNearIndexer::new(addresses_to_rollup_ids); + let validated_stream = fastnear_indexer.run(); + + rmq_publisher.run(validated_stream); Ok::<_, Error>(()) } else { @@ -69,7 +67,11 @@ fn run(home_dir: std::path::PathBuf, config: RunConfigArgs) -> Result<()> { candidates_validator.enable_metrics(registry.clone())?; } - rmq_publisher.run(candidates_validator.run(candidates_stream)); + let validated_stream = candidates_validator.run(candidates_stream); + + rmq_publisher.run(validated_stream); + + // TODO: Handle block_handle whether cancelled or panics Ok::<_, Error>(block_handle.await?) } }); From 2fa94e816b263db088b82627e06b65af59c937e9 Mon Sep 17 00:00:00 2001 From: Sasha Syrotenko Date: Wed, 27 Nov 2024 16:10:10 +0200 Subject: [PATCH 31/40] Fix fastnear docker compose --- .github/workflows/compose-fastnear-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/compose-fastnear-test.yml b/.github/workflows/compose-fastnear-test.yml index e68e6dd4..b33c8473 100644 --- a/.github/workflows/compose-fastnear-test.yml +++ b/.github/workflows/compose-fastnear-test.yml @@ -68,10 +68,10 @@ jobs: cache-to: type=gha,mode=max,scope=operator - name: Build and start Docker Compose services - run: docker-compose -f ./docker-compose.yml up --build -d + run: docker-compose -f ./docker-compose-fastnear.yml up --build -d - name: Wait for a couple of minutes - run: sleep 240 + run: sleep 200 - name: List running containers run: | From dd9b90ce5ed3864c0981df8456de50081db424c6 Mon Sep 17 00:00:00 2001 From: Sasha Syrotenko Date: Wed, 27 Nov 2024 19:03:13 +0200 Subject: [PATCH 32/40] Fix fastnear docker compose-2 --- .github/workflows/compose-fastnear-test.yml | 4 +-- docker-compose-fastnear.yml | 36 +++------------------ indexer/FastIndexer.dockerfile | 4 +-- 3 files changed, 8 insertions(+), 36 deletions(-) diff --git a/.github/workflows/compose-fastnear-test.yml b/.github/workflows/compose-fastnear-test.yml index b33c8473..86067608 100644 --- a/.github/workflows/compose-fastnear-test.yml +++ b/.github/workflows/compose-fastnear-test.yml @@ -70,8 +70,8 @@ jobs: - name: Build and start Docker Compose services run: docker-compose -f ./docker-compose-fastnear.yml up --build -d - - name: Wait for a couple of minutes - run: sleep 200 + - name: Wait for a minute + run: sleep 60 - name: List running containers run: | diff --git a/docker-compose-fastnear.yml b/docker-compose-fastnear.yml index 89c2cb32..f55bcf65 100644 --- a/docker-compose-fastnear.yml +++ b/docker-compose-fastnear.yml @@ -81,8 +81,8 @@ services: depends_on: rollup0-anvil: condition: service_healthy - near-da-deploy: - condition: service_completed_successfully + indexer: + condition: service_started expose: - 9091 volumes: @@ -125,8 +125,8 @@ services: depends_on: rollup1-anvil: condition: service_healthy - near-da-deploy: - condition: service_completed_successfully + indexer: + condition: service_started expose: - 9091 volumes: @@ -185,34 +185,6 @@ services: networks: - nffl - near-da-deploy: - image: node:16 - container_name: nffl-near-da-deploy - depends_on: - indexer: - condition: service_healthy - volumes: - - ./:/nffl/ - - near_cli_data:/near-cli - - near_cli_keys:/root/.near-credentials - entrypoint: sh - command: - - -c - - | - npm i -g near-cli@3.0.0 - near create-account da2.test.near --masterAccount test.near - near deploy da2.test.near /nffl/tests/near/near_da_blob_store.wasm --initFunction new --initArgs {} --masterAccount test.near -f - near create-account da3.test.near --masterAccount test.near - near deploy da3.test.near /nffl/tests/near/near_da_blob_store.wasm --initFunction new --initArgs {} --masterAccount test.near -f - environment: - - NEAR_ENV=localnet - - NEAR_CLI_LOCALNET_NETWORK_ID=localnet - - NEAR_HELPER_ACCOUNT=near - - NEAR_CLI_LOCALNET_KEY_PATH=/near-cli/validator_key.json - - NEAR_NODE_URL=http://nffl-indexer:3030 - networks: - - nffl - aggregator: image: nffl-aggregator container_name: nffl-aggregator diff --git a/indexer/FastIndexer.dockerfile b/indexer/FastIndexer.dockerfile index 9aa52148..c0eb0e54 100644 --- a/indexer/FastIndexer.dockerfile +++ b/indexer/FastIndexer.dockerfile @@ -39,7 +39,7 @@ RUN chmod +x ./entrypoint.sh EXPOSE 3030 -HEALTHCHECK \ - CMD (nc -z -v 0.0.0.0 3030 || exit 1) +#HEALTHCHECK --interval=30s --timeout=30s --retries=10 \ +# CMD (curl http://localhost:3030/status || exit 1) ENTRYPOINT [ "./entrypoint.sh" ] From 59af8d113914b3374051285f0231c4294c2f77f5 Mon Sep 17 00:00:00 2001 From: Sasha Syrotenko Date: Thu, 28 Nov 2024 15:55:28 +0200 Subject: [PATCH 33/40] Self-review, AI review comments and temporarily remove CI & IT test --- .github/workflows/compose-fastnear-test.yml | 133 ---- Cargo.lock | 84 +-- Makefile | 4 +- docker-compose-fastnear.yml | 339 --------- docker-compose.yml | 2 + indexer/Cargo.toml | 1 - indexer/FastIndexer.dockerfile | 5 - tests/integration/fastnear_test.go | 771 -------------------- 8 files changed, 6 insertions(+), 1333 deletions(-) delete mode 100644 .github/workflows/compose-fastnear-test.yml delete mode 100644 docker-compose-fastnear.yml delete mode 100644 tests/integration/fastnear_test.go diff --git a/.github/workflows/compose-fastnear-test.yml b/.github/workflows/compose-fastnear-test.yml deleted file mode 100644 index 86067608..00000000 --- a/.github/workflows/compose-fastnear-test.yml +++ /dev/null @@ -1,133 +0,0 @@ -name: Docker Compose Fastnear Liveness Test - -on: - push: - branches: - - main - pull_request: - paths: - - 'indexer/**' # Temporarily util it becomes prime way to obtain NEAR DA blocks. - -jobs: - run-docker-compose-with-fastnear: - runs-on: ubuntu-latest - - steps: - - name: Checkout code - uses: actions/checkout@v3 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: Set up Docker Compose - run: | - sudo apt-get update - sudo apt-get install docker-compose -y - - - name: Build fastnear indexer container - uses: docker/build-push-action@v5 - with: - load: true - context: . - file: ./indexer/FastIndexer.dockerfile - tags: nffl-fast-indexer - cache-from: type=gha,scope=indexer - cache-to: type=gha,mode=max,scope=indexer - build-args: | - - TARGET="debug" - - COMPILATION_MODE="" - - - name: Build relayer container - uses: docker/build-push-action@v5 - with: - load: true - context: . - file: ./relayer/cmd/Dockerfile - tags: nffl-test-relayer - cache-from: type=gha,scope=relayer - cache-to: type=gha,mode=max,scope=relayer - - - name: Build aggregator container - uses: docker/build-push-action@v5 - with: - load: true - context: . - file: ./aggregator/cmd/Dockerfile - tags: nffl-aggregator - cache-from: type=gha,scope=aggregator - cache-to: type=gha,mode=max,scope=aggregator - - - name: Build operator container - uses: docker/build-push-action@v5 - with: - load: true - context: . - file: ./operator/cmd/Dockerfile - tags: nffl-operator - cache-from: type=gha,scope=operator - cache-to: type=gha,mode=max,scope=operator - - - name: Build and start Docker Compose services - run: docker-compose -f ./docker-compose-fastnear.yml up --build -d - - - name: Wait for a minute - run: sleep 60 - - - name: List running containers - run: | - echo "Running containers:" - docker ps --format "{{.Names}}" - - - name: Ensure containers are running - run: | - containers=( - "nffl_operator1-health_1" - "nffl-operator1" - "nffl_operator0-health_1" - "nffl-operator0" - "rollup1-relayer" - "rollup0-relayer" - "nffl-indexer" - "nffl-aggregator" - "nffl_aggregator-health_1" - "mainnet-anvil" - "prometheus" - "rollup0-anvil" - "rmq" - "rollup1-anvil" - "grafana" - ) # List of container names - for container in "${containers[@]}"; do - if docker inspect -f '{{.State.Running}}' "$container" >/dev/null 2>&1; then - echo "$container is running" - else - echo "$container is not running" - exit 1 - fi - done - - - - name: Check health status - run: | - services=( - "nffl_operator1-health_1" - "nffl_operator0-health_1" - "nffl_aggregator-health_1" - "rollup1-anvil" - "rollup0-anvil" - "mainnet-anvil" - "rmq" - ) # List of services names - for service in "${services[@]}"; do - status=$(docker inspect -f '{{.State.Health.Status}}' $service) - if [ "$status" != "healthy" ]; then - echo "Service $service is not healthy" - docker-compose -f ./docker-compose-fastnear.yml logs $service - exit 1 - else - echo "Service $service is healthy" - fi - done - - - name: Tear down Docker Compose services - run: docker-compose down \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index efa00259..d7dd90f4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1365,27 +1365,6 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" -[[package]] -name = "async-attributes" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3203e79f4dd9bdda415ed03cf14dae5a2bf775c683a00f94e9cd1faf0f596e5" -dependencies = [ - "quote", - "syn 1.0.109", -] - -[[package]] -name = "async-channel" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" -dependencies = [ - "concurrent-queue", - "event-listener 2.5.3", - "futures-core", -] - [[package]] name = "async-channel" version = "2.3.1" @@ -1430,14 +1409,13 @@ version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c" dependencies = [ - "async-channel 2.3.1", + "async-channel", "async-executor", "async-io 2.4.0", "async-lock 3.4.0", "blocking", "futures-lite 2.5.0", "once_cell", - "tokio", ] [[package]] @@ -1522,33 +1500,6 @@ dependencies = [ "reactor-trait", ] -[[package]] -name = "async-std" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c634475f29802fde2b8f0b505b1bd00dfe4df7d4a000f0b36f7671197d5c3615" -dependencies = [ - "async-attributes", - "async-channel 1.9.0", - "async-global-executor", - "async-io 2.4.0", - "async-lock 3.4.0", - "crossbeam-utils", - "futures-channel", - "futures-core", - "futures-io", - "futures-lite 2.5.0", - "gloo-timers", - "kv-log-macro", - "log", - "memchr", - "once_cell", - "pin-project-lite", - "pin-utils", - "slab", - "wasm-bindgen-futures", -] - [[package]] name = "async-stream" version = "0.3.6" @@ -2200,7 +2151,7 @@ version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" dependencies = [ - "async-channel 2.3.1", + "async-channel", "async-task", "futures-io", "futures-lite 2.5.0", @@ -4158,18 +4109,6 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" -[[package]] -name = "gloo-timers" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994" -dependencies = [ - "futures-channel", - "futures-core", - "js-sys", - "wasm-bindgen", -] - [[package]] name = "group" version = "0.13.0" @@ -4812,7 +4751,6 @@ dependencies = [ "actix", "actix-web", "anyhow", - "async-std", "borsh 1.5.3", "clap", "deadpool", @@ -5059,15 +4997,6 @@ dependencies = [ "sha3-asm", ] -[[package]] -name = "kv-log-macro" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f" -dependencies = [ - "log", -] - [[package]] name = "language-tags" version = "0.3.2" @@ -5249,9 +5178,6 @@ name = "log" version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" -dependencies = [ - "value-bag", -] [[package]] name = "lru" @@ -10204,12 +10130,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" -[[package]] -name = "value-bag" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ef4c4aa54d5d05a279399bfa921ec387b7aba77caf7a682ae8d86785b8fdad2" - [[package]] name = "vcpkg" version = "0.2.15" diff --git a/Makefile b/Makefile index 41e6d602..3270d4ee 100644 --- a/Makefile +++ b/Makefile @@ -143,8 +143,8 @@ near-da-rpc-sys: tests-integration: ## runs all integration tests go test ./tests/integration/integration_test.go -v -count=1 #go test ./tests/integration/registration_test.go -v -race -count=1 -test-integration-fastnear: ## runs fastnear integration test - go test ./tests/integration/fastnear_test.go -v -count=1 +#test-integration-fastnear: ## runs fastnear integration test +# go test ./tests/integration/fastnear_test.go -v -count=1 ## runs slither for solidity files ## You can install Slither by following the guide at https://github.com/crytic/slither/tree/master?tab=readme-ov-file#how-to-install diff --git a/docker-compose-fastnear.yml b/docker-compose-fastnear.yml deleted file mode 100644 index f55bcf65..00000000 --- a/docker-compose-fastnear.yml +++ /dev/null @@ -1,339 +0,0 @@ -version: "3" - -networks: - nffl: - name: nffl - driver: bridge - -services: - rmq: - image: rabbitmq:3-management-alpine - container_name: rmq - user: rabbitmq - ports: - - "5672:5672" - - "15672:15672" - environment: - - RABBITMQ_DEFAULT_USER=guest - - RABBITMQ_DEFAULT_PASS=guest - healthcheck: - test: rabbitmq-diagnostics check_port_connectivity - interval: 1s - timeout: 3s - retries: 30 - networks: - - nffl - - mainnet-anvil: - image: ghcr.io/foundry-rs/foundry:latest@sha256:8b843eb65cc7b155303b316f65d27173c862b37719dc095ef3a2ef27ce8d3c00 - container_name: mainnet-anvil - ports: - - "8545:8545" - entrypoint: anvil - volumes: - - ./tests/anvil/data/avs-and-eigenlayer-deployed-anvil-state.json:/root/.anvil/state.json - command: --host 0.0.0.0 --port 8545 --chain-id 1 --block-time 5 --load-state /root/.anvil/state.json - healthcheck: - test: ["CMD", "nc", "-zv", "0.0.0.0", "8545"] - interval: 15s - timeout: 10s - retries: 5 - networks: - - nffl - - mainnet-anvil-setup: - image: ghcr.io/foundry-rs/foundry:latest@sha256:8b843eb65cc7b155303b316f65d27173c862b37719dc095ef3a2ef27ce8d3c00 - container_name: mainnet-anvil-setup - depends_on: - mainnet-anvil: - condition: service_healthy - entrypoint: sh - command: - - -c - - | - cast rpc anvil_setBalance 0xD5A0359da7B310917d7760385516B2426E86ab7f 0x8ac7230489e80000 - cast rpc anvil_setBalance 0x9441540E8183d416f2Dc1901AB2034600f17B65a 0x8ac7230489e80000 - environment: - - ETH_RPC_URL=http://mainnet-anvil:8545 - networks: - - nffl - - rollup0-anvil: - image: ghcr.io/foundry-rs/foundry:latest@sha256:8b843eb65cc7b155303b316f65d27173c862b37719dc095ef3a2ef27ce8d3c00 - container_name: rollup0-anvil - ports: - - "8546:8546" - entrypoint: anvil - volumes: - - ./tests/anvil/data/rollup-avs-deployed-anvil-state.json:/root/.anvil/state.json - command: --host 0.0.0.0 --port 8546 --chain-id 2 --block-time 5 --load-state /root/.anvil/state.json - healthcheck: - test: ["CMD", "nc", "-zv", "0.0.0.0", "8546"] - interval: 15s - timeout: 10s - retries: 5 - networks: - - nffl - - rollup0-relayer: - image: nffl-test-relayer:latest - container_name: rollup0-relayer - depends_on: - rollup0-anvil: - condition: service_healthy - indexer: - condition: service_started - expose: - - 9091 - volumes: - - near_cli_keys:/root/.near-credentials - command: - - run-args - - --rpc-url - - ws://rollup0-anvil:8546 - - --da-account-id - - da2.test.near - - --key-path - - /root/.near-credentials/localnet/da2.test.near.json - - --network - - http://nffl-indexer:3030 - - --metrics-ip-port-address - - rollup0-relayer:9091 - networks: - - nffl - - rollup1-anvil: - image: ghcr.io/foundry-rs/foundry:latest@sha256:8b843eb65cc7b155303b316f65d27173c862b37719dc095ef3a2ef27ce8d3c00 - container_name: rollup1-anvil - ports: - - "8547:8547" - entrypoint: anvil - volumes: - - ./tests/anvil/data/rollup-avs-deployed-anvil-state.json:/root/.anvil/state.json - command: --host 0.0.0.0 --port 8547 --chain-id 3 --block-time 5 --load-state /root/.anvil/state.json - healthcheck: - test: ["CMD", "nc", "-zv", "0.0.0.0", "8547"] - interval: 2s - timeout: 30s - retries: 15 - networks: - - nffl - - rollup1-relayer: - image: nffl-test-relayer:latest - container_name: rollup1-relayer - depends_on: - rollup1-anvil: - condition: service_healthy - indexer: - condition: service_started - expose: - - 9091 - volumes: - - near_cli_keys:/root/.near-credentials - - ./config-files:/etc/relayer - command: - - run-config - - --path - - /etc/relayer/relayer1-docker-compose.yaml - networks: - - nffl - - indexer: - image: nffl-fast-indexer:latest - container_name: nffl-indexer - depends_on: - rmq: - condition: service_healthy - mainnet-anvil-setup: - condition: service_completed_successfully - indexer-setup: - condition: service_completed_successfully - ports: - - "3030:3030" - volumes: - - near_cli_data:/root/.near - - near_cli_keys:/root/.near-credentials - command: - - --rmq-address - - amqp://rmq:5672 - - --da-contract-ids - - da2.test.near - - --da-contract-ids - - da3.test.near - - --rollup-ids - - "2" - - --rollup-ids - - "3" - - --metrics-ip-port-address - - "0.0.0.0:9090" - networks: - - nffl - - indexer-setup: - image: debian:bookworm - container_name: nffl-indexer-setup - volumes: - - near_cli_data:/near-cli - - near_cli_keys:/root/.near-credentials - entrypoint: sh - command: - - -c - - | - rm -rf /near-cli/* - rm -rf /root/.near-credentials/* - networks: - - nffl - - aggregator: - image: nffl-aggregator - container_name: nffl-aggregator - depends_on: - mainnet-anvil-setup: - condition: service_completed_successfully - expose: - - 9091 - volumes: - - ./:/nffl/ - working_dir: /nffl - command: - - --config - - config-files/aggregator-docker-compose.yaml - - --nffl-deployment - - contracts/evm/script/output/31337/sffl_avs_deployment_output.json - - --ecdsa-private-key - - "0x2a871d0798f97d79848a013d4936a73bf4cc922c825d33c1cf7073dff6d409c6" - networks: - - nffl - - aggregator-health: - image: debian:bookworm - depends_on: - aggregator: - condition: service_started - command: sh -c "apt update && apt install -y netcat-traditional && sleep infinity" - healthcheck: - test: ["CMD", "nc", "-zv", "nffl-aggregator", "9091"] - interval: 15s - timeout: 10s - retries: 5 - networks: - - nffl - - operator0: - image: nffl-operator - container_name: nffl-operator0 - depends_on: - rmq: - condition: service_healthy - mainnet-anvil-setup: - condition: service_completed_successfully - aggregator: - condition: service_started - expose: - - 9090 # prometheus metrics port (defined in operator0-docker-compose.anvil.yaml file) - volumes: - - ./:/nffl/ - working_dir: /nffl - environment: - - OPERATOR_BLS_KEY_PASSWORD=fDUMDLmBROwlzzPXyIcy - - OPERATOR_ECDSA_KEY_PASSWORD=EnJuncq01CiVk9UbuBYl - command: --config config-files/operator0-docker-compose.anvil.yaml - networks: - - nffl - - operator0-health: - image: debian:bookworm - depends_on: - operator0: - condition: service_started - command: sh -c "apt update && apt install -y netcat-traditional && sleep infinity" - healthcheck: - test: ["CMD", "nc", "-zv", "nffl-operator0", "9090"] - interval: 15s - timeout: 10s - retries: 5 - networks: - - nffl - - operator1: - image: nffl-operator - container_name: nffl-operator1 - depends_on: - operator0-health: - condition: service_healthy - expose: - - 9091 # prometheus metrics port (defined in operator1-docker-compose.anvil.yaml file) - volumes: - - ./:/nffl/ - working_dir: /nffl - environment: - - OPERATOR_BLS_KEY_PASSWORD=2EVEUyHCrHZdfdo8lp29 - - OPERATOR_ECDSA_KEY_PASSWORD=isru1gvtykIavuk1Fg1Q - command: --config config-files/operator1-docker-compose.anvil.yaml - networks: - - nffl - - operator1-health: - image: debian:bookworm - depends_on: - operator1: - condition: service_started - command: sh -c "apt update && apt install -y netcat-traditional && sleep infinity" - healthcheck: - test: ["CMD", "nc", "-zv", "nffl-operator1", "9091"] - interval: 15s - timeout: 10s - retries: 5 - networks: - - nffl - - # METRICS RELATED - grafana: - image: grafana/grafana:9.4.1 - container_name: grafana - volumes: - - grafana_data:/var/lib/grafana - - ./grafana/provisioning:/etc/grafana/provisioning - environment: - # See https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/#override-configuration-with-environment-variables - # and https://grafana.com/docs/grafana/latest/setup-grafana/configure-docker/ - # They recommend using env vars instead of overwriting config.ini - - GF_SECURITY_ADMIN_USER=${ADMIN_USER:-admin} - - GF_SECURITY_ADMIN_PASSWORD=${ADMIN_PASSWORD:-admin} - - GF_USERS_ALLOW_SIGN_UP=false - restart: unless-stopped - ports: - - 3000:3000 - networks: - - nffl - - prometheus: - image: prom/prometheus:v2.42.0 - container_name: prometheus - volumes: - - ./prometheus:/etc/prometheus - - prometheus_data:/prometheus - command: - - "--config.file=/etc/prometheus/prometheus.yml" - - "--storage.tsdb.path=/prometheus" - - "--web.console.libraries=/etc/prometheus/console_libraries" - - "--web.console.templates=/etc/prometheus/consoles" - - "--storage.tsdb.retention.time=200h" - - "--web.enable-lifecycle" - - --web.enable-remote-write-receiver - restart: unless-stopped - ports: - - 9090:9090 - networks: - - nffl - # so that we can access the host from within the container - # needed to get the metrics from host.docker.internal:9184/metrics - extra_hosts: - - "host.docker.internal:host-gateway" - -volumes: - prometheus_data: - grafana_data: - near_cli_data: - near_cli_keys: diff --git a/docker-compose.yml b/docker-compose.yml index b0bdd0a2..28f140f3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,6 +4,8 @@ networks: nffl: name: nffl driver: bridge + internal: true + enable_ipv6: false services: rmq: diff --git a/indexer/Cargo.toml b/indexer/Cargo.toml index de3cb4af..d4a81eaf 100644 --- a/indexer/Cargo.toml +++ b/indexer/Cargo.toml @@ -8,7 +8,6 @@ edition = "2021" [dependencies] actix = "0.13.1" actix-web = "4.5.1" -async-std = { version = "1", features = ["attributes", "tokio1"] } futures = "0.3.5" tokio = { version = "1", features = ["sync", "time"] } deadpool = "0.10.0" diff --git a/indexer/FastIndexer.dockerfile b/indexer/FastIndexer.dockerfile index c0eb0e54..68993b6e 100644 --- a/indexer/FastIndexer.dockerfile +++ b/indexer/FastIndexer.dockerfile @@ -37,9 +37,4 @@ COPY --from=builder /tmp/indexer/target/${TARGET}/indexer . COPY ./indexer/entrypoint.sh ./entrypoint.sh RUN chmod +x ./entrypoint.sh -EXPOSE 3030 - -#HEALTHCHECK --interval=30s --timeout=30s --retries=10 \ -# CMD (curl http://localhost:3030/status || exit 1) - ENTRYPOINT [ "./entrypoint.sh" ] diff --git a/tests/integration/fastnear_test.go b/tests/integration/fastnear_test.go deleted file mode 100644 index be8d3ce5..00000000 --- a/tests/integration/fastnear_test.go +++ /dev/null @@ -1,771 +0,0 @@ -package integration - -import ( - "context" - "crypto/ecdsa" - "encoding/json" - "fmt" - "io" - "io/fs" - "io/ioutil" - "log" - "math/big" - "net/http" - "os" - "os/exec" - "path/filepath" - "strings" - "testing" - "time" - - "github.com/Layr-Labs/eigensdk-go/crypto/bls" - sdkEcdsa "github.com/Layr-Labs/eigensdk-go/crypto/ecdsa" - sdklogging "github.com/Layr-Labs/eigensdk-go/logging" - sdkutils "github.com/Layr-Labs/eigensdk-go/utils" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/prometheus/client_golang/prometheus" - "github.com/stretchr/testify/assert" - "github.com/testcontainers/testcontainers-go" - "github.com/testcontainers/testcontainers-go/modules/rabbitmq" - "github.com/testcontainers/testcontainers-go/wait" - - "github.com/Nuffle-Labs/nffl/aggregator" - restserver "github.com/Nuffle-Labs/nffl/aggregator/rest_server" - rpcserver "github.com/Nuffle-Labs/nffl/aggregator/rpc_server" - aggtypes "github.com/Nuffle-Labs/nffl/aggregator/types" - registryrollup "github.com/Nuffle-Labs/nffl/contracts/bindings/SFFLRegistryRollup" - transparentproxy "github.com/Nuffle-Labs/nffl/contracts/bindings/TransparentUpgradeableProxy" - "github.com/Nuffle-Labs/nffl/core/chainio" - "github.com/Nuffle-Labs/nffl/core/config" - "github.com/Nuffle-Labs/nffl/core/types" - "github.com/Nuffle-Labs/nffl/operator" - optypes "github.com/Nuffle-Labs/nffl/operator/types" - "github.com/Nuffle-Labs/nffl/tests/integration/utils" -) - -const ( - TEST_DATA_DIR = "../../test_data" - BLS_KEYS_DIR = "../keys/bls" - ECDSA_KEYS_DIR = "../keys/ecdsa" -) - -func TestIntegration(t *testing.T) { - ctx, cancel := context.WithTimeout(context.Background(), 250*time.Second) - setup := setupTestEnv(t, ctx) - t.Cleanup(func() { - cancel() - - setup.cleanup() - }) - - time.Sleep(55 * time.Second) - - taskHash, err := setup.avsReader.AvsServiceBindings.TaskManager.AllCheckpointTaskHashes(&bind.CallOpts{}, 0) - if err != nil { - t.Fatalf("Cannot get task hash: %s", err.Error()) - } - if taskHash == [32]byte{} { - t.Fatalf("Task hash is empty") - } - - taskResponseHash, err := setup.avsReader.AvsServiceBindings.TaskManager.AllCheckpointTaskResponses(&bind.CallOpts{}, 0) - log.Printf("taskResponseHash: %v", taskResponseHash) - if err != nil { - t.Fatalf("Cannot get task response hash: %s", err.Error()) - } - if taskResponseHash == [32]byte{} { - t.Fatalf("Task response hash is empty") - } - - stateRootHeight, err := setup.rollupAnvils[1].HttpClient.BlockNumber(ctx) - if err != nil { - t.Fatalf("Cannot get current block height: %s", err.Error()) - } - - stateRootUpdate, err := getStateRootUpdateAggregation(setup.aggregatorRestUrl, uint32(setup.rollupAnvils[0].ChainID.Uint64()), stateRootHeight-1) - if err != nil { - t.Fatalf("Cannot get state root update: %s", err.Error()) - } - _, err = setup.registryRollups[1].UpdateStateRoot(setup.registryRollupAuths[1], registryrollup.StateRootUpdateMessage(stateRootUpdate.Message.ToBinding()), stateRootUpdate.Aggregation.ExtractBindingRollup()) - if err != nil { - t.Fatalf("Error updating state root: %s", err.Error()) - } - - newOperatorConfig, _, _ := genOperatorConfig(t, ctx, "4", setup.mainnetAnvil, setup.rollupAnvils, setup.rabbitMq) - newOperator := startOperator(t, ctx, newOperatorConfig) - - time.Sleep(60 * time.Second) - - // Check if operator set was updated on rollups - for _, registryRollup := range setup.registryRollups { - nextOperatorSetUpdateId, err := registryRollup.NextOperatorUpdateId(&bind.CallOpts{}) - if err != nil { - t.Fatalf("Error getting next operator set update ID: %s", err.Error()) - } - - if nextOperatorSetUpdateId != 2 { - t.Fatalf("Wrong next operator set update ID: expected %d, got %d", 2, nextOperatorSetUpdateId) - } - } - - stateRootHeight = uint64(16) - stateRootUpdate, err = getStateRootUpdateAggregation(setup.aggregatorRestUrl, uint32(setup.rollupAnvils[0].ChainID.Uint64()), stateRootHeight) - if err != nil { - t.Fatalf("Cannot get state root update: %s", err.Error()) - } - _, err = setup.registryRollups[1].UpdateStateRoot(setup.registryRollupAuths[1], registryrollup.StateRootUpdateMessage(stateRootUpdate.Message.ToBinding()), stateRootUpdate.Aggregation.ExtractBindingRollup()) - if err != nil { - t.Fatalf("Error updating state root: %s", err.Error()) - } - - operatorSetUpdateCount, err := setup.avsReader.AvsServiceBindings.OperatorSetUpdateRegistry.GetOperatorSetUpdateCount(&bind.CallOpts{}) - if err != nil { - t.Fatalf("Error getting operator set update count: %s", err.Error()) - } - if operatorSetUpdateCount != 2 { - t.Fatalf("Wrong operator set update count") - } - - stateRootHeight, err = setup.rollupAnvils[1].HttpClient.BlockNumber(ctx) - if err != nil { - t.Fatalf("Cannot get current block height: %s", err.Error()) - } - - stateRootUpdate, err = getStateRootUpdateAggregation(setup.aggregatorRestUrl, uint32(setup.rollupAnvils[0].ChainID.Uint64()), stateRootHeight-1) - if err != nil { - t.Fatalf("Cannot get state root update: %s", err.Error()) - } - - // Check if operator sets are same on rollups - _, err = setup.registryRollups[1].UpdateStateRoot(setup.registryRollupAuths[1], registryrollup.StateRootUpdateMessage(stateRootUpdate.Message.ToBinding()), stateRootUpdate.Aggregation.ExtractBindingRollup()) - if err != nil { - t.Fatalf("Error updating state root: %s", err.Error()) - } - - operatorSetUpdate, err := getOperatorSetUpdateAggregation(setup.aggregatorRestUrl, operatorSetUpdateCount-1) - if err != nil { - t.Fatalf("Error getting operator set update: %s", err.Error()) - } - - expectedUpdatedOperators := []types.RollupOperator{ - { - Pubkey: newOperator.BlsPubkeyG1(), - Weight: big.NewInt(1000), - }, - } - assert.Equal(t, expectedUpdatedOperators, operatorSetUpdate.Message.Operators) - - t.Log("Done") - <-ctx.Done() -} - -type testEnv struct { - mainnetAnvil *utils.AnvilInstance - rollupAnvils []*utils.AnvilInstance - rabbitMq *rabbitmq.RabbitMQContainer - indexerContainer testcontainers.Container - operator *operator.Operator - aggregator *aggregator.Aggregator - aggregatorRestUrl string - avsReader *chainio.AvsReader - registryRollups []*registryrollup.ContractSFFLRegistryRollup - registryRollupAuths []*bind.TransactOpts - cleanup func() -} - -func setupTestEnv(t *testing.T, ctx context.Context) *testEnv { - containersCtx, cancelContainersCtx := context.WithCancel(context.Background()) - - networkName := "nffl" - net, err := testcontainers.GenericNetwork(containersCtx, testcontainers.GenericNetworkRequest{ - NetworkRequest: testcontainers.NetworkRequest{ - Driver: "bridge", - Name: networkName, - CheckDuplicate: true, - Attachable: true, - }, - }) - if err != nil { - t.Fatalf("Cannot create network: %s", err.Error()) - } - - indexerContainerName := "indexer" - mainnetAnvilContainerName := "mainnet-anvil" - rollup0AnvilContainerName := "rollup0-anvil" - rollup1AnvilContainerName := "rollup1-anvil" - rmqContainerName := "rmq" - - mainnetAnvil := utils.StartAnvilTestContainer(t, containersCtx, mainnetAnvilContainerName, "8545", "1", true, networkName) - rollupAnvils := []*utils.AnvilInstance{ - utils.StartAnvilTestContainer(t, containersCtx, rollup0AnvilContainerName, "8546", "2", false, networkName), - utils.StartAnvilTestContainer(t, containersCtx, rollup1AnvilContainerName, "8547", "3", false, networkName), - } - rabbitMq := startRabbitMqContainer(t, containersCtx, rmqContainerName, networkName) - indexerContainer, relayers := startIndexer(t, containersCtx, indexerContainerName, rollupAnvils, rabbitMq, networkName) - - sfflDeploymentRaw := readSfflDeploymentRaw() - - configRaw := buildConfigRaw(mainnetAnvil, rollupAnvils) - logger, err := sdklogging.NewZapLogger(configRaw.Environment) - if err != nil { - t.Fatalf("Failed to create logger: %s", err.Error()) - } - - nodeConfig, _, _ := genOperatorConfig(t, ctx, "3", mainnetAnvil, rollupAnvils, rabbitMq) - - addresses, registryRollups, registryRollupAuths, _ := deployRegistryRollups(t, rollupAnvils) - operator := startOperator(t, ctx, nodeConfig) - - config := buildConfig(t, sfflDeploymentRaw, addresses, rollupAnvils, configRaw) - aggregator := startAggregator(t, ctx, config, logger) - - avsReader, err := chainio.BuildAvsReader(common.HexToAddress(sfflDeploymentRaw.Addresses.RegistryCoordinatorAddr), common.HexToAddress(sfflDeploymentRaw.Addresses.OperatorStateRetrieverAddr), mainnetAnvil.HttpClient, logger) - if err != nil { - t.Fatalf("Cannot create AVS Reader: %s", err.Error()) - } - - cleanup := func() { - if err := os.RemoveAll(TEST_DATA_DIR); err != nil { - t.Fatalf("Error cleaning test data dir: %s", err.Error()) - } - - time.Sleep(5 * time.Second) - - if err := mainnetAnvil.Container.Terminate(containersCtx); err != nil { - t.Fatalf("Error terminating container: %s", err.Error()) - } - for _, rollupAnvil := range rollupAnvils { - if err := rollupAnvil.Container.Terminate(containersCtx); err != nil { - t.Fatalf("Error terminating container: %s", err.Error()) - } - } - - if err := rabbitMq.Terminate(containersCtx); err != nil { - t.Fatalf("Error terminating container: %s", err.Error()) - } - if err := indexerContainer.Terminate(containersCtx); err != nil { - t.Fatalf("Error terminating container: %s", err.Error()) - } - for _, relayer := range relayers { - if err := relayer.Terminate(containersCtx); err != nil { - t.Fatalf("Error terminating container: %s", err.Error()) - } - } - - if err := net.Remove(containersCtx); err != nil { - t.Fatalf("Error removing network: %s", err.Error()) - } - - cancelContainersCtx() - } - - return &testEnv{ - mainnetAnvil: mainnetAnvil, - rollupAnvils: rollupAnvils, - rabbitMq: rabbitMq, - indexerContainer: indexerContainer, - operator: operator, - aggregator: aggregator, - aggregatorRestUrl: "http://" + config.AggregatorRestServerIpPortAddr, - avsReader: avsReader, - registryRollups: registryRollups, - registryRollupAuths: registryRollupAuths, - cleanup: cleanup, - } -} - -func startOperator(t *testing.T, ctx context.Context, nodeConfig optypes.NodeConfig) *operator.Operator { - operator, err := operator.NewOperatorFromConfig(nodeConfig) - if err != nil { - t.Fatalf("Failed to create operator: %s", err.Error()) - } - - go operator.Start(ctx) - - t.Log("Started operator. Sleeping 15 seconds to give it time to register...") - time.Sleep(15 * time.Second) - - return operator -} - -func startAggregator(t *testing.T, ctx context.Context, config *config.Config, logger sdklogging.Logger) *aggregator.Aggregator { - t.Log("starting aggregator for integration tests") - - var optRegistry *prometheus.Registry - if config.EnableMetrics { - optRegistry = prometheus.NewRegistry() - } - agg, err := aggregator.NewAggregator(ctx, config, nil, logger) - if err != nil { - t.Fatalf("Failed to create aggregator: %s", err.Error()) - } - - rpcServer := rpcserver.NewRpcServer(config.AggregatorServerIpPortAddr, agg, logger) - if optRegistry != nil { - err = rpcServer.EnableMetrics(optRegistry) - if err != nil { - t.Fatalf("Failed to create metrics for rpc server: %s", err.Error()) - } - } - go rpcServer.Start() - - restServer := restserver.NewRestServer(config.AggregatorRestServerIpPortAddr, agg, logger) - if optRegistry != nil { - err = restServer.EnableMetrics(optRegistry) - if err != nil { - t.Fatalf("Failed to create metrics for rest server: %s", err.Error()) - } - } - go restServer.Start() - - go agg.Start(ctx) - - t.Log("Started aggregator. Sleeping 20 seconds to give operator time to answer task 1...") - time.Sleep(20 * time.Second) - - return agg -} - -func startRabbitMqContainer(t *testing.T, ctx context.Context, name, networkName string) *rabbitmq.RabbitMQContainer { - rabbitMqC, err := rabbitmq.RunContainer( - ctx, - testcontainers.WithImage("rabbitmq:latest"), - func() testcontainers.CustomizeRequestOption { - return func(req *testcontainers.GenericContainerRequest) { - req.Name = name - req.Networks = []string{networkName} - } - }(), - ) - if err != nil { - t.Fatalf("Error starting RMQ container: %s", err.Error()) - } - - return rabbitMqC -} - -func readSfflDeploymentRaw() config.SFFLDeploymentRaw { - var sfflDeploymentRaw config.SFFLDeploymentRaw - sfflDeploymentFilePath := "../../contracts/evm/script/output/31337/sffl_avs_deployment_output.json" - sdkutils.ReadJsonConfig(sfflDeploymentFilePath, &sfflDeploymentRaw) - - return sfflDeploymentRaw -} - -func genOperatorConfig(t *testing.T, ctx context.Context, keyId string, mainnetAnvil *utils.AnvilInstance, rollupAnvils []*utils.AnvilInstance, rabbitMq *rabbitmq.RabbitMQContainer) (optypes.NodeConfig, *bls.KeyPair, *ecdsa.PrivateKey) { - nodeConfig := optypes.NodeConfig{} - nodeConfigFilePath := "../../config-files/operator.anvil.yaml" - err := sdkutils.ReadYamlConfig(nodeConfigFilePath, &nodeConfig) - if err != nil { - t.Fatalf("Failed to read yaml config: %s", err.Error()) - } - - log.Println("starting operator for integration tests") - - os.Setenv("OPERATOR_BLS_KEY_PASSWORD", "") - os.Setenv("OPERATOR_ECDSA_KEY_PASSWORD", "") - - nodeConfig.BlsPrivateKeyStorePath, err = filepath.Abs(filepath.Join(BLS_KEYS_DIR, keyId, "key.json")) - if err != nil { - t.Fatalf("Failed to get BLS key dir: %s", err.Error()) - } - passwordPath := filepath.Join(BLS_KEYS_DIR, keyId, "password.txt") - password, err := os.ReadFile(passwordPath) - if err != nil { - t.Fatalf("Failed to read BLS password: %s", err.Error()) - } - if string(password) != "" { - t.Fatalf("Password is not empty: '%s'", password) - } - keyPair, err := bls.ReadPrivateKeyFromFile(nodeConfig.BlsPrivateKeyStorePath, string(password)) - if err != nil { - t.Fatalf("Failed to generate operator BLS keys: %s", err.Error()) - } - - nodeConfig.EcdsaPrivateKeyStorePath, err = filepath.Abs(filepath.Join(ECDSA_KEYS_DIR, keyId, "key.json")) - if err != nil { - t.Fatalf("Failed to get ECDSA key dir: %s", err.Error()) - } - passwordPath = filepath.Join(ECDSA_KEYS_DIR, keyId, "password.txt") - password, err = os.ReadFile(passwordPath) - if err != nil { - t.Fatalf("Failed to read ECDSA password: %s", err.Error()) - } - if string(password) != "" { - t.Fatalf("Password is not empty: '%s'", password) - } - ecdsaKey, err := sdkEcdsa.ReadKey(nodeConfig.EcdsaPrivateKeyStorePath, string(password)) - if err != nil { - t.Fatalf("Failed to generate operator ECDSA keys: %s", err.Error()) - } - - address := crypto.PubkeyToAddress(ecdsaKey.PublicKey) - - t.Logf("Generated config for operator: %s", address.String()) - - nodeConfig.OperatorAddress = address.String() - nodeConfig.RegisterOperatorOnStartup = true - nodeConfig.EthRpcUrl = mainnetAnvil.HttpUrl - nodeConfig.EthWsUrl = mainnetAnvil.WsUrl - nodeConfig.RollupIdsToRpcUrls = make(map[uint32]string) - nodeConfig.NearDaIndexerRollupIds = make([]uint32, 0, len(rollupAnvils)) - for _, rollupAnvil := range rollupAnvils { - nodeConfig.RollupIdsToRpcUrls[uint32(rollupAnvil.ChainID.Uint64())] = rollupAnvil.WsUrl - nodeConfig.NearDaIndexerRollupIds = append(nodeConfig.NearDaIndexerRollupIds, uint32(rollupAnvil.ChainID.Uint64())) - } - nodeConfig.EnableNodeApi = false - nodeConfig.NodeApiIpPortAddress = "0.0.0.0:0" - if keyId == "4" { - // TODO: fix, Now impossible because of eigensdk - nodeConfig.EnableMetrics = false - nodeConfig.EigenMetricsIpPortAddress = "0.0.0.0:0" - } - - nodeConfig.NearDaIndexerRmqIpPortAddress, err = rabbitMq.AmqpURL(ctx) - if err != nil { - t.Fatalf("Error getting AMQP URL: %s", err.Error()) - } - - mainnetAnvil.SetBalance(address, big.NewInt(1e18)) - - return nodeConfig, keyPair, ecdsaKey -} - -func buildConfigRaw(mainnetAnvil *utils.AnvilInstance, rollupAnvils []*utils.AnvilInstance) config.ConfigRaw { - var configRaw config.ConfigRaw - aggConfigFilePath := "../../config-files/aggregator.yaml" - sdkutils.ReadYamlConfig(aggConfigFilePath, &configRaw) - configRaw.EthRpcUrl = mainnetAnvil.HttpUrl - configRaw.EthWsUrl = mainnetAnvil.WsUrl - configRaw.AggregatorDatabasePath = "" - - configRaw.RollupIdsToRpcUrls = map[uint32]string{} - for _, el := range rollupAnvils { - cleanedUrl := strings.TrimPrefix(el.HttpUrl, "http://") - configRaw.RollupIdsToRpcUrls[uint32(el.ChainID.Uint64())] = cleanedUrl - } - - return configRaw -} - -func buildConfig(t *testing.T, sfflDeploymentRaw config.SFFLDeploymentRaw, addresses []common.Address, rollupAnvils []*utils.AnvilInstance, aggConfigRaw config.ConfigRaw) *config.Config { - aggregatorEcdsaPrivateKeyString := "0x2a871d0798f97d79848a013d4936a73bf4cc922c825d33c1cf7073dff6d409c6" - if aggregatorEcdsaPrivateKeyString[:2] == "0x" { - aggregatorEcdsaPrivateKeyString = aggregatorEcdsaPrivateKeyString[2:] - } - aggregatorEcdsaPrivateKey, err := crypto.HexToECDSA(aggregatorEcdsaPrivateKeyString) - if err != nil { - t.Fatalf("Cannot parse ecdsa private key: %s", err.Error()) - } - aggregatorAddr, err := sdkutils.EcdsaPrivateKeyToAddress(aggregatorEcdsaPrivateKey) - if err != nil { - t.Fatalf("Cannot get operator address: %s", err.Error()) - } - - rollupsInfo := make(map[uint32]config.RollupInfo) - for i, addr := range addresses { - rollupsInfo[uint32(rollupAnvils[i].ChainID.Int64())] = config.RollupInfo{SFFLRegistryRollupAddr: addr, RpcUrl: rollupAnvils[i].WsUrl} - } - - return &config.Config{ - EcdsaPrivateKey: aggregatorEcdsaPrivateKey, - EthHttpRpcUrl: aggConfigRaw.EthRpcUrl, - EthWsRpcUrl: aggConfigRaw.EthWsUrl, - OperatorStateRetrieverAddr: common.HexToAddress(sfflDeploymentRaw.Addresses.OperatorStateRetrieverAddr), - SFFLRegistryCoordinatorAddr: common.HexToAddress(sfflDeploymentRaw.Addresses.RegistryCoordinatorAddr), - AggregatorServerIpPortAddr: aggConfigRaw.AggregatorServerIpPortAddr, - AggregatorRestServerIpPortAddr: aggConfigRaw.AggregatorRestServerIpPortAddr, - AggregatorDatabasePath: aggConfigRaw.AggregatorDatabasePath, - AggregatorCheckpointInterval: time.Duration(aggConfigRaw.AggregatorCheckpointInterval) * time.Millisecond, - RegisterOperatorOnStartup: aggConfigRaw.RegisterOperatorOnStartup, - AggregatorAddress: aggregatorAddr, - RollupsInfo: rollupsInfo, - EnableMetrics: false, - MetricsIpPortAddress: aggConfigRaw.MetricsIpPortAddress, - } -} - -func deployRegistryRollups(t *testing.T, anvils []*utils.AnvilInstance) ([]common.Address, []*registryrollup.ContractSFFLRegistryRollup, []*bind.TransactOpts, []*bind.TransactOpts) { - var registryRollups []*registryrollup.ContractSFFLRegistryRollup - var ownerAuths []*bind.TransactOpts - var proxyAdminAuths []*bind.TransactOpts - var addresses []common.Address - - for _, anvil := range anvils { - addr, registryRollup, ownerAuth, proxyAdminAuth := deployRegistryRollup(t, anvil) - - addresses = append(addresses, addr) - registryRollups = append(registryRollups, registryRollup) - ownerAuths = append(ownerAuths, ownerAuth) - proxyAdminAuths = append(proxyAdminAuths, proxyAdminAuth) - } - - return addresses, registryRollups, ownerAuths, proxyAdminAuths -} - -func deployRegistryRollup(t *testing.T, anvil *utils.AnvilInstance) (common.Address, *registryrollup.ContractSFFLRegistryRollup, *bind.TransactOpts, *bind.TransactOpts) { - t.Logf("Deploying RegistryRollup to chain %s", anvil.ChainID.String()) - - ownerPrivateKeyString := "ac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80" - ownerKeyPair, err := crypto.HexToECDSA(ownerPrivateKeyString) - if err != nil { - t.Fatalf("Error generating private key: %s", err.Error()) - } - ownerAddr := crypto.PubkeyToAddress(ownerKeyPair.PublicKey) - - aggregatorAddr := common.HexToAddress("0xa0Ee7A142d267C1f36714E4a8F75612F20a79720") - - ownerAuth, err := bind.NewKeyedTransactorWithChainID(ownerKeyPair, anvil.ChainID) - if err != nil { - t.Fatalf("Error generating transactor: %s", err.Error()) - } - - implAddr, _, _, err := registryrollup.DeployContractSFFLRegistryRollup(ownerAuth, anvil.WsClient) - if err != nil { - t.Fatalf("Error deploying RegistryRollup: %s", err.Error()) - } - - abi, err := registryrollup.ContractSFFLRegistryRollupMetaData.GetAbi() - if err != nil { - t.Fatalf("Error getting RegistryRollup ABI: %s", err.Error()) - } - - mockPauserRegistryAddr := common.HexToAddress("0x000000000000000000000000000000000000001") - - initCall, err := abi.Pack("initialize", big.NewInt(66), ownerAddr, aggregatorAddr, mockPauserRegistryAddr) - if err != nil { - t.Fatalf("Error encoding RegistryRollup initialize call: %s", err.Error()) - } - - // using a separate account as proxy admin since it cannot access the fallback - proxyAdminPrivateKeyString := "59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d" - proxyAdminKeyPair, err := crypto.HexToECDSA(proxyAdminPrivateKeyString) - if err != nil { - t.Fatalf("Error generating private key: %s", err.Error()) - } - proxyAdminAddr := crypto.PubkeyToAddress(proxyAdminKeyPair.PublicKey) - - proxyAdminAuth, err := bind.NewKeyedTransactorWithChainID(proxyAdminKeyPair, anvil.ChainID) - if err != nil { - t.Fatalf("Error generating transactor: %s", err.Error()) - } - - proxyAddr, _, _, err := transparentproxy.DeployContractTransparentUpgradeableProxy( - proxyAdminAuth, - anvil.WsClient, - implAddr, - proxyAdminAddr, - initCall, - ) - if err != nil { - t.Fatalf("Error deploying RegistryRollup proxy: %s", err.Error()) - } - - registry, err := registryrollup.NewContractSFFLRegistryRollup(proxyAddr, anvil.WsClient) - if err != nil { - t.Fatalf("Error creating RegistryRollup instance: %s", err.Error()) - } - - return proxyAddr, registry, ownerAuth, proxyAdminAuth -} - -func startIndexer(t *testing.T, ctx context.Context, name string, rollupAnvils []*utils.AnvilInstance, rabbitMq *rabbitmq.RabbitMQContainer, networkName string) (testcontainers.Container, []testcontainers.Container) { - rmqName, err := rabbitMq.Name(ctx) - if err != nil { - t.Fatalf("Error getting RabbitMQ container name: %s", err.Error()) - } - rmqName = strings.TrimPrefix(rmqName, "/") - - amqpUrl, err := rabbitMq.AmqpURL(ctx) - if err != nil { - t.Fatalf("Error getting RabbitMQ container URL: %s", err.Error()) - } - amqpUrl = strings.Split(amqpUrl, "@")[0] + "@" + rmqName + ":" + "5672" - - var rollupArgs []string - for _, rollupAnvil := range rollupAnvils { - rollupArgs = append(rollupArgs, "--da-contract-ids", utils.GetDaContractAccountId(rollupAnvil)) - } - for _, rollupAnvil := range rollupAnvils { - rollupArgs = append(rollupArgs, "--rollup-ids", rollupAnvil.ChainID.String()) - } - - req := testcontainers.ContainerRequest{ - Image: "nffl-fast-indexer", - Name: name, - Cmd: append([]string{"--rmq-address", amqpUrl}, rollupArgs...), - ExposedPorts: []string{"3030/tcp"}, - WaitingFor: wait.ForLog("Starting block stream"), - Networks: []string{networkName}, - } - - genericReq := testcontainers.GenericContainerRequest{ - ContainerRequest: req, - Started: true, - } - - indexerContainer, err := testcontainers.GenericContainer(ctx, genericReq) - - if err != nil { - t.Fatalf("Error starting indexer container: %s", err.Error()) - } - - relayers := setupNearDa(t, ctx, indexerContainer, rollupAnvils) - return indexerContainer, relayers -} - -func setupNearDa(t *testing.T, ctx context.Context, indexerContainer testcontainers.Container, rollupAnvils []*utils.AnvilInstance) []testcontainers.Container { - integrationDir, err := os.Getwd() - if err != nil { - panic(err) - } - - indexerUrl, err := indexerContainer.Endpoint(ctx, "http") - if err != nil { - t.Fatalf("Error getting indexer endpoint: %s", err.Error()) - } - - indexerContainerIp, err := indexerContainer.ContainerIP(ctx) - if err != nil { - t.Fatalf("Error getting indxer container IP: %s", err.Error()) - } - - hostNearCfgPath := getNearCliConfigPath(t) - hostNearKeyPath := filepath.Join(hostNearCfgPath, "validator_key.json") - containerNearCfgPath := "/root/.near" - - time.Sleep(5 * time.Second) - - copyFileFromContainer(ctx, indexerContainer, filepath.Join(containerNearCfgPath, "validator_key.json"), hostNearKeyPath, 0770) - - var relayers []testcontainers.Container - nearCliEnv := []string{"NEAR_ENV=" + utils.NearNetworkId, "NEAR_CLI_LOCALNET_NETWORK_ID=" + utils.NearNetworkId, "NEAR_HELPER_ACCOUNT=near", "NEAR_CLI_LOCALNET_KEY_PATH=" + hostNearKeyPath, "NEAR_NODE_URL=" + indexerUrl} - for _, rollupAnvil := range rollupAnvils { - accountId := utils.GetDaContractAccountId(rollupAnvil) - - err := execCommand(t, "near", - []string{"create-account", accountId, "--masterAccount", "test.near"}, - append(os.Environ(), nearCliEnv...), - true, - ) - if err != nil { - t.Fatalf("Error creating NEAR DA account: %s", err.Error()) - } - - relayer, err := utils.StartRelayer(t, ctx, accountId, indexerContainerIp, rollupAnvil) - if err != nil { - t.Fatalf("Error creating realayer: #%s", err.Error()) - } - relayers = append(relayers, relayer) - - err = execCommand(t, "near", - []string{"deploy", accountId, filepath.Join(integrationDir, "../near/near_da_blob_store.wasm"), "--initFunction", "new", "--initArgs", "{}", "--masterAccount", "test.near"}, - append(os.Environ(), nearCliEnv...), - true, - ) - if err != nil { - t.Fatalf("Error deploying NEAR DA contract: %s", err.Error()) - } - } - - return relayers -} - -func execCommand(t *testing.T, name string, arg, env []string, shouldLog bool) error { - cmd := exec.Command(name, arg...) - cmd.Env = env - out, err := cmd.CombinedOutput() - if shouldLog { - t.Log(string(out)) - } - return err -} - -func getStateRootUpdateAggregation(addr string, rollupID uint32, blockHeight uint64) (*aggtypes.GetStateRootUpdateAggregationResponse, error) { - url := fmt.Sprintf("%s/aggregation/state-root-update?rollupId=%d&blockHeight=%d", addr, rollupID, blockHeight) - - resp, err := http.Get(url) - if err != nil { - return nil, err - } - defer resp.Body.Close() - - if resp.StatusCode != http.StatusOK { - bodyBytes, errRead := ioutil.ReadAll(resp.Body) - if errRead != nil { - return nil, fmt.Errorf("failed to read response body for error: %v", errRead) - } - - return nil, fmt.Errorf("error: %s, message: %s", resp.Status, string(bodyBytes)) - } - - var response aggtypes.GetStateRootUpdateAggregationResponse - if err := json.NewDecoder(resp.Body).Decode(&response); err != nil { - return nil, err - } - - return &response, nil -} - -func getOperatorSetUpdateAggregation(addr string, id uint64) (*aggtypes.GetOperatorSetUpdateAggregationResponse, error) { - url := fmt.Sprintf("%s/aggregation/operator-set-update?id=%d", addr, id) - - resp, err := http.Get(url) - if err != nil { - return nil, err - } - defer resp.Body.Close() - - if resp.StatusCode != http.StatusOK { - body, errRead := ioutil.ReadAll(resp.Body) - if errRead != nil { - return nil, fmt.Errorf("error: %s, message: %s", resp.Status, string(body)) - } - - return nil, fmt.Errorf("error: %s", resp.Status) - } - - var response aggtypes.GetOperatorSetUpdateAggregationResponse - err = json.NewDecoder(resp.Body).Decode(&response) - if err != nil { - return nil, err - } - - return &response, err -} - -func copyFileFromContainer(ctx context.Context, container testcontainers.Container, sourcePath, destinationPath string, destinationPermissions fs.FileMode) error { - reader, err := container.CopyFileFromContainer(ctx, sourcePath) - if err != nil { - return err - } - defer reader.Close() - - err = os.MkdirAll(filepath.Dir(destinationPath), destinationPermissions) - if err != nil { - return err - } - - file, err := os.Create(destinationPath) - if err != nil { - return err - } - defer file.Close() - - _, err = io.Copy(file, reader) - if err != nil { - return err - } - - return nil -} - -func getNearCliConfigPath(t *testing.T) string { - path, err := filepath.Abs(filepath.Join(TEST_DATA_DIR, "sffl_test_localnet")) - if err != nil { - t.Fatalf("Error getting near-cli config path: %s", err.Error()) - } - return path -} From f6ffc25c0aaad142ee11ea7a13bf04fa63cc000a Mon Sep 17 00:00:00 2001 From: Sasha Syrotenko Date: Thu, 28 Nov 2024 16:20:44 +0200 Subject: [PATCH 34/40] Unit tests --- indexer/src/errors.rs | 4 -- indexer/src/fastnear_indexer.rs | 104 ++++++++++++++++++++++++++++++-- 2 files changed, 99 insertions(+), 9 deletions(-) diff --git a/indexer/src/errors.rs b/indexer/src/errors.rs index 1ea58678..67710b12 100644 --- a/indexer/src/errors.rs +++ b/indexer/src/errors.rs @@ -30,12 +30,8 @@ pub enum Error { ActixErrorKind(std::io::ErrorKind), #[error{"0"}] JoinError(#[from] tokio::task::JoinError), - #[error("Indexer not initialized")] - IndexerNotInitialized, #[error("Network error: {0}")] NetworkError(String), - #[error("API error: {0}")] - ApiError(String), #[error("Deserialize jsonerror: {0}")] DeserializeJsonError(String), } diff --git a/indexer/src/fastnear_indexer.rs b/indexer/src/fastnear_indexer.rs index f57f3fb4..85ce6cf6 100644 --- a/indexer/src/fastnear_indexer.rs +++ b/indexer/src/fastnear_indexer.rs @@ -1,12 +1,12 @@ -use std::collections::HashMap; use near_indexer::near_primitives::{types::AccountId, views::{ActionView, ExecutionStatusView, ReceiptEnumView}}; use reqwest::Client; -use tokio::sync::{mpsc::{Sender, Receiver}, mpsc}; -use tracing::{info, error, debug, trace}; +use std::collections::HashMap; +use tokio::sync::{mpsc, mpsc::{Receiver, Sender}}; +use tracing::{debug, error, info, trace}; -use crate::{errors::Error, rmq_publisher::{get_routing_key, PublishData, PublishOptions, PublishPayload, PublisherContext}, types::{BlockWithTxHashes, IndexerExecutionOutcomeWithReceiptAndTxHash, PartialCandidateData, PartialCandidateDataWithBlockTxHash}}; -use crate::metrics::{make_block_listener_metrics, BlockEventListener, Metricable}; use crate::errors::Result; +use crate::metrics::{make_block_listener_metrics, BlockEventListener, Metricable}; +use crate::{errors::Error, rmq_publisher::{get_routing_key, PublishData, PublishOptions, PublishPayload, PublisherContext}, types::{BlockWithTxHashes, IndexerExecutionOutcomeWithReceiptAndTxHash, PartialCandidateData, PartialCandidateDataWithBlockTxHash}}; const FASTNEAR_ENDPOINT: &str = "https://testnet.neardata.xyz/v0/last_block/final"; @@ -204,4 +204,98 @@ impl Metricable for FastNearIndexer { Ok(()) } +} + +#[cfg(test)] +mod tests { + use super::*; + use near_crypto::{KeyType, PublicKey}; + use near_indexer::near_primitives::views::{ActionView, ReceiptEnumView}; + use reqwest::Client; + use std::collections::HashMap; + + #[tokio::test] + async fn test_run() { + let addresses_to_rollup_ids = HashMap::new(); + let indexer = FastNearIndexer::new(addresses_to_rollup_ids); + let receiver = indexer.run(); + // Since the run method spawns asynchronous tasks, we can check if the receiver is valid + assert!(receiver.capacity() > 0); + } + + #[tokio::test] + async fn test_fetch_latest_block() { + let client = Client::new(); + let result = FastNearIndexer::fetch_latest_block(&client).await; + assert!(result.is_ok(), "Failed to fetch latest block"); + let block = result.unwrap(); + // Basic assertions about the block + assert!(block.block.header.height > 0, "Block height should be greater than 0"); + } + + #[tokio::test] + async fn test_extract_args_with_submit_method() { + let action = ActionView::FunctionCall { + method_name: "submit".to_string(), + args: vec![1, 2, 3].into(), + gas: 1000, + deposit: 0, + }; + let args = FastNearIndexer::extract_args(action); + assert!(args.is_some()); + assert_eq!(args.unwrap(), vec![1, 2, 3]); + } + + #[tokio::test] + async fn test_extract_args_with_other_method() { + let action = ActionView::FunctionCall { + method_name: "other_method".to_string(), + args: vec![1, 2, 3].into(), + gas: 1000, + deposit: 0, + }; + let args = FastNearIndexer::extract_args(action); + assert!(args.is_none()); + } + + #[tokio::test] + async fn test_receipt_filter_map_with_matching_rollup_id() { + let rollup_id = 1; + let action = ActionView::FunctionCall { + method_name: "submit".to_string(), + args: vec![1, 2, 3].into(), + gas: 1000, + deposit: 0, + }; + let receipt_enum_view = ReceiptEnumView::Action { + signer_id: "signer.near".to_string().try_into().unwrap(), + signer_public_key: PublicKey::empty(KeyType::ED25519), + gas_price: 0, + output_data_receivers: vec![], + input_data_ids: vec![], + actions: vec![action], + is_promise_yield: false, + }; + let result = FastNearIndexer::receipt_filter_map(receipt_enum_view, rollup_id); + assert!(result.is_some()); + let partial_candidate = result.unwrap(); + assert_eq!(partial_candidate.rollup_id, rollup_id); + assert_eq!(partial_candidate.payloads, vec![vec![1, 2, 3]]); + } + + #[tokio::test] + async fn test_receipt_filter_map_with_non_matching_rollup_id() { + let rollup_id = 1; + let receipt_enum_view = ReceiptEnumView::Action { + signer_id: "signer.near".to_string().try_into().unwrap(), + signer_public_key: PublicKey::empty(KeyType::ED25519), + gas_price: 0, + output_data_receivers: vec![], + input_data_ids: vec![], + actions: vec![], + is_promise_yield: false, + }; + let result = FastNearIndexer::receipt_filter_map(receipt_enum_view, rollup_id); + assert!(result.is_none()); + } } \ No newline at end of file From 05bda8592e0903b514d034f99761820b56cdeb59 Mon Sep 17 00:00:00 2001 From: Sasha Syrotenko Date: Thu, 28 Nov 2024 16:32:31 +0200 Subject: [PATCH 35/40] Fix CI test --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 28f140f3..627ac2df 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,8 +4,8 @@ networks: nffl: name: nffl driver: bridge - internal: true - enable_ipv6: false +# internal: true +# enable_ipv6: false services: rmq: From 8d961f400c0402a440177b968a18359704889653 Mon Sep 17 00:00:00 2001 From: Sasha Syrotenko Date: Fri, 29 Nov 2024 16:07:19 +0200 Subject: [PATCH 36/40] Review comments --- .github/workflows/integration-tests.yml | 4 + Cargo.lock | 12 +++ indexer/Cargo.toml | 2 + indexer/src/configs.rs | 2 + indexer/src/fastnear_indexer.rs | 121 ++++++++++++++---------- indexer/src/main.rs | 2 +- 6 files changed, 91 insertions(+), 52 deletions(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index f17ffe01..64f9d399 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -77,6 +77,10 @@ jobs: - name: Go Integration Test run: make tests-integration + - name: Rust Fastnear Integration Test + run: cargo test --features it-tests + working-directory: ./indexer + - name: Rust Integration Test run: cargo test --features it-tests working-directory: ./tests/e2e/e2e_tests diff --git a/Cargo.lock b/Cargo.lock index d7dd90f4..9cfabc20 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4773,6 +4773,7 @@ dependencies = [ "tokio", "tokio-executor-trait", "tokio-reactor-trait", + "tokio-retry", "tracing", ] @@ -9641,6 +9642,17 @@ dependencies = [ "tokio-stream", ] +[[package]] +name = "tokio-retry" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f57eb36ecbe0fc510036adff84824dd3c24bb781e21bfa67b69d556aa85214f" +dependencies = [ + "pin-project 1.1.7", + "rand", + "tokio", +] + [[package]] name = "tokio-rustls" version = "0.26.0" diff --git a/indexer/Cargo.toml b/indexer/Cargo.toml index d4a81eaf..3cdab894 100644 --- a/indexer/Cargo.toml +++ b/indexer/Cargo.toml @@ -15,6 +15,7 @@ lapin = "2.3.1" deadpool-lapin = "0.11.0" tokio-executor-trait = "2.1.0" tokio-reactor-trait = "1.1.0" +tokio-retry = "0.3" prometheus = "0.13.3" clap = { version = "4.5.21", features = ["color", "derive", "env"] } @@ -41,3 +42,4 @@ near-crypto = { git = "https://github.com/near/nearcore", rev = "a83c18490cf4daf [features] use_fastnear = [] +it_tests = [] \ No newline at end of file diff --git a/indexer/src/configs.rs b/indexer/src/configs.rs index 73c5c31d..80d00966 100644 --- a/indexer/src/configs.rs +++ b/indexer/src/configs.rs @@ -53,6 +53,8 @@ pub(crate) struct RunConfigArgs { /// Metrics socket addr #[clap(long)] pub metrics_ip_port_address: Option, + #[clap(long, default_value = "256")] + pub channel_width: usize } impl RunConfigArgs { diff --git a/indexer/src/fastnear_indexer.rs b/indexer/src/fastnear_indexer.rs index 85ce6cf6..89f3223e 100644 --- a/indexer/src/fastnear_indexer.rs +++ b/indexer/src/fastnear_indexer.rs @@ -1,35 +1,51 @@ -use near_indexer::near_primitives::{types::AccountId, views::{ActionView, ExecutionStatusView, ReceiptEnumView}}; +use near_indexer::near_primitives::{ + types::AccountId, + views::{ActionView, ExecutionStatusView, ReceiptEnumView}, +}; use reqwest::Client; use std::collections::HashMap; -use tokio::sync::{mpsc, mpsc::{Receiver, Sender}}; +use tokio::sync::{ + mpsc, + mpsc::{Receiver, Sender}, +}; use tracing::{debug, error, info, trace}; use crate::errors::Result; use crate::metrics::{make_block_listener_metrics, BlockEventListener, Metricable}; -use crate::{errors::Error, rmq_publisher::{get_routing_key, PublishData, PublishOptions, PublishPayload, PublisherContext}, types::{BlockWithTxHashes, IndexerExecutionOutcomeWithReceiptAndTxHash, PartialCandidateData, PartialCandidateDataWithBlockTxHash}}; +use crate::{ + errors::Error, + rmq_publisher::{get_routing_key, PublishData, PublishOptions, PublishPayload, PublisherContext}, + types::{ + BlockWithTxHashes, IndexerExecutionOutcomeWithReceiptAndTxHash, PartialCandidateData, + PartialCandidateDataWithBlockTxHash, + }, +}; const FASTNEAR_ENDPOINT: &str = "https://testnet.neardata.xyz/v0/last_block/final"; +const FASTNEAR_INDEXER: &str = "fastnear_indexer"; pub struct FastNearIndexer { client: Client, addresses_to_rollup_ids: HashMap, listener: Option, + channel_width: usize, } impl FastNearIndexer { - pub(crate) fn new(addresses_to_rollup_ids: HashMap) -> Self { - debug!(target: "fastnear_indexer", "Creating new FastNearIndexer"); - Self { + pub(crate) fn new(addresses_to_rollup_ids: HashMap, channel_width: usize) -> Self { + debug!(FASTNEAR_INDEXER, "Creating new FastNearIndexer"); + Self { client: Client::new(), addresses_to_rollup_ids, listener: None, + channel_width, } } pub fn run(&self) -> Receiver { - info!(target: "fastnear_indexer", "Starting FastNearIndexer"); + info!(FASTNEAR_INDEXER, "Starting FastNearIndexer"); let block_receiver = self.stream_latest_blocks(); - let (publish_sender, publish_receiver) = mpsc::channel(100); + let (publish_sender, publish_receiver) = mpsc::channel(self.channel_width); let addresses_to_rollup_ids = self.addresses_to_rollup_ids.clone(); @@ -45,11 +61,11 @@ impl FastNearIndexer { publish_sender: Sender, addresses_to_rollup_ids: HashMap, ) { - debug!(target: "fastnear_indexer", "Starting block processing"); + debug!(FASTNEAR_INDEXER, "Starting block processing"); while let Some(block) = block_receiver.recv().await { - trace!(target: "fastnear_indexer", "Received block: {:?}", block.block.header.height); + trace!(FASTNEAR_INDEXER, "Received block: {:?}", block.block.header.height); if let Err(e) = Self::parse_and_publish_block(block, &publish_sender, &addresses_to_rollup_ids).await { - error!(target: "fastnear_indexer", "Error parsing and publishing block: {:?}", e); + error!(FASTNEAR_INDEXER, "Error parsing and publishing block: {:?}", e); } } } @@ -59,31 +75,31 @@ impl FastNearIndexer { publish_sender: &Sender, addresses_to_rollup_ids: &HashMap, ) -> Result<(), Error> { - debug!(target: "fastnear_indexer", "Parsing block: {:?}", block.block.header.height); + debug!(FASTNEAR_INDEXER, "Parsing block: {:?}", block.block.header.height); for shard in block.shards { for receipt_execution_outcome in shard.receipt_execution_outcomes { let receiver_id = &receipt_execution_outcome.receipt.receiver_id; - debug!(target: "fastnear_indexer", "Processing receipt for receiver_id: {}", receiver_id); + debug!(FASTNEAR_INDEXER, "Processing receipt for receiver_id: {}", receiver_id); if let Some(rollup_id) = addresses_to_rollup_ids.get(receiver_id) { - trace!(target: "fastnear_indexer", "Processing receipt for rollup_id: {}", rollup_id); + trace!(FASTNEAR_INDEXER, "Processing receipt for rollup_id: {}", rollup_id); if !Self::is_successful_execution(&receipt_execution_outcome) { - trace!(target: "fastnear_indexer", "Skipping unsuccessful execution for rollup_id: {}", rollup_id); + trace!(FASTNEAR_INDEXER, "Skipping unsuccessful execution for rollup_id: {}", rollup_id); continue; } - let partial_candidate_data = Self::receipt_filter_map( - receipt_execution_outcome.receipt.receipt, - *rollup_id - ); + let partial_candidate_data = + Self::receipt_filter_map(receipt_execution_outcome.receipt.receipt, *rollup_id); - if let (Some(partial_data), Some(tx_hash)) = (partial_candidate_data, receipt_execution_outcome.tx_hash) { + if let (Some(partial_data), Some(tx_hash)) = + (partial_candidate_data, receipt_execution_outcome.tx_hash) + { let candidate_data = PartialCandidateDataWithBlockTxHash { rollup_id: *rollup_id, payloads: partial_data.payloads, tx_hash, block_hash: block.block.header.hash, }; - debug!(target: "fastnear_indexer", "Sending candidate data for rollup_id: {}", rollup_id); + debug!(FASTNEAR_INDEXER, "Sending candidate data for rollup_id: {}", rollup_id); Self::send(&candidate_data, publish_sender).await?; } } @@ -94,8 +110,8 @@ impl FastNearIndexer { } pub fn stream_latest_blocks(&self) -> mpsc::Receiver { - info!(target: "fastnear_indexer", "Starting block stream"); - let (block_sender, block_receiver) = mpsc::channel(100); + info!(FASTNEAR_INDEXER, "Starting block stream"); + let (block_sender, block_receiver) = mpsc::channel(self.channel_width); let client = self.client.clone(); tokio::spawn(async move { @@ -103,12 +119,12 @@ impl FastNearIndexer { match Self::fetch_latest_block(&client).await { Ok(block) => { if block_sender.send(block.clone()).await.is_err() { - error!(target: "fastnear_indexer", "Failed to send block to channel"); + error!(FASTNEAR_INDEXER, "Failed to send block to channel"); break; } - info!(target: "fastnear_indexer", "Successfully fetched and sent latest block with id: {}", block.block.header.height); + info!(FASTNEAR_INDEXER, "Successfully fetched and sent latest block with id: {}", block.block.header.height); } - Err(e) => error!(target: "fastnear_indexer", "Error fetching latest block: {:?}", e), + Err(e) => error!(FASTNEAR_INDEXER, "Error fetching latest block: {:?}", e), } tokio::time::sleep(std::time::Duration::from_secs(1)).await; } @@ -118,20 +134,25 @@ impl FastNearIndexer { } async fn fetch_latest_block(client: &Client) -> Result { - debug!(target: "fastnear_indexer", "Fetching latest block"); - let response = client.get(FASTNEAR_ENDPOINT) + debug!(FASTNEAR_INDEXER, "Fetching latest block"); + let response = client + .get(FASTNEAR_ENDPOINT) .send() .await .and_then(|r| r.error_for_status()) .map_err(|e| Error::NetworkError(e.to_string()))?; - response.json::() + response + .json::() .await .map_err(|e| Error::DeserializeJsonError(e.to_string())) } - async fn send(candidate_data: &PartialCandidateDataWithBlockTxHash, sender: &Sender) -> Result<(), Error> { - trace!(target: "fastnear_indexer", "Sending candidate data: {:?}", candidate_data); + async fn send( + candidate_data: &PartialCandidateDataWithBlockTxHash, + sender: &Sender, + ) -> Result<(), Error> { + trace!(FASTNEAR_INDEXER, "Sending candidate data: {:?}", candidate_data); for data in candidate_data.clone().payloads { let publish_data = PublishData { publish_options: PublishOptions { @@ -157,42 +178,38 @@ impl FastNearIndexer { receipt_execution_outcome.execution_outcome.outcome.status, ExecutionStatusView::SuccessValue(ref value) if value.is_empty() ); - trace!(target: "fastnear_indexer", "Execution successful: {}", is_successful); + trace!(FASTNEAR_INDEXER, "Execution successful: {}", is_successful); is_successful } fn receipt_filter_map(receipt_enum_view: ReceiptEnumView, rollup_id: u32) -> Option { - trace!(target: "fastnear_indexer", "Filtering receipt for rollup_id: {}", rollup_id); + trace!(FASTNEAR_INDEXER, "Filtering receipt for rollup_id: {}", rollup_id); let payloads = match receipt_enum_view { - ReceiptEnumView::Action { actions, .. } => { - actions.into_iter() - .filter_map(Self::extract_args) - .collect::>>() - } + ReceiptEnumView::Action { actions, .. } => actions + .into_iter() + .filter_map(Self::extract_args) + .collect::>>(), _ => return None, }; if payloads.is_empty() { - trace!(target: "fastnear_indexer", "No payloads found for rollup_id: {}", rollup_id); + trace!(FASTNEAR_INDEXER, "No payloads found for rollup_id: {}", rollup_id); return None; } - Some(PartialCandidateData { - rollup_id, - payloads, - }) + Some(PartialCandidateData { rollup_id, payloads }) } fn extract_args(action: ActionView) -> Option> { match action { ActionView::FunctionCall { method_name, args, .. } if method_name == "submit" => { - trace!(target: "fastnear_indexer", "Extracted args for 'submit' method"); + trace!(FASTNEAR_INDEXER, "Extracted args for 'submit' method"); Some(args.into()) - }, + } _ => { - trace!(target: "fastnear_indexer", "Skipped non-'submit' method"); + trace!(FASTNEAR_INDEXER, "Skipped non-'submit' method"); None - }, + } } } } @@ -211,19 +228,21 @@ mod tests { use super::*; use near_crypto::{KeyType, PublicKey}; use near_indexer::near_primitives::views::{ActionView, ReceiptEnumView}; + #[cfg(feature = "it_tests")] use reqwest::Client; + #[cfg(feature = "it_tests")] use std::collections::HashMap; - #[tokio::test] + #[cfg(all(test, feature = "it_tests"))] async fn test_run() { let addresses_to_rollup_ids = HashMap::new(); - let indexer = FastNearIndexer::new(addresses_to_rollup_ids); + let indexer = FastNearIndexer::new(addresses_to_rollup_ids, 128); let receiver = indexer.run(); // Since the run method spawns asynchronous tasks, we can check if the receiver is valid assert!(receiver.capacity() > 0); } - #[tokio::test] + #[cfg(all(test, feature = "it_tests"))] async fn test_fetch_latest_block() { let client = Client::new(); let result = FastNearIndexer::fetch_latest_block(&client).await; @@ -298,4 +317,4 @@ mod tests { let result = FastNearIndexer::receipt_filter_map(receipt_enum_view, rollup_id); assert!(result.is_none()); } -} \ No newline at end of file +} diff --git a/indexer/src/main.rs b/indexer/src/main.rs index bcebcc6e..625850d2 100644 --- a/indexer/src/main.rs +++ b/indexer/src/main.rs @@ -41,7 +41,7 @@ fn run(home_dir: std::path::PathBuf, config: RunConfigArgs) -> Result<()> { } if cfg!(feature = "use_fastnear") { - let fastnear_indexer = FastNearIndexer::new(addresses_to_rollup_ids); + let fastnear_indexer = FastNearIndexer::new(addresses_to_rollup_ids, config.channel_width); let validated_stream = fastnear_indexer.run(); rmq_publisher.run(validated_stream); From 36b90e91c72c1168283cc04d28fce42911a1b453 Mon Sep 17 00:00:00 2001 From: Sasha Syrotenko Date: Fri, 29 Nov 2024 16:19:07 +0200 Subject: [PATCH 37/40] Don's comments --- indexer/src/fastnear_indexer.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/indexer/src/fastnear_indexer.rs b/indexer/src/fastnear_indexer.rs index 89f3223e..6bf16171 100644 --- a/indexer/src/fastnear_indexer.rs +++ b/indexer/src/fastnear_indexer.rs @@ -118,11 +118,12 @@ impl FastNearIndexer { loop { match Self::fetch_latest_block(&client).await { Ok(block) => { - if block_sender.send(block.clone()).await.is_err() { + let block_height = block.block.header.height; + if block_sender.send(block).await.is_err() { error!(FASTNEAR_INDEXER, "Failed to send block to channel"); break; } - info!(FASTNEAR_INDEXER, "Successfully fetched and sent latest block with id: {}", block.block.header.height); + info!(FASTNEAR_INDEXER, "Successfully fetched and sent latest block with id: {}", block_height); } Err(e) => error!(FASTNEAR_INDEXER, "Error fetching latest block: {:?}", e), } From 39555ddc2cc301a3e0554deab1032206190d60e8 Mon Sep 17 00:00:00 2001 From: Sasha Syrotenko Date: Fri, 29 Nov 2024 16:21:31 +0200 Subject: [PATCH 38/40] AI review --- indexer/src/fastnear_indexer.rs | 6 ++++-- indexer/src/main.rs | 1 - 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/indexer/src/fastnear_indexer.rs b/indexer/src/fastnear_indexer.rs index 6bf16171..6cd0f798 100644 --- a/indexer/src/fastnear_indexer.rs +++ b/indexer/src/fastnear_indexer.rs @@ -154,7 +154,7 @@ impl FastNearIndexer { sender: &Sender, ) -> Result<(), Error> { trace!(FASTNEAR_INDEXER, "Sending candidate data: {:?}", candidate_data); - for data in candidate_data.clone().payloads { + for data in &candidate_data.payloads { let publish_data = PublishData { publish_options: PublishOptions { routing_key: get_routing_key(candidate_data.rollup_id), @@ -165,7 +165,7 @@ impl FastNearIndexer { }, payload: PublishPayload { transaction_id: candidate_data.tx_hash, - data, + data: data.clone() }, }; sender.send(publish_data).await? @@ -235,6 +235,7 @@ mod tests { use std::collections::HashMap; #[cfg(all(test, feature = "it_tests"))] + #[tokio::test] async fn test_run() { let addresses_to_rollup_ids = HashMap::new(); let indexer = FastNearIndexer::new(addresses_to_rollup_ids, 128); @@ -244,6 +245,7 @@ mod tests { } #[cfg(all(test, feature = "it_tests"))] + #[tokio::test] async fn test_fetch_latest_block() { let client = Client::new(); let result = FastNearIndexer::fetch_latest_block(&client).await; diff --git a/indexer/src/main.rs b/indexer/src/main.rs index 625850d2..c1d565d0 100644 --- a/indexer/src/main.rs +++ b/indexer/src/main.rs @@ -71,7 +71,6 @@ fn run(home_dir: std::path::PathBuf, config: RunConfigArgs) -> Result<()> { rmq_publisher.run(validated_stream); - // TODO: Handle block_handle whether cancelled or panics Ok::<_, Error>(block_handle.await?) } }); From b5ecb80c03d58bd01153ec06aeaac1444b1a6f21 Mon Sep 17 00:00:00 2001 From: Sasha Syrotenko Date: Sat, 30 Nov 2024 07:58:10 +0200 Subject: [PATCH 39/40] Add fastnear address to config, fix CI --- .github/workflows/integration-tests.yml | 2 +- indexer/src/configs.rs | 4 +++ indexer/src/fastnear_indexer.rs | 35 ++++++++++++++++++------- indexer/src/main.rs | 7 ++--- 4 files changed, 34 insertions(+), 14 deletions(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 64f9d399..259c3bd8 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -78,7 +78,7 @@ jobs: run: make tests-integration - name: Rust Fastnear Integration Test - run: cargo test --features it-tests + run: cargo test --features it_tests working-directory: ./indexer - name: Rust Integration Test diff --git a/indexer/src/configs.rs b/indexer/src/configs.rs index 80d00966..7213f034 100644 --- a/indexer/src/configs.rs +++ b/indexer/src/configs.rs @@ -53,6 +53,10 @@ pub(crate) struct RunConfigArgs { /// Metrics socket addr #[clap(long)] pub metrics_ip_port_address: Option, + /// Address of fastnear block producer. + #[clap(long, default_value = "https://testnet.neardata.xyz/v0/last_block/final")] + pub fastnear_address: String, + /// Internal FastIndexer channels width. #[clap(long, default_value = "256")] pub channel_width: usize } diff --git a/indexer/src/fastnear_indexer.rs b/indexer/src/fastnear_indexer.rs index 6cd0f798..309a64bb 100644 --- a/indexer/src/fastnear_indexer.rs +++ b/indexer/src/fastnear_indexer.rs @@ -21,20 +21,25 @@ use crate::{ }, }; -const FASTNEAR_ENDPOINT: &str = "https://testnet.neardata.xyz/v0/last_block/final"; const FASTNEAR_INDEXER: &str = "fastnear_indexer"; pub struct FastNearIndexer { client: Client, + fastnear_address: String, addresses_to_rollup_ids: HashMap, listener: Option, channel_width: usize, } impl FastNearIndexer { - pub(crate) fn new(addresses_to_rollup_ids: HashMap, channel_width: usize) -> Self { + pub(crate) fn new( + fastnear_address: &str, + addresses_to_rollup_ids: HashMap, + channel_width: usize, + ) -> Self { debug!(FASTNEAR_INDEXER, "Creating new FastNearIndexer"); Self { + fastnear_address: fastnear_address.to_string(), client: Client::new(), addresses_to_rollup_ids, listener: None, @@ -83,7 +88,11 @@ impl FastNearIndexer { if let Some(rollup_id) = addresses_to_rollup_ids.get(receiver_id) { trace!(FASTNEAR_INDEXER, "Processing receipt for rollup_id: {}", rollup_id); if !Self::is_successful_execution(&receipt_execution_outcome) { - trace!(FASTNEAR_INDEXER, "Skipping unsuccessful execution for rollup_id: {}", rollup_id); + trace!( + FASTNEAR_INDEXER, + "Skipping unsuccessful execution for rollup_id: {}", + rollup_id + ); continue; } @@ -113,17 +122,21 @@ impl FastNearIndexer { info!(FASTNEAR_INDEXER, "Starting block stream"); let (block_sender, block_receiver) = mpsc::channel(self.channel_width); let client = self.client.clone(); + let fastnear_address = self.fastnear_address.clone(); tokio::spawn(async move { loop { - match Self::fetch_latest_block(&client).await { + match Self::fetch_latest_block(&client, fastnear_address.as_str()).await { Ok(block) => { let block_height = block.block.header.height; if block_sender.send(block).await.is_err() { error!(FASTNEAR_INDEXER, "Failed to send block to channel"); break; } - info!(FASTNEAR_INDEXER, "Successfully fetched and sent latest block with id: {}", block_height); + info!( + FASTNEAR_INDEXER, + "Successfully fetched and sent latest block with id: {}", block_height + ); } Err(e) => error!(FASTNEAR_INDEXER, "Error fetching latest block: {:?}", e), } @@ -134,10 +147,10 @@ impl FastNearIndexer { block_receiver } - async fn fetch_latest_block(client: &Client) -> Result { + async fn fetch_latest_block(client: &Client, fastnear_address: &str) -> Result { debug!(FASTNEAR_INDEXER, "Fetching latest block"); let response = client - .get(FASTNEAR_ENDPOINT) + .get(fastnear_address) .send() .await .and_then(|r| r.error_for_status()) @@ -165,7 +178,7 @@ impl FastNearIndexer { }, payload: PublishPayload { transaction_id: candidate_data.tx_hash, - data: data.clone() + data: data.clone(), }, }; sender.send(publish_data).await? @@ -234,11 +247,13 @@ mod tests { #[cfg(feature = "it_tests")] use std::collections::HashMap; + const FASTNEAR_DEFAULT_ENDPOINT: &str = "https://testnet.neardata.xyz/v0/last_block/final"; + #[cfg(all(test, feature = "it_tests"))] #[tokio::test] async fn test_run() { let addresses_to_rollup_ids = HashMap::new(); - let indexer = FastNearIndexer::new(addresses_to_rollup_ids, 128); + let indexer = FastNearIndexer::new(FASTNEAR_DEFAULT_ENDPOINT, addresses_to_rollup_ids, 128); let receiver = indexer.run(); // Since the run method spawns asynchronous tasks, we can check if the receiver is valid assert!(receiver.capacity() > 0); @@ -248,7 +263,7 @@ mod tests { #[tokio::test] async fn test_fetch_latest_block() { let client = Client::new(); - let result = FastNearIndexer::fetch_latest_block(&client).await; + let result = FastNearIndexer::fetch_latest_block(&client, FASTNEAR_DEFAULT_ENDPOINT).await; assert!(result.is_ok(), "Failed to fetch latest block"); let block = result.unwrap(); // Basic assertions about the block diff --git a/indexer/src/main.rs b/indexer/src/main.rs index c1d565d0..74c0e720 100644 --- a/indexer/src/main.rs +++ b/indexer/src/main.rs @@ -24,7 +24,8 @@ mod fastnear_indexer; const INDEXER: &str = "indexer"; fn run(home_dir: std::path::PathBuf, config: RunConfigArgs) -> Result<()> { - let addresses_to_rollup_ids = config.compile_addresses_to_ids_map()?; + let addr_to_rollup_ids = config.compile_addresses_to_ids_map()?; + let fastnear_addr: &str = config.fastnear_address.as_str(); let system = actix::System::new(); let registry = Registry::new(); let server_handle = if let Some(metrics_addr) = config.metrics_ip_port_address { @@ -41,7 +42,7 @@ fn run(home_dir: std::path::PathBuf, config: RunConfigArgs) -> Result<()> { } if cfg!(feature = "use_fastnear") { - let fastnear_indexer = FastNearIndexer::new(addresses_to_rollup_ids, config.channel_width); + let fastnear_indexer = FastNearIndexer::new(fastnear_addr, addr_to_rollup_ids, config.channel_width); let validated_stream = fastnear_indexer.run(); rmq_publisher.run(validated_stream); @@ -55,7 +56,7 @@ fn run(home_dir: std::path::PathBuf, config: RunConfigArgs) -> Result<()> { validate_genesis: true, }; - let mut indexer = IndexerWrapper::new(indexer_config, addresses_to_rollup_ids); + let mut indexer = IndexerWrapper::new(indexer_config, addr_to_rollup_ids); if config.metrics_ip_port_address.is_some() { indexer.enable_metrics(registry.clone())?; } From 4e711fa88a90f428bbee7dc4b6fd6685a2997b57 Mon Sep 17 00:00:00 2001 From: Sasha Syrotenko Date: Sat, 30 Nov 2024 09:18:22 +0200 Subject: [PATCH 40/40] Update integration-tests.yml --- .github/workflows/integration-tests.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 259c3bd8..343ecd3b 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -81,7 +81,3 @@ jobs: run: cargo test --features it_tests working-directory: ./indexer - - name: Rust Integration Test - run: cargo test --features it-tests - working-directory: ./tests/e2e/e2e_tests -