From da4545a70c097092c1be5634370cf0187b9dcfb3 Mon Sep 17 00:00:00 2001
From: Emilia Hane <elsaemiliaevahane@gmail.com>
Date: Wed, 22 Jan 2025 19:02:03 +0100
Subject: [PATCH 1/2] Add no_std support for reth-metrics

---
 crates/metrics/Cargo.toml         | 4 ++++
 crates/metrics/src/common/mpsc.rs | 6 +++---
 crates/metrics/src/lib.rs         | 1 +
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/crates/metrics/Cargo.toml b/crates/metrics/Cargo.toml
index df3c7fa2161a..326fc75bad4f 100644
--- a/crates/metrics/Cargo.toml
+++ b/crates/metrics/Cargo.toml
@@ -22,4 +22,8 @@ futures = { workspace = true, optional = true }
 tokio-util = { workspace = true, optional = true }
 
 [features]
+default = ["std"]
+std = [
+    "futures/std",
+]
 common = ["tokio", "futures", "tokio-util"]
diff --git a/crates/metrics/src/common/mpsc.rs b/crates/metrics/src/common/mpsc.rs
index 2de8ddf9d53d..0ada1e801a43 100644
--- a/crates/metrics/src/common/mpsc.rs
+++ b/crates/metrics/src/common/mpsc.rs
@@ -2,12 +2,12 @@
 //! sent, number of errors, etc.
 
 use crate::Metrics;
-use futures::Stream;
-use metrics::Counter;
-use std::{
+use core::{
     pin::Pin,
     task::{ready, Context, Poll},
 };
+use futures::Stream;
+use metrics::Counter;
 use tokio::sync::mpsc::{
     self,
     error::{SendError, TryRecvError, TrySendError},
diff --git a/crates/metrics/src/lib.rs b/crates/metrics/src/lib.rs
index a5411b617c9c..93ba9f26d1f3 100644
--- a/crates/metrics/src/lib.rs
+++ b/crates/metrics/src/lib.rs
@@ -12,6 +12,7 @@
 )]
 #![cfg_attr(not(test), warn(unused_crate_dependencies))]
 #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
+#![cfg_attr(not(feature = "std"), no_std)]
 
 /// Metrics derive macro.
 pub use metrics_derive::Metrics;

From b1782ad16afd0a2d617f72b8d7c6dc19f220adb1 Mon Sep 17 00:00:00 2001
From: Emilia Hane <elsaemiliaevahane@gmail.com>
Date: Wed, 22 Jan 2025 19:11:10 +0100
Subject: [PATCH 2/2] Exclude reth-payload-builder from wasm check

---
 .github/assets/check_wasm.sh      | 1 +
 crates/metrics/Cargo.toml         | 4 ----
 crates/metrics/src/common/mpsc.rs | 6 +++---
 crates/metrics/src/lib.rs         | 1 -
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/.github/assets/check_wasm.sh b/.github/assets/check_wasm.sh
index 1370e689cdb3..18f3a283331f 100755
--- a/.github/assets/check_wasm.sh
+++ b/.github/assets/check_wasm.sh
@@ -58,6 +58,7 @@ exclude_crates=(
   reth-invalid-block-hooks # reth-provider
   reth-libmdbx # mdbx
   reth-mdbx-sys # mdbx
+  reth-payload-builder # reth-metrics 
   reth-provider # tokio
   reth-prune # tokio
   reth-stages-api # reth-provider, reth-prune
diff --git a/crates/metrics/Cargo.toml b/crates/metrics/Cargo.toml
index 326fc75bad4f..df3c7fa2161a 100644
--- a/crates/metrics/Cargo.toml
+++ b/crates/metrics/Cargo.toml
@@ -22,8 +22,4 @@ futures = { workspace = true, optional = true }
 tokio-util = { workspace = true, optional = true }
 
 [features]
-default = ["std"]
-std = [
-    "futures/std",
-]
 common = ["tokio", "futures", "tokio-util"]
diff --git a/crates/metrics/src/common/mpsc.rs b/crates/metrics/src/common/mpsc.rs
index 0ada1e801a43..2de8ddf9d53d 100644
--- a/crates/metrics/src/common/mpsc.rs
+++ b/crates/metrics/src/common/mpsc.rs
@@ -2,12 +2,12 @@
 //! sent, number of errors, etc.
 
 use crate::Metrics;
-use core::{
+use futures::Stream;
+use metrics::Counter;
+use std::{
     pin::Pin,
     task::{ready, Context, Poll},
 };
-use futures::Stream;
-use metrics::Counter;
 use tokio::sync::mpsc::{
     self,
     error::{SendError, TryRecvError, TrySendError},
diff --git a/crates/metrics/src/lib.rs b/crates/metrics/src/lib.rs
index 93ba9f26d1f3..a5411b617c9c 100644
--- a/crates/metrics/src/lib.rs
+++ b/crates/metrics/src/lib.rs
@@ -12,7 +12,6 @@
 )]
 #![cfg_attr(not(test), warn(unused_crate_dependencies))]
 #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
-#![cfg_attr(not(feature = "std"), no_std)]
 
 /// Metrics derive macro.
 pub use metrics_derive::Metrics;