From 7afbb7253a3f1221357145d52c421ca70d643a6d Mon Sep 17 00:00:00 2001 From: Tamas Blummer Date: Mon, 5 Mar 2018 17:37:40 +0100 Subject: [PATCH 1/2] integration with bitcoin-spv --- Cargo.toml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Cargo.toml b/Cargo.toml index bff66532004..5db99951eb0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,9 +12,15 @@ Still super-early code-dump quality and is missing large chunks. See README in g [features] # Supports tracking channels with a non-bitcoin chain hashes. Currently enables all kinds of fun DoS attacks. non_bitcoin_chain_hash_routing = [] +spv = ["bitcoin-spv"] [dependencies] bitcoin = "0.11" rust-crypto = "0.2" rand = "0.4" secp256k1 = "0.8" +bitcoin-spv = { git = "https://github.com/tamasblummer/bitcoin-spv", branch = "master", optional = true } + +[patch.crates-io] +bitcoin = { git = "https://github.com/tamasblummer/rust-bitcoin", branch = "prs" } + From d03e8779ec713eb7f92ab019ab8302c749dd1f37 Mon Sep 17 00:00:00 2001 From: Tamas Blummer Date: Mon, 5 Mar 2018 17:46:05 +0100 Subject: [PATCH 2/2] better use a dedicated integration branch, so I do not break it while updating master --- .gitignore | 3 +++ Cargo.toml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index c21e6c76781..f08c7144734 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,6 @@ Cargo.lock /target/ **/*.rs.bk +#IntelliJ IDEA files +.idea +*.iml diff --git a/Cargo.toml b/Cargo.toml index 5db99951eb0..96acc74219f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,7 +19,7 @@ bitcoin = "0.11" rust-crypto = "0.2" rand = "0.4" secp256k1 = "0.8" -bitcoin-spv = { git = "https://github.com/tamasblummer/bitcoin-spv", branch = "master", optional = true } +bitcoin-spv = { git = "https://github.com/tamasblummer/bitcoin-spv", branch = "integration", optional = true } [patch.crates-io] bitcoin = { git = "https://github.com/tamasblummer/rust-bitcoin", branch = "prs" }