From 2e6f8d74d725d02aea38ecd670a7ebb56941f412 Mon Sep 17 00:00:00 2001 From: DefiCake Date: Fri, 22 Dec 2023 17:31:40 +0100 Subject: [PATCH] chore: update fuel-core to 0.22 and fuels to 0.54 --- Cargo.lock | 180 +++++++++++++++++------------------------------------ Cargo.toml | 10 +-- 2 files changed, 62 insertions(+), 128 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7a35e15..72b0988 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -143,12 +143,6 @@ version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" -[[package]] -name = "arrayvec" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" - [[package]] name = "ascii" version = "0.9.3" @@ -421,12 +415,6 @@ version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" -[[package]] -name = "byte-slice-cast" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c" - [[package]] name = "byteorder" version = "1.5.0" @@ -1155,9 +1143,6 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534" dependencies = [ - "byteorder", - "rand", - "rustc-hex", "static_assertions", ] @@ -1195,9 +1180,9 @@ dependencies = [ [[package]] name = "fuel-asm" -version = "0.43.0" +version = "0.43.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cee560e1eeac4d292e38111f694f21983377176eb600b57cacaed86b747ffa2" +checksum = "1ea884860261efdc7300b63db7972cb0e08e8f5379495ad7cdd2bdb7c0cc4623" dependencies = [ "bitflags 2.4.1", "fuel-types", @@ -1207,9 +1192,9 @@ dependencies = [ [[package]] name = "fuel-core" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c545fd12c8b5bbc495fd37a4fdf2548450b07b3fb26ac8ea20a10436c311e1d0" +checksum = "b784b66a9dc46393d69967727895db787974a4d6349cc139c940125ede40c681" dependencies = [ "anyhow", "async-graphql", @@ -1234,9 +1219,7 @@ dependencies = [ "hex", "hyper", "itertools 0.10.5", - "parking_lot", "postcard", - "primitive-types", "rand", "serde", "serde_json", @@ -1252,9 +1235,9 @@ dependencies = [ [[package]] name = "fuel-core-chain-config" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84319b8e7a3b422b0f38c6ad4abd29f48b923797b7555c3bb53151322779f9bf" +checksum = "11f2b1fe72649f4eca267dc49f9ef1edfdc4b8f0d6325a8b1ebeb6641b11e1c3" dependencies = [ "anyhow", "bech32", @@ -1271,9 +1254,9 @@ dependencies = [ [[package]] name = "fuel-core-client" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed3555027c1362e8ff1b03783399b0baa62911ffcf4254c533f3f32c98982562" +checksum = "609b815dd45f01a012fa237d9ea946dcc67d6858d141bf64cbeb9fb0a80a6474" dependencies = [ "anyhow", "cynic", @@ -1295,9 +1278,9 @@ dependencies = [ [[package]] name = "fuel-core-consensus-module" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50fd6d90df194b5970bf16681bfad9f917ff3f837e00c6538a8b95d2e0a6fdf9" +checksum = "0b22705ff15266cd0206aea5e59e881be3606bc221ec29b938a2e630c72420b8" dependencies = [ "anyhow", "fuel-core-chain-config", @@ -1308,9 +1291,9 @@ dependencies = [ [[package]] name = "fuel-core-database" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb7b7cd46a2de1df8c71b4541bf19e09870965cb6ac72ee564170f9bcc8df909" +checksum = "11202dd7027502e663178663ab0a995d2ea93a0d543775d63730f8daa2cd490c" dependencies = [ "anyhow", "derive_more", @@ -1320,21 +1303,24 @@ dependencies = [ [[package]] name = "fuel-core-executor" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4a5ed529258ded68048806b150e190ab03dc399bdd5547096525c3419cca188" +checksum = "2d1cbcc8e330681305d603c22f736df3fe403bfedf5c122066fb853638286a9c" dependencies = [ "anyhow", "fuel-core-chain-config", "fuel-core-storage", "fuel-core-types", + "hex", + "parking_lot", + "tracing", ] [[package]] name = "fuel-core-importer" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acd700b679be3cda7561f46778aa136ba4af1048570e116d8eb1d3e0f0a316a9" +checksum = "db12defb4ed0d3aff3d39138925a0d8467f857254cba5d5e9de9bc273ade25d0" dependencies = [ "anyhow", "derive_more", @@ -1347,9 +1333,9 @@ dependencies = [ [[package]] name = "fuel-core-metrics" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f87fec36f415dd9cdc2f723f018c30985bbeeadbc7e066e27fc79f3a3e2e6f3" +checksum = "10d853a839036a1906e8082192268034ace79e5d04dbd935abeaee745c5f5a39" dependencies = [ "axum", "once_cell", @@ -1362,9 +1348,9 @@ dependencies = [ [[package]] name = "fuel-core-poa" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ef8dd121e59450d695435af4dea14d60acb41195cdd2dc64d3980aef42fbd9" +checksum = "3c94a4807d14918f6f2f30c29fd4cfed0c7b7565c01d51c05cffff2881b468f3" dependencies = [ "anyhow", "async-trait", @@ -1379,9 +1365,9 @@ dependencies = [ [[package]] name = "fuel-core-producer" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e85951fa8159a4698a6d523fc44fd3659b9db63800fcfd9619f4283a568296ce" +checksum = "21bbc29241e839c711ee2fcb9729978c1717f02e02459c00216a63e15384b275" dependencies = [ "anyhow", "async-trait", @@ -1395,9 +1381,9 @@ dependencies = [ [[package]] name = "fuel-core-services" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2a3a0ed906c332d13802209ab5839d81e464abd14307b75f58550cf0de30430" +checksum = "c0d8ed6f17fc5e42094412ea2af7a9e6a2ec5cd6fe56548ef0e0730938b55c26" dependencies = [ "anyhow", "async-trait", @@ -1410,21 +1396,22 @@ dependencies = [ [[package]] name = "fuel-core-storage" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33b84df7585c184d79c342833321db43c610d38bccf913acdf526e64fd292ab2" +checksum = "8188ae0d5af2925ca05608b60f69cdc89f9e33b6500f776e7e1ecd2c44d32447" dependencies = [ "anyhow", "derive_more", "fuel-core-types", "fuel-vm", + "primitive-types", ] [[package]] name = "fuel-core-txpool" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "943dec1ff13cd4fcd3c0f9ae826be09de1520bab5565916ec91cb31429c59f9a" +checksum = "ef6228d74e0a2efeda97a7f5f3c31052c3b0e961ca92c6754cbb19c864813f3d" dependencies = [ "anyhow", "async-trait", @@ -1443,11 +1430,12 @@ dependencies = [ [[package]] name = "fuel-core-types" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91b55088841f6211b3ba452687c301fee4b9d1cf52dc6fc47f940a6681336cff" +checksum = "5dd06358708d4c61ef53ad73c26ae55a0ed59ba9096c56b64a1eb56af748e9f0" dependencies = [ "anyhow", + "bs58", "derive_more", "fuel-vm", "secrecy", @@ -1459,9 +1447,9 @@ dependencies = [ [[package]] name = "fuel-crypto" -version = "0.43.0" +version = "0.43.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fca614c332efaeaae796a80c72c0a29a3853eab6c2af67379bd01473e0277449" +checksum = "9e0efe99de550a5b5c12a6a4d2eadd26bc5571cfba82d0133baa2805d485ad8c" dependencies = [ "coins-bip32", "coins-bip39", @@ -1480,9 +1468,9 @@ dependencies = [ [[package]] name = "fuel-derive" -version = "0.43.0" +version = "0.43.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1efdc9a47d14947cd50e88161eb2b6c85e0ce34a00a321103f1f7764e8d6b0d3" +checksum = "ff58cf4d01a4fb9440c63a8764154dfd3b07c74e4b3639cce8eea77d67e63a7a" dependencies = [ "proc-macro2", "quote", @@ -1524,9 +1512,9 @@ dependencies = [ [[package]] name = "fuel-merkle" -version = "0.43.0" +version = "0.43.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeb0d0661a655f7753afa5124ccd90a7b9218cb6d777235060b09f4da9feb22d" +checksum = "89143dd80b29dda305fbb033bc7f868834445ef6b361bf920f0077938fb6c0bc" dependencies = [ "derive_more", "digest", @@ -1539,15 +1527,15 @@ dependencies = [ [[package]] name = "fuel-storage" -version = "0.43.0" +version = "0.43.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97697cb72cb86e33dd5a3ef5509a233a290174f4b3b5c43b4be4484ccb6b2fc0" +checksum = "901aee4b46684e483d2c04d40e5ac1b8ccda737ac5a363507b44b9eb23b0fdaa" [[package]] name = "fuel-tx" -version = "0.43.0" +version = "0.43.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194617f09afa17e8cc4c4127ceed1d0fb1549680eb9b2a90c743605298a1c33e" +checksum = "bb1f65e363e5e9a5412cea204f2d2357043327a0c3da5482c3b38b9da045f20e" dependencies = [ "bitflags 2.4.1", "derivative", @@ -1567,9 +1555,9 @@ dependencies = [ [[package]] name = "fuel-types" -version = "0.43.0" +version = "0.43.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0a170bd25f8cc3def3833b2032646bf1ca77460353dfa8b2b89c4d83ad1f2cf" +checksum = "148b59be5c54bafff692310663cbce3f097a2a7ff5533224dcfdf387578a72b0" dependencies = [ "fuel-derive", "hex", @@ -1579,9 +1567,9 @@ dependencies = [ [[package]] name = "fuel-vm" -version = "0.43.0" +version = "0.43.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3e24e0f8e58c08192dd012eef70f47063aa48e4222209df6044aa0a471e0fd6" +checksum = "aed5ba0cde904f16cd748dc9b33e62f4b3dc5fd0a72ec867c973e687cd7347ba" dependencies = [ "async-trait", "backtrace", @@ -1610,9 +1598,9 @@ dependencies = [ [[package]] name = "fuels-accounts" -version = "0.52.0" +version = "0.54.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1194723c48883e6e1552860e73e65512a4831c1a799fd5393c7b37965c33132" +checksum = "bf897206616d15e284dba7641f95d2b3a119639705b4909828af5008699f6352" dependencies = [ "async-trait", "chrono", @@ -1622,7 +1610,6 @@ dependencies = [ "fuel-crypto", "fuel-tx", "fuel-types", - "fuel-vm", "fuels-core", "hex", "rand", @@ -1636,9 +1623,9 @@ dependencies = [ [[package]] name = "fuels-code-gen" -version = "0.52.0" +version = "0.54.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d978142941d423f898c2d3fd430237ec15ae260709e7f363d4cfa873c33a35fc" +checksum = "aa5acfe0ef24e12137786072a182dc5f0de9d51e79a6023183466f4eaecf7512" dependencies = [ "Inflector", "fuel-abi-types", @@ -1652,9 +1639,9 @@ dependencies = [ [[package]] name = "fuels-core" -version = "0.52.0" +version = "0.54.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "516cf8671017e36a012f1465f6ce5071f849a19dceb6410a7bef7a250bb42f17" +checksum = "c716030842d8c4eef2191a9c93ed0cb3cdae7927a4b2f07d87db0020293db893" dependencies = [ "async-trait", "bech32", @@ -1680,9 +1667,9 @@ dependencies = [ [[package]] name = "fuels-macros" -version = "0.52.0" +version = "0.54.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3708910fdf7a770ba0894202a6ebd64b300630f391b6fb7af6c7d28c212b1d71" +checksum = "7b0dcdf41ccc7090bec4848d680d16cdc0c6cd37b749e518084caa8e6b730053" dependencies = [ "fuels-code-gen", "itertools 0.12.0", @@ -2118,26 +2105,6 @@ dependencies = [ "unicode-normalization", ] -[[package]] -name = "impl-codec" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba6a270039626615617f3f36d15fc827041df3b78c439da2cadfa47455a77f2f" -dependencies = [ - "parity-scale-codec", -] - -[[package]] -name = "impl-trait-for-tuples" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "indexmap" version = "1.9.3" @@ -2470,32 +2437,6 @@ dependencies = [ "sha2", ] -[[package]] -name = "parity-scale-codec" -version = "3.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dec8a8073036902368c2cdc0387e85ff9a37054d7e7c98e592145e0c92cd4fb" -dependencies = [ - "arrayvec", - "bitvec", - "byte-slice-cast", - "impl-trait-for-tuples", - "parity-scale-codec-derive", - "serde", -] - -[[package]] -name = "parity-scale-codec-derive" -version = "3.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "312270ee71e1cd70289dacf597cab7b207aa107d2f28191c2ae45b2ece18a260" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "parking_lot" version = "0.12.1" @@ -2683,7 +2624,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b34d9fd68ae0b74a41b21c03c2f62847aa0ffea044eee893b4c140b37e244e2" dependencies = [ "fixed-hash", - "impl-codec", "uint", ] @@ -2982,12 +2922,6 @@ version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" -[[package]] -name = "rustc-hex" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6" - [[package]] name = "rustc_version" version = "0.4.0" diff --git a/Cargo.toml b/Cargo.toml index cf80eeb..6d90457 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,11 +12,11 @@ description = "A token faucet for onboarding fuel users" [dependencies] anyhow = "1.0" axum = "0.5" -fuel-core-client = "0.21.0" +fuel-core-client = "0.22.0" fuel-tx = "0.43.0" fuel-types = "0.43.0" -fuels-accounts = "0.52.0" -fuels-core = "0.52.0" +fuels-accounts = "0.54.0" +fuels-core = "0.54.0" handlebars = "4.2" lazy_static = "1.4" memoize = "0.3.1" @@ -31,8 +31,8 @@ tracing = "0.1" tracing-subscriber = { version = "0.3", features = ["env-filter", "json"] } [dev-dependencies] -fuel-core = { version = "0.21.0", default-features = false } -fuel-core-txpool = "0.21.0" +fuel-core = { version = "0.22.0", default-features = false } +fuel-core-txpool = "0.22.0" fuel-crypto = "0.43.0" fuel-types = { version = "0.43.0", features = ["random"] } futures = "0.3"