Skip to content

Commit

Permalink
Feature/btc (paritytech#68)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
gguoss committed Nov 5, 2018
1 parent 824bcd8 commit 159edfc
Show file tree
Hide file tree
Showing 15 changed files with 3,053 additions and 305 deletions.
48 changes: 25 additions & 23 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ slog = "^2"
log = "0.3"

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

[workspace]
members = [
Expand Down
17 changes: 9 additions & 8 deletions cxrml/bridge/btc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,14 @@ srml-consensus = { git = "https://github.com/paritytech/substrate", default-feat
srml-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false }

# bitcoin-rust
chain = { git = "https://github.com/chainx-org/bitcoin-rust", default-features = false }
primitives = { git = "https://github.com/chainx-org/bitcoin-rust", default-features = false }
serialization = { git = "https://github.com/chainx-org/bitcoin-rust", default-features = false }
bitcrypto = { git = "https://github.com/chainx-org/bitcoin-rust", default-features = false }
chain = { git = "https://github.com/chainx-org/bitcoin-rust", rev = "8b2dab29c12d19bcd75f268deb01ff19cccd7050", default-features = false }
primitives = { git = "https://github.com/chainx-org/bitcoin-rust", rev = "8b2dab29c12d19bcd75f268deb01ff19cccd7050", default-features = false }
serialization = { git = "https://github.com/chainx-org/bitcoin-rust", rev = "8b2dab29c12d19bcd75f268deb01ff19cccd7050", default-features = false }
bitcrypto = { git = "https://github.com/chainx-org/bitcoin-rust", rev = "8b2dab29c12d19bcd75f268deb01ff19cccd7050", default-features = false }
merkle = { git = "https://github.com/chainx-org/merkle.git", default-features = false }
bit-vec = { git = "https://github.com/chainx-org/bit-vec.git", default-features = false }
#chain = { path = "../../../../bitcoin-rust/chain", default-features = false }
#primitives = { path = "../../../../bitcoin-rust/primitives", default-features = false }
#serialization = { path = "../../../../bitcoin-rust/serialization", default-features = false }
rustc-hex = { version = "2", optional = true }
base58 = { version = "0.1", optional = true }


[features]
Expand All @@ -42,6 +41,8 @@ std=[
"substrate-primitives/std",
"sr-std/std",
"sr-io/std",
"rustc-hex",
"base58",
"sr-primitives/std",
"srml-support/std",
"srml-system/std",
Expand All @@ -56,4 +57,4 @@ std=[
"bitcrypto/std",
"merkle/std",
"bit-vec/std",
]
]
Loading

0 comments on commit 159edfc

Please sign in to comment.