[ci] Update the stable version to 1.56
This commit is contained in:
parent
59f795f176
commit
a348dbdcfe
4
.github/workflows/cont_integration.yml
vendored
4
.github/workflows/cont_integration.yml
vendored
@ -10,7 +10,7 @@ jobs:
|
|||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
rust:
|
rust:
|
||||||
- 1.53.0 # STABLE
|
- 1.56.0 # STABLE
|
||||||
- 1.46.0 # MSRV
|
- 1.46.0 # MSRV
|
||||||
features:
|
features:
|
||||||
- default
|
- default
|
||||||
@ -135,7 +135,7 @@ jobs:
|
|||||||
- run: sudo apt-get update || exit 1
|
- run: sudo apt-get update || exit 1
|
||||||
- run: sudo apt-get install -y libclang-common-10-dev clang-10 libc6-dev-i386 || exit 1
|
- run: sudo apt-get install -y libclang-common-10-dev clang-10 libc6-dev-i386 || exit 1
|
||||||
- name: Set default toolchain
|
- name: Set default toolchain
|
||||||
run: rustup default 1.53.0 # STABLE
|
run: rustup default 1.56.0 # STABLE
|
||||||
- name: Set profile
|
- name: Set profile
|
||||||
run: rustup set profile minimal
|
run: rustup set profile minimal
|
||||||
- name: Add target wasm32
|
- name: Add target wasm32
|
||||||
|
@ -70,7 +70,7 @@ fn main() -> Result<(), Box<dyn Error>> {
|
|||||||
let policy_str = matches.value_of("POLICY").unwrap();
|
let policy_str = matches.value_of("POLICY").unwrap();
|
||||||
info!("Compiling policy: {}", policy_str);
|
info!("Compiling policy: {}", policy_str);
|
||||||
|
|
||||||
let policy = Concrete::<String>::from_str(&policy_str)?;
|
let policy = Concrete::<String>::from_str(policy_str)?;
|
||||||
|
|
||||||
let descriptor = match matches.value_of("TYPE").unwrap() {
|
let descriptor = match matches.value_of("TYPE").unwrap() {
|
||||||
"sh" => Descriptor::new_sh(policy.compile()?)?,
|
"sh" => Descriptor::new_sh(policy.compile()?)?,
|
||||||
|
@ -254,7 +254,7 @@ impl Blockchain for CompactFiltersBlockchain {
|
|||||||
let total_cost = headers_cost + filters_cost + PROCESS_BLOCKS_COST;
|
let total_cost = headers_cost + filters_cost + PROCESS_BLOCKS_COST;
|
||||||
|
|
||||||
if let Some(snapshot) = sync::sync_headers(
|
if let Some(snapshot) = sync::sync_headers(
|
||||||
Arc::clone(&first_peer),
|
Arc::clone(first_peer),
|
||||||
Arc::clone(&self.headers),
|
Arc::clone(&self.headers),
|
||||||
|new_height| {
|
|new_height| {
|
||||||
let local_headers_cost =
|
let local_headers_cost =
|
||||||
@ -275,7 +275,7 @@ impl Blockchain for CompactFiltersBlockchain {
|
|||||||
let buried_height = synced_height.saturating_sub(sync::BURIED_CONFIRMATIONS);
|
let buried_height = synced_height.saturating_sub(sync::BURIED_CONFIRMATIONS);
|
||||||
info!("Synced headers to height: {}", synced_height);
|
info!("Synced headers to height: {}", synced_height);
|
||||||
|
|
||||||
cf_sync.prepare_sync(Arc::clone(&first_peer))?;
|
cf_sync.prepare_sync(Arc::clone(first_peer))?;
|
||||||
|
|
||||||
let all_scripts = Arc::new(
|
let all_scripts = Arc::new(
|
||||||
database
|
database
|
||||||
@ -294,7 +294,7 @@ impl Blockchain for CompactFiltersBlockchain {
|
|||||||
let mut threads = Vec::with_capacity(self.peers.len());
|
let mut threads = Vec::with_capacity(self.peers.len());
|
||||||
for peer in &self.peers {
|
for peer in &self.peers {
|
||||||
let cf_sync = Arc::clone(&cf_sync);
|
let cf_sync = Arc::clone(&cf_sync);
|
||||||
let peer = Arc::clone(&peer);
|
let peer = Arc::clone(peer);
|
||||||
let headers = Arc::clone(&self.headers);
|
let headers = Arc::clone(&self.headers);
|
||||||
let all_scripts = Arc::clone(&all_scripts);
|
let all_scripts = Arc::clone(&all_scripts);
|
||||||
let last_synced_block = Arc::clone(&last_synced_block);
|
let last_synced_block = Arc::clone(&last_synced_block);
|
||||||
|
@ -262,7 +262,7 @@ impl Peer {
|
|||||||
let message_resp = {
|
let message_resp = {
|
||||||
let mut lock = responses.write().unwrap();
|
let mut lock = responses.write().unwrap();
|
||||||
let message_resp = lock.entry(wait_for).or_default();
|
let message_resp = lock.entry(wait_for).or_default();
|
||||||
Arc::clone(&message_resp)
|
Arc::clone(message_resp)
|
||||||
};
|
};
|
||||||
|
|
||||||
let (lock, cvar) = &*message_resp;
|
let (lock, cvar) = &*message_resp;
|
||||||
@ -379,7 +379,7 @@ impl Peer {
|
|||||||
let message_resp = {
|
let message_resp = {
|
||||||
let mut lock = reader_thread_responses.write().unwrap();
|
let mut lock = reader_thread_responses.write().unwrap();
|
||||||
let message_resp = lock.entry(in_message.cmd()).or_default();
|
let message_resp = lock.entry(in_message.cmd()).or_default();
|
||||||
Arc::clone(&message_resp)
|
Arc::clone(message_resp)
|
||||||
};
|
};
|
||||||
|
|
||||||
let (lock, cvar) = &*message_resp;
|
let (lock, cvar) = &*message_resp;
|
||||||
|
@ -760,7 +760,7 @@ impl CfStore {
|
|||||||
let cf_headers: Vec<FilterHeader> = filter_hashes
|
let cf_headers: Vec<FilterHeader> = filter_hashes
|
||||||
.into_iter()
|
.into_iter()
|
||||||
.scan(checkpoint, |prev_header, filter_hash| {
|
.scan(checkpoint, |prev_header, filter_hash| {
|
||||||
let filter_header = filter_hash.filter_header(&prev_header);
|
let filter_header = filter_hash.filter_header(prev_header);
|
||||||
*prev_header = filter_header;
|
*prev_header = filter_header;
|
||||||
|
|
||||||
Some(filter_header)
|
Some(filter_header)
|
||||||
@ -801,7 +801,7 @@ impl CfStore {
|
|||||||
.zip(headers.into_iter())
|
.zip(headers.into_iter())
|
||||||
.scan(checkpoint, |prev_header, ((_, filter_content), header)| {
|
.scan(checkpoint, |prev_header, ((_, filter_content), header)| {
|
||||||
let filter = BlockFilter::new(&filter_content);
|
let filter = BlockFilter::new(&filter_content);
|
||||||
if header != filter.filter_header(&prev_header) {
|
if header != filter.filter_header(prev_header) {
|
||||||
return Some(Err(CompactFiltersError::InvalidFilter));
|
return Some(Err(CompactFiltersError::InvalidFilter));
|
||||||
}
|
}
|
||||||
*prev_header = header;
|
*prev_header = header;
|
||||||
|
@ -205,7 +205,7 @@ impl CfSync {
|
|||||||
let block_hash = self.headers_store.get_block_hash(height)?.unwrap();
|
let block_hash = self.headers_store.get_block_hash(height)?.unwrap();
|
||||||
|
|
||||||
// TODO: also download random blocks?
|
// TODO: also download random blocks?
|
||||||
if process(&block_hash, &BlockFilter::new(&filter))? {
|
if process(&block_hash, &BlockFilter::new(filter))? {
|
||||||
log::debug!("Downloading block {}", block_hash);
|
log::debug!("Downloading block {}", block_hash);
|
||||||
|
|
||||||
let block = peer
|
let block = peer
|
||||||
|
@ -156,7 +156,7 @@ impl Blockchain for RpcBlockchain {
|
|||||||
.iter()
|
.iter()
|
||||||
.map(|s| ImportMultiRequest {
|
.map(|s| ImportMultiRequest {
|
||||||
timestamp: ImportMultiRescanSince::Timestamp(0),
|
timestamp: ImportMultiRescanSince::Timestamp(0),
|
||||||
script_pubkey: Some(ImportMultiRequestScriptPubkey::Script(&s)),
|
script_pubkey: Some(ImportMultiRequestScriptPubkey::Script(s)),
|
||||||
watchonly: Some(true),
|
watchonly: Some(true),
|
||||||
..Default::default()
|
..Default::default()
|
||||||
})
|
})
|
||||||
@ -238,7 +238,7 @@ impl Blockchain for RpcBlockchain {
|
|||||||
txid, confirmation_time
|
txid, confirmation_time
|
||||||
);
|
);
|
||||||
known_tx.confirmation_time = confirmation_time;
|
known_tx.confirmation_time = confirmation_time;
|
||||||
db.set_tx(&known_tx)?;
|
db.set_tx(known_tx)?;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
//TODO check there is already the raw tx in db?
|
//TODO check there is already the raw tx in db?
|
||||||
@ -427,13 +427,13 @@ where
|
|||||||
{
|
{
|
||||||
//TODO check descriptors contains only public keys
|
//TODO check descriptors contains only public keys
|
||||||
let descriptor = descriptor
|
let descriptor = descriptor
|
||||||
.into_wallet_descriptor(&secp, network)?
|
.into_wallet_descriptor(secp, network)?
|
||||||
.0
|
.0
|
||||||
.to_string();
|
.to_string();
|
||||||
let mut wallet_name = get_checksum(&descriptor[..descriptor.find('#').unwrap()])?;
|
let mut wallet_name = get_checksum(&descriptor[..descriptor.find('#').unwrap()])?;
|
||||||
if let Some(change_descriptor) = change_descriptor {
|
if let Some(change_descriptor) = change_descriptor {
|
||||||
let change_descriptor = change_descriptor
|
let change_descriptor = change_descriptor
|
||||||
.into_wallet_descriptor(&secp, network)?
|
.into_wallet_descriptor(secp, network)?
|
||||||
.0
|
.0
|
||||||
.to_string();
|
.to_string();
|
||||||
wallet_name.push_str(
|
wallet_name.push_str(
|
||||||
|
@ -40,7 +40,7 @@ pub type MnemonicWithPassphrase = (Mnemonic, Option<String>);
|
|||||||
#[cfg_attr(docsrs, doc(cfg(feature = "keys-bip39")))]
|
#[cfg_attr(docsrs, doc(cfg(feature = "keys-bip39")))]
|
||||||
impl<Ctx: ScriptContext> DerivableKey<Ctx> for Seed {
|
impl<Ctx: ScriptContext> DerivableKey<Ctx> for Seed {
|
||||||
fn into_extended_key(self) -> Result<ExtendedKey<Ctx>, KeyError> {
|
fn into_extended_key(self) -> Result<ExtendedKey<Ctx>, KeyError> {
|
||||||
Ok(bip32::ExtendedPrivKey::new_master(Network::Bitcoin, &self.as_bytes())?.into())
|
Ok(bip32::ExtendedPrivKey::new_master(Network::Bitcoin, self.as_bytes())?.into())
|
||||||
}
|
}
|
||||||
|
|
||||||
fn into_descriptor_key(
|
fn into_descriptor_key(
|
||||||
|
Loading…
x
Reference in New Issue
Block a user