) -> impl IntoView {
- view! {
-
-
Target Balance:
-
Loading target balance... }>
-
- {move || format_balance(&faucet.get().get_target_balance(), &faucet.get().get_fil_unit())}
-
-
-
-
-
- "Sending..."
-
- }
- .into_any()
- } else if faucet.get().get_send_rate_limit_remaining() > 0 {
- let duration = faucet.get().get_send_rate_limit_remaining();
- view! {
-
- {format!("Rate-limited! {duration}s")}
-
- }
- .into_any()
- } else if faucet.get().is_low_balance() {
- view! {
-
- "Send"
-
- }
- .into_any()
- } else {
- view! {
-
- Send
-
- }
- .into_any()
- }
- }}
-
-
-
-
- {move || {
- let messages = faucet.get().get_sent_messages();
- if !messages.is_empty() {
- view! {
-
-
Transactions:
-
- {messages
- .into_iter()
- .map(|(msg, sent)| {
- let (cid, status) = if sent {
- let cid = faucet_tx_base_url
- .get()
- .as_ref()
- .and_then(|base_url| {
- format_url(base_url, SearchPath::Transaction, &msg.to_string()).ok()
- })
- .map(|tx_url| {
- view! {
-
- {msg.to_string()}
-
- }
- .into_any()
- })
- .unwrap_or_else(|| view! { {msg.to_string()} }.into_any());
- (cid, "(confirmed)")
- } else {
- let cid = view! { {msg.to_string()} }.into_any();
- (cid, "(pending)")
- };
- view! { "CID:" {cid} {status} }
- })
- .collect::>()}
-
-
- }
- .into_any()
- } else {
- ().into_any()
- }
- }}
-
- {move || {
- match faucet_tx_base_url.get() {
- Some(ref base_url) => {
- match format_url(base_url, SearchPath::Address, &faucet.get().get_sender_address()) {
- Ok(addr_url) => {
- view! {
-
-
- "Transaction History"
-
-
- }
- .into_any()
- }
- Err(_) => ().into_any(),
- }
- }
- None => ().into_any(),
- }
- }}
- Back to faucet list
-
-
-
Filecoin Calibnet Faucet
-
- "This faucet distributes "
- {format_balance(&crate::constants::CALIBNET_DRIP_AMOUNT, crate::constants::FIL_CALIBNET_UNIT)}
- " per request. It is rate-limited to 1 request per " {crate::constants::CALIBNET_RATE_LIMIT_SECONDS}
- " seconds. Farming is discouraged and will result in more stringent rate limiting in the future and/or permanent bans."
-
- }
-}
-
-#[component]
-pub fn Faucet_Mainnet() -> impl IntoView {
- let rpc_context = RpcContext::use_context();
- // Set rpc context to mainnet url
- rpc_context.set(Provider::get_network_url(Network::Mainnet));
-
- view! {
-
-
Filecoin Mainnet Faucet
-
-
- "This faucet distributes "
- {format_balance(&crate::constants::MAINNET_DRIP_AMOUNT, crate::constants::FIL_MAINNET_UNIT)}
- " per request. It is rate-limited to 1 request per " {crate::constants::MAINNET_RATE_LIMIT_SECONDS}
- " seconds. Farming is discouraged and will result in more stringent rate limiting in the future and/or permanent bans or service termination. Faucet funds are limited and may run out. They are replenished periodically."
-
-
,
+) -> impl IntoView {
+ let (fading_messages, set_fading_messages) = signal(HashSet::new());
+ view! {
+
+ {errors
+ .into_iter()
+ .map(|(id, error)| {
+ spawn_local(async move {
+ set_timeout(
+ move || {
+ set_fading_messages
+ .update(|fading| {
+ fading.insert(id);
+ });
+ },
+ MESSAGE_FADE_AFTER,
+ );
+ set_timeout(
+ move || {
+ set_fading_messages
+ .update(|fading| {
+ fading.remove(&id);
+ });
+ faucet.get().remove_error_message(id);
+ },
+ MESSAGE_REMOVAL_AFTER,
+ );
+ });
+
+ view! {
+
+
{error}
+
+
+ Close
+
+
+
+ }
+ })
+ .collect::
>()}
+ ) -> impl IntoView {
+ view! {
+
+
Faucet Balance:
+
Loading faucet balance... }
+ }>
+ {move || {
+ if faucet.get().is_low_balance() {
+ let topup_req_url = option_env!("FAUCET_TOPUP_REQ_URL");
+ view! {
+
+ "Request Faucet Top-up"
+
+ }
+ .into_any()
+ } else {
+ view! {
+
+ {format_balance(&faucet.get().get_faucet_balance(), &faucet.get().get_fil_unit())}
+
+ }
+ .into_any()
+ }
+ }}
+
+
) -> impl IntoView {
+ view! {
+
+
Target Balance:
+
Loading target balance... }>
+
+ {move || format_balance(&faucet.get().get_target_balance(), &faucet.get().get_fil_unit())}
+
+
+
+
+ }
+}
+
+#[component]
+pub fn LightningIcon(#[prop(default = String::new())] class: String) -> impl IntoView {
+ view! {
+
+
+ }
+}
+
+#[component]
+pub fn Loader(loading: impl Fn() -> bool + 'static + Send) -> impl IntoView {
+ view! { >,
+) -> impl IntoView {
+ view! {
+
+
Transactions:
+
+ {messages
+ .into_iter()
+ .map(|(msg, sent)| {
+ let (cid, status) = if sent {
+ let cid = faucet_tx_base_url
+ .get()
+ .as_ref()
+ .and_then(|base_url| {
+ format_url(base_url, SearchPath::Transaction, &msg.to_string()).ok()
+ })
+ .map(|tx_url| {
+ view! {
+
+ {msg.to_string()}
+
+ }
+ .into_any()
+ })
+ .unwrap_or_else(|| view! { {msg.to_string()} }.into_any());
+ (cid, "(confirmed)")
+ } else {
+ let cid = view! { {msg.to_string()} }.into_any();
+ (cid, "(pending)")
+ };
+ view! { "CID:" {cid} {status} }
+ })
+ .collect::>()}
+
+
,
+ faucet_tx_base_url: RwSignal>,
+) -> impl IntoView {
+ view! {
+ {move || {
+ match faucet_tx_base_url.get() {
+ Some(ref base_url) => {
+ match format_url(base_url, SearchPath::Address, &faucet.get().get_sender_address()) {
+ Ok(addr_url) => {
+ view! {
+
+
+ "Transaction History"
+
+
+ }
+ .into_any()
+ }
+ Err(_) => ().into_any(),
+ }
+ }
+ None => ().into_any(),
+ }
+ }}
+ }
+}
diff --git a/src/faucet/views/faucets/calibnet.rs b/src/faucet/views/faucets/calibnet.rs
new file mode 100644
index 00000000..126d4158
--- /dev/null
+++ b/src/faucet/views/faucets/calibnet.rs
@@ -0,0 +1,34 @@
+use super::Faucet;
+use crate::faucet::constants::{
+ CALIBNET_DRIP_AMOUNT, CALIBNET_RATE_LIMIT_SECONDS, FIL_CALIBNET_UNIT,
+};
+use crate::utils::format::format_balance;
+use crate::utils::rpc_context::{Provider, RpcContext};
+use fvm_shared::address::Network;
+use leptos::prelude::*;
+use leptos::{component, view, IntoView};
+use leptos_meta::{Meta, Title};
+
+#[component]
+pub fn Faucet_Calibnet() -> impl IntoView {
+ let rpc_context = RpcContext::use_context();
+ // Set rpc context to calibnet url
+ rpc_context.set(Provider::get_network_url(Network::Testnet));
+
+ view! {
+
+
+
+
+ "This faucet distributes " {format_balance(&CALIBNET_DRIP_AMOUNT, FIL_CALIBNET_UNIT)}
+ " per request. It is rate-limited to 1 request per " {CALIBNET_RATE_LIMIT_SECONDS}
+ " seconds. Farming is discouraged and will result in more stringent rate limiting in the future and/or permanent bans."
+
+ }
+}
diff --git a/src/faucet/views/faucets/mainnet.rs b/src/faucet/views/faucets/mainnet.rs
new file mode 100644
index 00000000..ec9597f8
--- /dev/null
+++ b/src/faucet/views/faucets/mainnet.rs
@@ -0,0 +1,29 @@
+use super::Faucet;
+use crate::faucet::constants::{FIL_MAINNET_UNIT, MAINNET_DRIP_AMOUNT, MAINNET_RATE_LIMIT_SECONDS};
+use crate::utils::format::format_balance;
+use crate::utils::rpc_context::{Provider, RpcContext};
+use fvm_shared::address::Network;
+use leptos::prelude::*;
+use leptos::{component, view, IntoView};
+use leptos_meta::{Meta, Title};
+
+#[component]
+pub fn Faucet_Mainnet() -> impl IntoView {
+ let rpc_context = RpcContext::use_context();
+ // Set rpc context to mainnet url
+ rpc_context.set(Provider::get_network_url(Network::Mainnet));
+
+ view! {
+
+
+
+
+ "This faucet distributes " {format_balance(&MAINNET_DRIP_AMOUNT, FIL_MAINNET_UNIT)}
+ " per request. It is rate-limited to 1 request per " {MAINNET_RATE_LIMIT_SECONDS}
+ " seconds. Farming is discouraged and will result in more stringent rate limiting in the future and/or permanent bans or service termination. Faucet funds are limited and may run out. They are replenished periodically."
+
+
) -> impl IntoView {
+ view! {
+
+
+ "Sending..."
+
+ }
+ .into_any()
+ } else if faucet.get().get_send_rate_limit_remaining() > 0 {
+ let duration = faucet.get().get_send_rate_limit_remaining();
+ view! {
+
+ {format!("Rate-limited! {duration}s")}
+
+ }
+ .into_any()
+ } else if faucet.get().is_low_balance() {
+ view! {
+
+ "Send"
+
+ }
+ .into_any()
+ } else {
+ view! {
+
+ Send
+
+ }
+ .into_any()
+ }
+ }}
+
+ }
+}
+
+#[cfg(feature = "hydrate")]
+fn use_faucet_polling(faucet: RwSignal) {
+ let _ = use_interval_fn(
+ move || {
+ let duration = faucet.get().get_send_rate_limit_remaining();
+ if duration > 0 {
+ faucet.get().set_send_rate_limit_remaining(duration - 1);
+ }
+ },
+ 1000,
+ );
+
+ let _ = use_interval_fn(
+ move || {
+ faucet.get().refetch_balances();
+ },
+ 5000,
+ );
+}
+
+#[component]
+pub fn Faucet(target_network: Network) -> impl IntoView {
+ let faucet = RwSignal::new(FaucetController::new(target_network));
+
+ #[cfg(feature = "hydrate")]
+ {
+ use_faucet_polling(faucet);
+ }
+
+ let faucet_tx_base_url = match target_network {
+ Network::Mainnet => {
+ RwSignal::new(option_env!("FAUCET_TX_URL_MAINNET").and_then(|url| Url::parse(url).ok()))
+ }
+ Network::Testnet => RwSignal::new(
+ option_env!("FAUCET_TX_URL_CALIBNET").and_then(|url| Url::parse(url).ok()),
+ ),
+ };
+
+ view! {
+ {move || {
+ let errors = faucet.get().get_error_messages();
+ if !errors.is_empty() {
+ view! {
+
+
+
+
+ {move || {
+ let messages = faucet.get().get_sent_messages();
+ if !messages.is_empty() {
+ view! {
}.into_any()
+ } else {
+ ().into_any()
+ }
+ }}
+
+
+ }
+}
+
+#[component]
+pub fn Faucets() -> impl IntoView {
+ view! {
+
+
+
What does the faucet offer?
+
+
+ Free calibnet tFIL for experimentation and development.
+
+
+
+ Real mainnet FIL for contributors engaging with the Filecoin ecosystem.
+
+
+
+
+ A Quick and Easy way to request free tFIL and FIL - Just enter your wallet address.
+
+
+
+
+
+
+
Why use this faucet?
+
+
+ Supports both calibnet and mainnet, unlike typical faucets.
+
+
+
+ Enables testing of smart contracts, storage deals, and blockchain interactions without financial risk.
+
+
+
+ Easy access to FIL for developers and users building on Filecoin.
+
+
+
+ Need help? Visit the
+ {" "}
+ Filecoin Slack
+ {" "}or
+ {" "}
+ documentation
+ .
+
+
+
+
+
>,
+ network_version: LocalResource>,
+) -> impl IntoView {
+ view! {
+
+
+
+ Glif.io Calibnet
+ Glif.io Mainnet
+
+
+
+
+
+
Network:
+
Loading network name... }>
+
+ {move || network_name.get().flatten()}
+
+
+
+
+
+
Version:
+
Loading network version... }>
+
+ {move || network_version.get().flatten()}
+
+
+
+
+
+
+ }
+}
diff --git a/src/faucet/views/mod.rs b/src/faucet/views/mod.rs
new file mode 100644
index 00000000..283ddb2e
--- /dev/null
+++ b/src/faucet/views/mod.rs
@@ -0,0 +1,3 @@
+pub mod components;
+pub mod faucets;
+pub mod home;
diff --git a/src/icons/check_icon.rs b/src/icons/check_icon.rs
deleted file mode 100644
index 50f228b3..00000000
--- a/src/icons/check_icon.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-use leptos::prelude::*;
-
-#[component]
-pub fn CheckIcon(#[prop(default = String::new())] class: String) -> impl IntoView {
- view! {
-
-
- }
-}
diff --git a/src/icons/lightning_icon.rs b/src/icons/lightning_icon.rs
deleted file mode 100644
index 4eacc6fc..00000000
--- a/src/icons/lightning_icon.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-use leptos::prelude::*;
-
-#[component]
-pub fn LightningIcon(#[prop(default = String::new())] class: String) -> impl IntoView {
- view! {
-
-
- }
-}
diff --git a/src/icons/mod.rs b/src/icons/mod.rs
deleted file mode 100644
index 431eef02..00000000
--- a/src/icons/mod.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-mod check_icon;
-mod lightning_icon;
-
-pub use check_icon::CheckIcon;
-pub use lightning_icon::LightningIcon;
diff --git a/src/lib.rs b/src/lib.rs
index 1253376f..520857dd 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,17 +1,8 @@
mod app;
-mod rpc_context;
+mod utils;
#[cfg(feature = "hydrate")]
use app::App;
-mod address;
-mod constants;
mod faucet;
-mod icons;
-mod key;
-mod lotus_json;
-mod message;
-#[cfg(feature = "ssr")]
-mod rate_limiter;
-mod utils;
#[cfg(feature = "hydrate")]
#[wasm_bindgen::prelude::wasm_bindgen]
@@ -25,15 +16,35 @@ pub fn hydrate() {
mod ssr_imports {
use std::sync::Arc;
- use crate::{
- app::{shell, App},
- faucet,
- };
+ use crate::{app::App, faucet};
use axum::{routing::post, Extension, Router};
use leptos::prelude::*;
use leptos_axum::{generate_route_list, LeptosRoutes};
+ use leptos_meta::*;
use worker::{event, Context, Env, HttpRequest, Result};
+ fn shell(options: LeptosOptions) -> impl IntoView {
+ view! {
+
+
+
+ Filecoin Forest Explorer Faucet - Get Free tFIL and FIL
+ ();
- server_fn::axum::register_explicit::();
+ server_fn::axum::register_explicit::();
+ server_fn::axum::register_explicit::();
}
#[event(fetch)]
diff --git a/src/lotus_json/signed_message.rs b/src/lotus_json/signed_message.rs
deleted file mode 100644
index ca889e17..00000000
--- a/src/lotus_json/signed_message.rs
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright 2019-2024 ChainSafe Systems
-// SPDX-License-Identifier: Apache-2.0, MIT
-
-use crate::message::{Message, SignedMessage};
-use ::cid::Cid;
-use fvm_shared::crypto::signature::Signature;
-
-use super::*;
-
-#[derive(Clone, Serialize, Deserialize)]
-#[serde(rename_all = "PascalCase")]
-pub struct SignedMessageLotusJson {
- #[serde(with = "crate::lotus_json")]
- message: Message,
- #[serde(with = "crate::lotus_json")]
- signature: Signature,
- #[serde(
- with = "crate::lotus_json",
- rename = "CID",
- skip_serializing_if = "Option::is_none",
- default
- )]
- cid: Option,
-}
-
-impl HasLotusJson for SignedMessage {
- type LotusJson = SignedMessageLotusJson;
-
- fn into_lotus_json(self) -> Self::LotusJson {
- let cid = Some(self.cid());
- let Self { message, signature } = self;
- Self::LotusJson {
- message,
- signature,
- cid,
- }
- }
-
- fn from_lotus_json(lotus_json: Self::LotusJson) -> Self {
- let Self::LotusJson {
- message,
- signature,
- cid: _ignored, // See notes on Message
- } = lotus_json;
- Self { message, signature }
- }
-}
diff --git a/src/message.rs b/src/message.rs
deleted file mode 100644
index a36b954d..00000000
--- a/src/message.rs
+++ /dev/null
@@ -1,63 +0,0 @@
-use cid::Cid;
-use fvm_ipld_encoding::Error;
-use fvm_ipld_encoding::RawBytes;
-pub use fvm_shared::message::Message;
-use fvm_shared::{
- address::Address,
- crypto::signature::{Signature, SignatureType},
- econ::TokenAmount,
- METHOD_SEND,
-};
-use multihash_codetable::{Code, MultihashDigest as _};
-use serde::{Deserialize, Serialize};
-
-fn from_cbor_blake2b256(obj: &S) -> Result {
- let bytes = fvm_ipld_encoding::to_vec(obj)?;
- Ok(Cid::new_v1(
- fvm_ipld_encoding::DAG_CBOR,
- Code::Blake2b256.digest(&bytes),
- ))
-}
-
-pub fn message_transfer(from: Address, to: Address, value: TokenAmount) -> Message {
- Message {
- from,
- to,
- value,
- method_num: METHOD_SEND,
- params: RawBytes::new(vec![]),
- gas_limit: 0,
- gas_fee_cap: TokenAmount::from_atto(0),
- gas_premium: TokenAmount::from_atto(0),
- version: 0,
- sequence: 0,
- }
-}
-
-pub fn message_cid(msg: &Message) -> cid::Cid {
- from_cbor_blake2b256(msg).expect("message serialization is infallible")
-}
-
-#[derive(PartialEq, Clone, Debug, Serialize, Deserialize, Hash, Eq)]
-pub struct SignedMessage {
- pub message: Message,
- pub signature: Signature,
-}
-
-impl SignedMessage {
- /// Checks if the signed message is a BLS message.
- pub fn is_bls(&self) -> bool {
- self.signature.signature_type() == SignatureType::BLS
- }
-
- // Important note: `msg.cid()` is different from
- // `Cid::from_cbor_blake2b256(msg)`. The behavior comes from Lotus, and
- // Lotus, by, definition, is correct.
- pub fn cid(&self) -> cid::Cid {
- if self.is_bls() {
- message_cid(&self.message)
- } else {
- from_cbor_blake2b256(self).expect("message serialization is infallible")
- }
- }
-}
diff --git a/src/address.rs b/src/utils/address.rs
similarity index 100%
rename from src/address.rs
rename to src/utils/address.rs
diff --git a/src/utils.rs b/src/utils/error.rs
similarity index 99%
rename from src/utils.rs
rename to src/utils/error.rs
index 660555d8..a0b96f12 100644
--- a/src/utils.rs
+++ b/src/utils/error.rs
@@ -1,6 +1,5 @@
-use std::future::Future;
-
use leptos::prelude::{RwSignal, Update};
+use std::future::Future;
use uuid::Uuid;
pub async fn catch_all(
diff --git a/src/utils/format.rs b/src/utils/format.rs
new file mode 100644
index 00000000..3844633e
--- /dev/null
+++ b/src/utils/format.rs
@@ -0,0 +1,76 @@
+use anyhow::{anyhow, Result};
+use fvm_shared::econ::TokenAmount;
+use url::Url;
+
+/// Formats FIL balance to a human-readable string with two decimal places and a unit.
+pub fn format_balance(balance: &TokenAmount, unit: &str) -> String {
+ format!(
+ "{:.2} {unit}",
+ balance.to_string().parse::().unwrap_or_default(),
+ )
+}
+
+/// Types of search paths in Filecoin explorer.
+#[derive(Copy, Clone)]
+pub enum SearchPath {
+ Transaction,
+ Address,
+}
+
+impl SearchPath {
+ pub fn as_str(&self) -> &'static str {
+ match self {
+ SearchPath::Transaction => "txs/",
+ SearchPath::Address => "address/",
+ }
+ }
+}
+
+/// Constructs a URL combining base URL, search path, and an identifier.
+pub fn format_url(base_url: &Url, path: SearchPath, identifier: &str) -> Result {
+ base_url
+ .join(path.as_str())?
+ .join(identifier)
+ .map_err(|e| anyhow!("Failed to join URL: {}", e))
+}
+
+#[cfg(test)]
+mod tests {
+ use super::*;
+ use fvm_shared::econ::TokenAmount;
+
+ #[test]
+ fn test_format_balance() {
+ let cases = [
+ (TokenAmount::from_whole(1), "1.00 FIL"),
+ (TokenAmount::from_whole(0), "0.00 FIL"),
+ (TokenAmount::from_nano(10e6 as i64), "0.01 FIL"),
+ (TokenAmount::from_nano(999_999_999), "1.00 FIL"),
+ ];
+ for (balance, expected) in cases.iter() {
+ assert_eq!(format_balance(balance, "FIL"), *expected);
+ }
+ }
+
+ #[test]
+ fn test_format_url() {
+ let base = Url::parse("https://test.com/").unwrap();
+ let cases = [
+ (
+ SearchPath::Transaction,
+ "0xdef456",
+ "https://test.com/txs/0xdef456",
+ ),
+ (
+ SearchPath::Address,
+ "0xabc123",
+ "https://test.com/address/0xabc123",
+ ),
+ ];
+
+ for (path, query, expected) in cases.iter() {
+ let result = format_url(&base, *path, query).unwrap();
+ assert_eq!(result.as_str(), *expected);
+ }
+ }
+}
diff --git a/src/key.rs b/src/utils/key.rs
similarity index 100%
rename from src/key.rs
rename to src/utils/key.rs
diff --git a/src/lotus_json/address.rs b/src/utils/lotus_json/address.rs
similarity index 92%
rename from src/lotus_json/address.rs
rename to src/utils/lotus_json/address.rs
index 2d328df5..2ac97c89 100644
--- a/src/lotus_json/address.rs
+++ b/src/utils/lotus_json/address.rs
@@ -1,6 +1,3 @@
-// Copyright 2019-2024 ChainSafe Systems
-// SPDX-License-Identifier: Apache-2.0, MIT
-
use super::*;
use fvm_shared::address::{Address, Network};
diff --git a/src/lotus_json/big_int.rs b/src/utils/lotus_json/big_int.rs
similarity index 67%
rename from src/lotus_json/big_int.rs
rename to src/utils/lotus_json/big_int.rs
index a7236dae..2e1f1909 100644
--- a/src/lotus_json/big_int.rs
+++ b/src/utils/lotus_json/big_int.rs
@@ -1,12 +1,9 @@
-// Copyright 2019-2024 ChainSafe Systems
-// SPDX-License-Identifier: Apache-2.0, MIT
-
use super::*;
use fvm_shared::bigint::BigInt;
#[derive(Clone, Serialize, Deserialize)]
-pub struct BigIntLotusJson(#[serde(with = "crate::lotus_json::stringify")] BigInt);
+pub struct BigIntLotusJson(#[serde(with = "crate::utils::lotus_json::stringify")] BigInt);
impl HasLotusJson for BigInt {
type LotusJson = BigIntLotusJson;
diff --git a/src/lotus_json/cid.rs b/src/utils/lotus_json/cid.rs
similarity index 73%
rename from src/lotus_json/cid.rs
rename to src/utils/lotus_json/cid.rs
index 69c6bdad..aa2fa8da 100644
--- a/src/lotus_json/cid.rs
+++ b/src/utils/lotus_json/cid.rs
@@ -1,11 +1,8 @@
-// Copyright 2019-2024 ChainSafe Systems
-// SPDX-License-Identifier: Apache-2.0, MIT
-
use super::*;
#[derive(Clone, Serialize, Deserialize)]
pub struct CidLotusJson {
- #[serde(rename = "/", with = "crate::lotus_json::stringify")]
+ #[serde(rename = "/", with = "crate::utils::lotus_json::stringify")]
slash: ::cid::Cid,
}
diff --git a/src/lotus_json/message.rs b/src/utils/lotus_json/message.rs
similarity index 80%
rename from src/lotus_json/message.rs
rename to src/utils/lotus_json/message.rs
index 4d968a30..dd874280 100644
--- a/src/lotus_json/message.rs
+++ b/src/utils/lotus_json/message.rs
@@ -1,35 +1,30 @@
-// Copyright 2019-2024 ChainSafe Systems
-// SPDX-License-Identifier: Apache-2.0, MIT
-
use super::*;
-
-use crate::message::Message;
use fvm_ipld_encoding::RawBytes;
-use fvm_shared::{address::Address, econ::TokenAmount};
+use fvm_shared::{address::Address, econ::TokenAmount, message::Message};
#[derive(Clone, Serialize, Deserialize)]
#[serde(rename_all = "PascalCase")]
pub struct MessageLotusJson {
#[serde(default)]
version: u64,
- #[serde(with = "crate::lotus_json")]
+ #[serde(with = "crate::utils::lotus_json")]
to: Address,
- #[serde(with = "crate::lotus_json")]
+ #[serde(with = "crate::utils::lotus_json")]
from: Address,
#[serde(default)]
nonce: u64,
- #[serde(with = "crate::lotus_json", default)]
+ #[serde(with = "crate::utils::lotus_json", default)]
value: TokenAmount,
#[serde(default)]
gas_limit: u64,
- #[serde(with = "crate::lotus_json", default)]
+ #[serde(with = "crate::utils::lotus_json", default)]
gas_fee_cap: TokenAmount,
- #[serde(with = "crate::lotus_json", default)]
+ #[serde(with = "crate::utils::lotus_json", default)]
gas_premium: TokenAmount,
#[serde(default)]
method: u64,
#[serde(
- with = "crate::lotus_json",
+ with = "crate::utils::lotus_json",
skip_serializing_if = "Option::is_none",
default
)]
diff --git a/src/lotus_json/mod.rs b/src/utils/lotus_json/mod.rs
similarity index 98%
rename from src/lotus_json/mod.rs
rename to src/utils/lotus_json/mod.rs
index 3376535a..4b09ec57 100644
--- a/src/lotus_json/mod.rs
+++ b/src/utils/lotus_json/mod.rs
@@ -1,6 +1,3 @@
-// Copyright 2019-2024 ChainSafe Systems
-// SPDX-License-Identifier: Apache-2.0, MIT
-
//! In the Filecoin ecosystem, there are TWO different ways to present a domain object:
//! - CBOR (defined in [`fvm_ipld_encoding`]).
//! This is the wire format.
@@ -169,11 +166,12 @@ mod message;
mod opt;
mod signature;
mod signature_type;
-mod signed_message;
mod token_amount;
mod vec;
mod vec_u8;
+pub mod signed_message;
+
// 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
@@ -185,7 +183,7 @@ mod raw_bytes; // fvm_ipld_encoding::RawBytes: !quickcheck::Arbitrary
#[serde(rename_all = "PascalCase")]
pub struct MessageLookup {
pub height: i64,
- #[serde(with = "crate::lotus_json")]
+ #[serde(with = "crate::utils::lotus_json")]
pub message: Cid,
}
lotus_json_with_self!(MessageLookup);
@@ -361,7 +359,7 @@ impl LotusJson {
macro_rules! lotus_json_with_self {
($($domain_ty:ty),* $(,)?) => {
$(
- impl $crate::lotus_json::HasLotusJson for $domain_ty {
+ impl $crate::utils::lotus_json::HasLotusJson for $domain_ty {
type LotusJson = Self;
fn into_lotus_json(self) -> Self::LotusJson {
self
diff --git a/src/lotus_json/opt.rs b/src/utils/lotus_json/opt.rs
similarity index 85%
rename from src/lotus_json/opt.rs
rename to src/utils/lotus_json/opt.rs
index b066e1d4..40447fd6 100644
--- a/src/lotus_json/opt.rs
+++ b/src/utils/lotus_json/opt.rs
@@ -1,6 +1,3 @@
-// Copyright 2019-2024 ChainSafe Systems
-// SPDX-License-Identifier: Apache-2.0, MIT
-
use super::*;
// TODO(forest): https://github.com/ChainSafe/forest/issues/4032
diff --git a/src/lotus_json/raw_bytes.rs b/src/utils/lotus_json/raw_bytes.rs
similarity index 80%
rename from src/lotus_json/raw_bytes.rs
rename to src/utils/lotus_json/raw_bytes.rs
index 15452512..a89ae924 100644
--- a/src/lotus_json/raw_bytes.rs
+++ b/src/utils/lotus_json/raw_bytes.rs
@@ -1,6 +1,3 @@
-// Copyright 2019-2024 ChainSafe Systems
-// SPDX-License-Identifier: Apache-2.0, MIT
-
use super::{vec_u8::VecU8LotusJson, *};
use fvm_ipld_encoding::RawBytes;
diff --git a/src/lotus_json/signature.rs b/src/utils/lotus_json/signature.rs
similarity index 80%
rename from src/lotus_json/signature.rs
rename to src/utils/lotus_json/signature.rs
index 9f301ce6..3f3a390b 100644
--- a/src/lotus_json/signature.rs
+++ b/src/utils/lotus_json/signature.rs
@@ -1,15 +1,12 @@
-// Copyright 2019-2024 ChainSafe Systems
-// SPDX-License-Identifier: Apache-2.0, MIT
-
use super::*;
use fvm_shared::crypto::signature::{Signature, SignatureType};
#[derive(Clone, Serialize, Deserialize)]
#[serde(rename_all = "PascalCase")]
pub struct SignatureLotusJson {
- #[serde(with = "crate::lotus_json")]
+ #[serde(with = "crate::utils::lotus_json")]
r#type: SignatureType,
- #[serde(with = "crate::lotus_json")]
+ #[serde(with = "crate::utils::lotus_json")]
data: Vec,
}
diff --git a/src/lotus_json/signature_type.rs b/src/utils/lotus_json/signature_type.rs
similarity index 86%
rename from src/lotus_json/signature_type.rs
rename to src/utils/lotus_json/signature_type.rs
index b528fac7..76aeabee 100644
--- a/src/lotus_json/signature_type.rs
+++ b/src/utils/lotus_json/signature_type.rs
@@ -1,6 +1,3 @@
-// Copyright 2019-2024 ChainSafe Systems
-// SPDX-License-Identifier: Apache-2.0, MIT
-
use super::*;
use fvm_shared::crypto::signature::SignatureType;
@@ -15,7 +12,7 @@ use fvm_shared::crypto::signature::SignatureType;
#[serde(untagged)] // try an int, then a string
pub enum SignatureTypeLotusJson {
Integer(SignatureType),
- // String(#[serde(with = "crate::lotus_json::stringify")] SignatureType),
+ // String(#[serde(with = "crate::utils::lotus_json::stringify")] SignatureType),
}
impl HasLotusJson for SignatureType {
diff --git a/src/utils/lotus_json/signed_message.rs b/src/utils/lotus_json/signed_message.rs
new file mode 100644
index 00000000..f32c7bf4
--- /dev/null
+++ b/src/utils/lotus_json/signed_message.rs
@@ -0,0 +1,82 @@
+use super::HasLotusJson;
+use ::cid::Cid;
+use fvm_ipld_encoding::Error;
+use fvm_shared::crypto::signature::Signature;
+use fvm_shared::crypto::signature::SignatureType;
+use fvm_shared::message::Message;
+use multihash_codetable::{Code, MultihashDigest as _};
+use serde::{Deserialize, Serialize};
+
+#[derive(PartialEq, Clone, Debug, Serialize, Deserialize, Hash, Eq)]
+pub struct SignedMessage {
+ pub message: Message,
+ pub signature: Signature,
+}
+
+fn from_cbor_blake2b256(obj: &S) -> Result {
+ let bytes = fvm_ipld_encoding::to_vec(obj)?;
+ Ok(Cid::new_v1(
+ fvm_ipld_encoding::DAG_CBOR,
+ Code::Blake2b256.digest(&bytes),
+ ))
+}
+pub fn message_cid(msg: &Message) -> Cid {
+ from_cbor_blake2b256(msg).expect("message serialization is infallible")
+}
+
+impl SignedMessage {
+ /// Checks if the signed message is a BLS message.
+ pub fn is_bls(&self) -> bool {
+ self.signature.signature_type() == SignatureType::BLS
+ }
+
+ // Important note: `msg.cid()` is different from
+ // `Cid::from_cbor_blake2b256(msg)`. The behavior comes from Lotus, and
+ // Lotus, by, definition, is correct.
+ pub fn cid(&self) -> Cid {
+ if self.is_bls() {
+ message_cid(&self.message)
+ } else {
+ from_cbor_blake2b256(self).expect("message serialization is infallible")
+ }
+ }
+}
+
+#[derive(Clone, Serialize, Deserialize)]
+#[serde(rename_all = "PascalCase")]
+pub struct SignedMessageLotusJson {
+ #[serde(with = "crate::utils::lotus_json")]
+ message: Message,
+ #[serde(with = "crate::utils::lotus_json")]
+ signature: Signature,
+ #[serde(
+ with = "crate::utils::lotus_json",
+ rename = "CID",
+ skip_serializing_if = "Option::is_none",
+ default
+ )]
+ cid: Option,
+}
+
+impl HasLotusJson for SignedMessage {
+ type LotusJson = SignedMessageLotusJson;
+
+ fn into_lotus_json(self) -> Self::LotusJson {
+ let cid = Some(self.cid());
+ let Self { message, signature } = self;
+ Self::LotusJson {
+ message,
+ signature,
+ cid,
+ }
+ }
+
+ fn from_lotus_json(lotus_json: Self::LotusJson) -> Self {
+ let Self::LotusJson {
+ message,
+ signature,
+ cid: _ignored, // See notes on Message
+ } = lotus_json;
+ Self { message, signature }
+ }
+}
diff --git a/src/lotus_json/token_amount.rs b/src/utils/lotus_json/token_amount.rs
similarity index 82%
rename from src/lotus_json/token_amount.rs
rename to src/utils/lotus_json/token_amount.rs
index d300a7ff..d7d0e19c 100644
--- a/src/lotus_json/token_amount.rs
+++ b/src/utils/lotus_json/token_amount.rs
@@ -1,6 +1,3 @@
-// Copyright 2019-2024 ChainSafe Systems
-// SPDX-License-Identifier: Apache-2.0, MIT
-
use super::*;
use fvm_shared::bigint::BigInt;
use fvm_shared::econ::TokenAmount;
@@ -8,7 +5,7 @@ use fvm_shared::econ::TokenAmount;
#[derive(Clone, Serialize, Deserialize)]
#[serde(transparent)] // name the field for clarity
pub struct TokenAmountLotusJson {
- #[serde(with = "crate::lotus_json")]
+ #[serde(with = "crate::utils::lotus_json")]
attos: BigInt,
}
diff --git a/src/lotus_json/vec.rs b/src/utils/lotus_json/vec.rs
similarity index 94%
rename from src/lotus_json/vec.rs
rename to src/utils/lotus_json/vec.rs
index 8a802b0a..56ba8da7 100644
--- a/src/lotus_json/vec.rs
+++ b/src/utils/lotus_json/vec.rs
@@ -1,6 +1,3 @@
-// Copyright 2019-2024 ChainSafe Systems
-// SPDX-License-Identifier: Apache-2.0, MIT
-
use super::*;
impl HasLotusJson for Vec
diff --git a/src/lotus_json/vec_u8.rs b/src/utils/lotus_json/vec_u8.rs
similarity index 89%
rename from src/lotus_json/vec_u8.rs
rename to src/utils/lotus_json/vec_u8.rs
index 84aa3ccd..19b9b3a3 100644
--- a/src/lotus_json/vec_u8.rs
+++ b/src/utils/lotus_json/vec_u8.rs
@@ -1,6 +1,3 @@
-// Copyright 2019-2024 ChainSafe Systems
-// SPDX-License-Identifier: Apache-2.0, MIT
-
use super::*;
// This code looks odd so we can
diff --git a/src/utils/message.rs b/src/utils/message.rs
new file mode 100644
index 00000000..74452cce
--- /dev/null
+++ b/src/utils/message.rs
@@ -0,0 +1,18 @@
+use fvm_ipld_encoding::RawBytes;
+use fvm_shared::message::Message;
+use fvm_shared::{address::Address, econ::TokenAmount, METHOD_SEND};
+
+pub fn message_transfer(from: Address, to: Address, value: TokenAmount) -> Message {
+ Message {
+ from,
+ to,
+ value,
+ method_num: METHOD_SEND,
+ params: RawBytes::new(vec![]),
+ gas_limit: 0,
+ gas_fee_cap: TokenAmount::from_atto(0),
+ gas_premium: TokenAmount::from_atto(0),
+ version: 0,
+ sequence: 0,
+ }
+}
diff --git a/src/utils/mod.rs b/src/utils/mod.rs
new file mode 100644
index 00000000..ef28000c
--- /dev/null
+++ b/src/utils/mod.rs
@@ -0,0 +1,7 @@
+pub mod address;
+pub mod error;
+pub mod format;
+pub mod key;
+pub mod lotus_json;
+pub mod message;
+pub mod rpc_context;
diff --git a/src/rpc_context.rs b/src/utils/rpc_context.rs
similarity index 96%
rename from src/rpc_context.rs
rename to src/utils/rpc_context.rs
index cf15bd2f..7ba72b9b 100644
--- a/src/rpc_context.rs
+++ b/src/utils/rpc_context.rs
@@ -7,8 +7,7 @@ use reqwest::Client;
use serde_json::{json, Value};
use std::sync::LazyLock;
-use crate::lotus_json::{HasLotusJson, LotusJson};
-use crate::message::SignedMessage;
+use super::lotus_json::{signed_message::SignedMessage, HasLotusJson, LotusJson};
static CLIENT: LazyLock = LazyLock::new(Client::new);
@@ -173,7 +172,7 @@ impl Provider {
pub async fn state_search_msg(
&self,
msg: Cid,
- ) -> anyhow::Result> {
+ ) -> anyhow::Result> {
invoke_rpc_method(
&self.url,
"Filecoin.StateSearchMsg",
diff --git a/style/tailwind.css b/style/tailwind.css
index 53873041..4afeca5b 100644
--- a/style/tailwind.css
+++ b/style/tailwind.css
@@ -2,76 +2,175 @@
@tailwind components;
@tailwind utilities;
-/* HTML: