From 54f06be404270c27b1a66938584d4120e4c110e8 Mon Sep 17 00:00:00 2001 From: hanabi1224 Date: Mon, 24 Feb 2025 06:18:28 +0800 Subject: [PATCH 1/3] chore: upgrade Rust toolchain to 1.85.0 and language edition to 2024 --- Cargo.lock | 76 +++++++++++++++++++++---------------------- Cargo.toml | 3 +- deny.toml | 4 +-- rust-toolchain.toml | 2 +- src/address.rs | 2 +- src/app.rs | 2 +- src/faucet/utils.rs | 2 +- src/faucet/views.rs | 2 +- src/key.rs | 3 +- src/lib.rs | 8 ++--- src/lotus_json/mod.rs | 6 ++-- src/message.rs | 2 +- src/rpc_context.rs | 4 +-- 13 files changed, 56 insertions(+), 60 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 63886b3..38a95c0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -55,9 +55,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.95" +version = "1.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04" +checksum = "6b964d184e89d9b6b67dd2715bc8e74cf3107fb2b529990c90cf517326150bf4" [[package]] name = "arc-swap" @@ -273,9 +273,9 @@ dependencies = [ [[package]] name = "blake3" -version = "1.5.5" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8ee0c1824c4dea5b5f81736aff91bae041d2c07ee1192bec91054e10e3e601e" +checksum = "1230237285e3e10cde447185e8975408ae24deaa67205ce684805c25bc0c7937" dependencies = [ "arrayref", "arrayvec", @@ -369,9 +369,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.14" +version = "1.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c3d1b2e905a3a7b00a6141adb0e4c0bb941d11caf55349d863942a1cc44e3c9" +checksum = "c736e259eea577f443d5c86c304f9f4ae0295c43f3ba05c21f1d66b5f06001af" dependencies = [ "shlex", ] @@ -810,9 +810,9 @@ dependencies = [ [[package]] name = "either" -version = "1.13.0" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" +checksum = "b7914353092ddf589ad78f25c5c1c21b7f80b0ff8621e7c814c3485b5306da9d" [[package]] name = "either_of" @@ -1213,9 +1213,9 @@ checksum = "17e2ac29387b1aa07a1e448f7bb4f35b500787971e965b02842b900afa5c8f6f" [[package]] name = "h2" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e" +checksum = "5017294ff4bb30944501348f6f8e42e6ad28f42c8bbef7a74029aff064a4e3c2" dependencies = [ "atomic-waker", "bytes", @@ -1928,9 +1928,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.169" +version = "0.2.170" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" +checksum = "875b3680cb2f8f71bdcf9a30f38d48282f5d3c95cbf9b3fa57269bb5d5c06828" [[package]] name = "libsecp256k1" @@ -2010,9 +2010,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.25" +version = "0.4.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f" +checksum = "30bde2b3dc3671ae49d8e2e9f044c7c005836e7a023ee57cffa25ab82764bb9e" [[package]] name = "manyhow" @@ -2063,9 +2063,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3b1c9bd4fe1f0f8b387f6eb9eb3b4a1aa26185e5750efb9140301703f62cd1b" +checksum = "8e3e04debbb59698c15bacbb6d93584a8c0ca9cc3213cb423d31f760d8843ce5" dependencies = [ "adler2", ] @@ -2165,9 +2165,9 @@ dependencies = [ [[package]] name = "native-tls" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dab59f8e050d5df8e4dd87d9206fb6f65a483e20ac9fda365ade4fab353196c" +checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e" dependencies = [ "libc", "log", @@ -2711,9 +2711,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.8" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834" +checksum = "82b568323e98e49e2a0899dcee453dd679fae22d69adf9b11dd508d1549b7e2f" dependencies = [ "bitflags 2.8.0", ] @@ -2798,9 +2798,9 @@ dependencies = [ [[package]] name = "ring" -version = "0.17.9" +version = "0.17.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e75ec5e92c4d8aede845126adc388046234541629e76029599ed35a003c7ed24" +checksum = "da5349ae27d3887ca812fb375b45a4fbb36d8d12d2df394968cd86e35683fe73" dependencies = [ "cc", "cfg-if", @@ -2984,9 +2984,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.217" +version = "1.0.218" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70" +checksum = "e8dfc9d19bdbf6d17e22319da49161d5d0108e4188e8b680aef6299eed22df60" dependencies = [ "serde_derive", ] @@ -3024,9 +3024,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.217" +version = "1.0.218" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" +checksum = "f09503e191f4e797cb8aac08e9a4a4695c5edf6a2e70e376d961ddd5c969f82b" dependencies = [ "proc-macro2", "quote", @@ -3047,9 +3047,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.138" +version = "1.0.139" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949" +checksum = "44f86c3acccc9c65b153fe1b85a3be07fe5515274ec9f0653b4a0875731c72a6" dependencies = [ "indexmap", "itoa", @@ -3460,9 +3460,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tempfile" -version = "3.17.0" +version = "3.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a40f762a77d2afa88c2d919489e390a12bdd261ed568e60cfa7e48d4e20f0d33" +checksum = "22e5a0acb1f3f55f65cc4a866c361b2fb2a0ff6366785ae6fbb5f85df07ba230" dependencies = [ "cfg-if", "fastrand", @@ -3812,9 +3812,9 @@ dependencies = [ [[package]] name = "typenum" -version = "1.17.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" +checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f" [[package]] name = "unic-langid" @@ -3836,9 +3836,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034" +checksum = "00e2473a93778eb0bad35909dff6a10d28e63f792f16ed15e404fca9d5eeedbe" [[package]] name = "unicode-segmentation" @@ -3895,9 +3895,9 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" [[package]] name = "uuid" -version = "1.13.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ced87ca4be083373936a67f8de945faa23b6b42384bd5b64434850802c6dccd0" +checksum = "93d59ca99a559661b96bf898d8fce28ed87935fd2bea9f05983c1464dd6c71b1" dependencies = [ "getrandom 0.3.1", "js-sys", @@ -4204,9 +4204,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59690dea168f2198d1a3b0cac23b8063efcd11012f10ae4698f284808c8ef603" +checksum = "0e7f4ea97f6f78012141bcdb6a216b2609f0979ada50b20ca5b52dde2eac2bb1" dependencies = [ "memchr", ] diff --git a/Cargo.toml b/Cargo.toml index 644ae0b..97fb128 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "forest-explorer" version = "0.1.0" -edition = "2021" +edition = "2024" authors = ["Forest Team "] [lib] @@ -9,7 +9,6 @@ crate-type = ["cdylib"] [workspace] members = ["e2e"] -resolver = "2" [dependencies] anyhow = "1" diff --git a/deny.toml b/deny.toml index 1d5a21f..903e62d 100644 --- a/deny.toml +++ b/deny.toml @@ -69,9 +69,7 @@ feature-depth = 1 #db-urls = ["https://github.com/rustsec/advisory-db"] # A list of advisory IDs to ignore. Note that ignored advisories will still # output a note when they are encountered. -ignore = [ - "RUSTSEC-2024-0370", # proc-macro-error is unmaintained -] +ignore = [] # If this is true, then cargo deny will use the git executable to fetch advisory database. # If this is false, then it uses a built-in git library. # Setting this to true can be helpful if you have special authentication requirements that cargo-deny does not support. diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 2c61fbc..367b79f 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,4 +1,4 @@ [toolchain] -channel = "1.83.0" +channel = "1.85.0" components = ["clippy", "rustfmt"] targets = ["wasm32-unknown-unknown"] diff --git a/src/address.rs b/src/address.rs index 2ab8d38..dae0752 100644 --- a/src/address.rs +++ b/src/address.rs @@ -1,6 +1,6 @@ use anyhow::ensure; -use fvm_shared::address::{Address, Network}; use fvm_shared::ActorID; +use fvm_shared::address::{Address, Network}; // '0x' + 20bytes const ETH_ADDRESS_LENGTH: usize = 42; diff --git a/src/app.rs b/src/app.rs index 5759afe..d65181e 100644 --- a/src/app.rs +++ b/src/app.rs @@ -1,6 +1,6 @@ use crate::rpc_context::RpcContext; use leptos::prelude::*; -use leptos::{component, leptos_dom::helpers::event_target_value, view, IntoView}; +use leptos::{IntoView, component, leptos_dom::helpers::event_target_value, view}; use leptos_meta::*; use leptos_router::components::*; use leptos_router::path; diff --git a/src/faucet/utils.rs b/src/faucet/utils.rs index 71d88cd..b37d309 100644 --- a/src/faucet/utils.rs +++ b/src/faucet/utils.rs @@ -1,5 +1,5 @@ #[cfg(feature = "ssr")] -use crate::key::{sign, Key}; +use crate::key::{Key, sign}; use crate::{lotus_json::LotusJson, message::SignedMessage}; #[cfg(feature = "ssr")] use fvm_shared::address::Network; diff --git a/src/faucet/views.rs b/src/faucet/views.rs index 4beda08..d83c888 100644 --- a/src/faucet/views.rs +++ b/src/faucet/views.rs @@ -3,7 +3,7 @@ use std::time::Duration; use fvm_shared::address::Network; use leptos::task::spawn_local; -use leptos::{component, leptos_dom::helpers::event_target_value, view, IntoView}; +use leptos::{IntoView, component, leptos_dom::helpers::event_target_value, view}; use leptos::prelude::*; use leptos_meta::{Meta, Title}; diff --git a/src/key.rs b/src/key.rs index cb9747f..431e7ef 100644 --- a/src/key.rs +++ b/src/key.rs @@ -28,10 +28,9 @@ pub fn new_address(sig_type: SignatureType, public_key: &[u8]) -> Result
(value: &[u8], serializer: S) -> Result where S: Serializer, diff --git a/src/lib.rs b/src/lib.rs index 977fede..9d93688 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -25,13 +25,13 @@ mod ssr_imports { use std::sync::Arc; use crate::{ - app::{shell, App}, + app::{App, shell}, faucet, }; - use axum::{routing::post, Extension, Router}; + use axum::{Extension, Router, routing::post}; use leptos::prelude::*; - use leptos_axum::{generate_route_list, LeptosRoutes}; - use worker::{event, Context, Env, HttpRequest, Result}; + use leptos_axum::{LeptosRoutes, generate_route_list}; + use worker::{Context, Env, HttpRequest, Result, event}; fn router(env: Env) -> Router { let leptos_options = LeptosOptions::builder() diff --git a/src/lotus_json/mod.rs b/src/lotus_json/mod.rs index 3376535..e43d4fe 100644 --- a/src/lotus_json/mod.rs +++ b/src/lotus_json/mod.rs @@ -123,7 +123,7 @@ use ::cid::Cid; use derive_more::From; -use serde::{de::DeserializeOwned, Deserialize, Deserializer, Serialize, Serializer}; +use serde::{Deserialize, Deserializer, Serialize, Serializer, de::DeserializeOwned}; use std::{fmt::Display, str::FromStr}; pub trait HasLotusJson: Sized { @@ -177,7 +177,7 @@ mod vec_u8; // mod nonempty; // can't make snapshots of generic type // mod opt; // can't make snapshots of generic type mod raw_bytes; // fvm_ipld_encoding::RawBytes: !quickcheck::Arbitrary - // mod vec; // can't make snapshots of generic type +// mod vec; // can't make snapshots of generic type // pub use vec::*; @@ -307,7 +307,7 @@ pub mod stringify { pub mod base64_standard { use super::*; - use base64::engine::{general_purpose::STANDARD, Engine as _}; + use base64::engine::{Engine as _, general_purpose::STANDARD}; pub fn serialize(value: &[u8], serializer: S) -> Result where diff --git a/src/message.rs b/src/message.rs index a36b954..0ee4def 100644 --- a/src/message.rs +++ b/src/message.rs @@ -3,10 +3,10 @@ use fvm_ipld_encoding::Error; use fvm_ipld_encoding::RawBytes; pub use fvm_shared::message::Message; use fvm_shared::{ + METHOD_SEND, address::Address, crypto::signature::{Signature, SignatureType}, econ::TokenAmount, - METHOD_SEND, }; use multihash_codetable::{Code, MultihashDigest as _}; use serde::{Deserialize, Serialize}; diff --git a/src/rpc_context.rs b/src/rpc_context.rs index e502d67..f288d74 100644 --- a/src/rpc_context.rs +++ b/src/rpc_context.rs @@ -1,10 +1,10 @@ use cid::Cid; -use fvm_shared::address::{set_current_network, Address, Network}; +use fvm_shared::address::{Address, Network, set_current_network}; use fvm_shared::econ::TokenAmount; use fvm_shared::message::Message; use leptos::prelude::*; use reqwest::Client; -use serde_json::{json, Value}; +use serde_json::{Value, json}; use std::sync::LazyLock; use crate::lotus_json::{HasLotusJson, LotusJson}; From 81a6ec5e055e60e64209a0c6ed7da68a441812da Mon Sep 17 00:00:00 2001 From: hanabi1224 Date: Wed, 26 Feb 2025 20:27:50 +0800 Subject: [PATCH 2/3] bump --- Cargo.lock | 16 +++++++++++----- e2e/Cargo.toml | 2 +- rustfmt.toml | 2 +- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 38a95c0..ee91f2f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -390,16 +390,16 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] name = "chrono" -version = "0.4.39" +version = "0.4.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825" +checksum = "1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", "wasm-bindgen", - "windows-targets", + "windows-link", ] [[package]] @@ -3895,9 +3895,9 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" [[package]] name = "uuid" -version = "1.14.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93d59ca99a559661b96bf898d8fce28ed87935fd2bea9f05983c1464dd6c71b1" +checksum = "bd8dcafa1ca14750d8d7a05aa05988c17aab20886e1f3ae33a40223c58d92ef7" dependencies = [ "getrandom 0.3.1", "js-sys", @@ -4090,6 +4090,12 @@ dependencies = [ "windows-targets", ] +[[package]] +name = "windows-link" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dccfd733ce2b1753b03b6d3c65edf020262ea35e20ccdf3e288043e6dd620e3" + [[package]] name = "windows-registry" version = "0.2.0" diff --git a/e2e/Cargo.toml b/e2e/Cargo.toml index 19f2f01..b723b32 100644 --- a/e2e/Cargo.toml +++ b/e2e/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "e2e" version = "0.1.0" -edition = "2021" +edition = "2024" [dependencies] thirtyfour = "0.35" diff --git a/rustfmt.toml b/rustfmt.toml index 3a26366..f216078 100644 --- a/rustfmt.toml +++ b/rustfmt.toml @@ -1 +1 @@ -edition = "2021" +edition = "2024" From 2d0b353c47f60927c25b4e0dc5ac43b162cb070b Mon Sep 17 00:00:00 2001 From: hanabi1224 Date: Wed, 26 Feb 2025 20:48:37 +0800 Subject: [PATCH 3/3] print wasm-pack version --- .github/workflows/test.yml | 2 ++ package.json | 4 ++-- yarn.lock | 10 +++++----- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bcaac38..be55c85 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -41,6 +41,8 @@ jobs: run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh + - run: wasm-pack --version + - uses: sigoden/install-binary@v1 with: repo: WebAssembly/binaryen diff --git a/package.json b/package.json index 37426dc..ef3407f 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "node": ">=18.0.0" }, "devDependencies": { - "prettier": "^3.4.2", + "prettier": "^3.5.2", "tailwindcss": "^3.4.17", "wrangler": "^3.100.0" }, @@ -21,5 +21,5 @@ "dev": "wrangler dev --env quick", "start": "wrangler dev" }, - "packageManager": "yarn@4.5.3" + "packageManager": "yarn@4.6.0" } diff --git a/yarn.lock b/yarn.lock index eb3a76c..ed64640 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1634,12 +1634,12 @@ __metadata: languageName: node linkType: hard -"prettier@npm:^3.4.2": - version: 3.4.2 - resolution: "prettier@npm:3.4.2" +"prettier@npm:^3.5.2": + version: 3.5.2 + resolution: "prettier@npm:3.5.2" bin: prettier: bin/prettier.cjs - checksum: 10c0/99e076a26ed0aba4ebc043880d0f08bbb8c59a4c6641cdee6cdadf2205bdd87aa1d7823f50c3aea41e015e99878d37c58d7b5f0e663bba0ef047f94e36b96446 + checksum: 10c0/d7b597ed33f39c32ace675896ad187f06a3e48dc8a1e80051b5c5f0dae3586d53981704b8fda5ac3b080e6c2e0e197d239131b953702674f044351621ca5e1ac languageName: node linkType: hard @@ -1783,7 +1783,7 @@ __metadata: version: 0.0.0-use.local resolution: "root@workspace:." dependencies: - prettier: "npm:^3.4.2" + prettier: "npm:^3.5.2" tailwindcss: "npm:^3.4.17" wrangler: "npm:^3.100.0" languageName: unknown