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/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/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/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/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/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/rustfmt.toml b/rustfmt.toml index 3a26366..f216078 100644 --- a/rustfmt.toml +++ b/rustfmt.toml @@ -1 +1 @@ -edition = "2021" +edition = "2024" 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}; 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