From 68222b238880dee27c666ffd1db559a789674b30 Mon Sep 17 00:00:00 2001 From: ra0x3 Date: Mon, 11 Dec 2023 15:53:18 -0500 Subject: [PATCH] updates --- Cargo.lock | 1807 +++++++++-------- Cargo.toml | 1 + .../schema/fuel_explorer.schema.graphql | 6 - .../fuel-explorer/fuel-explorer/src/lib.rs | 14 - packages/fuel-indexer-api-server/Cargo.toml | 2 +- packages/fuel-indexer-benchmarks/Cargo.toml | 2 +- packages/fuel-indexer-plugin/src/find.rs | 2 +- packages/fuel-indexer-tests/src/fixtures.rs | 104 +- packages/fuel-indexer-tests/tests/indexing.rs | 8 +- ...sts__commands__default_indexer_config.snap | 1 + ...ommands__forc_index_start_help_output.snap | 3 + ...el_indexer_api_server_run_help_output.snap | 3 + ...ommands__fuel_indexer_run_help_output.snap | 3 + .../fuel-indexer-tests/tests/web_server.rs | 10 +- packages/fuel-indexer-types/Cargo.toml | 1 + packages/fuel-indexer-types/src/fuel.rs | 19 +- packages/fuel-indexer/Cargo.toml | 8 +- packages/fuel-indexer/src/executor.rs | 17 +- plugins/forc-index/Cargo.toml | 2 +- 19 files changed, 1009 insertions(+), 1004 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 403de708e..d3852557b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -71,7 +71,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb" dependencies = [ "quote", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -183,7 +183,7 @@ dependencies = [ "actix-router", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -192,7 +192,7 @@ version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ - "gimli 0.28.0", + "gimli 0.28.1", ] [[package]] @@ -317,9 +317,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" +checksum = "d664a92ecae85fd0a7392615844904654d1d5f5514837f471ddef4a057aba1b6" dependencies = [ "anstyle", "anstyle-parse", @@ -337,30 +337,30 @@ checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" [[package]] name = "anstyle-parse" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.1" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" dependencies = [ "anstyle", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -414,36 +414,49 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" dependencies = [ "concurrent-queue", - "event-listener", + "event-listener 2.5.3", + "futures-core", +] + +[[package]] +name = "async-channel" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ca33f4bc4ed1babef42cad36cc1f51fa88be00420404e5b1e80ab1b18f7678c" +dependencies = [ + "concurrent-queue", + "event-listener 4.0.0", + "event-listener-strategy", "futures-core", + "pin-project-lite", ] [[package]] name = "async-executor" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b0c4a4f319e45986f347ee47fef8bf5e81c9abc3f6f58dc2391439f30df65f0" +checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" dependencies = [ - "async-lock", + "async-lock 3.2.0", "async-task", "concurrent-queue", "fastrand 2.0.1", - "futures-lite", + "futures-lite 2.1.0", "slab", ] [[package]] name = "async-global-executor" -version = "2.3.1" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776" +checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c" dependencies = [ - "async-channel", + "async-channel 2.1.1", "async-executor", - "async-io", - "async-lock", + "async-io 2.2.1", + "async-lock 3.2.0", "blocking", - "futures-lite", + "futures-lite 2.1.0", "once_cell", ] @@ -539,7 +552,7 @@ dependencies = [ "Inflector", "async-graphql-parser 4.0.16", "darling 0.14.4", - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "syn 1.0.109", @@ -555,7 +568,7 @@ dependencies = [ "Inflector", "async-graphql-parser 5.0.10", "darling 0.14.4", - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "syn 1.0.109", @@ -616,27 +629,57 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" dependencies = [ - "async-lock", + "async-lock 2.8.0", "autocfg", "cfg-if", "concurrent-queue", - "futures-lite", + "futures-lite 1.13.0", "log", "parking", - "polling", + "polling 2.8.0", "rustix 0.37.27", "slab", "socket2 0.4.10", "waker-fn", ] +[[package]] +name = "async-io" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6d3b15875ba253d1110c740755e246537483f152fa334f91abd7fe84c88b3ff" +dependencies = [ + "async-lock 3.2.0", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite 2.1.0", + "parking", + "polling 3.3.1", + "rustix 0.38.28", + "slab", + "tracing", + "windows-sys 0.52.0", +] + [[package]] name = "async-lock" version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" dependencies = [ - "event-listener", + "event-listener 2.5.3", +] + +[[package]] +name = "async-lock" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7125e42787d53db9dd54261812ef17e937c95a51e4d291373b670342fa44310c" +dependencies = [ + "event-listener 4.0.0", + "event-listener-strategy", + "pin-project-lite", ] [[package]] @@ -645,15 +688,15 @@ version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" dependencies = [ - "async-channel", + "async-channel 1.9.0", "async-global-executor", - "async-io", - "async-lock", + "async-io 1.13.0", + "async-lock 2.8.0", "crossbeam-utils", "futures-channel", "futures-core", "futures-io", - "futures-lite", + "futures-lite 1.13.0", "gloo-timers", "kv-log-macro", "log", @@ -684,7 +727,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -701,7 +744,7 @@ checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -715,9 +758,9 @@ dependencies = [ [[package]] name = "atomic-polyfill" -version = "0.1.11" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3ff7eb3f316534d83a8a2c3d1674ace8a5a71198eba31e2e2b597833f699b28" +checksum = "8cf2bce30dfe09ef0bfaef228b9d414faaf7e563035494d7fe092dba54b300f4" dependencies = [ "critical-section", ] @@ -856,7 +899,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -875,40 +918,12 @@ dependencies = [ "serde", ] -[[package]] -name = "base16ct" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce" - [[package]] name = "base16ct" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" -[[package]] -name = "base58" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5024ee8015f02155eee35c711107ddd9a9bf3cb689cf2a9089c97e79b6e1ae83" - -[[package]] -name = "base58check" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ee2fe4c9a0c84515f136aaae2466744a721af6d63339c18689d9e995d74d99b" -dependencies = [ - "base58", - "sha2 0.8.2", -] - -[[package]] -name = "base64" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" - [[package]] name = "base64" version = "0.13.1" @@ -936,12 +951,6 @@ dependencies = [ "serde", ] -[[package]] -name = "bech32" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dabbe35f96fb9507f7330793dc490461b2962659ac5d427181e451a623751d1" - [[package]] name = "bech32" version = "0.9.1" @@ -986,7 +995,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -1013,16 +1022,6 @@ dependencies = [ "typenum", ] -[[package]] -name = "bitvec" -version = "0.17.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41262f11d771fd4a61aa3ce019fca363b4b6c282fca9da2a31186d3965a47a5c" -dependencies = [ - "either", - "radium 0.3.0", -] - [[package]] name = "bitvec" version = "1.0.1" @@ -1030,20 +1029,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" dependencies = [ "funty", - "radium 0.7.0", + "radium", "tap", "wyz", ] -[[package]] -name = "blake2" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" -dependencies = [ - "digest 0.10.7", -] - [[package]] name = "blake3" version = "1.5.0" @@ -1057,25 +1047,13 @@ dependencies = [ "constant_time_eq", ] -[[package]] -name = "block-buffer" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" -dependencies = [ - "block-padding", - "byte-tools", - "byteorder", - "generic-array 0.12.4", -] - [[package]] name = "block-buffer" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" dependencies = [ - "generic-array 0.14.7", + "generic-array", ] [[package]] @@ -1084,30 +1062,21 @@ version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" dependencies = [ - "generic-array 0.14.7", -] - -[[package]] -name = "block-padding" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" -dependencies = [ - "byte-tools", + "generic-array", ] [[package]] name = "blocking" -version = "1.4.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c36a4d0d48574b3dd360b4b7d95cc651d2b6557b6402848a27d4b228a473e2a" +checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" dependencies = [ - "async-channel", - "async-lock", + "async-channel 2.1.1", + "async-lock 3.2.0", "async-task", "fastrand 2.0.1", "futures-io", - "futures-lite", + "futures-lite 2.1.0", "piper", "tracing", ] @@ -1139,12 +1108,6 @@ dependencies = [ "alloc-stdlib", ] -[[package]] -name = "bs58" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" - [[package]] name = "bs58" version = "0.5.0" @@ -1167,12 +1130,6 @@ version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c" -[[package]] -name = "byte-tools" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" - [[package]] name = "bytecheck" version = "0.6.11" @@ -1334,6 +1291,21 @@ dependencies = [ "libloading", ] +[[package]] +name = "clap" +version = "2.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +dependencies = [ + "ansi_term 0.12.1", + "atty", + "bitflags 1.3.2", + "strsim 0.8.0", + "textwrap 0.11.0", + "unicode-width", + "vec_map", +] + [[package]] name = "clap" version = "3.2.25" @@ -1346,16 +1318,16 @@ dependencies = [ "clap_lex 0.2.4", "indexmap 1.9.3", "once_cell", - "strsim", + "strsim 0.10.0", "termcolor", - "textwrap", + "textwrap 0.16.0", ] [[package]] name = "clap" -version = "4.4.7" +version = "4.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b" +checksum = "bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2" dependencies = [ "clap_builder", "clap_derive 4.4.7", @@ -1363,14 +1335,14 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.7" +version = "4.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663" +checksum = "a216b506622bb1d316cd51328dce24e07bdff4a6128a47c7e7fad11878d5adbb" dependencies = [ "anstream", "anstyle", "clap_lex 0.6.0", - "strsim", + "strsim 0.10.0", ] [[package]] @@ -1395,7 +1367,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -1419,66 +1391,30 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15" -[[package]] -name = "coins-bip32" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634c509653de24b439672164bbf56f5f582a2ab0e313d3b0f6af0b7345cf2560" -dependencies = [ - "bincode", - "bs58 0.4.0", - "coins-core 0.7.0", - "digest 0.10.7", - "getrandom", - "hmac", - "k256 0.11.6", - "lazy_static", - "serde", - "sha2 0.10.8", - "thiserror", -] - [[package]] name = "coins-bip32" version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b6be4a5df2098cd811f3194f64ddb96c267606bffd9689ac7b0160097b01ad3" dependencies = [ - "bs58 0.5.0", - "coins-core 0.8.7", + "bs58", + "coins-core", "digest 0.10.7", "hmac", - "k256 0.13.1", + "k256", "serde", "sha2 0.10.8", "thiserror", ] -[[package]] -name = "coins-bip39" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a11892bcac83b4c6e95ab84b5b06c76d9d70ad73548dd07418269c5c7977171" -dependencies = [ - "bitvec 0.17.4", - "coins-bip32 0.7.0", - "getrandom", - "hex", - "hmac", - "pbkdf2 0.11.0", - "rand", - "sha2 0.10.8", - "thiserror", -] - [[package]] name = "coins-bip39" version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3db8fba409ce3dc04f7d804074039eb68b960b0829161f8e06c95fea3f122528" dependencies = [ - "bitvec 1.0.1", - "coins-bip32 0.8.7", + "bitvec", + "coins-bip32", "hmac", "once_cell", "pbkdf2 0.12.2", @@ -1487,27 +1423,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "coins-core" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c94090a6663f224feae66ab01e41a2555a8296ee07b5f20dab8888bdefc9f617" -dependencies = [ - "base58check", - "base64 0.12.3", - "bech32 0.7.3", - "blake2", - "digest 0.10.7", - "generic-array 0.14.7", - "hex", - "ripemd", - "serde", - "serde_derive", - "sha2 0.10.8", - "sha3", - "thiserror", -] - [[package]] name = "coins-core" version = "0.8.7" @@ -1515,10 +1430,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5286a0843c21f8367f7be734f89df9b822e0321d8bcce8d6e735aadff7d74979" dependencies = [ "base64 0.21.5", - "bech32 0.9.1", - "bs58 0.5.0", + "bech32", + "bs58", "digest 0.10.7", - "generic-array 0.14.7", + "generic-array", "hex", "ripemd", "serde", @@ -1555,9 +1470,9 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" +checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" dependencies = [ "crossbeam-utils", ] @@ -1568,7 +1483,7 @@ version = "0.15.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" dependencies = [ - "encode_unicode", + "encode_unicode 0.3.6", "lazy_static", "libc", "unicode-width", @@ -1632,9 +1547,9 @@ dependencies = [ [[package]] name = "core-foundation" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ "core-foundation-sys", "libc", @@ -1642,9 +1557,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "corosensei" @@ -1793,7 +1708,7 @@ dependencies = [ "anes", "cast", "ciborium", - "clap 4.4.7", + "clap 4.4.11", "criterion-plot", "futures", "is-terminal", @@ -1848,7 +1763,7 @@ dependencies = [ "autocfg", "cfg-if", "crossbeam-utils", - "memoffset 0.9.0", + "memoffset", "scopeguard", ] @@ -1879,36 +1794,45 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] name = "crypto-bigint" -version = "0.4.9" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef" +checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" dependencies = [ - "generic-array 0.14.7", + "generic-array", "rand_core", "subtle", "zeroize", ] [[package]] -name = "crypto-bigint" -version = "0.5.3" +name = "crypto-common" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "740fe28e594155f10cfc383984cbefd529d7396050557148f79cb0f621204124" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ - "generic-array 0.14.7", - "rand_core", - "subtle", - "zeroize", + "generic-array", + "typenum", ] [[package]] -name = "crypto-common" -version = "0.1.6" +name = "csv" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" dependencies = [ - "generic-array 0.14.7", - "typenum", + "csv-core", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "csv-core" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" +dependencies = [ + "memchr", ] [[package]] @@ -1953,7 +1877,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -1982,7 +1906,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "strsim", + "strsim 0.10.0", "syn 1.0.109", ] @@ -2036,7 +1960,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "strsim", + "strsim 0.10.0", "syn 1.0.109", ] @@ -2050,7 +1974,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "strsim", + "strsim 0.10.0", "syn 1.0.109", ] @@ -2064,7 +1988,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -2097,7 +2021,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core 0.20.3", "quote", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -2107,7 +2031,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown 0.14.2", + "hashbrown 0.14.3", "lock_api", "once_cell", "parking_lot_core 0.9.9", @@ -2115,19 +2039,9 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" - -[[package]] -name = "der" -version = "0.6.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de" -dependencies = [ - "const-oid", - "zeroize", -] +checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" [[package]] name = "der" @@ -2141,9 +2055,9 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +checksum = "8eb30d70a07a3b04884d2677f06bec33509dc67ca60d92949e5535352d3191dc" dependencies = [ "powerfmt", ] @@ -2178,22 +2092,13 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" -[[package]] -name = "digest" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" -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", + "generic-array", ] [[package]] @@ -2226,6 +2131,16 @@ dependencies = [ "dirs-sys", ] +[[package]] +name = "dirs-next" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +dependencies = [ + "cfg-if", + "dirs-sys-next", +] + [[package]] name = "dirs-sys" version = "0.3.7" @@ -2237,6 +2152,17 @@ dependencies = [ "winapi", ] +[[package]] +name = "dirs-sys-next" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + [[package]] name = "doc-comment" version = "0.3.3" @@ -2275,28 +2201,16 @@ dependencies = [ [[package]] name = "ecdsa" -version = "0.14.8" +version = "0.16.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c" +checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" dependencies = [ - "der 0.6.1", - "elliptic-curve 0.12.3", - "rfc6979 0.3.1", - "signature 1.6.4", -] - -[[package]] -name = "ecdsa" -version = "0.16.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4b1e0c257a9e9f25f90ff76d7a68360ed497ee519c8e428d1825ef0000799d4" -dependencies = [ - "der 0.7.8", + "der", "digest 0.10.7", - "elliptic-curve 0.13.6", - "rfc6979 0.4.0", - "signature 2.1.0", - "spki 0.7.2", + "elliptic-curve", + "rfc6979", + "signature", + "spki", ] [[package]] @@ -2305,18 +2219,19 @@ version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" dependencies = [ - "signature 2.1.0", + "signature", ] [[package]] name = "ed25519-dalek" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7277392b266383ef8396db7fdeb1e77b6c52fed775f5df15bb24f35b72156980" +checksum = "1f628eaec48bfd21b865dc2950cfa014450c01d2fa2b69a86c2fd5844ec523c0" dependencies = [ "curve25519-dalek", "ed25519", "sha2 0.10.8", + "subtle", ] [[package]] @@ -2342,39 +2257,19 @@ dependencies = [ [[package]] name = "elliptic-curve" -version = "0.12.3" +version = "0.13.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3" +checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" dependencies = [ - "base16ct 0.1.1", - "crypto-bigint 0.4.9", - "der 0.6.1", + "base16ct", + "crypto-bigint", "digest 0.10.7", - "ff 0.12.1", - "generic-array 0.14.7", - "group 0.12.1", - "pkcs8 0.9.0", + "ff", + "generic-array", + "group", + "pkcs8", "rand_core", - "sec1 0.3.0", - "subtle", - "zeroize", -] - -[[package]] -name = "elliptic-curve" -version = "0.13.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d97ca172ae9dc9f9b779a6e3a65d308f2af74e5b8c921299075bdb4a0370e914" -dependencies = [ - "base16ct 0.2.0", - "crypto-bigint 0.5.3", - "digest 0.10.7", - "ff 0.13.0", - "generic-array 0.14.7", - "group 0.13.0", - "pkcs8 0.10.2", - "rand_core", - "sec1 0.7.3", + "sec1", "subtle", "zeroize", ] @@ -2391,6 +2286,12 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" +[[package]] +name = "encode_unicode" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" + [[package]] name = "encoding_rs" version = "0.8.33" @@ -2437,7 +2338,7 @@ checksum = "eecf8589574ce9b895052fa12d69af7a233f99e6107f5cb8dd1044f2a17bfdcb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -2450,7 +2351,7 @@ dependencies = [ "num-traits", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -2471,7 +2372,7 @@ dependencies = [ "darling 0.20.3", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -2482,12 +2383,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.6" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c18ee0ed65a5f1f81cac6b1d213b69c35fa47d4252ad41f1486dbd8226fe36e" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2551,6 +2452,27 @@ version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" +[[package]] +name = "event-listener" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "770d968249b5d99410d61f5bf89057f3199a077a04d087092f58e7d10692baae" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" +dependencies = [ + "event-listener 4.0.0", + "pin-project-lite", +] + [[package]] name = "eventsource-client" version = "0.10.2" @@ -2574,15 +2496,9 @@ checksum = "dd65f1b59dd22d680c7a626cc4a000c1e03d241c51c3e034d2bc9f1e90734f9b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", ] -[[package]] -name = "fake-simd" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" - [[package]] name = "fallible-iterator" version = "0.2.0" @@ -2614,13 +2530,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] -name = "ff" -version = "0.12.1" +name = "fd-lock" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160" +checksum = "b93f7a0db71c99f68398f80653ed05afb0b00e062e1a20c7ff849c4edfabbbcc" dependencies = [ - "rand_core", - "subtle", + "cfg-if", + "rustix 0.38.28", + "windows-sys 0.52.0", ] [[package]] @@ -2635,9 +2552,9 @@ dependencies = [ [[package]] name = "fiat-crypto" -version = "0.2.3" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f69037fe1b785e84986b4f2cbcf647381876a00671d25ceef715d7812dd7e1dd" +checksum = "27573eac26f4dd11e2b1916c3fe1baa56407c83c71a773a8ba17ec0bca03b6b7" [[package]] name = "filecheck" @@ -2651,14 +2568,14 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.22" +version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" +checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", - "windows-sys 0.48.0", + "redox_syscall 0.4.1", + "windows-sys 0.52.0", ] [[package]] @@ -2760,40 +2677,45 @@ checksum = "7e128b6278387c3b95103b292cfc311e213a21b3178ee3a63ee505876e02d0a1" dependencies = [ "ansi_term 0.12.1", "tracing", - "tracing-subscriber 0.3.17", + "tracing-subscriber 0.3.18", ] [[package]] name = "forc-tracing" -version = "0.35.5" +version = "0.46.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15a5505631d4b9deff14b19823372388c861edbc6dccebabe899bbf5b08523b1" +checksum = "713a25b050994cb3ccabbdee6122ec128d23a2b1cab82aee8a4d359bd25c7b7d" dependencies = [ "ansi_term 0.12.1", "tracing", - "tracing-subscriber 0.3.17", + "tracing-subscriber 0.3.18", ] [[package]] name = "forc-util" -version = "0.35.5" +version = "0.46.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a87496084f753e41f48d5af3dddf9a8a1f019c8e3a5b399410aacd53680dc527" +checksum = "18df7187d719c8da7fde281a34f28c648769bcbbb5565eb69c6c873b60134754" dependencies = [ "annotate-snippets", "ansi_term 0.12.1", "anyhow", + "clap 3.2.25", "dirs 3.0.2", - "forc-tracing 0.35.5", + "fd-lock", + "forc-tracing 0.46.1", + "fuel-tx 0.35.4", "hex", + "serde", "serde_json", "sway-core", "sway-error", "sway-types", "sway-utils", "tracing", - "tracing-subscriber 0.3.17", + "tracing-subscriber 0.3.18", "unicode-xid", + "walkdir", ] [[package]] @@ -2813,9 +2735,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] @@ -2844,20 +2766,10 @@ dependencies = [ "regex", "serde", "serde_json", - "syn 2.0.39", + "syn 2.0.40", "thiserror", ] -[[package]] -name = "fuel-asm" -version = "0.26.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0030cc1247de0507e547d8ea33484b82420fe61221b94b985d193ec7f63587ae" -dependencies = [ - "fuel-types 0.26.3", - "serde", -] - [[package]] name = "fuel-asm" version = "0.35.4" @@ -2891,20 +2803,20 @@ dependencies = [ "async-graphql 4.0.16", "async-trait", "axum 0.5.17", - "clap 4.4.7", + "clap 4.4.11", "derive_more", "enum-iterator 1.4.1", "fuel-core-chain-config 0.20.8", - "fuel-core-consensus-module", - "fuel-core-database", - "fuel-core-executor", - "fuel-core-importer", + "fuel-core-consensus-module 0.20.8", + "fuel-core-database 0.20.8", + "fuel-core-executor 0.20.8", + "fuel-core-importer 0.20.8", "fuel-core-metrics 0.20.8", "fuel-core-poa 0.20.8", - "fuel-core-producer", + "fuel-core-producer 0.20.8", "fuel-core-services 0.20.8", "fuel-core-storage 0.20.8", - "fuel-core-txpool", + "fuel-core-txpool 0.20.8", "fuel-core-types 0.20.8", "futures", "hex", @@ -2914,6 +2826,50 @@ dependencies = [ "postcard", "primitive-types", "rand", + "serde", + "serde_json", + "strum", + "strum_macros 0.24.3", + "thiserror", + "tokio", + "tokio-stream", + "tower-http", + "tracing", +] + +[[package]] +name = "fuel-core" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c545fd12c8b5bbc495fd37a4fdf2548450b07b3fb26ac8ea20a10436c311e1d0" +dependencies = [ + "anyhow", + "async-graphql 4.0.16", + "async-trait", + "axum 0.5.17", + "clap 4.4.11", + "derive_more", + "enum-iterator 1.4.1", + "fuel-core-chain-config 0.21.0", + "fuel-core-consensus-module 0.21.0", + "fuel-core-database 0.21.0", + "fuel-core-executor 0.21.0", + "fuel-core-importer 0.21.0", + "fuel-core-metrics 0.21.0", + "fuel-core-poa 0.21.0", + "fuel-core-producer 0.21.0", + "fuel-core-services 0.21.0", + "fuel-core-storage 0.21.0", + "fuel-core-txpool 0.21.0", + "fuel-core-types 0.21.0", + "futures", + "hex", + "hyper", + "itertools 0.10.5", + "parking_lot 0.12.1", + "postcard", + "primitive-types", + "rand", "rocksdb", "serde", "serde_json", @@ -2925,7 +2881,7 @@ dependencies = [ "tokio-stream", "tower-http", "tracing", - "uuid 1.5.0", + "uuid 1.6.1", ] [[package]] @@ -2935,7 +2891,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "86e8f361f44dafc02207c26b0c1929f39525dd1603418aad607dec6ca900053d" dependencies = [ "anyhow", - "bech32 0.9.1", + "bech32", "fuel-core-storage 0.20.8", "fuel-core-types 0.20.8", "hex", @@ -2955,7 +2911,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "84319b8e7a3b422b0f38c6ad4abd29f48b923797b7555c3bb53151322779f9bf" dependencies = [ "anyhow", - "bech32 0.9.1", + "bech32", "fuel-core-storage 0.21.0", "fuel-core-types 0.21.0", "hex", @@ -3028,27 +2984,64 @@ dependencies = [ ] [[package]] -name = "fuel-core-database" +name = "fuel-core-consensus-module" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50fd6d90df194b5970bf16681bfad9f917ff3f837e00c6538a8b95d2e0a6fdf9" +dependencies = [ + "anyhow", + "fuel-core-chain-config 0.21.0", + "fuel-core-poa 0.21.0", + "fuel-core-types 0.21.0", + "tokio", +] + +[[package]] +name = "fuel-core-database" +version = "0.20.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42469b8398400964639c7b021833080d41264ceb861e990215a9114d60b41439" +dependencies = [ + "anyhow", + "fuel-core-storage 0.20.8", + "fuel-core-types 0.20.8", + "thiserror", +] + +[[package]] +name = "fuel-core-database" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb7b7cd46a2de1df8c71b4541bf19e09870965cb6ac72ee564170f9bcc8df909" +dependencies = [ + "anyhow", + "derive_more", + "fuel-core-storage 0.21.0", + "fuel-core-types 0.21.0", +] + +[[package]] +name = "fuel-core-executor" version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42469b8398400964639c7b021833080d41264ceb861e990215a9114d60b41439" +checksum = "454a5774982e93521f49a8da4c67b8c3d9c1b822b295ca6f88b5db1db2130739" dependencies = [ "anyhow", + "fuel-core-chain-config 0.20.8", "fuel-core-storage 0.20.8", "fuel-core-types 0.20.8", - "thiserror", ] [[package]] name = "fuel-core-executor" -version = "0.20.8" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "454a5774982e93521f49a8da4c67b8c3d9c1b822b295ca6f88b5db1db2130739" +checksum = "f4a5ed529258ded68048806b150e190ab03dc399bdd5547096525c3419cca188" dependencies = [ "anyhow", - "fuel-core-chain-config 0.20.8", - "fuel-core-storage 0.20.8", - "fuel-core-types 0.20.8", + "fuel-core-chain-config 0.21.0", + "fuel-core-storage 0.21.0", + "fuel-core-types 0.21.0", ] [[package]] @@ -3066,6 +3059,21 @@ dependencies = [ "tracing", ] +[[package]] +name = "fuel-core-importer" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acd700b679be3cda7561f46778aa136ba4af1048570e116d8eb1d3e0f0a316a9" +dependencies = [ + "anyhow", + "derive_more", + "fuel-core-metrics 0.21.0", + "fuel-core-storage 0.21.0", + "fuel-core-types 0.21.0", + "tokio", + "tracing", +] + [[package]] name = "fuel-core-metrics" version = "0.20.8" @@ -3146,6 +3154,22 @@ dependencies = [ "tracing", ] +[[package]] +name = "fuel-core-producer" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e85951fa8159a4698a6d523fc44fd3659b9db63800fcfd9619f4283a568296ce" +dependencies = [ + "anyhow", + "async-trait", + "derive_more", + "fuel-core-storage 0.21.0", + "fuel-core-types 0.21.0", + "tokio", + "tokio-rayon", + "tracing", +] + [[package]] name = "fuel-core-services" version = "0.20.8" @@ -3221,6 +3245,27 @@ dependencies = [ "tracing", ] +[[package]] +name = "fuel-core-txpool" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "943dec1ff13cd4fcd3c0f9ae826be09de1520bab5565916ec91cb31429c59f9a" +dependencies = [ + "anyhow", + "async-trait", + "fuel-core-chain-config 0.21.0", + "fuel-core-metrics 0.21.0", + "fuel-core-services 0.21.0", + "fuel-core-storage 0.21.0", + "fuel-core-types 0.21.0", + "futures", + "parking_lot 0.12.1", + "tokio", + "tokio-rayon", + "tokio-stream", + "tracing", +] + [[package]] name = "fuel-core-types" version = "0.20.8" @@ -3253,25 +3298,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "fuel-crypto" -version = "0.26.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e7356deff8ce5a9b6bc8d9e7cacc6c1d1f7abf5cdd4d729869afb401befa495" -dependencies = [ - "borrown", - "coins-bip32 0.7.0", - "coins-bip39 0.7.0", - "fuel-types 0.26.3", - "getrandom", - "lazy_static", - "rand", - "secp256k1 0.24.3", - "serde", - "sha2 0.10.8", - "zeroize", -] - [[package]] name = "fuel-crypto" version = "0.35.4" @@ -3279,15 +3305,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2b934310e10a975ae3698c54e973125345c5f77a246bb8700e1658d8c4d12cf" dependencies = [ "borrown", - "coins-bip32 0.8.7", - "coins-bip39 0.8.7", - "ecdsa 0.16.8", + "coins-bip32", + "coins-bip39", + "ecdsa", "ed25519-dalek", "fuel-types 0.35.4", "lazy_static", "p256", "rand", - "secp256k1 0.26.0", + "secp256k1", "serde", "sha2 0.10.8", "zeroize", @@ -3299,16 +3325,16 @@ version = "0.43.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33bea0932fec1e3c77be1fd54439ee9947d8d05870631d1c83782e5b1bd8eb0a" dependencies = [ - "coins-bip32 0.8.7", - "coins-bip39 0.8.7", - "ecdsa 0.16.8", + "coins-bip32", + "coins-bip39", + "ecdsa", "ed25519-dalek", "fuel-types 0.43.1", - "k256 0.13.1", + "k256", "lazy_static", "p256", "rand", - "secp256k1 0.26.0", + "secp256k1", "serde", "sha2 0.10.8", "zeroize", @@ -3322,7 +3348,7 @@ checksum = "597adf13a46bdcc1e7e19fa9f9b8743106e5e5a9867a71c50e1bc6c899ba4ae8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", "synstructure", ] @@ -3408,9 +3434,9 @@ dependencies = [ "clap 3.2.25", "cynic", "forc-postgres", - "fuel-core", - "fuel-core-client 0.20.8", - "fuel-crypto 0.35.4", + "fuel-core 0.21.0", + "fuel-core-client 0.21.0", + "fuel-crypto 0.43.1", "fuel-indexer-api-server", "fuel-indexer-database", "fuel-indexer-lib", @@ -3440,7 +3466,7 @@ dependencies = [ "async-std", "axum 0.6.20", "clap 3.2.25", - "fuel-crypto 0.35.4", + "fuel-crypto 0.43.1", "fuel-indexer-database", "fuel-indexer-graphql", "fuel-indexer-lib", @@ -3473,7 +3499,7 @@ dependencies = [ "clap 3.2.25", "criterion", "duct", - "fuel-core-client 0.20.8", + "fuel-core-client 0.21.0", "fuel-indexer", "fuel-indexer-database", "fuel-indexer-graphql", @@ -3552,7 +3578,7 @@ dependencies = [ "thiserror", "tokio", "tracing", - "tracing-subscriber 0.3.17", + "tracing-subscriber 0.3.18", "url", ] @@ -3563,7 +3589,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -3586,7 +3612,7 @@ dependencies = [ "quote", "serde_json", "sha2 0.10.8", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -3628,7 +3654,7 @@ dependencies = [ "fuel-indexer-metrics", "sqlx", "tracing", - "uuid 1.5.0", + "uuid 1.6.1", ] [[package]] @@ -3714,6 +3740,7 @@ name = "fuel-indexer-types" version = "0.24.1" dependencies = [ "bytes", + "fuel-crypto 0.43.1", "fuel-tx 0.43.1", "fuel-types 0.43.1", "fuels 0.53.0", @@ -3731,20 +3758,6 @@ dependencies = [ "serde", ] -[[package]] -name = "fuel-merkle" -version = "0.26.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b13103bf12f62930dd26f75f90d6a95d952fdcd677a356f57d8ef8df7ae02b84" -dependencies = [ - "digest 0.10.7", - "fuel-storage 0.26.3", - "hashbrown 0.13.2", - "hex", - "sha2 0.10.8", - "thiserror", -] - [[package]] name = "fuel-merkle" version = "0.35.4" @@ -3785,12 +3798,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "fuel-storage" -version = "0.26.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "998d49926c8ae3e545e348075075c2fe85caae4474e01d2da65a9a8edc3277e9" - [[package]] name = "fuel-storage" version = "0.35.4" @@ -3803,24 +3810,6 @@ version = "0.43.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f20bd8cac585ccd5c51478c341b7e9807942d80e1c0e00a9b2cec8a3fb3879b" -[[package]] -name = "fuel-tx" -version = "0.26.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e09bb28731979db1f5192c04f2a330a15b8c2f5ef2b47836b3282c7fd9d7703c" -dependencies = [ - "derivative", - "fuel-asm 0.26.3", - "fuel-crypto 0.26.3", - "fuel-merkle 0.26.3", - "fuel-types 0.26.3", - "itertools 0.10.5", - "num-integer", - "rand", - "serde", - "serde_json", -] - [[package]] name = "fuel-tx" version = "0.35.4" @@ -3854,7 +3843,7 @@ dependencies = [ "fuel-crypto 0.43.1", "fuel-merkle 0.43.1", "fuel-types 0.43.1", - "hashbrown 0.14.2", + "hashbrown 0.14.3", "itertools 0.10.5", "rand", "serde", @@ -3863,16 +3852,6 @@ dependencies = [ "strum_macros 0.24.3", ] -[[package]] -name = "fuel-types" -version = "0.26.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89fc99a9878b98135c4b05c71fe63b82f4cb3a00abac278935f8be7282f8e468" -dependencies = [ - "hex", - "serde", -] - [[package]] name = "fuel-types" version = "0.35.4" @@ -3896,27 +3875,6 @@ dependencies = [ "serde", ] -[[package]] -name = "fuel-vm" -version = "0.26.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b36aac727729b94c620265da76112e1d36a1af0c067745491c376f084f5b7b38" -dependencies = [ - "bitflags 1.3.2", - "derivative", - "fuel-asm 0.26.3", - "fuel-crypto 0.26.3", - "fuel-merkle 0.26.3", - "fuel-storage 0.26.3", - "fuel-tx 0.26.3", - "fuel-types 0.26.3", - "itertools 0.10.5", - "serde", - "sha3", - "tai64", - "thiserror", -] - [[package]] name = "fuel-vm" version = "0.35.4" @@ -3961,7 +3919,7 @@ dependencies = [ "fuel-storage 0.43.1", "fuel-tx 0.43.1", "fuel-types 0.43.1", - "hashbrown 0.14.2", + "hashbrown 0.14.3", "itertools 0.10.5", "libm", "paste", @@ -3989,7 +3947,7 @@ version = "0.50.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e44490a7d415295059f37a92c6f02f060d13b0293d4dd6c27b2f24d73321a0f" dependencies = [ - "fuel-core", + "fuel-core 0.20.8", "fuel-core-client 0.20.8", "fuel-tx 0.35.4", "fuels-accounts 0.50.1", @@ -4022,7 +3980,7 @@ checksum = "905e1b22d5c7b6ab01f05285ea61cb7e15cdcce762263db2019c192213b03c53" dependencies = [ "async-trait", "chrono", - "elliptic-curve 0.13.6", + "elliptic-curve", "eth-keystore", "fuel-core-client 0.20.8", "fuel-crypto 0.35.4", @@ -4048,7 +4006,7 @@ checksum = "fa6f6435a6631577fa20aedbd88c4e59d9f1541a6bbb3a7b63715e40c15790f0" dependencies = [ "async-trait", "chrono", - "elliptic-curve 0.13.6", + "elliptic-curve", "eth-keystore", "fuel-core-client 0.21.0", "fuel-crypto 0.43.1", @@ -4079,7 +4037,7 @@ dependencies = [ "quote", "regex", "serde_json", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -4095,7 +4053,7 @@ dependencies = [ "quote", "regex", "serde_json", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -4111,7 +4069,7 @@ dependencies = [ "quote", "regex", "serde_json", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -4120,7 +4078,7 @@ version = "0.50.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8528f854c0e914445cefc3e5eefa7a494dd550f28b83ed965b8f9d94b5df8beb" dependencies = [ - "bech32 0.9.1", + "bech32", "chrono", "fuel-abi-types 0.3.0", "fuel-asm 0.35.4", @@ -4148,7 +4106,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c9a98b3217932b1f8f639fd4c1268923f0862166fecf7a897c3c2bd5bae8706d" dependencies = [ "async-trait", - "bech32 0.9.1", + "bech32", "chrono", "fuel-abi-types 0.3.0", "fuel-asm 0.43.1", @@ -4184,7 +4142,7 @@ dependencies = [ "rand", "regex", "serde_json", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -4198,7 +4156,7 @@ dependencies = [ "proc-macro2", "quote", "rand", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -4212,7 +4170,7 @@ dependencies = [ "proc-macro2", "quote", "rand", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -4261,7 +4219,7 @@ version = "0.50.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bff7c621bafd44735cdd5c1b3f73b7e1a153743ffcf035471fe30a63d23ddea2" dependencies = [ - "fuel-core", + "fuel-core 0.20.8", "fuel-core-chain-config 0.20.8", "fuel-core-client 0.20.8", "fuel-core-poa 0.20.8", @@ -4388,6 +4346,19 @@ dependencies = [ "waker-fn", ] +[[package]] +name = "futures-lite" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aeee267a1883f7ebef3700f262d2d54de95dfaf38189015a74fdc4e0c7ad8143" +dependencies = [ + "fastrand 2.0.1", + "futures-core", + "futures-io", + "parking", + "pin-project-lite", +] + [[package]] name = "futures-macro" version = "0.3.29" @@ -4396,7 +4367,7 @@ checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -4447,15 +4418,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "generic-array" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd" -dependencies = [ - "typenum", -] - [[package]] name = "generic-array" version = "0.14.7" @@ -4493,9 +4455,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.0" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "glob" @@ -4558,33 +4520,22 @@ dependencies = [ "serde", ] -[[package]] -name = "group" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7" -dependencies = [ - "ff 0.12.1", - "rand_core", - "subtle", -] - [[package]] name = "group" version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" dependencies = [ - "ff 0.13.0", + "ff", "rand_core", "subtle", ] [[package]] name = "h2" -version = "0.3.21" +version = "0.3.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" +checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" dependencies = [ "bytes", "fnv", @@ -4592,7 +4543,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 1.9.3", + "indexmap 2.1.0", "slab", "tokio", "tokio-util", @@ -4648,9 +4599,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.2" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" dependencies = [ "ahash 0.8.6", "allocator-api2", @@ -4663,7 +4614,7 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" dependencies = [ - "hashbrown 0.14.2", + "hashbrown 0.14.3", ] [[package]] @@ -4692,9 +4643,9 @@ dependencies = [ [[package]] name = "heapless" -version = "0.7.16" +version = "0.7.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db04bc24a18b9ea980628ecf00e6c0264f3c1426dac36c00cb49b6fbad8b0743" +checksum = "cdc6457c0eb62c71aac4bc17216026d8410337c4126773b9c5daba343f17964f" dependencies = [ "atomic-polyfill", "hash32", @@ -4784,9 +4735,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.9" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" dependencies = [ "bytes", "fnv", @@ -4795,9 +4746,9 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", "http", @@ -4894,11 +4845,11 @@ dependencies = [ "http", "hyper", "log", - "rustls 0.21.8", + "rustls 0.21.10", "rustls-native-certs 0.6.3", "tokio", "tokio-rustls 0.24.1", - "webpki-roots 0.25.2", + "webpki-roots 0.25.3", ] [[package]] @@ -4978,9 +4929,9 @@ dependencies = [ [[package]] name = "idna" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -5056,7 +5007,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", - "hashbrown 0.14.2", + "hashbrown 0.14.3", ] [[package]] @@ -5078,7 +5029,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" dependencies = [ - "generic-array 0.14.7", + "generic-array", ] [[package]] @@ -5128,7 +5079,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi 0.3.3", - "rustix 0.38.21", + "rustix 0.38.28", "windows-sys 0.48.0", ] @@ -5161,9 +5112,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "jobserver" @@ -5176,9 +5127,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.65" +version = "0.3.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" +checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" dependencies = [ "wasm-bindgen", ] @@ -5199,28 +5150,16 @@ dependencies = [ [[package]] name = "k256" -version = "0.11.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72c1e0b51e7ec0a97369623508396067a486bd0cbed95a2659a4b863d28cfc8b" -dependencies = [ - "cfg-if", - "ecdsa 0.14.8", - "elliptic-curve 0.12.3", - "sha2 0.10.8", -] - -[[package]] -name = "k256" -version = "0.13.1" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cadb76004ed8e97623117f3df85b17aaa6626ab0b0831e6573f104df16cd1bcc" +checksum = "3f01b677d82ef7a676aa37e099defd83a28e15687112cafdd112d60236b6115b" dependencies = [ "cfg-if", - "ecdsa 0.16.8", - "elliptic-curve 0.13.6", + "ecdsa", + "elliptic-curve", "once_cell", "sha2 0.10.8", - "signature 2.1.0", + "signature", ] [[package]] @@ -5267,9 +5206,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.150" +version = "0.2.151" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" +checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" [[package]] name = "libloading" @@ -5338,9 +5277,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" +checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" [[package]] name = "local-channel" @@ -5478,15 +5417,6 @@ dependencies = [ "libc", ] -[[package]] -name = "memoffset" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" -dependencies = [ - "autocfg", -] - [[package]] name = "memoffset" version = "0.9.0" @@ -5540,9 +5470,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.9" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" +checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" dependencies = [ "libc", "log", @@ -5602,6 +5532,15 @@ dependencies = [ "minimal-lexical", ] +[[package]] +name = "ntapi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" +dependencies = [ + "winapi", +] + [[package]] name = "nu-ansi-term" version = "0.46.0" @@ -5621,6 +5560,7 @@ dependencies = [ "autocfg", "num-integer", "num-traits", + "serde", ] [[package]] @@ -5669,9 +5609,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "oorandom" @@ -5679,12 +5619,6 @@ version = "11.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" -[[package]] -name = "opaque-debug" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" - [[package]] name = "opaque-debug" version = "0.3.0" @@ -5693,9 +5627,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.59" +version = "0.10.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a257ad03cd8fb16ad4172fedf8094451e1af1c4b70097636ef2eac9a5f0cc33" +checksum = "6b8419dc8cc6d866deb801274bba2e6f8f6108c1bb7fcc10ee5ab864931dbb45" dependencies = [ "bitflags 2.4.1", "cfg-if", @@ -5714,7 +5648,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -5725,18 +5659,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "300.1.6+3.1.4" +version = "300.2.0+3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439fac53e092cd7442a3660c85dde4643ab3b5bd39040912388dcdabf6b88085" +checksum = "b1ebed1d188c4cd64c2bcd73d6c1fe1092f3d98c111831923cc1b706c3859fca" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.95" +version = "0.9.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40a4130519a360279579c2053038317e40eff64d13fd3f004f9e1b72b8a6aaf9" +checksum = "c3eaad34cdd97d81de97964fc7f29e2d104f483840d906ef56daa1912338460b" dependencies = [ "cc", "libc", @@ -5779,20 +5713,29 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b" dependencies = [ - "ecdsa 0.16.8", - "elliptic-curve 0.13.6", + "ecdsa", + "elliptic-curve", "primeorder", "sha2 0.10.8", ] +[[package]] +name = "pad" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2ad9b889f1b12e0b9ee24db044b5129150d5eada288edc800f789928dc8c0e3" +dependencies = [ + "unicode-width", +] + [[package]] name = "parity-scale-codec" -version = "3.6.5" +version = "3.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dec8a8073036902368c2cdc0387e85ff9a37054d7e7c98e592145e0c92cd4fb" +checksum = "881331e34fa842a2fb61cc2db9643a8fedc615e47cfcc52597d1af0db9a7e8fe" dependencies = [ "arrayvec", - "bitvec 1.0.1", + "bitvec", "byte-slice-cast", "impl-trait-for-tuples", "parity-scale-codec-derive", @@ -5801,11 +5744,11 @@ dependencies = [ [[package]] name = "parity-scale-codec-derive" -version = "3.6.5" +version = "3.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "312270ee71e1cd70289dacf597cab7b207aa107d2f28191c2ae45b2ece18a260" +checksum = "be30eaf4b0a9fba5336683b38de57bb86d179a35862ba6bfcf57625d006bde5b" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 2.0.0", "proc-macro2", "quote", "syn 1.0.109", @@ -5865,17 +5808,6 @@ dependencies = [ "windows-targets 0.48.5", ] -[[package]] -name = "password-hash" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" -dependencies = [ - "base64ct", - "rand_core", - "subtle", -] - [[package]] name = "paste" version = "1.0.14" @@ -5889,9 +5821,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" dependencies = [ "digest 0.10.7", - "hmac", - "password-hash", - "sha2 0.10.8", ] [[package]] @@ -5948,9 +5877,9 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" @@ -5983,7 +5912,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -6088,7 +6017,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -6114,24 +6043,14 @@ dependencies = [ "futures-io", ] -[[package]] -name = "pkcs8" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba" -dependencies = [ - "der 0.6.1", - "spki 0.6.0", -] - [[package]] name = "pkcs8" version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" dependencies = [ - "der 0.7.8", - "spki 0.7.2", + "der", + "spki", ] [[package]] @@ -6190,11 +6109,25 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "polling" +version = "3.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf63fa624ab313c11656b4cda960bfc46c410187ad493c41f6ba2d8c1e991c9e" +dependencies = [ + "cfg-if", + "concurrent-queue", + "pin-project-lite", + "rustix 0.38.28", + "tracing", + "windows-sys 0.52.0", +] + [[package]] name = "portable-atomic" -version = "1.5.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bccab0e7fd7cc19f820a1c8c91720af652d0c88dc9664dd72aef2614f04af3b" +checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" [[package]] name = "portpicker" @@ -6239,6 +6172,18 @@ dependencies = [ "difference", ] +[[package]] +name = "prettydiff" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ff1fec61082821f8236cf6c0c14e8172b62ce8a72a0eedc30d3b247bb68dc11" +dependencies = [ + "ansi_term 0.12.1", + "pad", + "prettytable-rs", + "structopt", +] + [[package]] name = "prettyplease" version = "0.2.15" @@ -6246,16 +6191,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" dependencies = [ "proc-macro2", - "syn 2.0.39", + "syn 2.0.40", +] + +[[package]] +name = "prettytable-rs" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eea25e07510aa6ab6547308ebe3c036016d162b8da920dbb079e3ba8acf3d95a" +dependencies = [ + "csv", + "encode_unicode 1.0.0", + "is-terminal", + "lazy_static", + "term", + "unicode-width", ] [[package]] name = "primeorder" -version = "0.13.3" +version = "0.13.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7dbe9ed3b56368bd99483eb32fe9c17fdd3730aebadc906918ce78d54c7eeb4" +checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6" dependencies = [ - "elliptic-curve 0.13.6", + "elliptic-curve", ] [[package]] @@ -6281,6 +6240,15 @@ dependencies = [ "toml_edit 0.19.15", ] +[[package]] +name = "proc-macro-crate" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" +dependencies = [ + "toml_edit 0.20.7", +] + [[package]] name = "proc-macro-error" version = "1.0.4" @@ -6313,9 +6281,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.69" +version = "1.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" dependencies = [ "unicode-ident", ] @@ -6367,7 +6335,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -6432,12 +6400,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "radium" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "def50a86306165861203e7f84ecffbbdfdea79f0e51039b33de1e952358c47ac" - [[package]] name = "radium" version = "0.7.0" @@ -6512,15 +6474,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.4.1" @@ -6646,7 +6599,7 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls 0.21.8", + "rustls 0.21.10", "rustls-pemfile", "serde", "serde_json", @@ -6662,21 +6615,10 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots 0.25.2", + "webpki-roots 0.25.3", "winreg", ] -[[package]] -name = "rfc6979" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb" -dependencies = [ - "crypto-bigint 0.4.9", - "hmac", - "zeroize", -] - [[package]] name = "rfc6979" version = "0.4.0" @@ -6704,9 +6646,9 @@ dependencies = [ [[package]] name = "ring" -version = "0.17.5" +version = "0.17.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" +checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" dependencies = [ "cc", "getrandom", @@ -6731,7 +6673,7 @@ version = "0.7.42" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0200c8230b013893c0b2d6213d6ec64ed2b9be2e0e016682b7224ff82cff5c58" dependencies = [ - "bitvec 1.0.1", + "bitvec", "bytecheck", "hashbrown 0.12.3", "indexmap 1.9.3", @@ -6740,7 +6682,7 @@ dependencies = [ "rkyv_derive", "seahash", "tinyvec", - "uuid 1.5.0", + "uuid 1.6.1", ] [[package]] @@ -6817,15 +6759,15 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.21" +version = "0.38.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" +checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" dependencies = [ "bitflags 2.4.1", "errno", "libc", - "linux-raw-sys 0.4.11", - "windows-sys 0.48.0", + "linux-raw-sys 0.4.12", + "windows-sys 0.52.0", ] [[package]] @@ -6855,12 +6797,12 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.8" +version = "0.21.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "446e14c5cda4f3f30fe71863c34ec70f5ac79d6087097ad0bb433e1be5edf04c" +checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" dependencies = [ "log", - "ring 0.17.5", + "ring 0.17.7", "rustls-webpki", "sct 0.7.1", ] @@ -6904,7 +6846,7 @@ version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring 0.17.5", + "ring 0.17.7", "untrusted 0.9.0", ] @@ -6916,9 +6858,9 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" [[package]] name = "salsa20" @@ -7007,7 +6949,7 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring 0.17.5", + "ring 0.17.7", "untrusted 0.9.0", ] @@ -7017,44 +6959,20 @@ version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" -[[package]] -name = "sec1" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928" -dependencies = [ - "base16ct 0.1.1", - "der 0.6.1", - "generic-array 0.14.7", - "pkcs8 0.9.0", - "subtle", - "zeroize", -] - [[package]] name = "sec1" version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" dependencies = [ - "base16ct 0.2.0", - "der 0.7.8", - "generic-array 0.14.7", - "pkcs8 0.10.2", + "base16ct", + "der", + "generic-array", + "pkcs8", "subtle", "zeroize", ] -[[package]] -name = "secp256k1" -version = "0.24.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b1629c9c557ef9b293568b338dddfc8208c98a18c59d722a9d53f859d9c9b62" -dependencies = [ - "rand", - "secp256k1-sys 0.6.1", -] - [[package]] name = "secp256k1" version = "0.26.0" @@ -7062,16 +6980,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4124a35fe33ae14259c490fd70fa199a32b9ce9502f2ee6bc4f81ec06fa65894" dependencies = [ "rand", - "secp256k1-sys 0.8.1", -] - -[[package]] -name = "secp256k1-sys" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83080e2c2fc1006e625be82e5d1eb6a43b7fd9578b617fcc55814daf286bba4b" -dependencies = [ - "cc", + "secp256k1-sys", ] [[package]] @@ -7117,9 +7026,9 @@ dependencies = [ [[package]] name = "self_cell" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c309e515543e67811222dbc9e3dd7e1056279b782e1dacffe4242b718734fb6" +checksum = "e388332cd64eb80cd595a00941baf513caffae8dce9cfd0467fc9c66397dade6" [[package]] name = "semver" @@ -7129,9 +7038,9 @@ checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" [[package]] name = "serde" -version = "1.0.192" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001" +checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" dependencies = [ "serde_derive", ] @@ -7149,13 +7058,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.192" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1" +checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -7254,18 +7163,6 @@ dependencies = [ "digest 0.10.7", ] -[[package]] -name = "sha2" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a256f46ea78a0c0d9ff00077504903ac881a1dafdc20da66545699e7776b3e69" -dependencies = [ - "block-buffer 0.7.3", - "digest 0.8.1", - "fake-simd", - "opaque-debug 0.2.3", -] - [[package]] name = "sha2" version = "0.9.9" @@ -7276,7 +7173,7 @@ dependencies = [ "cfg-if", "cpufeatures", "digest 0.9.0", - "opaque-debug 0.3.0", + "opaque-debug", ] [[package]] @@ -7346,19 +7243,9 @@ dependencies = [ [[package]] name = "signature" -version = "1.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" -dependencies = [ - "digest 0.10.7", - "rand_core", -] - -[[package]] -name = "signature" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" dependencies = [ "digest 0.10.7", "rand_core", @@ -7432,9 +7319,9 @@ checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7" [[package]] name = "smallvec" -version = "1.11.1" +version = "1.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" +checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" [[package]] name = "snafu" @@ -7496,31 +7383,21 @@ dependencies = [ [[package]] name = "spki" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b" -dependencies = [ - "base64ct", - "der 0.6.1", -] - -[[package]] -name = "spki" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" dependencies = [ "base64ct", - "der 0.7.8", + "der", ] [[package]] name = "sqlformat" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b7b278788e7be4d0d29c0f39497a0eef3fba6bbc8e70d8bf7fde46edeaa9e85" +checksum = "ce81b7bd7c4493975347ef60d8c7e8b742d4694f4c49f93e0a12ea263938176c" dependencies = [ - "itertools 0.11.0", + "itertools 0.12.0", "nom", "unicode_categories", ] @@ -7572,7 +7449,7 @@ dependencies = [ "dirs 4.0.0", "dotenvy", "either", - "event-listener", + "event-listener 2.5.3", "futures-channel", "futures-core", "futures-intrusive", @@ -7666,12 +7543,42 @@ dependencies = [ "unicode-normalization", ] +[[package]] +name = "strsim" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" + [[package]] name = "strsim" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +[[package]] +name = "structopt" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10" +dependencies = [ + "clap 2.34.0", + "lazy_static", + "structopt-derive", +] + +[[package]] +name = "structopt-derive" +version = "0.4.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" +dependencies = [ + "heck 0.3.3", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "strum" version = "0.24.1" @@ -7714,21 +7621,23 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "sway-ast" -version = "0.35.5" +version = "0.46.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4257aa4b06d9a6c4fc08562b8ca6bb30694be7f4a6f2a1183a1b89b2ff8ae990" +checksum = "423ce7e98250c3805fb67c6992347ee9dfc468da726d3ffa164dfc45c7cb15c2" dependencies = [ "extension-trait", "num-bigint", "num-traits", + "serde", + "sway-error", "sway-types", ] [[package]] name = "sway-core" -version = "0.35.5" +version = "0.46.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8751a5122f74e7bb0bdf428c7c6d3e70d1c3dde85fbaabd00ea0753495bff180" +checksum = "b78ec44a20466cb6ed0266d911dbd586dbd1d8a224157ddf120d0c33e2b428cc" dependencies = [ "clap 3.2.25", "derivative", @@ -7739,9 +7648,10 @@ dependencies = [ "fuel-etk-asm", "fuel-etk-dasm", "fuel-etk-ops", - "fuel-vm 0.26.3", + "fuel-vm 0.35.4", "hashbrown 0.13.2", "im", + "indexmap 2.1.0", "itertools 0.10.5", "lazy_static", "miden-core", @@ -7752,13 +7662,14 @@ dependencies = [ "serde", "serde_json", "sha2 0.9.9", - "smallvec", + "strum", "sway-ast", "sway-error", "sway-ir", "sway-parse", "sway-types", "sway-utils", + "sysinfo", "thiserror", "tracing", "uint", @@ -7767,29 +7678,29 @@ dependencies = [ [[package]] name = "sway-error" -version = "0.35.5" +version = "0.46.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "804cfe1b52ad5a56c82c95248953055540740f0a409a6ccdc0b7856276d7b77a" +checksum = "a919173d4ea7662f4498886d6c59be391e1051d4a4fcfa03f54e941c0d04cf8a" dependencies = [ - "extension-trait", - "num-bigint", + "either", "num-traits", - "sway-ast", + "smallvec", "sway-types", "thiserror", ] [[package]] name = "sway-ir" -version = "0.35.5" +version = "0.46.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "748ac045cae77885624f41bf575caa9b0f7507114b636b18ddf3bc76afb5acc2" +checksum = "31c317b225415693962288a73e3f5bed530c01887e014697553bc4ad56facbba" dependencies = [ "anyhow", "downcast-rs", "filecheck", "generational-arena", "peg", + "prettydiff", "rustc-hash", "sway-ir-macros", "sway-types", @@ -7798,9 +7709,9 @@ dependencies = [ [[package]] name = "sway-ir-macros" -version = "0.35.5" +version = "0.46.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01b8414dad7e75caf6dee76df474b340c43032d4215e1c74cbd876ac0eeaae04" +checksum = "772dfe4e47a92f0f04dfad85646524fa381a22687b308c22e60924da49a3af0a" dependencies = [ "itertools 0.10.5", "proc-macro2", @@ -7810,9 +7721,9 @@ dependencies = [ [[package]] name = "sway-parse" -version = "0.35.5" +version = "0.46.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a0f715b8ccb38e3e3258ee6aa7411cc16fa000e97af0b9cd58d2007608d81df" +checksum = "738f774c5f9bbe17c8fd003782dbd3af9416384bf3c51b4c9d661e4045629e0b" dependencies = [ "extension-trait", "num-bigint", @@ -7822,27 +7733,34 @@ dependencies = [ "sway-error", "sway-types", "thiserror", + "unicode-bidi", "unicode-xid", ] [[package]] name = "sway-types" -version = "0.35.5" +version = "0.46.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2bdf404eec83133d3b7933db40b2f823713806534aae18ee6d0fbf3a28feebb" +checksum = "7a20288554aa256e698d8ad3446790e7ac1521b50c0244013ee3ab208fe44d2f" dependencies = [ - "fuel-asm 0.26.3", - "fuel-crypto 0.26.3", - "fuel-tx 0.26.3", + "fuel-asm 0.35.4", + "fuel-crypto 0.35.4", + "fuel-tx 0.35.4", "lazy_static", + "num-bigint", + "num-traits", "serde", + "thiserror", ] [[package]] name = "sway-utils" -version = "0.35.5" +version = "0.46.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f61b5b46ad59932ea64298dac267267dd36fb91c99a917a151081c09b88e4e7f" +checksum = "dab230006300db17fad46af0c6ddcc19b372b3b303be7ea76b54d386daef2d66" +dependencies = [ + "serde", +] [[package]] name = "syn" @@ -7857,9 +7775,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.39" +version = "2.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +checksum = "13fa70a4ee923979ffb522cacce59d34421ebdea5625e1073c4326ef9d2dd42e" dependencies = [ "proc-macro2", "quote", @@ -7880,10 +7798,25 @@ checksum = "285ba80e733fac80aa4270fbcdf83772a79b80aa35c97075320abfee4a915b06" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", "unicode-xid", ] +[[package]] +name = "sysinfo" +version = "0.29.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd727fc423c2060f6c92d9534cef765c65a6ed3f428a03d7def74a8c4348e666" +dependencies = [ + "cfg-if", + "core-foundation-sys", + "libc", + "ntapi", + "once_cell", + "rayon", + "winapi", +] + [[package]] name = "system-configuration" version = "0.5.1" @@ -7946,19 +7879,39 @@ dependencies = [ "cfg-if", "fastrand 2.0.1", "redox_syscall 0.4.1", - "rustix 0.38.21", + "rustix 0.38.28", "windows-sys 0.48.0", ] +[[package]] +name = "term" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" +dependencies = [ + "dirs-next", + "rustversion", + "winapi", +] + [[package]] name = "termcolor" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" +checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" dependencies = [ "winapi-util", ] +[[package]] +name = "textwrap" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +dependencies = [ + "unicode-width", +] + [[package]] name = "textwrap" version = "0.16.0" @@ -7982,7 +7935,7 @@ checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -8071,9 +8024,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.34.0" +version = "1.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9" +checksum = "841d45b238a16291a4e1584e61820b8ae57d696cc5015c459c229ccc6990cc1c" dependencies = [ "backtrace", "bytes", @@ -8106,7 +8059,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -8157,7 +8110,7 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls 0.21.8", + "rustls 0.21.10", "tokio", ] @@ -8241,6 +8194,17 @@ dependencies = [ "winnow", ] +[[package]] +name = "toml_edit" +version = "0.20.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" +dependencies = [ + "indexmap 2.1.0", + "toml_datetime", + "winnow", +] + [[package]] name = "toml_edit" version = "0.21.0" @@ -8329,7 +8293,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -8365,6 +8329,17 @@ dependencies = [ "tracing-core", ] +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + [[package]] name = "tracing-serde" version = "0.1.3" @@ -8393,15 +8368,15 @@ dependencies = [ "thread_local", "tracing", "tracing-core", - "tracing-log", + "tracing-log 0.1.4", "tracing-serde", ] [[package]] name = "tracing-subscriber" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ "matchers 0.1.0", "nu-ansi-term", @@ -8414,15 +8389,15 @@ dependencies = [ "thread_local", "tracing", "tracing-core", - "tracing-log", + "tracing-log 0.2.0", "tracing-serde", ] [[package]] name = "try-lock" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "trybuild" @@ -8493,9 +8468,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" [[package]] name = "unicode-ident" @@ -8559,12 +8534,12 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", - "idna 0.4.0", + "idna 0.5.0", "percent-encoding", ] @@ -8592,9 +8567,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.5.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" +checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" dependencies = [ "getrandom", ] @@ -8623,6 +8598,12 @@ version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2bda7c41ca331fe9a1c278a9e7ee055f4be7f5eb1c2b72f079b4ff8b5fce9d5c" +[[package]] +name = "vec_map" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + [[package]] name = "version_check" version = "0.9.4" @@ -8674,9 +8655,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" +checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -8684,47 +8665,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" +checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", "wasm-bindgen-shared", ] -[[package]] -name = "wasm-bindgen-downcast" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dac026d43bcca6e7ce1c0956ba68f59edf6403e8e930a5d891be72c31a44340" -dependencies = [ - "js-sys", - "once_cell", - "wasm-bindgen", - "wasm-bindgen-downcast-macros", -] - -[[package]] -name = "wasm-bindgen-downcast-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5020cfa87c7cecefef118055d44e3c1fc122c7ec25701d528ee458a0b45f38f" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "wasm-bindgen-futures" -version = "0.4.38" +version = "0.4.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9afec9963e3d0994cac82455b2b3502b81a7f40f9a0d32181f7528d9f4b43e02" +checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12" dependencies = [ "cfg-if", "js-sys", @@ -8734,9 +8692,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" +checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -8744,22 +8702,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" +checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" +checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" [[package]] name = "wasm-encoder" @@ -8785,9 +8743,9 @@ dependencies = [ [[package]] name = "wasmer" -version = "4.2.3" +version = "4.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50cb1ae2956aac1fbbcf334c543c1143cdf7d5b0a5fb6c3d23a17bf37dd1f47b" +checksum = "ce45cc009177ca345a6d041f9062305ad467d15e7d41494f5b81ab46d62d7a58" dependencies = [ "bytes", "cfg-if", @@ -8802,7 +8760,6 @@ dependencies = [ "target-lexicon", "thiserror", "wasm-bindgen", - "wasm-bindgen-downcast", "wasmer-compiler", "wasmer-compiler-cranelift", "wasmer-derive", @@ -8814,9 +8771,9 @@ dependencies = [ [[package]] name = "wasmer-compiler" -version = "4.2.3" +version = "4.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12fd9aeef339095798d1e04957d5657d97490b1112f145cbf08b98f6393b4a0a" +checksum = "e044f6140c844602b920deb4526aea3cc9c0d7cf23f00730bb9b2034669f522a" dependencies = [ "backtrace", "bytes", @@ -8841,9 +8798,9 @@ dependencies = [ [[package]] name = "wasmer-compiler-cranelift" -version = "4.2.3" +version = "4.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "344f5f1186c122756232fe7f156cc8d2e7bf333d5a658e81e25efa3415c26d07" +checksum = "32ce02358eb44a149d791c1d6648fb7f8b2f99cd55e3c4eef0474653ec8cc889" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -8860,9 +8817,9 @@ dependencies = [ [[package]] name = "wasmer-derive" -version = "4.2.3" +version = "4.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ac8c1f2dc0ed3c7412a5546e468365184a461f8ce7dfe2a707b621724339f91" +checksum = "c782d80401edb08e1eba206733f7859db6c997fc5a7f5fb44edc3ecd801468f6" dependencies = [ "proc-macro-error", "proc-macro2", @@ -8872,9 +8829,9 @@ dependencies = [ [[package]] name = "wasmer-middlewares" -version = "4.2.3" +version = "4.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dcde781a2db145acfff3873197838dc125bb2fab3e7ee3edbcf6b094eae6588" +checksum = "66d4f27f76b7b5325476c8851f34920ae562ef0de3c830fdbc4feafff6782187" dependencies = [ "wasmer", "wasmer-types", @@ -8883,9 +8840,9 @@ dependencies = [ [[package]] name = "wasmer-types" -version = "4.2.3" +version = "4.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a57ecbf218c0a9348d4dfbdac0f9d42d9201ae276dffb13e61ea4ff939ecce7" +checksum = "fd09e80d4d74bb9fd0ce6c3c106b1ceba1a050f9948db9d9b78ae53c172d6157" dependencies = [ "bytecheck", "enum-iterator 0.7.0", @@ -8899,9 +8856,9 @@ dependencies = [ [[package]] name = "wasmer-vm" -version = "4.2.3" +version = "4.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60c3513477bc0097250f6e34a640e2a903bb0ee57e6bb518c427f72c06ac7728" +checksum = "bdcd8a4fd36414a7b6a003dbfbd32393bce3e155d715dd877c05c1b7a41d224d" dependencies = [ "backtrace", "cc", @@ -8916,7 +8873,7 @@ dependencies = [ "lazy_static", "libc", "mach", - "memoffset 0.8.0", + "memoffset", "more-asserts", "region", "scopeguard", @@ -8967,9 +8924,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.65" +version = "0.3.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85" +checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" dependencies = [ "js-sys", "wasm-bindgen", @@ -8991,7 +8948,7 @@ version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" dependencies = [ - "ring 0.17.5", + "ring 0.17.7", "untrusted 0.9.0", ] @@ -9006,9 +8963,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.25.2" +version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" +checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" [[package]] name = "which" @@ -9019,7 +8976,7 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.21", + "rustix 0.38.28", ] [[package]] @@ -9031,7 +8988,7 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.21", + "rustix 0.38.28", "windows-sys 0.48.0", ] @@ -9116,6 +9073,15 @@ dependencies = [ "windows-targets 0.48.5", ] +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.0", +] + [[package]] name = "windows-targets" version = "0.42.2" @@ -9146,6 +9112,21 @@ dependencies = [ "windows_x86_64_msvc 0.48.5", ] +[[package]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", +] + [[package]] name = "windows_aarch64_gnullvm" version = "0.42.2" @@ -9158,6 +9139,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + [[package]] name = "windows_aarch64_msvc" version = "0.33.0" @@ -9176,6 +9163,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + [[package]] name = "windows_i686_gnu" version = "0.33.0" @@ -9194,6 +9187,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +[[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + [[package]] name = "windows_i686_msvc" version = "0.33.0" @@ -9212,6 +9211,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" +[[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + [[package]] name = "windows_x86_64_gnu" version = "0.33.0" @@ -9230,6 +9235,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + [[package]] name = "windows_x86_64_gnullvm" version = "0.42.2" @@ -9242,6 +9253,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + [[package]] name = "windows_x86_64_msvc" version = "0.33.0" @@ -9260,11 +9277,17 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + [[package]] name = "winnow" -version = "0.5.19" +version = "0.5.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" +checksum = "b67b5f0a4e7a27a64c651977932b9dc5667ca7fc31ac44b03ed37a0cf42fdfff" dependencies = [ "memchr", ] @@ -9317,11 +9340,13 @@ dependencies = [ [[package]] name = "xattr" -version = "1.0.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" +checksum = "d367426ae76bdfce3d8eaea6e94422afd6def7d46f9c89e2980309115b3c2c41" dependencies = [ "libc", + "linux-raw-sys 0.4.12", + "rustix 0.38.28", ] [[package]] @@ -9353,29 +9378,29 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.25" +version = "0.7.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd369a67c0edfef15010f980c3cbe45d7f651deac2cd67ce097cd801de16557" +checksum = "306dca4455518f1f31635ec308b6b3e4eb1b11758cefafc782827d0aa7acb5c7" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.25" +version = "0.7.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f140bda219a26ccc0cdb03dba58af72590c53b22642577d88a927bc5c87d6b" +checksum = "be912bf68235a88fbefd1b73415cb218405958d1655b2ece9035a19920bdf6ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] name = "zeroize" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" dependencies = [ "zeroize_derive", ] @@ -9388,7 +9413,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 1f57dab2e..045b63cec 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -84,6 +84,7 @@ fuel-indexer-postgres = { version = "0.24.1", path = "./packages/fuel-indexer-da fuel-indexer-schema = { version = "0.24.1", path = "./packages/fuel-indexer-schema", default-features = false } fuel-indexer-types = { version = "0.24.1", path = "./packages/fuel-indexer-types" } fuel-indexer-utils = { version = "0.24.1", path = "./packages/fuel-indexer-utils" } +fuel-crypto = { version = "0.43", default-features = false} fuel-tx = { version = "0.43", default-features = false } fuel-types = { version = "0.43", default-features = false, features = ["serde"] } fuel-vm = { version = "0.43", default-features = false } diff --git a/examples/fuel-explorer/fuel-explorer/schema/fuel_explorer.schema.graphql b/examples/fuel-explorer/fuel-explorer/schema/fuel_explorer.schema.graphql index 63635ad2a..5603d2701 100644 --- a/examples/fuel-explorer/fuel-explorer/schema/fuel_explorer.schema.graphql +++ b/examples/fuel-explorer/fuel-explorer/schema/fuel_explorer.schema.graphql @@ -45,10 +45,8 @@ enum PanicReason { InvalidMetadataIdentifier MalformedCallStructure ReservedRegisterNotWritable - ErrorFlag InvalidImmediateValue ExpectedCoinInput - MaxMemoryAccess MemoryWriteOverlap ContractNotInInputs InternalBalanceOverflow @@ -58,7 +56,6 @@ enum PanicReason { TransferAmountCannotBeZero ExpectedOutputVariable ExpectedParentInternalContext - IllegalJump ContractIdAlreadyDeployed Unknown } @@ -463,7 +460,6 @@ union Output = type CreateTransaction @entity { id: ID! gas_price: U64! - gas_limit: U64! maturity: U32! bytecode_length: U64! bytecode_witness_index: U8! @@ -482,7 +478,6 @@ type CreateTransaction @entity { type ScriptTransaction @entity { id: ID! gas_price: U64! - gas_limit: U64! maturity: U32! script: Bytes! script_data: Bytes! @@ -500,7 +495,6 @@ type ScriptTransaction @entity { type MintTransaction @entity { id: ID! tx_pointer: TxPointer! - outputs: [Output!] metadata: Json is_mint: Boolean! receipts: [Receipt!] diff --git a/examples/fuel-explorer/fuel-explorer/src/lib.rs b/examples/fuel-explorer/fuel-explorer/src/lib.rs index fbd94ec2e..609977277 100644 --- a/examples/fuel-explorer/fuel-explorer/src/lib.rs +++ b/examples/fuel-explorer/fuel-explorer/src/lib.rs @@ -57,12 +57,10 @@ impl From for PanicReason { fuel::ClientPanicReason::ReservedRegisterNotWritable => { PanicReason::ReservedRegisterNotWritable } - fuel::ClientPanicReason::ErrorFlag => PanicReason::ErrorFlag, fuel::ClientPanicReason::InvalidImmediateValue => { PanicReason::InvalidImmediateValue } fuel::ClientPanicReason::ExpectedCoinInput => PanicReason::ExpectedCoinInput, - fuel::ClientPanicReason::MaxMemoryAccess => PanicReason::MaxMemoryAccess, fuel::ClientPanicReason::MemoryWriteOverlap => { PanicReason::MemoryWriteOverlap } @@ -88,7 +86,6 @@ impl From for PanicReason { fuel::ClientPanicReason::ExpectedParentInternalContext => { PanicReason::ExpectedParentInternalContext } - fuel::ClientPanicReason::IllegalJump => PanicReason::IllegalJump, fuel::ClientPanicReason::ContractIdAlreadyDeployed => { PanicReason::ContractIdAlreadyDeployed } @@ -728,7 +725,6 @@ impl From for Transaction { let tx_status = TransactionStatus::from(transaction.status.clone()); match transaction.transaction { fuel::Transaction::Script(fuel::Script { - gas_limit, gas_price, maturity, script, @@ -762,7 +758,6 @@ impl From for Transaction { .collect::>(); let script_tx = ScriptTransaction::new( - gas_limit, gas_price, *maturity, script.to_owned().into(), @@ -781,7 +776,6 @@ impl From for Transaction { Self::from(script_tx).get_or_create() } fuel::Transaction::Create(fuel::Create { - gas_limit, gas_price, maturity, bytecode_length, @@ -821,7 +815,6 @@ impl From for Transaction { .collect::>(); let create_tx = CreateTransaction::new( - gas_limit, gas_price, *maturity, bytecode_length, @@ -842,15 +835,9 @@ impl From for Transaction { } fuel::Transaction::Mint(fuel::Mint { tx_pointer, - outputs, metadata, }) => { let tx_pointer = TxPointer::from(tx_pointer.to_owned()); - let outputs = outputs - .iter() - .map(|o| Output::from(o.to_owned())) - .map(|o| o.id) - .collect::>(); let receipts = transaction .receipts .iter() @@ -859,7 +846,6 @@ impl From for Transaction { let mint_tx = MintTransaction::new( tx_pointer.id, - Some(outputs), metadata.to_owned().map(|m| m.into()), true, Some(receipts), diff --git a/packages/fuel-indexer-api-server/Cargo.toml b/packages/fuel-indexer-api-server/Cargo.toml index 4bbfc1dce..da3c718f4 100644 --- a/packages/fuel-indexer-api-server/Cargo.toml +++ b/packages/fuel-indexer-api-server/Cargo.toml @@ -20,7 +20,7 @@ async-graphql-axum = "5.0.7" async-std = "1" axum = { version = "0.6", features = ["multipart", "macros"] } clap = { features = ["cargo", "derive", "env"], workspace = true } -fuel-crypto = { version = "=0.35.4", features = ["std"] } +fuel-crypto = { workspace = true, features = ["std"] } fuel-indexer-database = { workspace = true } fuel-indexer-graphql = { workspace = true } fuel-indexer-lib = { workspace = true } diff --git a/packages/fuel-indexer-benchmarks/Cargo.toml b/packages/fuel-indexer-benchmarks/Cargo.toml index 30bd301f9..2de97db40 100644 --- a/packages/fuel-indexer-benchmarks/Cargo.toml +++ b/packages/fuel-indexer-benchmarks/Cargo.toml @@ -26,7 +26,7 @@ chrono = { version = "0.4", features = ["serde"] } clap = { workspace = true } criterion = { version = "0.5.1", features = ["html_reports", "async_tokio"] } duct = "0.13" -fuel-core-client = "0.20" +fuel-core-client = "0.21" fuel-indexer = { workspace = true } fuel-indexer-database = { workspace = true } fuel-indexer-graphql = { workspace = true } diff --git a/packages/fuel-indexer-plugin/src/find.rs b/packages/fuel-indexer-plugin/src/find.rs index e342b4ba4..51d0ef784 100644 --- a/packages/fuel-indexer-plugin/src/find.rs +++ b/packages/fuel-indexer-plugin/src/find.rs @@ -306,7 +306,7 @@ impl ToSQLValue for UID { impl ToSQLValue for BlockHeight { fn to_sql_value(self) -> sql::Value { - sqlparser::test_utils::number(&self.as_usize().to_string()) + sqlparser::test_utils::number(&self.to_string()) } } diff --git a/packages/fuel-indexer-tests/src/fixtures.rs b/packages/fuel-indexer-tests/src/fixtures.rs index 2bf427e9c..686d74861 100644 --- a/packages/fuel-indexer-tests/src/fixtures.rs +++ b/packages/fuel-indexer-tests/src/fixtures.rs @@ -1,4 +1,6 @@ -use crate::{assets, defaults, TestError, WORKSPACE_ROOT}; +use crate::{ + assets, defaults, utils::update_test_manifest_asset_paths, TestError, WORKSPACE_ROOT, +}; use actix_service::Service; use actix_web::test; use axum::routing::Router; @@ -7,7 +9,7 @@ use fuel_indexer_api_server::api::WebApi; use fuel_indexer_database::IndexerConnectionPool; use fuel_indexer_lib::{ config::{DatabaseConfig, IndexerConfig, WebApiConfig}, - defaults::SERVICE_REQUEST_CHANNEL_SIZE, + defaults::{MAX_DB_CONNECTIONS, SERVICE_REQUEST_CHANNEL_SIZE}, manifest::Manifest, utils::{derive_socket_addr, ServiceRequest}, }; @@ -38,8 +40,8 @@ use tokio::{ use tracing_subscriber::filter::EnvFilter; abigen!(Contract( - name = "FuelIndexer", - abi = "packages/fuel-indexer-tests/sway/test-contract1/out/debug/test-contract1-abi.json" + name = "FuelIndexerTest", + abi = "packages/fuel-indexer-tests/contracts/fuel-indexer-test/out/debug/fuel-indexer-test-abi.json" )); pub struct TestPostgresDb { @@ -91,7 +93,8 @@ pub async fn setup_indexing_test_components( let db = TestPostgresDb::new().await.unwrap(); let mut service = indexer_service_postgres(Some(&db.url), config).await; - let manifest = assets::test_indexer_updated_manifest(); + let mut manifest = Manifest::try_from(assets::FUEL_INDEXER_TEST_MANIFEST).unwrap(); + update_test_manifest_asset_paths(&mut manifest); service .register_indexer_from_manifest( @@ -116,7 +119,8 @@ pub async fn setup_web_test_components( let db = TestPostgresDb::new().await.unwrap(); let mut service = indexer_service_postgres(Some(&db.url), config.clone()).await; - let manifest = assets::test_indexer_updated_manifest(); + let mut manifest = Manifest::try_from(assets::FUEL_INDEXER_TEST_MANIFEST).unwrap(); + update_test_manifest_asset_paths(&mut manifest); service .register_indexer_from_manifest( @@ -189,20 +193,22 @@ impl TestPostgresDb { .await?; // Instantiate a pool so that it can be stored in the struct for use in the tests - let pool = - match IndexerConnectionPool::connect(&test_db_config.clone().to_string()) - .await - { - Ok(pool) => match pool { - IndexerConnectionPool::Postgres(p) => { - let mut conn = p.acquire().await?; - - fuel_indexer_postgres::run_migration(&mut conn).await?; - p - } - }, - Err(e) => return Err(TestError::PoolCreationError(e)), - }; + let pool = match IndexerConnectionPool::connect( + &test_db_config.clone().to_string(), + MAX_DB_CONNECTIONS, + ) + .await + { + Ok(pool) => match pool { + IndexerConnectionPool::Postgres(p) => { + let mut conn = p.acquire().await?; + + fuel_indexer_postgres::run_migration(&mut conn).await?; + p + } + }, + Err(e) => return Err(TestError::PoolCreationError(e)), + }; Ok(Self { db_name, @@ -342,22 +348,22 @@ pub async fn setup_example_test_fuel_node() -> Result<(), ()> { let wallet_path = Path::new(WORKSPACE_ROOT).join("test-chain-config.json"); let contract_bin_path = Path::new(WORKSPACE_ROOT) - .join("sway") - .join("test-contract1") + .join("contracts") + .join("fuel-indexer-test") .join("out") .join("debug") - .join("test-contract1.bin"); + .join("fuel-indexer-test.bin"); setup_test_fuel_node(wallet_path, Some(contract_bin_path), None).await } pub fn get_test_contract_id() -> Bech32ContractId { let contract_bin_path = Path::new(WORKSPACE_ROOT) - .join("sway") - .join("test-contract1") + .join("contracts") + .join("fuel-indexer-test") .join("out") .join("debug") - .join("test-contract1.bin"); + .join("fuel-indexer-test.bin"); let loaded_contract = Contract::load_from( contract_bin_path.as_os_str().to_str().unwrap(), @@ -378,9 +384,12 @@ pub async fn api_server_app_postgres( config.database = DatabaseConfig::from_str(url).unwrap(); } - let pool = IndexerConnectionPool::connect(&config.database.to_string()) - .await - .unwrap(); + let pool = IndexerConnectionPool::connect( + &config.database.to_string(), + config.max_db_connections, + ) + .await + .unwrap(); let (tx, rx) = channel::(SERVICE_REQUEST_CHANNEL_SIZE); @@ -401,15 +410,18 @@ pub async fn indexer_service_postgres( let (_tx, rx) = channel::(SERVICE_REQUEST_CHANNEL_SIZE); - let pool = IndexerConnectionPool::connect(&config.database.to_string()) - .await - .unwrap(); + let pool = IndexerConnectionPool::connect( + &config.database.to_string(), + config.max_db_connections, + ) + .await + .unwrap(); IndexerService::new(config, pool, rx).await.unwrap() } pub async fn connect_to_deployed_contract( -) -> Result, Box> { +) -> Result, Box> { let wallet_path = Path::new(WORKSPACE_ROOT).join("test-chain-config.json"); let wallet_path_str = wallet_path.as_os_str().to_str().unwrap(); let mut wallet = @@ -429,7 +441,7 @@ pub async fn connect_to_deployed_contract( let contract_id: Bech32ContractId = Bech32ContractId::from(fuels::types::ContractId::from(get_test_contract_id())); - let contract = FuelIndexer::new(contract_id.clone(), wallet); + let contract = FuelIndexerTest::new(contract_id.clone(), wallet); println!("Using contract at {contract_id}"); @@ -450,7 +462,7 @@ pub mod test_web { use fuels::types::bech32::Bech32ContractId; use std::path::Path; - use super::{tx_params, FuelIndexer}; + use super::{tx_params, FuelIndexerTest}; async fn fuel_indexer_test_blocks(state: web::Data>) -> impl Responder { let _ = state @@ -835,28 +847,12 @@ pub mod test_web { HttpResponse::Ok() } - async fn trigger_predicate_witness_data( - state: web::Data>, - ) -> impl Responder { - let data = vec![1u8]; - let _ = state - .contract - .methods() - .trigger_find() - .tx_params(tx_params()) - .call() - .await - .unwrap(); - - HttpResponse::Ok() - } - pub struct AppState { - pub contract: FuelIndexer, + pub contract: FuelIndexerTest, } pub fn app( - contract: FuelIndexer, + contract: FuelIndexerTest, ) -> App< impl ServiceFactory< ServiceRequest, @@ -956,7 +952,7 @@ pub mod test_web { println!("Starting server at {}", defaults::WEB_API_ADDR); let _ = HttpServer::new(move || { - app(FuelIndexer::new(contract_id.clone(), wallet.clone())) + app(FuelIndexerTest::new(contract_id.clone(), wallet.clone())) }) .bind(defaults::WEB_API_ADDR) .unwrap() diff --git a/packages/fuel-indexer-tests/tests/indexing.rs b/packages/fuel-indexer-tests/tests/indexing.rs index 087706a43..5d85dfd21 100644 --- a/packages/fuel-indexer-tests/tests/indexing.rs +++ b/packages/fuel-indexer-tests/tests/indexing.rs @@ -10,7 +10,7 @@ use std::{collections::HashSet, str::FromStr}; const REVERT_VM_CODE: u64 = 0x0004; const EXPECTED_CONTRACT_ID: &str = - "60ddf75280b60e644e90fca5febaffb024882f0203b04ed8c7e9df8aa961060e"; + "5805ad6fc1543e317cc86d4da1185b8e122c183861bf9e151a3819ac3e26103d"; const TRANSFER_BASE_ASSET_ID: &str = "0000000000000000000000000000000000000000000000000000000000000000"; @@ -773,9 +773,3 @@ async fn test_find() { .get::<&str, usize>(2) .contains("called `Option::unwrap()` on a `None` value")); } - - -#[actix_web::test] -async fn test_signal_predicate_witness_data() { - -} \ No newline at end of file diff --git a/packages/fuel-indexer-tests/tests/snapshots/integration_tests__commands__default_indexer_config.snap b/packages/fuel-indexer-tests/tests/snapshots/integration_tests__commands__default_indexer_config.snap index 1c911339a..3cd5f6937 100644 --- a/packages/fuel-indexer-tests/tests/snapshots/integration_tests__commands__default_indexer_config.snap +++ b/packages/fuel-indexer-tests/tests/snapshots/integration_tests__commands__default_indexer_config.snap @@ -23,6 +23,7 @@ database: port: "5432" database: postgres verbose: "false" +max_db_connections: 100 metrics: true stop_idle_indexers: false run_migrations: true diff --git a/packages/fuel-indexer-tests/tests/snapshots/integration_tests__commands__forc_index_start_help_output.snap b/packages/fuel-indexer-tests/tests/snapshots/integration_tests__commands__forc_index_start_help_output.snap index dd80e7000..e34a3018e 100644 --- a/packages/fuel-indexer-tests/tests/snapshots/integration_tests__commands__forc_index_start_help_output.snap +++ b/packages/fuel-indexer-tests/tests/snapshots/integration_tests__commands__forc_index_start_help_output.snap @@ -73,6 +73,9 @@ OPTIONS: --max-body-size Max body size for web server requests. [default: 5242880] + --max-db-connections + The maximum number of database connections. [default: 100] + --metering-points The number of WASM opcodes after which the indexer's event handler will stop execution. [default: 30000000000] diff --git a/packages/fuel-indexer-tests/tests/snapshots/integration_tests__commands__fuel_indexer_api_server_run_help_output.snap b/packages/fuel-indexer-tests/tests/snapshots/integration_tests__commands__fuel_indexer_api_server_run_help_output.snap index 68f7b8f39..02c7b3de5 100644 --- a/packages/fuel-indexer-tests/tests/snapshots/integration_tests__commands__fuel_indexer_api_server_run_help_output.snap +++ b/packages/fuel-indexer-tests/tests/snapshots/integration_tests__commands__fuel_indexer_api_server_run_help_output.snap @@ -52,6 +52,9 @@ OPTIONS: --max-body-size Max body size for web requests. [default: 5242880] + --max-db-connections + The maximum number of database connections. [default: 100] + --metrics Use Prometheus metrics reporting. diff --git a/packages/fuel-indexer-tests/tests/snapshots/integration_tests__commands__fuel_indexer_run_help_output.snap b/packages/fuel-indexer-tests/tests/snapshots/integration_tests__commands__fuel_indexer_run_help_output.snap index 45f36786e..08df71656 100644 --- a/packages/fuel-indexer-tests/tests/snapshots/integration_tests__commands__fuel_indexer_run_help_output.snap +++ b/packages/fuel-indexer-tests/tests/snapshots/integration_tests__commands__fuel_indexer_run_help_output.snap @@ -73,6 +73,9 @@ OPTIONS: --max-body-size Max body size for web server requests. [default: 5242880] + --max-db-connections + The maximum number of database connections. [default: 100] + --metering-points The number of WASM opcodes after which the indexer's event handler will stop execution. [default: 30000000000] diff --git a/packages/fuel-indexer-tests/tests/web_server.rs b/packages/fuel-indexer-tests/tests/web_server.rs index 633d24a69..d3083dfad 100644 --- a/packages/fuel-indexer-tests/tests/web_server.rs +++ b/packages/fuel-indexer-tests/tests/web_server.rs @@ -4,7 +4,7 @@ use fuel_indexer_lib::config::{ }; use fuel_indexer_postgres as postgres; use fuel_indexer_tests::{ - assets, + assets::{self, SIMPLE_WASM_WASM}, fixtures::{setup_web_test_components, WebTestComponents}, }; use hyper::header::CONTENT_TYPE; @@ -408,3 +408,11 @@ async fn test_replacing_an_indexer_and_keeping_or_removing_data() { assert_eq!(last, 5); } + +#[actix_web::test] +async fn test_check_toolchain_version() { + fuel_indexer_api_server::utils::check_wasm_toolchain_version( + SIMPLE_WASM_WASM.to_vec(), + ) + .expect("failed to extract toolchain version from WASM module"); +} diff --git a/packages/fuel-indexer-types/Cargo.toml b/packages/fuel-indexer-types/Cargo.toml index 4a4eabe8e..925a769fc 100644 --- a/packages/fuel-indexer-types/Cargo.toml +++ b/packages/fuel-indexer-types/Cargo.toml @@ -11,6 +11,7 @@ description = "Fuel Indexer Types" [dependencies] bytes = { version = "1.4", features = ["serde"] } +fuel-crypto = { workspace = true } fuel-tx = { workspace = true, features = ["serde"] } fuel-types = { workspace = true } fuels = { workspace = true } diff --git a/packages/fuel-indexer-types/src/fuel.rs b/packages/fuel-indexer-types/src/fuel.rs index fb4738371..283b25359 100644 --- a/packages/fuel-indexer-types/src/fuel.rs +++ b/packages/fuel-indexer-types/src/fuel.rs @@ -13,7 +13,7 @@ use serde::{Deserialize, Serialize}; pub mod field { pub use fuel_tx::field::{ - BytecodeLength, BytecodeWitnessIndex, GasLimit, GasPrice, Inputs, Maturity, + BytecodeLength, BytecodeWitnessIndex, GasPrice, Inputs, Maturity, Outputs, ReceiptsRoot, Salt as TxFieldSalt, Script as TxFieldScript, ScriptData, StorageSlots, TxPointer as FieldTxPointer, Witnesses, }; @@ -43,7 +43,6 @@ impl Default for Transaction { #[derive(Clone, Debug, Serialize, Deserialize)] pub struct Create { pub gas_price: Word, - pub gas_limit: Word, pub maturity: BlockHeight, pub bytecode_length: Word, pub bytecode_witness_index: u8, @@ -86,7 +85,6 @@ impl From for CommonMetadata { #[derive(Clone, Debug, Serialize, Deserialize, Default)] pub struct Script { pub gas_price: Word, - pub gas_limit: Word, pub maturity: BlockHeight, pub script: Vec, pub script_data: Vec, @@ -122,7 +120,6 @@ impl From for ScriptMetadata { #[derive(Clone, Debug, Serialize, Deserialize)] pub struct Mint { pub tx_pointer: TxPointer, - pub outputs: Vec, pub metadata: Option, } @@ -176,7 +173,7 @@ pub struct BlockData { pub height: u32, pub id: Bytes32, pub header: Header, - pub producer: Option, + pub producer: Option, pub time: i64, pub consensus: Consensus, pub transactions: Vec, @@ -393,18 +390,14 @@ impl From for Output { .expect("Could not convert asset ID to bytes"), ), }), - ClientOutput::Contract { - input_index, - balance_root, - state_root, - } => Output::ContractOutput(ContractOutput { - input_index: input_index.into(), + ClientOutput::Contract(contract) => Output::ContractOutput(ContractOutput { + input_index: contract.input_index.into(), balance_root: Bytes32::from( - <[u8; 32]>::try_from(balance_root) + <[u8; 32]>::try_from(contract.balance_root) .expect("Could not convert balance root to bytes"), ), state_root: Bytes32::from( - <[u8; 32]>::try_from(state_root) + <[u8; 32]>::try_from(contract.state_root) .expect("Could not convert state root to bytes"), ), }), diff --git a/packages/fuel-indexer/Cargo.toml b/packages/fuel-indexer/Cargo.toml index c2b408f21..5fdcd236f 100644 --- a/packages/fuel-indexer/Cargo.toml +++ b/packages/fuel-indexer/Cargo.toml @@ -21,9 +21,9 @@ bincode = { workspace = true } clap = { features = ["cargo", "derive", "env"], workspace = true } cynic = "2.2" forc-postgres = { workspace = true } -fuel-core = { version = "0.20", optional = true } -fuel-core-client = "0.20" -fuel-crypto = { version = "=0.35.4" } +fuel-core = { version = "0.21", optional = true } +fuel-core-client = "0.21" +fuel-crypto = { sorkspace = true } fuel-indexer-api-server = { workspace = true, optional = true } fuel-indexer-database = { workspace = true } fuel-indexer-lib = { workspace = true } @@ -46,7 +46,7 @@ version = "0.10.52" features = ["vendored"] [dev-dependencies] -fuel-core-client = { version = "0.20", features = ["test-helpers"] } +fuel-core-client = { version = "0.21", features = ["test-helpers"] } [features] default = ["api-server", "metrics"] diff --git a/packages/fuel-indexer/src/executor.rs b/packages/fuel-indexer/src/executor.rs index e5cb657d5..7540932b0 100644 --- a/packages/fuel-indexer/src/executor.rs +++ b/packages/fuel-indexer/src/executor.rs @@ -6,6 +6,7 @@ use crate::{ use anyhow::Context; use async_std::sync::{Arc, Mutex}; use async_trait::async_trait; +use fuel_vm::fuel_types::canonical::Deserialize; use fuel_core_client::client::{ pagination::{PageDirection, PaginatedResult, PaginationRequest}, schema::block::{Consensus as ClientConsensus, Genesis as ClientGenesis}, @@ -23,7 +24,6 @@ use fuel_indexer_types::{ scalar::{Bytes, Bytes32}, }; use fuel_tx::UniqueIdentifier; -use fuel_vm::prelude::Deserializable; use fuel_vm::state::ProgramState as ClientProgramState; use futures::Future; use itertools::Itertools; @@ -367,7 +367,7 @@ pub async fn retrieve_blocks_from_node( } = client .full_blocks(PaginationRequest { cursor: cursor.clone(), - results: page_size, + results: page_size as i32, direction: PageDirection::Forward, }) .await @@ -386,7 +386,7 @@ pub async fn retrieve_blocks_from_node( let mut block_info = Vec::new(); for block in results.into_iter() { - let producer: Option = block.block_producer().map(|pk| pk.hash()); + let producer = block.block_producer().map(|pk| pk.hash()); let mut transactions = Vec::new(); @@ -482,9 +482,8 @@ pub async fn retrieve_blocks_from_node( let transaction = match transaction { ClientTransaction::Create(tx) => Transaction::Create(Create { - gas_price: *tx.gas_price(), - gas_limit: *tx.gas_limit(), - maturity: *tx.maturity(), + gas_price: tx.gas_price(), + maturity: tx.maturity(), bytecode_length: *tx.bytecode_length(), bytecode_witness_index: *tx.bytecode_witness_index(), storage_slots: tx @@ -502,9 +501,8 @@ pub async fn retrieve_blocks_from_node( metadata: None, }), ClientTransaction::Script(tx) => Transaction::Script(Script { - gas_price: *tx.gas_price(), - gas_limit: *tx.gas_limit(), - maturity: *tx.maturity(), + gas_price: tx.gas_price(), + maturity: (*tx.maturity()).into(), script: (*tx.script().clone()).to_vec(), script_data: (*tx.script_data().clone()).to_vec(), inputs: tx.inputs().iter().map(|i| i.to_owned().into()).collect(), @@ -515,7 +513,6 @@ pub async fn retrieve_blocks_from_node( }), ClientTransaction::Mint(tx) => Transaction::Mint(Mint { tx_pointer: tx.tx_pointer().to_owned().into(), - outputs: tx.outputs().iter().map(|o| o.to_owned().into()).collect(), metadata: None, }), }; diff --git a/plugins/forc-index/Cargo.toml b/plugins/forc-index/Cargo.toml index b7a0bdfcb..0fc20ae60 100644 --- a/plugins/forc-index/Cargo.toml +++ b/plugins/forc-index/Cargo.toml @@ -18,7 +18,7 @@ colorful = "0.2.2" filetime = "0.2" forc-postgres = { workspace = true } forc-tracing = { version = "0.31", default-features = false } -forc-util = { version = "0.35.0" } +forc-util = { version = "0.46" } fuel-indexer-database-types = { workspace = true } fuel-indexer-lib = { workspace = true } fuel-tx = { features = ["builder"], workspace = true }