Feat/user

Cargo.toml

@@ -2,9 +2,7 @@
 resolver = "3"
 members = [
     "crates/*",
-    "examples/options",
-    "examples/p2pk",
-    "examples/test_usage",
+    "example",
 ]
 
 [workspace.package]
@@ -21,6 +19,7 @@ simplex-macros = { path = "./crates/macros" }
 simplex-test = { path = "./crates/test" }
 simplex-sdk = { path = "./crates/sdk" }
 simplex = { path = "./crates/simplex" }
+simplex-user = { path = "./crates/user" }
 
 async-trait = { version = "0.1.89" }
 bincode = { version = "2.0.1", features = ["serde"] }

crates/cli/Cargo.toml

@@ -24,6 +24,7 @@ electrsd = { workspace = true }
 thiserror = { workspace = true }
 serde = { workspace = true }
 toml = { workspace = true }
+
 anyhow = "1"
 dotenvy = "0.15"
 clap = { version = "4", features = ["derive", "env"] }
@@ -36,4 +37,4 @@ glob = { version = "0.3.3"}
 [dev-dependencies]
 tracing = { workspace = true }
 tracing-appender = { version = "0.2.3" }
-tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }
+tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }

crates/cli/src/config.rs

@@ -5,7 +5,7 @@ use std::io;
 use std::path::{Path, PathBuf};
 use std::str::FromStr;
 
-pub const DEFAULT_CONFIG: &str = include_str!("../../../Simplex.example.toml");
+pub const DEFAULT_CONFIG: &str = include_str!("../Simplex.example.toml");
 const CONFIG_FILENAME: &str = "Simplex.toml";
 
 #[derive(thiserror::Error, Debug)]

crates/macros-core/Cargo.toml

@@ -14,14 +14,14 @@ serde = ["bincode", "dep:serde"]
 default = ["bincode", "serde"]
 
 [dependencies]
+simplicityhl = { workspace = true }
+simplex-test = { workspace = true }
+thiserror = { workspace = true }
+
 proc-macro-error = { version = "1.0" }
 proc-macro2 = { version = "1.0.106", features = ["span-locations"] }
 syn = { version = "2.0.114", default-features = false, features = ["proc-macro", "full", "parsing", "derive", "clone-impls", "extra-traits", "printing"] }
-thiserror = { workspace = true }
 quote = { version = "1.0.44" }
-simplicityhl = { workspace = true }
-simplex-test = { workspace = true }
 serde = { version = "1.0.228", optional = true }
 pathdiff = { version = "0.2.3" }
 prettyplease = { version = "0.2.37" }
-

crates/macros-core/src/attr/codegen.rs

@@ -113,7 +113,7 @@ impl WitnessStruct {
                     use ::simplicityhl::str::WitnessName;
                     use ::simplicityhl::types::TypeConstructible;
                     use ::simplicityhl::value::ValueConstructible;
-                    use ::simplex::simplex_sdk::arguments::ArgumentsTrait;
+                    use ::simplex::simplex_sdk::program::ArgumentsTrait;
                     use ::simplex::bincode::*;
             },
             struct_token_stream: quote! {
@@ -134,7 +134,7 @@ impl WitnessStruct {
 
                 }
 
-                impl ::simplex::simplex_sdk::arguments::ArgumentsTrait for #struct_name {
+                impl ::simplex::simplex_sdk::program::ArgumentsTrait for #struct_name {
                     /// Build Simplicity arguments for contract instantiation.
                     #[must_use]
                     fn build_arguments(&self) -> ::simplicityhl::Arguments {
@@ -190,7 +190,7 @@ impl WitnessStruct {
                     use simplicityhl::str::WitnessName;
                     use simplicityhl::types::TypeConstructible;
                     use simplicityhl::value::ValueConstructible;
-                    use ::simplex::simplex_sdk::witness::WitnessTrait;
+                    use ::simplex::simplex_sdk::program::WitnessTrait;
             },
             struct_token_stream: quote! {
                 #generated_struct
@@ -209,7 +209,7 @@ impl WitnessStruct {
                     }
                 }
 
-                impl ::simplex::simplex_sdk::witness::WitnessTrait for #struct_name {
+                impl ::simplex::simplex_sdk::program::WitnessTrait for #struct_name {
                      /// Build Simplicity witness values for contract execution.
                     #[must_use]
                     fn build_witness(&self) -> ::simplicityhl::WitnessValues {

crates/macros-core/src/env/mod.rs

@@ -102,28 +102,27 @@ impl<'b> CodeGenerator {
 
         let code = quote! {
             use simplex::simplex_macros::include_simf;
-            use simplex::simplex_sdk::arguments::ArgumentsTrait;
-            use simplex::simplex_sdk::program::Program;
+            use simplex::simplex_sdk::program::{ArgumentsTrait, Program};
             use simplicityhl::elements::secp256k1_zkp::XOnlyPublicKey;
 
-            pub struct #program_name<'a> {
-                program: Program<'a>,
+            pub struct #program_name {
+                program: Program,
             }
 
-            impl<'a> #program_name<'a> {
+            impl #program_name {
                 pub const SOURCE: &'static str = #include_simf_module::#include_simf_source_const;
 
-                pub fn new(public_key: &'a XOnlyPublicKey, arguments: &'a impl ArgumentsTrait) -> Self {
+                pub fn new(public_key: XOnlyPublicKey, arguments: impl ArgumentsTrait + 'static) -> Self {
                     Self {
-                        program: Program::new(Self::SOURCE, public_key, arguments),
+                        program: Program::new(Self::SOURCE, public_key, Box::new(arguments)),
                     }
                 }
 
-                pub fn get_program(&self) -> &Program<'a> {
+                pub fn get_program(&self) -> &Program {
                     &self.program
                 }
 
-                pub fn get_program_mut(&mut self) -> &mut Program<'a> {
+                pub fn get_program_mut(&mut self) -> &mut Program {
                     &mut self.program
                 }
             }

crates/macros/Cargo.toml

@@ -26,5 +26,6 @@ workspace = true
 
 [dependencies]
 simplex-macros-core = { workspace = true }
+
 serde = { version = "1.0.228", optional = true }
 syn = { version = "2.0.114", default-features = false, features = ["parsing", "proc-macro"] }

crates/provider/Cargo.toml

@@ -17,6 +17,7 @@ workspace = true
 simplicityhl = { workspace = true }
 thiserror = { workspace = true }
 electrsd = { workspace = true }
+
 async-trait = { version = "0.1.89" }
 reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls"] }
 minreq = { version = "2.14", features = ["https", "json-using-serde"] }

crates/sdk/Cargo.toml

@@ -17,3 +17,9 @@ thiserror = { workspace = true }
 sha2 = { workspace = true }
 minreq = { workspace = true }
 simplicityhl = { workspace = true }
+
+hex = { version = "0.4" }
+serde = { version = "1.0.228", features = ["derive"]}
+elements-miniscript = { version = "0.4", features = ["base64", "serde"] }
+bip39 = { version = "2.0.0", features = ["rand"] }
+dyn-clone = { version = "1.0.20" }

crates/sdk/src/constants.rs

@@ -82,6 +82,10 @@ impl SimplicityNetwork {
         }
     }
 
+    pub fn is_mainnet(&self) -> bool {
+        self == &Self::Liquid
+    }
+
     pub const fn address_params(&self) -> &'static elements::AddressParams {
         match self {
             Self::Liquid => &elements::AddressParams::LIQUID,

crates/sdk/src/lib.rs

@@ -1,12 +1,7 @@
-#![warn(clippy::all, clippy::pedantic)]
-
-pub mod arguments;
 pub mod constants;
-pub mod error;
 pub mod presets;
 pub mod program;
+pub mod transaction;
 pub mod provider;
 pub mod signer;
 pub mod utils;
-pub mod witness;
-pub mod witness_transaction;

crates/sdk/src/presets/mod.rs

@@ -1 +1,4 @@
 pub mod p2pk;
+
+pub use p2pk::P2PK;
+pub use p2pk::p2pk_build::{P2PKArguments, P2PKWitness};