diff --git a/Cargo.lock b/Cargo.lock index d27bc131f..60713d4e6 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]] @@ -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", @@ -346,9 +346,9 @@ dependencies = [ [[package]] name = "anstyle-query" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3a318f1f38d2418400f8209655bfd825785afd25aa30bb7ba6cc792e4596748" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" dependencies = [ "windows-sys 0.52.0", ] @@ -447,13 +447,13 @@ dependencies = [ [[package]] name = "async-global-executor" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b4353121d5644cdf2beb5726ab752e79a8db1ebb52031770ec47db31d245526" +checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c" dependencies = [ "async-channel 2.1.1", "async-executor", - "async-io 2.2.1", + "async-io 2.2.2", "async-lock 3.2.0", "blocking", "futures-lite 2.1.0", @@ -645,9 +645,9 @@ dependencies = [ [[package]] name = "async-io" -version = "2.2.1" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6d3b15875ba253d1110c740755e246537483f152fa334f91abd7fe84c88b3ff" +checksum = "6afaa937395a620e33dc6a742c593c01aced20aa376ffb0f628121198578ccc7" dependencies = [ "async-lock 3.2.0", "cfg-if", @@ -656,7 +656,7 @@ dependencies = [ "futures-lite 2.1.0", "parking", "polling 3.3.1", - "rustix 0.38.26", + "rustix 0.38.28", "slab", "tracing", "windows-sys 0.52.0", @@ -727,7 +727,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -744,7 +744,7 @@ checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -899,7 +899,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -915,42 +915,15 @@ dependencies = [ "miniz_oxide", "object", "rustc-demangle", + "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" @@ -978,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" @@ -1028,7 +995,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -1042,6 +1009,9 @@ name = "bitflags" version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +dependencies = [ + "serde", +] [[package]] name = "bitmaps" @@ -1052,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" @@ -1069,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" @@ -1096,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]] @@ -1123,16 +1062,7 @@ 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]] @@ -1178,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" @@ -1206,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" @@ -1373,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" @@ -1385,9 +1318,9 @@ dependencies = [ "clap_lex 0.2.4", "indexmap 1.9.3", "once_cell", - "strsim", + "strsim 0.10.0", "termcolor", - "textwrap", + "textwrap 0.16.0", ] [[package]] @@ -1409,7 +1342,7 @@ dependencies = [ "anstream", "anstyle", "clap_lex 0.6.0", - "strsim", + "strsim 0.10.0", ] [[package]] @@ -1434,7 +1367,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -1458,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.2", + "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", @@ -1526,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" @@ -1554,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", @@ -1607,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", @@ -1916,25 +1792,13 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" -[[package]] -name = "crypto-bigint" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef" -dependencies = [ - "generic-array 0.14.7", - "rand_core", - "subtle", - "zeroize", -] - [[package]] name = "crypto-bigint" version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" dependencies = [ - "generic-array 0.14.7", + "generic-array", "rand_core", "subtle", "zeroize", @@ -1946,10 +1810,31 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ - "generic-array 0.14.7", + "generic-array", "typenum", ] +[[package]] +name = "csv" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" +dependencies = [ + "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]] name = "ct-logs" version = "0.8.0" @@ -1992,7 +1877,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -2021,7 +1906,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "strsim", + "strsim 0.10.0", "syn 1.0.109", ] @@ -2075,7 +1960,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "strsim", + "strsim 0.10.0", "syn 1.0.109", ] @@ -2089,7 +1974,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "strsim", + "strsim 0.10.0", "syn 1.0.109", ] @@ -2103,7 +1988,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -2136,7 +2021,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core 0.20.3", "quote", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -2158,16 +2043,6 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" -[[package]] -name = "der" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de" -dependencies = [ - "const-oid", - "zeroize", -] - [[package]] name = "der" version = "0.7.8" @@ -2217,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]] @@ -2265,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" @@ -2276,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" @@ -2312,30 +2199,18 @@ dependencies = [ "shared_child", ] -[[package]] -name = "ecdsa" -version = "0.14.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c" -dependencies = [ - "der 0.6.1", - "elliptic-curve 0.12.3", - "rfc6979 0.3.1", - "signature 1.6.4", -] - [[package]] name = "ecdsa" version = "0.16.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" dependencies = [ - "der 0.7.8", + "der", "digest 0.10.7", - "elliptic-curve 0.13.8", - "rfc6979 0.4.0", - "signature 2.2.0", - "spki 0.7.3", + "elliptic-curve", + "rfc6979", + "signature", + "spki", ] [[package]] @@ -2344,7 +2219,7 @@ version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" dependencies = [ - "signature 2.2.0", + "signature", ] [[package]] @@ -2380,41 +2255,21 @@ dependencies = [ "serde", ] -[[package]] -name = "elliptic-curve" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3" -dependencies = [ - "base16ct 0.1.1", - "crypto-bigint 0.4.9", - "der 0.6.1", - "digest 0.10.7", - "ff 0.12.1", - "generic-array 0.14.7", - "group 0.12.1", - "pkcs8 0.9.0", - "rand_core", - "sec1 0.3.0", - "subtle", - "zeroize", -] - [[package]] name = "elliptic-curve" version = "0.13.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" dependencies = [ - "base16ct 0.2.0", - "crypto-bigint 0.5.5", + "base16ct", + "crypto-bigint", "digest 0.10.7", - "ff 0.13.0", - "generic-array 0.14.7", - "group 0.13.0", - "pkcs8 0.10.2", + "ff", + "generic-array", + "group", + "pkcs8", "rand_core", - "sec1 0.7.3", + "sec1", "subtle", "zeroize", ] @@ -2431,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" @@ -2477,7 +2338,7 @@ checksum = "eecf8589574ce9b895052fa12d69af7a233f99e6107f5cb8dd1044f2a17bfdcb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -2490,7 +2351,7 @@ dependencies = [ "num-traits", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -2511,7 +2372,7 @@ dependencies = [ "darling 0.20.3", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -2635,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" @@ -2675,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]] @@ -2776,7 +2632,7 @@ dependencies = [ "forc-util", "fuel-indexer-database-types", "fuel-indexer-lib", - "fuel-tx 0.35.4", + "fuel-tx 0.43.1", "fuels", "hex", "humantime", @@ -2826,9 +2682,9 @@ dependencies = [ [[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", @@ -2837,16 +2693,20 @@ dependencies = [ [[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", @@ -2855,6 +2715,7 @@ dependencies = [ "tracing", "tracing-subscriber 0.3.18", "unicode-xid", + "walkdir", ] [[package]] @@ -2905,36 +2766,38 @@ dependencies = [ "regex", "serde", "serde_json", - "syn 2.0.39", + "syn 2.0.40", "thiserror", ] [[package]] name = "fuel-asm" -version = "0.26.3" +version = "0.35.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0030cc1247de0507e547d8ea33484b82420fe61221b94b985d193ec7f63587ae" +checksum = "77ac38b692cf1d259c4576e96969ddc1b21880f3059744a730d1677b6f9fd4df" dependencies = [ - "fuel-types 0.26.3", + "bitflags 1.3.2", "serde", + "strum", ] [[package]] name = "fuel-asm" -version = "0.35.4" +version = "0.43.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ac38b692cf1d259c4576e96969ddc1b21880f3059744a730d1677b6f9fd4df" +checksum = "f2a78a31d8c15dc8139bc8d2074d09be4c8e7ca4735707996ed8bb96f20dd29e" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.1", + "fuel-types 0.43.1", "serde", "strum", ] [[package]] name = "fuel-core" -version = "0.20.8" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a03c9323a24f2886bd1cbeed09a6d0e3ad663d173d99b2b343eab01a69f6fc14" +checksum = "c545fd12c8b5bbc495fd37a4fdf2548450b07b3fb26ac8ea20a10436c311e1d0" dependencies = [ "anyhow", "async-graphql 4.0.16", @@ -2979,18 +2842,17 @@ dependencies = [ [[package]] name = "fuel-core-chain-config" -version = "0.20.8" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86e8f361f44dafc02207c26b0c1929f39525dd1603418aad607dec6ca900053d" +checksum = "84319b8e7a3b422b0f38c6ad4abd29f48b923797b7555c3bb53151322779f9bf" dependencies = [ "anyhow", - "bech32 0.9.1", + "bech32", "fuel-core-storage", "fuel-core-types", "hex", "itertools 0.10.5", "postcard", - "rand", "serde", "serde_json", "serde_with 1.14.0", @@ -2999,9 +2861,9 @@ dependencies = [ [[package]] name = "fuel-core-client" -version = "0.20.8" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f39aab47a2b77b830884a9abfdba11d165281ba855f07e109177e56c8a962962" +checksum = "ed3555027c1362e8ff1b03783399b0baa62911ffcf4254c533f3f32c98982562" dependencies = [ "anyhow", "cynic", @@ -3013,6 +2875,7 @@ dependencies = [ "hyper-rustls 0.24.2", "itertools 0.10.5", "reqwest", + "schemafy_lib", "serde", "serde_json", "tai64", @@ -3022,9 +2885,9 @@ dependencies = [ [[package]] name = "fuel-core-consensus-module" -version = "0.20.8" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1599312ab0cf81aa2ce7be03e21c012f522d67cfddfe04603523ae64a219aac9" +checksum = "50fd6d90df194b5970bf16681bfad9f917ff3f837e00c6538a8b95d2e0a6fdf9" dependencies = [ "anyhow", "fuel-core-chain-config", @@ -3035,21 +2898,21 @@ dependencies = [ [[package]] name = "fuel-core-database" -version = "0.20.8" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42469b8398400964639c7b021833080d41264ceb861e990215a9114d60b41439" +checksum = "fb7b7cd46a2de1df8c71b4541bf19e09870965cb6ac72ee564170f9bcc8df909" dependencies = [ "anyhow", + "derive_more", "fuel-core-storage", "fuel-core-types", - "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", @@ -3059,24 +2922,24 @@ dependencies = [ [[package]] name = "fuel-core-importer" -version = "0.20.8" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77099398f453ca5e8b6b6986ef5302058a42a2b3708876f83106df57786fe175" +checksum = "acd700b679be3cda7561f46778aa136ba4af1048570e116d8eb1d3e0f0a316a9" dependencies = [ "anyhow", + "derive_more", "fuel-core-metrics", "fuel-core-storage", "fuel-core-types", - "thiserror", "tokio", "tracing", ] [[package]] name = "fuel-core-metrics" -version = "0.20.8" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b1098234b4e1db6ba9d7abddd72bb8f3148018991dae3050422bd407f126889" +checksum = "0f87fec36f415dd9cdc2f723f018c30985bbeeadbc7e066e27fc79f3a3e2e6f3" dependencies = [ "axum 0.5.17", "once_cell", @@ -3089,9 +2952,9 @@ dependencies = [ [[package]] name = "fuel-core-poa" -version = "0.20.8" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e60448e02f22fe1de577b0056ca43e25caa02762f75c2d1be38559e671e89899" +checksum = "93ef8dd121e59450d695435af4dea14d60acb41195cdd2dc64d3980aef42fbd9" dependencies = [ "anyhow", "async-trait", @@ -3106,15 +2969,15 @@ dependencies = [ [[package]] name = "fuel-core-producer" -version = "0.20.8" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c5495d4af93e4e8586cbc821ecc3fcfc51c028f1fc2259f1f9a3a3968847a9d" +checksum = "e85951fa8159a4698a6d523fc44fd3659b9db63800fcfd9619f4283a568296ce" dependencies = [ "anyhow", "async-trait", + "derive_more", "fuel-core-storage", "fuel-core-types", - "thiserror", "tokio", "tokio-rayon", "tracing", @@ -3122,9 +2985,9 @@ dependencies = [ [[package]] name = "fuel-core-services" -version = "0.20.8" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37fed9fd24eb93aef5f4fb4b66a5f47c04501c62a8a95e738aeb61c47f7553a7" +checksum = "f2a3a0ed906c332d13802209ab5839d81e464abd14307b75f58550cf0de30430" dependencies = [ "anyhow", "async-trait", @@ -3137,21 +3000,21 @@ dependencies = [ [[package]] name = "fuel-core-storage" -version = "0.20.8" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1548a301f2b7f4777242468348d7306030bfae50e7d5a56ac7e6615c4f145b09" +checksum = "33b84df7585c184d79c342833321db43c610d38bccf913acdf526e64fd292ab2" dependencies = [ "anyhow", + "derive_more", "fuel-core-types", - "fuel-vm 0.35.4", - "thiserror", + "fuel-vm 0.43.1", ] [[package]] name = "fuel-core-txpool" -version = "0.20.8" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abe6a5d7ff157b2ea8e0b45226ec76f9a6fc8b64c0a45db353c322b9804f6d45" +checksum = "943dec1ff13cd4fcd3c0f9ae826be09de1520bab5565916ec91cb31429c59f9a" dependencies = [ "anyhow", "async-trait", @@ -3170,13 +3033,13 @@ dependencies = [ [[package]] name = "fuel-core-types" -version = "0.20.8" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e837844e4f034658ff229517f9eb81aafa62cb316fd3465268ee6f822d1647e2" +checksum = "91b55088841f6211b3ba452687c301fee4b9d1cf52dc6fc47f940a6681336cff" dependencies = [ "anyhow", "derive_more", - "fuel-vm 0.35.4", + "fuel-vm 0.43.1", "secrecy", "serde", "tai64", @@ -3186,18 +3049,20 @@ dependencies = [ [[package]] name = "fuel-crypto" -version = "0.26.3" +version = "0.35.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e7356deff8ce5a9b6bc8d9e7cacc6c1d1f7abf5cdd4d729869afb401befa495" +checksum = "d2b934310e10a975ae3698c54e973125345c5f77a246bb8700e1658d8c4d12cf" dependencies = [ "borrown", - "coins-bip32 0.7.0", - "coins-bip39 0.7.0", - "fuel-types 0.26.3", - "getrandom", + "coins-bip32", + "coins-bip39", + "ecdsa", + "ed25519-dalek", + "fuel-types 0.35.4", "lazy_static", + "p256", "rand", - "secp256k1 0.24.3", + "secp256k1", "serde", "sha2 0.10.8", "zeroize", @@ -3205,25 +3070,37 @@ dependencies = [ [[package]] name = "fuel-crypto" -version = "0.35.4" +version = "0.43.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b934310e10a975ae3698c54e973125345c5f77a246bb8700e1658d8c4d12cf" +checksum = "33bea0932fec1e3c77be1fd54439ee9947d8d05870631d1c83782e5b1bd8eb0a" dependencies = [ - "borrown", - "coins-bip32 0.8.7", - "coins-bip39 0.8.7", - "ecdsa 0.16.9", + "coins-bip32", + "coins-bip39", + "ecdsa", "ed25519-dalek", - "fuel-types 0.35.4", + "fuel-types 0.43.1", + "k256", "lazy_static", "p256", "rand", - "secp256k1 0.26.0", + "secp256k1", "serde", "sha2 0.10.8", "zeroize", ] +[[package]] +name = "fuel-derive" +version = "0.43.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597adf13a46bdcc1e7e19fa9f9b8743106e5e5a9867a71c50e1bc6c899ba4ae8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.40", + "synstructure", +] + [[package]] name = "fuel-ethabi" version = "18.0.0" @@ -3308,15 +3185,15 @@ dependencies = [ "forc-postgres", "fuel-core", "fuel-core-client", - "fuel-crypto 0.35.4", + "fuel-crypto 0.43.1", "fuel-indexer-api-server", "fuel-indexer-database", "fuel-indexer-lib", "fuel-indexer-metrics", "fuel-indexer-schema", "fuel-indexer-types", - "fuel-tx 0.35.4", - "fuel-vm 0.35.4", + "fuel-tx 0.43.1", + "fuel-vm 0.43.1", "futures", "itertools 0.10.5", "openssl", @@ -3338,7 +3215,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", @@ -3462,7 +3339,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -3478,14 +3355,14 @@ dependencies = [ "fuel-indexer-schema", "fuel-indexer-types", "fuels", - "fuels-code-gen 0.49.0", + "fuels-code-gen 0.53.0", "lazy_static", "proc-macro-error", "proc-macro2", "quote", "serde_json", "sha2 0.10.8", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -3579,8 +3456,8 @@ dependencies = [ "fuel-indexer-schema", "fuel-indexer-types", "fuel-indexer-utils", - "fuel-tx 0.35.4", - "fuel-types 0.35.4", + "fuel-tx 0.43.1", + "fuel-types 0.43.1", "fuels", "fuels-macros 0.46.0", "futures", @@ -3613,8 +3490,9 @@ name = "fuel-indexer-types" version = "0.24.3" dependencies = [ "bytes", - "fuel-tx 0.35.4", - "fuel-types 0.35.4", + "fuel-crypto 0.43.1", + "fuel-tx 0.43.1", + "fuel-types 0.43.1", "fuels", "serde", "serde_json", @@ -3632,12 +3510,12 @@ dependencies = [ [[package]] name = "fuel-merkle" -version = "0.26.3" +version = "0.35.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b13103bf12f62930dd26f75f90d6a95d952fdcd677a356f57d8ef8df7ae02b84" +checksum = "8d9ccc8b3db24d152e88b84709c151f0b647bb213ec8fa10303ab6d55bc6e39b" dependencies = [ "digest 0.10.7", - "fuel-storage 0.26.3", + "fuel-storage 0.35.4", "hashbrown 0.13.2", "hex", "sha2 0.10.8", @@ -3646,16 +3524,17 @@ dependencies = [ [[package]] name = "fuel-merkle" -version = "0.35.4" +version = "0.43.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d9ccc8b3db24d152e88b84709c151f0b647bb213ec8fa10303ab6d55bc6e39b" +checksum = "5a68333d5e0869ad89fcd4284b2790ba60edd5c0c63cec30713289cc820ed7ab" dependencies = [ + "derive_more", "digest 0.10.7", - "fuel-storage 0.35.4", + "fuel-storage 0.43.1", "hashbrown 0.13.2", "hex", + "serde", "sha2 0.10.8", - "thiserror", ] [[package]] @@ -3664,54 +3543,58 @@ version = "0.0.0" dependencies = [ "clap 3.2.25", "fuel-indexer-tests", - "fuel-types 0.35.4", + "fuel-types 0.43.1", "fuels", "tokio", ] [[package]] name = "fuel-storage" -version = "0.26.3" +version = "0.35.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "998d49926c8ae3e545e348075075c2fe85caae4474e01d2da65a9a8edc3277e9" +checksum = "ae188b019be59dea7f6a036c46daca5de8414906df1bfb0009dd379810d1976d" [[package]] name = "fuel-storage" -version = "0.35.4" +version = "0.43.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae188b019be59dea7f6a036c46daca5de8414906df1bfb0009dd379810d1976d" +checksum = "9f20bd8cac585ccd5c51478c341b7e9807942d80e1c0e00a9b2cec8a3fb3879b" [[package]] name = "fuel-tx" -version = "0.26.3" +version = "0.35.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e09bb28731979db1f5192c04f2a330a15b8c2f5ef2b47836b3282c7fd9d7703c" +checksum = "c55b1cdcad2b54eefed5c695b8408cfc82002ea3a7529114bf6917164f757a00" dependencies = [ "derivative", - "fuel-asm 0.26.3", - "fuel-crypto 0.26.3", - "fuel-merkle 0.26.3", - "fuel-types 0.26.3", + "fuel-asm 0.35.4", + "fuel-crypto 0.35.4", + "fuel-merkle 0.35.4", + "fuel-types 0.35.4", "itertools 0.10.5", "num-integer", "rand", "serde", "serde_json", + "strum", + "strum_macros 0.24.3", ] [[package]] name = "fuel-tx" -version = "0.35.4" +version = "0.43.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c55b1cdcad2b54eefed5c695b8408cfc82002ea3a7529114bf6917164f757a00" +checksum = "c32cd8e0015a8c6091c43f7149119e1812f2208243921c50f83c72c8055635e1" dependencies = [ + "bitflags 2.4.1", "derivative", - "fuel-asm 0.35.4", - "fuel-crypto 0.35.4", - "fuel-merkle 0.35.4", - "fuel-types 0.35.4", + "derive_more", + "fuel-asm 0.43.1", + "fuel-crypto 0.43.1", + "fuel-merkle 0.43.1", + "fuel-types 0.43.1", + "hashbrown 0.14.3", "itertools 0.10.5", - "num-integer", "rand", "serde", "serde_json", @@ -3721,9 +3604,9 @@ dependencies = [ [[package]] name = "fuel-types" -version = "0.26.3" +version = "0.35.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89fc99a9878b98135c4b05c71fe63b82f4cb3a00abac278935f8be7282f8e468" +checksum = "3d467a3b9deae49d7b4272b4a191b0e4b87c6ed9030a846c2d0d2c6394772832" dependencies = [ "hex", "serde", @@ -3731,10 +3614,11 @@ dependencies = [ [[package]] name = "fuel-types" -version = "0.35.4" +version = "0.43.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d467a3b9deae49d7b4272b4a191b0e4b87c6ed9030a846c2d0d2c6394772832" +checksum = "ee3eda536ec1c1c7b0e06bf4a2d7b22980a79108c66ab8f81661433b2211e21e" dependencies = [ + "fuel-derive", "hex", "rand", "serde", @@ -3742,19 +3626,23 @@ dependencies = [ [[package]] name = "fuel-vm" -version = "0.26.3" +version = "0.35.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b36aac727729b94c620265da76112e1d36a1af0c067745491c376f084f5b7b38" +checksum = "781255b35b145fc39a136abfaeec15bc4556b8dbee37610d6b3eb8abe29d378b" dependencies = [ + "async-trait", "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", + "ethnum", + "fuel-asm 0.35.4", + "fuel-crypto 0.35.4", + "fuel-merkle 0.35.4", + "fuel-storage 0.35.4", + "fuel-tx 0.35.4", + "fuel-types 0.35.4", "itertools 0.10.5", + "paste", + "primitive-types", "serde", "sha3", "tai64", @@ -3763,28 +3651,33 @@ dependencies = [ [[package]] name = "fuel-vm" -version = "0.35.4" +version = "0.43.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "781255b35b145fc39a136abfaeec15bc4556b8dbee37610d6b3eb8abe29d378b" +checksum = "fef3adfffe707feb335819119351a8f0c83b2113ab010714e262f60e87959546" dependencies = [ "async-trait", - "bitflags 1.3.2", + "backtrace", + "bitflags 2.4.1", "derivative", + "derive_more", "ethnum", - "fuel-asm 0.35.4", - "fuel-crypto 0.35.4", - "fuel-merkle 0.35.4", - "fuel-storage 0.35.4", - "fuel-tx 0.35.4", - "fuel-types 0.35.4", + "fuel-asm 0.43.1", + "fuel-crypto 0.43.1", + "fuel-merkle 0.43.1", + "fuel-storage 0.43.1", + "fuel-tx 0.43.1", + "fuel-types 0.43.1", + "hashbrown 0.14.3", "itertools 0.10.5", + "libm", "paste", + "percent-encoding", "primitive-types", - "rand", "serde", "sha3", + "static_assertions", + "strum", "tai64", - "thiserror", ] [[package]] @@ -3798,35 +3691,35 @@ dependencies = [ [[package]] name = "fuels" -version = "0.50.1" +version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e44490a7d415295059f37a92c6f02f060d13b0293d4dd6c27b2f24d73321a0f" +checksum = "d8ad2e6a398d3ea13edd540c29d9e6452bc3e690ab763f5373ba960f17cdae4d" dependencies = [ "fuel-core", "fuel-core-client", - "fuel-tx 0.35.4", + "fuel-tx 0.43.1", "fuels-accounts", "fuels-core", - "fuels-macros 0.50.1", + "fuels-macros 0.53.0", "fuels-programs", "fuels-test-helpers", ] [[package]] name = "fuels-accounts" -version = "0.50.1" +version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "905e1b22d5c7b6ab01f05285ea61cb7e15cdcce762263db2019c192213b03c53" +checksum = "fa6f6435a6631577fa20aedbd88c4e59d9f1541a6bbb3a7b63715e40c15790f0" dependencies = [ "async-trait", "chrono", - "elliptic-curve 0.13.8", + "elliptic-curve", "eth-keystore", "fuel-core-client", - "fuel-crypto 0.35.4", - "fuel-tx 0.35.4", - "fuel-types 0.35.4", - "fuel-vm 0.35.4", + "fuel-crypto 0.43.1", + "fuel-tx 0.43.1", + "fuel-types 0.43.1", + "fuel-vm 0.43.1", "fuels-core", "hex", "rand", @@ -3851,60 +3744,45 @@ dependencies = [ "quote", "regex", "serde_json", - "syn 2.0.39", -] - -[[package]] -name = "fuels-code-gen" -version = "0.49.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3afd5ba59c905adfae0e8afc09588e2a3acf451520053e5e2cefb58d38ac3253" -dependencies = [ - "Inflector", - "fuel-abi-types 0.3.0", - "itertools 0.11.0", - "proc-macro2", - "quote", - "regex", - "serde_json", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] name = "fuels-code-gen" -version = "0.50.1" +version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99ee789e15eaff668fa41efbcd1b6e52daa1ae195c204e1c55b64dcbfc007823" +checksum = "7a76d2517cebc47be8723312e80634b6389e0c5db34663bd1360afee504f0cfb" dependencies = [ "Inflector", "fuel-abi-types 0.3.0", - "itertools 0.11.0", + "itertools 0.12.0", "proc-macro2", "quote", "regex", "serde_json", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] name = "fuels-core" -version = "0.50.1" +version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8528f854c0e914445cefc3e5eefa7a494dd550f28b83ed965b8f9d94b5df8beb" +checksum = "c9a98b3217932b1f8f639fd4c1268923f0862166fecf7a897c3c2bd5bae8706d" dependencies = [ - "bech32 0.9.1", + "async-trait", + "bech32", "chrono", "fuel-abi-types 0.3.0", - "fuel-asm 0.35.4", + "fuel-asm 0.43.1", "fuel-core-chain-config", "fuel-core-client", - "fuel-crypto 0.35.4", - "fuel-tx 0.35.4", - "fuel-types 0.35.4", - "fuel-vm 0.35.4", - "fuels-macros 0.50.1", + "fuel-crypto 0.43.1", + "fuel-tx 0.43.1", + "fuel-types 0.43.1", + "fuel-vm 0.43.1", + "fuels-macros 0.53.0", "hex", - "itertools 0.11.0", + "itertools 0.12.0", "serde", "serde_json", "sha2 0.10.8", @@ -3928,38 +3806,38 @@ dependencies = [ "rand", "regex", "serde_json", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] name = "fuels-macros" -version = "0.50.1" +version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "708b35dbbbc6167f7f9821e3eaad803af1327ca987f1190dc9e87b5c4872c571" +checksum = "e1cb90a892ac4b1acfd6f383a7505ce5f33764495adcf9c34371bbcabf9a4042" dependencies = [ - "fuels-code-gen 0.50.1", - "itertools 0.11.0", + "fuels-code-gen 0.53.0", + "itertools 0.12.0", "proc-macro2", "quote", "rand", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] name = "fuels-programs" -version = "0.50.1" +version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "612d79594053a247146b2fabb8a32a4c32a22e4d8fd9f57671d3ed5c3bfdd952" +checksum = "3d9fd3a7722685ba45a6794374f44530732f4f2f43f507eb1ec6fd0656abacf8" dependencies = [ "async-trait", "bytes", "fuel-abi-types 0.3.0", - "fuel-asm 0.35.4", - "fuel-tx 0.35.4", - "fuel-types 0.35.4", + "fuel-asm 0.43.1", + "fuel-tx 0.43.1", + "fuel-types 0.43.1", "fuels-accounts", "fuels-core", - "itertools 0.11.0", + "itertools 0.12.0", "rand", "serde_json", "tokio", @@ -3967,17 +3845,17 @@ dependencies = [ [[package]] name = "fuels-test-helpers" -version = "0.50.1" +version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff7c621bafd44735cdd5c1b3f73b7e1a153743ffcf035471fe30a63d23ddea2" +checksum = "d5742db9887960bbd58bf0b7cb3b0adaa5e29ce4bd667d1063bbe12491c52852" dependencies = [ "fuel-core", "fuel-core-chain-config", "fuel-core-client", "fuel-core-poa", "fuel-core-services", - "fuel-tx 0.35.4", - "fuel-types 0.35.4", + "fuel-tx 0.43.1", + "fuel-types 0.43.1", "fuels-accounts", "fuels-core", "futures", @@ -4093,7 +3971,7 @@ checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -4139,18 +4017,9 @@ dependencies = [ name = "generational-arena" version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877e94aff08e743b651baaea359664321055749b398adff8740a7399af7796e7" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "generic-array" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd" +checksum = "877e94aff08e743b651baaea359664321055749b398adff8740a7399af7796e7" dependencies = [ - "typenum", + "cfg-if", ] [[package]] @@ -4229,8 +4098,8 @@ dependencies = [ "clap 3.2.25", "fuel-indexer-lib", "fuel-indexer-tests", - "fuel-tx 0.35.4", - "fuel-types 0.35.4", + "fuel-tx 0.43.1", + "fuel-types 0.43.1", "fuels", "rand", "thiserror", @@ -4255,24 +4124,13 @@ 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", ] @@ -4351,6 +4209,7 @@ checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" dependencies = [ "ahash 0.8.6", "allocator-api2", + "serde", ] [[package]] @@ -4491,9 +4350,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", @@ -4590,7 +4449,7 @@ dependencies = [ "http", "hyper", "log", - "rustls 0.21.9", + "rustls 0.21.10", "rustls-native-certs 0.6.3", "tokio", "tokio-rustls 0.24.1", @@ -4774,7 +4633,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]] @@ -4824,7 +4683,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi 0.3.3", - "rustix 0.38.26", + "rustix 0.38.28", "windows-sys 0.48.0", ] @@ -4857,9 +4716,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" @@ -4893,18 +4752,6 @@ dependencies = [ "simple_asn1", ] -[[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.2" @@ -4912,11 +4759,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f01b677d82ef7a676aa37e099defd83a28e15687112cafdd112d60236b6115b" dependencies = [ "cfg-if", - "ecdsa 0.16.9", - "elliptic-curve 0.13.8", + "ecdsa", + "elliptic-curve", "once_cell", "sha2 0.10.8", - "signature 2.2.0", + "signature", ] [[package]] @@ -4963,9 +4810,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" @@ -4977,6 +4824,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "libm" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + [[package]] name = "libredox" version = "0.0.1" @@ -5283,6 +5136,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" @@ -5302,6 +5164,7 @@ dependencies = [ "autocfg", "num-integer", "num-traits", + "serde", ] [[package]] @@ -5350,9 +5213,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" @@ -5360,12 +5223,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" @@ -5395,7 +5252,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -5406,9 +5263,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "300.1.6+3.1.4" +version = "300.2.1+3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439fac53e092cd7442a3660c85dde4643ab3b5bd39040912388dcdabf6b88085" +checksum = "3fe476c29791a5ca0d1273c697e96085bbabbbea2ef7afd5617e78a4b40332d3" dependencies = [ "cc", ] @@ -5460,12 +5317,21 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b" dependencies = [ - "ecdsa 0.16.9", - "elliptic-curve 0.13.8", + "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.9" @@ -5473,7 +5339,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "881331e34fa842a2fb61cc2db9643a8fedc615e47cfcc52597d1af0db9a7e8fe" dependencies = [ "arrayvec", - "bitvec 1.0.1", + "bitvec", "byte-slice-cast", "impl-trait-for-tuples", "parity-scale-codec-derive", @@ -5546,17 +5412,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" @@ -5570,9 +5425,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]] @@ -5664,7 +5516,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -5769,7 +5621,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -5795,24 +5647,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.3", + "der", + "spki", ] [[package]] @@ -5880,7 +5722,7 @@ dependencies = [ "cfg-if", "concurrent-queue", "pin-project-lite", - "rustix 0.38.26", + "rustix 0.38.28", "tracing", "windows-sys 0.52.0", ] @@ -5934,6 +5776,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" @@ -5941,7 +5795,21 @@ 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]] @@ -5950,7 +5818,7 @@ version = "0.13.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6" dependencies = [ - "elliptic-curve 0.13.8", + "elliptic-curve", ] [[package]] @@ -6071,7 +5939,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -6136,12 +6004,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" @@ -6341,7 +6203,7 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls 0.21.9", + "rustls 0.21.10", "rustls-pemfile", "serde", "serde_json", @@ -6361,17 +6223,6 @@ dependencies = [ "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" @@ -6426,7 +6277,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", @@ -6512,9 +6363,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.26" +version = "0.38.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9470c4bf8246c8daf25f9598dca807fb6510347b1e1cfa55749113850c79d88a" +checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" dependencies = [ "bitflags 2.4.1", "errno", @@ -6550,9 +6401,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.9" +version = "0.21.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "629648aced5775d558af50b2b4c7b02983a04b312126d45eeead26e7caa498b9" +checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" dependencies = [ "log", "ring 0.17.7", @@ -6611,9 +6462,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" @@ -6642,6 +6493,32 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "schemafy_core" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41781ae092f4fd52c9287efb74456aea0d3b90032d2ecad272bd14dbbcb0511b" +dependencies = [ + "serde", + "serde_json", +] + +[[package]] +name = "schemafy_lib" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e953db32579999ca98c451d80801b6f6a7ecba6127196c5387ec0774c528befa" +dependencies = [ + "Inflector", + "proc-macro2", + "quote", + "schemafy_core", + "serde", + "serde_derive", + "serde_json", + "syn 1.0.109", +] + [[package]] name = "scopeguard" version = "1.2.0" @@ -6686,44 +6563,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" @@ -6731,16 +6584,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]] @@ -6824,7 +6668,7 @@ checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -6923,18 +6767,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" @@ -6945,7 +6777,7 @@ dependencies = [ "cfg-if", "cpufeatures", "digest 0.9.0", - "opaque-debug 0.3.0", + "opaque-debug", ] [[package]] @@ -7013,16 +6845,6 @@ dependencies = [ "libc", ] -[[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.2.0" @@ -7050,7 +6872,7 @@ name = "simple-wasm" version = "0.0.0" dependencies = [ "fuel-indexer-utils", - "fuel-tx 0.35.4", + "fuel-tx 0.43.1", "fuels", "serde", "sha2 0.10.8", @@ -7163,16 +6985,6 @@ dependencies = [ "lock_api", ] -[[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.3" @@ -7180,7 +6992,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" dependencies = [ "base64ct", - "der 0.7.8", + "der", ] [[package]] @@ -7335,12 +7147,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" @@ -7383,21 +7225,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", @@ -7408,9 +7252,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", @@ -7421,13 +7266,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", @@ -7436,29 +7282,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", @@ -7467,9 +7313,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", @@ -7479,9 +7325,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", @@ -7491,27 +7337,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" @@ -7526,9 +7379,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", @@ -7541,6 +7394,33 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +[[package]] +name = "synstructure" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "285ba80e733fac80aa4270fbcdf83772a79b80aa35c97075320abfee4a915b06" +dependencies = [ + "proc-macro2", + "quote", + "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" @@ -7603,10 +7483,21 @@ dependencies = [ "cfg-if", "fastrand 2.0.1", "redox_syscall 0.4.1", - "rustix 0.38.26", + "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.4.0" @@ -7616,6 +7507,15 @@ 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" @@ -7639,7 +7539,7 @@ checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -7728,9 +7628,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", @@ -7763,7 +7663,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -7814,7 +7714,7 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls 0.21.9", + "rustls 0.21.10", "tokio", ] @@ -7997,7 +7897,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -8099,9 +7999,9 @@ dependencies = [ [[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" @@ -8302,6 +8202,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" @@ -8372,7 +8278,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", "wasm-bindgen-shared", ] @@ -8406,7 +8312,7 @@ checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -8616,7 +8522,7 @@ name = "web-api" version = "0.0.0" dependencies = [ "fuel-indexer-tests", - "fuel-types 0.35.4", + "fuel-types 0.43.1", "tokio", ] @@ -8667,14 +8573,15 @@ checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" [[package]] name = "which" -version = "4.4.2" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" +checksum = "9bf3ea8596f3a0dd5980b46430f2058dfe2c36a27ccfbb1845d6fbfcd9ba6e14" dependencies = [ "either", "home", "once_cell", - "rustix 0.38.26", + "rustix 0.38.28", + "windows-sys 0.48.0", ] [[package]] @@ -8970,9 +8877,9 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" [[package]] name = "winnow" -version = "0.5.25" +version = "0.5.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e87b8dfbe3baffbe687eef2e164e32286eff31a5ee16463ce03d991643ec94" +checksum = "cb877ca3232bec99a6472ed63f7241de2a250165260908b2d24c09d867907a85" dependencies = [ "memchr", ] @@ -9025,11 +8932,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]] @@ -9061,22 +8970,22 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.29" +version = "0.7.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d075cf85bbb114e933343e087b92f2146bac0d55b534cbb8188becf0039948e" +checksum = "306dca4455518f1f31635ec308b6b3e4eb1b11758cefafc782827d0aa7acb5c7" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.29" +version = "0.7.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86cd5ca076997b97ef09d3ad65efe811fa68c9e874cb636ccb211223a813b0c2" +checksum = "be912bf68235a88fbefd1b73415cb218405958d1655b2ece9035a19920bdf6ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -9096,7 +9005,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 523b1a7c9..baabbdcde 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -84,11 +84,12 @@ fuel-indexer-postgres = { version = "0.24.3", path = "./packages/fuel-indexer-da fuel-indexer-schema = { version = "0.24.3", path = "./packages/fuel-indexer-schema", default-features = false } fuel-indexer-types = { version = "0.24.3", path = "./packages/fuel-indexer-types" } fuel-indexer-utils = { version = "0.24.3", path = "./packages/fuel-indexer-utils" } -fuel-tx = { version = "=0.35.4", default-features = false } -fuel-types = { version = "=0.35.4", default-features = false, features = ["serde"] } -fuel-vm = { version = "=0.35.4", default-features = false } -fuels = { version = "0.50", default-features = false } -fuels-code-gen = { version = "0.49", default-features = false } +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 } +fuels = { version = "0.53", default-features = false } +fuels-code-gen = { version = "0.53", default-features = false } serde = { version = "1.0", default-features = false, features = ["derive"] } serde_json = { version = "1.0", default-features = false } thiserror = "1.0" diff --git a/docs/src/authentication/index.md b/docs/src/authentication/index.md index c779e1d7e..25b9759e3 100644 --- a/docs/src/authentication/index.md +++ b/docs/src/authentication/index.md @@ -10,10 +10,10 @@ The new authentication functionality offers a flexible and secure way for users ## Usage -Below is a demonstration of basic JWT authentication using an indexer operator at "https://beta-4-indexer.fuel.network" +Below is a demonstration of basic JWT authentication using an indexer operator at "https://beta-5-indexer.fuel.network" ```bash -forc index auth --url https://beta-4-indexer.fuel.network:29987 +forc index auth --url https://beta-5-indexer.fuel.network:29987 ``` You will first be prompted for the password for your wallet: @@ -25,7 +25,7 @@ Please enter your wallet password: After successfully entering your wallet password you should be presented with your new JWT token. ```text -✅ Successfully authenticated at https://beta-4-indexer.fuel.network:29987/api/auth/signature. +✅ Successfully authenticated at https://beta-5-indexer.fuel.network:29987/api/auth/signature. Token: eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiODNlNjhiOTFmNDhjYWM4M.... ``` diff --git a/docs/src/forc-index/deploy.md b/docs/src/forc-index/deploy.md index 3971e5693..f0f6c2022 100644 --- a/docs/src/forc-index/deploy.md +++ b/docs/src/forc-index/deploy.md @@ -3,7 +3,7 @@ Deploy an indexer to an indexer service. ```bash -forc index deploy --url https://beta-4-indexer.fuel.network +forc index deploy --url https://beta-5-indexer.fuel.network ``` ```text diff --git a/docs/src/forc-index/remove.md b/docs/src/forc-index/remove.md index 5ceaf27df..97d5b10fb 100644 --- a/docs/src/forc-index/remove.md +++ b/docs/src/forc-index/remove.md @@ -3,7 +3,7 @@ Stop and remove a running indexer. ```bash -forc index remove --url https://beta-4-indexer.fuel.network +forc index remove --url https://beta-5-indexer.fuel.network ``` ```text diff --git a/docs/src/forc-index/start.md b/docs/src/forc-index/start.md index 4b236d16f..5c990937c 100644 --- a/docs/src/forc-index/start.md +++ b/docs/src/forc-index/start.md @@ -86,7 +86,7 @@ OPTIONS: Use Prometheus metrics reporting. --network - Use a network alias when connecting to a Fuel client. [default: beta-3 beta-4 beta-5] + Use a network alias when connecting to a Fuel client. [default: beta-3 beta-5 beta-5] --postgres-database Postgres database. diff --git a/docs/src/forc-index/status.md b/docs/src/forc-index/status.md index 675568ca8..32eeca4bd 100644 --- a/docs/src/forc-index/status.md +++ b/docs/src/forc-index/status.md @@ -3,7 +3,7 @@ Check the status of a registered indexer. ```bash -forc index status --url https://beta-4-indexer.fuel.network +forc index status --url https://beta-5-indexer.fuel.network ``` ```text diff --git a/docs/src/getting-started/indexer-service-infrastructure.md b/docs/src/getting-started/indexer-service-infrastructure.md index b38806c48..9a61633fb 100644 --- a/docs/src/getting-started/indexer-service-infrastructure.md +++ b/docs/src/getting-started/indexer-service-infrastructure.md @@ -120,7 +120,7 @@ OPTIONS: Use Prometheus metrics reporting. --network - Use a network alias when connecting to a Fuel client. [possible values: beta-3, beta-4, + Use a network alias when connecting to a Fuel client. [possible values: beta-3, beta-5, beta-5] --postgres-database @@ -250,7 +250,7 @@ OPTIONS: Use Prometheus metrics reporting. --network - Use a network alias when connecting to a Fuel client. [possible values: beta-3, beta-4, + Use a network alias when connecting to a Fuel client. [possible values: beta-3, beta-5, beta-5] --postgres-database diff --git a/docs/src/getting-started/quickstart.md b/docs/src/getting-started/quickstart.md index 7f63c8e77..79089e9a8 100644 --- a/docs/src/getting-started/quickstart.md +++ b/docs/src/getting-started/quickstart.md @@ -3,7 +3,7 @@ In this tutorial you will: 1. Bootstrap your development environment. -2. Create, build, and deploy an indexer to an indexer service hooked up to Fuel's `beta-4` testnet. +2. Create, build, and deploy an indexer to an indexer service hooked up to Fuel's `beta-5` testnet. 3. Query your indexer's newly created index for data using GraphQL. --- @@ -109,7 +109,7 @@ We can quickly create a bootstrapped database and start the Fuel indexer service > If you find that `--embedded-database` isn't working on your machine (for whatever reason), we strongly recommend that you simply used the Dockerized Fuel indexer components included in the project by using the `docker compose` script [included in the project](https://github.com/FuelLabs/fuel-indexer/blob/develop/scripts/docker-compose.yaml). ```bash -forc index start --network beta-4 --run-migrations --postgres-host postgresql +forc index start --network beta-5 --run-migrations --postgres-host postgresql ``` You should see output indicating the successful creation of a database and start of the indexer service; there may be much more content in your session, but it should generally contain output similar to the following lines: @@ -117,12 +117,12 @@ You should see output indicating the successful creation of a database and start ```text ✅ Successfully started the indexer service at PID 39407 -2023-07-31T15:57:28.942954Z INFO fuel_indexer::commands::run: 109: Configuration: IndexerConfig { metering_points: Some(30000000000), log_level: "info", verbose: false, local_fuel_node: false, indexer_net_config: false, fuel_node: FuelClientConfig { host: "beta-4.fuel.network", port: "80" }, web_api: WebApiConfig { host: "localhost", port: "29987", max_body_size: 5242880 }, database: PostgresConfig { user: "postgres", password: "XXXX", host: "localhost", port: "5432", database: "postgres", verbose: "false" }, metrics: false, stop_idle_indexers: false, run_migrations: true, authentication: AuthenticationConfig { enabled: false, strategy: None, jwt_secret: "XXXX", jwt_issuer: None, jwt_expiry: None }, rate_limit: RateLimitConfig { enabled: false, request_count: None, window_size: None }, replace_indexer: false, accept_sql_queries: false } +2023-07-31T15:57:28.942954Z INFO fuel_indexer::commands::run: 109: Configuration: IndexerConfig { metering_points: Some(30000000000), log_level: "info", verbose: false, local_fuel_node: false, indexer_net_config: false, fuel_node: FuelClientConfig { host: "beta-5.fuel.network", port: "80" }, web_api: WebApiConfig { host: "localhost", port: "29987", max_body_size: 5242880 }, database: PostgresConfig { user: "postgres", password: "XXXX", host: "localhost", port: "5432", database: "postgres", verbose: "false" }, metrics: false, stop_idle_indexers: false, run_migrations: true, authentication: AuthenticationConfig { enabled: false, strategy: None, jwt_secret: "XXXX", jwt_issuer: None, jwt_expiry: None }, rate_limit: RateLimitConfig { enabled: false, request_count: None, window_size: None }, replace_indexer: false, accept_sql_queries: false } 2023-07-31T15:57:28.948657Z INFO sqlx::postgres::notice: 157: relation "_sqlx_migrations" already exists, skipping 2023-07-31T15:57:28.976258Z INFO fuel_indexer::service: 378: Resuming Indexer(fuel.indexer_test) from block 81188 2023-07-31T15:57:29.077928Z INFO fuel_indexer::database: 187: Loading schema for Indexer(fuel.indexer_test) with Version(2738d221cf1e926d28e62bc93604a96ec6f7c5093e766f45a4555ed06e437b7f). 2023-07-31T15:57:29.081302Z WARN fuel_indexer::executor: 87: No end_block specified in manifest. Indexer will run forever. -2023-07-31T15:57:29.081311Z INFO fuel_indexer::executor: 109: Indexer(fuel.indexer_test) subscribing to Fuel node at beta-4.fuel.network:80 +2023-07-31T15:57:29.081311Z INFO fuel_indexer::executor: 109: Indexer(fuel.indexer_test) subscribing to Fuel node at beta-5.fuel.network:80 2023-07-31T15:57:29.081424Z INFO fuel_indexer::service: 194: Registered Indexer(fuel.indexer_test) 2023-07-31T15:57:29.082150Z INFO fuel_indexer_lib::utils: 132: Parsed SocketAddr '127.0.0.1:29987' from 'localhost:29987 ``` diff --git a/docs/src/project-components/index.md b/docs/src/project-components/index.md index 6f51adf21..7bc324e43 100644 --- a/docs/src/project-components/index.md +++ b/docs/src/project-components/index.md @@ -35,7 +35,7 @@ Create, deploy, and check the status of a new indexer. ```bash fuel-indexer run \ - --network beta-4 \ + --network beta-5 \ --run-migrations \ --accept-sql-queries \ --replace-indexer diff --git a/docs/src/project-components/manifest.md b/docs/src/project-components/manifest.md index 0d0025c67..b354ba851 100644 --- a/docs/src/project-components/manifest.md +++ b/docs/src/project-components/manifest.md @@ -7,7 +7,7 @@ Below is a sample indexer manifest file ```yaml namespace: fuellabs identifier: order_book_v1 -fuel_client: beta-4.fuel.network:80 +fuel_client: beta-5.fuel.network:80 abi: path/to/my/contract-abi.json contract_id: "fuels0x39150017c9e38e5e280432d546fae345d6ce6d8fe4710162c2e3a95a6faff051" graphql_schema: path/to/my/schema.graphql diff --git a/docs/src/querying/full-example.md b/docs/src/querying/full-example.md index 5409b5e05..77a59bd7b 100644 --- a/docs/src/querying/full-example.md +++ b/docs/src/querying/full-example.md @@ -2,7 +2,7 @@ Finally, let's combine nested entities, filtering, and pagination into one complete example. -Sticking with the same block explorer example, let's say that we are looking for a particular transaction and its containing block, but we don't remember either of the hashes. All we know is that the total value of the transaction is greater than zero, it was sometime after the start of the `beta-4` testnet, and it was included as part of the first fifty blocks. Additionally, we don't want to parse through all the results at once, so we only want to look at two records at a time. Finally, we think that it may have been on the more recent side, so we want to check them in reverse chronological order. +Sticking with the same block explorer example, let's say that we are looking for a particular transaction and its containing block, but we don't remember either of the hashes. All we know is that the total value of the transaction is greater than zero, it was sometime after the start of the `beta-5` testnet, and it was included as part of the first fifty blocks. Additionally, we don't want to parse through all the results at once, so we only want to look at two records at a time. Finally, we think that it may have been on the more recent side, so we want to check them in reverse chronological order. Putting all of that together, we get the following query: diff --git a/examples/fuel-explorer/docker-compose.yaml b/examples/fuel-explorer/docker-compose.yaml index 3fc16b776..21bcf2736 100644 --- a/examples/fuel-explorer/docker-compose.yaml +++ b/examples/fuel-explorer/docker-compose.yaml @@ -17,7 +17,7 @@ services: start_period: 80s fuel-indexer: image: ghcr.io/fuellabs/fuel-indexer:latest - command: bash -c "sleep 2 && ./fuel-indexer run --network beta-4 --postgres-host postgres --postgres-password postgres --web-api-host 0.0.0.0 --run-migrations" + command: bash -c "sleep 2 && ./fuel-indexer run --network beta-5 --postgres-host postgres --postgres-password postgres --web-api-host 0.0.0.0 --run-migrations" ports: - "29987:29987" volumes: 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/examples/greetings/greetings-data/Cargo.toml b/examples/greetings/greetings-data/Cargo.toml index d489ee5ff..02bafd73d 100644 --- a/examples/greetings/greetings-data/Cargo.toml +++ b/examples/greetings/greetings-data/Cargo.toml @@ -10,7 +10,7 @@ fuel-indexer-lib = { workspace = true } fuel-indexer-tests = { version = "0.0.0", path = "./../../../packages/fuel-indexer-tests" } fuel-tx = { workspace = true } fuel-types = { workspace = true } -fuels = { version = "0.50" } +fuels = { version = "0.53" } rand = "0.8" thiserror = { workspace = true } tokio = { features = ["macros", "rt-multi-thread"], workspace = true } diff --git a/examples/greetings/greetings-data/src/main.rs b/examples/greetings/greetings-data/src/main.rs index 644d05c57..0cc71a981 100644 --- a/examples/greetings/greetings-data/src/main.rs +++ b/examples/greetings/greetings-data/src/main.rs @@ -1,9 +1,9 @@ use clap::Parser; -use fuel_indexer_tests::{defaults, fixtures::tx_params}; +use fuel_indexer_tests::defaults; use fuels::accounts::wallet::WalletUnlocked; use fuels::macros::abigen; use fuels::{ - prelude::{Bech32ContractId, Contract, LoadConfiguration, Provider}, + prelude::{Bech32ContractId, CallParameters, Contract, LoadConfiguration, Provider}, types::SizedAsciiString, }; use rand::{seq::SliceRandom, Rng}; @@ -115,7 +115,8 @@ async fn main() -> Result<(), Box> { let _ = contract .methods() .new_greeting(id, greeting, name) - .tx_params(tx_params()) + .call_params(CallParameters::default()) + .unwrap() .call() .await .unwrap(); diff --git a/examples/hello-world/docker-compose.yaml b/examples/hello-world/docker-compose.yaml index 317c08f43..2e0452f8f 100644 --- a/examples/hello-world/docker-compose.yaml +++ b/examples/hello-world/docker-compose.yaml @@ -17,7 +17,7 @@ services: start_period: 80s fuel-indexer: image: ghcr.io/fuellabs/fuel-indexer:latest - command: bash -c "sleep 2 && ./fuel-indexer run --network beta-4 --postgres-host postgres --postgres-password postgres --web-api-host 0.0.0.0 --run-migrations" + command: bash -c "sleep 2 && ./fuel-indexer run --network beta-5 --postgres-host postgres --postgres-password postgres --web-api-host 0.0.0.0 --run-migrations" ports: - "29987:29987" volumes: diff --git a/helm/fuel-indexer/sample.values.yaml b/helm/fuel-indexer/sample.values.yaml index a0cce8f8f..61004058e 100644 --- a/helm/fuel-indexer/sample.values.yaml +++ b/helm/fuel-indexer/sample.values.yaml @@ -1,5 +1,5 @@ app: - fuel_node_host: beta-4.fuel.network + fuel_node_host: beta-5.fuel.network fuel_node_port: 80 volume: storageclass: gp3-generic 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-benchmarks/README.md b/packages/fuel-indexer-benchmarks/README.md index 0147e8ad1..9c931fe11 100644 --- a/packages/fuel-indexer-benchmarks/README.md +++ b/packages/fuel-indexer-benchmarks/README.md @@ -23,7 +23,7 @@ runs in `target/criterion`. Additionally, an HTML file with plots and statistics ### QA suite ```bash -cargo run -p fuel-indexer-benchmarks --bin qa -- --network beta-4.fuel.network +cargo run -p fuel-indexer-benchmarks --bin qa -- --network beta-5.fuel.network ``` ### Comparing Branches diff --git a/packages/fuel-indexer-benchmarks/src/bin/qa.rs b/packages/fuel-indexer-benchmarks/src/bin/qa.rs index aae354e15..db75ceff5 100644 --- a/packages/fuel-indexer-benchmarks/src/bin/qa.rs +++ b/packages/fuel-indexer-benchmarks/src/bin/qa.rs @@ -378,6 +378,7 @@ struct BlockHeightRequest { #[derive(Debug)] enum Network { Beta4, + Beta5, Mainnet, } @@ -385,6 +386,7 @@ impl From for Network { fn from(s: String) -> Self { match s.as_str() { "beta-4.fuel.network" => Network::Beta4, + "beta-5.fuel.network" => Network::Beta5, "mainnet" => Network::Mainnet, _ => panic!("Invalid network"), } @@ -395,6 +397,7 @@ impl Display for Network { fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { match self { Network::Beta4 => write!(f, "beta-4.fuel.network"), + Network::Beta5 => write!(f, "beta-5.fuel.network"), Network::Mainnet => write!(f, "mainnet"), } } @@ -589,7 +592,7 @@ async fn main() { .arg("start") .arg("--run-migrations") .arg("--fuel-node-host") - .arg("beta-4.fuel.network") + .arg("beta-5.fuel.network") .arg("--fuel-node-port") .arg("80") .arg("--replace-indexer") diff --git a/packages/fuel-indexer-benchmarks/src/lib.rs b/packages/fuel-indexer-benchmarks/src/lib.rs index 474b53643..2e4560dcd 100644 --- a/packages/fuel-indexer-benchmarks/src/lib.rs +++ b/packages/fuel-indexer-benchmarks/src/lib.rs @@ -10,7 +10,7 @@ use fuel_indexer_tests::fixtures::TestPostgresDb; use std::str::FromStr; /// Location of Fuel node to be used for block retrieval. -pub const NODE_URL: &str = "beta-4.fuel.network:80"; +pub const NODE_URL: &str = "beta-5.fuel.network:80"; /// Cargo workspace root; used to ensure correct file paths. pub const WORKSPACE_ROOT: &str = env!("CARGO_MANIFEST_DIR"); diff --git a/packages/fuel-indexer-lib/src/defaults.rs b/packages/fuel-indexer-lib/src/defaults.rs index d3c19b8bc..a22fea14a 100644 --- a/packages/fuel-indexer-lib/src/defaults.rs +++ b/packages/fuel-indexer-lib/src/defaults.rs @@ -142,7 +142,7 @@ pub const ALLOW_NON_SEQUENTIAL_BLOCKS: bool = false; pub const DISABLE_TOOLCHAIN_VERSION_CHECK: bool = false; /// Default Fuel network to use. -pub const NETWORK: &str = "beta-4"; +pub const NETWORK: &str = "beta-5"; /// Maximum number of database connections. It the number exceeds the database backend setting, a warning will be issued. pub const MAX_DB_CONNECTIONS: u32 = 100; diff --git a/packages/fuel-indexer-plugin/src/find.rs b/packages/fuel-indexer-plugin/src/find.rs index e342b4ba4..e69a399e2 100644 --- a/packages/fuel-indexer-plugin/src/find.rs +++ b/packages/fuel-indexer-plugin/src/find.rs @@ -306,7 +306,11 @@ 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( + &usize::try_from(u32::from(self)) + .expect("Could not convert BlockHeight into SQL value") + .to_string(), + ) } } @@ -336,7 +340,11 @@ macro_rules! impl_number_to_sql_value { ($T:ident) => { impl ToSQLValue for fuel_indexer_types::scalar::$T { fn to_sql_value(self) -> sql::Value { - sqlparser::test_utils::number(&self.to_string()) + sqlparser::test_utils::number( + &usize::try_from(self) + .expect("Could not convert scalar into usize") + .to_string(), + ) } } }; diff --git a/packages/fuel-indexer-tests/Cargo.toml b/packages/fuel-indexer-tests/Cargo.toml index 84585abac..b04115e6d 100644 --- a/packages/fuel-indexer-tests/Cargo.toml +++ b/packages/fuel-indexer-tests/Cargo.toml @@ -41,7 +41,7 @@ fuel-indexer-types = { workspace = true } fuel-indexer-utils = { workspace = true } fuel-tx = { workspace = true } fuel-types = { workspace = true } -fuels = { features = ["fuel-core-lib", "std"], version = "0.50" } +fuels = { features = ["fuel-core-lib", "std"], version = "0.53" } fuels-macros = { version = "0.46", default-features = false } futures = "0.3" hex = "0.4" diff --git a/packages/fuel-indexer-tests/contracts/fuel-indexer-test/Forc.lock b/packages/fuel-indexer-tests/contracts/fuel-indexer-test/Forc.lock index a604fef1b..57d3e19d4 100644 --- a/packages/fuel-indexer-tests/contracts/fuel-indexer-test/Forc.lock +++ b/packages/fuel-indexer-tests/contracts/fuel-indexer-test/Forc.lock @@ -1,6 +1,6 @@ [[package]] name = "core" -source = "path+from-root-BD9159206068AEC6" +source = "path+from-root-C3992B43B72ADB8C" [[package]] name = "fuel-indexer-test" @@ -9,5 +9,5 @@ dependencies = ["std"] [[package]] name = "std" -source = "git+https://github.com/fuellabs/sway?tag=v0.46.1#512a3386f8961185188302f391ccc96553d23a7a" +source = "git+https://github.com/fuellabs/sway?tag=v0.49.1#2ac7030570f22510b0ac2a7b5ddf7baa20bdc0e1" dependencies = ["core"] diff --git a/packages/fuel-indexer-tests/contracts/fuel-indexer-test/out/debug/fuel-indexer-test-abi.json b/packages/fuel-indexer-tests/contracts/fuel-indexer-test/out/debug/fuel-indexer-test-abi.json index 8dedba6e0..c91958c26 100644 --- a/packages/fuel-indexer-tests/contracts/fuel-indexer-test/out/debug/fuel-indexer-test-abi.json +++ b/packages/fuel-indexer-tests/contracts/fuel-indexer-test/out/debug/fuel-indexer-test-abi.json @@ -8,159 +8,35 @@ }, { "typeId": 1, - "type": "(_, _)", - "components": [ - { - "name": "__tuple_element", - "type": 19, - "typeArguments": null - }, - { - "name": "__tuple_element", - "type": 33, - "typeArguments": null - } - ], - "typeParameters": null - }, - { - "typeId": 2, - "type": "(_, _)", - "components": [ - { - "name": "__tuple_element", - "type": 35, - "typeArguments": null - }, - { - "name": "__tuple_element", - "type": 3, - "typeArguments": null - } - ], - "typeParameters": null - }, - { - "typeId": 3, - "type": "(_, _, _)", - "components": [ - { - "name": "__tuple_element", - "type": 36, - "typeArguments": null - }, - { - "name": "__tuple_element", - "type": 7, - "typeArguments": null - }, - { - "name": "__tuple_element", - "type": 1, - "typeArguments": null - } - ], - "typeParameters": null - }, - { - "typeId": 4, - "type": "(_, _, _)", - "components": [ - { - "name": "__tuple_element", - "type": 35, - "typeArguments": null - }, - { - "name": "__tuple_element", - "type": 36, - "typeArguments": null - }, - { - "name": "__tuple_element", - "type": 17, - "typeArguments": null - } - ], - "typeParameters": null - }, - { - "typeId": 5, - "type": "[_; 3]", - "components": [ - { - "name": "__array_element", - "type": 37, - "typeArguments": null - } - ], - "typeParameters": null - }, - { - "typeId": 6, "type": "b256", "components": null, "typeParameters": null }, { - "typeId": 7, + "typeId": 2, "type": "bool", "components": null, "typeParameters": null }, { - "typeId": 8, - "type": "enum AnotherSimpleEnum", - "components": [ - { - "name": "Ping", - "type": 27, - "typeArguments": null - }, - { - "name": "Pung", - "type": 29, - "typeArguments": null - }, - { - "name": "Call", - "type": 12, - "typeArguments": null - } - ], - "typeParameters": null - }, - { - "typeId": 9, + "typeId": 3, "type": "enum Identity", "components": [ { "name": "Address", - "type": 20, + "type": 10, "typeArguments": null }, { "name": "ContractId", - "type": 23, - "typeArguments": null - } - ], - "typeParameters": null - }, - { - "typeId": 10, - "type": "enum NestedEnum", - "components": [ - { - "name": "Inner", - "type": 8, + "type": 12, "typeArguments": null } ], "typeParameters": null }, { - "typeId": 11, + "typeId": 4, "type": "enum Option", "components": [ { @@ -170,38 +46,16 @@ }, { "name": "Some", - "type": 14, + "type": 6, "typeArguments": null } ], "typeParameters": [ - 14 + 6 ] }, { - "typeId": 12, - "type": "enum SimpleEnum", - "components": [ - { - "name": "One", - "type": 0, - "typeArguments": null - }, - { - "name": "Two", - "type": 0, - "typeArguments": null - }, - { - "name": "Three", - "type": 0, - "typeArguments": null - } - ], - "typeParameters": null - }, - { - "typeId": 13, + "typeId": 5, "type": "enum UserError", "components": [ { @@ -213,289 +67,230 @@ "typeParameters": null }, { - "typeId": 14, + "typeId": 6, "type": "generic T", "components": null, "typeParameters": null }, { - "typeId": 15, + "typeId": 7, "type": "raw untyped ptr", "components": null, "typeParameters": null }, { - "typeId": 16, + "typeId": 8, "type": "str", "components": null, "typeParameters": null }, { - "typeId": 17, - "type": "str[12]", - "components": null, - "typeParameters": null - }, - { - "typeId": 18, + "typeId": 9, "type": "str[32]", "components": null, "typeParameters": null }, { - "typeId": 19, - "type": "str[5]", - "components": null, - "typeParameters": null - }, - { - "typeId": 20, + "typeId": 10, "type": "struct Address", "components": [ { "name": "value", - "type": 6, + "type": 1, "typeArguments": null } ], "typeParameters": null }, { - "typeId": 21, + "typeId": 11, "type": "struct AssetId", "components": [ { "name": "value", - "type": 6, - "typeArguments": null - } - ], - "typeParameters": null - }, - { - "typeId": 22, - "type": "struct ComplexTupleStruct", - "components": [ - { - "name": "data", - "type": 2, + "type": 1, "typeArguments": null } ], "typeParameters": null }, { - "typeId": 23, + "typeId": 12, "type": "struct ContractId", "components": [ { "name": "value", - "type": 6, + "type": 1, "typeArguments": null } ], "typeParameters": null }, { - "typeId": 24, + "typeId": 13, "type": "struct ExampleMessageStruct", "components": [ { "name": "id", - "type": 36, + "type": 22, "typeArguments": null }, { "name": "message", - "type": 18, + "type": 9, "typeArguments": null } ], "typeParameters": null }, { - "typeId": 25, + "typeId": 14, "type": "struct ExplicitQueryStruct", "components": [ { "name": "id", - "type": 36, + "type": 22, "typeArguments": null } ], "typeParameters": null }, { - "typeId": 26, + "typeId": 15, "type": "struct Find", "components": [], "typeParameters": null }, { - "typeId": 27, + "typeId": 16, "type": "struct Ping", "components": [ { "name": "id", - "type": 36, + "type": 22, "typeArguments": null }, { "name": "value", - "type": 36, + "type": 22, "typeArguments": null }, { "name": "message", - "type": 18, + "type": 9, "typeArguments": null } ], "typeParameters": null }, { - "typeId": 28, + "typeId": 17, "type": "struct Pong", "components": [ { "name": "id", - "type": 36, + "type": 22, "typeArguments": null }, { "name": "value", - "type": 36, + "type": 22, "typeArguments": null } ], "typeParameters": null }, { - "typeId": 29, + "typeId": 18, "type": "struct Pung", "components": [ { "name": "id", - "type": 36, + "type": 22, "typeArguments": null }, { "name": "value", - "type": 36, + "type": 22, "typeArguments": null }, { "name": "is_pung", - "type": 7, + "type": 2, "typeArguments": null }, { "name": "pung_from", - "type": 9, + "type": 3, "typeArguments": null } ], "typeParameters": null }, { - "typeId": 30, + "typeId": 19, "type": "struct RawVec", "components": [ { "name": "ptr", - "type": 15, + "type": 7, "typeArguments": null }, { "name": "cap", - "type": 36, + "type": 22, "typeArguments": null } ], "typeParameters": [ - 14 + 6 ] }, { - "typeId": 31, + "typeId": 20, "type": "struct SimpleQueryStruct", "components": [ { "name": "id", - "type": 36, + "type": 22, "typeArguments": null } ], "typeParameters": null }, { - "typeId": 32, - "type": "struct SimpleTupleStruct", - "components": [ - { - "name": "data", - "type": 4, - "typeArguments": null - } - ], - "typeParameters": null - }, - { - "typeId": 33, - "type": "struct TupleStructItem", - "components": [ - { - "name": "id", - "type": 36, - "typeArguments": null - }, - { - "name": "arr", - "type": 5, - "typeArguments": null - } - ], - "typeParameters": null - }, - { - "typeId": 34, + "typeId": 21, "type": "struct Vec", "components": [ { "name": "buf", - "type": 30, + "type": 19, "typeArguments": [ { "name": "", - "type": 14, + "type": 6, "typeArguments": null } ] }, { "name": "len", - "type": 36, + "type": 22, "typeArguments": null } ], "typeParameters": [ - 14 + 6 ] }, { - "typeId": 35, - "type": "u32", - "components": null, - "typeParameters": null - }, - { - "typeId": 36, + "typeId": 22, "type": "u64", "components": null, "typeParameters": null }, { - "typeId": 37, + "typeId": 23, "type": "u8", "components": null, "typeParameters": null @@ -522,7 +317,7 @@ "name": "trigger_callreturn", "output": { "name": "", - "type": 29, + "type": 18, "typeArguments": null }, "attributes": null @@ -532,17 +327,7 @@ "name": "trigger_deeply_nested", "output": { "name": "", - "type": 31, - "typeArguments": null - }, - "attributes": null - }, - { - "inputs": [], - "name": "trigger_enum", - "output": { - "name": "", - "type": 8, + "type": 20, "typeArguments": null }, "attributes": null @@ -551,7 +336,7 @@ "inputs": [ { "name": "num", - "type": 36, + "type": 22, "typeArguments": null } ], @@ -568,7 +353,7 @@ "name": "trigger_explicit", "output": { "name": "", - "type": 25, + "type": 14, "typeArguments": null }, "attributes": null @@ -578,7 +363,7 @@ "name": "trigger_find", "output": { "name": "", - "type": 26, + "type": 15, "typeArguments": null }, "attributes": null @@ -588,11 +373,11 @@ "name": "trigger_generics", "output": { "name": "", - "type": 11, + "type": 4, "typeArguments": [ { "name": "", - "type": 27, + "type": 16, "typeArguments": null } ] @@ -649,7 +434,7 @@ "name": "trigger_multiargs", "output": { "name": "", - "type": 27, + "type": 16, "typeArguments": null }, "attributes": null @@ -659,7 +444,7 @@ "name": "trigger_panic", "output": { "name": "", - "type": 36, + "type": 22, "typeArguments": null }, "attributes": null @@ -669,7 +454,7 @@ "name": "trigger_ping", "output": { "name": "", - "type": 27, + "type": 16, "typeArguments": null }, "attributes": null @@ -679,7 +464,7 @@ "name": "trigger_ping_for_optional", "output": { "name": "", - "type": 27, + "type": 16, "typeArguments": null }, "attributes": null @@ -689,7 +474,7 @@ "name": "trigger_pong", "output": { "name": "", - "type": 28, + "type": 17, "typeArguments": null }, "attributes": null @@ -754,25 +539,15 @@ } ] }, - { - "inputs": [], - "name": "trigger_tuple", - "output": { - "name": "", - "type": 22, - "typeArguments": null - }, - "attributes": null - }, { "inputs": [ { "name": "_v", - "type": 34, + "type": 21, "typeArguments": [ { "name": "", - "type": 37, + "type": 23, "typeArguments": null } ] @@ -802,7 +577,7 @@ "logId": 0, "loggedType": { "name": "", - "type": 8, + "type": 5, "typeArguments": [] } }, @@ -810,111 +585,87 @@ "logId": 1, "loggedType": { "name": "", - "type": 10, - "typeArguments": [] - } - }, - { - "logId": 2, - "loggedType": { - "name": "", - "type": 13, - "typeArguments": [] - } - }, - { - "logId": 3, - "loggedType": { - "name": "", - "type": 11, + "type": 4, "typeArguments": [ { "name": "", - "type": 27, + "type": 16, "typeArguments": [] } ] } }, { - "logId": 4, + "logId": 2, "loggedType": { "name": "", - "type": 34, + "type": 21, "typeArguments": [ { "name": "", - "type": 27, + "type": 16, "typeArguments": [] } ] } }, { - "logId": 5, + "logId": 3, "loggedType": { "name": "", - "type": 36, + "type": 22, "typeArguments": null } }, { - "logId": 6, + "logId": 4, "loggedType": { "name": "", - "type": 29, + "type": 18, "typeArguments": [] } }, { - "logId": 7, + "logId": 5, "loggedType": { "name": "", - "type": 29, + "type": 18, "typeArguments": [] } }, { - "logId": 8, + "logId": 6, "loggedType": { "name": "", - "type": 28, + "type": 17, "typeArguments": [] } }, { - "logId": 9, + "logId": 7, "loggedType": { "name": "", - "type": 36, + "type": 22, "typeArguments": null } }, { - "logId": 10, - "loggedType": { - "name": "", - "type": 32, - "typeArguments": [] - } - }, - { - "logId": 11, + "logId": 8, "loggedType": { "name": "", - "type": 16, + "type": 8, "typeArguments": null } }, { - "logId": 12, + "logId": 9, "loggedType": { "name": "", - "type": 34, + "type": 21, "typeArguments": [ { "name": "", - "type": 28, + "type": 17, "typeArguments": [] } ] @@ -926,7 +677,7 @@ "messageId": 0, "messageType": { "name": "", - "type": 24, + "type": 13, "typeArguments": [] } } diff --git a/packages/fuel-indexer-tests/contracts/fuel-indexer-test/out/debug/fuel-indexer-test.bin b/packages/fuel-indexer-tests/contracts/fuel-indexer-test/out/debug/fuel-indexer-test.bin index 2c11d81e0..f8f5cb2ac 100644 Binary files a/packages/fuel-indexer-tests/contracts/fuel-indexer-test/out/debug/fuel-indexer-test.bin and b/packages/fuel-indexer-tests/contracts/fuel-indexer-test/out/debug/fuel-indexer-test.bin differ diff --git a/packages/fuel-indexer-tests/contracts/fuel-indexer-test/src/main.sw b/packages/fuel-indexer-tests/contracts/fuel-indexer-test/src/main.sw index 917f45821..5b50039c3 100644 --- a/packages/fuel-indexer-tests/contracts/fuel-indexer-test/src/main.sw +++ b/packages/fuel-indexer-tests/contracts/fuel-indexer-test/src/main.sw @@ -12,7 +12,7 @@ use std::{ logging::log, message::send_typed_message, revert::revert, - token::*, + asset::*, }; configurable { @@ -43,18 +43,23 @@ pub struct Pung { pung_from: Identity, } -pub struct TupleStructItem { - id: u64, - arr: [u8; 3], -} +// TODO: Sway does not currently support auto-implementation +// of the AutoEncode trait for general tuple structures; once +// it's been implemented for more tuple types, these types and +// functions should be re-enabled. -pub struct ComplexTupleStruct { - data: (u32, (u64, bool, (str[5], TupleStructItem))), -} +// pub struct TupleStructItem { +// id: u64, +// arr: [u8; 3], +// } -pub struct SimpleTupleStruct { - data: (u32, u64, str[12]), -} +// pub struct ComplexTupleStruct { +// data: (u32, (u64, bool, (str[5], TupleStructItem))), +// } + +// pub struct SimpleTupleStruct { +// data: (u32, u64, str), +// } pub struct ExplicitQueryStruct { id: u64, @@ -69,21 +74,24 @@ pub struct ExampleMessageStruct { message: str[32], } -pub enum SimpleEnum { - One: (), - Two: (), - Three: (), -} +// TODO: Sway does not currently support auto-implementation +// of the AutoEncode trait for string arrays; once +// it's been implemented, these types and functions should be re-enabled. -pub enum AnotherSimpleEnum { - Ping: Ping, - Pung: Pung, - Call: SimpleEnum, -} +// pub enum SimpleEnum { +// One: (), +// Two: (), +// Three: (), +// } -pub enum NestedEnum { - Inner: AnotherSimpleEnum, -} +// pub enum AnotherSimpleEnum { +// Pung: Pung, +// Call: SimpleEnum, +// } + +// pub enum NestedEnum { +// Inner: AnotherSimpleEnum, +// } pub struct Find {} @@ -102,7 +110,7 @@ abi FuelIndexer { fn trigger_transferout(); #[payable] fn trigger_messageout(); - fn trigger_tuple() -> ComplexTupleStruct; + // fn trigger_tuple() -> ComplexTupleStruct; fn trigger_explicit() -> ExplicitQueryStruct; fn trigger_deeply_nested() -> SimpleQueryStruct; fn trigger_vec_pong_calldata(v: Vec); @@ -111,7 +119,7 @@ abi FuelIndexer { fn trigger_panic() -> u64; fn trigger_revert(); fn trigger_enum_error(num: u64); - fn trigger_enum() -> AnotherSimpleEnum; + // fn trigger_enum() -> AnotherSimpleEnum; fn trigger_mint(); #[payable] fn trigger_burn(); @@ -217,27 +225,27 @@ impl FuelIndexer for Contract { send_typed_message(RECEIVER, example, 100); } - fn trigger_tuple() -> ComplexTupleStruct { - log(SimpleTupleStruct { - data: (4u32, 5u64, __to_str_array("hello world!")), - }); - ComplexTupleStruct { - data: ( - 1u32, - ( - 5u64, - true, - ( - __to_str_array("abcde"), - TupleStructItem { - id: 54321, - arr: [1u8, 2, 3], - }, - ), - ), - ), - } - } + // fn trigger_tuple() -> ComplexTupleStruct { + // log(SimpleTupleStruct { + // data: (4u32, 5u64, "hello world!"), + // }); + // ComplexTupleStruct { + // data: ( + // 1u32, + // ( + // 5u64, + // true, + // ( + // __to_str_array("abcde"), + // TupleStructItem { + // id: 54321, + // arr: [1u8, 2, 3], + // }, + // ), + // ), + // ), + // } + // } fn trigger_explicit() -> ExplicitQueryStruct { ExplicitQueryStruct { id: 456 } @@ -299,22 +307,22 @@ impl FuelIndexer for Contract { require(num != 69, UserError::Unauthorized); } - fn trigger_enum() -> AnotherSimpleEnum { - log(AnotherSimpleEnum::Pung(Pung { - id: 91231, - value: 888777, - is_pung: true, - pung_from: Identity::ContractId(ContractId::from(0x322ee5fb2cabec472409eb5f9b42b59644edb7bf9943eda9c2e3947305ed5e96)), - })); - - log(NestedEnum::Inner(AnotherSimpleEnum::Call(SimpleEnum::Three))); - - AnotherSimpleEnum::Ping(Ping { - id: 7777, - value: 7775, - message: __to_str_array("hello world! I am, a log event!!"), - }) - } + // fn trigger_enum() -> AnotherSimpleEnum { + // log(AnotherSimpleEnum::Pung(Pung { + // id: 91231, + // value: 888777, + // is_pung: true, + // pung_from: Identity::ContractId(ContractId::from(0x322ee5fb2cabec472409eb5f9b42b59644edb7bf9943eda9c2e3947305ed5e96)), + // })); + + // log(NestedEnum::Inner(AnotherSimpleEnum::Call(SimpleEnum::Three))); + + // AnotherSimpleEnum::Ping(Ping { + // id: 7777, + // value: 7775, + // message: __to_str_array("hello world! I am, a log event!!"), + // }) + // } fn trigger_mint() { mint(ZERO_B256, 100); diff --git a/packages/fuel-indexer-tests/indexers/fuel-indexer-test/fuel_indexer_test.yaml b/packages/fuel-indexer-tests/indexers/fuel-indexer-test/fuel_indexer_test.yaml index b4903ce44..1c45ee0bc 100644 --- a/packages/fuel-indexer-tests/indexers/fuel-indexer-test/fuel_indexer_test.yaml +++ b/packages/fuel-indexer-tests/indexers/fuel-indexer-test/fuel_indexer_test.yaml @@ -4,8 +4,8 @@ graphql_schema: packages/fuel-indexer-tests/indexers/fuel-indexer-test/schema/fu abi: packages/fuel-indexer-tests/contracts/fuel-indexer-test/out/debug/fuel-indexer-test-abi.json start_block: ~ end_block: ~ -contract_id: fuel1tqz66m7p2slrzlxgd4x6zxzm3cfzcxpcvxleu9g68qv6c03xzq7svf2y5a +contract_id: fuel1zuk6jzm6z2nnf0kx7ckl55ea7y0xfvpdqxkcpsuhz399yvjx5fdslt3xr8 identifier: index1 module: wasm: target/wasm32-unknown-unknown/release/fuel_indexer_test.wasm -resumable: true \ No newline at end of file +resumable: true diff --git a/packages/fuel-indexer-tests/indexers/fuel-indexer-test/src/lib.rs b/packages/fuel-indexer-tests/indexers/fuel-indexer-test/src/lib.rs index 26472ed09..4b2134ba8 100644 --- a/packages/fuel-indexer-tests/indexers/fuel-indexer-test/src/lib.rs +++ b/packages/fuel-indexer-tests/indexers/fuel-indexer-test/src/lib.rs @@ -171,20 +171,23 @@ mod fuel_indexer_test { entity.save(); } - fn fuel_indexer_test_tuple( - event: ComplexTupleStruct, - logdata_entity: SimpleTupleStruct, - ) { - info!("fuel_indexer_test_tuple handling ComplexTupleStruct and SimpleTupleStruct events."); - let data: (u32, (u64, bool, (SizedAsciiString<5>, TupleStructItem))) = event.data; - - TupleEntity::new( - data.1 .2 .0.to_string(), - data.1 .2 .1.id, - logdata_entity.data.2.to_string(), - ) - .get_or_create(); - } + // TODO: Due to incomplete support for tuples and the AutoEncode trait + // in the Sway compiler, this test has been ignored for now. + + // fn fuel_indexer_test_tuple( + // event: ComplexTupleStruct, + // logdata_entity: SimpleTupleStruct, + // ) { + // info!("fuel_indexer_test_tuple handling ComplexTupleStruct and SimpleTupleStruct events."); + // let data: (u32, (u64, bool, (SizedAsciiString<5>, TupleStructItem))) = event.data; + + // TupleEntity::new( + // data.1 .2 .0.to_string(), + // data.1 .2 .1.id, + // logdata_entity.data.2.to_string(), + // ) + // .get_or_create(); + // } fn fuel_indexer_test_pure_function(call: Call) { info!("fuel_indexer_test_tuple handling Call event."); @@ -442,19 +445,19 @@ mod fuel_indexer_test { e.save(); } - fn fuel_indexer_trigger_enum( - _first: AnotherSimpleEnum, - _second: NestedEnum, - _third: AnotherSimpleEnum, - ) { - info!("fuel_indexer_trigger_enum handling trigger_enum event.."); - - let e = ComplexEnumEntity { - id: uid([1]), - one: Some(EnumEntity::One.into()), - }; - e.save(); - } + // fn fuel_indexer_trigger_enum( + // _first: AnotherSimpleEnum, + // _second: NestedEnum, + // _third: AnotherSimpleEnum, + // ) { + // info!("fuel_indexer_trigger_enum handling trigger_enum event.."); + + // let e = ComplexEnumEntity { + // id: uid([1]), + // one: Some(EnumEntity::One.into()), + // }; + // e.save(); + // } fn fuel_indexer_trigger_non_indexable_type(_b: BlockData) { info!("fuel_indexer_trigger_non_indexable_type handling trigger_non_indexable_type event."); diff --git a/packages/fuel-indexer-tests/src/fixtures.rs b/packages/fuel-indexer-tests/src/fixtures.rs index 686d74861..137db8521 100644 --- a/packages/fuel-indexer-tests/src/fixtures.rs +++ b/packages/fuel-indexer-tests/src/fixtures.rs @@ -18,7 +18,7 @@ use fuels::{ macros::abigen, prelude::{ setup_single_asset_coins, setup_test_provider, AssetId, Bech32ContractId, - Contract, LoadConfiguration, Provider, TxParameters, WalletUnlocked, + Contract, LoadConfiguration, Provider, TxPolicies, WalletUnlocked, DEFAULT_COIN_AMOUNT, }, test_helpers::Config, @@ -267,13 +267,6 @@ impl Drop for TestPostgresDb { } } -pub fn tx_params() -> TxParameters { - let gas_price = 0; - let gas_limit = 1_000_000; - let byte_price = 0; - TxParameters::new(Some(gas_price), Some(gas_limit), byte_price) -} - pub async fn setup_test_fuel_node( wallet_path: PathBuf, contract_bin_path: Option, @@ -315,7 +308,7 @@ pub async fn setup_test_fuel_node( let config = Config { utxo_validation: false, addr, - ..Config::local_node() + ..Config::default() }; let provider = setup_test_provider(coins, vec![], Some(config), None) @@ -331,8 +324,23 @@ pub async fn setup_test_fuel_node( ) .expect("Failed to load contract"); + let gas_price = 0; + let gas_limit = 1_000_000; + let witness_limit = 1_000_000; + let maturity = 0; + let max_fee = 1; + let contract_id = loaded_contract - .deploy(&wallet, TxParameters::default()) + .deploy( + &wallet, + TxPolicies::new( + Some(gas_price), + Some(witness_limit), + Some(maturity), + Some(max_fee), + Some(gas_limit), + ), + ) .await .unwrap(); @@ -462,14 +470,15 @@ pub mod test_web { use fuels::types::bech32::Bech32ContractId; use std::path::Path; - use super::{tx_params, FuelIndexerTest}; + use super::FuelIndexerTest; async fn fuel_indexer_test_blocks(state: web::Data>) -> impl Responder { let _ = state .contract .methods() .trigger_ping() - .tx_params(tx_params()) + .call_params(CallParameters::default()) + .unwrap() .call() .await .unwrap(); @@ -482,7 +491,8 @@ pub mod test_web { .contract .methods() .trigger_ping() - .tx_params(tx_params()) + .call_params(CallParameters::default()) + .unwrap() .call() .await .unwrap(); @@ -500,7 +510,8 @@ pub mod test_web { .contract .methods() .trigger_transfer() - .tx_params(tx_params()) + .call_params(CallParameters::default()) + .unwrap() .call_params(call_params) .expect("Could not set call parameters for contract method") .call() @@ -515,7 +526,8 @@ pub mod test_web { .contract .methods() .trigger_log() - .tx_params(tx_params()) + .call_params(CallParameters::default()) + .unwrap() .call() .await .unwrap(); @@ -530,7 +542,8 @@ pub mod test_web { .contract .methods() .trigger_logdata() - .tx_params(tx_params()) + .call_params(CallParameters::default()) + .unwrap() .call() .await .unwrap(); @@ -545,7 +558,8 @@ pub mod test_web { .contract .methods() .trigger_scriptresult() - .tx_params(tx_params()) + .call_params(CallParameters::default()) + .unwrap() .call() .await .unwrap(); @@ -564,7 +578,8 @@ pub mod test_web { .methods() .trigger_transferout() .append_variable_outputs(1) - .tx_params(tx_params()) + .call_params(CallParameters::default()) + .unwrap() .call_params(call_params) .expect("Could not set call parameters for contract method") .call() @@ -585,7 +600,8 @@ pub mod test_web { .trigger_messageout() .call_params(call_params) .expect("Could not set call parameters for contract method") - .tx_params(tx_params()) + .call_params(CallParameters::default()) + .unwrap() .call() .await .unwrap(); @@ -600,7 +616,8 @@ pub mod test_web { .contract .methods() .trigger_callreturn() - .tx_params(tx_params()) + .call_params(CallParameters::default()) + .unwrap() .call() .await .unwrap(); @@ -615,7 +632,8 @@ pub mod test_web { .contract .methods() .trigger_multiargs() - .tx_params(tx_params()) + .call_params(CallParameters::default()) + .unwrap() .call() .await .unwrap(); @@ -630,7 +648,8 @@ pub mod test_web { .contract .methods() .trigger_ping_for_optional() - .tx_params(tx_params()) + .call_params(CallParameters::default()) + .unwrap() .call() .await .unwrap(); @@ -645,7 +664,8 @@ pub mod test_web { .contract .methods() .trigger_deeply_nested() - .tx_params(tx_params()) + .call_params(CallParameters::default()) + .unwrap() .call() .await .unwrap(); @@ -660,7 +680,8 @@ pub mod test_web { .contract .methods() .trigger_explicit() - .tx_params(tx_params()) + .call_params(CallParameters::default()) + .unwrap() .call() .await .unwrap(); @@ -674,17 +695,23 @@ pub mod test_web { HttpResponse::Ok().body(block_height.to_string()) } - async fn fuel_indexer_test_tuple(state: web::Data>) -> impl Responder { - let _ = state - .contract - .methods() - .trigger_tuple() - .tx_params(tx_params()) - .call() - .await - .unwrap(); - HttpResponse::Ok() - } + // TODO: Sway does not currently support auto-implementation + // of the AutoEncode trait for general tuple structures; once + // it's been implemented for more tuple types, these types and + // functions should be re-enabled. + + // async fn fuel_indexer_test_tuple(state: web::Data>) -> impl Responder { + // let _ = state + // .contract + // .methods() + // .trigger_tuple() + // .call_params(CallParameters::default()) + // .unwrap() + // .call() + // .await + // .unwrap(); + // HttpResponse::Ok() + // } async fn fuel_indexer_vec_calldata( state: web::Data>, @@ -693,7 +720,8 @@ pub mod test_web { .contract .methods() .trigger_vec_pong_calldata(vec![1, 2, 3, 4, 5, 6, 7, 8]) - .tx_params(tx_params()) + .call_params(CallParameters::default()) + .unwrap() .call() .await .unwrap(); @@ -705,7 +733,8 @@ pub mod test_web { .contract .methods() .trigger_vec_pong_logdata() - .tx_params(tx_params()) + .call_params(CallParameters::default()) + .unwrap() .call() .await .unwrap(); @@ -719,7 +748,8 @@ pub mod test_web { .contract .methods() .trigger_pure_function() - .tx_params(tx_params()) + .call_params(CallParameters::default()) + .unwrap() .call() .await .unwrap(); @@ -734,7 +764,8 @@ pub mod test_web { .contract .methods() .trigger_panic() - .tx_params(tx_params()) + .call_params(CallParameters::default()) + .unwrap() .call() .await; @@ -747,7 +778,8 @@ pub mod test_web { .contract .methods() .trigger_revert() - .tx_params(tx_params()) + .call_params(CallParameters::default()) + .unwrap() .call() .await; @@ -761,27 +793,35 @@ pub mod test_web { .contract .methods() .trigger_enum_error(69) - .tx_params(tx_params()) + .call_params(CallParameters::default()) + .unwrap() .call() .await; HttpResponse::Ok() } - async fn fuel_indexer_test_trigger_enum( - state: web::Data>, - ) -> impl Responder { - let _ = state - .contract - .methods() - .trigger_enum() - .tx_params(tx_params()) - .call() - .await - .unwrap(); - - HttpResponse::Ok() - } + // TODO: Sway does not currently support auto-implementation + // of the AutoEncode trait for string arrays (and string slices + // cannot be returned from a function); once it's been + // implemented for more tuple types, these types and + // functions should be re-enabled. + + // async fn fuel_indexer_test_trigger_enum( + // state: web::Data>, + // ) -> impl Responder { + // let _ = state + // .contract + // .methods() + // .trigger_enum() + // .call_params(CallParameters::default()) + // .unwrap() + // .call() + // .await + // .unwrap(); + + // HttpResponse::Ok() + // } async fn fuel_indexer_test_trigger_mint( state: web::Data>, @@ -790,7 +830,8 @@ pub mod test_web { .contract .methods() .trigger_mint() - .tx_params(tx_params()) + .call_params(CallParameters::default()) + .unwrap() .call() .await .unwrap(); @@ -807,7 +848,8 @@ pub mod test_web { .contract .methods() .trigger_burn() - .tx_params(tx_params()) + .call_params(CallParameters::default()) + .unwrap() .call_params(call_params) .unwrap() .call() @@ -824,7 +866,8 @@ pub mod test_web { .contract .methods() .trigger_generics() - .tx_params(tx_params()) + .call_params(CallParameters::default()) + .unwrap() .call() .await .unwrap(); @@ -839,7 +882,8 @@ pub mod test_web { .contract .methods() .trigger_find() - .tx_params(tx_params()) + .call_params(CallParameters::default()) + .unwrap() .call() .await .unwrap(); @@ -889,7 +933,7 @@ pub mod test_web { "/block_height", web::get().to(fuel_indexer_test_get_block_height), ) - .route("/tuples", web::post().to(fuel_indexer_test_tuple)) + // .route("/tuples", web::post().to(fuel_indexer_test_tuple)) .route( "/deeply_nested", web::post().to(fuel_indexer_test_deeply_nested_schema_fields), @@ -909,7 +953,7 @@ pub mod test_web { "/enum_error", web::post().to(fuel_indexer_test_trigger_enum_error), ) - .route("/enum", web::post().to(fuel_indexer_test_trigger_enum)) + // .route("/enum", web::post().to(fuel_indexer_test_trigger_enum)) .route("/mint", web::post().to(fuel_indexer_test_trigger_mint)) .route("/burn", web::post().to(fuel_indexer_test_trigger_burn)) .route( diff --git a/packages/fuel-indexer-tests/tests/indexing.rs b/packages/fuel-indexer-tests/tests/indexing.rs index d4ab922e9..b6b16bc66 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 = - "5805ad6fc1543e317cc86d4da1185b8e122c183861bf9e151a3819ac3e26103d"; + "172da90b7a12a734bec6f62dfa533df11e64b02d01ad80c397144a523246a25b"; const TRANSFER_BASE_ASSET_ID: &str = "0000000000000000000000000000000000000000000000000000000000000000"; @@ -119,7 +119,7 @@ async fn test_index_receipt_types() { mock_request("/call").await; - let row = sqlx::query("SELECT * FROM fuel_indexer_test_index1.callentity LIMIT 1") + let row = sqlx::query("SELECT * FROM fuel_indexer_test_index1.callentity WHERE fn_name = 'trigger_pure_function' LIMIT 1") .fetch_one(&mut conn) .await .unwrap(); @@ -130,10 +130,12 @@ async fn test_index_receipt_types() { mock_request("/returndata").await; - let row = sqlx::query("SELECT * FROM fuel_indexer_test_index1.pungentity LIMIT 1") - .fetch_one(&mut conn) - .await - .unwrap(); + let row = sqlx::query( + "SELECT * FROM fuel_indexer_test_index1.pungentity WHERE value = 12345 LIMIT 1", + ) + .fetch_one(&mut conn) + .await + .unwrap(); let from_buff = Address::from_str(&row.get::(3)).unwrap(); let addr_buff = Address::from_str( @@ -361,6 +363,9 @@ async fn test_index_optional_types() { assert!(row.get::, usize>(3).is_none()); } +// TODO: Due to incomplete support for tuples and the AutoEncode trait +// in the Sway compiler, this test has been ignored for now. +#[ignore] #[actix_web::test] async fn test_index_tuples() { let IndexingTestComponents { @@ -572,16 +577,16 @@ async fn test_index_sway_enums() { ref node, ref db, .. } = setup_indexing_test_components(None).await; - mock_request("/enum").await; + // mock_request("/enum").await; - let mut conn = db.pool.acquire().await.unwrap(); - let row = - sqlx::query("SELECT * FROM fuel_indexer_test_index1.complexenumentity LIMIT 1") - .fetch_one(&mut conn) - .await - .unwrap(); + // let mut conn = db.pool.acquire().await.unwrap(); + // let row = + // sqlx::query("SELECT * FROM fuel_indexer_test_index1.complexenumentity LIMIT 1") + // .fetch_one(&mut conn) + // .await + // .unwrap(); - assert_eq!(row.get::<&str, usize>(1), "EnumEntity::One"); + // assert_eq!(row.get::<&str, usize>(1), "EnumEntity::One"); mock_request("/enum_error").await; diff --git a/packages/fuel-indexer-tests/trybuild/fail_if_attribute_abi_arg_includes_invalid_type.stderr b/packages/fuel-indexer-tests/trybuild/fail_if_attribute_abi_arg_includes_invalid_type.stderr index bbdbd6f64..dd4f5a02b 100644 --- a/packages/fuel-indexer-tests/trybuild/fail_if_attribute_abi_arg_includes_invalid_type.stderr +++ b/packages/fuel-indexer-tests/trybuild/fail_if_attribute_abi_arg_includes_invalid_type.stderr @@ -114,7 +114,6 @@ help: consider importing one of these items | 2 + use fuel_indexer_utils::plugin::prelude::fuel::TransactionStatus; | - and 1 other candidate help: if you import `TransactionStatus`, refer to it directly | 46 - status: fuel::TransactionStatus::default(), 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..f28de0bc5 100644 --- a/packages/fuel-indexer-types/src/fuel.rs +++ b/packages/fuel-indexer-types/src/fuel.rs @@ -13,8 +13,8 @@ use serde::{Deserialize, Serialize}; pub mod field { pub use fuel_tx::field::{ - BytecodeLength, BytecodeWitnessIndex, GasLimit, GasPrice, Inputs, Maturity, - Outputs, ReceiptsRoot, Salt as TxFieldSalt, Script as TxFieldScript, ScriptData, + 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..0e734f87d 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 = { workspace = 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..43540ccce 100644 --- a/packages/fuel-indexer/src/executor.rs +++ b/packages/fuel-indexer/src/executor.rs @@ -23,7 +23,7 @@ use fuel_indexer_types::{ scalar::{Bytes, Bytes32}, }; use fuel_tx::UniqueIdentifier; -use fuel_vm::prelude::Deserializable; +use fuel_vm::fuel_types::canonical::Deserialize; 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 } diff --git a/plugins/forc-index/README.md b/plugins/forc-index/README.md index aaa9e2eb2..fcb2acc33 100644 --- a/plugins/forc-index/README.md +++ b/plugins/forc-index/README.md @@ -25,7 +25,7 @@ forc index start Deploy a given indexer project to a particular endpoint ```bash -forc index deploy --url https://beta-4-indexer.fuel.network +forc index deploy --url https://beta-5-indexer.fuel.network ``` ### `forc index remove` @@ -33,7 +33,7 @@ forc index deploy --url https://beta-4-indexer.fuel.network Kill a running indexer ```bash -forc index remove --url https://beta-4-indexer.fuel.network +forc index remove --url https://beta-5-indexer.fuel.network ``` ### `forc index check` diff --git a/plugins/forc-index/src/defaults.rs b/plugins/forc-index/src/defaults.rs index 63466bcbb..fa741a5cb 100644 --- a/plugins/forc-index/src/defaults.rs +++ b/plugins/forc-index/src/defaults.rs @@ -29,7 +29,7 @@ crate-type = ['cdylib'] [dependencies] fuel-indexer-utils = {{ version = "0.24" }} -fuels = {{ version = "0.50", default-features = false }} +fuels = {{ version = "0.53", default-features = false }} getrandom = {{ version = "0.2", features = ["js"] }} serde = {{ version = "1.0", default-features = false, features = ["derive"] }} "# diff --git a/scripts/docker-compose.yaml b/scripts/docker-compose.yaml index f10ed7ab4..9a4e3a34e 100644 --- a/scripts/docker-compose.yaml +++ b/scripts/docker-compose.yaml @@ -17,7 +17,7 @@ services: start_period: 80s fuel-indexer: image: ghcr.io/fuellabs/fuel-indexer:latest - command: bash -c "sleep 2 && ./fuel-indexer run --network beta-4 --postgres-host postgres --postgres-password postgres --web-api-host 0.0.0.0 --run-migrations --client-request-delay 1 --block-page-size 50" + command: bash -c "sleep 2 && ./fuel-indexer run --network beta-5 --postgres-host postgres --postgres-password postgres --web-api-host 0.0.0.0 --run-migrations --client-request-delay 1 --block-page-size 50" ports: - "29987:29987" volumes: