Skip to content

Commit 159edfc

Browse files
committed
Feature/btc (paritytech#68)
* Add btc keys module * Add script module * Add some script * Update RelayTx * Support four tx type * Add UTXO index * Support handle_output rollback * Add handle input function * Delete tx/script.rs * Add handle input on block rollback
1 parent 824bcd8 commit 159edfc

15 files changed

Lines changed: 3053 additions & 305 deletions

File tree

Cargo.lock

Lines changed: 25 additions & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ slog = "^2"
4646
log = "0.3"
4747

4848
# bitcoin-rust
49-
primitives = { git = "https://github.com/chainx-org/bitcoin-rust" }
50-
chain = { git = "https://github.com/chainx-org/bitcoin-rust" }
49+
primitives = { git = "https://github.com/chainx-org/bitcoin-rust", rev = "8b2dab29c12d19bcd75f268deb01ff19cccd7050" }
50+
chain = { git = "https://github.com/chainx-org/bitcoin-rust", rev = "8b2dab29c12d19bcd75f268deb01ff19cccd7050" }
5151

5252
[workspace]
5353
members = [

cxrml/bridge/btc/Cargo.toml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,14 @@ srml-consensus = { git = "https://github.com/paritytech/substrate", default-feat
2121
srml-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false }
2222

2323
# bitcoin-rust
24-
chain = { git = "https://github.com/chainx-org/bitcoin-rust", default-features = false }
25-
primitives = { git = "https://github.com/chainx-org/bitcoin-rust", default-features = false }
26-
serialization = { git = "https://github.com/chainx-org/bitcoin-rust", default-features = false }
27-
bitcrypto = { git = "https://github.com/chainx-org/bitcoin-rust", default-features = false }
24+
chain = { git = "https://github.com/chainx-org/bitcoin-rust", rev = "8b2dab29c12d19bcd75f268deb01ff19cccd7050", default-features = false }
25+
primitives = { git = "https://github.com/chainx-org/bitcoin-rust", rev = "8b2dab29c12d19bcd75f268deb01ff19cccd7050", default-features = false }
26+
serialization = { git = "https://github.com/chainx-org/bitcoin-rust", rev = "8b2dab29c12d19bcd75f268deb01ff19cccd7050", default-features = false }
27+
bitcrypto = { git = "https://github.com/chainx-org/bitcoin-rust", rev = "8b2dab29c12d19bcd75f268deb01ff19cccd7050", default-features = false }
2828
merkle = { git = "https://github.com/chainx-org/merkle.git", default-features = false }
2929
bit-vec = { git = "https://github.com/chainx-org/bit-vec.git", default-features = false }
30-
#chain = { path = "../../../../bitcoin-rust/chain", default-features = false }
31-
#primitives = { path = "../../../../bitcoin-rust/primitives", default-features = false }
32-
#serialization = { path = "../../../../bitcoin-rust/serialization", default-features = false }
30+
rustc-hex = { version = "2", optional = true }
31+
base58 = { version = "0.1", optional = true }
3332

3433

3534
[features]
@@ -42,6 +41,8 @@ std=[
4241
"substrate-primitives/std",
4342
"sr-std/std",
4443
"sr-io/std",
44+
"rustc-hex",
45+
"base58",
4546
"sr-primitives/std",
4647
"srml-support/std",
4748
"srml-system/std",
@@ -56,4 +57,4 @@ std=[
5657
"bitcrypto/std",
5758
"merkle/std",
5859
"bit-vec/std",
59-
]
60+
]

0 commit comments

Comments
 (0)