Add btc native segwit function and support mixed signature

api/src/api.rs

@@ -145,3 +145,14 @@ pub struct BtcForkWallet {
     #[prost(string, tag = "4")]
     pub enc_x_pub: std::string::String,
 }
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct BtcAddressParam {
+    #[prost(string, tag = "1")]
+    pub chain_type: std::string::String,
+    #[prost(string, tag = "2")]
+    pub path: std::string::String,
+    #[prost(string, tag = "3")]
+    pub network: std::string::String,
+    #[prost(string, tag = "4")]
+    pub seg_wit: std::string::String,
+}

api/src/btc_address.rs

@@ -1,5 +1,6 @@
 use crate::api::{
-    AddressParam, AddressResult, BitcoinWallet, ExternalAddress, ExternalAddressParam,
+    AddressParam, AddressResult, BitcoinWallet, BtcAddressParam, ExternalAddress,
+    ExternalAddressParam,
 };
 use crate::error_handling::Result;
 use crate::message_handler::encode_message;
@@ -23,7 +24,7 @@ pub fn get_btc_xpub(data: &[u8]) -> Result<Vec<u8>> {
     encode_message(address_message)
 }
 
-pub fn get_address(param: &AddressParam) -> Result<Vec<u8>> {
+pub fn get_address(param: &BtcAddressParam) -> Result<Vec<u8>> {
     let network = match param.network.as_ref() {
         "MAINNET" => Network::Bitcoin,
         "TESTNET" => Network::Testnet,
@@ -34,16 +35,30 @@ pub fn get_address(param: &AddressParam) -> Result<Vec<u8>> {
     let main_address: String;
     let receive_address: String;
 
-    if param.is_seg_wit {
-        main_address =
-            BtcAddress::get_segwit_address(network, format!("{}/0/0", account_path).as_str())?;
-        receive_address =
-            BtcAddress::get_segwit_address(network, format!("{}/0/1", account_path).as_str())?;
-    } else {
-        main_address = BtcAddress::get_address(network, format!("{}/0/0", account_path).as_str())?;
-        receive_address =
-            BtcAddress::get_address(network, format!("{}/0/1", account_path).as_str())?;
-    }
+    match param.seg_wit.to_uppercase() {
+        "NONE" => {
+            main_address =
+                BtcAddress::get_address(network, format!("{}/0/0", account_path).as_str())?;
+            receive_address =
+                BtcAddress::get_address(network, format!("{}/0/1", account_path).as_str())?;
+        }
+        "P2WPKH" => {
+            main_address =
+                BtcAddress::get_segwit_address(network, format!("{}/0/0", account_path).as_str())?;
+            receive_address =
+                BtcAddress::get_segwit_address(network, format!("{}/0/1", account_path).as_str())?;
+        }
+        "BECH32" => {
+            main_address = BtcAddress::get_native_segwit_address(
+                network,
+                format!("{}/0/0", account_path).as_str(),
+            )?;
+            receive_address = BtcAddress::get_native_segwit_address(
+                network,
+                format!("{}/0/1", account_path).as_str(),
+            )?;
+        }
+    };
 
     let enc_xpub = get_enc_xpub(network, param.path.as_ref())?;
 
@@ -74,11 +89,18 @@ pub fn calc_external_address(param: &ExternalAddressParam) -> Result<Vec<u8>> {
     let external_path = format!("{}/0/{}", account_path, param.external_idx);
     let receive_address: String;
 
-    if param.seg_wit.to_uppercase() == "P2WPKH" {
-        receive_address = BtcAddress::get_segwit_address(network, external_path.as_str())?;
-    } else {
-        receive_address = BtcAddress::get_address(network, external_path.as_str())?;
-    }
+    match param.seg_wit.to_uppercase() {
+        "NONE" => {
+            receive_address = BtcAddress::get_address(network, external_path.as_str())?;
+        }
+        "P2WPKH" => {
+            receive_address = BtcAddress::get_segwit_address(network, external_path.as_str())?;
+        }
+        "BECH32" => {
+            receive_address =
+                BtcAddress::get_native_segwit_address(network, external_path.as_str())?;
+        }
+    };
 
     let external_address = ExternalAddress {
         address: receive_address,
@@ -99,15 +121,15 @@ pub fn get_enc_xpub(network: Network, path: &str) -> Result<String> {
     Ok(base64::encode(&encrypted))
 }
 
-pub fn register_btc_address(param: &AddressParam) -> Result<Vec<u8>> {
-    if param.is_seg_wit {
-        display_segwit_address(param)
-    } else {
-        display_btc_legacy_address(param)
+pub fn register_btc_address(param: &BtcAddressParam) -> Result<Vec<u8>> {
+    match param.seg_wit.to_uppercase() {
+        "NONE" => display_btc_legacy_address(param),
+        "P2WPKH" => display_segwit_address(param),
+        "BECH32" => display_native_segwit_address(param),
     }
 }
 
-pub fn display_btc_legacy_address(param: &AddressParam) -> Result<Vec<u8>> {
+pub fn display_btc_legacy_address(param: &BtcAddressParam) -> Result<Vec<u8>> {
     let network = match param.network.as_ref() {
         "MAINNET" => Network::Bitcoin,
         "TESTNET" => Network::Testnet,
@@ -125,7 +147,7 @@ pub fn display_btc_legacy_address(param: &AddressParam) -> Result<Vec<u8>> {
     encode_message(address_message)
 }
 
-pub fn display_segwit_address(param: &AddressParam) -> Result<Vec<u8>> {
+pub fn display_segwit_address(param: &BtcAddressParam) -> Result<Vec<u8>> {
     let network = match param.network.as_ref() {
         "MAINNET" => Network::Bitcoin,
         "TESTNET" => Network::Testnet,
@@ -142,3 +164,21 @@ pub fn display_segwit_address(param: &AddressParam) -> Result<Vec<u8>> {
     };
     encode_message(address_message)
 }
+
+pub fn display_native_segwit_address(param: &BtcAddressParam) -> Result<Vec<u8>> {
+    let network = match param.network.as_ref() {
+        "MAINNET" => Network::Bitcoin,
+        "TESTNET" => Network::Testnet,
+        _ => Network::Testnet,
+    };
+
+    let path = format!("{}/0/0", param.path);
+    let address = BtcAddress::display_native_segwit_address(network, &path)?;
+
+    let address_message = AddressResult {
+        path: param.path.to_string(),
+        chain_type: param.chain_type.to_string(),
+        address,
+    };
+    encode_message(address_message)
+}

api/src/btc_signer.rs

@@ -15,12 +15,16 @@ pub fn sign_btc_transaction(data: &[u8], sign_param: &SignParam) -> Result<Vec<u
     if (input.protocol.to_uppercase() == "OMNI") {
         if input.seg_wit.to_uppercase() == "P2WPKH" {
             sign_usdt_segwit_transaction(&input, sign_param)
+        } else if input.seg_wit.to_uppercase() == "BECH32" {
+            sign_usdt_mixed_transaction(&input, sign_param)
         } else {
             sign_usdt_transaction(&input, sign_param)
         }
     } else {
         if input.seg_wit.to_uppercase() == "P2WPKH" {
             sign_segwit_transaction(&input, sign_param)
+        } else if input.seg_wit.to_uppercase() == "BECH32" {
+            sign_mixed_transaction(&input, sign_param)
         } else {
             sign_legacy_transaction(&input, sign_param)
         }
@@ -126,6 +130,52 @@ pub fn sign_segwit_transaction(param: &BtcTxInput, sign_param: &SignParam) -> Re
     encode_message(tx_sign_result)
 }
 
+pub fn sign_mixed_transaction(param: &BtcTxInput, sign_param: &SignParam) -> Result<Vec<u8>> {
+    let mut unspents = Vec::new();
+    for utxo in &param.unspents {
+        let new_utxo = Utxo {
+            txhash: utxo.tx_hash.to_string(),
+            vout: utxo.vout,
+            amount: utxo.amount,
+            address: Address::from_str(&utxo.address).unwrap(),
+            script_pubkey: utxo.script_pub_key.to_string(),
+            derive_path: utxo.derived_path.to_string(),
+            sequence: utxo.sequence,
+        };
+        unspents.push(new_utxo);
+    }
+
+    let btc_tx = BtcTransaction {
+        to: Address::from_str(&param.to).unwrap(),
+        //        change_idx: input.change_address_index as i32,
+        amount: param.amount,
+        unspents: unspents,
+        fee: param.fee,
+    };
+
+    let network = if sign_param.network == "TESTNET".to_string() {
+        Network::Testnet
+    } else {
+        Network::Bitcoin
+    };
+
+    let op_return: Vec<u8>;
+    if let Some(extra) = param.extra.clone() {
+        op_return = hex_to_bytes(&extra.op_return).expect("decode btc extra op_return");
+    } else {
+        op_return = vec![];
+    }
+
+    let signed =
+        btc_tx.sign_mixed_transaction(network, param.change_address_index as i32, &op_return)?;
+    let tx_sign_result = BtcTxOutput {
+        signature: signed.signature,
+        wtx_hash: signed.wtx_id,
+        tx_hash: signed.tx_hash,
+    };
+    encode_message(tx_sign_result)
+}
+
 pub fn sign_usdt_transaction(input: &BtcTxInput, sign_param: &SignParam) -> Result<Vec<u8>> {
     let mut unspents = Vec::new();
     for utxo in &input.unspents {
@@ -210,3 +260,46 @@ pub fn sign_usdt_segwit_transaction(input: &BtcTxInput, sign_param: &SignParam)
     };
     encode_message(tx_sign_result)
 }
+
+pub fn sign_usdt_mixed_transaction(input: &BtcTxInput, sign_param: &SignParam) -> Result<Vec<u8>> {
+    let mut unspents = Vec::new();
+    for utxo in &input.unspents {
+        let new_utxo = Utxo {
+            txhash: utxo.tx_hash.to_string(),
+            vout: utxo.vout,
+            amount: utxo.amount,
+            address: Address::from_str(&utxo.address).unwrap(),
+            script_pubkey: utxo.script_pub_key.to_string(),
+            derive_path: utxo.derived_path.to_string(),
+            sequence: utxo.sequence,
+        };
+        unspents.push(new_utxo);
+    }
+
+    let btc_tx = BtcTransaction {
+        to: Address::from_str(&input.to).unwrap(),
+        //        change_idx: input.change_address_index as i32,
+        amount: input.amount,
+        unspents: unspents,
+        fee: input.fee,
+    };
+
+    let network = if sign_param.network == "TESTNET".to_string() {
+        Network::Testnet
+    } else {
+        Network::Bitcoin
+    };
+
+    let extra = input
+        .extra
+        .clone()
+        .expect("sign usdt tx must contains extra");
+
+    let signed = btc_tx.sign_omni_mixed_transaction(network, extra.property_id as i32)?;
+    let tx_sign_result = BtcTxOutput {
+        signature: signed.signature,
+        wtx_hash: signed.wtx_id,
+        tx_hash: signed.tx_hash,
+    };
+    encode_message(tx_sign_result)
+}

common/src/apdu.rs

@@ -93,6 +93,16 @@ impl BtcApdu {
         apdu.to_hex().to_uppercase()
     }
 
+    pub fn btc_legacy_sign(p1: u8, p2: u8, data: &Vec<u8>) -> String {
+        if data.len() as u32 > LC_MAX {
+            panic!("data to long");
+        }
+        let mut apdu = ApduHeader::new(0x80, 0x52, p1, p2, data.len() as u8).to_array();
+        apdu.extend(data.iter());
+        apdu.push(0x00);
+        apdu.to_hex().to_uppercase()
+    }
+
     pub fn omni_prepare_data(p1: u8, data: Vec<u8>) -> String {
         if data.len() as u32 > LC_MAX {
             panic!("data to long");

common/src/constants.rs

@@ -38,6 +38,12 @@ pub const FILECOIN_PATH: &str = "m/44'/461'/0/0/0";
 pub const POLKADOT_PATH: &str = "m/44'/354'/0'/0'/0'";
 pub const KUSAMA_PATH: &str = "m/44'/434'/0'/0'/0'";
 pub const TRON_PATH: &str = "m/44'/195'/0'/0/0";
+pub const BTC_LEGACY_MAINNET_PATH: &str = "m/44'/0'/0'";
+pub const BTC_LEGACY_TESTNET_PATH: &str = "m/44'/1'/0'";
+pub const BTC_SEGWIT_MAINNET_PATH: &str = "m/49'/0'/0'";
+pub const BTC_SEGWIT_TESTNET_PATH: &str = "m/49'/1'/0'";
+pub const BTC_NATIVE_SEGWIT_MAINNET_PATH: &str = "m/84'/0'/0'";
+pub const BTC_NATIVE_SEGWIT_TESTNET_PATH: &str = "m/84'/1'/0'";
 
 pub const MAX_UTXO_NUMBER: usize = 252;
 pub const EACH_ROUND_NUMBER: usize = 5;

common/src/error.rs

@@ -82,4 +82,6 @@ pub enum CoinError {
     InvalidVersion,
     #[fail(display = "invalid addr length")]
     InvalidAddrLength,
+    #[fail(display = "unsupported script pubkey")]
+    UnsupportedScriptPubkey,
 }

proto/src/api.proto

@@ -100,4 +100,11 @@ message BtcForkWallet {
     string chainType = 2;
     string address = 3;
     string encXPub = 4;
+}
+
+message BtcAddressParam {
+    string chainType = 1;
+    string path = 2;
+    string network = 3;
+    string segWit = 4;
 }

target/rls/.rustc_info.json

@@ -0,0 +1 @@
+{"rustc_fingerprint":14399210194298430792,"outputs":{"4476964694761187371":["___\nlib___.rlib\nlib___.dylib\nlib___.dylib\nlib___.a\nlib___.dylib\n/Users/joe/.rustup/toolchains/stable-x86_64-apple-darwin\ndebug_assertions\nproc_macro\ntarget_arch=\"x86_64\"\ntarget_endian=\"little\"\ntarget_env=\"\"\ntarget_family=\"unix\"\ntarget_feature=\"fxsr\"\ntarget_feature=\"sse\"\ntarget_feature=\"sse2\"\ntarget_feature=\"sse3\"\ntarget_feature=\"ssse3\"\ntarget_os=\"macos\"\ntarget_pointer_width=\"64\"\ntarget_vendor=\"apple\"\nunix\n",""],"1164083562126845933":["rustc 1.39.0 (4560ea788 2019-11-04)\nbinary: rustc\ncommit-hash: 4560ea788cb760f0a34127156c78e2552949f734\ncommit-date: 2019-11-04\nhost: x86_64-apple-darwin\nrelease: 1.39.0\nLLVM version: 9.0\n",""],"1138116330425514636":["___\n",""],"10915535544655558915":["rustdoc [options] <input>\n\nOptions:\n    -h, --help          show this help message\n    -V, --version       print rustdoc's version\n    -v, --verbose       use verbose output\n    -r, --input-format [rust]\n                        the input type of the specified file\n    -w, --output-format [html]\n                        the output type to write\n    -o, --output PATH   where to place the output\n        --crate-name NAME\n                        specify the name of this crate\n        --crate-type [bin|lib|rlib|dylib|cdylib|staticlib|proc-macro]\n                        Comma separated list of types of crates\n                        for the compiler to emit\n    -L, --library-path DIR\n                        directory to add to crate search path\n        --cfg           pass a --cfg to rustc\n        --extern NAME=PATH\n                        pass an --extern to rustc\n        --extern-html-root-url NAME=URL\n                        base URL to use for dependencies\n        --plugin-path DIR\n                        removed\n    -C, --codegen OPT[=VALUE]\n                        pass a codegen option to rustc\n        --passes PASSES list of passes to also run, you might want to pass it\n                        multiple times; a value of `list` will print available\n                        passes\n        --plugins PLUGINS\n                        removed\n        --no-defaults   don't run the default passes\n        --document-private-items \n                        document private items\n        --test          run code examples as tests\n        --test-args ARGS\n                        arguments to pass to the test runner\n        --target TRIPLE target triple to document\n        --markdown-css FILES\n                        CSS files to include via <link> in a rendered Markdown\n                        file\n        --html-in-header FILES\n                        files to include inline in the <head> section of a\n                        rendered Markdown file or generated documentation\n        --html-before-content FILES\n                        files to include inline between <body> and the content\n                        of a rendered Markdown file or generated documentation\n        --html-after-content FILES\n                        files to include inline between the content and\n                        </body> of a rendered Markdown file or generated\n                        documentation\n        --markdown-before-content FILES\n                        files to include inline between <body> and the content\n                        of a rendered Markdown file or generated documentation\n        --markdown-after-content FILES\n                        files to include inline between the content and\n                        </body> of a rendered Markdown file or generated\n                        documentation\n        --markdown-playground-url URL\n                        URL to send code snippets to\n        --markdown-no-toc \n                        don't include table of contents\n    -e, --extend-css PATH\n                        To add some CSS rules with a given file to generate\n                        doc with your own theme. However, your theme might\n                        break if the rustdoc's generated HTML changes, so be\n                        careful!\n    -Z FLAG             internal and debugging options (only on nightly build)\n        --sysroot PATH  Override the system root\n        --playground-url URL\n                        URL to send code snippets to, may be reset by\n                        --markdown-playground-url or\n                        `#![doc(html_playground_url=...)]`\n        --display-warnings \n                        to print code warnings when testing doc\n        --crate-version VERSION\n                        crate version to print into documentation\n        --sort-modules-by-appearance \n                        sort modules by where they appear in the program,\n                        rather than alphabetically\n        --themes FILES  additional themes which will be added to the generated\n                        docs\n        --theme-checker FILES\n                        check if given theme is valid\n        --resource-suffix PATH\n                        suffix to add to CSS and JavaScript files, e.g.,\n                        \"light.css\" will become \"light-suffix.css\"\n        --edition EDITION\n                        edition to use when compiling rust code (default:\n                        2015)\n        --color auto|always|never\n                        Configure coloring of output:\n                        auto = colorize, if output goes to a tty (default);\n                        always = always colorize output;\n                        never = never colorize output\n        --error-format human|json|short\n                        How errors and other messages are produced\n        --json CONFIG   Configure the structure of JSON diagnostics\n        --disable-minification \n                        Disable minification applied on JS files\n    -W, --warn OPT      Set lint warnings\n    -A, --allow OPT     Set lint allowed\n    -D, --deny OPT      Set lint denied\n    -F, --forbid OPT    Set lint forbidden\n        --cap-lints LEVEL\n                        Set the most restrictive lint level. More restrictive\n                        lints are capped at this level. By default, it is at\n                        `forbid` level.\n        --index-page PATH\n                        Markdown file to be used as index page\n        --enable-index-page \n                        To enable generation of the index page\n        --static-root-path PATH\n                        Path string to force loading static files from in\n                        output pages. If not set, uses combinations of '../'\n                        to reach the documentation root.\n        --disable-per-crate-search \n                        disables generating the crate selector on the search\n                        box\n        --persist-doctests PATH\n                        Directory to persist doctest executables into\n        --generate-redirect-pages \n                        Generate extra pages to support legacy URLs and tool\n                        links\n        --show-coverage \n                        calculate percentage of public items with\n                        documentation\n        --enable-per-target-ignores \n                        parse ignore-foo for ignoring doctests on a per-target\n                        basis\n        --runtool The tool to run tests with when building for a different target than host\n                        \n        --runtool-arg One (of possibly many) arguments to pass to the runtool\n                        \n        --test-builder  specified the rustc-like binary to use as the test\n                        builder\n\n",""],"7418947162089833526":["___\nlib___.rlib\nlib___.dylib\nlib___.dylib\nlib___.a\nlib___.dylib\n/Users/joe/.rustup/toolchains/stable-x86_64-apple-darwin\ndebug_assertions\nproc_macro\ntarget_arch=\"x86_64\"\ntarget_endian=\"little\"\ntarget_env=\"\"\ntarget_family=\"unix\"\ntarget_feature=\"fxsr\"\ntarget_feature=\"sse\"\ntarget_feature=\"sse2\"\ntarget_feature=\"sse3\"\ntarget_feature=\"ssse3\"\ntarget_os=\"macos\"\ntarget_pointer_width=\"64\"\ntarget_vendor=\"apple\"\nunix\n",""]},"successes":{}}

target/rls/debug/.fingerprint/api-605d75f72da8e02d/invoked.timestamp

@@ -0,0 +1 @@
+This file has an mtime of when this was started.

target/rls/debug/.fingerprint/api-605d75f72da8e02d/test-lib-api-605d75f72da8e02d

@@ -0,0 +1 @@
+f8c00763f4d87098