Refactor RGB imports.

src/rgb/carbonado.rs

@@ -4,9 +4,10 @@ use postcard::{from_bytes, to_allocvec};
 use rgbstd::persistence::Stock;
 use strict_encoding::{StrictDeserialize, StrictSerialize};
 
-use crate::carbonado::{retrieve, store};
-use crate::rgb::constants::RGB_STRICT_TYPE_VERSION;
-use crate::rgb::structs::RgbAccount;
+use crate::{
+    carbonado::{retrieve, store},
+    rgb::{constants::RGB_STRICT_TYPE_VERSION, structs::RgbAccount},
+};
 
 pub async fn store_stock(sk: &str, name: &str, stock: &Stock) -> Result<()> {
     let data = stock.to_strict_serialized::<U32>()?;

src/rgb/contract.rs

@@ -11,12 +11,10 @@ use rgbstd::{
 use strict_encoding::{FieldName, StrictDeserialize, StrictSerialize};
 use strict_types::StrictVal;
 
-use crate::rgb::resolvers::ResolveSpent;
-use crate::rgb::wallet::allocations_by_contract;
-use crate::structs::GenesisFormats;
+use crate::rgb::{resolvers::ResolveSpent, wallet::allocations_by_contract};
 use crate::structs::{
-    AllocationValue, ContractFormats, ContractMeta, ContractMetadata, ContractResponse, MediaInfo,
-    UDADetail,
+    AllocationValue, ContractFormats, ContractMeta, ContractMetadata, ContractResponse,
+    GenesisFormats, MediaInfo, UDADetail,
 };
 
 // TODO: Create one extractor by contract interface

src/rgb/issue.rs

@@ -1,26 +1,28 @@
-use amplify::confinement::SmallBlob;
-use amplify::Wrapper;
-use bp::seals::txout::ExplicitSeal;
-use bp::{Chain, Txid};
-use rgb_schemata::{nia_rgb20, nia_schema, uda_rgb21, uda_schema};
-use rgbstd::contract::GenesisSeal;
-use rgbstd::interface::rgb21::{Allocation, EmbeddedMedia, OwnedFraction, TokenData, TokenIndex};
-use rgbstd::resolvers::ResolveHeight;
-use rgbstd::stl::{
-    Amount, ContractData, DivisibleAssetSpec, MediaType, Name, Precision, RicardianContract,
-    Ticker, Timestamp,
-};
-use rgbstd::validation::ResolveTx;
 use std::str::FromStr;
 use std::time::{SystemTime, UNIX_EPOCH};
 
-use rgbstd::containers::Contract;
-use rgbstd::interface::{rgb20, rgb21, BuilderError, ContractBuilder};
-use rgbstd::persistence::{Inventory, Stash, Stock};
+use amplify::{confinement::SmallBlob, Wrapper};
+use bp::{seals::txout::ExplicitSeal, Chain, Txid};
+use rgb_schemata::{nia_rgb20, nia_schema, uda_rgb21, uda_schema};
+use rgbstd::{
+    containers::Contract,
+    contract::GenesisSeal,
+    interface::{
+        rgb20, rgb21,
+        rgb21::{Allocation, EmbeddedMedia, OwnedFraction, TokenData, TokenIndex},
+        BuilderError, ContractBuilder,
+    },
+    persistence::{Inventory, Stash, Stock},
+    resolvers::ResolveHeight,
+    stl::{
+        Amount, ContractData, DivisibleAssetSpec, MediaType, Name, Precision, RicardianContract,
+        Ticker, Timestamp,
+    },
+    validation::ResolveTx,
+};
+use strict_types::encoding::TypeName;
 
 use crate::structs::{IssueMetaRequest, IssueMetadata};
-// use seals::txout::ExplicitSeal;
-use strict_types::encoding::TypeName;
 
 #[derive(Clone, Eq, PartialEq, Debug, Display, Error, From)]
 #[display(doc_comments)]

src/rgb/prefetch.rs

@@ -1,10 +1,10 @@
 #![allow(unused_imports)]
 #![allow(unused_variables)]
+
 use amplify::{
     confinement::Confined,
     hex::{FromHex, ToHex},
 };
-
 use bdk::blockchain::EsploraBlockchain;
 use bech32::{decode, FromBase32};
 use bitcoin::{OutPoint, Script, Txid};

src/rgb/psbt.rs

@@ -2,41 +2,38 @@ use std::collections::BTreeMap;
 use std::str::FromStr;
 
 use amplify::hex::ToHex;
-use bdk::wallet::coin_selection::{decide_change, Excess};
-use bdk::FeeRate;
-use bitcoin::secp256k1::SECP256K1;
-use bitcoin::util::bip32::Fingerprint;
+use bdk::{
+    wallet::coin_selection::{decide_change, Excess},
+    FeeRate,
+};
+use bitcoin::{secp256k1::SECP256K1, util::bip32::Fingerprint};
 use bitcoin::{EcdsaSighashType, OutPoint, Script, XOnlyPublicKey};
 // TODO: Incompatible versions between RGB and Descriptor Wallet
-use bitcoin_30::secp256k1::SECP256K1 as SECP256K1_30;
-use bitcoin_30::taproot::TaprootBuilder;
-use bitcoin_30::ScriptBuf;
+use bitcoin_30::{secp256k1::SECP256K1 as SECP256K1_30, taproot::TaprootBuilder, ScriptBuf};
 use bitcoin_blockchain::locks::SeqNo;
 use bitcoin_scripts::PubkeyScript;
-use bp::dbc::tapret::TapretCommitment;
-use bp::TapScript;
-use commit_verify::mpc::Commitment;
-use commit_verify::CommitVerify;
-
+use bp::{dbc::tapret::TapretCommitment, TapScript};
+use commit_verify::{mpc::Commitment, CommitVerify};
 use miniscript_crate::Descriptor;
 use psbt::{ProprietaryKey, ProprietaryKeyType};
-use rgb::psbt::{
-    DbcPsbtError, TapretKeyError, PSBT_OUT_TAPRET_COMMITMENT, PSBT_OUT_TAPRET_HOST,
-    PSBT_TAPRET_PREFIX,
+use rgb::{
+    psbt::{
+        DbcPsbtError, TapretKeyError, PSBT_OUT_TAPRET_COMMITMENT, PSBT_OUT_TAPRET_HOST,
+        PSBT_TAPRET_PREFIX,
+    },
+    Resolver, RgbDescr, RgbWallet, TerminalPath,
 };
-use rgb::{Resolver, RgbDescr, RgbWallet, TerminalPath};
-use wallet::descriptors::derive::DeriveDescriptor;
-use wallet::hd::DerivationSubpath;
-use wallet::psbt::Psbt;
 use wallet::{
-    descriptors::InputDescriptor,
-    hd::{DerivationAccount, UnhardenedIndex},
+    descriptors::{derive::DeriveDescriptor, InputDescriptor},
+    hd::{DerivationAccount, DerivationSubpath, UnhardenedIndex},
     onchain::ResolveTx,
-    psbt::{ProprietaryKeyDescriptor, ProprietaryKeyError, ProprietaryKeyLocation},
+    psbt::{ProprietaryKeyDescriptor, ProprietaryKeyError, ProprietaryKeyLocation, Psbt},
 };
 
-use crate::rgb::{constants::RGB_PSBT_TAPRET, structs::AddressAmount};
-use crate::structs::SecretString;
+use crate::{
+    rgb::{constants::RGB_PSBT_TAPRET, structs::AddressAmount},
+    structs::SecretString,
+};
 
 #[allow(clippy::too_many_arguments)]
 pub fn create_psbt(

src/rgb/resolvers.rs

@@ -1,15 +1,17 @@
 #![allow(unused_imports)]
 #![allow(unused_variables)]
-use amplify::hex::ToHex;
-use bitcoin::Script;
-use bp::{LockTime, Outpoint, SeqNo, Tx, TxIn, TxOut, TxVer, Txid, VarIntArray, Witness};
-use rgb::{prelude::DeriveInfo, MiningStatus, TerminalPath, Utxo};
-use rgbstd::{resolvers::ResolveHeight, validation::ResolveTx as ResolveCommiment};
+
 use std::{
     collections::{BTreeMap, BTreeSet, HashMap},
     convert::Infallible,
     str::FromStr,
 };
+
+use amplify::hex::ToHex;
+use bitcoin::Script;
+use bp::{LockTime, Outpoint, SeqNo, Tx, TxIn, TxOut, TxVer, Txid, VarIntArray, Witness};
+use rgb::{prelude::DeriveInfo, MiningStatus, TerminalPath, Utxo};
+use rgbstd::{resolvers::ResolveHeight, validation::ResolveTx as ResolveCommiment};
 use wallet::onchain::{ResolveTx, TxResolverError};
 
 #[derive(Default)]

src/rgb/wallet.rs

@@ -1,3 +1,8 @@
+use std::{
+    collections::{BTreeMap, HashMap},
+    str::FromStr,
+};
+
 use amplify::hex::ToHex;
 use bitcoin::{OutPoint, Script, Txid};
 use bitcoin_30::{bip32::ExtendedPubKey, ScriptBuf};
@@ -13,14 +18,12 @@ use rgbstd::{
     persistence::{Inventory, Stash, Stock},
     validation::ResolveTx,
 };
-use std::{
-    collections::{BTreeMap, HashMap},
-    str::FromStr,
-};
 use strict_encoding::tn;
 
-use crate::rgb::{resolvers::ResolveSpent, structs::AddressTerminal};
-use crate::structs::{AllocationDetail, AllocationValue, UDAPosition, WatcherDetail};
+use crate::{
+    rgb::{resolvers::ResolveSpent, structs::AddressTerminal},
+    structs::{AllocationDetail, AllocationValue, UDAPosition, WatcherDetail},
+};
 
 pub fn create_wallet(
     iface: &str,