feat: functional L2 faucet!

Cargo.toml

@@ -8,10 +8,7 @@ resolver = "2"
 members = [".", "utils/html-solver"]
 
 [dependencies]
-alloy = { version = "0.3.5", default-features = false, features = [
-  "std",
-  "rpc-client-ws",
-] }
+alloy = { version = "0.3.5", features = ["std", "rpc-client-ws", "network", "signers", "signer-local", "providers", "rpc-types"] }
 arrayvec = "0.7.6"
 axum = { version = "0.7.5", features = ["http2"] }
 axum-client-ip = "0.6.0"

README.md

@@ -48,9 +48,14 @@ Once you find a solution, hex encode it and use it in a claim for either L1 or L
 
 Where `l1_address` is the address that you want to receive funds on.
 
-If successful, this will return a `200 OK` with an empty body.
+If successful, this will return a `200 OK` with the hex-encoded txid in the body.
 If not, it will return a status code and a raw error message string in the body.
 
 ### L2
 
-`todo`
+`GET /claim_l2/<solution_as_hex>/<l2_address>`
+
+Where `l2_address` is the address that you want to receive funds on.
+
+If successful, this will return a `200 OK` with the hex-encoded txid in the body.
+If not, it will return a status code and a raw error message string in the body.

faucet.toml

@@ -5,5 +5,6 @@ seed_file = "faucet.seed"
 sqlite_file = "faucet.sqlite"
 network = "signet"
 esplora = "https://explorer.bc-2.jp/api"
+l2_http_endpoint = "https://ethereum-rpc.publicnode.com"
 sats_per_claim = 10_000_000
 pow_difficulty = 17

src/l1.rs

@@ -16,20 +16,14 @@ use bdk_esplora::{
     EsploraAsyncExt,
 };
 use bdk_wallet::{
-    bitcoin::{
-        bip32::{Xpriv, Xpub},
-        key::Secp256k1,
-        FeeRate, Network,
-    },
-    descriptor::calc_checksum,
+    bitcoin::{bip32::Xpriv, FeeRate, Network},
     rusqlite::{self, Connection},
     ChangeSet, KeychainKind, PersistedWallet, Wallet, WalletPersister,
 };
-use colored::Colorize;
 use tokio::time::sleep;
 use tracing::{debug, error, info, warn};
 
-use crate::{seed::SavableSeed, AppState, SETTINGS};
+use crate::{seed::Seed, AppState, SETTINGS};
 
 /// Live updating fee rate in sat/kwu
 static FEE_RATE: AtomicU64 = AtomicU64::new(250);
@@ -122,26 +116,13 @@ impl WalletPersister for Persister {
 pub struct L1Wallet(PersistedWallet<Persister>);
 
 impl L1Wallet {
-    /// Load or create a wallet from the disk using the seed file and sqlite
-    /// database.
-    pub fn load_or_create(network: Network) -> io::Result<Self> {
-        let seed = SavableSeed::load_or_create()?;
-        let rootpriv = Xpriv::new_master(Network::Signet, &seed).expect("valid xpriv");
-        let rootpub = Xpub::from_priv(&Secp256k1::new(), &rootpriv);
+    /// Create a wallet using the seed file and sqlite database.
+    pub fn new(network: Network, seed: &Seed) -> io::Result<Self> {
+        let rootpriv = Xpriv::new_master(Network::Signet, seed).expect("valid xpriv");
+        // let rootpub = Xpub::from_priv(&Secp256k1::new(), &rootpriv);
         let base_desc = format!("tr({}/86h/0h/0h", rootpriv);
-        let base_pub_desc = format!("tr({}/86h/0h/0h)", rootpub);
-        info!(
-            "public descriptor: {}",
-            format!(
-                "{}#{}",
-                base_pub_desc,
-                calc_checksum(&base_pub_desc).expect("valid descriptor")
-            )
-            .green()
-        );
-
-        let external_desc = format!("{base_desc}/0)");
-        let internal_desc = format!("{base_desc}/1)");
+        let external_desc = format!("{base_desc}/0/*)");
+        let internal_desc = format!("{base_desc}/1/*)");
 
         Ok(Self(
             Wallet::load()