PoC of schema

Author: KyrylR

Cargo.lock

@@ -1,7 +1,9 @@
 [workspace]
 resolver = "3"
 members = [
-    "crates/*"
+    "crates/cli",
+    "crates/contracts",
+    "crates/wallet-abi",
 ]
 
 [workspace.package]
@@ -21,7 +23,10 @@ tracing = { version = "0.1.41" }
 minreq = { version = "2.14.1", features = ["https", "json-using-serde"]}
 
 simplicityhl = { version = "0.4.0" }
-simplicityhl-core = { version = "0.4.2", features = ["encoding"] }
 
 [patch.crates-io]
 simplicity-sys = { git = "https://github.com/BlockstreamResearch/rust-simplicity", tag = "simplicity-sys-0.6.1" }
+lwk_common = { git = "https://github.com/Blockstream/lwk", rev = "4074c527fcc1268eb26953af397eecc6c1444293", package = "lwk_common" }
+lwk_signer = { git = "https://github.com/Blockstream/lwk", rev = "4074c527fcc1268eb26953af397eecc6c1444293", package = "lwk_signer" }
+lwk_simplicity = { git = "https://github.com/Blockstream/lwk", rev = "4074c527fcc1268eb26953af397eecc6c1444293", package = "lwk_simplicity" }
+lwk_wollet = { git = "https://github.com/Blockstream/lwk", rev = "4074c527fcc1268eb26953af397eecc6c1444293", package = "lwk_wollet" }

Cargo.toml

@@ -8,15 +8,13 @@ The only crate published to crates.io is `simplicity-contracts`, so read its [RE
 
 If you are new to contract development with Simplicity HL, below you will find a step-by-step workflow for how a contract can be developed, deployed, and used.
 
-Everything starts with the actual Simplicity HL code. See the [.simf files](crates/contracts/src), especially the [Options contract](crates/contracts/src/options/source_simf/options.simf) as the most structured example. Check the issues referenced in the contract for better understanding of development implications.
+Everything starts with the actual Simplicity HL code. See the [.simf files](crates/contracts/src), especially the [Options contract](crates/contracts/src/finance/options/source_simf/options.simf) as the most structured example. Check the issues referenced in the contract for better understanding of development implications.
 
 You can use tools like [`hal-simplicity`](https://github.com/BlockstreamResearch/hal-simplicity) for ad-hoc interaction and manual testing.
 
-If you want to build an application or service around your new contract, take a look at the relevant builders of arguments and witness. See the [Options contract](crates/contracts/src/options/mod.rs) for how to write Rust functions to build those — it is well tested.
+If you want to build an application or service around your new contract, take a look at the relevant builders of arguments and witness. See the [Options contract](crates/contracts/src/finance/options/mod.rs) for how to write Rust functions to build those.
 
-The next step after writing helper functions to build args and witness is to do actual testing. Again, see [mod.rs](crates/contracts/src/options/mod.rs) as the best example.
-
-Here you could also take a look at how relevant SDK functions in [options](crates/contracts/src/sdk/options) are structured, and what their responsibilities are.
+The next step after writing helper functions to build args and witness is to do actual testing. Again, see [mod.rs](crates/contracts/src/finance/options/mod.rs) as the best example.
 
 The last step is actual transaction publishing on the chain. This part can be found in the [CLI README](crates/cli/README.md).
 
@@ -28,8 +26,8 @@ Though this repository provides only examples, and because the basic Simplicity
 
 ## Important Concepts
 
-It is recommended to study the [options.simf](crates/contracts/src/options/source_simf/options.simf) and related issues on GitHub to understand better how to write such contracts securely.
+It is recommended to study the [options.simf](crates/contracts/src/finance/options/source_simf/options.simf) and related issues on GitHub to understand better how to write such contracts securely.
 
-You can see how to use the storage for 32 bytes in the [bytes32_tr_storage.simf](crates/contracts/src/bytes32_tr_storage/source_simf/bytes32_tr_storage.simf) file.  
-For a more general case, see the [array_tr_storage.simf](crates/contracts/src/array_tr_storage/source_simf/array_tr_storage.simf) file.  
-You can find a more detailed explanation of how it works in the first file.
+You can see how to use the storage for 32 bytes in the [bytes32_tr_storage.simf](crates/contracts/src/state_management/bytes32_tr_storage/source_simf/bytes32_tr_storage.simf) file.  
+For a more general case, see the [array_tr_storage.simf](crates/contracts/src/state_management/array_tr_storage/source_simf/array_tr_storage.simf) file.  
+You can find a more detailed explanation of how it works in the first file.

README.md

@@ -0,0 +1,6 @@
+pub fn wallet_data_root() -> std::path::PathBuf {
+    std::env::var_os("SIMPLICITY_CLI_WALLET_DATA_DIR").map_or_else(
+        || std::path::PathBuf::from(".cache/wallet"),
+        std::path::PathBuf::from,
+    )
+}

crates/cli/src/modules/paths.rs

@@ -10,8 +10,7 @@ keywords = ["simplicity", "liquid", "bitcoin", "elements", "contracts"]
 categories = ["cryptography::cryptocurrencies"]
 
 [features]
-default = ["sdk-basic", "finance-options", "finance-dcd", "finance-option-offer", "simple-storage", "bytes32-tr-storage", "array-tr-storage", "smt-storage"]
-sdk-basic = []
+default = ["finance-options", "finance-dcd", "finance-option-offer", "simple-storage", "bytes32-tr-storage", "array-tr-storage", "smt-storage"]
 finance-options = []
 finance-dcd = []
 finance-option-offer = []
@@ -28,14 +27,14 @@ bincode = "2.0.1"
 
 thiserror = "2"
 
-ring = { workspace = true }
-sha2 = { workspace = true }
-
 hex = { workspace = true }
 
 simplicityhl = { workspace = true }
-
-simplicityhl-core = { workspace = true }
+wallet-abi = { path = "../wallet-abi" }
+serde_json = "1"
+serde = { version = "1", features = ["derive"] }
 
 [dev-dependencies]
-anyhow = "1"
+anyhow = "1"
+bitcoincore-rpc = "0.19.0"
+lwk_test_util = { git = "https://github.com/Blockstream/lwk", rev = "4074c527fcc1268eb26953af397eecc6c1444293", package = "lwk_test_util" }

crates/contracts/Cargo.toml

@@ -1,12 +1,10 @@
-# Simplicity HL Core -- Contracts
+# Simplicity Contracts
 
 This crate is a collection of contracts showcasing core possibilities of [Elements](https://docs.rs/elements) and [Simplicity HL](https://github.com/BlockstreamResearch/simfony).
 
-Here you will find Simplicity HL implementations of [Options](https://blockstream.com/assets/downloads/pdf/options-whitepaper.pdf) (see [options](src/options)), Dual Currency Deposit Contract (see [dcd](src/dual_currency_deposit)), and more.
+Here you will find Simplicity HL implementations of [Options](https://blockstream.com/assets/downloads/pdf/options-whitepaper.pdf) (see [finance/options](src/finance/options)), Dual Currency Deposit Contract (see [finance/dcd](src/finance/dcd)), storage contracts, and more.
 
-The module that stands out is [`sdk`](src/sdk). This module does not contain contract source code; instead, it provides builder functions to help build Elements transactions to issue assets or transfer native currency (see [basic](src/sdk/basic)), as well as builder functions for the Options contract.
-
-This SDK can be used as a reference for how to build libraries targeting a particular Simplicity contract, integrateable with mobile/desktop, etc.
+Wallet-facing transaction construction is schema-first and lives in the wallet ABI crate. Contract-side modules in this crate focus on program compilation, argument/witness helpers, execution, and transaction finalization primitives.
 
 ## License
 

crates/contracts/README.md

@@ -22,36 +22,6 @@ pub enum ValidationError {
     },
 }
 
-/// Errors from taproot pubkey generation and verification.
-#[derive(Debug, thiserror::Error)]
-pub enum TaprootPubkeyGenError {
-    #[error("Invalid pubkey recovered: expected {expected}, got {actual}")]
-    InvalidPubkey { expected: String, actual: String },
-
-    #[error("Invalid address recovered: expected {expected}, got {actual}")]
-    InvalidAddress { expected: String, actual: String },
-
-    #[error(
-        "Invalid taproot pubkey gen string: expected 3 parts separated by ':', got {parts_count}"
-    )]
-    InvalidFormat { parts_count: usize },
-
-    #[error("Failed to decode seed hex: {0}")]
-    SeedHexDecode(#[from] hex::FromHexError),
-
-    #[error("Failed to parse public key: {0}")]
-    PublicKeyParse(#[from] simplicityhl::simplicity::bitcoin::key::ParsePublicKeyError),
-
-    #[error("Failed to parse address: {0}")]
-    AddressParse(#[from] simplicityhl::elements::address::AddressError),
-
-    #[error("Failed to create X-only public key from bytes: {0}")]
-    XOnlyPublicKey(#[from] simplicityhl::simplicity::bitcoin::secp256k1::Error),
-
-    #[error("Failed to generate address: {0}")]
-    AddressGeneration(#[from] simplicityhl_core::ProgramError),
-}
-
 /// Errors from transaction building operations.
 #[derive(Debug, thiserror::Error)]
 pub enum TransactionBuildError {
@@ -120,12 +90,6 @@ pub enum TransactionBuildError {
 
     #[error(transparent)]
     Validation(#[from] ValidationError),
-
-    #[error(transparent)]
-    TaprootPubkeyGen(#[from] TaprootPubkeyGenError),
-
-    #[error(transparent)]
-    IssuanceValidation(#[from] crate::sdk::IssuanceVerificationError),
 }
 
 /// Errors from extracting arguments from Arguments struct.

crates/contracts/src/error.rs

@@ -557,7 +557,7 @@ impl DCDArguments {
     }
 }
 
-impl simplicityhl_core::Encodable for DCDArguments {}
+impl wallet_abi::Encodable for DCDArguments {}
 
 fn u256_from_le_hex(hex_le: &str) -> U256 {
     let mut bytes = <[u8; 32]>::from_hex(hex_le).expect("expected 32 bytes hex");