Abnormal cash withdrawals (paritytech#316)

* Fix give change
Optimize log

* Fix irr_block

* Modify decoding mode

* Modify  'chainx_getWithdrawTx'

* Make format btc
Change sign status

* Delete unused params

Author: eee-byte

cli/src/chainx_runtime_wasm.compact.wasm

@@ -272,29 +272,19 @@ pub fn testnet_genesis(genesis_spec: GenesisSpec) -> GenesisConfig {
         }),
         bitcoin: Some(XBridgeOfBTCConfig {
             // start genesis block: (genesis, blocknumber)
-            genesis: (
-                BlockHeader {
-                    version: 980090880,
-                    previous_header_hash: H256::from_reversed_str(
-                        "00000000000000ab706b663326210d03780fea6ecfe0cc59c78f0c7dddba9cc2",
-                    ),
-                    merkle_root_hash: H256::from_reversed_str(
-                        "91ee572484dabc6edf5a8da44a4fb55b5040facf66624b2a37c4f633070c60c8",
-                    ),
-                    time: 1550454022,
-                    bits: Compact::new(436283074),
-                    nonce: 47463732,
-                },
-                1457525,
-            ),
-            params_info: Params::new(
-                520159231,            // max_bits
-                2 * 60 * 60,          // block_max_future
-                3,                    // max_fork_route_preset
-                2 * 7 * 24 * 60 * 60, // target_timespan_seconds
-                10 * 60,              // target_spacing_seconds
-                4,
-            ), // retargeting_factor
+            genesis: (BlockHeader {
+                version: 536870912,
+                previous_header_hash: H256::from_reversed_str("0000000000005a693961608af8c00d25fa71bde2d9e3eae4494c10baaeed4070"),
+                merkle_root_hash: H256::from_reversed_str("9e7add48fd35513b37309fed6c0b9e116621de9385548aee5c4bb313476ff30a"),
+                time: 1550490136,
+                bits: Compact::new(453049348),
+                nonce: 3012999283,
+            }, 1474333),
+            params_info: Params::new(520159231, // max_bits
+                                     2 * 60 * 60,  // block_max_future
+                                     2 * 7 * 24 * 60 * 60,  // target_timespan_seconds
+                                     10 * 60,  // target_spacing_seconds
+                                     4), // retargeting_factor
             network_id: 1,
             irr_block: 6,
             reserved: 2100,

cli/src/genesis_config.rs

@@ -4,6 +4,7 @@ extern crate hex;
 
 use self::types::Revocation;
 use super::*;
+use codec::Encode;
 use keys::DisplayLayout;
 use runtime_primitives::traits::{Header, ProvideRuntimeApi};
 use srml_support::storage::generator::{StorageMap, StorageValue};
@@ -810,8 +811,6 @@ where
     }
 
     fn fee(&self, call_params: String, tx_length: u64) -> Result<Option<u64>> {
-        use codec::Encode;
-
         if !call_params.starts_with("0x") {
             return Err(BinanryStartErr.into());
         }
@@ -835,6 +834,42 @@ where
         let transaction_fee = transaction_fee?;
         Ok(transaction_fee)
     }
+
+    fn withdraw_tx(&self, chain: Chain) -> Result<Option<WithdrawTxInfo>> {
+        let state = self.best_state()?;
+        match chain {
+            Chain::Bitcoin => {
+                let key = <xbitcoin::TrusteeRedeemScript<Runtime>>::key();
+                match Self::pickout::<xbitcoin::TrusteeScriptInfo>(&state, &key)? {
+                    Some(script) => {
+                        let key = <TxProposal<Runtime>>::key();
+                        if let Some(candidate) =
+                            Self::pickout::<CandidateTx<AccountId>>(&state, &key)?
+                        {
+                            let mut sign_status = false;
+                            if candidate.sig_status == VoteResult::Finish {
+                                sign_status = true;
+                            }
+                            let raw_tx = candidate.tx.encode();
+                            if raw_tx.len() < 2 {
+                                return Ok(None);
+                            }
+                            let tx_info = WithdrawTxInfo {
+                                tx: hex::encode(raw_tx[2..].to_vec()),
+                                redeem_script: hex::encode(script.hot_redeem_script),
+                                sign_status: sign_status,
+                            };
+                            Ok(Some(tx_info))
+                        } else {
+                            return Ok(None);
+                        }
+                    }
+                    None => return Ok(None),
+                }
+            }
+            _ => return Ok(None),
+        }
+    }
 }
 
 fn get_btc_deposit_info(

rpc/src/chainx/impl_rpc.rs

@@ -47,7 +47,7 @@ use self::error::Result;
 use self::types::{
     AssetInfo, DepositInfo, IntentionInfo, NominationRecord, PageData, PairInfo,
     PseduIntentionInfo, PseduNominationRecord, QuotationsList, TotalAssetInfo, TrusteeInfo,
-    WithdrawInfo, WithdrawStatus,
+    WithdrawInfo, WithdrawStatus, WithdrawTxInfo,
 };
 use chainx::error::ErrorKind::*;
 const MAX_PAGE_SIZE: u32 = 100;
@@ -109,6 +109,9 @@ pub trait ChainXApi<Number, AccountId, Balance, BlockNumber, SignedBlock> {
 
     #[rpc(name = "chainx_getFeeByCallAndLength")]
     fn fee(&self, String, u64) -> Result<Option<u64>>;
+
+    #[rpc(name = "chainx_getWithdrawTx")]
+    fn withdraw_tx(&self, chain: Chain) -> Result<Option<WithdrawTxInfo>>;
 }
 
 /// ChainX API

rpc/src/chainx/mod.rs

@@ -294,3 +294,14 @@ impl WithdrawInfo {
         }
     }
 }
+
+#[derive(Debug, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct WithdrawTxInfo {
+    /// tx
+    pub tx: String,
+    /// redeem_script
+    pub redeem_script: String,
+    /// sign_status
+    pub sign_status: bool,
+}

rpc/src/chainx/types.rs

@@ -43,7 +43,7 @@ impl<T: Trait> Chain<T> {
             None => return Err(ChainErr::OtherErr("Not found block header for this hash")),
         };
 
-        runtime_io::print("[bridge-btc] Confirmed header height:");
+        runtime_io::print("[bridge-btc] Confirmed header:");
         runtime_io::print(confirmed_header.height as u64);
 
         let tx_list = confirmed_header.txid;
@@ -52,7 +52,7 @@ impl<T: Trait> Chain<T> {
             // deposit & withdraw
             match handle_tx::<T>(&txid) {
                 Err(_) => {
-                    runtime_io::print("[bridge-btc] Handle_tx error, tx hash:");
+                    runtime_io::print("[bridge-btc] Handle tx error, tx hash:");
                     runtime_io::print(&txid[..]);
                 }
                 Ok(()) => (),

runtime/wasm/target/wasm32-unknown-unknown/release/chainx_runtime_wasm.compact.wasm

@@ -9,7 +9,8 @@ use primitives::hash::H256;
 use primitives::U256;
 
 use super::{
-    BestIndex, BlockHeaderFor, BlockHeightFor, GenesisInfo, NetworkId, Params, ParamsInfo, Trait,
+    BestIndex, BlockHeaderFor, BlockHeightFor, GenesisInfo, IrrBlock, NetworkId, Params,
+    ParamsInfo, Trait,
 };
 use blockchain::ChainErr;
 use runtime_primitives::traits::As;
@@ -44,8 +45,9 @@ impl<'a> HeaderVerifier<'a> {
             return Err(ChainErr::NotFound);
         }
 
+        let irr_block = <IrrBlock<T>>::get();
         let this_height = prev_height + 1;
-        if this_height < best_height - params.max_fork_route_preset {
+        if this_height < best_height - irr_block {
             return Err(ChainErr::AncientFork);
         }
 

xrml/xbridge/bitcoin/src/blockchain.rs

@@ -76,7 +76,7 @@ use rstd::result::Result as StdResult;
 use runtime_support::dispatch::Result;
 use runtime_support::{StorageMap, StorageValue};
 use script::script::Script;
-use ser::deserialize;
+use ser::{deserialize, Reader};
 use system::ensure_signed;
 pub use tx::RelayTx;
 use tx::{
@@ -175,7 +175,6 @@ pub struct Params {
     max_bits: u32,
     //Compact
     block_max_future: u32,
-    max_fork_route_preset: u32,
 
     target_timespan_seconds: u32,
     target_spacing_seconds: u32,
@@ -192,15 +191,13 @@ impl Params {
     pub fn new(
         max_bits: u32,
         block_max_future: u32,
-        max_fork_route_preset: u32,
         target_timespan_seconds: u32,
         target_spacing_seconds: u32,
         retargeting_factor: u32,
     ) -> Params {
         Params {
             max_bits,
             block_max_future,
-            max_fork_route_preset,
 
             target_timespan_seconds,
             target_spacing_seconds,
@@ -315,7 +312,6 @@ decl_module! {
         fn deposit_event<T>() = default;
 
         pub fn push_header(origin, header: Vec<u8>) -> Result {
-            runtime_io::print("[bridge_btc] Push btc header");
             let from = ensure_signed(origin)?;
             let header: BlockHeader = deserialize(header.as_slice()).map_err(|_| "Cannot deserialize the header vec")?;
             ensure!(
@@ -326,14 +322,12 @@ decl_module! {
                 <BlockHeaderFor<T>>::exists(&header.previous_header_hash),
                 "Cannot push if can't find its previous header in ChainX, which may be header of some orphan block."
             );
-
             Self::apply_push_header(header, &from)?;
 
             Ok(())
         }
 
         pub fn push_transaction(origin, tx: Vec<u8>) -> Result {
-            runtime_io::print("[bridge_btc] Push btc tx");
             ensure_signed(origin)?;
             let tx: RelayTx = Decode::decode(&mut tx.as_slice()).ok_or("Parse RelayTx err")?;
             let trustee_address = <xaccounts::TrusteeAddress<T>>::get(xassets::Chain::Bitcoin).ok_or("Should set trustee address first.")?;
@@ -348,7 +342,7 @@ decl_module! {
             let from = ensure_signed(origin)?;
             // commiter must in trustee node list
             Self::ensure_trustee_node(&from)?;
-            let tx: BTCTransaction = Decode::decode(&mut tx.as_slice()).ok_or("Parse transaction err")?;
+            let tx: BTCTransaction = deserialize(Reader::new(tx.as_slice())).map_err(|_|"Parse transaction err")?;
             Self::apply_create_withdraw(tx, withdraw_id)?;
 
             Ok(())
@@ -475,9 +469,9 @@ impl<T: Trait> Module<T> {
             <BlockHeightFor<T>>::remove(&del);
 
             // update confirmd status
-            let params: Params = <ParamsInfo<T>>::get();
+            let irr_block = <IrrBlock<T>>::get();
             let mut confirm_header = header_info.clone();
-            for _index in 0..params.max_fork_route_preset {
+            for _index in 0..irr_block {
                 if let Some(info) =
                     <BlockHeaderFor<T>>::get(&confirm_header.header.previous_header_hash)
                 {
@@ -526,7 +520,7 @@ impl<T: Trait> Module<T> {
                 let outpoint = tx.raw.inputs[0].previous_output.clone();
                 match inspect_address::<T>(&tx.previous_raw, outpoint) {
                     Some(a) => a,
-                    None => return Err("inspect address failed"),
+                    None => return Err("Inspect address failed"),
                 }
             }
         };
@@ -549,7 +543,7 @@ impl<T: Trait> Module<T> {
 
         if confirmed {
             handle_tx::<T>(&tx.raw.hash()).map_err(|e| {
-                runtime_io::print("handle_tx error :");
+                runtime_io::print("[bridge_btc] Handle tx error:");
                 runtime_io::print(tx.raw.hash().to_vec().as_slice());
                 e
             })?;
@@ -567,7 +561,10 @@ impl<T: Trait> Module<T> {
             .ok_or("Should set trustee address first.")?;
         let hot_address = Address::from_layout(&trustee_address.hot_address.as_slice())
             .map_err(|_| "Invalid Address")?;
-        check_withdraw_tx::<T>(tx, withdraw_id, hot_address)?;
+        check_withdraw_tx::<T>(tx.clone(), withdraw_id.clone(), hot_address.clone())?;
+        let candidate = CandidateTx::new(withdraw_id, tx, VoteResult::Unfinish, Vec::new());
+        <TxProposal<T>>::put(candidate);
+        runtime_io::print("[bridge-btc] Through the legality check of withdrawal transaction ");
         Ok(())
     }
 
@@ -586,28 +583,30 @@ impl<T: Trait> Module<T> {
                     let reject_count: Vec<&(T::AccountId, bool)> =
                         sig_node.iter().filter(|(_, vote)| *vote == false).collect();
                     data.sig_node.push((who, vote_state));
-                    runtime_io::print("Veto signature");
+                    runtime_io::print("[bridge_btc] Veto signature");
                     if reject_count.len() + 1 >= sign_num {
-                        runtime_io::print("Clear TxProposal");
+                        runtime_io::print("[bridge_btc] Clear TxProposal");
                         <TxProposal<T>>::kill();
                         return Ok(());
                     }
                     let candidate =
                         CandidateTx::new(data.withdraw_id, data.tx, data.sig_status, data.sig_node);
                     <TxProposal<T>>::put(candidate);
                 } else {
-                    let tx: BTCTransaction = Decode::decode(&mut tx.as_slice()).ok_or("Parse transaction err")?;
+                    let tx: BTCTransaction = deserialize(Reader::new(tx.as_slice())).map_err(|_|"Parse transaction err")?;
                     let script: Script = tx.inputs[0].script_sig.clone().into();
                     let (sigs, _dem) = if let Ok((sigs, dem)) = script.extract_multi_scriptsig() {
                         (sigs, dem)
                     } else {
                         return Err("No signature");
                     };
-                    runtime_io::print("Signature pass");
+                    runtime_io::print("[bridge_btc] Signature pass");
                     data.sig_node.push((who, vote_state));
                     if sigs.len() >= sign_num {
-                        runtime_io::print("Signature finsh 2n/3");
+                        runtime_io::print("[bridge_btc] Signature finish");
                         data.sig_status = VoteResult::Finish;
+                    } else {
+                        data.sig_status = VoteResult::Unfinish;
                     }
 
                     let candidate =

xrml/xbridge/bitcoin/src/header_proof.rs

@@ -6,11 +6,7 @@ extern crate rustc_hex;
 extern crate serialization;
 extern crate sr_primitives;
 extern crate srml_consensus as consensus;
-use self::base58::FromBase58;
-use self::hex::FromHex;
-//use self::rustc_hex::FromHex;
 use self::keys::DisplayLayout;
-use self::rustc_hex::ToHex;
 use self::serialization::Reader;
 use super::*;
 use chain::Transaction;
@@ -22,10 +18,7 @@ use runtime_primitives::traits::{BlakeTwo256, IdentityLookup};
 use runtime_primitives::BuildStorage;
 use runtime_support::StorageValue;
 use script::builder::Builder;
-use script::{
-    builder, script::Script, Opcode, SignatureChecker, SignatureVersion, TransactionInputSigner,
-    TransactionSignatureChecker,
-};
+use script::{script::Script, Opcode};
 use substrate_primitives::{Blake2Hasher, H256 as S_H256};
 
 impl_outer_origin! {
@@ -694,15 +687,14 @@ pub fn test_multi_address() {
 
 fn create_multi_address(pubkeys: Vec<Vec<u8>>) -> Address {
     let mut build = Builder::default().push_opcode(Opcode::OP_3);
-    for (i, pubkey) in pubkeys.iter().enumerate() {
+    for (_, pubkey) in pubkeys.iter().enumerate() {
         build = build.push_bytes(pubkey);
     }
     let script = build
         .push_opcode(Opcode::OP_4)
         .push_opcode(Opcode::OP_CHECKMULTISIG)
         .into_script();
-    println!("script:{:?}", script.to_bytes().to_vec());
-    println!("script:{:?}", Script::from(script.to_bytes().to_vec()));
+    //println!("script:{:?}", script.to_bytes().to_vec());
     let multisig_address = Address {
         kind: keys::Type::P2SH,
         network: keys::Network::Testnet,
@@ -746,10 +738,8 @@ fn test_create_multi_address() {
     cold_keys.push(pubkey7_bytes);
     cold_keys.push(pubkey8_bytes);
 
-    let hot_addr = create_multi_address(hot_keys);
+    let _hot_addr = create_multi_address(hot_keys);
     let cold_addr = create_multi_address(cold_keys);
-    println!("hot_addr:{:?}", hot_addr.to_string());
-    println!("cold_addr:{:?}", cold_addr.to_string());
 
     let layout_addr = cold_addr.layout().to_vec();
     let layout = [
@@ -804,7 +794,7 @@ fn test_accountid() {
 #[test]
 fn test_sign_withdraw() {
     with_externalities(&mut new_test_ext3(), || {
-        let tx1 = hex::decode("01000000019d15247f7f75ffd6e9377ea928f476bcaf9ab542563429b97ee2ef89f2c9d4a101000000b5004830450221008c9147795b2ddf923d5dad3c9fcfde6394aa2629b9a10ca8f93a5c6d4293a7490220687aeb3318b35450fda4d45cc54177f3d6f898d15ea1f8705a77c7116cb44fe8014c695221023e505c48a955e759ce61145dc4a9a7447425290b8483f4e36f05169e7967c86d2102e34d10113f2dd162e8d8614a4afbb8e2eb14eddf4036042b35d12cf5529056a2210311252930af8ba766b9c7a6580d8dc4bbf9b0befd17a8ef7fabac275bba77ae4053aeffffffff01e8030000000000001976a914023dbd259dd15fc43da1a758ea7b2bfaec97893488ac00000000").unwrap();
+        let _tx1 = hex::decode("01000000019d15247f7f75ffd6e9377ea928f476bcaf9ab542563429b97ee2ef89f2c9d4a101000000b5004830450221008c9147795b2ddf923d5dad3c9fcfde6394aa2629b9a10ca8f93a5c6d4293a7490220687aeb3318b35450fda4d45cc54177f3d6f898d15ea1f8705a77c7116cb44fe8014c695221023e505c48a955e759ce61145dc4a9a7447425290b8483f4e36f05169e7967c86d2102e34d10113f2dd162e8d8614a4afbb8e2eb14eddf4036042b35d12cf5529056a2210311252930af8ba766b9c7a6580d8dc4bbf9b0befd17a8ef7fabac275bba77ae4053aeffffffff01e8030000000000001976a914023dbd259dd15fc43da1a758ea7b2bfaec97893488ac00000000").unwrap();
         let tx2 = hex::decode("01000000019d15247f7f75ffd6e9377ea928f476bcaf9ab542563429b97ee2ef89f2c9d4a101000000fdfd00004830450221008c9147795b2ddf923d5dad3c9fcfde6394aa2629b9a10ca8f93a5c6d4293a7490220687aeb3318b35450fda4d45cc54177f3d6f898d15ea1f8705a77c7116cb44fe80147304402204b999fbf18b944a3f6446ca56d094d70699a1e44c8636b06fc2267434e9200ae022073327aca6cdad35075c9c8bb2759a24753906ef030ccb513d8a515648ab46d0e014c695221023e505c48a955e759ce61145dc4a9a7447425290b8483f4e36f05169e7967c86d2102e34d10113f2dd162e8d8614a4afbb8e2eb14eddf4036042b35d12cf5529056a2210311252930af8ba766b9c7a6580d8dc4bbf9b0befd17a8ef7fabac275bba77ae4053aeffffffff01e8030000000000001976a914023dbd259dd15fc43da1a758ea7b2bfaec97893488ac00000000").unwrap();
         let tx: Transaction = deserialize(Reader::new(&tx2)).unwrap();
         XBridgeOfBTC::apply_sign_withdraw(0, tx, true).unwrap();