From 1e3d3dbe61fe315af23a8268d1d13e63ee239441 Mon Sep 17 00:00:00 2001 From: Mikhail Zabaluev Date: Tue, 12 Nov 2024 11:52:55 +0200 Subject: [PATCH] deps: bump for diesel 2.2 and diesel-async 0.5 This pulls in a newer revision of aptos-indexer-processors, which requires adaptation in local_testnet CLI. --- Cargo.lock | 613 +++++++++--------- Cargo.toml | 10 +- crates/aptos/Cargo.toml | 13 +- .../src/node/local_testnet/processors.rs | 36 +- 4 files changed, 366 insertions(+), 306 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 22c544f5db933..af30184099152 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -108,6 +108,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", + "const-random", "getrandom 0.2.11", "once_cell", "serde", @@ -130,6 +131,27 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" +[[package]] +name = "allocative" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "082af274fd02beef17b7f0725a49ecafe6c075ef56cac9d6363eb3916a9817ae" +dependencies = [ + "allocative_derive", + "ctor", +] + +[[package]] +name = "allocative_derive" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe233a377643e0fc1a56421d7c90acdec45c291b30345eb9f08e8d0ddce5a4ab" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + [[package]] name = "allocator-api2" version = "0.2.16" @@ -168,15 +190,16 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.5" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d664a92ecae85fd0a7392615844904654d1d5f5514837f471ddef4a057aba1b6" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", + "is_terminal_polyfill", "utf8parse", ] @@ -458,7 +481,7 @@ dependencies = [ "async-trait", "bcs 0.1.4", "bytes", - "clap 4.4.14", + "clap 4.5.13", "csv", "futures", "itertools 0.12.1", @@ -466,7 +489,7 @@ dependencies = [ "move-bytecode-verifier", "num_cpus", "once_cell", - "pin-project 1.1.3", + "pin-project", "proptest", "rand 0.7.3", "regex", @@ -574,7 +597,7 @@ dependencies = [ "aptos-metrics-core", "aptos-types", "bcs 0.1.4", - "clap 4.4.14", + "clap 4.5.13", "criterion", "dashmap", "itertools 0.12.1", @@ -624,7 +647,7 @@ dependencies = [ "anyhow", "camino", "chrono", - "clap 4.4.14", + "clap 4.5.13", "clap-verbosity-flag", "determinator", "env_logger", @@ -651,7 +674,7 @@ name = "aptos-cli-common" version = "1.0.0" dependencies = [ "anstyle", - "clap 4.4.14", + "clap 4.5.13", "clap_complete", ] @@ -755,7 +778,7 @@ dependencies = [ "bytes", "chrono", "claims", - "clap 4.4.14", + "clap 4.5.13", "dashmap", "enum_dispatch", "fail", @@ -842,7 +865,7 @@ dependencies = [ "backtrace", "move-core-types", "serde", - "toml 0.7.8", + "toml 0.8.2", ] [[package]] @@ -1011,7 +1034,7 @@ dependencies = [ "bcs 0.1.4", "byteorder", "claims", - "clap 4.4.14", + "clap 4.5.13", "crossbeam-channel", "dashmap", "either", @@ -1089,7 +1112,7 @@ dependencies = [ "aptos-types", "aptos-vm", "bcs 0.1.4", - "clap 4.4.14", + "clap 4.5.13", "itertools 0.12.1", "tokio", ] @@ -1104,7 +1127,7 @@ dependencies = [ "aptos-logger", "aptos-move-debugger", "aptos-push-metrics", - "clap 4.4.14", + "clap 4.5.13", "jemallocator", "tokio", ] @@ -1310,7 +1333,7 @@ dependencies = [ "async-trait", "bcs 0.1.4", "chrono", - "clap 4.4.14", + "clap 4.5.13", "derivative", "indicatif 0.15.0", "itertools 0.12.1", @@ -1323,7 +1346,7 @@ dependencies = [ "serde", "thread_local", "tokio", - "toml 0.7.8", + "toml 0.8.2", ] [[package]] @@ -1343,7 +1366,7 @@ dependencies = [ "aptos-types", "aptos-vm", "bcs 0.1.4", - "clap 4.4.14", + "clap 4.5.13", "crossbeam-channel", "ctrlc", "dashmap", @@ -1456,7 +1479,7 @@ dependencies = [ "aptos-faucet-core", "aptos-logger", "aptos-sdk", - "clap 4.4.14", + "clap 4.5.13", "tokio", ] @@ -1472,7 +1495,7 @@ dependencies = [ "aptos-sdk", "async-trait", "captcha", - "clap 4.4.14", + "clap 4.5.13", "deadpool-redis", "enum_dispatch", "futures", @@ -1513,7 +1536,7 @@ dependencies = [ "anyhow", "aptos-faucet-core", "aptos-logger", - "clap 4.4.14", + "clap 4.5.13", "tokio", ] @@ -1525,7 +1548,7 @@ dependencies = [ "aptos-logger", "aptos-node-checker", "aptos-sdk", - "clap 4.4.14", + "clap 4.5.13", "env_logger", "futures", "gcp-bigquery-client", @@ -1561,7 +1584,7 @@ dependencies = [ "aptos-transaction-generator-lib", "async-trait", "chrono", - "clap 4.4.14", + "clap 4.5.13", "either", "futures", "hex", @@ -1602,7 +1625,7 @@ dependencies = [ "aptos-testcases", "async-trait", "chrono", - "clap 4.4.14", + "clap 4.5.13", "futures", "jemallocator", "once_cell", @@ -1642,7 +1665,7 @@ dependencies = [ "bulletproofs", "byteorder", "claims", - "clap 4.4.14", + "clap 4.5.13", "codespan-reporting", "curve25519-dalek-ng", "either", @@ -1748,7 +1771,7 @@ dependencies = [ "aptos-package-builder", "aptos-types", "bcs 0.1.4", - "clap 4.4.14", + "clap 4.5.13", "move-core-types", "move-model", "tempfile", @@ -1842,7 +1865,7 @@ dependencies = [ "aptos-moving-average 0.1.0 (git+https://github.com/movementlabsxyz/aptos-indexer-processors)", "aptos-protos 1.3.0", "async-trait", - "clap 4.4.14", + "clap 4.5.13", "futures", "futures-core", "jemallocator", @@ -1870,7 +1893,7 @@ dependencies = [ "aptos-protos 1.3.0", "aptos-transaction-filter", "async-trait", - "clap 4.4.14", + "clap 4.5.13", "futures", "jemallocator", "once_cell", @@ -1896,7 +1919,7 @@ dependencies = [ "aptos-metrics-core", "aptos-moving-average 0.1.0 (git+https://github.com/movementlabsxyz/aptos-indexer-processors)", "async-trait", - "clap 4.4.14", + "clap 4.5.13", "futures", "jemallocator", "once_cell", @@ -2010,13 +2033,13 @@ dependencies = [ "aptos-system-utils 0.1.0", "async-trait", "backtrace", - "clap 4.4.14", + "clap 4.5.13", "prometheus", "serde", "serde_yaml 0.8.26", "tempfile", "tokio", - "toml 0.7.8", + "toml 0.8.2", "tracing", "tracing-subscriber 0.3.18", "warp", @@ -2518,7 +2541,7 @@ dependencies = [ "aptos-vm-logging", "aptos-vm-types", "bcs 0.1.4", - "clap 4.4.14", + "clap 4.5.13", "itertools 0.12.1", "regex", "reqwest", @@ -2546,7 +2569,7 @@ dependencies = [ "aptos-gas-schedule", "aptos-types", "aptos-vm", - "clap 4.4.14", + "clap 4.5.13", "move-cli", "move-package", "move-prover", @@ -2578,7 +2601,7 @@ dependencies = [ [[package]] name = "aptos-moving-average" version = "0.1.0" -source = "git+https://github.com/aptos-labs/aptos-indexer-processors.git?rev=5244b84fa5ed872e5280dc8df032d744d62ad29d#5244b84fa5ed872e5280dc8df032d744d62ad29d" +source = "git+https://github.com/movementlabsxyz/aptos-indexer-processors?rev=a43b90b98bc5e8d79d37cc6058ed2cfa741c0997#a43b90b98bc5e8d79d37cc6058ed2cfa741c0997" dependencies = [ "chrono", ] @@ -2640,7 +2663,7 @@ dependencies = [ "aptos-types", "bytes", "futures", - "pin-project 1.1.3", + "pin-project", "serde", "tokio", "tokio-util 0.7.10", @@ -2680,7 +2703,7 @@ dependencies = [ "maplit", "once_cell", "ordered-float 3.9.2", - "pin-project 1.1.3", + "pin-project", "proptest", "proptest-derive", "rand 0.7.3", @@ -2747,7 +2770,7 @@ dependencies = [ "aptos-logger", "aptos-network", "aptos-types", - "clap 4.4.14", + "clap 4.5.13", "futures", "serde", "tokio", @@ -2837,7 +2860,7 @@ dependencies = [ "aptos-validator-transaction-pool", "aptos-vm", "bcs 0.1.4", - "clap 4.4.14", + "clap 4.5.13", "either", "fail", "futures", @@ -2867,7 +2890,7 @@ dependencies = [ "aptos-sdk", "aptos-transaction-emitter-lib", "async-trait", - "clap 4.4.14", + "clap 4.5.13", "futures", "once_cell", "poem", @@ -2938,7 +2961,7 @@ dependencies = [ "aptos-mempool", "aptos-storage-interface", "aptos-types", - "clap 4.4.14", + "clap 4.5.13", ] [[package]] @@ -3040,7 +3063,7 @@ dependencies = [ [[package]] name = "aptos-profiler" version = "0.1.0" -source = "git+https://github.com/aptos-labs/aptos-core.git?rev=4541add3fd29826ec57f22658ca286d2d6134b93#4541add3fd29826ec57f22658ca286d2d6134b93" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=338f9a1bcc06f62ce4a4994f1642b9a61b631ee0#338f9a1bcc06f62ce4a4994f1642b9a61b631ee0" dependencies = [ "anyhow", "backtrace", @@ -3073,7 +3096,7 @@ dependencies = [ [[package]] name = "aptos-protos" version = "1.3.0" -source = "git+https://github.com/aptos-labs/aptos-core.git?tag=aptos-node-v1.12.1#4b9a2593facaee92b28df2e99b2773a7e4f930f5" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=338f9a1bcc06f62ce4a4994f1642b9a61b631ee0#338f9a1bcc06f62ce4a4994f1642b9a61b631ee0" dependencies = [ "futures-core", "pbjson", @@ -3107,7 +3130,7 @@ dependencies = [ "aptos-logger", "aptos-metrics-core", "futures", - "pin-project 1.1.3", + "pin-project", "tokio", "tokio-util 0.7.10", ] @@ -3130,7 +3153,7 @@ dependencies = [ "aptos-temppath", "aptos-types", "bcs 0.1.4", - "clap 4.4.14", + "clap 4.5.13", "futures", "git2 0.16.1", "handlebars", @@ -3196,7 +3219,7 @@ dependencies = [ "aptos-types", "bcs 0.1.4", "bytes", - "clap 4.4.14", + "clap 4.5.13", "hex", "move-core-types", "reqwest", @@ -3240,7 +3263,7 @@ dependencies = [ "aptos-types", "aptos-warp-webserver", "bcs 0.1.4", - "clap 4.4.14", + "clap 4.5.13", "futures", "hex", "itertools 0.12.1", @@ -3263,7 +3286,7 @@ dependencies = [ "aptos-logger", "aptos-rosetta", "aptos-types", - "clap 4.4.14", + "clap 4.5.13", "movement", "serde", "serde_json", @@ -3381,7 +3404,7 @@ dependencies = [ "aptos-framework", "aptos-types", "bcs 0.1.4", - "clap 4.4.14", + "clap 4.5.13", "heck 0.4.1", "move-core-types", "once_cell", @@ -3634,10 +3657,10 @@ dependencies = [ [[package]] name = "aptos-system-utils" version = "0.1.0" -source = "git+https://github.com/aptos-labs/aptos-core.git?rev=4541add3fd29826ec57f22658ca286d2d6134b93#4541add3fd29826ec57f22658ca286d2d6134b93" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=338f9a1bcc06f62ce4a4994f1642b9a61b631ee0#338f9a1bcc06f62ce4a4994f1642b9a61b631ee0" dependencies = [ "anyhow", - "aptos-profiler 0.1.0 (git+https://github.com/aptos-labs/aptos-core.git?rev=4541add3fd29826ec57f22658ca286d2d6134b93)", + "aptos-profiler 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?rev=338f9a1bcc06f62ce4a4994f1642b9a61b631ee0)", "async-mutex", "http", "hyper", @@ -3723,7 +3746,7 @@ dependencies = [ "bcs 0.1.4", "chrono", "claims", - "clap 4.4.14", + "clap 4.5.13", "debug-ignore", "flate2", "futures", @@ -3793,7 +3816,7 @@ dependencies = [ "aptos-infallible", "enum_dispatch", "futures", - "pin-project 1.1.3", + "pin-project", "thiserror", "tokio", "tokio-test", @@ -3815,7 +3838,7 @@ dependencies = [ "aptos-types", "aptos-vm", "aptos-vm-logging", - "clap 4.4.14", + "clap 4.5.13", "criterion", "criterion-cpu-time", "num_cpus", @@ -3831,7 +3854,7 @@ dependencies = [ "aptos-logger", "aptos-sdk", "aptos-transaction-emitter-lib", - "clap 4.4.14", + "clap 4.5.13", "futures", "rand 0.7.3", "tokio", @@ -3853,7 +3876,7 @@ dependencies = [ "aptos-transaction-generator-lib", "aptos-types", "async-trait", - "clap 4.4.14", + "clap 4.5.13", "futures", "itertools 0.12.1", "once_cell", @@ -3890,7 +3913,7 @@ dependencies = [ "aptos-logger", "aptos-sdk", "async-trait", - "clap 4.4.14", + "clap 4.5.13", "move-binary-format", "once_cell", "rand 0.7.3", @@ -3915,7 +3938,7 @@ dependencies = [ "aptos-vm", "aptos-vm-genesis", "bcs 0.1.4", - "clap 4.4.14", + "clap 4.5.13", "codespan-reporting", "datatest-stable", "hex", @@ -4163,7 +4186,7 @@ dependencies = [ "aptos-types", "aptos-vm", "bcs 0.1.4", - "clap 4.4.14", + "clap 4.5.13", "glob", "move-binary-format", "move-core-types", @@ -4563,19 +4586,6 @@ dependencies = [ "pin-project-lite", ] -[[package]] -name = "async-compression" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc2d0cfb2a7388d34f590e76686704c494ed7aaceed62ee1ba35cbf363abc2a5" -dependencies = [ - "flate2", - "futures-core", - "memchr", - "pin-project-lite", - "tokio", -] - [[package]] name = "async-executor" version = "1.8.0" @@ -5125,7 +5135,7 @@ version = "0.69.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.6.0", "cexpr", "clang-sys", "itertools 0.12.1", @@ -5162,9 +5172,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "bitmaps" @@ -5511,7 +5521,7 @@ name = "calc-dep-sizes" version = "0.1.0" dependencies = [ "anyhow", - "clap 4.4.14", + "clap 4.5.13", "futures", "move-binary-format", "move-core-types", @@ -5528,6 +5538,19 @@ dependencies = [ "serde", ] +[[package]] +name = "canonical_json" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f89083fd014d71c47a718d7f4ac050864dac8587668dbe90baf9e261064c5710" +dependencies = [ + "hex", + "regex", + "serde", + "serde_json", + "thiserror", +] + [[package]] name = "captcha" version = "0.0.9" @@ -5633,9 +5656,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.31" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", @@ -5643,7 +5666,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.48.5", + "windows-targets 0.52.0", ] [[package]] @@ -5765,12 +5788,12 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.14" +version = "4.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33e92c5c1a78c62968ec57dbc2440366a2d6e5a23faf829970ff1585dc6b18e2" +checksum = "0fbb260a053428790f3de475e304ff84cdbc4face759ea7a3e64c1edd938a7fc" dependencies = [ "clap_builder", - "clap_derive 4.4.7", + "clap_derive 4.5.13", ] [[package]] @@ -5779,20 +5802,20 @@ version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c90e95e5bd4e8ac34fa6f37c774b0c6f8ed06ea90c79931fd448fcf941a9767" dependencies = [ - "clap 4.4.14", + "clap 4.5.13", "log", ] [[package]] name = "clap_builder" -version = "4.4.14" +version = "4.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4323769dc8a61e2c39ad7dc26f6f2800524691a44d74fe3d1071a5c24db6370" +checksum = "64b17d7ea74e9f833c7dbf2cbe4fb12ff26783eda4782a8975b72f895c9b4d99" dependencies = [ "anstream", "anstyle", - "clap_lex 0.6.0", - "strsim 0.10.0", + "clap_lex 0.7.2", + "strsim 0.11.1", ] [[package]] @@ -5801,7 +5824,7 @@ version = "4.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97aeaa95557bd02f23fbb662f981670c3d20c5a26e69f7354b28f57092437fcd" dependencies = [ - "clap 4.4.14", + "clap 4.5.13", ] [[package]] @@ -5819,11 +5842,11 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.4.7" +version = "4.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" dependencies = [ - "heck 0.4.1", + "heck 0.5.0", "proc-macro2", "quote", "syn 2.0.48", @@ -5840,9 +5863,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.6.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" [[package]] name = "clear_on_drop" @@ -6006,6 +6029,26 @@ 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 0.2.11", + "once_cell", + "tiny-keccak", +] + [[package]] name = "const_fn" version = "0.4.9" @@ -6383,6 +6426,16 @@ dependencies = [ "memchr", ] +[[package]] +name = "ctor" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" +dependencies = [ + "quote", + "syn 1.0.109", +] + [[package]] name = "ctr" version = "0.9.2" @@ -6802,12 +6855,12 @@ checksum = "3ae2a35373c5c74340b79ae6780b498b2b183915ec5dacf263aac5a099bf485a" [[package]] name = "diesel" -version = "2.1.1" +version = "2.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d98235fdc2f355d330a8244184ab6b4b33c28679c0b4158f63138e51d6cf7e88" +checksum = "158fe8e2e68695bd615d7e4f3227c0727b151330d3e253b525086c348d055d5e" dependencies = [ "bigdecimal", - "bitflags 2.4.1", + "bitflags 2.6.0", "byteorder", "chrono", "diesel_derives", @@ -6822,22 +6875,9 @@ dependencies = [ [[package]] name = "diesel-async" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acada1517534c92d3f382217b485db8a8638f111b0e3f2a2a8e26165050f77be" -dependencies = [ - "async-trait", - "diesel", - "futures-util", - "scoped-futures", - "tokio", - "tokio-postgres", -] - -[[package]] -name = "diesel-async" -version = "0.4.1" -source = "git+https://github.com/weiznich/diesel_async.git?rev=d02798c67065d763154d7272dd0c09b39757d0f2#d02798c67065d763154d7272dd0c09b39757d0f2" +checksum = "4c5c6ec8d5c7b8444d19a47161797cbe361e0fb1ee40c6a8124ec915b64a4125" dependencies = [ "async-trait", "bb8", @@ -6848,25 +6888,14 @@ dependencies = [ "tokio-postgres", ] -[[package]] -name = "diesel_async_migrations" -version = "0.11.0" -source = "git+https://github.com/niroco/diesel_async_migrations?rev=11f331b73c5cfcc894380074f748d8fda710ac12#11f331b73c5cfcc894380074f748d8fda710ac12" -dependencies = [ - "diesel", - "diesel-async 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "macros", - "scoped-futures", - "tracing", -] - [[package]] name = "diesel_derives" -version = "2.1.2" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef8337737574f55a468005a83499da720f20c65586241ffea339db9ecdfd2b44" +checksum = "e7f2c3de51e2ba6bf2a648285696137aaf0f5f487bcbea93972fe8a364e131a4" dependencies = [ "diesel_table_macro_syntax", + "dsl_auto_type", "proc-macro2", "quote", "syn 2.0.48", @@ -6874,9 +6903,9 @@ dependencies = [ [[package]] name = "diesel_migrations" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6036b3f0120c5961381b570ee20a02432d7e2d27ea60de9578799cf9156914ac" +checksum = "8a73ce704bad4231f001bff3314d91dce4aba0770cee8b233991859abc15c1f6" dependencies = [ "diesel", "migrations_internals", @@ -6885,9 +6914,9 @@ dependencies = [ [[package]] name = "diesel_table_macro_syntax" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc5557efc453706fed5e4fa85006fe9817c224c3f480a34c7e5959fd700921c5" +checksum = "209c735641a413bc68c4923a9d6ad4bcb3ca306b794edaa7eb0b3228a99ffb25" dependencies = [ "syn 2.0.48", ] @@ -7018,6 +7047,20 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1" +[[package]] +name = "dsl_auto_type" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5d9abe6314103864cc2d8901b7ae224e0ab1a103a0a416661b4097b0779b607" +dependencies = [ + "darling 0.20.9", + "either", + "heck 0.5.0", + "proc-macro2", + "quote", + "syn 2.0.48", +] + [[package]] name = "dunce" version = "1.0.4" @@ -7501,7 +7544,7 @@ version = "0.1.0" dependencies = [ "anyhow", "atty", - "clap 4.4.14", + "clap 4.5.13", "codespan-reporting", "move-to-yul", "serde_json", @@ -7973,49 +8016,6 @@ version = "0.3.55" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" -[[package]] -name = "gcemeta" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47d460327b24cc34c86d53d60a90e9e6044817f7906ebd9baa5c3d0ee13e1ecf" -dependencies = [ - "bytes", - "hyper", - "serde", - "serde_json", - "thiserror", - "tokio", - "tracing", -] - -[[package]] -name = "gcloud-sdk" -version = "0.20.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a24376e7850e7864bb326debc5765a1dda4fc47603c22e2bc0ebf30ff59141b" -dependencies = [ - "async-trait", - "chrono", - "futures", - "gcemeta", - "hyper", - "jsonwebtoken 8.3.0", - "once_cell", - "prost 0.11.9", - "prost-types 0.11.9", - "reqwest", - "secret-vault-value", - "serde", - "serde_json", - "tokio", - "tonic 0.9.2", - "tower", - "tower-layer", - "tower-util", - "tracing", - "url", -] - [[package]] name = "gcp-bigquery-client" version = "0.16.8" @@ -8419,6 +8419,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "02b4af3693f1b705df946e9fe5631932443781d0aabb423b62fcd4d73f6d2fd0" dependencies = [ "crunchy", + "num-traits", ] [[package]] @@ -8835,7 +8836,7 @@ dependencies = [ "futures-util", "hex", "hyper", - "pin-project 1.1.3", + "pin-project", "tokio", ] @@ -9083,7 +9084,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "321f0f839cd44a4686e9504b0a62b4d69a50b62072144c71c68f5873c167b8d9" dependencies = [ "ahash 0.8.11", - "clap 4.4.14", + "clap 4.5.13", "crossbeam-channel", "crossbeam-utils", "dashmap", @@ -9120,6 +9121,12 @@ dependencies = [ "web-sys", ] +[[package]] +name = "integer-encoding" +version = "3.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02" + [[package]] name = "internment" version = "0.5.6" @@ -9185,6 +9192,12 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06d198e9919d9822d5f7083ba8530e04de87841eaf21ead9af8f2304efd57c89" +[[package]] +name = "is_terminal_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + [[package]] name = "isahc" version = "1.7.2" @@ -9414,7 +9427,7 @@ dependencies = [ "k8s-openapi", "kube-core", "pem 1.1.1", - "pin-project 1.1.3", + "pin-project", "rustls 0.20.9", "rustls-pemfile 0.2.1", "serde", @@ -9641,7 +9654,7 @@ version = "0.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.6.0", "libc", "redox_syscall 0.4.1", ] @@ -9776,7 +9789,7 @@ name = "listener" version = "0.1.0" dependencies = [ "bytes", - "clap 4.4.14", + "clap 4.5.13", "tokio", ] @@ -9852,12 +9865,12 @@ dependencies = [ ] [[package]] -name = "macros" -version = "0.1.0" -source = "git+https://github.com/niroco/diesel_async_migrations?rev=11f331b73c5cfcc894380074f748d8fda710ac12#11f331b73c5cfcc894380074f748d8fda710ac12" +name = "lz4_flex" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75761162ae2b0e580d7e7c390558127e5f01b4194debd6221fd8c207fc80e3f5" dependencies = [ - "proc-macro2", - "quote", + "twox-hash", ] [[package]] @@ -9947,19 +9960,19 @@ dependencies = [ [[package]] name = "migrations_internals" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f23f71580015254b020e856feac3df5878c2c7a8812297edd6c0a485ac9dada" +checksum = "fd01039851e82f8799046eabbb354056283fb265c8ec0996af940f4e85a380ff" dependencies = [ "serde", - "toml 0.7.8", + "toml 0.8.2", ] [[package]] name = "migrations_macros" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cce3325ac70e67bbab5bd837a31cae01f1a6db64e0e744a33cb03a543469ef08" +checksum = "ffb161cc72176cb37aa47f1fc520d3ef02263d67d661f44f05d05a079e1237fd" dependencies = [ "migrations_internals", "proc-macro2", @@ -10078,7 +10091,7 @@ dependencies = [ "anyhow", "aptos-framework", "bcs 0.1.4", - "clap 4.4.14", + "clap 4.5.13", "move-binary-format", ] @@ -10208,7 +10221,7 @@ name = "move-bytecode-viewer" version = "0.1.0" dependencies = [ "anyhow", - "clap 4.4.14", + "clap 4.5.13", "crossterm 0.26.1", "move-binary-format", "move-bytecode-source-map", @@ -10222,7 +10235,7 @@ name = "move-cli" version = "0.1.0" dependencies = [ "anyhow", - "clap 4.4.14", + "clap 4.5.13", "codespan-reporting", "colored", "datatest-stable", @@ -10270,7 +10283,7 @@ version = "0.0.1" dependencies = [ "anyhow", "bcs 0.1.4", - "clap 4.4.14", + "clap 4.5.13", "codespan-reporting", "datatest-stable", "hex", @@ -10306,7 +10319,7 @@ dependencies = [ "abstract-domain-derive", "anyhow", "bcs 0.1.4", - "clap 4.4.14", + "clap 4.5.13", "codespan-reporting", "datatest-stable", "ethnum", @@ -10380,7 +10393,7 @@ version = "0.1.0" dependencies = [ "anyhow", "bcs 0.1.4", - "clap 4.4.14", + "clap 4.5.13", "codespan", "colored", "move-binary-format", @@ -10397,7 +10410,7 @@ name = "move-disassembler" version = "0.1.0" dependencies = [ "anyhow", - "clap 4.4.14", + "clap 4.5.13", "colored", "move-binary-format", "move-bytecode-source-map", @@ -10413,7 +10426,7 @@ name = "move-docgen" version = "0.1.0" dependencies = [ "anyhow", - "clap 4.4.14", + "clap 4.5.13", "codespan", "codespan-reporting", "datatest-stable", @@ -10466,7 +10479,7 @@ name = "move-explain" version = "0.1.0" dependencies = [ "bcs 0.1.4", - "clap 4.4.14", + "clap 4.5.13", "move-command-line-common", "move-core-types", ] @@ -10477,7 +10490,7 @@ version = "0.1.0" dependencies = [ "anyhow", "bcs 0.1.4", - "clap 4.4.14", + "clap 4.5.13", "move-binary-format", "move-bytecode-source-map", "move-bytecode-verifier", @@ -10567,7 +10580,7 @@ name = "move-package" version = "0.1.0" dependencies = [ "anyhow", - "clap 4.4.14", + "clap 4.5.13", "colored", "datatest-stable", "evm-exec-utils", @@ -10595,7 +10608,7 @@ dependencies = [ "sha2 0.9.9", "tempfile", "termcolor", - "toml 0.7.8", + "toml 0.8.2", "walkdir", "whoami", ] @@ -10606,7 +10619,7 @@ version = "0.1.0" dependencies = [ "anyhow", "atty", - "clap 4.4.14", + "clap 4.5.13", "codespan-reporting", "datatest-stable", "itertools 0.12.1", @@ -10627,7 +10640,7 @@ dependencies = [ "shell-words", "simplelog", "tempfile", - "toml 0.7.8", + "toml 0.8.2", "walkdir", ] @@ -10800,7 +10813,7 @@ version = "0.1.0" dependencies = [ "anyhow", "atty", - "clap 4.4.14", + "clap 4.5.13", "codespan", "codespan-reporting", "datatest-stable", @@ -10831,7 +10844,7 @@ name = "move-transactional-test-runner" version = "0.1.0" dependencies = [ "anyhow", - "clap 4.4.14", + "clap 4.5.13", "datatest-stable", "difference", "move-binary-format", @@ -10863,7 +10876,7 @@ version = "0.1.0" dependencies = [ "anyhow", "better_any", - "clap 4.4.14", + "clap 4.5.13", "codespan-reporting", "colored", "datatest-stable", @@ -11031,11 +11044,11 @@ dependencies = [ "bcs 0.1.4", "bollard", "chrono", - "clap 4.4.14", + "clap 4.5.13", "clap_complete", "dashmap", "diesel", - "diesel-async 0.4.1 (git+https://github.com/weiznich/diesel_async.git?rev=d02798c67065d763154d7272dd0c09b39757d0f2)", + "diesel-async", "dirs", "futures", "hex", @@ -11070,7 +11083,7 @@ dependencies = [ "tempfile", "thiserror", "tokio", - "toml 0.7.8", + "toml 0.8.2", "tonic 0.11.0", "tracing", "tracing-subscriber 0.3.18", @@ -11177,7 +11190,7 @@ version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.6.0", "cfg-if", "libc", ] @@ -11536,7 +11549,7 @@ version = "0.10.62" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8cde4d2d9200ad5909f8dac647e29482e07c3a35de8a13fce7c9c7747ad9f671" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.6.0", "cfg-if", "foreign-types 0.3.2", "libc", @@ -11775,6 +11788,40 @@ dependencies = [ "windows-targets 0.48.5", ] +[[package]] +name = "parquet" +version = "52.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e977b9066b4d3b03555c22bdc442f3fadebd96a39111249113087d0edb2691cd" +dependencies = [ + "ahash 0.8.11", + "bytes", + "chrono", + "futures", + "half 2.2.1", + "hashbrown 0.14.3", + "lz4_flex", + "num 0.4.1", + "num-bigint 0.4.4", + "paste", + "seq-macro", + "thrift", + "tokio", + "twox-hash", +] + +[[package]] +name = "parquet_derive" +version = "52.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e57262f900bc3e93755be67e0fc4e2fcdae416b563472528e413c6e0a52ee81" +dependencies = [ + "parquet", + "proc-macro2", + "quote", + "syn 2.0.48", +] + [[package]] name = "parse-zoneinfo" version = "0.3.0" @@ -11823,7 +11870,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "499cff8432e71c5f8784d9645aac0f9fca604d67f59b68a606170b5e229c6538" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.6.0", "ciborium", "coset", "data-encoding", @@ -12053,33 +12100,13 @@ dependencies = [ "siphasher", ] -[[package]] -name = "pin-project" -version = "0.4.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ef0f924a5ee7ea9cbcea77529dba45f8a9ba9f622419fe3386ca581a3ae9d5a" -dependencies = [ - "pin-project-internal 0.4.30", -] - [[package]] name = "pin-project" version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" dependencies = [ - "pin-project-internal 1.1.3", -] - -[[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]] @@ -12658,47 +12685,54 @@ dependencies = [ [[package]] name = "processor" version = "1.0.0" -source = "git+https://github.com/aptos-labs/aptos-indexer-processors.git?rev=5244b84fa5ed872e5280dc8df032d744d62ad29d#5244b84fa5ed872e5280dc8df032d744d62ad29d" +source = "git+https://github.com/movementlabsxyz/aptos-indexer-processors?rev=a43b90b98bc5e8d79d37cc6058ed2cfa741c0997#a43b90b98bc5e8d79d37cc6058ed2cfa741c0997" dependencies = [ "ahash 0.8.11", + "allocative", + "allocative_derive", "anyhow", - "aptos-moving-average 0.1.0 (git+https://github.com/aptos-labs/aptos-indexer-processors.git?rev=5244b84fa5ed872e5280dc8df032d744d62ad29d)", - "aptos-protos 1.3.0 (git+https://github.com/aptos-labs/aptos-core.git?tag=aptos-node-v1.12.1)", + "aptos-moving-average 0.1.0 (git+https://github.com/movementlabsxyz/aptos-indexer-processors?rev=a43b90b98bc5e8d79d37cc6058ed2cfa741c0997)", + "aptos-protos 1.3.0 (git+https://github.com/movementlabsxyz/aptos-core?rev=338f9a1bcc06f62ce4a4994f1642b9a61b631ee0)", "async-trait", - "base64 0.13.1", "bcs 0.1.4", "bigdecimal", + "bitflags 2.6.0", + "canonical_json", "chrono", - "clap 4.4.14", + "clap 4.5.13", "diesel", - "diesel-async 0.4.1 (git+https://github.com/weiznich/diesel_async.git?rev=d02798c67065d763154d7272dd0c09b39757d0f2)", - "diesel_async_migrations", + "diesel-async", "diesel_migrations", "enum_dispatch", "field_count", "futures", "futures-util", - "gcloud-sdk", "google-cloud-googleapis", "google-cloud-pubsub", + "google-cloud-storage", "hex", + "hyper", "itertools 0.12.1", "jemallocator", "kanal", + "lazy_static", "native-tls", + "num 0.4.1", "num_cpus", "once_cell", + "parquet", + "parquet_derive", "postgres-native-tls", "prometheus", "prost 0.12.3", - "prost-types 0.12.3", "regex", "serde", "serde_json", "server-framework", "sha2 0.9.9", "sha3 0.9.1", - "strum 0.24.1", + "strum 0.26.2", + "tiny-keccak", "tokio", "tokio-postgres", "tonic 0.11.0", @@ -12775,7 +12809,7 @@ checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf" dependencies = [ "bit-set", "bit-vec", - "bitflags 2.4.1", + "bitflags 2.6.0", "lazy_static", "num-traits", "rand 0.8.5", @@ -12893,7 +12927,7 @@ version = "0.1.0" dependencies = [ "anyhow", "chrono", - "clap 4.4.14", + "clap 4.5.13", "codespan-reporting", "itertools 0.12.1", "log", @@ -13287,7 +13321,6 @@ version = "0.11.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41" dependencies = [ - "async-compression", "base64 0.21.6", "bytes", "cookie 0.16.2", @@ -13637,7 +13670,7 @@ version = "0.38.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.6.0", "errno", "libc", "linux-raw-sys 0.4.12", @@ -13916,19 +13949,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "secret-vault-value" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5f8cfb86d2019f64a4cfb49e499f401f406fbec946c1ffeea9d0504284347de" -dependencies = [ - "prost 0.12.3", - "prost-types 0.12.3", - "serde", - "serde_json", - "zeroize", -] - [[package]] name = "security-framework" version = "2.9.2" @@ -13997,11 +14017,17 @@ name = "sender" version = "0.1.0" dependencies = [ "bytes", - "clap 4.4.14", + "clap 4.5.13", "event-listener 2.5.3", "tokio", ] +[[package]] +name = "seq-macro" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4" + [[package]] name = "serde" version = "1.0.197" @@ -14240,20 +14266,19 @@ dependencies = [ [[package]] name = "server-framework" version = "1.0.0" -source = "git+https://github.com/aptos-labs/aptos-indexer-processors.git?rev=5244b84fa5ed872e5280dc8df032d744d62ad29d#5244b84fa5ed872e5280dc8df032d744d62ad29d" +source = "git+https://github.com/movementlabsxyz/aptos-indexer-processors?rev=a43b90b98bc5e8d79d37cc6058ed2cfa741c0997#a43b90b98bc5e8d79d37cc6058ed2cfa741c0997" dependencies = [ "anyhow", - "aptos-system-utils 0.1.0 (git+https://github.com/aptos-labs/aptos-core.git?rev=4541add3fd29826ec57f22658ca286d2d6134b93)", + "aptos-system-utils 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?rev=338f9a1bcc06f62ce4a4994f1642b9a61b631ee0)", "async-trait", "backtrace", - "clap 4.4.14", - "futures", + "clap 4.5.13", "prometheus", "serde", "serde_yaml 0.8.26", "tempfile", "tokio", - "toml 0.7.8", + "toml 0.8.2", "tracing", "tracing-subscriber 0.3.18", "warp", @@ -14816,9 +14841,6 @@ 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" @@ -14834,6 +14856,9 @@ name = "strum" version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" +dependencies = [ + "strum_macros 0.26.4", +] [[package]] name = "strum_macros" @@ -15122,7 +15147,7 @@ dependencies = [ name = "test-generation" version = "0.1.0" dependencies = [ - "clap 4.4.14", + "clap 4.5.13", "crossbeam-channel", "getrandom 0.2.11", "hex", @@ -15148,7 +15173,7 @@ name = "testdiff" version = "0.1.0" dependencies = [ "anyhow", - "clap 4.4.14", + "clap 4.5.13", "once_cell", "regex", "walkdir", @@ -15229,6 +15254,17 @@ dependencies = [ "num_cpus", ] +[[package]] +name = "thrift" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e54bc85fc7faa8bc175c4bab5b92ba8d9a3ce893d0e9f42cc455c8ab16a9e09" +dependencies = [ + "byteorder", + "integer-encoding", + "ordered-float 2.10.1", +] + [[package]] name = "time" version = "0.3.31" @@ -15396,7 +15432,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f57eb36ecbe0fc510036adff84824dd3c24bb781e21bfa67b69d556aa85214f" dependencies = [ - "pin-project 1.1.3", + "pin-project", "rand 0.8.5", "tokio", ] @@ -15520,14 +15556,14 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.8" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" +checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.19.15", + "toml_edit 0.20.2", ] [[package]] @@ -15546,8 +15582,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ "indexmap 2.2.5", - "serde", - "serde_spanned", "toml_datetime", "winnow", ] @@ -15559,6 +15593,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" dependencies = [ "indexmap 2.2.5", + "serde", + "serde_spanned", "toml_datetime", "winnow", ] @@ -15583,9 +15619,8 @@ dependencies = [ "hyper", "hyper-timeout", "percent-encoding", - "pin-project 1.1.3", + "pin-project", "prost 0.11.9", - "rustls-native-certs 0.6.3", "rustls-pemfile 1.0.4", "tokio", "tokio-rustls 0.24.1", @@ -15614,7 +15649,7 @@ dependencies = [ "hyper", "hyper-timeout", "percent-encoding", - "pin-project 1.1.3", + "pin-project", "prost 0.12.3", "rustls-native-certs 0.7.0", "rustls-pemfile 2.1.1", @@ -15652,7 +15687,7 @@ dependencies = [ "futures-core", "futures-util", "indexmap 1.9.3", - "pin-project 1.1.3", + "pin-project", "pin-project-lite", "rand 0.8.5", "slab", @@ -15714,18 +15749,6 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" -[[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" @@ -15765,7 +15788,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" dependencies = [ - "pin-project 1.1.3", + "pin-project", "tracing", ] @@ -15913,6 +15936,16 @@ dependencies = [ "utf-8", ] +[[package]] +name = "twox-hash" +version = "1.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" +dependencies = [ + "cfg-if", + "static_assertions", +] + [[package]] name = "typed-arena" version = "2.0.2" @@ -16319,7 +16352,7 @@ dependencies = [ "mime_guess", "multer", "percent-encoding", - "pin-project 1.1.3", + "pin-project", "rustls-pemfile 1.0.4", "scoped-tls", "serde", diff --git a/Cargo.toml b/Cargo.toml index 33fe32c8244b5..21d713824e13d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -533,16 +533,14 @@ derivation-path = "0.2.0" derive_builder = "0.20.0" determinator = "0.12.0" derive_more = "0.99.11" -diesel = "=2.1.1" -# Use the crate version once this feature gets released on crates.io: -# https://github.com/weiznich/diesel_async/commit/e165e8c96a6c540ebde2d6d7c52df5c5620a4bf1 -diesel-async = { git = "https://github.com/weiznich/diesel_async.git", rev = "d02798c67065d763154d7272dd0c09b39757d0f2", features = [ +diesel = "2.2.3" +diesel-async = { version = "0.5", features = [ "async-connection-wrapper", "postgres", "bb8", "tokio", ] } -diesel_migrations = { version = "2.1.0", features = ["postgres"] } +diesel_migrations = { version = "2.2", features = ["postgres"] } difference = "2.0.0" digest = "0.9.0" dir-diff = "0.3.2" @@ -762,7 +760,7 @@ tokio-scoped = { version = "0.2.0" } tokio-stream = { version = "0.1.14", features = ["fs"] } tokio-test = "0.4.1" tokio-util = { version = "0.7.2", features = ["compat", "codec"] } -toml = "0.7.4" +toml = "0.8" tonic = { version = "0.11.0", features = [ "tls-roots", "transport", diff --git a/crates/aptos/Cargo.toml b/crates/aptos/Cargo.toml index e9f4c42c3e76e..c4bc8df7d7fec 100644 --- a/crates/aptos/Cargo.toml +++ b/crates/aptos/Cargo.toml @@ -56,9 +56,7 @@ chrono = { workspace = true } clap = { workspace = true, features = ["env", "unstable-styles"] } clap_complete = { workspace = true } dashmap = { workspace = true } -diesel = { workspace = true, features = [ - "postgres_backend", -] } +diesel = { workspace = true, features = ["postgres_backend"] } diesel-async = { workspace = true } dirs = { workspace = true } futures = { workspace = true } @@ -83,14 +81,17 @@ pathsearch = { workspace = true } poem = { workspace = true } # We set default-features to false so we don't onboard the libpq dep. See more here: # https://github.com/aptos-labs/aptos-core/pull/12568 -processor = { git = "https://github.com/aptos-labs/aptos-indexer-processors.git", rev = "5244b84fa5ed872e5280dc8df032d744d62ad29d", default-features = false } +processor = { git = "https://github.com/movementlabsxyz/aptos-indexer-processors", rev = "a43b90b98bc5e8d79d37cc6058ed2cfa741c0997", default-features = false } rand = { workspace = true } reqwest = { workspace = true } -self_update = { git = "https://github.com/banool/self_update.git", rev = "8306158ad0fd5b9d4766a3c6bf967e7ef0ea5c4b", features = ["archive-zip", "compression-zip-deflate"] } +self_update = { git = "https://github.com/banool/self_update.git", rev = "8306158ad0fd5b9d4766a3c6bf967e7ef0ea5c4b", features = [ + "archive-zip", + "compression-zip-deflate", +] } serde = { workspace = true } serde_json = { workspace = true } serde_yaml = { workspace = true } -server-framework = { git = "https://github.com/aptos-labs/aptos-indexer-processors.git", rev = "5244b84fa5ed872e5280dc8df032d744d62ad29d" } +server-framework = { git = "https://github.com/movementlabsxyz/aptos-indexer-processors", rev = "a43b90b98bc5e8d79d37cc6058ed2cfa741c0997" } tempfile = { workspace = true } thiserror = { workspace = true } tokio = { workspace = true } diff --git a/crates/aptos/src/node/local_testnet/processors.rs b/crates/aptos/src/node/local_testnet/processors.rs index 40f5552e179d7..a953c68a1b816 100644 --- a/crates/aptos/src/node/local_testnet/processors.rs +++ b/crates/aptos/src/node/local_testnet/processors.rs @@ -10,9 +10,11 @@ use diesel_async::{async_connection_wrapper::AsyncConnectionWrapper, pg::AsyncPg use maplit::hashset; use processor::{ processors::{ - objects_processor::ObjectsProcessorConfig, stake_processor::StakeProcessorConfig, - token_processor::TokenProcessorConfig, token_v2_processor::TokenV2ProcessorConfig, - ProcessorConfig, ProcessorName, + objects_processor::ObjectsProcessorConfig, + parquet_processors::parquet_default_processor::ParquetDefaultProcessorConfig, + parquet_processors::parquet_fungible_asset_processor::ParquetFungibleAssetProcessorConfig, + stake_processor::StakeProcessorConfig, token_processor::TokenProcessorConfig, + token_v2_processor::TokenV2ProcessorConfig, ProcessorConfig, ProcessorName, }, utils::database::run_pending_migrations, IndexerGrpcProcessorConfig, @@ -113,6 +115,28 @@ impl ProcessorManager { ProcessorConfig::TransactionMetadataProcessor }, ProcessorName::UserTransactionProcessor => ProcessorConfig::UserTransactionProcessor, + ProcessorName::ParquetDefaultProcessor => { + ProcessorConfig::ParquetDefaultProcessor(ParquetDefaultProcessorConfig { + google_application_credentials: Default::default(), + bucket_name: Default::default(), + bucket_root: Default::default(), + parquet_handler_response_channel_size: Default::default(), + max_buffer_size: Default::default(), + parquet_upload_interval: Default::default(), + }) + }, + ProcessorName::ParquetFungibleAssetProcessor => { + ProcessorConfig::ParquetFungibleAssetProcessor( + ParquetFungibleAssetProcessorConfig { + google_application_credentials: Default::default(), + bucket_name: Default::default(), + bucket_root: Default::default(), + parquet_handler_response_channel_size: Default::default(), + max_buffer_size: Default::default(), + parquet_upload_interval: Default::default(), + }, + ) + }, }; let config = IndexerGrpcProcessorConfig { processor_config, @@ -128,10 +152,14 @@ impl ProcessorManager { // many in a localnet environment. db_pool_size: Some(8), gap_detection_batch_size: 50, + parquet_gap_detection_batch_size: 50, pb_channel_txn_chunk_size: 100_000, per_table_chunk_sizes: Default::default(), - transaction_filter: Default::default(), grpc_response_item_timeout_in_secs: 10, + transaction_filter: Default::default(), + deprecated_tables: Default::default(), + default_sleep_time_between_request: + IndexerGrpcProcessorConfig::default_sleep_time_between_request(), }; let manager = Self { config,