tentative vpn sessions

2025-03-11 14:39:20 +01:00
104 changed files with 1911 additions and 4343 deletions
@@ -100,6 +100,7 @@ jobs:
          cp target/release/nymvisor $OUTPUT_DIR
          cp target/release/nym-node $OUTPUT_DIR
          cp target/release/nym-cli $OUTPUT_DIR
+          cp target/release/explorer-api $OUTPUT_DIR
          if [ ${{ github.event_name == 'workflow_dispatch' && inputs.enable_deb == true }} = true ]; then
            cp target/debian/*.deb $OUTPUT_DIR
          fi
@@ -816,9 +816,9 @@ dependencies = [
 [[package]]
 name = "bls12_381"
 version = "0.8.0"
-source = "git+https://github.com/jstuczyn/bls12_381?branch=temp/experimental-serdect-updated#9bf520059cb28323fc51469cae86868ef4fa6fbd"
+source = "git+https://github.com/jstuczyn/bls12_381?branch=temp/experimental-serdect#22cd0a16b674af1629110a2dc8b6cf6c73ea4cd9"
 dependencies = [
- "digest 0.10.7",
+ "digest 0.9.0",
 "ff",
 "group",
 "pairing",
@@ -4786,7 +4786,7 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"

 [[package]]
 name = "nym-api"
-version = "1.1.54"
+version = "1.1.53"
 dependencies = [
 "anyhow",
 "async-trait",
@@ -4850,7 +4850,7 @@ dependencies = [
 "semver 1.0.26",
 "serde",
 "serde_json",
- "sha2 0.10.8",
+ "sha2 0.9.9",
 "sqlx",
 "tempfile",
 "tendermint 0.40.1",
@@ -4896,7 +4896,6 @@ dependencies = [
 "serde_json",
 "sha2 0.10.8",
 "tendermint 0.40.1",
- "tendermint-rpc",
 "thiserror 2.0.12",
 "time",
 "ts-rs",
@@ -4938,6 +4937,7 @@ dependencies = [
 "nym-gateway-storage",
 "nym-id",
 "nym-network-defaults",
+ "nym-node-metrics",
 "nym-sdk",
 "nym-service-provider-requests-common",
 "nym-service-providers-common",
@@ -5036,7 +5036,7 @@ dependencies = [

 [[package]]
 name = "nym-cli"
-version = "1.1.51"
+version = "1.1.50"
 dependencies = [
 "anyhow",
 "base64 0.22.1",
@@ -5119,7 +5119,7 @@ dependencies = [

 [[package]]
 name = "nym-client"
-version = "1.1.51"
+version = "1.1.50"
 dependencies = [
 "bs58",
 "clap",
@@ -5331,7 +5331,7 @@ dependencies = [
 "bs58",
 "cfg-if",
 "criterion",
- "digest 0.10.7",
+ "digest 0.9.0",
 "ff",
 "group",
 "itertools 0.14.0",
@@ -5340,7 +5340,7 @@ dependencies = [
 "rand 0.8.5",
 "rayon",
 "serde",
- "sha2 0.10.8",
+ "sha2 0.9.9",
 "subtle 2.6.1",
 "thiserror 2.0.12",
 "zeroize",
@@ -5613,7 +5613,7 @@ dependencies = [
 "rand_core 0.6.4",
 "serde",
 "serde_derive",
- "sha2 0.10.8",
+ "sha2 0.9.9",
 "thiserror 2.0.12",
 "zeroize",
 ]
@@ -6163,7 +6163,7 @@ dependencies = [

 [[package]]
 name = "nym-network-requester"
-version = "1.1.52"
+version = "1.1.51"
 dependencies = [
 "addr",
 "anyhow",
@@ -6214,7 +6214,7 @@ dependencies = [

 [[package]]
 name = "nym-node"
-version = "1.7.0"
+version = "1.6.2"
 dependencies = [
 "anyhow",
 "arc-swap",
@@ -6241,7 +6241,6 @@ dependencies = [
 "nym-crypto",
 "nym-gateway",
 "nym-gateway-stats-storage",
- "nym-http-api-client",
 "nym-http-api-common",
 "nym-ip-packet-router",
 "nym-metrics",
@@ -6356,7 +6355,6 @@ dependencies = [
 "nym-contracts-common",
 "nym-crypto",
 "nym-explorer-client",
- "nym-http-api-client",
 "nym-network-defaults",
 "nym-node-metrics",
 "nym-node-requests",
@@ -6601,7 +6599,7 @@ dependencies = [

 [[package]]
 name = "nym-socks5-client"
-version = "1.1.51"
+version = "1.1.50"
 dependencies = [
 "bs58",
 "clap",
@@ -7206,7 +7204,7 @@ dependencies = [

 [[package]]
 name = "nymvisor"
-version = "0.1.16"
+version = "0.1.15"
 dependencies = [
 "anyhow",
 "bytes",
@@ -7236,7 +7234,7 @@ dependencies = [

 [[package]]
 name = "nyx-chain-watcher"
-version = "0.1.14"
+version = "0.1.12"
 dependencies = [
 "anyhow",
 "async-trait",
@@ -7246,12 +7244,15 @@ dependencies = [
 "nym-bin-common",
 "nym-config",
 "nym-network-defaults",
+ "nym-node-requests",
 "nym-task",
 "nym-validator-client",
 "nyxd-scraper",
 "reqwest 0.12.4",
+ "rocket",
 "schemars",
 "serde",
+ "serde_json",
 "sqlx",
 "thiserror 2.0.12",
 "time",
@@ -8605,9 +8606,9 @@ dependencies = [

 [[package]]
 name = "rs_merkle"
-version = "1.5.0"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb09b49230ba22e8c676e7b75dfe2887dea8121f18b530ae0ba519ce442d2b21"
+checksum = "3b241d2e59b74ef9e98d94c78c47623d04c8392abaf82014dfd372a16041128f"
 dependencies = [
 "sha2 0.10.8",
 ]
@@ -11265,24 +11266,6 @@ dependencies = [
 "serde",
 ]

-[[package]]
-name = "validator-status-check"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "clap",
- "comfy-table",
- "nym-bin-common",
- "nym-network-defaults",
- "nym-validator-client",
- "serde",
- "serde_json",
- "strum 0.26.3",
- "time",
- "tokio",
- "tracing",
-]
-
 [[package]]
 name = "valuable"
 version = "0.1.1"
@@ -137,7 +137,7 @@ members = [
    "tools/internal/testnet-manager",
    "tools/internal/testnet-manager",
    "tools/internal/testnet-manager/dkg-bypass-contract",
-    "tools/internal/testnet-manager/dkg-bypass-contract", "tools/internal/validator-status-check",
+    "tools/internal/testnet-manager/dkg-bypass-contract",
    "tools/nym-cli",
    "tools/nym-id-cli",
    "tools/nym-nr-query",
@@ -308,7 +308,7 @@ reqwest = { version = "0.12.4", default-features = false }
 rocket = "0.5.0"
 rocket_cors = "0.6.0"
 rocket_okapi = "0.8.0"
-rs_merkle = "1.5.0"
+rs_merkle = "1.4.2"
 safer-ffi = "0.1.13"
 schemars = "0.8.22"
 semver = "1.0.26"
@@ -370,7 +370,7 @@ prometheus = { version = "0.13.0" }
 # unfortunately until https://github.com/zkcrypto/bls12_381/issues/10 is resolved, we have to rely on the fork
 # as we need to be able to serialize Gt so that we could create the lookup table for baby-step-giant-step algorithm
 # plus to make our live easier we need serde support from https://github.com/zkcrypto/bls12_381/pull/125
-bls12_381 = { git = "https://github.com/jstuczyn/bls12_381", default-features = false, branch = "temp/experimental-serdect-updated" }
+bls12_381 = { git = "https://github.com/jstuczyn/bls12_381", default-features = false, branch = "temp/experimental-serdect" }
 group = { version = "0.13.0", default-features = false }
 ff = { version = "0.13.1", default-features = false }
 subtle = "2.5.0"
@@ -447,4 +447,4 @@ dbg_macro = "deny"
 exit = "deny"
 panic = "deny"
 unimplemented = "deny"
-unreachable = "deny"
+unreachable = "deny"
@@ -1,6 +1,6 @@
 [package]
 name = "nym-client"
-version = "1.1.51"
+version = "1.1.50"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>", "Jędrzej Stuczyński <andrew@nymtech.net>"]
 description = "Implementation of the Nym Client"
 edition = "2021"
@@ -1,6 +1,6 @@
 [package]
 name = "nym-socks5-client"
-version = "1.1.51"
+version = "1.1.50"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>"]
 description = "A SOCKS5 localhost proxy that converts incoming messages to Sphinx and sends them to a Nym address"
 edition = "2021"
@@ -139,8 +139,6 @@ where
    let gateway_setup = GatewaySetup::New {
        specification: selection_spec,
        available_gateways,
-        #[cfg(unix)]
-        connection_fd_callback: None,
    };

    let init_details =
@@ -187,8 +187,6 @@ where
    let gateway_setup = GatewaySetup::New {
        specification: selection_spec,
        available_gateways,
-        #[cfg(unix)]
-        connection_fd_callback: None,
    };

    let init_details =
@@ -11,8 +11,6 @@ use nym_topology::node::RoutingNode;
 use nym_validator_client::client::IdentityKeyRef;
 use nym_validator_client::UserAgent;
 use rand::{seq::SliceRandom, Rng};
-#[cfg(unix)]
-use std::os::fd::RawFd;
 use std::{sync::Arc, time::Duration};
 use tungstenite::Message;
 use url::Url;
@@ -315,15 +313,9 @@ pub(super) async fn register_with_gateway(
    gateway_id: identity::PublicKey,
    gateway_listener: Url,
    our_identity: Arc<identity::KeyPair>,
-    #[cfg(unix)] connection_fd_callback: Option<Arc<dyn Fn(RawFd) + Send + Sync>>,
 ) -> Result<RegistrationResult, ClientCoreError> {
-    let mut gateway_client = GatewayClient::new_init(
-        gateway_listener,
-        gateway_id,
-        our_identity.clone(),
-        #[cfg(unix)]
-        connection_fd_callback,
-    );
+    let mut gateway_client =
+        GatewayClient::new_init(gateway_listener, gateway_id, our_identity.clone());

    gateway_client.establish_connection().await.map_err(|err| {
        log::warn!("Failed to establish connection with gateway!");
@@ -23,8 +23,6 @@ use nym_topology::node::RoutingNode;
 use rand::rngs::OsRng;
 use rand::{CryptoRng, RngCore};
 use serde::Serialize;
-#[cfg(unix)]
-use std::{os::fd::RawFd, sync::Arc};

 pub mod helpers;
 pub mod types;
@@ -55,7 +53,6 @@ async fn setup_new_gateway<K, D>(
    details_store: &D,
    selection_specification: GatewaySelectionSpecification,
    available_gateways: Vec<RoutingNode>,
-    #[cfg(unix)] connection_fd_callback: Option<Arc<dyn Fn(RawFd) + Send + Sync>>,
 ) -> Result<InitialisationResult, ClientCoreError>
 where
    K: KeyStore,
@@ -111,14 +108,9 @@ where
            // if we're using a 'normal' gateway setup, do register
            let our_identity = client_keys.identity_keypair();

-            let registration = helpers::register_with_gateway(
-                gateway_id,
-                gateway_listener.clone(),
-                our_identity,
-                #[cfg(unix)]
-                connection_fd_callback,
-            )
-            .await?;
+            let registration =
+                helpers::register_with_gateway(gateway_id, gateway_listener.clone(), our_identity)
+                    .await?;
            (
                GatewayDetails::new_remote(
                    gateway_id,
@@ -211,19 +203,9 @@ where
        GatewaySetup::New {
            specification,
            available_gateways,
-            #[cfg(unix)]
-            connection_fd_callback,
        } => {
            log::debug!("GatewaySetup::New with spec: {specification:?}");
-            setup_new_gateway(
-                key_store,
-                details_store,
-                specification,
-                available_gateways,
-                #[cfg(unix)]
-                connection_fd_callback,
-            )
-            .await
+            setup_new_gateway(key_store, details_store, specification, available_gateways).await
        }
        GatewaySetup::ReuseConnection {
            authenticated_ephemeral_client,
@@ -18,8 +18,6 @@ use nym_validator_client::client::IdentityKey;
 use nym_validator_client::nyxd::AccountId;
 use serde::Serialize;
 use std::fmt::{Debug, Display};
-#[cfg(unix)]
-use std::os::fd::RawFd;
 use std::sync::Arc;
 use time::OffsetDateTime;
 use url::Url;
@@ -210,10 +208,6 @@ pub enum GatewaySetup {

        // TODO: seems to be a bit inefficient to pass them by value
        available_gateways: Vec<RoutingNode>,
-
-        /// Callback useful for allowing initial connection to gateway
-        #[cfg(unix)]
-        connection_fd_callback: Option<Arc<dyn Fn(RawFd) + Send + Sync>>,
    },

    ReuseConnection {
@@ -237,8 +231,6 @@ impl Debug for GatewaySetup {
            GatewaySetup::New {
                specification,
                available_gateways,
-                #[cfg(unix)]
-                    connection_fd_callback: _,
            } => f
                .debug_struct("GatewaySetup::New")
                .field("specification", specification)
@@ -278,8 +270,6 @@ impl GatewaySetup {
                additional_data: None,
            },
            available_gateways: vec![],
-            #[cfg(unix)]
-            connection_fd_callback: None,
        }
    }

@@ -1065,7 +1065,6 @@ impl GatewayClient<InitOnly, EphemeralCredentialStorage> {
        gateway_listener: Url,
        gateway_identity: identity::PublicKey,
        local_identity: Arc<identity::KeyPair>,
-        #[cfg(unix)] connection_fd_callback: Option<Arc<dyn Fn(RawFd) + Send + Sync>>,
    ) -> Self {
        log::trace!("Initialising gateway client");
        use futures::channel::mpsc;
@@ -1091,7 +1090,7 @@ impl GatewayClient<InitOnly, EphemeralCredentialStorage> {
            stats_reporter: ClientStatsSender::new(None, task_client.clone()),
            negotiated_protocol: None,
            #[cfg(unix)]
-            connection_fd_callback,
+            connection_fd_callback: None,
            task_client,
        }
    }
@@ -38,8 +38,7 @@ pub(crate) async fn connect_async(
            // Do a DNS lookup for the domain using our custom DNS resolver
            resolver
                .resolve_str(domain)
-                .await
-                .inspect_err(|err| tracing::error!("Resolve error {err}"))?
+                .await?
                .into_iter()
                .map(|a| SocketAddr::new(a, port))
                .collect()
@@ -50,27 +49,20 @@ pub(crate) async fn connect_async(
        address: endpoint.to_owned(),
    });
    for sock_addr in sock_addrs {
-        tracing::info!("Trying with {sock_addr}");
        let socket = if sock_addr.is_ipv4() {
            TcpSocket::new_v4()
        } else {
            TcpSocket::new_v6()
        }
-        .map_err(|err| {
-            tracing::error!("Couldn't create the socket");
-            GatewayClientError::NetworkConnectionFailed {
-                address: endpoint.to_owned(),
-                source: err.into(),
-            }
+        .map_err(|err| GatewayClientError::NetworkConnectionFailed {
+            address: endpoint.to_owned(),
+            source: err.into(),
        })?;

-        tracing::info!("Preparing to call callback");
        #[cfg(unix)]
        if let Some(callback) = connection_fd_callback.as_ref() {
-            tracing::info!("Calling callback");
            callback.as_ref()(socket.as_raw_fd());
        }
-        tracing::info!("Preparing to connect");

        match socket.connect(sock_addr).await {
            Ok(s) => {
@@ -83,12 +83,6 @@ impl TryFrom<ContractVKShare> for EcashApiClient {

        let url_address = Url::parse(&share.announce_address)?;

-        // The NymApiClient constructed here uses the default (hickory DoT/DoH) resolver because
-        // this EcashApiClient is used by both client and non-client applications.
-        //
-        // In non-client applications this resolver can cause warning logs about H2 connection
-        // failure. This indicates that the long lived https connection was closed by the remote
-        // peer and the resolver will have to reconnect. It should not impact actual functionality
        Ok(EcashApiClient {
            api_client: NymApiClient::new(url_address),
            verification_key: VerificationKeyAuth::try_from_bs58(&share.share)?,
@@ -12,9 +12,8 @@ use nym_api_requests::ecash::models::{
 };
 use nym_api_requests::ecash::VerificationKeyResponse;
 use nym_api_requests::models::{
-    AnnotationResponse, ApiHealthResponse, BinaryBuildInformationOwned, ChainStatusResponse,
-    LegacyDescribedMixNode, NodePerformanceResponse, NodeRefreshBody, NymNodeDescription,
-    PerformanceHistoryResponse, RewardedSetResponse,
+    AnnotationResponse, ApiHealthResponse, LegacyDescribedMixNode, NodePerformanceResponse,
+    NodeRefreshBody, NymNodeDescription, PerformanceHistoryResponse, RewardedSetResponse,
 };
 use nym_api_requests::nym_nodes::{
    NodesByAddressesRequestBody, NodesByAddressesResponse, PaginatedCachedNodesResponse,
@@ -70,19 +69,6 @@ pub trait NymApiClientExt: ApiClient {
        .await
    }

-    #[instrument(level = "debug", skip(self))]
-    async fn build_information(&self) -> Result<BinaryBuildInformationOwned, NymAPIError> {
-        self.get_json(
-            &[
-                routes::API_VERSION,
-                routes::API_STATUS_ROUTES,
-                routes::BUILD_INFORMATION,
-            ],
-            NO_PARAMS,
-        )
-        .await
-    }
-
    #[deprecated]
    #[instrument(level = "debug", skip(self))]
    async fn get_mixnodes(&self) -> Result<Vec<MixNodeDetails>, NymAPIError> {
@@ -1057,15 +1043,6 @@ pub trait NymApiClientExt: ApiClient {
        )
        .await
    }
-
-    #[instrument(level = "debug", skip(self))]
-    async fn get_chain_status(&self) -> Result<ChainStatusResponse, NymAPIError> {
-        self.get_json(
-            &[routes::API_VERSION, routes::NETWORK, routes::CHAIN_STATUS],
-            NO_PARAMS,
-        )
-        .await
-    }
 }

 #[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
@@ -49,8 +49,6 @@ pub mod nym_nodes {
 pub const STATUS_ROUTES: &str = "status";
 pub const API_STATUS_ROUTES: &str = "api-status";
 pub const HEALTH: &str = "health";
-pub const BUILD_INFORMATION: &str = "build-information";
-
 pub const MIXNODE: &str = "mixnode";
 pub const GATEWAY: &str = "gateway";
 pub const NYM_NODES: &str = "nym-nodes";
@@ -72,5 +70,4 @@ pub const SUBMIT_NODE: &str = "submit-node-monitoring-results";
 pub const SERVICE_PROVIDERS: &str = "services";

 pub const DETAILS: &str = "details";
-pub const CHAIN_STATUS: &str = "chain-status";
 pub const NETWORK: &str = "network";
@@ -62,7 +62,6 @@ pub use cw3;
 pub use cw4;
 pub use cw_controllers;
 pub use fee::{gas_price::GasPrice, GasAdjustable, GasAdjustment};
-pub use prost::Name;
 pub use tendermint_rpc::endpoint::block::Response as BlockResponse;
 pub use tendermint_rpc::{
    endpoint::{tx::Response as TxResponse, validators::Response as ValidatorResponse},
@@ -21,7 +21,7 @@ lazy_static = { workspace = true }
 rand = { workspace = true }
 rand_chacha = { workspace = true }
 rand_core = { workspace = true }
-sha2 = { workspace = true }
+sha2 = "0.9"
 serde = { workspace = true }
 serde_derive = { workspace = true }
 thiserror = { workspace = true }
@@ -54,12 +54,12 @@ pub(crate) fn hash_to_scalar<M: AsRef<[u8]>>(msg: M, domain: &[u8]) -> Scalar {
 pub(crate) fn hash_to_scalars<M: AsRef<[u8]>>(msg: M, domain: &[u8], n: usize) -> Vec<Scalar> {
    let mut output = vec![Scalar::zero(); n];

-    Scalar::hash_to_field::<ExpandMsgXmd<Sha256>, _>([msg], domain, &mut output);
+    Scalar::hash_to_field::<ExpandMsgXmd<Sha256>>(msg.as_ref(), domain, &mut output);
    output
 }

 pub(crate) fn hash_g2<M: AsRef<[u8]>>(msg: M, domain: &[u8]) -> G2Projective {
-    <G2Projective as HashToCurve<ExpandMsgXmd<Sha256>>>::hash_to_curve([msg], domain)
+    <G2Projective as HashToCurve<ExpandMsgXmd<Sha256>>>::hash_to_curve(msg, domain)
 }

 pub(crate) fn combine_scalar_chunks(chunks: &[Scalar]) -> Scalar {
@@ -112,97 +112,3 @@ pub(crate) fn deserialize_g2(b: &[u8]) -> Option<G2Projective> {
        G2Projective::from_bytes(&encoding).into()
    }
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use bls12_381::G2Affine;
-
-    #[test]
-    fn test_hash_to_scalar() {
-        let msg1 = "foo";
-        let expected1 = Scalar::from_bytes(&[
-            253, 57, 224, 227, 175, 195, 226, 82, 46, 175, 33, 126, 171, 239, 255, 92, 108, 168, 6,
-            79, 90, 11, 235, 236, 221, 10, 85, 133, 42, 81, 95, 30,
-        ])
-        .unwrap();
-
-        let msg2 = "bar";
-        let expected2 = Scalar::from_bytes(&[
-            48, 83, 69, 52, 42, 18, 135, 244, 211, 190, 160, 196, 118, 154, 24, 126, 0, 125, 72,
-            201, 170, 225, 123, 201, 52, 120, 171, 132, 235, 182, 20, 26,
-        ])
-        .unwrap();
-
-        let msg3 = [
-            33, 135, 76, 234, 71, 35, 247, 216, 39, 242, 42, 88, 152, 29, 74, 135, 9, 29, 216, 123,
-            250, 87, 108, 29, 245, 126, 109, 102, 84, 71, 158, 224, 145, 243, 49, 121, 244, 27,
-            115, 121, 25, 66, 216, 67, 97, 101, 140, 160, 77, 239, 114, 215, 152, 48, 15, 231, 101,
-            60, 42, 92, 128, 131, 161, 43,
-        ];
-        let expected3 = Scalar::from_bytes(&[
-            128, 189, 8, 43, 186, 55, 52, 61, 171, 196, 159, 177, 162, 100, 27, 143, 85, 83, 218,
-            171, 91, 220, 155, 25, 7, 38, 2, 36, 4, 93, 136, 4,
-        ])
-        .unwrap();
-
-        assert_eq!(
-            hash_to_scalar(msg1, b"NYMECASH-V01-CS02-with-expander-SHA256"),
-            expected1
-        );
-        assert_eq!(
-            hash_to_scalar(msg2, b"NYMECASH-V01-CS02-with-expander-SHA256"),
-            expected2
-        );
-        assert_eq!(
-            hash_to_scalar(msg3, b"NYMECASH-V01-CS02-with-expander-SHA256"),
-            expected3
-        );
-    }
-
-    #[test]
-    fn test_hash_g2() {
-        let msg1 = "foo";
-        let expected1 = G2Affine::from_compressed(&[
-            175, 187, 62, 7, 29, 17, 42, 93, 28, 93, 234, 253, 101, 166, 158, 187, 153, 82, 93, 18,
-            11, 233, 36, 107, 51, 117, 30, 127, 32, 254, 210, 77, 133, 12, 253, 255, 84, 128, 36,
-            214, 234, 103, 50, 21, 26, 78, 112, 49, 20, 69, 19, 109, 7, 78, 33, 227, 196, 180, 168,
-            219, 73, 251, 192, 221, 41, 138, 160, 131, 191, 186, 156, 117, 179, 179, 191, 235, 171,
-            26, 219, 148, 170, 179, 11, 38, 137, 14, 95, 115, 171, 186, 163, 82, 158, 6, 239, 88,
-        ])
-        .unwrap()
-        .into();
-
-        let msg2 = "bar";
-        let expected2 = G2Affine::from_compressed(&[
-            183, 25, 90, 187, 34, 184, 30, 182, 215, 242, 158, 83, 116, 34, 210, 96, 188, 79, 83,
-            255, 100, 122, 90, 188, 196, 93, 164, 253, 20, 106, 205, 33, 48, 140, 60, 149, 66, 246,
-            121, 244, 146, 66, 170, 60, 113, 95, 102, 237, 25, 231, 8, 42, 121, 124, 180, 140, 34,
-            104, 173, 251, 89, 189, 28, 196, 49, 66, 101, 38, 68, 44, 40, 235, 21, 35, 204, 123,
-            218, 238, 216, 92, 134, 217, 212, 246, 176, 77, 187, 0, 245, 134, 132, 73, 31, 44, 137,
-            197,
-        ])
-        .unwrap()
-        .into();
-        let msg3 = [
-            33, 135, 76, 234, 71, 35, 247, 216, 39, 242, 42, 88, 152, 29, 74, 135, 9, 29, 216, 123,
-            250, 87, 108, 29, 245, 126, 109, 102, 84, 71, 158, 224, 145, 243, 49, 121, 244, 27,
-            115, 121, 25, 66, 216, 67, 97, 101, 140, 160, 77, 239, 114, 215, 152, 48, 15, 231, 101,
-            60, 42, 92, 128, 131, 161, 43,
-        ];
-        let expected3 = G2Affine::from_compressed(&[
-            151, 185, 8, 123, 223, 150, 192, 192, 115, 10, 3, 129, 49, 179, 31, 108, 0, 17, 46,
-            231, 184, 164, 247, 228, 22, 142, 87, 70, 120, 111, 154, 15, 245, 110, 32, 84, 53, 117,
-            239, 93, 89, 119, 32, 17, 39, 250, 198, 137, 6, 95, 137, 202, 54, 244, 238, 190, 11,
-            217, 237, 95, 72, 59, 140, 56, 3, 42, 61, 195, 192, 101, 46, 204, 207, 75, 70, 176,
-            207, 48, 24, 195, 248, 234, 178, 168, 54, 109, 19, 189, 51, 52, 120, 69, 248, 226, 102,
-            91,
-        ])
-        .unwrap()
-        .into();
-
-        assert_eq!(hash_g2(msg1, b"DUMMY_TEST_DOMAIN"), expected1);
-        assert_eq!(hash_g2(msg2, b"DUMMY_TEST_DOMAIN"), expected2);
-        assert_eq!(hash_g2(msg3, b"DUMMY_TEST_DOMAIN"), expected3);
-    }
-}
@@ -10,7 +10,6 @@ use nym_sphinx::params::packet_sizes::PacketSize;
 use serde::{Deserialize, Serialize};
 use std::string::FromUtf8Error;
 use thiserror::Error;
-use time::OffsetDateTime;

 // specific errors (that should not be nested!!) for clients to match on
 #[derive(Debug, Copy, Clone, Error, Serialize, Deserialize)]
@@ -113,15 +112,15 @@ pub enum AuthenticationFailure {
    #[error("failed to verify request signature")]
    InvalidSignature(#[from] SignatureError),

+    #[error("provided request timestamp is in the future")]
+    RequestTimestampInFuture,
+
    #[error("the client is not registered")]
    NotRegistered,

-    #[error("the provided request timestamp is excessively skewed. got {received} whilst the server time is {server}")]
-    ExcessiveTimestampSkew {
-        received: OffsetDateTime,
-        server: OffsetDateTime,
-    },
+    #[error("the provided request is too stale to process")]
+    StaleRequest,

-    #[error("the provided request timestamp is smaller or equal to one previously used")]
+    #[error("the provided request timestamp is smaller or equal to a one previously used")]
    RequestReuse,
 }
@@ -38,22 +38,13 @@ impl AuthenticateRequest {
        })
    }

-    pub fn verify_timestamp(
-        &self,
-        max_request_timestamp_skew: Duration,
-    ) -> Result<(), AuthenticationFailure> {
+    pub fn verify_timestamp(&self, max_request_age: Duration) -> Result<(), AuthenticationFailure> {
        let now = OffsetDateTime::now_utc();
-        if self.content.request_timestamp() < now - max_request_timestamp_skew {
-            return Err(AuthenticationFailure::ExcessiveTimestampSkew {
-                received: self.content.request_timestamp(),
-                server: now,
-            });
+        if self.content.request_timestamp() + max_request_age < now {
+            return Err(AuthenticationFailure::StaleRequest);
        }
-        if self.content.request_timestamp() - max_request_timestamp_skew > now {
-            return Err(AuthenticationFailure::ExcessiveTimestampSkew {
-                received: self.content.request_timestamp(),
-                server: now,
-            });
+        if self.content.request_timestamp() > now {
+            return Err(AuthenticationFailure::RequestTimestampInFuture);
        }
        Ok(())
    }
@@ -1,6 +1,3 @@
-// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
 //! DNS resolver configuration for internal lookups.
 //!
 //! The resolver itself is the set combination of the google, cloudflare, and quad9 endpoints
@@ -12,19 +9,6 @@
 //!
 //! Requires the `dns-over-https-rustls`, `webpki-roots` feature for the
 //! `hickory-resolver` crate
-//!
-//!
-//! Note: The hickory DoH resolver can cause warning logs about H2 connection failure. This
-//! indicates that the long lived https connection was closed by the remote peer and the resolver
-//! will have to reconnect. It should not impact actual functionality.
-//!
-//! code ref: https://github.com/hickory-dns/hickory-dns/blob/06a8b1ce9bd9322d8e6accf857d30257e1274427/crates/proto/src/h2/h2_client_stream.rs#L534
-//!
-//! example log:
-//!
-//! ```txt
-//!   WARN /home/ubuntu/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/hickory-proto-0.24.3/src/h2/h2_client_stream.rs:493: h2 connection failed: unexpected end of file
-//! ```
 #![deny(missing_docs)]

 use crate::ClientBuilder;
@@ -49,13 +33,6 @@ impl ClientBuilder {
    /// Override the DNS resolver implementation used by the underlying http client.
    pub fn dns_resolver<R: Resolve + 'static>(mut self, resolver: Arc<R>) -> Self {
        self.reqwest_client_builder = self.reqwest_client_builder.dns_resolver(resolver);
-        self.use_secure_dns = false;
-        self
-    }
-
-    /// Override the DNS resolver implementation used by the underlying http client.
-    pub fn no_hickory_dns(mut self) -> Self {
-        self.use_secure_dns = false;
        self
    }
 }
@@ -228,8 +228,6 @@ pub struct ClientBuilder {
    timeout: Option<Duration>,
    custom_user_agent: bool,
    reqwest_client_builder: reqwest::ClientBuilder,
-    #[allow(dead_code)] // not dead code, just unused in wasm
-    use_secure_dns: bool,
 }

 impl ClientBuilder {
@@ -241,46 +239,37 @@ impl ClientBuilder {
        U: IntoUrl,
        E: Display,
    {
+        // a naive check: if the provided URL does not start with http(s), add that scheme
        let str_url = url.as_str();

-        // a naive check: if the provided URL does not start with http(s), add that scheme
        if !str_url.starts_with("http") {
            let alt = format!("http://{str_url}");
            warn!("the provided url ('{str_url}') does not contain scheme information. Changing it to '{alt}' ...");
            // TODO: or should we maybe default to https?
            Self::new(alt)
        } else {
-            Ok(Self::new_with_url(url.into_url()?))
-        }
-    }
+            #[cfg(target_arch = "wasm32")]
+            let reqwest_client_builder = reqwest::ClientBuilder::new();

-    /// Constructs a new http `ClientBuilder` from a valid url.
-    pub fn new_with_url(url: Url) -> Self {
-        if !url.scheme().starts_with("http") {
-            warn!("the provided url ('{url}') does not use HTTP / HTTPS scheme");
-        }
+            #[cfg(not(target_arch = "wasm32"))]
+            let reqwest_client_builder = {
+                let r = reqwest::ClientBuilder::new()
+                    .dns_resolver(Arc::new(HickoryDnsResolver::default()));

-        #[cfg(target_arch = "wasm32")]
-        let reqwest_client_builder = reqwest::ClientBuilder::new();
+                // Note this is extra as the `gzip` feature for `reqwest` crate should be enabled which
+                // `"Enable[s] auto gzip decompression by checking the Content-Encoding response header."`
+                //
+                // I am going to leave it here anyways so that gzip decompression is attempted even if
+                // that feature is removed.
+                r.gzip(true)
+            };

-        #[cfg(not(target_arch = "wasm32"))]
-        let reqwest_client_builder = {
-            let r = reqwest::ClientBuilder::new();
-
-            // Note this is extra as the `gzip` feature for `reqwest` crate should be enabled which
-            // `"Enable[s] auto gzip decompression by checking the Content-Encoding response header."`
-            //
-            // I am going to leave it here anyways so that gzip decompression is attempted even if
-            // that feature is removed.
-            r.gzip(true)
-        };
-
-        ClientBuilder {
-            url,
-            timeout: None,
-            custom_user_agent: false,
-            reqwest_client_builder,
-            use_secure_dns: true,
+            Ok(ClientBuilder {
+                url: url.into_url()?,
+                timeout: None,
+                custom_user_agent: false,
+                reqwest_client_builder,
+            })
        }
    }

@@ -336,18 +325,10 @@ impl ClientBuilder {
            let mut builder = self
                .reqwest_client_builder
                .timeout(self.timeout.unwrap_or(DEFAULT_TIMEOUT));
-
-            // if no custom user agent was set, use a default
            if !self.custom_user_agent {
                builder =
                    builder.user_agent(format!("nym-http-api-client/{}", env!("CARGO_PKG_VERSION")))
            }
-
-            // unless explicitly disabled use the DoT/DoH enabled resolver
-            if self.use_secure_dns {
-                builder = builder.dns_resolver(Arc::new(HickoryDnsResolver::default()));
-            }
-
            builder.build()?
        };

@@ -374,9 +355,6 @@ pub struct Client {
 impl Client {
    /// Create a new http `Client`
    // no timeout until https://github.com/seanmonstar/reqwest/issues/1135 is fixed
-    //
-    // In order to prevent interference in API requests at the DNS phase we default to a resolver
-    // that uses DoT and DoH.
    pub fn new(base_url: Url, timeout: Option<Duration>) -> Self {
        Self::new_url::<_, String>(base_url, timeout).expect(
            "we provided valid url and we were unwrapping previous construction errors anyway",
@@ -15,10 +15,10 @@ bls12_381 = { workspace = true, features = ["alloc", "pairings", "experimental",
 bincode.workspace = true
 cfg-if.workspace = true
 itertools = { workspace = true }
-digest = { workspace = true }
+digest = "0.9"
 rand = { workspace = true }
 thiserror = { workspace = true }
-sha2 = { workspace = true }
+sha2 = "0.9"
 bs58 = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 rayon = { workspace = true, optional = true }
@@ -113,13 +113,17 @@ const G1_HASH_DOMAIN: &[u8] = b"NYMECASH-V01-CS02-with-BLS12381G1_XMD:SHA-256_SS
 const SCALAR_HASH_DOMAIN: &[u8] = b"NYMECASH-V01-CS02-with-expander-SHA256";

 pub fn hash_g1<M: AsRef<[u8]>>(msg: M) -> G1Projective {
-    <G1Projective as HashToCurve<ExpandMsgXmd<sha2::Sha256>>>::hash_to_curve([msg], G1_HASH_DOMAIN)
+    <G1Projective as HashToCurve<ExpandMsgXmd<sha2::Sha256>>>::hash_to_curve(msg, G1_HASH_DOMAIN)
 }

 pub fn hash_to_scalar<M: AsRef<[u8]>>(msg: M) -> Scalar {
    let mut output = vec![Scalar::zero()];

-    Scalar::hash_to_field::<ExpandMsgXmd<sha2::Sha256>, _>([msg], SCALAR_HASH_DOMAIN, &mut output);
+    Scalar::hash_to_field::<ExpandMsgXmd<sha2::Sha256>>(
+        msg.as_ref(),
+        SCALAR_HASH_DOMAIN,
+        &mut output,
+    );
    output[0]
 }

@@ -397,75 +401,4 @@ mod tests {
        assert_eq!(hash_to_scalar(msg2), hash_to_scalar(msg2));
        assert_ne!(hash_to_scalar(msg1), hash_to_scalar(msg2));
    }
-
-    #[test]
-    fn test_hash_to_scalar() {
-        let msg1 = "foo";
-        let expected1 = Scalar::from_bytes(&[
-            253, 57, 224, 227, 175, 195, 226, 82, 46, 175, 33, 126, 171, 239, 255, 92, 108, 168, 6,
-            79, 90, 11, 235, 236, 221, 10, 85, 133, 42, 81, 95, 30,
-        ])
-        .unwrap();
-
-        let msg2 = "bar";
-        let expected2 = Scalar::from_bytes(&[
-            48, 83, 69, 52, 42, 18, 135, 244, 211, 190, 160, 196, 118, 154, 24, 126, 0, 125, 72,
-            201, 170, 225, 123, 201, 52, 120, 171, 132, 235, 182, 20, 26,
-        ])
-        .unwrap();
-
-        let msg3 = [
-            33, 135, 76, 234, 71, 35, 247, 216, 39, 242, 42, 88, 152, 29, 74, 135, 9, 29, 216, 123,
-            250, 87, 108, 29, 245, 126, 109, 102, 84, 71, 158, 224, 145, 243, 49, 121, 244, 27,
-            115, 121, 25, 66, 216, 67, 97, 101, 140, 160, 77, 239, 114, 215, 152, 48, 15, 231, 101,
-            60, 42, 92, 128, 131, 161, 43,
-        ];
-        let expected3 = Scalar::from_bytes(&[
-            128, 189, 8, 43, 186, 55, 52, 61, 171, 196, 159, 177, 162, 100, 27, 143, 85, 83, 218,
-            171, 91, 220, 155, 25, 7, 38, 2, 36, 4, 93, 136, 4,
-        ])
-        .unwrap();
-
-        assert_eq!(hash_to_scalar(msg1), expected1);
-        assert_eq!(hash_to_scalar(msg2), expected2);
-        assert_eq!(hash_to_scalar(msg3), expected3);
-    }
-
-    #[test]
-    fn test_hash_to_g1() {
-        let msg1 = "foo";
-        let expected1 = G1Affine::from_compressed(&[
-            161, 109, 186, 0, 192, 221, 83, 87, 71, 31, 120, 201, 185, 35, 62, 239, 46, 120, 117,
-            150, 191, 227, 128, 161, 78, 201, 207, 167, 86, 181, 229, 115, 2, 6, 178, 16, 251, 118,
-            219, 115, 184, 96, 2, 10, 31, 63, 150, 70,
-        ])
-        .unwrap()
-        .into();
-
-        let msg2 = "bar";
-        let expected2 = G1Affine::from_compressed(&[
-            135, 102, 204, 42, 221, 49, 209, 192, 250, 87, 59, 255, 197, 93, 37, 113, 38, 2, 154,
-            233, 68, 234, 206, 182, 121, 212, 166, 210, 74, 155, 190, 33, 203, 237, 176, 60, 249,
-            241, 53, 170, 18, 168, 49, 35, 1, 151, 205, 174,
-        ])
-        .unwrap()
-        .into();
-        let msg3 = [
-            33, 135, 76, 234, 71, 35, 247, 216, 39, 242, 42, 88, 152, 29, 74, 135, 9, 29, 216, 123,
-            250, 87, 108, 29, 245, 126, 109, 102, 84, 71, 158, 224, 145, 243, 49, 121, 244, 27,
-            115, 121, 25, 66, 216, 67, 97, 101, 140, 160, 77, 239, 114, 215, 152, 48, 15, 231, 101,
-            60, 42, 92, 128, 131, 161, 43,
-        ];
-        let expected3 = G1Affine::from_compressed(&[
-            184, 200, 211, 115, 47, 45, 39, 185, 105, 9, 222, 247, 132, 241, 121, 130, 238, 224,
-            155, 109, 105, 201, 137, 154, 132, 149, 214, 233, 136, 69, 77, 132, 174, 30, 46, 123,
-            20, 92, 219, 18, 45, 29, 208, 127, 158, 145, 130, 41,
-        ])
-        .unwrap()
-        .into();
-
-        assert_eq!(hash_g1(msg1), expected1);
-        assert_eq!(hash_g1(msg2), expected2);
-        assert_eq!(hash_g1(msg3), expected3);
-    }
 }
@@ -7,7 +7,7 @@ use nym_sphinx_addressing::clients::Recipient;
 use nym_sphinx_addressing::nodes::{NymNodeRoutingAddress, MAX_NODE_ADDRESS_UNPADDED_LEN};
 use nym_sphinx_params::packet_sizes::PacketSize;
 use nym_sphinx_params::{PacketType, ReplySurbKeyDigestAlgorithm};
-use nym_sphinx_types::{NymPacket, SURBMaterial, SphinxError, SURB};
+use nym_sphinx_types::{NymPacket, SURBMaterial, SphinxError, SURB, UPDATED_LEGACY_VERSION};
 use nym_topology::{NymRouteProvider, NymTopologyError};
 use rand::{CryptoRng, RngCore};
 use serde::de::{Error as SerdeError, Visitor};
@@ -101,7 +101,8 @@ impl ReplySurb {
        let delays = nym_sphinx_routing::generate_hop_delays(average_delay, route.len());
        let destination = recipient.as_sphinx_destination();

-        let surb_material = SURBMaterial::new(route, delays, destination);
+        let surb_material =
+            SURBMaterial::new(route, delays, destination).with_version(UPDATED_LEGACY_VERSION);

        // this can't fail as we know we have a valid route to gateway and have correct number of delays
        Ok(ReplySurb {
@@ -30,6 +30,7 @@ pub use sphinx_packet::{
    route::{Destination, DestinationAddressBytes, Node, NodeAddressBytes, SURBIdentifier},
    surb::{SURBMaterial, SURB},
    version::Version,
+    version::UPDATED_LEGACY_VERSION,
    Error as SphinxError, ProcessedPacket, ProcessedPacketData,
 };

@@ -90,8 +91,12 @@ impl NymPacket {
        destination: &Destination,
        delays: &[Delay],
    ) -> Result<NymPacket, NymPacketError> {
+        // FIXME:
+        // for now explicitly use the legacy version until sufficient number of nodes
+        // understand both variants
        Ok(NymPacket::Sphinx(
            SphinxPacketBuilder::new()
+                .with_version(UPDATED_LEGACY_VERSION)
                .with_payload_size(size)
                .build_packet(message, route, destination, delays)?,
        ))
@@ -182,11 +182,9 @@ impl BlockProcessor {
            // the ones concerned with individual messages
            for (index, msg) in block_tx.tx.body.messages.iter().enumerate() {
                for msg_module in &mut self.msg_modules {
-                    if msg.type_url == msg_module.type_url() {
-                        msg_module
-                            .handle_msg(index, msg, &block_tx, &mut tx)
-                            .await?
-                    }
+                    msg_module
+                        .handle_msg(index, msg, &block_tx, &mut tx)
+                        .await?
                }
            }
        }
@@ -83,15 +83,6 @@ pub enum ScraperError {
        source: cosmrs::ErrorReport,
    },

-    #[error("could not parse msg in tx {hash} at index {index} into {type_url}: {source}")]
-    MsgParseFailure {
-        hash: Hash,
-        index: usize,
-        type_url: String,
-        #[source]
-        source: cosmrs::ErrorReport,
-    },
-
    #[error("received an invalid chain subscription event of kind {kind} while we were waiting for new block data (query: '{query}')")]
    InvalidSubscriptionEvent { query: String, kind: String },

@@ -9,8 +9,6 @@ use cosmrs::Any;

 #[async_trait]
 pub trait MsgModule {
-    fn type_url(&self) -> String;
-
    async fn handle_msg(
        &mut self,
        index: usize,
@@ -103,8 +103,4 @@ impl LaneQueueLengthsInner {
    {
        self.map.entry(*lane).and_modify(f);
    }
-
-    pub fn total(&self) -> usize {
-        self.map.values().sum()
-    }
 }
@@ -1185,7 +1185,6 @@ name = "nym-pemstore"
 version = "0.3.0"
 dependencies = [
 "pem",
- "tracing",
 ]

 [[package]]
@@ -1252,12 +1251,6 @@ dependencies = [
 "regex",
 ]

-[[package]]
-name = "pin-project-lite"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
-
 [[package]]
 name = "pkcs8"
 version = "0.9.0"
@@ -1529,18 +1522,18 @@ dependencies = [

 [[package]]
 name = "semver"
-version = "1.0.26"
+version = "1.0.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0"
+checksum = "f79dfe2d285b0488816f30e700a7438c5a73d816b5b7d3ac72fbc48b0d185e03"
 dependencies = [
 "serde",
 ]

 [[package]]
 name = "serde"
-version = "1.0.219"
+version = "1.0.217"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
+checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
 dependencies = [
 "serde_derive",
 ]
@@ -1565,9 +1558,9 @@ dependencies = [

 [[package]]
 name = "serde_derive"
-version = "1.0.219"
+version = "1.0.217"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
+checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -1784,9 +1777,9 @@ dependencies = [

 [[package]]
 name = "time"
-version = "0.3.39"
+version = "0.3.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dad298b01a40a23aac4580b67e3dbedb7cc8402f3592d7f49469de2ea4aecdd8"
+checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21"
 dependencies = [
 "deranged",
 "itoa",
@@ -1801,15 +1794,15 @@ dependencies = [

 [[package]]
 name = "time-core"
-version = "0.1.3"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "765c97a5b985b7c11d7bc27fa927dc4fe6af3a6dfb021d28deb60d3bf51e76ef"
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"

 [[package]]
 name = "time-macros"
-version = "0.2.20"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8093bc3e81c3bc5f7879de09619d06c9a5a5e45ca44dfeeb7225bae38005c5c"
+checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de"
 dependencies = [
 "num-conv",
 "time-core",
@@ -1847,37 +1840,6 @@ dependencies = [
 "winnow",
 ]

-[[package]]
-name = "tracing"
-version = "0.1.41"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
-dependencies = [
- "pin-project-lite",
- "tracing-attributes",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-attributes"
-version = "0.1.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.98",
-]
-
-[[package]]
-name = "tracing-core"
-version = "0.1.33"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
-dependencies = [
- "once_cell",
-]
-
 [[package]]
 name = "typenum"
 version = "1.18.0"
@@ -102,8 +102,8 @@ pub struct Debug {

    pub zk_nym_tickets: ZkNymTicketHandlerDebug,

-    /// Defines the timestamp skew of a signed authentication request before it's deemed too excessive to process.
-    pub max_request_timestamp_skew: Duration,
+    /// Defines the maximum age of a signed authentication request before it's deemed too stale to process.
+    pub maximum_auth_request_age: Duration,
 }

 #[derive(Debug, Clone)]
@@ -14,11 +14,12 @@ use std::time::Duration;
 #[derive(Clone)]
 pub(crate) struct Config {
    pub(crate) enforce_zk_nym: bool,
-    pub(crate) max_request_timestamp_skew: Duration,
+    pub(crate) max_auth_request_age: Duration,

    pub(crate) bandwidth: BandwidthFlushingBehaviourConfig,
 }

+// I can see this being possible expanded with say storage or client store
 #[derive(Clone)]
 pub(crate) struct CommonHandlerState {
    pub(crate) cfg: Config,
@@ -131,6 +131,9 @@ impl<R, S> FreshHandler<R, S> {

    // for time being we assume handle is always constructed from raw socket.
    // if we decide we want to change it, that's not too difficult
+    // also at this point I'm not entirely sure how to deal with this warning without
+    // some considerable refactoring
+    #[allow(clippy::too_many_arguments)]
    pub(crate) fn new(
        rng: R,
        conn: S,
@@ -638,7 +641,7 @@ impl<R, S> FreshHandler<R, S> {

        // do cheap checks first
        // is the provided timestamp relatively recent (and not in the future?)
-        request.verify_timestamp(self.shared_state.cfg.max_request_timestamp_skew)?;
+        request.verify_timestamp(self.shared_state.cfg.max_auth_request_age)?;

        // does the message signature verify?
        request.verify_signature()?;
@@ -6,8 +6,9 @@ use crate::node::client_handling::websocket::connection_handler::FreshHandler;
 use nym_task::TaskClient;
 use rand::rngs::OsRng;
 use std::net::SocketAddr;
-use std::{io, process};
-use tokio::net::TcpStream;
+use std::process;
+use std::sync::atomic::{AtomicUsize, Ordering};
+use std::sync::Arc;
 use tokio::task::JoinHandle;
 use tracing::*;

@@ -33,76 +34,6 @@ impl Listener {
        }
    }

-    fn active_connections(&self) -> usize {
-        self.shared_state
-            .metrics
-            .network
-            .active_ingress_websocket_connections_count()
-    }
-
-    fn prepare_connection_handler(
-        &self,
-        socket: TcpStream,
-        remote_address: SocketAddr,
-    ) -> FreshHandler<OsRng, TcpStream> {
-        let shutdown = self
-            .shutdown
-            .fork(format!("websocket_handler_{remote_address}"));
-        FreshHandler::new(
-            OsRng,
-            socket,
-            self.shared_state.clone(),
-            remote_address,
-            shutdown,
-        )
-    }
-
-    fn try_handle_accepted_connection(&self, accepted: io::Result<(TcpStream, SocketAddr)>) {
-        match accepted {
-            Ok((socket, remote_address)) => {
-                trace!("received a socket connection from {remote_address}");
-
-                let active = self.active_connections();
-
-                // 1. check if we're within the connection limit
-                if active >= self.maximum_open_connections {
-                    warn!(
-                        "connection limit exceeded ({}). can't accept request from {remote_address}",
-                        self.maximum_open_connections
-                    );
-                    return;
-                }
-
-                debug!("there are currently {active} connected clients on the gateway websocket");
-
-                // 2. prepare shared data for the new connection handler
-                let handle = self.prepare_connection_handler(socket, remote_address);
-
-                // 3. increment the connection counter.
-                // make sure to do it before spawning the task,
-                // as another connection might get accepted before the task is scheduled
-                // for execution
-                self.shared_state
-                    .metrics
-                    .network
-                    .new_ingress_websocket_client();
-
-                // 4. spawn the task handling the client connection
-                tokio::spawn(async move {
-                    // TODO: refactor it similarly to the mixnet listener on the nym-node
-                    let metrics_ref = handle.shared_state.metrics.clone();
-
-                    // 4.1. handle all client requests until connection gets terminated
-                    handle.start_handling().await;
-
-                    // 4.2. decrement the connection counter
-                    metrics_ref.network.disconnected_ingress_websocket_client();
-                });
-            }
-            Err(err) => warn!("failed to accept client connection: {err}"),
-        }
-    }
-
    // TODO: change the signature to pub(crate) async fn run(&self, handler: Handler)

    pub(crate) async fn run(&mut self) {
@@ -115,6 +46,8 @@ impl Listener {
            }
        };

+        let open_connections = Arc::new(AtomicUsize::new(0));
+
        while !self.shutdown.is_shutdown() {
            tokio::select! {
                biased;
@@ -122,7 +55,38 @@ impl Listener {
                    trace!("client_handling::Listener: received shutdown");
                }
                connection = tcp_listener.accept() => {
-                    self.try_handle_accepted_connection(connection)
+                    match connection {
+                        Ok((socket, remote_addr)) => {
+                            let shutdown = self.shutdown.fork(format!("websocket_handler_{remote_addr}"));
+                            trace!("received a socket connection from {remote_addr}");
+
+                            if open_connections.fetch_add(1, Ordering::SeqCst) >= self.maximum_open_connections {
+                                warn!("connection limit exceeded ({}). can't accept request from {remote_addr}", self.maximum_open_connections);
+                                continue;
+                            }
+
+                            // TODO: I think we *REALLY* need a mechanism for having a maximum number of connected
+                            // clients or spawned tokio tasks -> perhaps a worker system?
+                            let handle = FreshHandler::new(
+                                OsRng,
+                                socket,
+                                self.shared_state.clone(),
+                                remote_addr,
+                                shutdown,
+                            );
+                            let open_connections = open_connections.clone();
+                            tokio::spawn(async move {
+                                // TODO: refactor it similarly to the mixnet listener on the nym-node
+                                let metrics_ref = handle.shared_state.metrics.clone();
+                                metrics_ref.network.new_ingress_websocket_client();
+                                open_connections.fetch_add(1, Ordering::SeqCst);
+                                handle.start_handling().await;
+                                metrics_ref.network.disconnected_ingress_websocket_client();
+                                open_connections.fetch_sub(1, Ordering::SeqCst);
+                            });
+                        }
+                        Err(err) => warn!("failed to get client: {err}"),
+                    }
                }

            }
@@ -251,7 +251,7 @@ impl GatewayTasksBuilder {
        let shared_state = websocket::CommonHandlerState {
            cfg: websocket::Config {
                enforce_zk_nym: self.config.gateway.enforce_zk_nyms,
-                max_request_timestamp_skew: self.config.debug.max_request_timestamp_skew,
+                max_auth_request_age: self.config.debug.maximum_auth_request_age,
                bandwidth: (&self.config).into(),
            },
            ecash_verifier: self.ecash_manager().await?,
@@ -434,6 +434,7 @@ impl GatewayTasksBuilder {
            used_private_network_ips,
        )
        .with_ecash_verifier(ecash_manager)
+        .with_metrics_event_sender(self.metrics_sender.clone())
        .with_custom_gateway_transceiver(transceiver)
        .with_shutdown(self.shutdown.fork("authenticator_sp"))
        .with_wait_for_gateway(true)
@@ -4,7 +4,7 @@
 [package]
 name = "nym-api"
 license = "GPL-3.0"
-version = "1.1.54"
+version = "1.1.53"
 authors.workspace = true
 edition = "2021"
 rust-version.workspace = true
@@ -141,7 +141,7 @@ tempfile = { workspace = true }
 cw3 = { workspace = true }
 cw-utils = { workspace = true }
 rand_chacha = { workspace = true }
-sha2 = { workspace = true }
+sha2 = "0.9"

 [lints]
 workspace = true
@@ -17,7 +17,6 @@ humantime-serde = { workspace = true }
 serde_json = { workspace = true }
 sha2.workspace = true
 tendermint = { workspace = true }
-tendermint-rpc = { workspace = true }
 thiserror.workspace = true
 time = { workspace = true, features = ["serde", "parsing", "formatting"] }
 ts-rs = { workspace = true, optional = true }
@@ -27,7 +27,9 @@ use nym_network_defaults::{DEFAULT_MIX_LISTENING_PORT, DEFAULT_VERLOC_LISTENING_
 use nym_node_requests::api::v1::authenticator::models::Authenticator;
 use nym_node_requests::api::v1::gateway::models::Wireguard;
 use nym_node_requests::api::v1::ip_packet_router::models::IpPacketRouter;
-use nym_node_requests::api::v1::node::models::{AuxiliaryDetails, NodeRoles};
+use nym_node_requests::api::v1::node::models::{
+    AuxiliaryDetails, BinaryBuildInformationOwned, NodeRoles,
+};
 use schemars::gen::SchemaGenerator;
 use schemars::schema::{InstanceType, Schema, SchemaObject};
 use schemars::JsonSchema;
@@ -41,8 +43,6 @@ use thiserror::Error;
 use time::{Date, OffsetDateTime};
 use utoipa::{IntoParams, ToResponse, ToSchema};

-pub use nym_node_requests::api::v1::node::models::BinaryBuildInformationOwned;
-
 #[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq, JsonSchema)]
 pub struct RequestError {
    message: String,
@@ -1215,7 +1215,6 @@ impl From<Wireguard> for WireguardDetails {
 #[derive(Clone, Copy, Debug, Serialize, Deserialize, schemars::JsonSchema, ToSchema)]
 pub struct ApiHealthResponse {
    pub status: ApiStatus,
-    #[serde(default)]
    pub chain_status: ChainStatus,
    pub uptime: u64,
 }
@@ -1226,11 +1225,10 @@ pub enum ApiStatus {
    Up,
 }

-#[derive(Clone, Copy, Debug, Serialize, Deserialize, Default, schemars::JsonSchema, ToSchema)]
+#[derive(Clone, Copy, Debug, Serialize, Deserialize, schemars::JsonSchema, ToSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum ChainStatus {
    Synced,
-    #[default]
    Unknown,
    Stalled {
        #[serde(
@@ -1430,297 +1428,7 @@ impl From<nym_mixnet_contract_common::EpochRewardedSet> for RewardedSetResponse
    }
 }

-#[derive(Clone, Serialize, Deserialize, JsonSchema, ToSchema)]
-pub struct ChainStatusResponse {
-    pub connected_nyxd: String,
-    pub status: DetailedChainStatus,
-}
-
-#[derive(Clone, Serialize, Deserialize, JsonSchema, ToSchema)]
-pub struct DetailedChainStatus {
-    pub abci: crate::models::tendermint_types::AbciInfo,
-    pub latest_block: BlockInfo,
-}
-
-#[derive(Clone, Serialize, Deserialize, JsonSchema, ToSchema)]
-pub struct BlockInfo {
-    pub block_id: BlockId,
-    pub block: FullBlockInfo,
-    // if necessary we might put block data here later too
-}
-
-impl From<tendermint_rpc::endpoint::block::Response> for BlockInfo {
-    fn from(value: tendermint_rpc::endpoint::block::Response) -> Self {
-        BlockInfo {
-            block_id: value.block_id.into(),
-            block: FullBlockInfo {
-                header: value.block.header.into(),
-            },
-        }
-    }
-}
-
-#[derive(Clone, Serialize, Deserialize, JsonSchema, ToSchema)]
-pub struct FullBlockInfo {
-    pub header: BlockHeader,
-}
-
-// copy tendermint types definitions whilst deriving schema types on them and dropping unwanted fields
-pub mod tendermint_types {
-    use schemars::JsonSchema;
-    use serde::{Deserialize, Serialize};
-    use tendermint::abci::response::Info;
-    use tendermint::block::header::Version;
-    use tendermint::{block, Hash};
-    use utoipa::ToSchema;
-
-    #[derive(Clone, Serialize, Deserialize, JsonSchema, ToSchema)]
-    pub struct AbciInfo {
-        /// Some arbitrary information.
-        pub data: String,
-
-        /// The application software semantic version.
-        pub version: String,
-
-        /// The application protocol version.
-        pub app_version: u64,
-
-        /// The latest block for which the app has called [`Commit`].
-        pub last_block_height: u64,
-
-        /// The latest result of [`Commit`].
-        pub last_block_app_hash: String,
-    }
-
-    impl From<Info> for AbciInfo {
-        fn from(value: Info) -> Self {
-            AbciInfo {
-                data: value.data,
-                version: value.version,
-                app_version: value.app_version,
-                last_block_height: value.last_block_height.value(),
-                last_block_app_hash: value.last_block_app_hash.to_string(),
-            }
-        }
-    }
-
-    /// `Version` contains the protocol version for the blockchain and the
-    /// application.
-    ///
-    /// <https://github.com/tendermint/spec/blob/d46cd7f573a2c6a2399fcab2cde981330aa63f37/spec/core/data_structures.md#version>
-    #[derive(
-        Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize, JsonSchema, ToSchema,
-    )]
-    pub struct HeaderVersion {
-        /// Block version
-        pub block: u64,
-
-        /// App version
-        pub app: u64,
-    }
-
-    impl From<tendermint::block::header::Version> for HeaderVersion {
-        fn from(value: Version) -> Self {
-            HeaderVersion {
-                block: value.block,
-                app: value.app,
-            }
-        }
-    }
-
-    /// Block identifiers which contain two distinct Merkle roots of the block,
-    /// as well as the number of parts in the block.
-    ///
-    /// <https://github.com/tendermint/spec/blob/d46cd7f573a2c6a2399fcab2cde981330aa63f37/spec/core/data_structures.md#blockid>
-    ///
-    /// Default implementation is an empty Id as defined by the Go implementation in
-    /// <https://github.com/tendermint/tendermint/blob/1635d1339c73ae6a82e062cd2dc7191b029efa14/types/block.go#L1204>.
-    ///
-    /// If the Hash is empty in BlockId, the BlockId should be empty (encoded to None).
-    /// This is implemented outside of this struct. Use the Default trait to check for an empty BlockId.
-    /// See: <https://github.com/informalsystems/tendermint-rs/issues/663>
-    #[derive(
-        Serialize,
-        Deserialize,
-        Copy,
-        Clone,
-        Debug,
-        Default,
-        Hash,
-        Eq,
-        PartialEq,
-        PartialOrd,
-        Ord,
-        JsonSchema,
-        ToSchema,
-    )]
-    pub struct BlockId {
-        /// The block's main hash is the Merkle root of all the fields in the
-        /// block header.
-        #[schemars(with = "String")]
-        #[schema(value_type = String)]
-        pub hash: Hash,
-
-        /// Parts header (if available) is used for secure gossipping of the block
-        /// during consensus. It is the Merkle root of the complete serialized block
-        /// cut into parts.
-        ///
-        /// PartSet is used to split a byteslice of data into parts (pieces) for
-        /// transmission. By splitting data into smaller parts and computing a
-        /// Merkle root hash on the list, you can verify that a part is
-        /// legitimately part of the complete data, and the part can be forwarded
-        /// to other peers before all the parts are known. In short, it's a fast
-        /// way to propagate a large file over a gossip network.
-        ///
-        /// <https://github.com/tendermint/tendermint/wiki/Block-Structure#partset>
-        ///
-        /// PartSetHeader in protobuf is defined as never nil using the gogoproto
-        /// annotations. This does not translate to Rust, but we can indicate this
-        /// in the domain type.
-        pub part_set_header: PartSetHeader,
-    }
-
-    impl From<block::Id> for BlockId {
-        fn from(value: block::Id) -> Self {
-            BlockId {
-                hash: value.hash,
-                part_set_header: value.part_set_header.into(),
-            }
-        }
-    }
-
-    /// Block parts header
-    #[derive(
-        Clone,
-        Copy,
-        Debug,
-        Default,
-        Hash,
-        Eq,
-        PartialEq,
-        PartialOrd,
-        Ord,
-        Deserialize,
-        Serialize,
-        JsonSchema,
-        ToSchema,
-    )]
-    #[non_exhaustive]
-    pub struct PartSetHeader {
-        /// Number of parts in this block
-        pub total: u32,
-
-        /// Hash of the parts set header,
-        #[schemars(with = "String")]
-        #[schema(value_type = String)]
-        pub hash: Hash,
-    }
-
-    impl From<tendermint::block::parts::Header> for PartSetHeader {
-        fn from(value: block::parts::Header) -> Self {
-            PartSetHeader {
-                total: value.total,
-                hash: value.hash,
-            }
-        }
-    }
-
-    /// Block `Header` values contain metadata about the block and about the
-    /// consensus, as well as commitments to the data in the current block, the
-    /// previous block, and the results returned by the application.
-    ///
-    /// <https://github.com/tendermint/spec/blob/d46cd7f573a2c6a2399fcab2cde981330aa63f37/spec/core/data_structures.md#header>
-    #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, JsonSchema, ToSchema)]
-    pub struct BlockHeader {
-        /// Header version
-        pub version: HeaderVersion,
-
-        /// Chain ID
-        pub chain_id: String,
-
-        /// Current block height
-        pub height: u64,
-
-        /// Current timestamp
-        #[schemars(with = "String")]
-        #[schema(value_type = String)]
-        pub time: tendermint::Time,
-
-        /// Previous block info
-        pub last_block_id: Option<BlockId>,
-
-        /// Commit from validators from the last block
-        #[schemars(with = "Option<String>")]
-        #[schema(value_type = Option<String>)]
-        pub last_commit_hash: Option<Hash>,
-
-        /// Merkle root of transaction hashes
-        #[schemars(with = "Option<String>")]
-        #[schema(value_type = Option<String>)]
-        pub data_hash: Option<Hash>,
-
-        /// Validators for the current block
-        #[schemars(with = "String")]
-        #[schema(value_type = String)]
-        pub validators_hash: Hash,
-
-        /// Validators for the next block
-        #[schemars(with = "String")]
-        #[schema(value_type = String)]
-        pub next_validators_hash: Hash,
-
-        /// Consensus params for the current block
-        #[schemars(with = "String")]
-        #[schema(value_type = String)]
-        pub consensus_hash: Hash,
-
-        /// State after txs from the previous block
-        #[schemars(with = "String")]
-        #[schema(value_type = String)]
-        pub app_hash: Hash,
-
-        /// Root hash of all results from the txs from the previous block
-        #[schemars(with = "Option<String>")]
-        #[schema(value_type = Option<String>)]
-        pub last_results_hash: Option<Hash>,
-
-        /// Hash of evidence included in the block
-        #[schemars(with = "Option<String>")]
-        #[schema(value_type = Option<String>)]
-        pub evidence_hash: Option<Hash>,
-
-        /// Original proposer of the block
-        #[serde(with = "nym_serde_helpers::hex")]
-        #[schemars(with = "String")]
-        #[schema(value_type = String)]
-        pub proposer_address: Vec<u8>,
-    }
-
-    impl From<block::Header> for BlockHeader {
-        fn from(value: block::Header) -> Self {
-            BlockHeader {
-                version: value.version.into(),
-                chain_id: value.chain_id.to_string(),
-                height: value.height.value(),
-                time: value.time,
-                last_block_id: value.last_block_id.map(Into::into),
-                last_commit_hash: value.last_commit_hash,
-                data_hash: value.data_hash,
-                validators_hash: value.validators_hash,
-                next_validators_hash: value.next_validators_hash,
-                consensus_hash: value.consensus_hash,
-                app_hash: Hash::try_from(value.app_hash.as_bytes().to_vec()).unwrap_or_default(),
-                last_results_hash: value.last_results_hash,
-                evidence_hash: value.evidence_hash,
-                proposer_address: value.proposer_address.as_bytes().to_vec(),
-            }
-        }
-    }
-}
-
-use crate::models::tendermint_types::{BlockHeader, BlockId};
 pub use config_score::*;
-
 pub mod config_score {
    use nym_contracts_common::NaiveFloat;
    use serde::{Deserialize, Serialize};
@@ -109,7 +109,7 @@ impl InternalCounters {

        // just hash the current counter
        self.tx_hash_counter += 1;
-        Hash::Sha256(sha2::Sha256::digest(self.tx_hash_counter.to_be_bytes()).into())
+        Hash::Sha256(sha2::Sha256::digest(&self.tx_hash_counter.to_be_bytes()).into())
    }

    #[allow(dead_code)]
@@ -1,12 +1,11 @@
 // Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: GPL-3.0-only

-use crate::network::models::{ContractInformation, NetworkDetails};
+use crate::network::models::{ChainStatusResponse, ContractInformation, NetworkDetails};
 use crate::node_status_api::models::AxumResult;
 use crate::support::http::state::AppState;
 use axum::extract::State;
 use axum::{extract, Json, Router};
-use nym_api_requests::models::ChainStatusResponse;
 use nym_contracts_common::ContractBuildInformation;
 use std::collections::HashMap;
 use tower_http::compression::CompressionLayer;
@@ -1,7 +1,9 @@
 // Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: GPL-3.0-only

+use crate::network::models::tendermint_types::{AbciInfo, BlockHeader, BlockId};
 use nym_config::defaults::NymNetworkDetails;
+use nym_validator_client::nyxd::BlockResponse;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use utoipa::ToSchema;
@@ -27,3 +29,292 @@ pub struct ContractInformation<T> {
    pub(crate) address: Option<String>,
    pub(crate) details: Option<T>,
 }
+
+#[derive(Clone, Serialize, Deserialize, JsonSchema, ToSchema)]
+pub struct ChainStatusResponse {
+    pub connected_nyxd: String,
+    pub status: ChainStatus,
+}
+
+#[derive(Clone, Serialize, Deserialize, JsonSchema, ToSchema)]
+pub struct ChainStatus {
+    pub abci: AbciInfo,
+    pub latest_block: BlockInfo,
+}
+
+#[derive(Clone, Serialize, Deserialize, JsonSchema, ToSchema)]
+pub struct BlockInfo {
+    pub block_id: BlockId,
+    pub block: FullBlockInfo,
+    // if necessary we might put block data here later too
+}
+
+impl From<BlockResponse> for BlockInfo {
+    fn from(value: BlockResponse) -> Self {
+        BlockInfo {
+            block_id: value.block_id.into(),
+            block: FullBlockInfo {
+                header: value.block.header.into(),
+            },
+        }
+    }
+}
+
+#[derive(Clone, Serialize, Deserialize, JsonSchema, ToSchema)]
+pub struct FullBlockInfo {
+    pub header: BlockHeader,
+}
+
+// copy tendermint types definitions whilst deriving schema types on them and dropping unwanted fields
+pub mod tendermint_types {
+    use nym_validator_client::nyxd::Hash;
+    use schemars::JsonSchema;
+    use serde::{Deserialize, Serialize};
+    use tendermint::abci::response::Info;
+    use tendermint::block;
+    use tendermint::block::header::Version;
+    use utoipa::ToSchema;
+
+    #[derive(Clone, Serialize, Deserialize, JsonSchema, ToSchema)]
+    pub struct AbciInfo {
+        /// Some arbitrary information.
+        pub data: String,
+
+        /// The application software semantic version.
+        pub version: String,
+
+        /// The application protocol version.
+        pub app_version: u64,
+
+        /// The latest block for which the app has called [`Commit`].
+        pub last_block_height: u64,
+
+        /// The latest result of [`Commit`].
+        pub last_block_app_hash: String,
+    }
+
+    impl From<Info> for AbciInfo {
+        fn from(value: Info) -> Self {
+            AbciInfo {
+                data: value.data,
+                version: value.version,
+                app_version: value.app_version,
+                last_block_height: value.last_block_height.value(),
+                last_block_app_hash: value.last_block_app_hash.to_string(),
+            }
+        }
+    }
+
+    /// `Version` contains the protocol version for the blockchain and the
+    /// application.
+    ///
+    /// <https://github.com/tendermint/spec/blob/d46cd7f573a2c6a2399fcab2cde981330aa63f37/spec/core/data_structures.md#version>
+    #[derive(
+        Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize, JsonSchema, ToSchema,
+    )]
+    pub struct HeaderVersion {
+        /// Block version
+        pub block: u64,
+
+        /// App version
+        pub app: u64,
+    }
+
+    impl From<tendermint::block::header::Version> for HeaderVersion {
+        fn from(value: Version) -> Self {
+            HeaderVersion {
+                block: value.block,
+                app: value.app,
+            }
+        }
+    }
+
+    /// Block identifiers which contain two distinct Merkle roots of the block,
+    /// as well as the number of parts in the block.
+    ///
+    /// <https://github.com/tendermint/spec/blob/d46cd7f573a2c6a2399fcab2cde981330aa63f37/spec/core/data_structures.md#blockid>
+    ///
+    /// Default implementation is an empty Id as defined by the Go implementation in
+    /// <https://github.com/tendermint/tendermint/blob/1635d1339c73ae6a82e062cd2dc7191b029efa14/types/block.go#L1204>.
+    ///
+    /// If the Hash is empty in BlockId, the BlockId should be empty (encoded to None).
+    /// This is implemented outside of this struct. Use the Default trait to check for an empty BlockId.
+    /// See: <https://github.com/informalsystems/tendermint-rs/issues/663>
+    #[derive(
+        Serialize,
+        Deserialize,
+        Copy,
+        Clone,
+        Debug,
+        Default,
+        Hash,
+        Eq,
+        PartialEq,
+        PartialOrd,
+        Ord,
+        JsonSchema,
+        ToSchema,
+    )]
+    pub struct BlockId {
+        /// The block's main hash is the Merkle root of all the fields in the
+        /// block header.
+        #[schemars(with = "String")]
+        #[schema(value_type = String)]
+        pub hash: Hash,
+
+        /// Parts header (if available) is used for secure gossipping of the block
+        /// during consensus. It is the Merkle root of the complete serialized block
+        /// cut into parts.
+        ///
+        /// PartSet is used to split a byteslice of data into parts (pieces) for
+        /// transmission. By splitting data into smaller parts and computing a
+        /// Merkle root hash on the list, you can verify that a part is
+        /// legitimately part of the complete data, and the part can be forwarded
+        /// to other peers before all the parts are known. In short, it's a fast
+        /// way to propagate a large file over a gossip network.
+        ///
+        /// <https://github.com/tendermint/tendermint/wiki/Block-Structure#partset>
+        ///
+        /// PartSetHeader in protobuf is defined as never nil using the gogoproto
+        /// annotations. This does not translate to Rust, but we can indicate this
+        /// in the domain type.
+        pub part_set_header: PartSetHeader,
+    }
+
+    impl From<block::Id> for BlockId {
+        fn from(value: block::Id) -> Self {
+            BlockId {
+                hash: value.hash,
+                part_set_header: value.part_set_header.into(),
+            }
+        }
+    }
+
+    /// Block parts header
+    #[derive(
+        Clone,
+        Copy,
+        Debug,
+        Default,
+        Hash,
+        Eq,
+        PartialEq,
+        PartialOrd,
+        Ord,
+        Deserialize,
+        Serialize,
+        JsonSchema,
+        ToSchema,
+    )]
+    #[non_exhaustive]
+    pub struct PartSetHeader {
+        /// Number of parts in this block
+        pub total: u32,
+
+        /// Hash of the parts set header,
+        #[schemars(with = "String")]
+        #[schema(value_type = String)]
+        pub hash: Hash,
+    }
+
+    impl From<tendermint::block::parts::Header> for PartSetHeader {
+        fn from(value: block::parts::Header) -> Self {
+            PartSetHeader {
+                total: value.total,
+                hash: value.hash,
+            }
+        }
+    }
+
+    /// Block `Header` values contain metadata about the block and about the
+    /// consensus, as well as commitments to the data in the current block, the
+    /// previous block, and the results returned by the application.
+    ///
+    /// <https://github.com/tendermint/spec/blob/d46cd7f573a2c6a2399fcab2cde981330aa63f37/spec/core/data_structures.md#header>
+    #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, JsonSchema, ToSchema)]
+    pub struct BlockHeader {
+        /// Header version
+        pub version: HeaderVersion,
+
+        /// Chain ID
+        pub chain_id: String,
+
+        /// Current block height
+        pub height: u64,
+
+        /// Current timestamp
+        #[schemars(with = "String")]
+        #[schema(value_type = String)]
+        pub time: tendermint::Time,
+
+        /// Previous block info
+        pub last_block_id: Option<BlockId>,
+
+        /// Commit from validators from the last block
+        #[schemars(with = "Option<String>")]
+        #[schema(value_type = Option<String>)]
+        pub last_commit_hash: Option<Hash>,
+
+        /// Merkle root of transaction hashes
+        #[schemars(with = "Option<String>")]
+        #[schema(value_type = Option<String>)]
+        pub data_hash: Option<Hash>,
+
+        /// Validators for the current block
+        #[schemars(with = "String")]
+        #[schema(value_type = String)]
+        pub validators_hash: Hash,
+
+        /// Validators for the next block
+        #[schemars(with = "String")]
+        #[schema(value_type = String)]
+        pub next_validators_hash: Hash,
+
+        /// Consensus params for the current block
+        #[schemars(with = "String")]
+        #[schema(value_type = String)]
+        pub consensus_hash: Hash,
+
+        /// State after txs from the previous block
+        #[schemars(with = "String")]
+        #[schema(value_type = String)]
+        pub app_hash: Hash,
+
+        /// Root hash of all results from the txs from the previous block
+        #[schemars(with = "Option<String>")]
+        #[schema(value_type = Option<String>)]
+        pub last_results_hash: Option<Hash>,
+
+        /// Hash of evidence included in the block
+        #[schemars(with = "Option<String>")]
+        #[schema(value_type = Option<String>)]
+        pub evidence_hash: Option<Hash>,
+
+        /// Original proposer of the block
+        #[serde(with = "nym_serde_helpers::hex")]
+        #[schemars(with = "String")]
+        #[schema(value_type = String)]
+        pub proposer_address: Vec<u8>,
+    }
+
+    impl From<block::Header> for BlockHeader {
+        fn from(value: block::Header) -> Self {
+            BlockHeader {
+                version: value.version.into(),
+                chain_id: value.chain_id.to_string(),
+                height: value.height.value(),
+                time: value.time,
+                last_block_id: value.last_block_id.map(Into::into),
+                last_commit_hash: value.last_commit_hash,
+                data_hash: value.data_hash,
+                validators_hash: value.validators_hash,
+                next_validators_hash: value.next_validators_hash,
+                consensus_hash: value.consensus_hash,
+                app_hash: Hash::try_from(value.app_hash.as_bytes().to_vec()).unwrap_or_default(),
+                last_results_hash: value.last_results_hash,
+                evidence_hash: value.evidence_hash,
+                proposer_address: value.proposer_address.as_bytes().to_vec(),
+            }
+        }
+    }
+}
@@ -191,7 +191,6 @@ async fn try_get_client(
        // if provided host was malformed, no point in continuing
        let client = match nym_node_requests::api::Client::builder(address).and_then(|b| {
            b.with_timeout(Duration::from_secs(5))
-                .no_hickory_dns()
                .with_user_agent("nym-api-describe-cache")
                .build()
        }) {
@@ -3,7 +3,7 @@

 use crate::circulating_supply_api::cache::CirculatingSupplyCache;
 use crate::ecash::state::EcashState;
-use crate::network::models::NetworkDetails;
+use crate::network::models::{ChainStatus, NetworkDetails};
 use crate::node_describe_cache::DescribedNodes;
 use crate::node_status_api::handlers::unstable;
 use crate::node_status_api::models::AxumErrorResponse;
@@ -15,9 +15,7 @@ use crate::support::caching::Cache;
 use crate::support::nyxd::Client;
 use crate::support::storage;
 use axum::extract::FromRef;
-use nym_api_requests::models::{
-    DetailedChainStatus, GatewayBondAnnotated, MixNodeBondAnnotated, NodeAnnotation,
-};
+use nym_api_requests::models::{GatewayBondAnnotated, MixNodeBondAnnotated, NodeAnnotation};
 use nym_mixnet_contract_common::NodeId;
 use nym_task::TaskManager;
 use nym_topology::CachedEpochRewardedSet;
@@ -153,7 +151,7 @@ impl ChainStatusCache {

 struct ChainStatusCacheInner {
    last_refreshed_at: OffsetDateTime,
-    cache_value: DetailedChainStatus,
+    cache_value: ChainStatus,
 }

 impl ChainStatusCacheInner {
@@ -169,7 +167,7 @@ impl ChainStatusCache {
    pub(crate) async fn get_or_refresh(
        &self,
        client: &Client,
-    ) -> Result<DetailedChainStatus, AxumErrorResponse> {
+    ) -> Result<ChainStatus, AxumErrorResponse> {
        if let Some(cached) = self.check_cache().await {
            return Ok(cached);
        }
@@ -177,7 +175,7 @@ impl ChainStatusCache {
        self.refresh(client).await
    }

-    async fn check_cache(&self) -> Option<DetailedChainStatus> {
+    async fn check_cache(&self) -> Option<ChainStatus> {
        let guard = self.inner.read().await;
        let inner = guard.as_ref()?;
        if inner.is_valid(self.cache_ttl) {
@@ -186,7 +184,7 @@ impl ChainStatusCache {
        None
    }

-    async fn refresh(&self, client: &Client) -> Result<DetailedChainStatus, AxumErrorResponse> {
+    async fn refresh(&self, client: &Client) -> Result<ChainStatus, AxumErrorResponse> {
        // 1. attempt to get write lock permit
        let mut guard = self.inner.write().await;

@@ -203,7 +201,7 @@ impl ChainStatusCache {
            .block_info(abci.last_block_height.value() as u32)
            .await?;

-        let status = DetailedChainStatus {
+        let status = ChainStatus {
            abci: abci.into(),
            latest_block: block.into(),
        };
@@ -29,7 +29,6 @@ nym-bin-common = { path = "../../common/bin-common", features = ["models"] }
 nym-node-status-client = { path = "../nym-node-status-client" }
 nym-crypto = { path = "../../common/crypto", features = ["asymmetric", "serde"] }
 nym-explorer-client = { path = "../../explorer-api/explorer-client" }
-nym-http-api-client = { path = "../../common/http-api-client" }
 nym-network-defaults = { path = "../../common/network-defaults" }
 nym-serde-helpers = { path = "../../common/serde-helpers"}
 nym-statistics-common = { path = "../../common/statistics" }
@@ -97,12 +97,8 @@ impl Monitor {
            .clone()
            .expect("rust sdk mainnet default missing api_url");

-        let nym_api = nym_http_api_client::ClientBuilder::new_with_url(default_api_url)
-            .no_hickory_dns()
-            .with_timeout(self.nym_api_client_timeout)
-            .build::<&str>()?;
-
-        let api_client = NymApiClient { nym_api };
+        let api_client =
+            NymApiClient::new_with_timeout(default_api_url, self.nym_api_client_timeout);

        let described_nodes = api_client
            .get_all_described_nodes()
@@ -57,12 +57,7 @@ async fn run(
        .clone()
        .expect("rust sdk mainnet default missing api_url");

-    let nym_api = nym_http_api_client::ClientBuilder::new_with_url(default_api_url)
-        .no_hickory_dns()
-        .with_timeout(nym_api_client_timeout)
-        .build::<&str>()?;
-
-    let api_client = NymApiClient { nym_api };
+    let api_client = NymApiClient::new_with_timeout(default_api_url, nym_api_client_timeout);

    //SW TBC what nodes exactly need to be scraped, the skimmed node endpoint seems to return more nodes
    let bonded_nodes = api_client.get_all_bonded_nym_nodes().await?;
@@ -175,7 +170,6 @@ impl MetricsScrapingData {
            let client = match nym_node_requests::api::Client::builder(address).and_then(|b| {
                b.with_timeout(Duration::from_secs(5))
                    .with_user_agent("node-status-api-metrics-scraper")
-                    .no_hickory_dns()
                    .build()
            }) {
                Ok(client) => client,
@@ -3,7 +3,7 @@

 [package]
 name = "nym-node"
-version = "1.7.0"
+version = "1.6.2"
 authors.workspace = true
 repository.workspace = true
 homepage.workspace = true
@@ -71,7 +71,7 @@ nym-verloc = { path = "../common/verloc" }
 nym-metrics = { path = "../common/nym-metrics" }
 nym-gateway-stats-storage = { path = "../common/gateway-stats-storage" }
 nym-topology = { path = "../common/topology" }
-nym-http-api-client = { path = "../common/http-api-client" }
+

 # http server
 # useful for `#[axum_macros::debug_handler]`
@@ -45,7 +45,7 @@ impl NetworkStats {

    pub fn active_ingress_websocket_connections_count(&self) -> usize {
        self.active_ingress_websocket_connections
-            .load(Ordering::SeqCst)
+            .load(Ordering::Relaxed)
    }

    pub fn active_egress_mixnet_connections_counter(&self) -> Arc<AtomicUsize> {
@@ -54,9 +54,8 @@ pub struct Debug {
    /// of the services providers
    pub minimum_mix_performance: u8,

-    /// Defines the timestamp skew of a signed authentication request before it's deemed too excessive to process.
-    #[serde(alias = "maximum_auth_request_age")]
-    pub max_request_timestamp_skew: Duration,
+    /// Defines the maximum age of a signed authentication request before it's deemed too stale to process.
+    pub maximum_auth_request_age: Duration,

    pub stale_messages: StaleMessageDebug,

@@ -68,7 +67,7 @@ pub struct Debug {
 impl Debug {
    pub const DEFAULT_MESSAGE_RETRIEVAL_LIMIT: i64 = 100;
    pub const DEFAULT_MINIMUM_MIX_PERFORMANCE: u8 = 50;
-    pub const DEFAULT_MAXIMUM_AUTH_REQUEST_TIMESTAMP_SKEW: Duration = Duration::from_secs(120);
+    pub const DEFAULT_MAXIMUM_AUTH_REQUEST_AGE: Duration = Duration::from_secs(30);
    pub const DEFAULT_MAXIMUM_OPEN_CONNECTIONS: usize = 8192;
 }

@@ -77,7 +76,7 @@ impl Default for Debug {
        Debug {
            message_retrieval_limit: Self::DEFAULT_MESSAGE_RETRIEVAL_LIMIT,
            maximum_open_connections: Self::DEFAULT_MAXIMUM_OPEN_CONNECTIONS,
-            max_request_timestamp_skew: Self::DEFAULT_MAXIMUM_AUTH_REQUEST_TIMESTAMP_SKEW,
+            maximum_auth_request_age: Self::DEFAULT_MAXIMUM_AUTH_REQUEST_AGE,
            minimum_mix_performance: Self::DEFAULT_MINIMUM_MIX_PERFORMANCE,
            stale_messages: Default::default(),
            client_bandwidth: Default::default(),
@@ -60,7 +60,7 @@ fn ephemeral_gateway_config(config: &Config) -> nym_gateway::config::Config {
                    .zk_nym_tickets
                    .maximum_time_between_redemption,
            },
-            max_request_timestamp_skew: config.gateway_tasks.debug.max_request_timestamp_skew,
+            maximum_auth_request_age: config.gateway_tasks.debug.maximum_auth_request_age,
        },
    )
 }
@@ -3,7 +3,6 @@

 use crate::node::http::error::NymNodeHttpError;
 use crate::wireguard::error::WireguardError;
-use nym_http_api_client::HttpClientError;
 use nym_ip_packet_router::error::ClientCoreError;
 use nym_validator_client::ValidatorClientError;
 use std::io;
@@ -210,9 +209,3 @@ pub enum ServiceProvidersError {
    #[error(transparent)]
    ExternalClientCore(#[from] ClientCoreError),
 }
-
-impl From<HttpClientError> for NymNodeError {
-    fn from(value: HttpClientError) -> Self {
-        Self::HttpFailure(NymNodeHttpError::ClientError { source: value })
-    }
-}
@@ -1,7 +1,6 @@
 // Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: GPL-3.0-only

-use nym_http_api_client::HttpClientError;
 use std::io;
 use std::net::SocketAddr;
 use thiserror::Error;
@@ -25,10 +24,4 @@ pub enum NymNodeHttpError {
        #[from]
        source: nym_crypto::asymmetric::encryption::KeyRecoveryError,
    },
-
-    #[error("error building or using HTTP client: {source}")]
-    ClientError {
-        #[from]
-        source: HttpClientError,
-    },
 }
@@ -814,23 +814,9 @@ impl NymNode {
            return;
        }

-        for nym_api_url in &self.config.mixnet.nym_api_urls {
-            info!("trying {nym_api_url}...");
-
-            let nym_api =
-                match nym_http_api_client::ClientBuilder::new_with_url(nym_api_url.clone())
-                    .no_hickory_dns()
-                    .with_user_agent(self.user_agent())
-                    .build::<&str>()
-                {
-                    Ok(b) => b,
-                    Err(e) => {
-                        warn!("failed to build http client for \"{nym_api_url}\": {e}",);
-                        continue;
-                    }
-                };
-
-            let client = NymApiClient { nym_api };
+        for nym_api in &self.config.mixnet.nym_api_urls {
+            info!("trying {nym_api}...");
+            let client = NymApiClient::new_with_user_agent(nym_api.clone(), self.user_agent());

            // make new request every time in case previous one takes longer and invalidates the signature
            let request = NodeRefreshBody::new(self.ed25519_identity_keys.private_key());
@@ -9,7 +9,6 @@ use nym_node_metrics::prometheus_wrapper::{PrometheusMetric, PROMETHEUS_METRICS}
 use nym_task::ShutdownToken;
 use nym_topology::node::RoutingNode;
 use nym_topology::{EpochRewardedSet, NymTopology, Role, TopologyProvider};
-use nym_validator_client::nym_api::NymApiClientExt;
 use nym_validator_client::nym_nodes::{NodesByAddressesResponse, SkimmedNode};
 use nym_validator_client::{NymApiClient, ValidatorClientError};
 use std::collections::HashSet;
@@ -168,7 +167,6 @@ impl NodesQuerier {
    ) -> Result<NodesByAddressesResponse, ValidatorClientError> {
        let res = self
            .client
-            .nym_api
            .nodes_by_addresses(ips)
            .await
            .inspect_err(|err| error!("failed to obtain node information: {err}"));
@@ -176,7 +174,7 @@ impl NodesQuerier {
        if res.is_err() {
            self.use_next_nym_api()
        }
-        Ok(res?)
+        res
    }
 }

@@ -265,14 +263,9 @@ impl NetworkRefresher {
        pending_check_interval: Duration,
        shutdown_token: ShutdownToken,
    ) -> Result<Self, NymNodeError> {
-        let nym_api = nym_http_api_client::Client::builder(nym_api_urls[0].clone())?
-            .no_hickory_dns()
-            .with_user_agent(user_agent)
-            .build()?;
-
        let mut this = NetworkRefresher {
            querier: NodesQuerier {
-                client: NymApiClient { nym_api },
+                client: NymApiClient::new_with_user_agent(nym_api_urls[0].clone(), user_agent),
                nym_api_urls,
                currently_used_api: 0,
            },
@@ -385,15 +385,15 @@ dependencies = [
 [[package]]
 name = "bls12_381"
 version = "0.8.0"
-source = "git+https://github.com/jstuczyn/bls12_381?branch=temp/experimental-serdect-updated#9bf520059cb28323fc51469cae86868ef4fa6fbd"
+source = "git+https://github.com/jstuczyn/bls12_381?branch=temp/experimental-serdect#22cd0a16b674af1629110a2dc8b6cf6c73ea4cd9"
 dependencies = [
- "digest 0.10.7",
+ "digest 0.9.0",
 "ff",
 "group",
 "pairing",
 "rand_core 0.6.4",
 "serde",
- "serdect 0.3.0",
+ "serdect 0.3.0-pre.0",
 "subtle",
 "zeroize",
 ]
@@ -540,11 +540,11 @@ dependencies = [

 [[package]]
 name = "cc"
-version = "1.2.16"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be714c154be609ec7f5dad223a33bf1482fff90472de28f7362806e6d4832b8c"
+checksum = "305fe645edc1442a0fa8b6726ba61d422798d37a52e12eaecf4b022ebbb88f01"
 dependencies = [
- "shlex",
+ "libc",
 ]

 [[package]]
@@ -1583,9 +1583,9 @@ dependencies = [

 [[package]]
 name = "ff"
-version = "0.13.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0b50bfb653653f9ca9095b427bed08ab8d75a137839d9ad64eb11810d5b6393"
+checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449"
 dependencies = [
 "rand_core 0.6.4",
 "subtle",
@@ -3293,7 +3293,6 @@ dependencies = [
 "serde_json",
 "sha2 0.10.8",
 "tendermint 0.40.1",
- "tendermint-rpc",
 "thiserror 2.0.11",
 "time",
 "utoipa",
@@ -3342,7 +3341,7 @@ dependencies = [
 "bls12_381",
 "bs58",
 "cfg-if",
- "digest 0.10.7",
+ "digest 0.9.0",
 "ff",
 "group",
 "itertools 0.14.0",
@@ -3350,7 +3349,7 @@ dependencies = [
 "nym-pemstore",
 "rand 0.8.5",
 "serde",
- "sha2 0.10.8",
+ "sha2 0.9.9",
 "subtle",
 "thiserror 2.0.11",
 "zeroize",
@@ -4761,16 +4760,16 @@ dependencies = [

 [[package]]
 name = "ring"
-version = "0.17.13"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ac5d832aa16abd7d1def883a8545280c20a60f523a370aa3a9617c2b8550ee"
+checksum = "9babe80d5c16becf6594aa32ad2be8fe08498e7ae60b77de8df700e67f191d7e"
 dependencies = [
 "cc",
- "cfg-if",
 "getrandom 0.2.10",
 "libc",
+ "spin",
 "untrusted",
- "windows-sys 0.52.0",
+ "windows-sys 0.48.0",
 ]

 [[package]]
@@ -4784,9 +4783,9 @@ dependencies = [

 [[package]]
 name = "rs_merkle"
-version = "1.5.0"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb09b49230ba22e8c676e7b75dfe2887dea8121f18b530ae0ba519ce442d2b21"
+checksum = "3b241d2e59b74ef9e98d94c78c47623d04c8392abaf82014dfd372a16041128f"
 dependencies = [
 "sha2 0.10.8",
 ]
@@ -5064,18 +5063,18 @@ dependencies = [

 [[package]]
 name = "semver"
-version = "1.0.26"
+version = "1.0.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0"
+checksum = "f79dfe2d285b0488816f30e700a7438c5a73d816b5b7d3ac72fbc48b0d185e03"
 dependencies = [
 "serde",
 ]

 [[package]]
 name = "serde"
-version = "1.0.219"
+version = "1.0.217"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
+checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
 dependencies = [
 "serde_derive",
 ]
@@ -5091,18 +5090,18 @@ dependencies = [

 [[package]]
 name = "serde_bytes"
-version = "0.11.17"
+version = "0.11.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8437fd221bde2d4ca316d61b90e337e9e702b3820b87d63caa9ba6c02bd06d96"
+checksum = "364fec0df39c49a083c9a8a18a23a6bcfd9af130fe9fe321d18520a0d113e09e"
 dependencies = [
 "serde",
 ]

 [[package]]
 name = "serde_derive"
-version = "1.0.219"
+version = "1.0.217"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
+checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -5198,9 +5197,9 @@ dependencies = [

 [[package]]
 name = "serdect"
-version = "0.3.0"
+version = "0.3.0-pre.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f42f67da2385b51a5f9652db9c93d78aeaf7610bf5ec366080b6de810604af53"
+checksum = "791ef964bfaba6be28a5c3f0c56836e17cb711ac009ca1074b9c735a3ebf240a"
 dependencies = [
 "base16ct",
 "serde",
@@ -5271,12 +5270,6 @@ dependencies = [
 "lazy_static",
 ]

-[[package]]
-name = "shlex"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
-
 [[package]]
 name = "signal-hook-registry"
 version = "1.4.1"
@@ -5371,6 +5364,12 @@ dependencies = [
 "system-deps 5.0.0",
 ]

+[[package]]
+name = "spin"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+
 [[package]]
 name = "spki"
 version = "0.7.2"
@@ -6057,9 +6056,9 @@ dependencies = [

 [[package]]
 name = "time"
-version = "0.3.39"
+version = "0.3.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dad298b01a40a23aac4580b67e3dbedb7cc8402f3592d7f49469de2ea4aecdd8"
+checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21"
 dependencies = [
 "deranged",
 "itoa 1.0.9",
@@ -6074,15 +6073,15 @@ dependencies = [

 [[package]]
 name = "time-core"
-version = "0.1.3"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "765c97a5b985b7c11d7bc27fa927dc4fe6af3a6dfb021d28deb60d3bf51e76ef"
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"

 [[package]]
 name = "time-macros"
-version = "0.2.20"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8093bc3e81c3bc5f7879de09619d06c9a5a5e45ca44dfeeb7225bae38005c5c"
+checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de"
 dependencies = [
 "num-conv",
 "time-core",
@@ -6115,9 +6114,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"

 [[package]]
 name = "tokio"
-version = "1.44.0"
+version = "1.43.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9975ea0f48b5aa3972bf2d888c238182458437cc2a19374b81b25cdf1023fb3a"
+checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e"
 dependencies = [
 "backtrace",
 "bytes",
@@ -157,6 +157,20 @@ export const SendInputModal = ({
            initialValue={userFees?.amount}
            fullWidth
          />
+          <TextField
+            name="memo"
+            label="Memo"
+            onChange={(e) => onMemoChange(e.target.value)}
+            value={memo}
+            error={!memoIsValid}
+            helperText={
+              !memoIsValid
+                ? ' The text is invalid, only alphanumeric characters and white spaces are allowed'
+                : undefined
+            }
+            InputLabelProps={{ shrink: true }}
+            fullWidth
+          />
        </Stack>
      )}
    </SimpleModal>
@@ -1,6 +1,6 @@
 {
  "db_name": "SQLite",
-  "query": "\n                SELECT id, tx_hash, height, message_index, sender, recipient, amount, memo, created_at as \"created_at: ::time::OffsetDateTime\"\n                FROM transactions\n                WHERE height > ?\n                ORDER BY height ASC, message_index ASC\n            ",
+  "query": "\n                    SELECT * FROM transactions\n                    WHERE height > ? \n                    ORDER BY height ASC, message_index ASC\n                    ",
  "describe": {
    "columns": [
      {
@@ -44,7 +44,7 @@
        "type_info": "Text"
      },
      {
-        "name": "created_at: ::time::OffsetDateTime",
+        "name": "created_at",
        "ordinal": 8,
        "type_info": "Datetime"
      }
@@ -64,5 +64,5 @@
      true
    ]
  },
-  "hash": "f69907735e9b1e1572c4bf6fe8d44d4ea4e55c2a9c4d4f7e1c7e57bcb848ee08"
+  "hash": "7b9abf4ff422b8d7a942955dc4fba380e7d5f0127f4745705b8ac9af6c170d19"
 }
@@ -3,7 +3,7 @@

 [package]
 name = "nyx-chain-watcher"
-version = "0.1.14"
+version = "0.1.12"
 authors.workspace = true
 repository.workspace = true
 homepage.workspace = true
@@ -23,11 +23,16 @@ nym-config = { path = "../common/config" }
 nym-bin-common = { path = "../common/bin-common", features = ["output_format"] }
 nym-network-defaults = { path = "../common/network-defaults" }
 nym-task = { path = "../common/task" }
+nym-node-requests = { path = "../nym-node/nym-node-requests", features = [
+    "openapi",
+] }
 nym-validator-client = { path = "../common/client-libs/validator-client" }
 nyxd-scraper = { path = "../common/nyxd-scraper" }
 reqwest = { workspace = true, features = ["rustls-tls"] }
+rocket = { workspace = true }
 schemars = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
+serde_json = { workspace = true }
 sqlx = { workspace = true, features = ["runtime-tokio-rustls", "sqlite", "time"] }
 thiserror = { workspace = true }
 time = { workspace = true }
@@ -1,14 +1,12 @@
-use crate::config::PaymentWatchersConfig;
+use crate::config::PaymentWatcherConfig;
 use crate::env::vars::{
    NYXD_SCRAPER_START_HEIGHT, NYXD_SCRAPER_UNSAFE_NUKE_DB,
    NYXD_SCRAPER_USE_BEST_EFFORT_START_HEIGHT,
 };
-use crate::http::state::BankScraperModuleState;
 use async_trait::async_trait;
-use nym_validator_client::nyxd::{Any, Coin, CosmosCoin, Hash, Msg, MsgSend, Name};
 use nyxd_scraper::{
-    error::ScraperError, storage::StorageTransaction, MsgModule, NyxdScraper,
-    ParsedTransactionResponse, PruningOptions,
+    error::ScraperError, storage::StorageTransaction, NyxdScraper, ParsedTransactionResponse,
+    PruningOptions, TxModule,
 };
 use sqlx::SqlitePool;
 use std::fs;
@@ -17,7 +15,6 @@ use tracing::{info, warn};
 pub(crate) async fn run_chain_scraper(
    config: &crate::config::Config,
    db_pool: SqlitePool,
-    shared_state: BankScraperModuleState,
 ) -> anyhow::Result<NyxdScraper> {
    let websocket_url = std::env::var("NYXD_WS").expect("NYXD_WS not defined");

@@ -61,10 +58,9 @@ pub(crate) async fn run_chain_scraper(
            use_best_effort_start_height,
        },
    })
-    .with_msg_module(BankScraperModule::new(
+    .with_tx_module(EventScraperModule::new(
        db_pool,
-        config.payment_watcher_config.clone(),
-        shared_state,
+        config.payment_watcher_config.clone().unwrap_or_default(),
    ));

    let instance = scraper.build_and_start().await?;
@@ -75,22 +71,16 @@ pub(crate) async fn run_chain_scraper(
    Ok(instance)
 }

-pub struct BankScraperModule {
+pub struct EventScraperModule {
    db_pool: SqlitePool,
-    payment_config: PaymentWatchersConfig,
-    shared_state: BankScraperModuleState,
+    payment_config: PaymentWatcherConfig,
 }

-impl BankScraperModule {
-    pub fn new(
-        db_pool: SqlitePool,
-        payment_config: PaymentWatchersConfig,
-        shared_state: BankScraperModuleState,
-    ) -> Self {
+impl EventScraperModule {
+    pub fn new(db_pool: SqlitePool, payment_config: PaymentWatcherConfig) -> Self {
        Self {
            db_pool,
            payment_config,
-            shared_state,
        }
    }

@@ -118,47 +108,23 @@ impl BankScraperModule {
            amount,
            memo
        )
-            .execute(&self.db_pool)
-            .await?;
+        .execute(&self.db_pool)
+        .await?;

        Ok(())
    }
-
-    fn get_unym_coin(&self, coins: &[CosmosCoin]) -> Option<Coin> {
-        coins
-            .iter()
-            .find(|coin| coin.denom.as_ref() == "unym")
-            .map(|c| c.clone().into())
-    }
-
-    // TODO: ideally this should be done by the scraper itself
-    fn recover_bank_msg(
-        &self,
-        tx_hash: Hash,
-        index: usize,
-        msg: &Any,
-    ) -> Result<MsgSend, ScraperError> {
-        MsgSend::from_any(msg).map_err(|source| ScraperError::MsgParseFailure {
-            hash: tx_hash,
-            index,
-            type_url: self.type_url(),
-            source,
-        })
-    }
 }
-#[async_trait]
-impl MsgModule for BankScraperModule {
-    fn type_url(&self) -> String {
-        <MsgSend as Msg>::Proto::type_url()
-    }

-    async fn handle_msg(
+#[async_trait]
+impl TxModule for EventScraperModule {
+    async fn handle_tx(
        &mut self,
-        index: usize,
-        msg: &Any,
        tx: &ParsedTransactionResponse,
-        _storage_tx: &mut StorageTransaction,
+        _: &mut StorageTransaction,
    ) -> Result<(), ScraperError> {
+        let events = &tx.tx_result.events;
+        let height = tx.height.value() as i64;
+        let tx_hash = tx.hash.to_string();
        let memo = tx.tx.body.memo.clone();

        // Don't process failed transactions
@@ -166,53 +132,60 @@ impl MsgModule for BankScraperModule {
            return Ok(());
        }

-        let msg = self.recover_bank_msg(tx.hash, index, msg)?;
+        // Process each event
+        for event in events {
+            // Only process transfer events
+            if event.kind == "transfer" {
+                let mut recipient = None;
+                let mut sender = None;
+                let mut amount = None;
+                // TODO: get message index from event
+                let message_index = 0;

-        // Check if any watcher is watching this recipient
-        let is_watched = self
-            .payment_config
-            .is_being_watched(msg.to_address.as_ref());
+                // Extract transfer event attributes
+                for attr in &event.attributes {
+                    if let (Ok(key), Ok(value)) = (attr.key_str(), attr.value_str()) {
+                        match key {
+                            "recipient" => recipient = Some(value.to_string()),
+                            "sender" => sender = Some(value.to_string()),
+                            "amount" => amount = Some(value.to_string()),
+                            _ => continue,
+                        }
+                    }
+                }

-        self.shared_state
-            .new_bank_msg(tx, index, &msg, is_watched)
-            .await;
+                // If we have all required fields, check if recipient is watched and store
+                if let (Some(recipient), Some(sender), Some(amount)) = (recipient, sender, amount) {
+                    // Check if any watcher is watching this recipient
+                    let is_watched = self.payment_config.watchers.iter().any(|watcher| {
+                        if let Some(watched_accounts) =
+                            &watcher.watch_for_transfer_recipient_accounts
+                        {
+                            watched_accounts
+                                .iter()
+                                .any(|account| account.to_string() == recipient)
+                        } else {
+                            false
+                        }
+                    });

-        if is_watched {
-            let Some(unym_coin) = self.get_unym_coin(&msg.amount) else {
-                let warn = format!(
-                    "{} sent {:?} instead of unym!",
-                    msg.from_address, msg.amount
-                );
-                warn!("{warn}");
-                self.shared_state
-                    .new_rejection(tx.hash.to_string(), tx.height.value(), index as u32, warn)
-                    .await;
-
-                // we don't want to fail the whole processing - this is not a failure in that sense!
-                return Ok(());
-            };
-
-            if let Err(err) = self
-                .store_transfer_event(
-                    &tx.hash.to_string(),
-                    tx.height.value() as i64,
-                    index as i64,
-                    msg.from_address.to_string(),
-                    msg.to_address.to_string(),
-                    unym_coin.to_string(),
-                    Some(memo.clone()),
-                )
-                .await
-            {
-                warn!("Failed to store transfer event: {err}");
-                self.shared_state
-                    .new_rejection(
-                        tx.hash.to_string(),
-                        tx.height.value(),
-                        index as u32,
-                        format!("storage failure: {err}"),
-                    )
-                    .await;
+                    if is_watched {
+                        if let Err(e) = self
+                            .store_transfer_event(
+                                &tx_hash,
+                                height,
+                                message_index,
+                                sender,
+                                recipient,
+                                amount,
+                                Some(memo.clone()),
+                            )
+                            .await
+                        {
+                            warn!("Failed to store transfer event: {}", e);
+                        }
+                    }
+                }
            }
        }

@@ -3,8 +3,8 @@

 use crate::cli::DEFAULT_NYX_CHAIN_WATCHER_ID;
 use crate::config::payments_watcher::HttpAuthenticationOptions::AuthorizationBearerToken;
-use crate::config::payments_watcher::PaymentWatcherConfig;
-use crate::config::{default_config_filepath, Config, ConfigBuilder, PaymentWatchersConfig};
+use crate::config::payments_watcher::PaymentWatcherEntry;
+use crate::config::{default_config_filepath, Config, ConfigBuilder, PaymentWatcherConfig};
 use crate::error::NyxChainWatcherError;
 use nym_config::save_unformatted_config_to_file;
 use nym_validator_client::nyxd::AccountId;
@@ -18,22 +18,22 @@ pub(crate) async fn execute(_args: Args) -> Result<(), NyxChainWatcherError> {
    let data_dir = Config::default_data_directory(&config_path)?;

    let builder = ConfigBuilder::new(config_path.clone(), data_dir).with_payment_watcher_config(
-        PaymentWatchersConfig {
-            watchers: vec![PaymentWatcherConfig {
+        PaymentWatcherConfig {
+            watchers: vec![PaymentWatcherEntry {
                id: DEFAULT_NYX_CHAIN_WATCHER_ID.to_string(),
                webhook_url: "https://webhook.site".to_string(),
-                watch_for_transfer_recipient_accounts: vec![AccountId::from_str(
+                watch_for_transfer_recipient_accounts: Some(vec![AccountId::from_str(
                    "n17g9a2pwwkg8m60wf59pq6mv0c2wusg9ukparkz",
                )
-                .unwrap()],
+                .unwrap()]),
                authentication: Some(AuthorizationBearerToken {
                    token: "1234".to_string(),
                }),
                description: None,
-                watch_for_chain_message_types: vec![
+                watch_for_chain_message_types: Some(vec![
                    "/cosmos.bank.v1beta1.MsgSend".to_string(),
                    "/ibc.applications.transfer.v1.MsgTransfer".to_string(),
-                ],
+                ]),
            }],
        },
    );
@@ -20,7 +20,7 @@ pub(crate) struct Args {
        value_delimiter = ',',
        env = NYX_CHAIN_WATCHER_WATCH_ACCOUNTS
    )]
-    pub watch_for_transfer_recipient_accounts: Vec<AccountId>,
+    pub watch_for_transfer_recipient_accounts: Option<Vec<AccountId>>,

    /// (Override) Watch for chain messages of these types
    #[clap(
@@ -28,7 +28,7 @@ pub(crate) struct Args {
        value_delimiter = ',',
        env = NYX_CHAIN_WATCHER_WATCH_CHAIN_MESSAGE_TYPES
    )]
-    pub watch_for_chain_message_types: Vec<String>,
+    pub watch_for_chain_message_types: Option<Vec<String>>,

    /// (Override) The webhook to call when we find something
    #[clap(
@@ -1,7 +1,7 @@
 use crate::cli::commands::run::args::Args;
 use crate::cli::DEFAULT_NYX_CHAIN_WATCHER_ID;
-use crate::config::payments_watcher::{HttpAuthenticationOptions, PaymentWatcherConfig};
-use crate::config::{default_config_filepath, Config, ConfigBuilder, PaymentWatchersConfig};
+use crate::config::payments_watcher::{HttpAuthenticationOptions, PaymentWatcherEntry};
+use crate::config::{default_config_filepath, Config, ConfigBuilder, PaymentWatcherConfig};
 use crate::error::NyxChainWatcherError;
 use tracing::{info, warn};

@@ -18,8 +18,8 @@ pub(crate) fn get_run_config(args: Args) -> Result<Config, NyxChainWatcherError>
    } = args;

    // if there are no args set, then try load the config
-    if args.watch_for_transfer_recipient_accounts.is_empty()
-        && args.watch_for_transfer_recipient_accounts.is_empty()
+    if args.watch_for_transfer_recipient_accounts.is_none()
+        && args.watch_for_transfer_recipient_accounts.is_none()
        && args.chain_watcher_db_path.is_none()
    {
        info!("Loading default config file...");
@@ -27,12 +27,12 @@ pub(crate) fn get_run_config(args: Args) -> Result<Config, NyxChainWatcherError>
    }

    // set default messages
-    if watch_for_chain_message_types.is_empty() {
-        watch_for_chain_message_types = vec!["/cosmos.bank.v1beta1.MsgSend".to_string()];
+    if watch_for_chain_message_types.is_none() {
+        watch_for_chain_message_types = Some(vec!["/cosmos.bank.v1beta1.MsgSend".to_string()]);
    }

    // warn if no accounts set
-    if watch_for_transfer_recipient_accounts.is_empty() {
+    if watch_for_transfer_recipient_accounts.is_none() {
        warn!(
            "You did not specify any accounts to watch in {}. Only chain data will be stored.",
            crate::env::vars::NYX_CHAIN_WATCHER_WATCH_ACCOUNTS
@@ -58,8 +58,8 @@ pub(crate) fn get_run_config(args: Args) -> Result<Config, NyxChainWatcherError>
        let authentication =
            webhook_auth.map(|token| HttpAuthenticationOptions::AuthorizationBearerToken { token });

-        let watcher_config = PaymentWatchersConfig {
-            watchers: vec![PaymentWatcherConfig {
+        let watcher_config = PaymentWatcherConfig {
+            watchers: vec![PaymentWatcherEntry {
                id: DEFAULT_NYX_CHAIN_WATCHER_ID.to_string(),
                description: None,
                watch_for_transfer_recipient_accounts: watch_for_transfer_recipient_accounts
@@ -14,10 +14,7 @@ mod config;

 use crate::chain_scraper::run_chain_scraper;
 use crate::db::DbPool;
-use crate::http::state::{BankScraperModuleState, PaymentListenerState, PriceScraperState};
-use crate::payment_listener::PaymentListener;
-use crate::price_scraper::PriceScraper;
-use crate::{db, http};
+use crate::{db, http, payment_listener, price_scraper};
 pub(crate) use args::Args;
 use nym_task::signal::wait_for_signal;

@@ -144,51 +141,43 @@ pub(crate) async fn execute(args: Args, http_port: u16) -> Result<(), NyxChainWa
    let scraper_pool = storage.pool_owned();
    let shutdown_pool = storage.pool_owned();

-    // construct shared state
-    let payment_listener_shared_state = PaymentListenerState::new();
-    let price_scraper_shared_state = PriceScraperState::new();
-    let bank_scraper_module_shared_state = BankScraperModuleState::new();
-
    // spawn all the tasks

    // 1. chain scraper (note: this doesn't really spawn the full scraper on this task, but we don't want to be blocking waiting for its startup)
    let scraper_token_handle: JoinHandle<anyhow::Result<CancellationToken>> = tokio::spawn({
        let config = config.clone();
-        let shared_state = bank_scraper_module_shared_state.clone();
        async move {
            // this only blocks until startup sync is done; it then runs on its own set of tasks
-            let scraper = run_chain_scraper(&config, scraper_pool, shared_state).await?;
+            let scraper = run_chain_scraper(&config, scraper_pool).await?;
            Ok(scraper.cancel_token())
        }
    });

    // 2. payment listener
    let token = cancellation_token.clone();
-    let payment_watcher_config = config.payment_watcher_config.clone();
-    let payment_listener = PaymentListener::new(
-        price_scraper_pool,
-        payment_watcher_config,
-        payment_listener_shared_state.clone(),
-    )?;
    {
        tasks.spawn(async move {
            token
                .run_until_cancelled(async move {
-                    payment_listener.run().await;
-                    Ok(())
+                    let payment_watcher_config = config.payment_watcher_config.unwrap_or_default();
+                    payment_listener::run_payment_listener(
+                        payment_watcher_config,
+                        price_scraper_pool,
+                    )
+                    .await
+                    .inspect_err(|err| error!("Payment listener error: {err}"))
                })
                .await
        });
    }

    // 3. price scraper (note, this task never terminates on its own)
-    let price_scraper = PriceScraper::new(price_scraper_shared_state.clone(), watcher_pool);
    {
        let token = cancellation_token.clone();
        tasks.spawn(async move {
            token
                .run_until_cancelled(async move {
-                    price_scraper.run().await;
+                    price_scraper::run_price_scraper(&watcher_pool).await;
                    Ok(())
                })
                .await
@@ -196,15 +185,7 @@ pub(crate) async fn execute(args: Args, http_port: u16) -> Result<(), NyxChainWa
    }

    // 4. http api
-    let http_server = http::server::build_http_api(
-        storage.pool_owned(),
-        &config,
-        http_port,
-        payment_listener_shared_state,
-        price_scraper_shared_state,
-        bank_scraper_module_shared_state,
-    )
-    .await?;
+    let http_server = http::server::build_http_api(storage.pool_owned(), http_port).await?;
    {
        let token = cancellation_token.clone();
        tasks.spawn(async move {
@@ -14,7 +14,7 @@ use tracing::{debug, error};
 pub(crate) mod payments_watcher;
 mod template;

-pub use crate::config::payments_watcher::PaymentWatchersConfig;
+pub use crate::config::payments_watcher::PaymentWatcherConfig;
 use crate::error::NyxChainWatcherError;

 const DEFAULT_NYM_CHAIN_WATCHER_DIR: &str = "nym-chain-watcher";
@@ -46,7 +46,7 @@ pub struct ConfigBuilder {

    pub chain_scraper_db_path: Option<String>,

-    pub payment_watcher_config: Option<PaymentWatchersConfig>,
+    pub payment_watcher_config: Option<PaymentWatcherConfig>,

    pub logging: Option<LoggingSettings>,
 }
@@ -76,7 +76,7 @@ impl ConfigBuilder {
    #[allow(dead_code)]
    pub fn with_payment_watcher_config(
        mut self,
-        payment_watcher_config: impl Into<PaymentWatchersConfig>,
+        payment_watcher_config: impl Into<PaymentWatcherConfig>,
    ) -> Self {
        self.payment_watcher_config = Some(payment_watcher_config.into());
        self
@@ -92,7 +92,7 @@ impl ConfigBuilder {
        Config {
            logging: self.logging.unwrap_or_default(),
            save_path: Some(self.config_path),
-            payment_watcher_config: self.payment_watcher_config.unwrap_or_default(),
+            payment_watcher_config: self.payment_watcher_config,
            data_dir: self.data_dir,
            db_path: self.db_path,
            chain_scraper_db_path: self.chain_scraper_db_path,
@@ -116,8 +116,7 @@ pub struct Config {
    #[serde(skip)]
    chain_scraper_db_path: Option<String>,

-    #[serde(default)]
-    pub payment_watcher_config: PaymentWatchersConfig,
+    pub payment_watcher_config: Option<PaymentWatcherConfig>,

    #[serde(default)]
    pub logging: LoggingSettings,
@@ -1,29 +1,19 @@
 use nym_validator_client::nyxd::AccountId;
 use serde::{Deserialize, Serialize};

-#[derive(Debug, Default, Clone, Serialize, Deserialize)]
-pub struct PaymentWatchersConfig {
-    pub watchers: Vec<PaymentWatcherConfig>,
-}
-
-impl PaymentWatchersConfig {
-    pub fn is_being_watched(&self, account: &str) -> bool {
-        self.watchers.iter().any(|watcher| {
-            watcher
-                .watch_for_transfer_recipient_accounts
-                .iter()
-                .any(|acc| acc.as_ref() == account)
-        })
-    }
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
+pub struct PaymentWatcherConfig {
+    pub watchers: Vec<PaymentWatcherEntry>,
 }

 #[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct PaymentWatcherConfig {
+pub struct PaymentWatcherEntry {
    pub id: String,
    pub description: Option<String>,
    pub webhook_url: String,
-    pub watch_for_transfer_recipient_accounts: Vec<AccountId>,
-    pub watch_for_chain_message_types: Vec<String>,
+    pub watch_for_transfer_recipient_accounts: Option<Vec<AccountId>>,
+    pub watch_for_chain_message_types: Option<Vec<String>>,
    pub authentication: Option<HttpAuthenticationOptions>,
 }

@@ -1,11 +1,7 @@
-use anyhow::Context;
-use nym_validator_client::nyxd::Coin;
 use serde::{Deserialize, Serialize};
-use sqlx::FromRow;
-use time::OffsetDateTime;
 use utoipa::ToSchema;

-#[derive(Clone, Serialize, Deserialize, Debug, ToSchema)]
+#[derive(Clone, Deserialize, Debug, ToSchema)]
 pub(crate) struct CurrencyPrices {
    pub(crate) chf: f32,
    pub(crate) usd: f32,
@@ -15,7 +11,7 @@ pub(crate) struct CurrencyPrices {
 }

 // Struct to hold Coingecko response
-#[derive(Clone, Serialize, Deserialize, Debug, ToSchema)]
+#[derive(Clone, Deserialize, Debug, ToSchema)]
 pub(crate) struct CoingeckoPriceResponse {
    pub(crate) nym: CurrencyPrices,
 }
@@ -45,25 +41,3 @@ pub(crate) struct PaymentRecord {
    pub(crate) timestamp: i64,
    pub(crate) height: i64,
 }
-
-#[derive(Serialize, Deserialize, Debug, FromRow)]
-pub(crate) struct Transaction {
-    pub(crate) id: i64,
-    pub(crate) tx_hash: String,
-    pub(crate) height: i64,
-    pub(crate) message_index: i64,
-    pub(crate) sender: String,
-    pub(crate) recipient: String,
-    pub(crate) amount: String,
-    pub(crate) memo: Option<String>,
-    pub(crate) created_at: Option<OffsetDateTime>,
-}
-
-impl Transaction {
-    pub(crate) fn funds(&self) -> anyhow::Result<Coin> {
-        self.amount
-            .as_str()
-            .parse()
-            .context("failed to parse transaction amount")
-    }
-}
@@ -1,55 +0,0 @@
-// Copyright 2025 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: GPL-3.0-only
-
-use serde::{Deserialize, Serialize};
-use std::collections::vec_deque::{IntoIter, Iter};
-use std::collections::VecDeque;
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub(crate) struct RingBuffer<T> {
-    #[serde(flatten)]
-    inner: VecDeque<T>,
-}
-
-impl<T> RingBuffer<T> {
-    pub fn new(capacity: usize) -> Self {
-        Self {
-            inner: VecDeque::with_capacity(capacity),
-        }
-    }
-
-    pub fn push(&mut self, item: T) {
-        if self.inner.len() == self.inner.capacity() {
-            self.inner.pop_front();
-            self.inner.push_back(item);
-            debug_assert!(self.inner.len() == self.inner.capacity());
-        } else {
-            self.inner.push_back(item);
-        }
-    }
-
-    pub fn iter(&self) -> Iter<'_, T> {
-        self.inner.iter()
-    }
-}
-
-impl<T> From<RingBuffer<T>> for VecDeque<T> {
-    fn from(value: RingBuffer<T>) -> Self {
-        value.inner
-    }
-}
-
-impl<T> From<RingBuffer<T>> for Vec<T> {
-    fn from(value: RingBuffer<T>) -> Self {
-        value.inner.into()
-    }
-}
-
-impl<T> IntoIterator for RingBuffer<T> {
-    type Item = T;
-    type IntoIter = IntoIter<T>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        self.inner.into_iter()
-    }
-}
@@ -8,7 +8,6 @@ use utoipa_swagger_ui::SwaggerUi;
 use crate::http::{api_docs, server::HttpServer, state::AppState};

 pub(crate) mod price;
-pub(crate) mod status;
 pub(crate) mod watcher;

 pub(crate) struct RouterBuilder {
@@ -26,13 +25,8 @@ impl RouterBuilder {
                "/",
                axum::routing::get(|| async { Redirect::permanent("/swagger") }),
            )
-            .nest(
-                "/v1",
-                Router::new()
-                    .nest("/status", status::routes())
-                    .nest("/price", price::routes())
-                    .nest("/watcher", watcher::routes()),
-            );
+            .nest("/v1", Router::new().nest("/price", price::routes()))
+            .nest("/v1", Router::new().nest("/watcher", watcher::routes()));

        Self {
            unfinished_router: router,
@@ -1,228 +0,0 @@
-// Copyright 2025 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: GPL-3.0-only
-
-use crate::http::models::status::{
-    ActivePaymentWatchersResponse, ApiStatus, BankModuleStatusResponse, BankMsgDetails,
-    BankMsgRejection, HealthResponse, PaymentListenerFailureDetails, PaymentListenerStatusResponse,
-    PriceScraperLastError, PriceScraperLastSuccess, PriceScraperStatusResponse, ProcessedPayment,
-    WatcherFailureDetails, WatcherState,
-};
-use crate::http::state::{
-    AppState, BankScraperModuleState, PaymentListenerState, PriceScraperState, StatusState,
-};
-use axum::extract::State;
-use axum::routing::get;
-use axum::{Json, Router};
-use nym_bin_common::build_information::BinaryBuildInformationOwned;
-use std::ops::Deref;
-
-pub(crate) fn routes() -> Router<AppState> {
-    Router::new()
-        .route("/health", get(health))
-        .route("/build-information", get(build_information))
-        .route("/active-payment-watchers", get(active_payment_watchers))
-        .route("/payment-listener", get(payment_listener_status))
-        .route("/price-scraper", get(price_scraper_status))
-        .route("/bank-module-scraper", get(bank_module_status))
-}
-
-#[utoipa::path(
-    tag = "Status",
-    get,
-    path = "/build-information",
-    context_path = "/v1/status",
-    responses(
-        (status = 200, body = BinaryBuildInformationOwned)
-    )
-)]
-async fn build_information(State(state): State<StatusState>) -> Json<BinaryBuildInformationOwned> {
-    Json(state.build_information.to_owned())
-}
-
-#[utoipa::path(
-    tag = "Status",
-    get,
-    path = "/health",
-    context_path = "/v1/status",
-    responses(
-        (status = 200, body = HealthResponse)
-    )
-)]
-async fn health(State(state): State<StatusState>) -> Json<HealthResponse> {
-    let uptime = state.startup_time.elapsed();
-
-    let health = HealthResponse {
-        status: ApiStatus::Up,
-        uptime: uptime.as_secs(),
-    };
-    Json(health)
-}
-
-#[utoipa::path(
-    tag = "Status",
-    get,
-    path = "/active-payment-watchers",
-    context_path = "/v1/status",
-    responses(
-        (status = 200, body = ActivePaymentWatchersResponse)
-    )
-)]
-pub(crate) async fn active_payment_watchers(
-    State(state): State<AppState>,
-) -> Json<ActivePaymentWatchersResponse> {
-    Json(ActivePaymentWatchersResponse {
-        watchers: state.registered_payment_watchers.deref().clone(),
-    })
-}
-
-#[utoipa::path(
-    tag = "Status",
-    get,
-    path = "/payment-listener",
-    context_path = "/v1/status",
-    responses(
-        (status = 200, body = PaymentListenerStatusResponse)
-    )
-)]
-pub(crate) async fn payment_listener_status(
-    State(state): State<PaymentListenerState>,
-) -> Json<PaymentListenerStatusResponse> {
-    let guard = state.inner.read().await;
-
-    // sorry for the nasty conversion code here, run out of time : (
-    Json(PaymentListenerStatusResponse {
-        last_checked: guard.last_checked,
-        processed_payments_since_startup: guard.processed_payments_since_startup,
-        watcher_errors_since_startup: guard.watcher_errors_since_startup,
-        payment_listener_errors_since_startup: guard.payment_listener_errors_since_startup,
-        last_processed_payment: guard
-            .last_processed_payment
-            .as_ref()
-            .map(|p| ProcessedPayment {
-                processed_at: p.processed_at,
-                tx_hash: p.tx_hash.clone(),
-                message_index: p.message_index,
-                height: p.height,
-                sender: p.sender.clone(),
-                receiver: p.receiver.clone(),
-                funds: p.funds.clone(),
-                memo: p.memo.clone(),
-            }),
-        latest_failures: guard
-            .latest_failures
-            .iter()
-            .map(|f| PaymentListenerFailureDetails {
-                timestamp: f.timestamp,
-                error: f.error.clone(),
-            })
-            .collect(),
-        watchers: guard
-            .watchers
-            .iter()
-            .map(|(w, state)| {
-                (
-                    w.clone(),
-                    WatcherState {
-                        latest_failures: state
-                            .latest_failures
-                            .iter()
-                            .map(|f| WatcherFailureDetails {
-                                timestamp: f.timestamp,
-                                error: f.error.clone(),
-                            })
-                            .collect(),
-                    },
-                )
-            })
-            .collect(),
-    })
-}
-
-#[utoipa::path(
-    tag = "Status",
-    get,
-    path = "/price-scraper",
-    context_path = "/v1/status",
-    responses(
-        (status = 200, body = PriceScraperStatusResponse)
-    )
-)]
-pub(crate) async fn price_scraper_status(
-    State(state): State<PriceScraperState>,
-) -> Json<PriceScraperStatusResponse> {
-    let guard = state.inner.read().await;
-    Json(PriceScraperStatusResponse {
-        last_success: guard
-            .last_success
-            .as_ref()
-            .map(|s| PriceScraperLastSuccess {
-                timestamp: s.timestamp,
-                response: s.response.clone(),
-            }),
-        last_failure: guard.last_failure.as_ref().map(|f| PriceScraperLastError {
-            timestamp: f.timestamp,
-            message: f.message.clone(),
-        }),
-    })
-}
-
-#[utoipa::path(
-    tag = "Status",
-    get,
-    path = "/bank-module-scraper",
-    context_path = "/v1/status",
-    responses(
-        (status = 200, body = BankModuleStatusResponse)
-    )
-)]
-pub(crate) async fn bank_module_status(
-    State(state): State<BankScraperModuleState>,
-) -> Json<BankModuleStatusResponse> {
-    let guard = state.inner.read().await;
-    Json(BankModuleStatusResponse {
-        processed_bank_msgs_since_startup: guard.processed_bank_msgs_since_startup,
-        processed_bank_msgs_to_watched_addresses_since_startup: guard
-            .processed_bank_msgs_to_watched_addresses_since_startup,
-        rejected_bank_msgs_to_watched_addresses_since_startup: guard
-            .rejected_bank_msgs_to_watched_addresses_since_startup,
-        last_seen_bank_msgs: guard
-            .last_seen_bank_msgs
-            .iter()
-            .map(|msg| BankMsgDetails {
-                processed_at: msg.processed_at,
-                tx_hash: msg.tx_hash.clone(),
-                height: msg.height,
-                index: msg.index,
-                from: msg.from.clone(),
-                to: msg.to.clone(),
-                amount: msg.amount.clone(),
-                memo: msg.memo.clone(),
-            })
-            .collect(),
-        last_seen_watched_bank_msgs: guard
-            .last_seen_watched_bank_msgs
-            .iter()
-            .map(|msg| BankMsgDetails {
-                processed_at: msg.processed_at,
-                tx_hash: msg.tx_hash.clone(),
-                height: msg.height,
-                index: msg.index,
-                from: msg.from.clone(),
-                to: msg.to.clone(),
-                amount: msg.amount.clone(),
-                memo: msg.memo.clone(),
-            })
-            .collect(),
-        last_rejected_watched_bank_msgs: guard
-            .last_rejected_watched_bank_msgs
-            .iter()
-            .map(|r| BankMsgRejection {
-                rejected_at: r.rejected_at,
-                tx_hash: r.tx_hash.clone(),
-                height: r.height,
-                index: r.index,
-                error: r.error.clone(),
-            })
-            .collect(),
-    })
-}
@@ -1,7 +1,9 @@
+use crate::config::Config;
+use crate::env;
 use crate::http::error::HttpResult;
 use crate::http::state::AppState;
-use axum::extract::State;
 use axum::{Json, Router};
+use std::env::var;

 pub(crate) fn routes() -> Router<AppState> {
    Router::new().route("/addresses", axum::routing::get(get_addresses))
@@ -17,6 +19,30 @@ pub(crate) fn routes() -> Router<AppState> {
 )]

 /// Fetch the addresses being watched by the chain watcher
-async fn get_addresses(State(state): State<AppState>) -> HttpResult<Json<Vec<String>>> {
-    Ok(Json(state.watched_accounts()))
+async fn get_addresses() -> HttpResult<Json<Vec<String>>> {
+    let addresses = match Config::read_from_toml_file_in_default_location() {
+        Ok(config) => config
+            .payment_watcher_config
+            .as_ref()
+            .and_then(|config| {
+                config.watchers.iter().find_map(|watcher| {
+                    watcher
+                        .watch_for_transfer_recipient_accounts
+                        .as_ref()
+                        .map(|accounts| {
+                            accounts
+                                .iter()
+                                .map(|account| account.to_string())
+                                .collect::<Vec<_>>()
+                        })
+                })
+            })
+            .unwrap_or_default(),
+        // If the config file doesn't exist, fall back to env variable
+        Err(_) => var(env::vars::NYX_CHAIN_WATCHER_WATCH_ACCOUNTS)
+            .map(|accounts| accounts.split(',').map(String::from).collect())
+            .unwrap_or_default(),
+    };
+
+    Ok(Json(addresses))
 }
@@ -1,6 +1,5 @@
 pub(crate) mod api;
 pub(crate) mod api_docs;
 pub(crate) mod error;
-pub(crate) mod models;
 pub(crate) mod server;
 pub(crate) mod state;
@@ -1,162 +0,0 @@
-// Copyright 2025 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: GPL-3.0-only
-
-// if we ever create some sort of chain watcher client, those would need to be extracted
-
-pub mod status {
-    use crate::config::payments_watcher::PaymentWatcherConfig;
-    use crate::db::models::CoingeckoPriceResponse;
-    use crate::models::openapi_schema;
-    use nym_validator_client::nyxd::Coin;
-    use serde::{Deserialize, Serialize};
-    use std::collections::HashMap;
-    use time::OffsetDateTime;
-    use utoipa::ToSchema;
-
-    #[derive(Clone, Copy, Debug, Serialize, Deserialize, schemars::JsonSchema, ToSchema)]
-    #[serde(rename_all = "lowercase")]
-    pub enum ApiStatus {
-        Up,
-    }
-
-    #[derive(Clone, Copy, Debug, Serialize, Deserialize, schemars::JsonSchema, ToSchema)]
-    pub struct HealthResponse {
-        pub status: ApiStatus,
-        pub uptime: u64,
-    }
-
-    #[derive(Debug, Serialize, Deserialize, ToSchema)]
-    pub struct ActivePaymentWatchersResponse {
-        pub watchers: Vec<PaymentWatcher>,
-    }
-
-    #[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
-    pub struct PaymentWatcher {
-        pub id: String,
-        pub description: String,
-        pub webhook_url: String,
-        pub watched_accounts: Vec<String>,
-        pub watched_message_types: Vec<String>,
-    }
-
-    impl From<&PaymentWatcherConfig> for PaymentWatcher {
-        fn from(value: &PaymentWatcherConfig) -> Self {
-            PaymentWatcher {
-                id: value.id.clone(),
-                description: value.description.clone().unwrap_or_default(),
-                webhook_url: value.webhook_url.clone(),
-                watched_accounts: value
-                    .watch_for_transfer_recipient_accounts
-                    .iter()
-                    .map(|a| a.to_string())
-                    .collect(),
-                watched_message_types: value.watch_for_chain_message_types.clone(),
-            }
-        }
-    }
-
-    #[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
-    pub struct PaymentListenerStatusResponse {
-        #[serde(with = "time::serde::rfc3339")]
-        pub last_checked: OffsetDateTime,
-
-        pub processed_payments_since_startup: u64,
-        pub watcher_errors_since_startup: u64,
-        pub payment_listener_errors_since_startup: u64,
-
-        pub last_processed_payment: Option<ProcessedPayment>,
-
-        pub latest_failures: Vec<PaymentListenerFailureDetails>,
-        pub watchers: HashMap<String, WatcherState>,
-    }
-
-    #[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
-    pub(crate) struct ProcessedPayment {
-        #[serde(with = "time::serde::rfc3339")]
-        pub processed_at: OffsetDateTime,
-
-        pub tx_hash: String,
-        pub message_index: u64,
-        pub height: u64,
-        pub sender: String,
-        pub receiver: String,
-
-        #[schema(value_type = openapi_schema::Coin)]
-        pub funds: Coin,
-
-        pub memo: String,
-    }
-
-    #[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
-    pub(crate) struct PaymentListenerFailureDetails {
-        #[serde(with = "time::serde::rfc3339")]
-        pub(crate) timestamp: OffsetDateTime,
-        pub(crate) error: String,
-    }
-
-    #[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
-    pub(crate) struct WatcherState {
-        pub(crate) latest_failures: Vec<WatcherFailureDetails>,
-    }
-
-    #[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
-    pub(crate) struct WatcherFailureDetails {
-        #[serde(with = "time::serde::rfc3339")]
-        pub(crate) timestamp: OffsetDateTime,
-        pub(crate) error: String,
-    }
-
-    #[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
-    pub(crate) struct PriceScraperStatusResponse {
-        pub(crate) last_success: Option<PriceScraperLastSuccess>,
-        pub(crate) last_failure: Option<PriceScraperLastError>,
-    }
-
-    #[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
-    pub(crate) struct PriceScraperLastSuccess {
-        #[serde(with = "time::serde::rfc3339")]
-        pub(crate) timestamp: OffsetDateTime,
-        pub(crate) response: CoingeckoPriceResponse,
-    }
-
-    #[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
-    pub(crate) struct PriceScraperLastError {
-        #[serde(with = "time::serde::rfc3339")]
-        pub(crate) timestamp: OffsetDateTime,
-        pub(crate) message: String,
-    }
-
-    #[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
-    pub(crate) struct BankModuleStatusResponse {
-        pub(crate) processed_bank_msgs_since_startup: usize,
-        pub(crate) processed_bank_msgs_to_watched_addresses_since_startup: usize,
-        pub(crate) rejected_bank_msgs_to_watched_addresses_since_startup: usize,
-
-        pub(crate) last_seen_bank_msgs: Vec<BankMsgDetails>,
-        pub(crate) last_seen_watched_bank_msgs: Vec<BankMsgDetails>,
-        pub(crate) last_rejected_watched_bank_msgs: Vec<BankMsgRejection>,
-    }
-
-    #[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
-    pub(crate) struct BankMsgDetails {
-        #[serde(with = "time::serde::rfc3339")]
-        pub(crate) processed_at: OffsetDateTime,
-        pub(crate) tx_hash: String,
-        pub(crate) height: u64,
-        pub(crate) index: u32,
-        pub(crate) from: String,
-        pub(crate) to: String,
-        pub(crate) amount: Vec<String>,
-        pub(crate) memo: String,
-    }
-
-    #[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
-    pub(crate) struct BankMsgRejection {
-        #[serde(with = "time::serde::rfc3339")]
-        pub(crate) rejected_at: OffsetDateTime,
-        pub(crate) tx_hash: String,
-        pub(crate) height: u64,
-        pub(crate) index: u32,
-        pub(crate) error: String,
-    }
-}
@@ -3,35 +3,15 @@ use core::net::SocketAddr;
 use tokio::net::TcpListener;
 use tokio_util::sync::WaitForCancellationFutureOwned;

-use crate::config::Config;
-use crate::http::state::{BankScraperModuleState, PaymentListenerState, PriceScraperState};
 use crate::{
    db::DbPool,
    http::{api::RouterBuilder, state::AppState},
 };

-pub(crate) async fn build_http_api(
-    db_pool: DbPool,
-    config: &Config,
-    http_port: u16,
-    payment_listener_state: PaymentListenerState,
-    price_scraper_state: PriceScraperState,
-    bank_scraper_module_shared_state: BankScraperModuleState,
-) -> anyhow::Result<HttpServer> {
+pub(crate) async fn build_http_api(db_pool: DbPool, http_port: u16) -> anyhow::Result<HttpServer> {
    let router_builder = RouterBuilder::with_default_routes();

-    let state = AppState::new(
-        db_pool,
-        config
-            .payment_watcher_config
-            .watchers
-            .iter()
-            .map(Into::into)
-            .collect(),
-        payment_listener_state,
-        price_scraper_state,
-        bank_scraper_module_shared_state,
-    );
+    let state = AppState::new(db_pool);
    let router = router_builder.with_state(state);

    let bind_addr = format!("0.0.0.0:{}", http_port);
@@ -1,392 +1,16 @@
-use crate::db::models::CoingeckoPriceResponse;
 use crate::db::DbPool;
-use crate::helpers::RingBuffer;
-use crate::http::models::status::PaymentWatcher;
-use crate::models::WebhookPayload;
-use axum::extract::FromRef;
-use nym_bin_common::bin_info;
-use nym_bin_common::build_information::BinaryBuildInformation;
-use nym_validator_client::nyxd::{Coin, MsgSend};
-use nyxd_scraper::ParsedTransactionResponse;
-use serde::{Deserialize, Serialize};
-use std::collections::HashMap;
-use std::ops::Deref;
-use std::sync::Arc;
-use time::OffsetDateTime;
-use tokio::sync::RwLock;
-use tokio::time::Instant;

 #[derive(Debug, Clone)]
 pub(crate) struct AppState {
    db_pool: DbPool,
-    pub(crate) registered_payment_watchers: Arc<Vec<PaymentWatcher>>,
-    pub(crate) payment_listener_state: PaymentListenerState,
-    pub(crate) status_state: StatusState,
-    pub(crate) price_scraper_state: PriceScraperState,
-    pub(crate) bank_scraper_module_state: BankScraperModuleState,
 }

 impl AppState {
-    pub(crate) fn new(
-        db_pool: DbPool,
-        registered_payment_watchers: Vec<PaymentWatcher>,
-        payment_listener_state: PaymentListenerState,
-        price_scraper_state: PriceScraperState,
-        bank_scraper_module_state: BankScraperModuleState,
-    ) -> Self {
-        Self {
-            db_pool,
-            registered_payment_watchers: Arc::new(registered_payment_watchers),
-            payment_listener_state,
-            status_state: Default::default(),
-            price_scraper_state,
-            bank_scraper_module_state,
-        }
+    pub(crate) fn new(db_pool: DbPool) -> Self {
+        Self { db_pool }
    }

    pub(crate) fn db_pool(&self) -> &DbPool {
        &self.db_pool
    }
-
-    pub(crate) fn watched_accounts(&self) -> Vec<String> {
-        self.registered_payment_watchers
-            .iter()
-            .flat_map(|w| w.watched_accounts.iter())
-            .cloned()
-            .collect()
-    }
-}
-
-#[derive(Clone, Debug)]
-pub(crate) struct StatusState {
-    inner: Arc<StatusStateInner>,
-}
-
-impl Default for StatusState {
-    fn default() -> Self {
-        StatusState {
-            inner: Arc::new(StatusStateInner {
-                startup_time: Instant::now(),
-                build_information: bin_info!(),
-            }),
-        }
-    }
-}
-
-impl Deref for StatusState {
-    type Target = StatusStateInner;
-    fn deref(&self) -> &Self::Target {
-        &self.inner
-    }
-}
-
-#[derive(Debug)]
-pub(crate) struct StatusStateInner {
-    pub(crate) startup_time: Instant,
-    pub(crate) build_information: BinaryBuildInformation,
-}
-
-#[derive(Debug, Clone)]
-pub(crate) struct PriceScraperState {
-    pub(crate) inner: Arc<RwLock<PriceScraperStateInner>>,
-}
-
-impl PriceScraperState {
-    pub(crate) fn new() -> Self {
-        PriceScraperState {
-            inner: Arc::new(Default::default()),
-        }
-    }
-
-    pub(crate) async fn new_failure<S: Into<String>>(&self, error: S) {
-        self.inner.write().await.last_failure = Some(PriceScraperLastError {
-            timestamp: OffsetDateTime::now_utc(),
-            message: error.into(),
-        })
-    }
-    pub(crate) async fn new_success(&self, response: CoingeckoPriceResponse) {
-        self.inner.write().await.last_success = Some(PriceScraperLastSuccess {
-            timestamp: OffsetDateTime::now_utc(),
-            response,
-        })
-    }
-}
-
-#[derive(Debug, Default)]
-pub(crate) struct PriceScraperStateInner {
-    pub(crate) last_success: Option<PriceScraperLastSuccess>,
-    pub(crate) last_failure: Option<PriceScraperLastError>,
-}
-
-#[derive(Debug)]
-pub(crate) struct PriceScraperLastSuccess {
-    pub(crate) timestamp: OffsetDateTime,
-    pub(crate) response: CoingeckoPriceResponse,
-}
-
-#[derive(Debug)]
-pub(crate) struct PriceScraperLastError {
-    pub(crate) timestamp: OffsetDateTime,
-    pub(crate) message: String,
-}
-
-#[derive(Debug, Clone)]
-pub(crate) struct PaymentListenerState {
-    pub(crate) inner: Arc<RwLock<PaymentListenerStateInner>>,
-}
-
-impl PaymentListenerState {
-    // TODO: make those configurable
-    const MAX_WATCHER_FAILURES: usize = 20;
-    const MAX_PAYMENT_LISTENER_FAILURES: usize = 50;
-
-    pub(crate) fn new() -> Self {
-        PaymentListenerState {
-            inner: Arc::new(RwLock::new(PaymentListenerStateInner {
-                last_checked: OffsetDateTime::UNIX_EPOCH,
-                processed_payments_since_startup: 0,
-                watcher_errors_since_startup: 0,
-                payment_listener_errors_since_startup: 0,
-                last_processed_payment: None,
-                latest_failures: RingBuffer::new(Self::MAX_PAYMENT_LISTENER_FAILURES),
-                watchers: Default::default(),
-            })),
-        }
-    }
-
-    pub(crate) async fn insert_listener_failure(&self, failure: PaymentListenerFailureDetails) {
-        let mut guard = self.inner.write().await;
-
-        guard.payment_listener_errors_since_startup += 1;
-        guard.latest_failures.push(failure);
-    }
-
-    pub(crate) async fn insert_watcher_failure(&self, id: &str, failure: WatcherFailureDetails) {
-        self.inner
-            .write()
-            .await
-            .watchers
-            .entry(id.to_string())
-            .or_insert(WatcherState {
-                latest_failures: RingBuffer::new(Self::MAX_WATCHER_FAILURES),
-            })
-            .latest_failures
-            .push(failure);
-    }
-
-    pub(crate) async fn processed_payment_transaction(&self, payment: ProcessedPayment) {
-        let mut guard = self.inner.write().await;
-
-        guard.processed_payments_since_startup += 1;
-        guard.last_processed_payment = Some(payment)
-    }
-
-    pub(crate) async fn update_last_checked(&self) {
-        self.inner.write().await.last_checked = OffsetDateTime::now_utc();
-    }
-}
-
-#[derive(Debug)]
-pub(crate) struct PaymentListenerStateInner {
-    pub(crate) last_checked: OffsetDateTime,
-
-    pub(crate) processed_payments_since_startup: u64,
-    pub(crate) watcher_errors_since_startup: u64,
-    pub(crate) payment_listener_errors_since_startup: u64,
-
-    pub(crate) last_processed_payment: Option<ProcessedPayment>,
-
-    pub(crate) latest_failures: RingBuffer<PaymentListenerFailureDetails>,
-    pub(crate) watchers: HashMap<String, WatcherState>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub(crate) struct ProcessedPayment {
-    pub processed_at: OffsetDateTime,
-
-    pub tx_hash: String,
-    pub message_index: u64,
-    pub height: u64,
-    pub sender: String,
-    pub receiver: String,
-    pub funds: Coin,
-    pub memo: String,
-}
-
-impl From<WebhookPayload> for ProcessedPayment {
-    fn from(payload: WebhookPayload) -> Self {
-        ProcessedPayment {
-            processed_at: OffsetDateTime::now_utc(),
-            tx_hash: payload.transaction_hash,
-            message_index: payload.message_index,
-            height: payload.height as u64,
-            sender: payload.sender_address,
-            receiver: payload.receiver_address,
-            funds: payload.funds.into(),
-            memo: payload.memo.unwrap_or_default(),
-        }
-    }
-}
-
-#[derive(Debug, Clone)]
-pub(crate) struct PaymentListenerFailureDetails {
-    pub(crate) timestamp: OffsetDateTime,
-    pub(crate) error: String,
-}
-
-impl PaymentListenerFailureDetails {
-    pub(crate) fn new(error: String) -> Self {
-        PaymentListenerFailureDetails {
-            timestamp: OffsetDateTime::now_utc(),
-            error,
-        }
-    }
-}
-
-#[derive(Debug)]
-pub(crate) struct WatcherState {
-    pub(crate) latest_failures: RingBuffer<WatcherFailureDetails>,
-}
-
-#[derive(Debug)]
-pub(crate) struct WatcherFailureDetails {
-    pub(crate) timestamp: OffsetDateTime,
-    pub(crate) error: String,
-}
-
-impl WatcherFailureDetails {
-    pub(crate) fn new(error: String) -> Self {
-        WatcherFailureDetails {
-            timestamp: OffsetDateTime::now_utc(),
-            error,
-        }
-    }
-}
-
-#[derive(Debug, Clone)]
-pub(crate) struct BankScraperModuleState {
-    pub(crate) inner: Arc<RwLock<BankScraperModuleStateInner>>,
-}
-
-impl BankScraperModuleState {
-    // TODO: make those configurable
-    const MAX_LAST_BANK_MSGS: usize = 20;
-    const MAX_LAST_WATCHED_BANK_MSGS: usize = 10;
-    const MAX_LAST_REJECTED_BANK_MSGS: usize = 25;
-
-    pub(crate) fn new() -> Self {
-        BankScraperModuleState {
-            inner: Arc::new(RwLock::new(BankScraperModuleStateInner {
-                processed_bank_msgs_since_startup: 0,
-                processed_bank_msgs_to_watched_addresses_since_startup: 0,
-                rejected_bank_msgs_to_watched_addresses_since_startup: 0,
-                last_seen_bank_msgs: RingBuffer::new(Self::MAX_LAST_BANK_MSGS),
-                last_seen_watched_bank_msgs: RingBuffer::new(Self::MAX_LAST_WATCHED_BANK_MSGS),
-                last_rejected_watched_bank_msgs: RingBuffer::new(Self::MAX_LAST_REJECTED_BANK_MSGS),
-            })),
-        }
-    }
-
-    pub(crate) async fn new_bank_msg(
-        &self,
-        tx: &ParsedTransactionResponse,
-        index: usize,
-        msg: &MsgSend,
-        is_watched: bool,
-    ) {
-        let mut guard = self.inner.write().await;
-        guard.processed_bank_msgs_since_startup += 1;
-
-        let details = BankMsgDetails {
-            processed_at: OffsetDateTime::now_utc(),
-            tx_hash: tx.hash.to_string(),
-            height: tx.height.value(),
-            index: index as u32,
-            from: msg.from_address.to_string(),
-            to: msg.to_address.to_string(),
-            amount: msg.amount.iter().map(|c| c.to_string()).collect(),
-            memo: tx.tx.body.memo.clone(),
-        };
-        guard.last_seen_bank_msgs.push(details.clone());
-
-        if is_watched {
-            guard.processed_bank_msgs_to_watched_addresses_since_startup += 1;
-            guard.last_seen_watched_bank_msgs.push(details.clone());
-        }
-    }
-
-    pub(crate) async fn new_rejection<S: Into<String>>(
-        &self,
-        tx_hash: String,
-        height: u64,
-        index: u32,
-        error: S,
-    ) {
-        self.inner
-            .write()
-            .await
-            .last_rejected_watched_bank_msgs
-            .push(BankMsgRejection {
-                rejected_at: OffsetDateTime::now_utc(),
-                tx_hash,
-                height,
-                index,
-                error: error.into(),
-            })
-    }
-}
-
-#[derive(Debug)]
-pub(crate) struct BankScraperModuleStateInner {
-    pub(crate) processed_bank_msgs_since_startup: usize,
-    pub(crate) processed_bank_msgs_to_watched_addresses_since_startup: usize,
-    pub(crate) rejected_bank_msgs_to_watched_addresses_since_startup: usize,
-
-    pub(crate) last_seen_bank_msgs: RingBuffer<BankMsgDetails>,
-    pub(crate) last_seen_watched_bank_msgs: RingBuffer<BankMsgDetails>,
-    pub(crate) last_rejected_watched_bank_msgs: RingBuffer<BankMsgRejection>,
-}
-
-#[derive(Debug, Clone)]
-pub(crate) struct BankMsgDetails {
-    pub(crate) processed_at: OffsetDateTime,
-    pub(crate) tx_hash: String,
-    pub(crate) height: u64,
-    pub(crate) index: u32,
-    pub(crate) from: String,
-    pub(crate) to: String,
-    pub(crate) amount: Vec<String>,
-    pub(crate) memo: String,
-}
-
-#[derive(Debug)]
-pub(crate) struct BankMsgRejection {
-    pub(crate) rejected_at: OffsetDateTime,
-    pub(crate) tx_hash: String,
-    pub(crate) height: u64,
-    pub(crate) index: u32,
-    pub(crate) error: String,
-}
-
-impl FromRef<AppState> for PaymentListenerState {
-    fn from_ref(input: &AppState) -> Self {
-        input.payment_listener_state.clone()
-    }
-}
-impl FromRef<AppState> for StatusState {
-    fn from_ref(input: &AppState) -> Self {
-        input.status_state.clone()
-    }
-}
-
-impl FromRef<AppState> for PriceScraperState {
-    fn from_ref(input: &AppState) -> Self {
-        input.price_scraper_state.clone()
-    }
-}
-
-impl FromRef<AppState> for BankScraperModuleState {
-    fn from_ref(input: &AppState) -> Self {
-        input.bank_scraper_module_state.clone()
-    }
 }
@@ -10,7 +10,6 @@ mod config;
 mod db;
 mod env;
 mod error;
-pub(crate) mod helpers;
 mod http;
 mod logging;
 pub mod models;
@@ -1,6 +1,6 @@
 use nym_validator_client::nyxd::CosmWasmCoin;
+use rocket::serde::{Deserialize, Serialize};
 use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
 use utoipa::ToSchema;

 #[derive(Serialize, Deserialize, Clone, JsonSchema, ToSchema)]
@@ -1,152 +1,108 @@
-// Copyright 2025 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: GPL-3.0-only
-
-use crate::config::PaymentWatchersConfig;
-use crate::db::models::Transaction;
+use crate::config::payments_watcher::HttpAuthenticationOptions;
+use crate::config::PaymentWatcherConfig;
 use crate::db::queries;
-use crate::http::state::{
-    PaymentListenerFailureDetails, PaymentListenerState, ProcessedPayment, WatcherFailureDetails,
-};
 use crate::models::WebhookPayload;
-use crate::payment_listener::watcher::PaymentWatcher;
-use anyhow::Context;
+use nym_validator_client::nyxd::Coin;
+use reqwest::Client;
 use sqlx::SqlitePool;
+use std::str::FromStr;
 use tokio::time::{self, Duration};
-use tracing::{debug, error, info};
+use tracing::{error, info};

-pub(crate) mod watcher;
+pub(crate) async fn run_payment_listener(
+    payment_watcher_config: PaymentWatcherConfig,
+    watcher_pool: SqlitePool,
+) -> anyhow::Result<()> {
+    let client = Client::new();

-pub(crate) struct PaymentListener {
-    db_pool: SqlitePool,
-    payment_watchers: Vec<PaymentWatcher>,
-    shared_state: PaymentListenerState,
-}
+    loop {
+        // 1. get the last height this watcher ran at
+        let last_checked_height = queries::payments::get_last_checked_height(&watcher_pool).await?;
+        info!("Last checked height: {}", last_checked_height);

-impl PaymentListener {
-    pub(crate) fn new(
-        db_pool: SqlitePool,
-        config: PaymentWatchersConfig,
-        shared_state: PaymentListenerState,
-    ) -> anyhow::Result<Self> {
-        Ok(PaymentListener {
-            db_pool,
-            payment_watchers: config
-                .watchers
-                .iter()
-                .map(|watcher_cfg| PaymentWatcher::new(watcher_cfg.clone()))
-                .collect::<anyhow::Result<Vec<_>>>()?,
-            shared_state,
-        })
-    }
+        // 2. iterate through watchers
+        for watcher in &payment_watcher_config.watchers {
+            if watcher.watch_for_transfer_recipient_accounts.is_some() {
+                // 3. Query new transactions for this watcher's recipient accounts
+                let transactions = sqlx::query!(
+                    r#"
+                    SELECT * FROM transactions
+                    WHERE height > ? 
+                    ORDER BY height ASC, message_index ASC
+                    "#,
+                    last_checked_height
+                )
+                .fetch_all(&watcher_pool)
+                .await?;

-    async fn retrieve_unprocessed_transactions(&self) -> anyhow::Result<Vec<Transaction>> {
-        let last_checked_height = queries::payments::get_last_checked_height(&self.db_pool).await?;
-        let txs = sqlx::query_as!(
-            Transaction,
-            r#"
-                SELECT id, tx_hash, height, message_index, sender, recipient, amount, memo, created_at as "created_at: ::time::OffsetDateTime"
-                FROM transactions
-                WHERE height > ?
-                ORDER BY height ASC, message_index ASC
-            "#,
-            last_checked_height
-        )
-        .fetch_all(&self.db_pool)
-        .await?;
+                if !transactions.is_empty() {
+                    info!(
+                        "[watcher = {}] Processing {} transactions",
+                        watcher.id,
+                        transactions.len()
+                    );
+                }

-        Ok(txs)
-    }
+                for tx in transactions {
+                    let funds = Coin::from_str(&tx.amount)?;
+                    let amount: f64 = funds.amount as f64 / 1e6f64; // convert to major value, there will be precision loss

-    async fn process_transaction(&self, tx: Transaction) -> anyhow::Result<()> {
-        // 3.1 process any payments
-        let funds = tx.funds()?;
-        let amount: f64 = funds.amount as f64 / 1e6f64; // convert to major value, there will be precision loss
+                    // Store transaction hash for later use
+                    let tx_hash = tx.tx_hash.clone();
+                    let message_index = tx.message_index;

-        // TODO: FIXME: it may happen that we insert a payment but fail to invoke all webhooks
-
-        queries::payments::insert_payment(
-            &self.db_pool,
-            tx.tx_hash.clone(),
-            tx.sender.clone(),
-            tx.recipient.clone(),
-            amount,
-            tx.height,
-            tx.memo.clone(),
-        )
-        .await?;
-
-        // 3.1. invoke all relevant webhooks for all registered watchers
-        let webhook_data = WebhookPayload {
-            transaction_hash: tx.tx_hash,
-            message_index: tx.message_index as u64,
-            sender_address: tx.sender,
-            receiver_address: tx.recipient,
-            funds: funds.into(),
-            height: tx.height as u128,
-            memo: tx.memo,
-        };
-
-        for watcher in &self.payment_watchers {
-            if let Err(err) = watcher.invoke_webhook(&webhook_data).await {
-                error!("watcher {} failure: {err:#}", watcher.id());
-                self.shared_state
-                    .insert_watcher_failure(
-                        watcher.id(),
-                        WatcherFailureDetails::new(err.to_string()),
+                    queries::payments::insert_payment(
+                        &watcher_pool,
+                        tx.tx_hash,
+                        tx.sender.clone(),
+                        tx.recipient.clone(),
+                        amount,
+                        tx.height,
+                        tx.memo.clone(),
                    )
-                    .await
+                    .await?;
+
+                    let webhook_data = WebhookPayload {
+                        transaction_hash: tx_hash.clone(),
+                        message_index: message_index as u64,
+                        sender_address: tx.sender,
+                        receiver_address: tx.recipient,
+                        funds: funds.into(),
+                        height: tx.height as u128,
+                        memo: tx.memo,
+                    };
+
+                    let mut request_builder = client.post(&watcher.webhook_url).json(&webhook_data);
+
+                    if let Some(auth) = &watcher.authentication {
+                        match auth {
+                            HttpAuthenticationOptions::AuthorizationBearerToken { token } => {
+                                request_builder = request_builder.bearer_auth(token);
+                            }
+                        }
+                    }
+
+                    match request_builder.send().await {
+                        Ok(res) => info!(
+                            "[watcher = {}] ✅ Webhook {} {} - tx {}, index {}",
+                            watcher.id,
+                            res.status(),
+                            res.url(),
+                            tx_hash,
+                            message_index,
+                        ),
+                        Err(e) => error!(
+                            "[watcher = {}] ❌ Webhook {:?} {:?} error = {}",
+                            watcher.id,
+                            e.status(),
+                            e.url(),
+                            e,
+                        ),
+                    }
+                }
            }
        }

-        self.shared_state
-            .processed_payment_transaction(ProcessedPayment::from(webhook_data))
-            .await;
-
-        Ok(())
-    }
-
-    async fn check_for_unprocessed_payments(&self) -> anyhow::Result<()> {
-        // 1. retrieve any unprocessed transactions
-        let unprocessed_transactions = self
-            .retrieve_unprocessed_transactions()
-            .await
-            .context("failed to retrieve unprocessed transactions")?;
-
-        if unprocessed_transactions.is_empty() {
-            debug!("no payment transactions to process.");
-            return Ok(());
-        } else {
-            info!(
-                "processing {} payment transactions",
-                unprocessed_transactions.len()
-            );
-        }
-
-        // 2. attempt to process them
-        for tx in unprocessed_transactions {
-            let hash = tx.tx_hash.clone();
-            let height = tx.height;
-            self.process_transaction(tx).await.with_context(|| {
-                format!("failed to process transaction {hash} at height {height}")
-            })?;
-        }
-
-        Ok(())
-    }
-
-    pub(crate) async fn run(&self) {
-        loop {
-            time::sleep(Duration::from_secs(10)).await;
-
-            if let Err(err) = self.check_for_unprocessed_payments().await {
-                error!("failed to fully process payments: {err:#}");
-                self.shared_state
-                    .insert_listener_failure(PaymentListenerFailureDetails::new(err.to_string()))
-                    .await;
-                continue;
-            }
-
-            self.shared_state.update_last_checked().await;
-        }
+        time::sleep(Duration::from_secs(10)).await;
    }
 }
@@ -1,73 +0,0 @@
-// Copyright 2025 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: GPL-3.0-only
-
-use crate::config::payments_watcher::{HttpAuthenticationOptions, PaymentWatcherConfig};
-use crate::models::WebhookPayload;
-use anyhow::Context;
-use reqwest::{Client, Url};
-use tracing::{error, info};
-
-pub(crate) struct PaymentWatcher {
-    webhook_url: Url,
-    config: PaymentWatcherConfig,
-}
-
-impl PaymentWatcher {
-    pub(crate) fn new(config: PaymentWatcherConfig) -> anyhow::Result<Self> {
-        Ok(PaymentWatcher {
-            webhook_url: config
-                .webhook_url
-                .as_str()
-                .parse()
-                .context("couldn't create payment watcher: provided webhook URL is malformed")?,
-            config,
-        })
-    }
-
-    pub(super) fn id(&self) -> &str {
-        &self.config.id
-    }
-
-    pub(crate) async fn invoke_webhook(&self, payload: &WebhookPayload) -> anyhow::Result<()> {
-        let client = Client::builder()
-            .user_agent(format!(
-                "nyx-chain-watcher/{}/watcher-{}",
-                env!("CARGO_PKG_VERSION"),
-                self.config.id
-            ))
-            .build()
-            .context("failed to build reqwest client")?;
-
-        let mut request_builder = client.post(self.webhook_url.clone()).json(payload);
-
-        if let Some(auth) = &self.config.authentication {
-            match auth {
-                HttpAuthenticationOptions::AuthorizationBearerToken { token } => {
-                    request_builder = request_builder.bearer_auth(token);
-                }
-            }
-        }
-
-        match request_builder.send().await {
-            Ok(res) => info!(
-                "[watcher = {}] ✅ Webhook {} {} - tx {}, index {}",
-                self.config.id,
-                res.status(),
-                res.url(),
-                payload.transaction_hash,
-                payload.message_index,
-            ),
-            Err(err) => {
-                error!(
-                    "[watcher = {}] ❌ Webhook {:?} {:?} error = {err}",
-                    self.config.id,
-                    err.status(),
-                    err.url(),
-                );
-                return Err(err.into());
-            }
-        }
-
-        Ok(())
-    }
-}
@@ -6,71 +6,49 @@ use core::str;
 use tokio::time::Duration;

 use crate::db::DbPool;
-use crate::http::state::PriceScraperState;

 const REFRESH_DELAY: Duration = Duration::from_secs(300);
 const FAILURE_RETRY_DELAY: Duration = Duration::from_secs(60 * 2);
 const COINGECKO_API_URL: &str =
    "https://api.coingecko.com/api/v3/simple/price?ids=nym&vs_currencies=chf,usd,eur,gbp,btc";

-pub(crate) struct PriceScraper {
-    shared_state: PriceScraperState,
-    db_pool: DbPool,
-}
-
-impl PriceScraper {
-    pub(crate) fn new(shared_state: PriceScraperState, db_pool: DbPool) -> Self {
-        PriceScraper {
-            shared_state,
-            db_pool,
-        }
-    }
-
-    async fn get_coingecko_prices(&self) -> anyhow::Result<CoingeckoPriceResponse> {
-        tracing::info!("💰 Fetching CoinGecko prices from {COINGECKO_API_URL}");
-
-        let response = reqwest::get(COINGECKO_API_URL)
-            .await?
-            .json::<CoingeckoPriceResponse>()
-            .await;
-
-        tracing::info!("Got response {:?}", response);
-        match response {
-            Ok(resp) => {
-                let price_record = PriceRecord {
-                    timestamp: time::OffsetDateTime::now_utc().unix_timestamp(),
-                    nym: resp.nym.clone(),
-                };
-
-                insert_nym_prices(&self.db_pool, price_record).await?;
-                Ok(resp)
-            }
-            Err(err) => {
-                //tracing::info!("💰 CoinGecko price response: {:?}", response);
-                tracing::error!("Error sending request: {err}");
-                Err(err.into())
-            }
-        }
-    }
-
-    pub(crate) async fn run(&self) {
-        loop {
-            tracing::info!("Running in a loop 🏃");
-            match self.get_coingecko_prices().await {
-                Ok(coingecko_price_response) => {
-                    self.shared_state
-                        .new_success(coingecko_price_response)
-                        .await;
-                    tracing::info!("✅ Successfully fetched CoinGecko prices");
-                    tokio::time::sleep(REFRESH_DELAY).await;
-                }
-                Err(err) => {
-                    tracing::error!("❌ Failed to get CoinGecko prices: {err}");
-                    tracing::info!("Retrying in {}s...", FAILURE_RETRY_DELAY.as_secs());
-                    self.shared_state.new_failure(err.to_string()).await;
-                    tokio::time::sleep(FAILURE_RETRY_DELAY).await;
-                }
-            }
+pub(crate) async fn run_price_scraper(db_pool: &DbPool) {
+    loop {
+        tracing::info!("Running in a loop 🏃");
+        if let Err(e) = get_coingecko_prices(db_pool).await {
+            tracing::error!("❌ Failed to get CoinGecko prices: {e}");
+            tracing::info!("Retrying in {}s...", FAILURE_RETRY_DELAY.as_secs());
+            tokio::time::sleep(FAILURE_RETRY_DELAY).await;
+        } else {
+            tracing::info!("✅ Successfully fetched CoinGecko prices");
+            tokio::time::sleep(REFRESH_DELAY).await;
        }
    }
 }
+
+async fn get_coingecko_prices(pool: &DbPool) -> anyhow::Result<()> {
+    tracing::info!("💰 Fetching CoinGecko prices from {}", COINGECKO_API_URL);
+
+    let response = reqwest::get(COINGECKO_API_URL)
+        .await?
+        .json::<CoingeckoPriceResponse>()
+        .await;
+
+    tracing::info!("Got response {:?}", response);
+    match response {
+        Ok(resp) => {
+            let price_record = PriceRecord {
+                timestamp: time::OffsetDateTime::now_utc().unix_timestamp(),
+                nym: resp.nym,
+            };
+
+            insert_nym_prices(pool, price_record).await?;
+        }
+        Err(e) => {
+            //tracing::info!("💰 CoinGecko price response: {:?}", response);
+            tracing::error!("Error sending request: {}", e);
+        }
+    }
+
+    Ok(())
+}
@@ -82,7 +82,7 @@ pub use nym_sphinx::{
 pub use nym_statistics_common::clients::{
    connection::ConnectionStatsEvent, ClientStatsEvents, ClientStatsSender,
 };
-pub use nym_task::connections::{LaneQueueLengths, TransmissionLane};
+pub use nym_task::connections::TransmissionLane;
 pub use nym_topology::{provider_trait::TopologyProvider, NymTopology};
 pub use paths::StoragePaths;
 pub use socks5_client::Socks5MixnetClient;
@@ -543,8 +543,6 @@ where
        Ok(GatewaySetup::New {
            specification: selection_spec,
            available_gateways,
-            #[cfg(unix)]
-            connection_fd_callback: self.connection_fd_callback.clone(),
        })
    }

@@ -506,11 +506,11 @@ brace-expansion@^2.0.1:
    balanced-match "^1.0.0"

 braces@^3.0.2, braces@~3.0.2:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
-  integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
+  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
  dependencies:
-    fill-range "^7.1.1"
+    fill-range "^7.0.1"

 builtin-modules@^3.3.0:
  version "3.3.0"
@@ -1215,10 +1215,10 @@ file-entry-cache@^6.0.1:
  dependencies:
    flat-cache "^3.0.4"

-fill-range@^7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
-  integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
+fill-range@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
+  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
  dependencies:
    to-regex-range "^5.0.1"

@@ -42,6 +42,7 @@ nym-gateway-requests = { path = "../../common/gateway-requests" }
 nym-gateway-storage = { path = "../../common/gateway-storage" }
 nym-id = { path = "../../common/nym-id" }
 nym-network-defaults = { path = "../../common/network-defaults" }
+nym-node-metrics = { path = "../../nym-node/nym-node-metrics" } #TODO SW this is fugly
 nym-sdk = { path = "../../sdk/rust/nym-sdk" }
 nym-service-providers-common = { path = "../common" }
 nym-service-provider-requests-common = { path = "../../common/service-provider-requests-common" }
@@ -7,6 +7,7 @@ use futures::channel::oneshot;
 use ipnetwork::IpNetwork;
 use nym_client_core::{HardcodedTopologyProvider, TopologyProvider};
 use nym_credential_verification::ecash::EcashManager;
+use nym_node_metrics::events::MetricEventsSender;
 use nym_sdk::{mixnet::Recipient, GatewayTransceiver};
 use nym_task::{TaskClient, TaskHandle};
 use nym_wireguard::WireguardGatewayData;
@@ -32,6 +33,7 @@ pub struct Authenticator {
    custom_gateway_transceiver: Option<Box<dyn GatewayTransceiver + Send + Sync>>,
    wireguard_gateway_data: WireguardGatewayData,
    ecash_verifier: Option<Arc<EcashManager>>,
+    metrics_sender: Option<MetricEventsSender>,
    used_private_network_ips: Vec<IpAddr>,
    shutdown: Option<TaskClient>,
    on_start: Option<oneshot::Sender<OnStartData>>,
@@ -49,6 +51,7 @@ impl Authenticator {
            custom_topology_provider: None,
            custom_gateway_transceiver: None,
            ecash_verifier: None,
+            metrics_sender: None,
            wireguard_gateway_data,
            used_private_network_ips,
            shutdown: None,
@@ -63,6 +66,13 @@ impl Authenticator {
        self
    }

+    #[must_use]
+    #[allow(unused)]
+    pub fn with_metrics_event_sender(mut self, metrics_sender: MetricEventsSender) -> Self {
+        self.metrics_sender = Some(metrics_sender);
+        self
+    }
+
    #[must_use]
    #[allow(unused)]
    pub fn with_shutdown(mut self, shutdown: TaskClient) -> Self {
@@ -163,6 +173,7 @@ impl Authenticator {
            mixnet_client,
            task_handle,
            self.ecash_verifier,
+            self.metrics_sender,
        );

        log::info!("The address of this client is: {self_address}");
@@ -27,9 +27,10 @@ use nym_credential_verification::{
    bandwidth_storage_manager::BandwidthStorageManager, ecash::EcashManager,
    BandwidthFlushingBehaviourConfig, ClientBandwidth, CredentialVerifier,
 };
-use nym_credentials_interface::CredentialSpendingData;
+use nym_credentials_interface::{CredentialSpendingData, TicketType};
 use nym_crypto::asymmetric::x25519::KeyPair;
 use nym_gateway_requests::models::CredentialSpendingRequest;
+use nym_node_metrics::events::{GatewaySessionEvent, MetricEventsSender};
 use nym_sdk::mixnet::{
    AnonymousSenderTag, InputMessage, MixnetMessageSender, Recipient, TransmissionLane,
 };
@@ -76,6 +77,8 @@ pub(crate) struct MixnetListener {

    pub(crate) ecash_verifier: Option<Arc<EcashManager>>,

+    pub(crate) metrics_events_sender: Option<MetricEventsSender>,
+
    pub(crate) timeout_check_interval: IntervalStream,
 }

@@ -87,6 +90,7 @@ impl MixnetListener {
        mixnet_client: nym_sdk::mixnet::MixnetClient,
        task_handle: TaskHandle,
        ecash_verifier: Option<Arc<EcashManager>>,
+        metrics_event_sender: Option<MetricEventsSender>,
    ) -> Self {
        let timeout_check_interval =
            IntervalStream::new(tokio::time::interval(DEFAULT_REGISTRATION_TIMEOUT_CHECK));
@@ -97,6 +101,7 @@ impl MixnetListener {
            registred_and_free: RwLock::new(RegistredAndFree::new(free_private_network_ips)),
            peer_manager: PeerManager::new(wireguard_gateway_data),
            ecash_verifier,
+            metrics_events_sender: metrics_event_sender,
            timeout_check_interval,
        }
    }
@@ -510,7 +515,8 @@ impl MixnetListener {
                    "peer with ticket shouldn't have been used before without a ticket".to_string(),
                ))?;
            if let Err(e) =
-                Self::credential_verification(ecash_verifier.clone(), credential, client_id).await
+                Self::credential_verification(ecash_verifier.clone(), credential.clone(), client_id)
+                    .await
            {
                ecash_verifier
                    .storage()
@@ -518,6 +524,7 @@ impl MixnetListener {
                    .await?;
                return Err(e);
            }
+            self.send_ecash_metrics_event(credential);
            let public_key = peer.public_key.to_string();
            if let Err(e) = self.peer_manager.add_peer(peer, Some(client_id)).await {
                ecash_verifier
@@ -624,6 +631,22 @@ impl MixnetListener {
        Ok(verifier.verify().await?)
    }

+    fn send_ecash_metrics_event(&self, credential: CredentialSpendingData) {
+        if let Some(metrics_events_sender) = &self.metrics_events_sender {
+            if let Ok(ticket_type) = TicketType::try_from_encoded(credential.payment.t_type) {
+                metrics_events_sender.report_unchecked(GatewaySessionEvent::new_ecash_ticket(
+                    self.mixnet_client
+                        .nym_address()
+                        .as_sphinx_destination()
+                        .address,
+                    ticket_type,
+                ));
+            } else {
+                log::error!("Somehow trying to send a ticket event with an unknown ticket type");
+            }
+        }
+    }
+
    async fn on_query_bandwidth_request(
        &mut self,
        msg: Box<dyn QueryBandwidthMessage + Send + Sync + 'static>,
@@ -741,6 +764,7 @@ impl MixnetListener {
            ),
        );
        let available_bandwidth = verifier.verify().await?;
+        self.send_ecash_metrics_event(msg.credential());

        let bytes = match AuthenticatorVersion::from(protocol) {
            AuthenticatorVersion::V5 => v5::response::AuthenticatorResponse::new_topup_bandwidth(
@@ -4,7 +4,7 @@
 [package]
 name = "nym-network-requester"
 license = "GPL-3.0"
-version = "1.1.52"
+version = "1.1.51"
 authors.workspace = true
 edition.workspace = true
 rust-version = "1.70"
@@ -1,30 +0,0 @@
-[package]
-name = "validator-status-check"
-version = "0.1.0"
-authors.workspace = true
-repository.workspace = true
-homepage.workspace = true
-documentation.workspace = true
-edition.workspace = true
-license.workspace = true
-rust-version.workspace = true
-readme.workspace = true
-
-[dependencies]
-anyhow = { workspace = true }
-clap = { workspace = true, features = ["cargo", "derive"] }
-comfy-table = { workspace = true }
-tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }
-strum = { workspace = true, features = ["derive"] }
-serde = { workspace = true, features = ["derive"] }
-serde_json = { workspace = true }
-tracing = { workspace = true }
-time = { workspace = true }
-
-
-nym-validator-client = { path = "../../../common/client-libs/validator-client" }
-nym-bin-common = { path = "../../../common/bin-common", features = ["output_format", "basic_tracing"] }
-nym-network-defaults = { path = "../../../common/network-defaults" }
-
-[lints]
-workspace = true
@@ -1,15 +0,0 @@
-// Copyright 2025 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: GPL-3.0-only
-
-use nym_bin_common::bin_info_owned;
-use nym_bin_common::output_format::OutputFormat;
-
-#[derive(clap::Args, Debug)]
-pub(crate) struct Args {
-    #[clap(short, long, default_value_t = OutputFormat::default())]
-    output: OutputFormat,
-}
-
-pub(crate) fn execute(args: Args) {
-    println!("{}", args.output.format(&bin_info_owned!()))
-}
@@ -1,73 +0,0 @@
-// Copyright 2025 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: GPL-3.0-only
-
-use crate::helpers::{get_known_dealers, get_signer_status};
-use crate::models::SignerStatus;
-use comfy_table::Table;
-use nym_bin_common::output_format::OutputFormat;
-use serde::{Deserialize, Serialize};
-use std::fmt::{Display, Formatter};
-
-#[derive(clap::Args, Debug)]
-pub(crate) struct Args {
-    #[clap(short, long, default_value_t = OutputFormat::default())]
-    output: OutputFormat,
-}
-
-#[derive(Serialize, Deserialize)]
-struct NetworkStatus {
-    available_api_nodes: f64,
-    available_rpc_nodes: f64,
-    detailed: Vec<SignerStatus>,
-}
-
-impl From<Vec<SignerStatus>> for NetworkStatus {
-    fn from(value: Vec<SignerStatus>) -> Self {
-        let nodes = value.len() as f64;
-        let api = value.iter().filter(|s| s.api_up()).count() as f64;
-        let rpc = value.iter().filter(|s| s.rpc_up()).count() as f64;
-
-        NetworkStatus {
-            available_api_nodes: api / nodes,
-            available_rpc_nodes: rpc / nodes,
-            detailed: value,
-        }
-    }
-}
-
-impl Display for NetworkStatus {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        writeln!(
-            f,
-            "available signers: {:.2}%, available rpc nodes: {:.2}%",
-            self.available_api_nodes, self.available_rpc_nodes
-        )?;
-
-        let mut table = Table::new();
-        table.set_header(vec![
-            "signer",
-            "api version",
-            "rpc status",
-            "rpc endpoint",
-            "abci version",
-        ]);
-        for signer in &self.detailed {
-            table.add_row(signer.to_table_row());
-        }
-        write!(f, "{table}")
-    }
-}
-
-pub(crate) async fn execute(args: Args) -> anyhow::Result<()> {
-    let dealers = get_known_dealers().await?;
-
-    let mut signers = Vec::new();
-    for dealer in dealers {
-        signers.push(get_signer_status(&dealer.announce_address).await)
-    }
-
-    let out = args.output.format(&NetworkStatus::from(signers));
-    println!("{out}");
-
-    Ok(())
-}
@@ -1,21 +0,0 @@
-// Copyright 2025 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: GPL-3.0-only
-
-use crate::helpers::get_signer_status;
-use nym_bin_common::output_format::OutputFormat;
-
-#[derive(clap::Args, Debug)]
-pub(crate) struct Args {
-    #[clap(short, long, default_value_t = OutputFormat::default())]
-    output: OutputFormat,
-
-    /// api address of the specified signer
-    #[clap(long)]
-    signer: String,
-}
-
-pub(crate) async fn execute(args: Args) -> anyhow::Result<()> {
-    let out = args.output.format(&get_signer_status(&args.signer).await);
-    println!("{out}");
-    Ok(())
-}
@@ -1,51 +0,0 @@
-// Copyright 2025 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: GPL-3.0-only
-
-use clap::{Parser, Subcommand};
-use nym_bin_common::bin_info;
-use std::path::PathBuf;
-use std::sync::OnceLock;
-
-mod build_info;
-mod check_network;
-mod check_signer;
-
-fn pretty_build_info_static() -> &'static str {
-    static PRETTY_BUILD_INFORMATION: OnceLock<String> = OnceLock::new();
-    PRETTY_BUILD_INFORMATION.get_or_init(|| bin_info!().pretty_print())
-}
-
-#[derive(Parser, Debug)]
-#[clap(author = "Nymtech", version, long_version = pretty_build_info_static(), about)]
-pub struct Cli {
-    /// Path pointing to an env file that configures the CLI.
-    #[clap(short, long)]
-    pub(crate) config_env_file: Option<PathBuf>,
-
-    #[clap(subcommand)]
-    command: Commands,
-}
-
-#[derive(Subcommand, Debug)]
-pub(crate) enum Commands {
-    /// Check status of an individual signer
-    CheckSigner(check_signer::Args),
-
-    /// Check status of all signers
-    CheckNetwork(check_network::Args),
-
-    /// Show build information of this binary
-    BuildInfo(build_info::Args),
-}
-
-impl Cli {
-    pub async fn execute(self) -> anyhow::Result<()> {
-        match self.command {
-            Commands::CheckSigner(args) => check_signer::execute(args).await?,
-            Commands::CheckNetwork(args) => check_network::execute(args).await?,
-            Commands::BuildInfo(args) => build_info::execute(args),
-        }
-
-        Ok(())
-    }
-}
@@ -1,39 +0,0 @@
-// Copyright 2025 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: GPL-3.0-only
-
-use crate::models::SignerStatus;
-use anyhow::bail;
-use nym_network_defaults::NymNetworkDetails;
-use nym_validator_client::nyxd::contract_traits::dkg_query_client::DealerDetails;
-use nym_validator_client::nyxd::contract_traits::PagedDkgQueryClient;
-use nym_validator_client::nyxd::Config;
-use nym_validator_client::QueryHttpRpcNyxdClient;
-use tracing::info;
-
-async fn get_query_client() -> anyhow::Result<QueryHttpRpcNyxdClient> {
-    let network = NymNetworkDetails::new_from_env();
-
-    let Some(endpoint_info) = network.endpoints.first() else {
-        bail!("no known rpc endpoints available")
-    };
-
-    let config = Config::try_from_nym_network_details(&network)?;
-    Ok(QueryHttpRpcNyxdClient::connect(
-        config,
-        endpoint_info.nyxd_url.as_str(),
-    )?)
-}
-
-pub(crate) async fn get_known_dealers() -> anyhow::Result<Vec<DealerDetails>> {
-    let client = get_query_client().await?;
-    Ok(client.get_all_current_dealers().await?)
-}
-
-pub(crate) async fn get_signer_status(raw_api_endpoint: &str) -> SignerStatus {
-    info!("attempting to get signer status of {raw_api_endpoint}...");
-    let mut status = SignerStatus::new(raw_api_endpoint.to_string());
-
-    status.try_update_api_version().await;
-    status.try_update_rpc_status().await;
-    status
-}
@@ -1,24 +0,0 @@
-// Copyright 2025 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: GPL-3.0-only
-
-use crate::commands::Cli;
-use clap::Parser;
-use nym_bin_common::logging::setup_tracing_logger;
-use nym_network_defaults::setup_env;
-use tracing::trace;
-
-mod commands;
-mod helpers;
-mod models;
-
-#[tokio::main]
-async fn main() -> anyhow::Result<()> {
-    let cli = Cli::parse();
-    trace!("args: {cli:#?}");
-
-    setup_env(cli.config_env_file.as_ref());
-    setup_tracing_logger();
-
-    cli.execute().await?;
-    Ok(())
-}
@@ -1,222 +0,0 @@
-// Copyright 2025 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: GPL-3.0-only
-
-use nym_validator_client::client::NymApiClientExt;
-use nym_validator_client::NymApiClient;
-use serde::{Deserialize, Serialize};
-use std::fmt::Display;
-use strum::{Display, EnumProperty};
-use time::{Duration, OffsetDateTime};
-use tracing::error;
-
-#[derive(Serialize, Deserialize)]
-pub(crate) struct SignerStatus {
-    api_endpoint: String,
-    api_version: ApiVersion,
-    rpc_status: RpcStatus,
-    used_rpc_endpoint: RpcEndpoint,
-    abci_version: AbciVersion,
-}
-
-impl Display for SignerStatus {
-    fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        writeln!(f, "api_endpoint: {}", self.api_endpoint)?;
-        writeln!(f, "api_version: {}", self.api_version)?;
-        writeln!(f, "rpc_status: {}", self.rpc_status)?;
-        writeln!(f, "used_rpc_endpoint: {}", self.used_rpc_endpoint)?;
-        writeln!(f, "abci_version: {}", self.abci_version)?;
-        Ok(())
-    }
-}
-
-impl SignerStatus {
-    pub(crate) fn new(api_endpoint: String) -> Self {
-        SignerStatus {
-            api_endpoint,
-            api_version: Default::default(),
-            rpc_status: Default::default(),
-            used_rpc_endpoint: Default::default(),
-            abci_version: Default::default(),
-        }
-    }
-
-    pub(crate) fn api_up(&self) -> bool {
-        matches!(self.api_version, ApiVersion::Available { .. })
-    }
-
-    pub(crate) fn rpc_up(&self) -> bool {
-        matches!(self.rpc_status, RpcStatus::Up)
-    }
-
-    fn build_api_client(&self) -> Option<NymApiClient> {
-        let api_endpoint = match self.api_endpoint.as_str().parse() {
-            Ok(endpoint) => endpoint,
-            Err(err) => {
-                error!("{} is not a valid api endpoint: {err}", self.api_endpoint);
-                return None;
-            }
-        };
-
-        Some(NymApiClient::new(api_endpoint))
-    }
-
-    pub(crate) async fn try_update_api_version(&mut self) {
-        let Some(client) = self.build_api_client() else {
-            return;
-        };
-        match client.nym_api.build_information().await {
-            Ok(build_info) => {
-                self.api_version = ApiVersion::Available {
-                    version: build_info.build_version,
-                };
-            }
-            Err(err) => {
-                error!(
-                    "failed to retrieve build information of {}: {err}",
-                    self.api_endpoint
-                )
-            }
-        }
-    }
-
-    pub(crate) async fn try_update_rpc_status(&mut self) {
-        let Some(client) = self.build_api_client() else {
-            return;
-        };
-
-        match client.nym_api.get_chain_status().await {
-            Ok(chain_status) => {
-                self.used_rpc_endpoint = RpcEndpoint(chain_status.connected_nyxd);
-                let last_block =
-                    OffsetDateTime::from(chain_status.status.latest_block.block.header.time);
-                let now = OffsetDateTime::now_utc();
-                let diff = now - last_block;
-                if diff < Duration::minutes(2) {
-                    self.rpc_status = RpcStatus::Up
-                } else {
-                    self.rpc_status = RpcStatus::Down
-                }
-                self.abci_version = AbciVersion::Available {
-                    version: chain_status.status.abci.version,
-                }
-            }
-            Err(err) => {
-                error!(
-                    "failed to retrieve chain status from {}: {err}",
-                    self.api_endpoint
-                );
-            }
-        }
-    }
-
-    pub(crate) fn to_table_row(&self) -> Vec<String> {
-        vec![
-            self.api_endpoint.to_string(),
-            self.api_version.as_cell(),
-            self.rpc_status.as_cell(),
-            self.used_rpc_endpoint.as_cell(),
-            self.abci_version.as_cell(),
-        ]
-    }
-}
-
-#[derive(Serialize, Deserialize, Default)]
-struct RpcEndpoint(String);
-
-impl Display for RpcEndpoint {
-    fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        self.0.fmt(f)
-    }
-}
-
-impl RpcEndpoint {
-    fn as_cell(&self) -> String {
-        if self.0.contains("localhost") || self.0.contains("127.0.0.1") {
-            format!("✅ {}", self.0)
-        } else if self.0.contains("nymtech") {
-            format!("❗ {}", self.0)
-        } else if self.0.is_empty() {
-            "⚠️ unknown".to_string()
-        } else {
-            format!("⚠️  {}", self.0)
-        }
-    }
-}
-
-#[derive(
-    Clone, Default, PartialOrd, PartialEq, Ord, Eq, Display, EnumProperty, Serialize, Deserialize,
-)]
-#[strum(serialize_all = "snake_case")]
-enum AbciVersion {
-    #[strum(props(emoji = "✅"))]
-    #[strum(to_string = "{version}")]
-    Available { version: String },
-
-    #[strum(props(emoji = "❗"))]
-    #[default]
-    Unavailable,
-}
-
-impl AbciVersion {
-    // SAFETY: every variant has a `emoji` prop defined
-    #[allow(clippy::unwrap_used)]
-    fn as_cell(&self) -> String {
-        format!("{} {}", self.get_str("emoji").unwrap(), self)
-    }
-}
-
-#[derive(
-    Clone, Default, PartialOrd, PartialEq, Ord, Eq, Display, EnumProperty, Serialize, Deserialize,
-)]
-#[strum(serialize_all = "snake_case")]
-enum ApiVersion {
-    #[strum(props(emoji = "✅"))]
-    #[strum(to_string = "{version}")]
-    Available { version: String },
-
-    #[strum(props(emoji = "❗"))]
-    #[default]
-    Unavailable,
-}
-
-impl ApiVersion {
-    // SAFETY: every variant has a `emoji` prop defined
-    #[allow(clippy::unwrap_used)]
-    fn as_cell(&self) -> String {
-        format!("{} {}", self.get_str("emoji").unwrap(), self)
-    }
-}
-
-#[derive(
-    Copy,
-    Clone,
-    Default,
-    PartialOrd,
-    PartialEq,
-    Ord,
-    Eq,
-    Display,
-    EnumProperty,
-    Serialize,
-    Deserialize,
-)]
-#[strum(serialize_all = "snake_case")]
-enum RpcStatus {
-    #[strum(props(emoji = "❗"))]
-    Down,
-
-    #[strum(props(emoji = "✅"))]
-    Up,
-
-    #[strum(props(emoji = "⚠️"))]
-    #[default]
-    Unknown,
-}
-
-impl RpcStatus {
-    // SAFETY: every variant has a `emoji` prop defined
-    #[allow(clippy::unwrap_used)]
-    fn as_cell(&self) -> String {
-        format!("{} {}", self.get_str("emoji").unwrap(), self)
-    }
-}
@@ -1,6 +1,6 @@
 [package]
 name = "nym-cli"
-version = "1.1.51"
+version = "1.1.50"
 authors.workspace = true
 edition = "2021"
 license.workspace = true
@@ -1,6 +1,6 @@
 [package]
 name = "nymvisor"
-version = "0.1.16"
+version = "0.1.15"
 authors.workspace = true
 repository.workspace = true
 homepage.workspace = true
@@ -24,7 +24,8 @@
    },
    "../pkg": {
      "name": "@nymproject/nym-client-wasm",
-      "version": "1.4.0-rc.0"
+      "version": "1.4.0-rc.0",
+      "license": "Apache-2.0"
    },
    "node_modules/@discoveryjs/json-ext": {
      "version": "0.5.7",
@@ -697,9 +698,9 @@
      }
    },
    "node_modules/body-parser": {
-      "version": "1.20.3",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz",
-      "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==",
+      "version": "1.20.2",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz",
+      "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -711,7 +712,7 @@
        "http-errors": "2.0.0",
        "iconv-lite": "0.4.24",
        "on-finished": "2.4.1",
-        "qs": "6.13.0",
+        "qs": "6.11.0",
        "raw-body": "2.5.2",
        "type-is": "~1.6.18",
        "unpipe": "1.0.0"
@@ -814,32 +815,15 @@
        "node": ">= 0.8"
      }
    },
-    "node_modules/call-bind-apply-helpers": {
+    "node_modules/call-bind": {
      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
-      "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/call-bound": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz",
-      "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bind-apply-helpers": "^1.0.2",
-        "get-intrinsic": "^1.3.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.0.2"
      },
      "funding": {
        "url": "https://github.com/sponsors/ljharb"
@@ -1026,9 +1010,9 @@
      }
    },
    "node_modules/cookie": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz",
-      "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==",
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz",
+      "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==",
      "dev": true,
      "license": "MIT",
      "engines": {
@@ -1183,21 +1167,6 @@
        "node": ">=6"
      }
    },
-    "node_modules/dunder-proto": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
-      "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bind-apply-helpers": "^1.0.1",
-        "es-errors": "^1.3.0",
-        "gopd": "^1.2.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
    "node_modules/ee-first": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
@@ -1213,9 +1182,9 @@
      "license": "ISC"
    },
    "node_modules/encodeurl": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
-      "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
      "dev": true,
      "license": "MIT",
      "engines": {
@@ -1249,26 +1218,6 @@
        "node": ">=4"
      }
    },
-    "node_modules/es-define-property": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
-      "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/es-errors": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
-      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
    "node_modules/es-module-lexer": {
      "version": "0.9.3",
      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz",
@@ -1276,19 +1225,6 @@
      "dev": true,
      "license": "MIT"
    },
-    "node_modules/es-object-atoms": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
-      "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "es-errors": "^1.3.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
    "node_modules/escalade": {
      "version": "3.1.1",
      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
@@ -1405,38 +1341,38 @@
      }
    },
    "node_modules/express": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz",
-      "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==",
+      "version": "4.19.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz",
+      "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
        "accepts": "~1.3.8",
        "array-flatten": "1.1.1",
-        "body-parser": "1.20.3",
+        "body-parser": "1.20.2",
        "content-disposition": "0.5.4",
        "content-type": "~1.0.4",
-        "cookie": "0.7.1",
+        "cookie": "0.6.0",
        "cookie-signature": "1.0.6",
        "debug": "2.6.9",
        "depd": "2.0.0",
-        "encodeurl": "~2.0.0",
+        "encodeurl": "~1.0.2",
        "escape-html": "~1.0.3",
        "etag": "~1.8.1",
-        "finalhandler": "1.3.1",
+        "finalhandler": "1.2.0",
        "fresh": "0.5.2",
        "http-errors": "2.0.0",
-        "merge-descriptors": "1.0.3",
+        "merge-descriptors": "1.0.1",
        "methods": "~1.1.2",
        "on-finished": "2.4.1",
        "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.12",
+        "path-to-regexp": "0.1.7",
        "proxy-addr": "~2.0.7",
-        "qs": "6.13.0",
+        "qs": "6.11.0",
        "range-parser": "~1.2.1",
        "safe-buffer": "5.2.1",
-        "send": "0.19.0",
-        "serve-static": "1.16.2",
+        "send": "0.18.0",
+        "serve-static": "1.15.0",
        "setprototypeof": "1.2.0",
        "statuses": "2.0.1",
        "type-is": "~1.6.18",
@@ -1445,10 +1381,6 @@
      },
      "engines": {
        "node": ">= 0.10.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/express"
      }
    },
    "node_modules/express/node_modules/array-flatten": {
@@ -1549,14 +1481,14 @@
      }
    },
    "node_modules/finalhandler": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz",
-      "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
+      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
        "debug": "2.6.9",
-        "encodeurl": "~2.0.0",
+        "encodeurl": "~1.0.2",
        "escape-html": "~1.0.3",
        "on-finished": "2.4.1",
        "parseurl": "~1.3.3",
@@ -1652,54 +1584,27 @@
      }
    },
    "node_modules/function-bind": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
-      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
      "dev": true,
-      "license": "MIT",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
+      "license": "MIT"
    },
    "node_modules/get-intrinsic": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
-      "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz",
+      "integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "call-bind-apply-helpers": "^1.0.2",
-        "es-define-property": "^1.0.1",
-        "es-errors": "^1.3.0",
-        "es-object-atoms": "^1.1.1",
-        "function-bind": "^1.1.2",
-        "get-proto": "^1.0.1",
-        "gopd": "^1.2.0",
-        "has-symbols": "^1.1.0",
-        "hasown": "^2.0.2",
-        "math-intrinsics": "^1.1.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.3"
      },
      "funding": {
        "url": "https://github.com/sponsors/ljharb"
      }
    },
-    "node_modules/get-proto": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
-      "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "dunder-proto": "^1.0.1",
-        "es-object-atoms": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
    "node_modules/get-stream": {
      "version": "6.0.1",
      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
@@ -1775,19 +1680,6 @@
        "url": "https://github.com/sponsors/sindresorhus"
      }
    },
-    "node_modules/gopd": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
-      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
    "node_modules/graceful-fs": {
      "version": "4.2.11",
      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
@@ -1826,9 +1718,9 @@
      }
    },
    "node_modules/has-symbols": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
-      "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
      "dev": true,
      "license": "MIT",
      "engines": {
@@ -1838,19 +1730,6 @@
        "url": "https://github.com/sponsors/ljharb"
      }
    },
-    "node_modules/hasown": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
-      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "function-bind": "^1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
    "node_modules/hello-wasm-pack": {
      "version": "0.1.0",
      "resolved": "https://registry.npmjs.org/hello-wasm-pack/-/hello-wasm-pack-0.1.0.tgz",
@@ -2297,16 +2176,6 @@
        "node": ">=8"
      }
    },
-    "node_modules/math-intrinsics": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
-      "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
    "node_modules/media-typer": {
      "version": "0.3.0",
      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
@@ -2331,14 +2200,11 @@
      }
    },
    "node_modules/merge-descriptors": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz",
-      "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
+      "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==",
      "dev": true,
-      "license": "MIT",
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
+      "license": "MIT"
    },
    "node_modules/merge-stream": {
      "version": "2.0.0",
@@ -2526,14 +2392,11 @@
      }
    },
    "node_modules/object-inspect": {
-      "version": "1.13.4",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz",
-      "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==",
+      "version": "1.12.3",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
+      "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
      "dev": true,
      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      },
      "funding": {
        "url": "https://github.com/sponsors/ljharb"
      }
@@ -2713,9 +2576,9 @@
      "license": "MIT"
    },
    "node_modules/path-to-regexp": {
-      "version": "0.1.12",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
-      "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==",
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
+      "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==",
      "dev": true,
      "license": "MIT"
    },
@@ -2804,13 +2667,13 @@
      }
    },
    "node_modules/qs": {
-      "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
-      "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
      "dev": true,
      "license": "BSD-3-Clause",
      "dependencies": {
-        "side-channel": "^1.0.6"
+        "side-channel": "^1.0.4"
      },
      "engines": {
        "node": ">=0.6"
@@ -3116,9 +2979,9 @@
      }
    },
    "node_modules/send": {
-      "version": "0.19.0",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",
-      "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==",
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
+      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -3140,16 +3003,6 @@
        "node": ">= 0.8.0"
      }
    },
-    "node_modules/send/node_modules/encodeurl": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
    "node_modules/send/node_modules/ms": {
      "version": "2.1.3",
      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
@@ -3237,16 +3090,16 @@
      }
    },
    "node_modules/serve-static": {
-      "version": "1.16.2",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz",
-      "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
+      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "encodeurl": "~2.0.0",
+        "encodeurl": "~1.0.2",
        "escape-html": "~1.0.3",
        "parseurl": "~1.3.3",
-        "send": "0.19.0"
+        "send": "0.18.0"
      },
      "engines": {
        "node": ">= 0.8.0"
@@ -3306,76 +3159,15 @@
      }
    },
    "node_modules/side-channel": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz",
-      "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "es-errors": "^1.3.0",
-        "object-inspect": "^1.13.3",
-        "side-channel-list": "^1.0.0",
-        "side-channel-map": "^1.0.1",
-        "side-channel-weakmap": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/side-channel-list": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz",
-      "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "es-errors": "^1.3.0",
-        "object-inspect": "^1.13.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/side-channel-map": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz",
-      "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bound": "^1.0.2",
-        "es-errors": "^1.3.0",
-        "get-intrinsic": "^1.2.5",
-        "object-inspect": "^1.13.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/side-channel-weakmap": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz",
-      "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bound": "^1.0.2",
-        "es-errors": "^1.3.0",
-        "get-intrinsic": "^1.2.5",
-        "object-inspect": "^1.13.3",
-        "side-channel-map": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.2",
+        "object-inspect": "^1.9.0"
      },
      "funding": {
        "url": "https://github.com/sponsors/ljharb"
@@ -3951,9 +3743,9 @@
      }
    },
    "node_modules/webpack-dev-middleware": {
-      "version": "5.3.4",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz",
-      "integrity": "sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==",
+      "version": "5.3.3",
+      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz",
+      "integrity": "sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -34,7 +34,7 @@
    "@jridgewell/gen-mapping" "^0.3.0"
    "@jridgewell/trace-mapping" "^0.3.9"

-"@jridgewell/sourcemap-codec@1.4.14", "@jridgewell/sourcemap-codec@^1.4.10":
+"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@1.4.14":
  version "1.4.14"
  resolved "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz"
  integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
@@ -60,7 +60,7 @@
    "@nodelib/fs.stat" "2.0.5"
    run-parallel "^1.1.9"

-"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2":
+"@nodelib/fs.stat@^2.0.2", "@nodelib/fs.stat@2.0.5":
  version "2.0.5"
  resolved "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz"
  integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
@@ -75,6 +75,7 @@

 "@nymproject/nym-client-wasm@file:../pkg":
  version "1.4.0-rc.0"
+  resolved "file:../pkg"

 "@types/body-parser@*":
  version "1.19.2"
@@ -373,7 +374,7 @@ acorn-import-assertions@^1.7.6:
  resolved "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz"
  integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==

-acorn@^8.5.0, acorn@^8.7.1:
+acorn@^8, acorn@^8.5.0, acorn@^8.7.1:
  version "8.8.2"
  resolved "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz"
  integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==
@@ -397,7 +398,7 @@ ajv-keywords@^5.0.0:
  dependencies:
    fast-deep-equal "^3.1.3"

-ajv@^6.12.5:
+ajv@^6.12.5, ajv@^6.9.1:
  version "6.12.6"
  resolved "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz"
  integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -407,7 +408,7 @@ ajv@^6.12.5:
    json-schema-traverse "^0.4.1"
    uri-js "^4.2.2"

-ajv@^8.0.0, ajv@^8.8.0:
+ajv@^8.0.0, ajv@^8.8.0, ajv@^8.8.2:
  version "8.12.0"
  resolved "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz"
  integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==
@@ -430,16 +431,16 @@ anymatch@~3.1.2:
    normalize-path "^3.0.0"
    picomatch "^2.0.4"

-array-flatten@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz"
-  integrity sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==
-
 array-flatten@^2.1.2:
  version "2.1.2"
  resolved "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz"
  integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==

+array-flatten@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz"
+  integrity sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==
+
 balanced-match@^1.0.0:
  version "1.0.2"
  resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz"
@@ -455,10 +456,10 @@ binary-extensions@^2.0.0:
  resolved "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz"
  integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==

-body-parser@1.20.3:
-  version "1.20.3"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.3.tgz#1953431221c6fb5cd63c4b36d53fab0928e548c6"
-  integrity sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==
+body-parser@1.20.2:
+  version "1.20.2"
+  resolved "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz"
+  integrity sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==
  dependencies:
    bytes "3.1.2"
    content-type "~1.0.5"
@@ -468,7 +469,7 @@ body-parser@1.20.3:
    http-errors "2.0.0"
    iconv-lite "0.4.24"
    on-finished "2.4.1"
-    qs "6.13.0"
+    qs "6.11.0"
    raw-body "2.5.2"
    type-is "~1.6.18"
    unpipe "1.0.0"
@@ -498,7 +499,7 @@ braces@^3.0.2, braces@~3.0.2:
  dependencies:
    fill-range "^7.0.1"

-browserslist@^4.14.5:
+browserslist@^4.14.5, "browserslist@>= 4.21.0":
  version "4.21.5"
  resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.21.5.tgz"
  integrity sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==
@@ -523,21 +524,13 @@ bytes@3.1.2:
  resolved "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz"
  integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==

-call-bind-apply-helpers@^1.0.1, call-bind-apply-helpers@^1.0.2:
+call-bind@^1.0.0:
  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz#4b5428c222be985d79c3d82657479dbe0b59b2d6"
-  integrity sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==
+  resolved "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz"
+  integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
  dependencies:
-    es-errors "^1.3.0"
-    function-bind "^1.1.2"
-
-call-bound@^1.0.2:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/call-bound/-/call-bound-1.0.4.tgz#238de935d2a2a692928c538c7ccfa91067fd062a"
-  integrity sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==
-  dependencies:
-    call-bind-apply-helpers "^1.0.2"
-    get-intrinsic "^1.3.0"
+    function-bind "^1.1.1"
+    get-intrinsic "^1.0.2"

 caniuse-lite@^1.0.30001449:
  version "1.0.30001474"
@@ -635,10 +628,10 @@ cookie-signature@1.0.6:
  resolved "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz"
  integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==

-cookie@0.7.1:
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.7.1.tgz#2f73c42142d5d5cf71310a74fc4ae61670e5dbc9"
-  integrity sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==
+cookie@0.6.0:
+  version "0.6.0"
+  resolved "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz"
+  integrity sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==

 copy-webpack-plugin@^11.0.0:
  version "11.0.0"
@@ -666,13 +659,6 @@ cross-spawn@^7.0.3:
    shebang-command "^2.0.0"
    which "^2.0.1"

-debug@2.6.9:
-  version "2.6.9"
-  resolved "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"
-  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
-  dependencies:
-    ms "2.0.0"
-
 debug@^4.1.0:
  version "4.3.4"
  resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"
@@ -680,6 +666,13 @@ debug@^4.1.0:
  dependencies:
    ms "2.1.2"

+debug@2.6.9:
+  version "2.6.9"
+  resolved "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"
+  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
+  dependencies:
+    ms "2.0.0"
+
 default-gateway@^6.0.3:
  version "6.0.3"
  resolved "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz"
@@ -692,16 +685,16 @@ define-lazy-prop@^2.0.0:
  resolved "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz"
  integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==

-depd@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz"
-  integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
-
 depd@~1.1.2:
  version "1.1.2"
  resolved "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz"
  integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==

+depd@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz"
+  integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
+
 destroy@1.2.0:
  version "1.2.0"
  resolved "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz"
@@ -731,15 +724,6 @@ dns-packet@^5.2.2:
  dependencies:
    "@leichtgewicht/ip-codec" "^2.0.1"

-dunder-proto@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/dunder-proto/-/dunder-proto-1.0.1.tgz#d7ae667e1dc83482f8b70fd0f6eefc50da30f58a"
-  integrity sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==
-  dependencies:
-    call-bind-apply-helpers "^1.0.1"
-    es-errors "^1.3.0"
-    gopd "^1.2.0"
-
 ee-first@1.1.1:
  version "1.1.1"
  resolved "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz"
@@ -755,11 +739,6 @@ encodeurl@~1.0.2:
  resolved "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz"
  integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==

-encodeurl@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-2.0.0.tgz#7b8ea898077d7e409d3ac45474ea38eaf0857a58"
-  integrity sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==
-
 enhanced-resolve@^5.10.0:
  version "5.12.0"
  resolved "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz"
@@ -773,28 +752,11 @@ envinfo@^7.7.3:
  resolved "https://registry.npmjs.org/envinfo/-/envinfo-7.8.1.tgz"
  integrity sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==

-es-define-property@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.1.tgz#983eb2f9a6724e9303f61addf011c72e09e0b0fa"
-  integrity sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==
-
-es-errors@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f"
-  integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==
-
 es-module-lexer@^0.9.0:
  version "0.9.3"
  resolved "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz"
  integrity sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==

-es-object-atoms@^1.0.0, es-object-atoms@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/es-object-atoms/-/es-object-atoms-1.1.1.tgz#1c4f2c4837327597ce69d2ca190a7fdd172338c1"
-  integrity sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==
-  dependencies:
-    es-errors "^1.3.0"
-
 escalade@^3.1.1:
  version "3.1.1"
  resolved "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz"
@@ -861,36 +823,36 @@ execa@^5.0.0:
    strip-final-newline "^2.0.0"

 express@^4.17.3:
-  version "4.21.2"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.21.2.tgz#cf250e48362174ead6cea4a566abef0162c1ec32"
-  integrity sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==
+  version "4.19.2"
+  resolved "https://registry.npmjs.org/express/-/express-4.19.2.tgz"
+  integrity sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==
  dependencies:
    accepts "~1.3.8"
    array-flatten "1.1.1"
-    body-parser "1.20.3"
+    body-parser "1.20.2"
    content-disposition "0.5.4"
    content-type "~1.0.4"
-    cookie "0.7.1"
+    cookie "0.6.0"
    cookie-signature "1.0.6"
    debug "2.6.9"
    depd "2.0.0"
-    encodeurl "~2.0.0"
+    encodeurl "~1.0.2"
    escape-html "~1.0.3"
    etag "~1.8.1"
-    finalhandler "1.3.1"
+    finalhandler "1.2.0"
    fresh "0.5.2"
    http-errors "2.0.0"
-    merge-descriptors "1.0.3"
+    merge-descriptors "1.0.1"
    methods "~1.1.2"
    on-finished "2.4.1"
    parseurl "~1.3.3"
-    path-to-regexp "0.1.12"
+    path-to-regexp "0.1.7"
    proxy-addr "~2.0.7"
-    qs "6.13.0"
+    qs "6.11.0"
    range-parser "~1.2.1"
    safe-buffer "5.2.1"
-    send "0.19.0"
-    serve-static "1.16.2"
+    send "0.18.0"
+    serve-static "1.15.0"
    setprototypeof "1.2.0"
    statuses "2.0.1"
    type-is "~1.6.18"
@@ -944,13 +906,13 @@ fill-range@^7.0.1:
  dependencies:
    to-regex-range "^5.0.1"

-finalhandler@1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.3.1.tgz#0c575f1d1d324ddd1da35ad7ece3df7d19088019"
-  integrity sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==
+finalhandler@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz"
+  integrity sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==
  dependencies:
    debug "2.6.9"
-    encodeurl "~2.0.0"
+    encodeurl "~1.0.2"
    escape-html "~1.0.3"
    on-finished "2.4.1"
    parseurl "~1.3.3"
@@ -990,51 +952,26 @@ fs.realpath@^1.0.0:
  resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"
  integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==

-fsevents@~2.3.2:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
-  integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
-
 function-bind@^1.1.1:
  version "1.1.1"
  resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"
  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==

-function-bind@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
-  integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
-
-get-intrinsic@^1.2.5, get-intrinsic@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.3.0.tgz#743f0e3b6964a93a5491ed1bffaae054d7f98d01"
-  integrity sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==
+get-intrinsic@^1.0.2:
+  version "1.2.0"
+  resolved "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz"
+  integrity sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==
  dependencies:
-    call-bind-apply-helpers "^1.0.2"
-    es-define-property "^1.0.1"
-    es-errors "^1.3.0"
-    es-object-atoms "^1.1.1"
-    function-bind "^1.1.2"
-    get-proto "^1.0.1"
-    gopd "^1.2.0"
-    has-symbols "^1.1.0"
-    hasown "^2.0.2"
-    math-intrinsics "^1.1.0"
-
-get-proto@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/get-proto/-/get-proto-1.0.1.tgz#150b3f2743869ef3e851ec0c49d15b1d14d00ee1"
-  integrity sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==
-  dependencies:
-    dunder-proto "^1.0.1"
-    es-object-atoms "^1.0.0"
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    has-symbols "^1.0.3"

 get-stream@^6.0.0:
  version "6.0.1"
  resolved "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz"
  integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==

-glob-parent@^5.1.2, glob-parent@~5.1.2:
+glob-parent@^5.1.2:
  version "5.1.2"
  resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz"
  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
@@ -1048,6 +985,13 @@ glob-parent@^6.0.1:
  dependencies:
    is-glob "^4.0.3"

+glob-parent@~5.1.2:
+  version "5.1.2"
+  resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz"
+  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
+  dependencies:
+    is-glob "^4.0.1"
+
 glob-to-regexp@^0.4.1:
  version "0.4.1"
  resolved "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz"
@@ -1076,11 +1020,6 @@ globby@^13.1.1:
    merge2 "^1.4.1"
    slash "^4.0.0"

-gopd@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.2.0.tgz#89f56b8217bdbc8802bd299df6d7f1081d7e51a1"
-  integrity sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==
-
 graceful-fs@^4.1.2, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
  version "4.2.11"
  resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz"
@@ -1096,10 +1035,10 @@ has-flag@^4.0.0:
  resolved "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz"
  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==

-has-symbols@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.1.0.tgz#fc9c6a783a084951d0b971fe1018de813707a338"
-  integrity sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==
+has-symbols@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz"
+  integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==

 has@^1.0.3:
  version "1.0.3"
@@ -1108,13 +1047,6 @@ has@^1.0.3:
  dependencies:
    function-bind "^1.1.1"

-hasown@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003"
-  integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==
-  dependencies:
-    function-bind "^1.1.2"
-
 hello-wasm-pack@^0.1.0:
  version "0.1.0"
  resolved "https://registry.npmjs.org/hello-wasm-pack/-/hello-wasm-pack-0.1.0.tgz"
@@ -1140,6 +1072,16 @@ http-deceiver@^1.2.7:
  resolved "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz"
  integrity sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw==

+http-errors@~1.6.2:
+  version "1.6.3"
+  resolved "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz"
+  integrity sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==
+  dependencies:
+    depd "~1.1.2"
+    inherits "2.0.3"
+    setprototypeof "1.1.0"
+    statuses ">= 1.4.0 < 2"
+
 http-errors@2.0.0:
  version "2.0.0"
  resolved "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz"
@@ -1151,16 +1093,6 @@ http-errors@2.0.0:
    statuses "2.0.1"
    toidentifier "1.0.1"

-http-errors@~1.6.2:
-  version "1.6.3"
-  resolved "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz"
-  integrity sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==
-  dependencies:
-    depd "~1.1.2"
-    inherits "2.0.3"
-    setprototypeof "1.1.0"
-    statuses ">= 1.4.0 < 2"
-
 http-parser-js@>=0.5.1:
  version "0.5.8"
  resolved "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz"
@@ -1219,7 +1151,7 @@ inflight@^1.0.4:
    once "^1.3.0"
    wrappy "1"

-inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.3:
+inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.3, inherits@2, inherits@2.0.4:
  version "2.0.4"
  resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"
  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -1234,16 +1166,16 @@ interpret@^2.2.0:
  resolved "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz"
  integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==

-ipaddr.js@1.9.1:
-  version "1.9.1"
-  resolved "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz"
-  integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==
-
 ipaddr.js@^2.0.1:
  version "2.0.1"
  resolved "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.0.1.tgz"
  integrity sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng==

+ipaddr.js@1.9.1:
+  version "1.9.1"
+  resolved "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz"
+  integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==
+
 is-binary-path@~2.1.0:
  version "2.1.0"
  resolved "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz"
@@ -1368,11 +1300,6 @@ locate-path@^5.0.0:
  dependencies:
    p-locate "^4.1.0"

-math-intrinsics@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/math-intrinsics/-/math-intrinsics-1.1.0.tgz#a0dd74be81e2aa5c2f27e65ce283605ee4e2b7f9"
-  integrity sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==
-
 media-typer@0.3.0:
  version "0.3.0"
  resolved "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"
@@ -1385,10 +1312,10 @@ memfs@^3.4.3:
  dependencies:
    fs-monkey "^1.0.3"

-merge-descriptors@1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.3.tgz#d80319a65f3c7935351e5cfdac8f9318504dbed5"
-  integrity sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==
+merge-descriptors@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz"
+  integrity sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==

 merge-stream@^2.0.0:
  version "2.0.0"
@@ -1413,7 +1340,7 @@ micromatch@^4.0.2, micromatch@^4.0.4:
    braces "^3.0.2"
    picomatch "^2.3.1"

-mime-db@1.52.0, "mime-db@>= 1.43.0 < 2":
+"mime-db@>= 1.43.0 < 2", mime-db@1.52.0:
  version "1.52.0"
  resolved "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz"
  integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
@@ -1502,10 +1429,10 @@ npm-run-path@^4.0.1:
  dependencies:
    path-key "^3.0.0"

-object-inspect@^1.13.3:
-  version "1.13.4"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.4.tgz#8375265e21bc20d0fa582c22e1b13485d6e00213"
-  integrity sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==
+object-inspect@^1.9.0:
+  version "1.12.3"
+  resolved "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz"
+  integrity sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==

 obuf@^1.0.0, obuf@^1.1.2:
  version "1.1.2"
@@ -1599,10 +1526,10 @@ path-parse@^1.0.7:
  resolved "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz"
  integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==

-path-to-regexp@0.1.12:
-  version "0.1.12"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.12.tgz#d5e1a12e478a976d432ef3c58d534b9923164bb7"
-  integrity sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==
+path-to-regexp@0.1.7:
+  version "0.1.7"
+  resolved "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz"
+  integrity sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==

 path-type@^4.0.0:
  version "4.0.0"
@@ -1644,12 +1571,12 @@ punycode@^2.1.0:
  resolved "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz"
  integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==

-qs@6.13.0:
-  version "6.13.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.13.0.tgz#6ca3bd58439f7e245655798997787b0d88a51906"
-  integrity sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==
+qs@6.11.0:
+  version "6.11.0"
+  resolved "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz"
+  integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==
  dependencies:
-    side-channel "^1.0.6"
+    side-channel "^1.0.4"

 queue-microtask@^1.2.2:
  version "1.2.3"
@@ -1769,22 +1696,36 @@ run-parallel@^1.1.9:
  dependencies:
    queue-microtask "^1.2.2"

-safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+safe-buffer@^5.1.0, safe-buffer@>=5.1.0, safe-buffer@~5.2.0, safe-buffer@5.2.1:
+  version "5.2.1"
+  resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"
+  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
+
+safe-buffer@~5.1.0, safe-buffer@~5.1.1:
  version "5.1.2"
  resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"
  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==

-safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.1.0, safe-buffer@~5.2.0:
-  version "5.2.1"
-  resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"
-  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
+safe-buffer@5.1.2:
+  version "5.1.2"
+  resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"
+  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==

 "safer-buffer@>= 2.1.2 < 3":
  version "2.1.2"
  resolved "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"
  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==

-schema-utils@^3.1.0, schema-utils@^3.1.1:
+schema-utils@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz"
+  integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==
+  dependencies:
+    "@types/json-schema" "^7.0.8"
+    ajv "^6.12.5"
+    ajv-keywords "^3.5.2"
+
+schema-utils@^3.1.1:
  version "3.1.1"
  resolved "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz"
  integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==
@@ -1815,10 +1756,10 @@ selfsigned@^2.1.1:
  dependencies:
    node-forge "^1"

-send@0.19.0:
-  version "0.19.0"
-  resolved "https://registry.yarnpkg.com/send/-/send-0.19.0.tgz#bbc5a388c8ea6c048967049dbeac0e4a3f09d7f8"
-  integrity sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==
+send@0.18.0:
+  version "0.18.0"
+  resolved "https://registry.npmjs.org/send/-/send-0.18.0.tgz"
+  integrity sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==
  dependencies:
    debug "2.6.9"
    depd "2.0.0"
@@ -1854,15 +1795,15 @@ serve-index@^1.9.1:
    mime-types "~2.1.17"
    parseurl "~1.3.2"

-serve-static@1.16.2:
-  version "1.16.2"
-  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.16.2.tgz#b6a5343da47f6bdd2673848bf45754941e803296"
-  integrity sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==
+serve-static@1.15.0:
+  version "1.15.0"
+  resolved "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz"
+  integrity sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==
  dependencies:
-    encodeurl "~2.0.0"
+    encodeurl "~1.0.2"
    escape-html "~1.0.3"
    parseurl "~1.3.3"
-    send "0.19.0"
+    send "0.18.0"

 setprototypeof@1.1.0:
  version "1.1.0"
@@ -1898,45 +1839,14 @@ shell-quote@^1.7.3:
  resolved "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.0.tgz"
  integrity sha512-QHsz8GgQIGKlRi24yFc6a6lN69Idnx634w49ay6+jA5yFh7a1UY+4Rp6HPx/L/1zcEDPEij8cIsiqR6bQsE5VQ==

-side-channel-list@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/side-channel-list/-/side-channel-list-1.0.0.tgz#10cb5984263115d3b7a0e336591e290a830af8ad"
-  integrity sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==
+side-channel@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz"
+  integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==
  dependencies:
-    es-errors "^1.3.0"
-    object-inspect "^1.13.3"
-
-side-channel-map@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/side-channel-map/-/side-channel-map-1.0.1.tgz#d6bb6b37902c6fef5174e5f533fab4c732a26f42"
-  integrity sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==
-  dependencies:
-    call-bound "^1.0.2"
-    es-errors "^1.3.0"
-    get-intrinsic "^1.2.5"
-    object-inspect "^1.13.3"
-
-side-channel-weakmap@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz#11dda19d5368e40ce9ec2bdc1fb0ecbc0790ecea"
-  integrity sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==
-  dependencies:
-    call-bound "^1.0.2"
-    es-errors "^1.3.0"
-    get-intrinsic "^1.2.5"
-    object-inspect "^1.13.3"
-    side-channel-map "^1.0.1"
-
-side-channel@^1.0.6:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.1.0.tgz#c3fcff9c4da932784873335ec9765fa94ff66bc9"
-  integrity sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==
-  dependencies:
-    es-errors "^1.3.0"
-    object-inspect "^1.13.3"
-    side-channel-list "^1.0.0"
-    side-channel-map "^1.0.1"
-    side-channel-weakmap "^1.0.2"
+    call-bind "^1.0.0"
+    get-intrinsic "^1.0.2"
+    object-inspect "^1.9.0"

 signal-exit@^3.0.3:
  version "3.0.7"
@@ -1993,16 +1903,16 @@ spdy@^4.0.2:
    select-hose "^2.0.0"
    spdy-transport "^3.0.0"

-statuses@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz"
-  integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==
-
 "statuses@>= 1.4.0 < 2":
  version "1.5.0"
  resolved "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz"
  integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==

+statuses@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz"
+  integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==
+
 string_decoder@^1.1.1:
  version "1.3.0"
  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz"
@@ -2085,7 +1995,7 @@ type-is@~1.6.18:
    media-typer "0.3.0"
    mime-types "~2.1.24"

-unpipe@1.0.0, unpipe@~1.0.0:
+unpipe@~1.0.0, unpipe@1.0.0:
  version "1.0.0"
  resolved "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"
  integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==
@@ -2140,7 +2050,7 @@ wbuf@^1.1.0, wbuf@^1.7.3:
  dependencies:
    minimalistic-assert "^1.0.0"

-webpack-cli@^4.9.2:
+webpack-cli@^4.9.2, webpack-cli@4.x.x:
  version "4.10.0"
  resolved "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.10.0.tgz"
  integrity sha512-NLhDfH/h4O6UOy+0LSso42xvYypClINuMNBVVzX4vX98TmTaTUxwRbXdhucbFMd2qLaCTcLq/PdYrvi8onw90w==
@@ -2159,9 +2069,9 @@ webpack-cli@^4.9.2:
    webpack-merge "^5.7.3"

 webpack-dev-middleware@^5.3.1:
-  version "5.3.4"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz#eb7b39281cbce10e104eb2b8bf2b63fce49a3517"
-  integrity sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==
+  version "5.3.3"
+  resolved "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz"
+  integrity sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==
  dependencies:
    colorette "^2.0.10"
    memfs "^3.4.3"
@@ -2218,7 +2128,7 @@ webpack-sources@^3.2.3:
  resolved "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz"
  integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==

-webpack@^5.70.0:
+"webpack@^4.0.0 || ^5.0.0", "webpack@^4.37.0 || ^5.0.0", webpack@^5.1.0, webpack@^5.70.0, "webpack@4.x.x || 5.x.x":
  version "5.77.0"
  resolved "https://registry.npmjs.org/webpack/-/webpack-5.77.0.tgz"
  integrity sha512-sbGNjBr5Ya5ss91yzjeJTLKyfiwo5C628AFjEa6WSXcZa4E+F57om3Cc8xLb1Jh0b243AWuSYRf3dn7HVeFQ9Q==
@@ -2248,7 +2158,7 @@ webpack@^5.70.0:
    watchpack "^2.4.0"
    webpack-sources "^3.2.3"

-websocket-driver@>=0.5.1, websocket-driver@^0.7.4:
+websocket-driver@^0.7.4, websocket-driver@>=0.5.1:
  version "0.7.4"
  resolved "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz"
  integrity sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==
--- a/Show More
+++ b/Show More