replace bitcoin-rust dep with light-bitcoin (paritytech#442)

* Remove useless comment

Signed-off-by: koushiro <[email protected]>

* Replace bitcoin-rust with light-bitcoin

Signed-off-by: koushiro <[email protected]>

* Remove useless comment and cargo fmt

Signed-off-by: koushiro <[email protected]>

* update wasm

Signed-off-by: koushiro <[email protected]>

* resolve wasm conflict

Signed-off-by: koushiro <[email protected]>

* Update light-bitcoin dep; Resolve wasm conflict

Signed-off-by: koushiro <[email protected]>

Author: koushiro

Cargo.lock

@@ -14,11 +14,6 @@ ctrlc = { version = "3.0", features = ["termination"] }
 error-chain = "0.12"
 futures = "0.1.17"
 
-# bitcoin-rust
-primitives = { git = "https://github.com/chainx-org/bitcoin-rust" }
-chain = { git = "https://github.com/chainx-org/bitcoin-rust" }
-keys = { git = "https://github.com/chainx-org/bitcoin-rust" }
-
 [features]
 msgbus-redis = [
 	"chainx-cli/msgbus-redis"

Cargo.toml

@@ -38,8 +38,8 @@ runtime-api = { path = "../runtime-api" }
 xsystem = { package = "xrml-xsystem", path = "../xrml/xsystem" }
 
 # bitcoin
-btc-primitives = { package = "primitives", git = "https://github.com/chainx-org/bitcoin-rust" }
-btc-chain = { package = "chain", git = "https://github.com/chainx-org/bitcoin-rust" }
+btc-primitives = { package = "primitives", git = "https://github.com/chainx-org/light-bitcoin" }
+btc-chain = { package = "chain", git = "https://github.com/chainx-org/light-bitcoin" }
 
 [dev-dependencies]
 service-test = { package = "substrate-service-test", git = "https://github.com/chainpool/substrate" }

cli/Cargo.toml

@@ -18,7 +18,7 @@ use chainx_runtime::{
 };
 
 use btc_chain::BlockHeader;
-use btc_primitives::{compact::Compact, hash::H256};
+use btc_primitives::{h256_from_rev_str, Compact};
 
 pub enum GenesisSpec {
     Dev,
@@ -144,10 +144,10 @@ pub fn testnet_genesis(genesis_spec: GenesisSpec) -> GenesisConfig {
     let btc_genesis = (
         BlockHeader {
             version: 536870912,
-            previous_header_hash: H256::from_reversed_str(
+            previous_header_hash: h256_from_rev_str(
                 "000000000000001632e4110fd57a66e3495549cc7c37350cfaf092edf20b3370",
             ),
-            merkle_root_hash: H256::from_reversed_str(
+            merkle_root_hash: h256_from_rev_str(
                 "c8bf8333e880f7439af6ca14a6f0a18806ad0d6dfa3a58df35a1c05968d3981d",
             ),
             time: 1552136928,

cli/src/genesis_config.rs

@@ -48,8 +48,8 @@ xspot = { package = "xrml-xdex-spot", path = "../xrml/xdex/spot"  }
 xbitcoin = { package = "xrml-bridge-bitcoin", path = "../xrml/xbridge/bitcoin" }
 
 # bitcoin
-keys = { git = "https://github.com/chainx-org/bitcoin-rust" }
-btc_ser = { package = "serialization", git = "https://github.com/chainx-org/bitcoin-rust" }
+btc-keys = { package = "keys", git = "https://github.com/chainx-org/light-bitcoin" }
+btc-ser = { package = "serialization", git = "https://github.com/chainx-org/light-bitcoin" }
 
 [dev-dependencies]
 assert_matches = "1.1"

rpc/Cargo.toml

@@ -3,7 +3,6 @@
 use std::convert::Into;
 use std::iter::FromIterator;
 
-use keys::{Address, DisplayLayout};
 use parity_codec::{Decode, Encode};
 use rustc_hex::{FromHex, ToHex};
 
@@ -13,6 +12,7 @@ use runtime_primitives::traits::{Header, ProvideRuntimeApi};
 use support::storage::generator::{StorageMap, StorageValue};
 use xassets::ChainT;
 
+use btc_keys::{Address, DisplayLayout};
 use btc_ser::serialize as btc_serialize;
 
 use runtime_api::{