Merge branch 'HB/rbf-tmp' into HB/rbf

.env

@@ -32,11 +32,13 @@ CARBONADO_ENDPOINT=http://localhost:7070/carbonado
 UDAS_UTXO=3b367e1facc3174e97658295961faf6a4ed889129c881b7a73db1f074b49bd8a:
 MARKETPLACE_SEED="lion bronze dumb tuna perfect fantasy wall orphan improve business harbor sadness"
 MARKETPLACE_NOSTR=cd591c134a0d88991326b1619953d0eae2287d315a7c4a93c1e4883a8c26c464
-
 # 1..100
 MARKETPLACE_FEE_PERC=
 # xpub..
 MARKETPLACE_FEE_XPUB=
 
+# :: Coordinator ::
+COORDINATOR_NOSTR=9e8294eb38ba77c0fba982da8fbd370b8868c6dbfc9ca414aff4863c15dfbcff
+
 # :: RGB PROXY ::
 RGB_PROXY_ENDPOINT=http://localhost:3001

.github/workflows/rust.yaml

@@ -106,8 +106,11 @@ jobs:
           MAIN_VAULT_ADDRESS: ${{ secrets.MAIN_VAULT_ADDRESS }}
           RUST_BACKTRACE: 1
 
+      - name: RGB Test Init
+        run: cargo test --locked --features server --test _init -- _init --nocapture --test-threads 1
+
       - name: RGB Tests
-        run: cargo test --locked --features server --test rgb  -- rgb --nocapture --test-threads 1
+        run: cargo test --locked --features server --test rgb -- rgb --nocapture --test-threads 1
         env:
           TEST_WALLET_SEED: ${{ secrets.TEST_WALLET_SEED }}
           RUST_BACKTRACE: 1

Cargo.toml

@@ -120,6 +120,7 @@ esplora_block = { version = "0.5.0", package = "esplora-client", default-feature
     "blocking",
 ] }
 inflate = "0.4.5"
+sled = "0.34.7"
 tower-http = { version = "0.4.4", features = ["cors"], optional = true }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
@@ -134,7 +135,8 @@ anyhow = "1.0.71"
 blake3 = "1.4.1"
 rgb-std = { version = "0.10.2" }
 serde = "1.0.189"
-toml = { version = "0.7.8", features = ["preserve_order"] }
+serde_json = "1.0.107"
+toml = { version = "0.8.0", features = ["preserve_order"] }
 
 [patch.crates-io]
 # Remove after merge and release https://github.com/BP-WG/bitcoin_foundation/pull/20

build.rs

@@ -1,4 +1,4 @@
-use std::{collections::BTreeMap, fs};
+use std::{collections::BTreeMap, env, fs, path};
 
 use anyhow::Result;
 use rgbstd::{
@@ -54,6 +54,30 @@ const MARKETPLACE_OFFERS: &str = "bitmask-marketplace_public_offers.c15";
 const MARKETPLACE_BIDS: &str = "bitmask-marketplace_public_bids.c15";
 const NETWORK: &str = "bitcoin"; // Only mainnet is tracked, no monetary incentive to upgrade testnet assets
 
+#[derive(Serialize, Deserialize, Default)]
+pub struct MetricsData {
+    bytes: u64,
+    bytes_by_day: BTreeMap<String, u64>,
+    bitcoin_wallets_by_day: BTreeMap<String, usize>,
+    signet_wallets_by_day: BTreeMap<String, usize>,
+    testnet_wallets_by_day: BTreeMap<String, usize>,
+    regtest_wallets_by_day: BTreeMap<String, usize>,
+    wallets_by_network: BTreeMap<String, usize>,
+}
+
+pub fn init_fs() -> Result<()> {
+    let dir = env::var("CARBONADO_DIR").unwrap_or("/tmp/bitmaskd/carbonado".to_owned());
+    let dir = path::Path::new(&dir);
+
+    fs::create_dir_all(dir)?;
+    fs::write(
+        dir.join("metrics.json"),
+        serde_json::to_string_pretty(&MetricsData::default())?,
+    )?;
+
+    Ok(())
+}
+
 fn main() -> Result<()> {
     // lib ids
     const BMC_VERSION: &str = env!("CARGO_PKG_VERSION");
@@ -158,5 +182,7 @@ fn main() -> Result<()> {
 
     fs::write(FILE_HASHES_FILE, toml)?;
 
+    init_fs()?;
+
     Ok(())
 }

lib/web/bitcoin.ts

@@ -173,6 +173,12 @@ export interface TransactionDetails extends Transaction {
 }
 
 export interface TransactionData {
+  details: TransactionDataDetails;
+  vsize: number;
+  feeRate: number;
+}
+
+export interface TransactionDataDetails {
   transaction?: Transaction;
   txid: string;
   received: number;

lib/web/package.json

@@ -6,7 +6,7 @@
     "Francisco Calderón <[email protected]>"
   ],
   "description": "Core functionality for the BitMask wallet",
-  "version": "0.7.0-beta.8",
+  "version": "0.7.0-beta.10",
   "license": "MIT",
   "repository": {
     "type": "git",