package psbt and wif

VERSION

@@ -1 +1 @@
-2.7.3
+2.7.4

token-core/tcx-btc-kin/Cargo.toml

@@ -14,7 +14,7 @@ tcx-common = { path = "../tcx-common" }
 hex = "=0.4.3"
 base64 = "=0.13.1"
 
-bitcoin = "=0.29.2"
+bitcoin = {version = "=0.29.2", features = ["serde", "std", "secp-recovery"] }
 secp256k1 = {version ="=0.24.3", features = ["rand", "recovery", "rand-std"] }
 tiny-bip39 = "=1.0.0"
 bitcoin_hashes = "=0.11.0"

token-core/tcx-btc-kin/src/bch_sighash.rs

@@ -181,4 +181,14 @@ impl TxSignatureHasher for BitcoinCashSighash {
     ) -> Result<TapSighashHash> {
         Err(Error::UnsupportedTaproot.into())
     }
+
+    fn taproot_script_spend_signature_hash(
+        &mut self,
+        input_index: usize,
+        prevouts: &Prevouts<TxOut>,
+        tap_leaf_hash: TapLeafHash,
+        sighash_type: SchnorrSighashType,
+    ) -> Result<TapSighashHash> {
+        Err(Error::UnsupportedTaproot.into())
+    }
 }

token-core/tcx-btc-kin/src/lib.rs

@@ -9,6 +9,7 @@ pub mod network;
 pub mod signer;
 pub mod transaction;
 
+mod message;
 mod psbt;
 
 use core::result;
@@ -20,7 +21,6 @@ extern crate num_traits;
 
 #[macro_use]
 extern crate tcx_keystore;
-extern crate core;
 
 pub type Result<T> = result::Result<T, anyhow::Error>;
 
@@ -57,6 +57,9 @@ pub enum Error {
     ConstructBchAddressFailed(String),
     #[error("unsupported_taproot")]
     UnsupportedTaproot,
+
+    #[error("missing_signature")]
+    MissingSignature,
 }
 
 pub mod bitcoin {
@@ -65,6 +68,10 @@ pub mod bitcoin {
     pub type Address = crate::BtcKinAddress;
     pub type TransactionInput = crate::transaction::BtcKinTxInput;
     pub type TransactionOutput = crate::transaction::BtcKinTxOutput;
+
+    pub type MessageInput = crate::transaction::BtcMessageInput;
+
+    pub type MessageOutput = crate::transaction::BtcMessageOutput;
 }
 
 pub mod bitcoincash {
@@ -77,6 +84,10 @@ pub mod bitcoincash {
     pub type TransactionInput = crate::transaction::BtcKinTxInput;
 
     pub type TransactionOutput = crate::transaction::BtcKinTxOutput;
+
+    pub type MessageInput = crate::transaction::BtcMessageInput;
+
+    pub type MessageOutput = crate::transaction::BtcMessageOutput;
 }
 
 pub mod omni {
@@ -93,8 +104,10 @@ pub mod omni {
 
 #[cfg(test)]
 mod tests {
-    use tcx_constants::{TEST_MNEMONIC, TEST_PASSWORD};
+    use tcx_common::ToHex;
+    use tcx_constants::{CurveType, TEST_MNEMONIC, TEST_PASSWORD, TEST_WIF};
     use tcx_keystore::{Keystore, Metadata};
+    use tcx_primitive::{PrivateKey, Secp256k1PrivateKey};
 
     pub fn hd_keystore(mnemonic: &str) -> Keystore {
         let mut keystore =
@@ -103,7 +116,47 @@ mod tests {
         keystore
     }
 
+    pub fn private_keystore(wif: &str) -> Keystore {
+        let sec_key = Secp256k1PrivateKey::from_wif(wif).unwrap();
+        let mut keystore = Keystore::from_private_key(
+            &sec_key.to_bytes().to_hex(),
+            TEST_PASSWORD,
+            CurveType::SECP256k1,
+            Metadata::default(),
+            None,
+        )
+        .unwrap();
+        keystore.unlock_by_password(TEST_PASSWORD).unwrap();
+        keystore
+    }
+
     pub fn sample_hd_keystore() -> Keystore {
         hd_keystore(TEST_MNEMONIC)
     }
+
+    pub fn hex_keystore(hex: &str) -> Keystore {
+        let mut keystore = Keystore::from_private_key(
+            hex,
+            TEST_PASSWORD,
+            CurveType::SECP256k1,
+            Metadata::default(),
+            None,
+        )
+        .unwrap();
+        keystore.unlock_by_password(TEST_PASSWORD).unwrap();
+        keystore
+    }
+
+    pub fn wif_keystore(wif: &str) -> Keystore {
+        let hex = Secp256k1PrivateKey::from_wif(wif)
+            .unwrap()
+            .to_bytes()
+            .to_hex();
+
+        hex_keystore(&hex)
+    }
+
+    pub fn sample_wif_keystore() -> Keystore {
+        wif_keystore(TEST_WIF)
+    }
 }