feat: add basic commands implementation, reworked contracts params storage

chore:
* fix storing of entropies instead of asset ids
* reworked contracts storage
* assign constants to fixed values in library
* align todos with one style

Author: ikripaka

crates/cli-client/src/cli/basic.rs

@@ -76,11 +76,7 @@ pub enum HelperCommand {
     Balance,
 
     /// List all UTXOs stored in wallet
-    Utxos {
-        /// Sets script for filtering in wallet
-        #[arg(long, long = "mine", default_value_t = false)]
-        is_mine: bool,
-    },
+    Utxos,
 
     /// Import a UTXO into the wallet
     Import {

crates/cli-client/src/cli/commands.rs

@@ -1,8 +1,6 @@
 use crate::error::Error;
-use crate::wallet::Wallet;
-use coin_store::utxo_store::UtxoStore;
+use simplicityhl::elements::Transaction;
 use simplicityhl::elements::pset::serialize::Serialize;
-use simplicityhl::elements::{OutPoint, Transaction};
 use simplicityhl::simplicity::hex::DisplayHex;
 
 #[derive(Debug, Clone, Copy)]
@@ -18,31 +16,14 @@ impl From<bool> for Broadcaster {
 }
 
 impl Broadcaster {
-    /// Broadcasts created transaction or returns raw transaction as hex string
-    pub async fn broadcast_tx(&self, wallet: &Wallet, tx: &Transaction, outpoints: &[OutPoint]) -> Result<(), Error> {
+    pub async fn broadcast_tx(&self, tx: &Transaction) -> Result<(), Error> {
         match self {
             Broadcaster::Offline => {
                 println!("{}", tx.serialize().to_lower_hex_string());
             }
             Broadcaster::Online => {
                 cli_helper::explorer::broadcast_tx(tx).await?;
-
-                for outpoint in outpoints {
-                    wallet.store().mark_as_spent(*outpoint).await?;
-                }
-
                 let txid = tx.txid();
-                for (vout, output) in tx.output.iter().enumerate() {
-                    if output.is_fee() {
-                        continue;
-                    }
-
-                    #[allow(clippy::cast_possible_truncation)]
-                    let new_outpoint = simplicityhl::elements::OutPoint::new(txid, vout as u32);
-
-                    wallet.store().insert(new_outpoint, output.clone(), None).await?;
-                }
-
                 println!("Broadcasted: {txid}");
             }
         }

crates/cli-client/src/cli/common.rs

@@ -3,10 +3,9 @@ use crate::config::Config;
 use crate::error::Error;
 use crate::wallet::Wallet;
 use coin_store::utxo_store::UtxoStore;
+use simplicityhl::elements::bitcoin::secp256k1;
 
 impl Cli {
-    const BLINDING_KEY_LEN: usize = 32;
-
     pub(crate) async fn run_helper(&self, config: Config, command: &HelperCommand) -> Result<(), Error> {
         match command {
             HelperCommand::Init => {
@@ -31,7 +30,7 @@ impl Cli {
 
                 let filter = coin_store::UtxoFilter::new()
                     .script_pubkey(wallet.signer().p2pk_address(config.address_params())?.script_pubkey());
-                let results = <_ as UtxoStore>::query(wallet.store(), &[filter]).await?;
+                let results = <_ as UtxoStore>::query_utxos(wallet.store(), &[filter]).await?;
 
                 let mut balances: std::collections::HashMap<simplicityhl::elements::AssetId, u64> =
                     std::collections::HashMap::new();
@@ -59,16 +58,11 @@ impl Cli {
                 }
                 Ok(())
             }
-            HelperCommand::Utxos { is_mine } => {
+            HelperCommand::Utxos => {
                 let wallet = self.get_wallet(&config).await?;
 
-                let filter = if *is_mine {
-                    coin_store::UtxoFilter::new()
-                        .script_pubkey(wallet.signer().p2pk_address(config.address_params())?.script_pubkey())
-                } else {
-                    coin_store::UtxoFilter::new()
-                };
-                let results = wallet.store().query(&[filter]).await?;
+                let filter = coin_store::UtxoFilter::new();
+                let results = wallet.store().query_utxos(&[filter]).await?;
 
                 if let Some(coin_store::UtxoQueryResult::Found(entries)) = results.into_iter().next() {
                     for entry in &entries {
@@ -96,7 +90,7 @@ impl Cli {
 
                 let blinder = match blinding_key {
                     Some(key_hex) => {
-                        let bytes: [u8; Self::BLINDING_KEY_LEN] = hex::decode(key_hex)
+                        let bytes: [u8; secp256k1::constants::SECRET_KEY_SIZE] = hex::decode(key_hex)
                             .map_err(|e| Error::Config(format!("Invalid blinding key hex: {e}")))?
                             .try_into()
                             .map_err(|_| Error::Config("Blinding key must be 32 bytes".to_string()))?;

crates/cli-client/src/cli/helper.rs

@@ -14,6 +14,9 @@ categories.workspace = true
 
 [dependencies]
 simplicityhl = { workspace = true }
+simplicityhl-core = { workspace = true }
+contracts = { workspace = true }
+
 
 futures = { version = "0.3" }
 
@@ -22,3 +25,8 @@ thiserror = { version = "2" }
 async-trait = { version = "0.1.89" }
 tokio = { version = "1", features = ["rt-multi-thread", "macros"] }
 sqlx = { version = "0.8", features = ["runtime-tokio", "sqlite", "migrate"] }
+
+bincode = { version = "2.0.1", features = ["alloc", "derive"] }
+
+[dev-dependencies]
+hex = { version = "0.4.3" }

crates/coin-store/Cargo.toml

@@ -5,6 +5,7 @@ CREATE TABLE utxos(
     asset_id BLOB NOT NULL,
     value INTEGER NOT NULL,
     serialized BLOB NOT NULL,
+    serialized_witness BLOB,
     is_confidential INTEGER NOT NULL,
     is_spent INTEGER DEFAULT 0,
     PRIMARY KEY (txid, vout)
@@ -21,28 +22,31 @@ CREATE TABLE blinder_keys (
 CREATE TABLE assets
 (
     asset_name TEXT NOT NULL,
-    asset_id   BLOB NOT NULL,
+    asset_entropy   BLOB NOT NULL,
     PRIMARY KEY (asset_name)
 );
 
-CREATE TABLE option_params
-(
-    script_pubkey           BLOB NOT NULL PRIMARY KEY,
-    start_time              BLOB NOT NULL,
-    expiry_time             BLOB NOT NULL,
-    collateral_per_contract BLOB NOT NULL,
-    settlement_per_contract BLOB NOT NULL,
-    collateral_asset_id     BLOB NOT NULL,
-    settlement_asset_id     BLOB NOT NULL,
-    option_token_entropy    BLOB NOT NULL,
-    grantor_token_entropy   BLOB NOT NULL
-);
-
 CREATE INDEX idx_utxos_asset_id ON utxos (asset_id);
 CREATE INDEX idx_utxos_is_spent ON utxos (is_spent);
 CREATE INDEX idx_utxos_script_pubkey ON utxos (script_pubkey);
 CREATE INDEX idx_utxos_asset_spent_value ON utxos (asset_id, is_spent, value DESC);
 
-CREATE INDEX idx_option_params_script_pubkey ON option_params (script_pubkey);
-
 CREATE INDEX idx_assets_asset_name ON assets (asset_name);
+
+CREATE TABLE simplicity_contracts
+(
+    x_only_pubkey      BLOB    NOT NULL,
+    taproot_pubkey_gen BLOB    NOT NULL,
+    contract_type      INTEGER NOT NULL,
+    PRIMARY KEY (taproot_pubkey_gen)
+);
+
+CREATE TABLE contracts
+(
+    taproot_pubkey_gen BLOB NOT NULL,
+    params             BLOB NOT NULL,
+    FOREIGN KEY (taproot_pubkey_gen) REFERENCES simplicity_contracts (taproot_pubkey_gen),
+    PRIMARY KEY (taproot_pubkey_gen)
+);
+
+

crates/coin-store/migrations/001_initial.sql

@@ -0,0 +1,13 @@
+use crate::asset_entropy_store::AssetEntropy;
+
+#[derive(Debug)]
+pub struct AssetEntropyEntry {
+    pub name: String,
+    pub asset_entropy: AssetEntropy,
+}
+
+#[derive(Debug)]
+pub enum QueryResult {
+    Found(Vec<AssetEntropyEntry>),
+    Empty,
+}

crates/coin-store/src/asset_entropy_store/entry.rs

@@ -0,0 +1,5 @@
+pub mod entry;
+pub mod filter;
+mod store_impl;
+
+pub use store_impl::*;