Merge branch 'master' into fix_wallet_checksum

diff --cc src/blockchain/rpc.rs
Simple merge

diff --cc src/descriptor/mod.rs
index 3b6e7d35d01ebba9a52ed0758a00c1f6eee172b2,c8f4d29dc84d5d5068f86259ca956abb6a82d0f0..1329063ac1b33ab1d1b5914ff62768a45276fa4c
--- 1/src/descriptor/mod.rs
--- 2/src/descriptor/mod.rs
+++ b/src/descriptor/mod.rs
@@@ -39,9 -37,7 +37,8 @@@ pub mod error
  pub mod policy;
  pub mod template;
  
 -pub use self::checksum::get_checksum;
 +pub use self::checksum::calc_checksum;
 +use self::checksum::calc_checksum_bytes;
- pub use self::derived::{AsDerived, DerivedDescriptorKey};
  pub use self::error::Error as DescriptorError;
  pub use self::policy::Policy;
  use self::template::DescriptorTemplateOut;

diff --cc src/descriptor/policy.rs
index 8f64a5d2035e72b845cbbf786a007a3ae5c526e6,413fe6e3e4f70449cc705e3fbfd9280121a82983..964ec29114bfde7eb7fa2c5b7603cb7fbb7ae638
--- 1/src/descriptor/policy.rs
--- 2/src/descriptor/policy.rs
+++ b/src/descriptor/policy.rs
@@@ -58,9 -61,9 +61,9 @@@ use log::{debug, error, info, trace}
  use crate::descriptor::ExtractPolicy;
  use crate::keys::ExtScriptContext;
  use crate::wallet::signer::{SignerId, SignersContainer};
- use crate::wallet::utils::{self, After, Older, SecpCtx};
+ use crate::wallet::utils::{After, Older, SecpCtx};
  
 -use super::checksum::get_checksum;
 +use super::checksum::calc_checksum;
  use super::error::Error;
  use super::XKeyUtils;
  use bitcoin::util::psbt::{Input as PsbtInput, PartiallySignedTransaction as Psbt};

diff --cc src/wallet/mod.rs
index 07690e3fadf86449bbab661fafe2029e013ff12e,54d76f135e9625deb584b96d7ace77ff5447682f..c400c5a4daff781951a3958553f9cc4c6bcb3efa
--- 1/src/wallet/mod.rs
--- 2/src/wallet/mod.rs
+++ b/src/wallet/mod.rs
@@@ -64,15 -59,12 +59,13 @@@ use utils::{check_nsequence_rbf, After
  use crate::blockchain::{GetHeight, NoopProgress, Progress, WalletSync};
  use crate::database::memory::MemoryDatabase;
  use crate::database::{AnyDatabase, BatchDatabase, BatchOperations, DatabaseUtils, SyncTime};
- use crate::descriptor::derived::AsDerived;
 +use crate::descriptor::checksum::calc_checksum_bytes_internal;
  use crate::descriptor::policy::BuildSatisfaction;
  use crate::descriptor::{
-     calc_checksum, into_wallet_descriptor_checked, DerivedDescriptor, DerivedDescriptorMeta,
-     DescriptorMeta, DescriptorScripts, ExtendedDescriptor, ExtractPolicy, IntoWalletDescriptor,
-     Policy, XKeyUtils,
 -    get_checksum, into_wallet_descriptor_checked, DerivedDescriptor, DescriptorMeta,
++    calc_checksum, into_wallet_descriptor_checked, DerivedDescriptor, DescriptorMeta,
+     ExtendedDescriptor, ExtractPolicy, IntoWalletDescriptor, Policy, XKeyUtils,
  };
- use crate::error::Error;
+ use crate::error::{Error, MiniscriptPsbtError};
  use crate::psbt::PsbtUtils;
  use crate::signer::SignerError;
  use crate::testutils;