mirrors/rust-lightning
1
0
Fork 0
mirror of https://github.com/lightningdevkit/rust-lightning.git synced 2025-02-24 06:57:53 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update rust-bitcoin

Browse source
This commit is contained in:
Matt Corallo 2021-01-14 20:57:56 -05:00
parent e77b16049b
commit a51d5cef58
12 changed files with 23 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
background-processor/Cargo.toml
View file

@ -7,7 +7,7 @@ edition = "2018"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
bitcoin = "0.24"
bitcoin = "0.26"
lightning = { version = "0.0.12", path = "../lightning", features = ["allow_wallclock_use"] }
lightning-persister = { version = "0.0.1", path = "../lightning-persister" }

2
fuzz/Cargo.toml
View file

@ -19,7 +19,7 @@ stdin_fuzz = []
[dependencies]
afl = { version = "0.4", optional = true }
lightning = { path = "../lightning", features = ["fuzztarget"] }
bitcoin = { version = "0.24", features = ["fuzztarget"] }
bitcoin = { version = "0.26", features = ["fuzztarget"] }
hex = "0.3"
honggfuzz = { version = "0.5", optional = true }
libfuzzer-sys = { git = "https://github.com/rust-fuzz/libfuzzer-sys.git", optional = true }

2
lightning-block-sync/Cargo.toml
View file

@ -13,7 +13,7 @@ rest-client = [ "serde", "serde_json", "chunked_transfer" ]
rpc-client = [ "serde", "serde_json", "chunked_transfer" ]
[dependencies]
bitcoin = "0.24"
bitcoin = "0.26"
lightning = { version = "0.0.12", path = "../lightning" }
tokio = { version = "1.0", features = [ "io-util", "net" ], optional = true }
serde = { version = "1.0", features = ["derive"], optional = true }

2
lightning-c-bindings/Cargo.toml
View file

@ -15,7 +15,7 @@ crate-type = ["staticlib"
,"cdylib"]
[dependencies]
bitcoin = "0.24"
bitcoin = "0.26"
lightning = { version = "0.0.12", path = "../lightning" }
# We eventually want to join the root workspace, but for now, the bindings generation is

3
lightning-c-bindings/src/c_types/mod.rs
View file

@ -72,8 +72,8 @@ pub enum Secp256k1Error {
InvalidSecretKey,
InvalidRecoveryId,
InvalidTweak,
TweakCheckFailed,
NotEnoughMemory,
CallbackPanicked,
}
impl Secp256k1Error {
pub(crate) fn from_rust(err: SecpError) -> Self {
@ -85,6 +85,7 @@ impl Secp256k1Error {
SecpError::InvalidSecretKey => Secp256k1Error::InvalidSecretKey,
SecpError::InvalidRecoveryId => Secp256k1Error::InvalidRecoveryId,
SecpError::InvalidTweak => Secp256k1Error::InvalidTweak,
SecpError::TweakCheckFailed => Secp256k1Error::TweakCheckFailed,
SecpError::NotEnoughMemory => Secp256k1Error::NotEnoughMemory,
}
}

2
lightning-net-tokio/Cargo.toml
View file

@ -10,7 +10,7 @@ For Rust-Lightning clients which wish to make direct connections to Lightning P2
"""
[dependencies]
bitcoin = "0.24"
bitcoin = "0.26"
lightning = { version = "0.0.12", path = "../lightning" }
tokio = { version = "1.0", features = [ "io-util", "macros", "rt", "sync", "net", "time" ] }

4
lightning-persister/Cargo.toml
View file

@ -8,7 +8,7 @@ Utilities to manage channel data persistence and retrieval.
"""
[dependencies]
bitcoin = "0.24"
bitcoin = "0.26"
lightning = { version = "0.0.12", path = "../lightning" }
libc = "0.2"
@ -16,7 +16,7 @@ libc = "0.2"
winapi = { version = "0.3", features = ["winbase"] }
[dev-dependencies.bitcoin]
version = "0.24"
version = "0.26"
features = ["bitcoinconsensus"]
[dev-dependencies]

4
lightning/Cargo.toml
View file

@ -27,13 +27,13 @@ unsafe_revoked_tx_signing = []
unstable = []
[dependencies]
bitcoin = "0.24"
bitcoin = "0.26"
hex = { version = "0.3", optional = true }
regex = { version = "0.1.80", optional = true }
[dev-dependencies.bitcoin]
version = "0.24"
version = "0.26"
features = ["bitcoinconsensus"]
[dev-dependencies]

2
lightning/src/lib.rs
View file

@ -19,7 +19,7 @@
//! instead of having a rather-separate lightning appendage to a wallet.
#![cfg_attr(not(any(feature = "fuzztarget", feature = "_test_utils")), deny(missing_docs))]
#![forbid(unsafe_code)]
#![cfg_attr(not(any(test, feature = "fuzztarget", feature = "_test_utils")), forbid(unsafe_code))]
// In general, rust is absolutely horrid at supporting users doing things like,
// for example, compiling Rust code for real environments. Disable useless lints

2
lightning/src/ln/onion_route_tests.rs
View file

@ -219,7 +219,7 @@ impl msgs::ChannelUpdate {
use bitcoin::secp256k1::ffi::Signature as FFISignature;
use bitcoin::secp256k1::Signature;
msgs::ChannelUpdate {
signature: Signature::from(FFISignature::new()),
signature: Signature::from(unsafe { FFISignature::new() }),
contents: msgs::UnsignedChannelUpdate {
chain_hash: BlockHash::hash(&vec![0u8][..]),
short_channel_id: 0,

3
lightning/src/util/ser.rs
View file

@ -707,8 +707,7 @@ macro_rules! impl_consensus_ser {
fn write<W: Writer>(&self, writer: &mut W) -> Result<(), ::std::io::Error> {
match self.consensus_encode(WriterWriteAdaptor(writer)) {
Ok(_) => Ok(()),
Err(consensus::encode::Error::Io(e)) => Err(e),
Err(_) => panic!("We shouldn't get a consensus::encode::Error unless our Write generated an std::io::Error"),
Err(e) => Err(e),
}
}
}

16
lightning/src/util/test_utils.rs
View file

@ -253,12 +253,14 @@ fn get_dummy_channel_announcement(short_chan_id: u64) -> msgs::ChannelAnnounceme
excess_data: Vec::new(),
};
msgs::ChannelAnnouncement {
node_signature_1: Signature::from(FFISignature::new()),
node_signature_2: Signature::from(FFISignature::new()),
bitcoin_signature_1: Signature::from(FFISignature::new()),
bitcoin_signature_2: Signature::from(FFISignature::new()),
contents: unsigned_ann,
unsafe {
msgs::ChannelAnnouncement {
node_signature_1: Signature::from(FFISignature::new()),
node_signature_2: Signature::from(FFISignature::new()),
bitcoin_signature_1: Signature::from(FFISignature::new()),
bitcoin_signature_2: Signature::from(FFISignature::new()),
contents: unsigned_ann,
}
}
}
@ -266,7 +268,7 @@ fn get_dummy_channel_update(short_chan_id: u64) -> msgs::ChannelUpdate {
use bitcoin::secp256k1::ffi::Signature as FFISignature;
let network = Network::Testnet;
msgs::ChannelUpdate {
signature: Signature::from(FFISignature::new()),
signature: Signature::from(unsafe { FFISignature::new() }),
contents: msgs::UnsignedChannelUpdate {
chain_hash: genesis_block(network).header.block_hash(),
short_channel_id: short_chan_id,