chore: typos, bindings, helpers

Signed-off-by: Gregory Hill <gregorydhill@outlook.com>

Author: gregdhill

contracts/src/swap/Marketplace.sol

@@ -8,7 +8,7 @@ import {ERC2771Recipient} from "../ERC2771/ERC2771Recipient.sol";
 using SafeERC20 for IERC20;
 
 contract MarketPlace is ERC2771Recipient {
-    mapping(uint256 => Order) public ercErcOrders; // cant have struct as key, nor tupple
+    mapping(uint256 => Order) public ercErcOrders; // can't have struct as key, nor tuple
 
     event placeOrder(
         uint256 indexed orderId,

crates/bindings/src/full_relay.rs

@@ -1,4 +1,4 @@
-#![allow(unused_imports, clippy::all, dead_code, rustdoc::all)]
+#![allow(unused_imports, clippy::all, rustdoc::all)]
 //! This module contains the sol! generated bindings for solidity contracts.
 //! This is autogenerated code.
 //! Do not manually edit these files.

crates/bindings/src/full_relay_with_verify.rs

@@ -259,6 +259,16 @@ impl BitcoinClient {
         }
     }
 
+    pub fn new_with_wallet(
+        url: &str,
+        wallet_name: &str,
+        rpc_user: impl Into<String>,
+        rpc_pass: impl Into<String>,
+    ) -> Self {
+        let rpc_url_with_wallet = format!("{}/wallet/{}", url.trim_end_matches('/'), wallet_name);
+        Self::new(&rpc_url_with_wallet, rpc_user, rpc_pass)
+    }
+
     pub async fn connect(&self, connection_timeout: Duration) -> Result<(), Error> {
         info!("Connecting to bitcoin...");
         timeout(connection_timeout, async move {

crates/bindings/src/lib.rs

@@ -1,6 +1,6 @@
 use bitcoin::{
-    block::Header, consensus, hashes::hex::FromHex, BlockHash, CompactTarget, MerkleBlock, Network,
-    Transaction, TxMerkleNode, Txid,
+    block::Header, consensus, constants::ChainHash, hashes::hex::FromHex, BlockHash, CompactTarget,
+    MerkleBlock, Network, Transaction, TxMerkleNode, Txid,
 };
 use eyre::{Error, Result};
 use reqwest::{Client, Url};
@@ -257,15 +257,8 @@ impl EsploraClient {
     }
 
     pub async fn get_bitcoin_network(&self) -> Result<Network> {
-        let url_str = self.url.as_str();
-
-        match url_str {
-            _ if url_str.contains(ESPLORA_MAINNET_URL) => Ok(Network::Bitcoin),
-            _ if url_str.contains(ESPLORA_TESTNET_URL) => Ok(Network::Testnet),
-            _ if url_str.contains(ESPLORA_LOCALHOST_URL) => Ok(Network::Regtest),
-            _ if url_str.contains(ESPLORA_SIGNET_URL) => Ok(Network::Signet),
-            _ => Err(Error::msg("Unknown network for URL: {url_str}")),
-        }
+        let genesis_hash = self.get_block_hash(0).await?;
+        Ok(Network::try_from(ChainHash::from_genesis_block_hash(genesis_hash))?)
     }
 }
 
@@ -351,4 +344,18 @@ mod tests {
         );
         Ok(())
     }
+
+    #[tokio::test]
+    async fn test_get_network() -> Result<()> {
+        let esplora_client = EsploraClient::new(Network::Bitcoin)?;
+        matches!(esplora_client.get_bitcoin_network().await?, Network::Bitcoin);
+
+        let esplora_client = EsploraClient::new(Network::Testnet)?;
+        matches!(esplora_client.get_bitcoin_network().await?, Network::Testnet);
+
+        let esplora_client = EsploraClient::new(Network::Signet)?;
+        matches!(esplora_client.get_bitcoin_network().await?, Network::Signet);
+
+        Ok(())
+    }
 }

crates/utils/src/bitcoin_client.rs

@@ -37,7 +37,7 @@ npx gsn deploy --network https://l2-puff-bob-jznbxtoq7h.t.conduit.xyz --privateK
 #   Paymaster (Default): 0x0000000000000000000000000000000000000000
 ```
 
-## Miscelaneous deployments
+## Miscellaneous deployments
 
 ### Tokens