From 7a82c6922f2506aeb36a0fb1eb22f5feeb58cb56 Mon Sep 17 00:00:00 2001
From: Mohsen <56779182+mrtnetwork@users.noreply.github.com>
Date: Tue, 1 Oct 2024 11:44:57 +0330
Subject: [PATCH 01/62] v4.8.0

Update dependencies
---
 CHANGELOG.md                                  |  4 +++
 example/pubspec.lock                          | 30 +++++++++----------
 example/pubspec.yaml                          |  2 +-
 lib/src/bitcoin/address/core.dart             |  2 +-
 lib/src/bitcoin/address/legacy_address.dart   |  6 ++--
 lib/src/bitcoin/address/network_address.dart  |  2 +-
 lib/src/bitcoin/address/segwit_address.dart   |  4 +--
 .../bitcoin/address/utils/address_utils.dart  | 10 +++----
 lib/src/bitcoin/script/input.dart             |  2 +-
 lib/src/bitcoin/script/op_code/tools.dart     |  4 +--
 lib/src/bitcoin/script/sequence.dart          |  6 ++--
 lib/src/bitcoin/script/transaction.dart       |  2 +-
 lib/src/cash_token/cash_token.dart            | 18 +++++------
 lib/src/crypto/keypair/ec_public.dart         |  2 +-
 lib/src/exception/exception.dart              | 10 +++----
 lib/src/models/network.dart                   |  8 ++---
 .../api_provider/electrum_api_provider.dart   | 17 +++++------
 lib/src/provider/models/config.dart           |  4 +--
 .../provider/models/fee_rate/fee_rate.dart    |  2 +-
 lib/src/provider/models/multisig_script.dart  | 12 ++++----
 lib/src/provider/models/utxo_details.dart     |  6 ++--
 .../forked_transaction_builder.dart           | 20 ++++++-------
 .../transaction_builder.dart                  | 26 ++++++++--------
 pubspec.yaml                                  |  6 ++--
 24 files changed, 103 insertions(+), 102 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6c89343..dc41c5e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 4.8.0
+
+* Update dependencies
+
 ## 4.7.0
 
 * Update dependencies
diff --git a/example/pubspec.lock b/example/pubspec.lock
index d7800dd..9cabb7b 100644
--- a/example/pubspec.lock
+++ b/example/pubspec.lock
@@ -15,15 +15,15 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "4.7.0"
+    version: "4.8.0"
   blockchain_utils:
     dependency: "direct main"
     description:
       name: blockchain_utils
-      sha256: aebc3a32b927b34f638817c4bfdb85f86a97e6ad35f0cd962660b0c6e8d5c56b
+      sha256: ebb6c336ba0120de0982c50d8bc597cb494a530bd22bd462895bb5cebde405af
       url: "https://pub.dev"
     source: hosted
-    version: "3.3.0"
+    version: "3.4.0"
   boolean_selector:
     dependency: transitive
     description:
@@ -110,18 +110,18 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
+      sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.4"
+    version: "10.0.5"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
+      sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.3"
+    version: "3.0.5"
   leak_tracker_testing:
     dependency: transitive
     description:
@@ -150,18 +150,18 @@ packages:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
+      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.0"
+    version: "0.11.1"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
+      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
       url: "https://pub.dev"
     source: hosted
-    version: "1.12.0"
+    version: "1.15.0"
   path:
     dependency: transitive
     description:
@@ -219,10 +219,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
+      sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.0"
+    version: "0.7.2"
   typed_data:
     dependency: transitive
     description:
@@ -243,10 +243,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
+      sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
       url: "https://pub.dev"
     source: hosted
-    version: "14.2.1"
+    version: "14.2.5"
   web:
     dependency: transitive
     description:
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
index ca4fb33..2fad8b2 100644
--- a/example/pubspec.yaml
+++ b/example/pubspec.yaml
@@ -39,7 +39,7 @@ dependencies:
     path: ../
   # blockchain_utils: 
   #   path: ../../blockchain_utils
-  blockchain_utils: ^3.3.0
+  blockchain_utils: ^3.4.0
   http: ^1.2.0
 
 dev_dependencies:
diff --git a/lib/src/bitcoin/address/core.dart b/lib/src/bitcoin/address/core.dart
index 1211396..51a04e8 100644
--- a/lib/src/bitcoin/address/core.dart
+++ b/lib/src/bitcoin/address/core.dart
@@ -9,7 +9,7 @@ abstract class BitcoinAddressType implements Enumerate {
   /// Factory method to create a BitcoinAddressType enum value from a name or value.
   static BitcoinAddressType fromValue(String value) {
     return values.firstWhere((element) => element.value == value,
-        orElse: () => throw BitcoinBasePluginException(
+        orElse: () => throw DartBitcoinPluginException(
             'Invalid BitcoinAddressType: $value'));
   }
 
diff --git a/lib/src/bitcoin/address/legacy_address.dart b/lib/src/bitcoin/address/legacy_address.dart
index c3952cf..30b1445 100644
--- a/lib/src/bitcoin/address/legacy_address.dart
+++ b/lib/src/bitcoin/address/legacy_address.dart
@@ -14,7 +14,7 @@ abstract class LegacyAddress implements BitcoinBaseAddress {
     final decode = _BitcoinAddressUtils.decodeLagacyAddressWithNetworkAndType(
         address: address, type: type, network: network);
     if (decode == null) {
-      throw BitcoinBasePluginException(
+      throw DartBitcoinPluginException(
           "Invalid ${network.conf.coinName} address");
     }
     _addressProgram = decode;
@@ -63,7 +63,7 @@ class P2shAddress extends LegacyAddress {
   @override
   String toAddress(BasedUtxoNetwork network) {
     if (!network.supportedAddress.contains(type)) {
-      throw BitcoinBasePluginException(
+      throw DartBitcoinPluginException(
           "network does not support ${type.value} address");
     }
     return super.toAddress(network);
@@ -111,7 +111,7 @@ class P2pkAddress extends LegacyAddress {
   P2pkAddress({required String publicKey}) : super._() {
     final toBytes = BytesUtils.fromHexString(publicKey);
     if (!Secp256k1PublicKeyEcdsa.isValidBytes(toBytes)) {
-      throw const BitcoinBasePluginException("Invalid secp256k1 public key");
+      throw const DartBitcoinPluginException("Invalid secp256k1 public key");
     }
     publicHex = publicKey;
   }
diff --git a/lib/src/bitcoin/address/network_address.dart b/lib/src/bitcoin/address/network_address.dart
index e1c4307..69950da 100644
--- a/lib/src/bitcoin/address/network_address.dart
+++ b/lib/src/bitcoin/address/network_address.dart
@@ -107,7 +107,7 @@ class BitcoinCashAddress extends BitcoinNetworkAddress<BitcoinCashNetwork> {
         address, network,
         validateNetworkHRP: validateNetworkPrefix);
     if (decodeAddress == null) {
-      throw BitcoinBasePluginException("Invalid ${network.value} address.");
+      throw DartBitcoinPluginException("Invalid ${network.value} address.");
     }
     return BitcoinCashAddress._(decodeAddress, address);
   }
diff --git a/lib/src/bitcoin/address/segwit_address.dart b/lib/src/bitcoin/address/segwit_address.dart
index a68574f..039395d 100644
--- a/lib/src/bitcoin/address/segwit_address.dart
+++ b/lib/src/bitcoin/address/segwit_address.dart
@@ -6,7 +6,7 @@ abstract class SegwitAddress implements BitcoinBaseAddress {
       required BasedUtxoNetwork network,
       required this.segwitVersion}) {
     if (!network.supportedAddress.contains(type)) {
-      throw BitcoinBasePluginException(
+      throw DartBitcoinPluginException(
           "network does not support ${type.value} address");
     }
     addressProgram = _BitcoinAddressUtils.toSegwitProgramWithVersionAndNetwork(
@@ -30,7 +30,7 @@ abstract class SegwitAddress implements BitcoinBaseAddress {
   @override
   String toAddress(BasedUtxoNetwork network) {
     if (!network.supportedAddress.contains(type)) {
-      throw BitcoinBasePluginException(
+      throw DartBitcoinPluginException(
           "network does not support ${type.value} address");
     }
     return _BitcoinAddressUtils.segwitToAddress(
diff --git a/lib/src/bitcoin/address/utils/address_utils.dart b/lib/src/bitcoin/address/utils/address_utils.dart
index f6d2baa..af88a82 100644
--- a/lib/src/bitcoin/address/utils/address_utils.dart
+++ b/lib/src/bitcoin/address/utils/address_utils.dart
@@ -89,7 +89,7 @@ class _BitcoinAddressUtils {
     final convert = SegwitBech32Decoder.decode(network.p2wpkhHrp, address);
     final witnessVersion = convert.item1;
     if (witnessVersion != version) {
-      throw const BitcoinBasePluginException("Invalid segwit version");
+      throw const DartBitcoinPluginException("Invalid segwit version");
     }
     return BytesUtils.toHexString(convert.item2);
   }
@@ -137,7 +137,7 @@ class _BitcoinAddressUtils {
     if (network.supportedAddress.contains(address.type)) {
       return address;
     }
-    throw BitcoinBasePluginException(
+    throw DartBitcoinPluginException(
         "${network.value} does not support ${address.type.value} address");
   }
 
@@ -158,7 +158,7 @@ class _BitcoinAddressUtils {
     }
     baseAddress ??= toLegacy(address, network);
     if (baseAddress == null) {
-      throw const BitcoinBasePluginException("Invalid Bitcoin address");
+      throw const DartBitcoinPluginException("Invalid Bitcoin address");
     }
     return validateAddress(baseAddress, network);
   }
@@ -180,7 +180,7 @@ class _BitcoinAddressUtils {
       }
       // ignore: empty_catches
     } catch (e) {}
-    throw const BitcoinBasePluginException(
+    throw const DartBitcoinPluginException(
         "Invalid Bitcoin address program length (program length should be 32 or 20 bytes)");
   }
 
@@ -276,7 +276,7 @@ class _BitcoinAddressUtils {
       required BitcoinAddressType type,
       required BasedUtxoNetwork network}) {
     if (!network.supportedAddress.contains(type)) {
-      throw BitcoinBasePluginException(
+      throw DartBitcoinPluginException(
           "${network.value} does not support ${type.value} address type");
     }
     if (network is BitcoinCashNetwork) {
diff --git a/lib/src/bitcoin/script/input.dart b/lib/src/bitcoin/script/input.dart
index b55b68a..c9d0aee 100644
--- a/lib/src/bitcoin/script/input.dart
+++ b/lib/src/bitcoin/script/input.dart
@@ -63,7 +63,7 @@ class TxInput {
     List<int> inpHash =
         txInputRaw.sublist(cursor, cursor + 32).reversed.toList();
     if (inpHash.isEmpty) {
-      throw const BitcoinBasePluginException(
+      throw const DartBitcoinPluginException(
           "Input transaction hash not found. Probably malformed raw transaction");
     }
     List<int> outputN =
diff --git a/lib/src/bitcoin/script/op_code/tools.dart b/lib/src/bitcoin/script/op_code/tools.dart
index 9bb44e5..8d17869 100644
--- a/lib/src/bitcoin/script/op_code/tools.dart
+++ b/lib/src/bitcoin/script/op_code/tools.dart
@@ -19,14 +19,14 @@ List<int> opPushData(String hexData) {
     writeUint32LE(lengthBytes.length, lengthBytes);
     return List<int>.from([0x4e, ...lengthBytes, ...dataBytes]);
   } else {
-    throw const BitcoinBasePluginException(
+    throw const DartBitcoinPluginException(
         "Data too large. Cannot push into script");
   }
 }
 
 List<int> pushInteger(int integer) {
   if (integer < 0) {
-    throw const BitcoinBasePluginException(
+    throw const DartBitcoinPluginException(
         'Integer is currently required to be positive.');
   }
 
diff --git a/lib/src/bitcoin/script/sequence.dart b/lib/src/bitcoin/script/sequence.dart
index f202eff..920212f 100644
--- a/lib/src/bitcoin/script/sequence.dart
+++ b/lib/src/bitcoin/script/sequence.dart
@@ -13,7 +13,7 @@ class Sequence {
       {required this.seqType, required this.value, this.isTypeBlock = true}) {
     if (seqType == BitcoinOpCodeConst.TYPE_RELATIVE_TIMELOCK &&
         (value < 1 || value > mask16)) {
-      throw const BitcoinBasePluginException(
+      throw const DartBitcoinPluginException(
           'Sequence should be between 1 and 65535');
     }
   }
@@ -39,13 +39,13 @@ class Sequence {
       return IntUtils.toBytes(seq, length: 4, byteOrder: Endian.little);
     }
 
-    throw const BitcoinBasePluginException("Invalid seqType");
+    throw const DartBitcoinPluginException("Invalid seqType");
   }
 
   /// Returns the appropriate integer for a script; e.g. for relative timelocks
   int forScript() {
     if (seqType == BitcoinOpCodeConst.TYPE_REPLACE_BY_FEE) {
-      throw const BitcoinBasePluginException(
+      throw const DartBitcoinPluginException(
           "RBF is not to be included in a script.");
     }
     int scriptIntiger = value;
diff --git a/lib/src/bitcoin/script/transaction.dart b/lib/src/bitcoin/script/transaction.dart
index da9b409..380067f 100644
--- a/lib/src/bitcoin/script/transaction.dart
+++ b/lib/src/bitcoin/script/transaction.dart
@@ -159,7 +159,7 @@ class BtcTransaction {
       }
     } else if ((sighash & 0x1f) == BitcoinOpCodeConst.SIGHASH_SINGLE) {
       if (txInIndex >= tx.outputs.length) {
-        throw const BitcoinBasePluginException(
+        throw const DartBitcoinPluginException(
             "Transaction index is greater than the available outputs");
       }
 
diff --git a/lib/src/cash_token/cash_token.dart b/lib/src/cash_token/cash_token.dart
index 53f852c..e322257 100644
--- a/lib/src/cash_token/cash_token.dart
+++ b/lib/src/cash_token/cash_token.dart
@@ -63,7 +63,7 @@ class CashTokenCapability {
       final int intCapability = _getCapability(bitfield);
       return values.firstWhere((element) => element.value == intCapability);
     } on StateError {
-      throw const BitcoinBasePluginException(
+      throw const DartBitcoinPluginException(
           "Invalid CashToken NFT Capability");
     }
   }
@@ -73,7 +73,7 @@ class CashTokenCapability {
     try {
       return values.firstWhere((element) => element.name == name);
     } on StateError {
-      throw const BitcoinBasePluginException(
+      throw const DartBitcoinPluginException(
           "Invalid CashToken NFT Capability Name");
     }
   }
@@ -273,30 +273,30 @@ class CashToken {
       List<int>? commitment,
       required int bitfield}) {
     if (!CashTokenUtils.isValidBitfield(bitfield)) {
-      throw const BitcoinBasePluginException("Invalid bitfield");
+      throw const DartBitcoinPluginException("Invalid bitfield");
     }
     if (CashTokenUtils.hasAmount(bitfield) && amount == null) {
-      throw const BitcoinBasePluginException(
+      throw const DartBitcoinPluginException(
           "Invalid cash token: the bitfield indicates an amount, but the amount is null.");
     }
     if (amount != null) {
       if (amount < BigInt.zero || amount > CashTokenUtils.maxTokenAmount) {
-        throw const BitcoinBasePluginException(
+        throw const DartBitcoinPluginException(
             "Invalid amount. Amount must be between zero and 99.");
       }
     }
     if (!StringUtils.isHexBytes(category)) {
-      throw const BitcoinBasePluginException(
+      throw const DartBitcoinPluginException(
           "Invalid category hexadecimal bytes.");
     }
     final toBytes = BytesUtils.fromHexString(category);
     if (toBytes.length != CashTokenUtils.idBytesLength) {
-      throw const BitcoinBasePluginException(
+      throw const DartBitcoinPluginException(
           "Invalid category. The category should consist of 32 bytes.");
     }
     if (CashTokenUtils.hasCommitmentLength(bitfield) &&
         (commitment == null || commitment.isEmpty)) {
-      throw const BitcoinBasePluginException(
+      throw const DartBitcoinPluginException(
           "Invalid cash token: the bitfield indicates an commitment, but the commitment is null or empty.");
     }
     return CashToken.noValidate(
@@ -336,7 +336,7 @@ class CashToken {
         amount < BigInt.zero ||
         amount > CashTokenUtils.maxTokenAmount ||
         CashTokenUtils.hasCommitmentLength(bitfield) && commitment.isEmpty) {
-      throw const BitcoinBasePluginException('Invalid cash token');
+      throw const DartBitcoinPluginException('Invalid cash token');
     }
     return Tuple(
         CashToken(
diff --git a/lib/src/crypto/keypair/ec_public.dart b/lib/src/crypto/keypair/ec_public.dart
index 03f85b2..b33e29f 100644
--- a/lib/src/crypto/keypair/ec_public.dart
+++ b/lib/src/crypto/keypair/ec_public.dart
@@ -9,7 +9,7 @@ class ECPublic {
 
   factory ECPublic.fromBip32(Bip32PublicKey publicKey) {
     if (publicKey.curveType != EllipticCurveTypes.secp256k1) {
-      throw const BitcoinBasePluginException(
+      throw const DartBitcoinPluginException(
           "invalid public key curve for bitcoin");
     }
     return ECPublic._(publicKey);
diff --git a/lib/src/exception/exception.dart b/lib/src/exception/exception.dart
index f06d838..09652ba 100644
--- a/lib/src/exception/exception.dart
+++ b/lib/src/exception/exception.dart
@@ -1,9 +1,7 @@
 import 'package:blockchain_utils/blockchain_utils.dart';
 
-class BitcoinBasePluginException extends BlockchainUtilsException {
-  @override
-  final String message;
-  @override
-  final Map<String, dynamic>? details;
-  const BitcoinBasePluginException(this.message, {this.details});
+class DartBitcoinPluginException extends BlockchainUtilsException {
+  const DartBitcoinPluginException(String message,
+      {Map<String, dynamic>? details})
+      : super(message, details: details);
 }
diff --git a/lib/src/models/network.dart b/lib/src/models/network.dart
index 89e32b3..67c1277 100644
--- a/lib/src/models/network.dart
+++ b/lib/src/models/network.dart
@@ -282,7 +282,7 @@ class DashNetwork implements BasedUtxoNetwork {
 
   /// Retrieves the Human-Readable Part (HRP) for Pay-to-Witness-Public-Key-Hash (P2WPKH) addresses.
   @override
-  String get p2wpkhHrp => throw const BitcoinBasePluginException(
+  String get p2wpkhHrp => throw const DartBitcoinPluginException(
       "DashNetwork network does not support P2WPKH/P2WSH");
 
   /// Checks if the current network is the mainnet.
@@ -341,7 +341,7 @@ class DogecoinNetwork implements BasedUtxoNetwork {
 
   /// Retrieves the Human-Readable Part (HRP) for Pay-to-Witness-Public-Key-Hash (P2WPKH) addresses.
   @override
-  String get p2wpkhHrp => throw const BitcoinBasePluginException(
+  String get p2wpkhHrp => throw const DartBitcoinPluginException(
       "DogecoinNetwork network does not support P2WPKH/P2WSH");
 
   /// Checks if the current network is the mainnet.
@@ -409,7 +409,7 @@ class BitcoinCashNetwork implements BasedUtxoNetwork {
   /// Retrieves the Human-Readable Part (HRP) for Pay-to-Witness-Public-Key-Hash (P2WPKH) addresses
   /// from the associated `CoinConf`.
   @override
-  String get p2wpkhHrp => throw const BitcoinBasePluginException(
+  String get p2wpkhHrp => throw const DartBitcoinPluginException(
       "network does not support p2wpkh HRP");
 
   String get networkHRP => conf.params.p2pkhStdHrp!;
@@ -470,7 +470,7 @@ class PepeNetwork implements BasedUtxoNetwork {
 
   /// Retrieves the Human-Readable Part (HRP) for Pay-to-Witness-Public-Key-Hash (P2WPKH) addresses.
   @override
-  String get p2wpkhHrp => throw const BitcoinBasePluginException(
+  String get p2wpkhHrp => throw const DartBitcoinPluginException(
       "DogecoinNetwork network does not support P2WPKH/P2WSH");
 
   /// Checks if the current network is the mainnet.
diff --git a/lib/src/provider/api_provider/electrum_api_provider.dart b/lib/src/provider/api_provider/electrum_api_provider.dart
index 9cd90ec..835cc2d 100644
--- a/lib/src/provider/api_provider/electrum_api_provider.dart
+++ b/lib/src/provider/api_provider/electrum_api_provider.dart
@@ -21,16 +21,15 @@ class ElectrumApiProvider {
 
   dynamic _findResult(
       Map<String, dynamic> data, ElectrumRequestDetails request) {
-    if (data["error"] != null) {
-      final code =
-          int.tryParse(((data["error"]?['code']?.toString()) ?? "0")) ?? 0;
-      final message = data["error"]?['message'] ?? "";
+    final error = data["error"];
+    if (error != null) {
+      final code = int.tryParse(error["code"]?.toString() ?? "");
+      final message = error['message'] ?? "";
       throw RPCError(
-        errorCode: code,
-        message: message,
-        data: data["error"]?["data"],
-        request: data["request"] ?? request.params,
-      );
+          errorCode: code,
+          message: message,
+          request: data["request"] ?? request.params,
+          details: error);
     }
 
     return data["result"];
diff --git a/lib/src/provider/models/config.dart b/lib/src/provider/models/config.dart
index 9369398..44ebefb 100644
--- a/lib/src/provider/models/config.dart
+++ b/lib/src/provider/models/config.dart
@@ -66,7 +66,7 @@ class APIConfig {
         baseUrl = BtcApiConst.blockCypherLitecoinBaseUri;
         break;
       default:
-        throw BitcoinBasePluginException(
+        throw DartBitcoinPluginException(
             "blockcypher does not support ${network.conf.coinName.name}, u must use your own provider");
     }
 
@@ -92,7 +92,7 @@ class APIConfig {
         baseUrl = BtcApiConst.mempoolBaseURL;
         break;
       default:
-        throw BitcoinBasePluginException(
+        throw DartBitcoinPluginException(
             "mempool does not support ${network.conf.coinName.name}");
     }
 
diff --git a/lib/src/provider/models/fee_rate/fee_rate.dart b/lib/src/provider/models/fee_rate/fee_rate.dart
index 09c6312..8064aaa 100644
--- a/lib/src/provider/models/fee_rate/fee_rate.dart
+++ b/lib/src/provider/models/fee_rate/fee_rate.dart
@@ -99,7 +99,7 @@ BigInt _parseMempoolFees(dynamic data) {
   } else if (data is int) {
     return BigInt.from((data * kb));
   } else {
-    throw BitcoinBasePluginException(
+    throw DartBitcoinPluginException(
         "cannot parse mempool fees excepted double, string got ${data.runtimeType}");
   }
 }
diff --git a/lib/src/provider/models/multisig_script.dart b/lib/src/provider/models/multisig_script.dart
index 657f912..7a8aed6 100644
--- a/lib/src/provider/models/multisig_script.dart
+++ b/lib/src/provider/models/multisig_script.dart
@@ -51,7 +51,7 @@ class MultiSignatureAddress {
 
   BitcoinBaseAddress toP2wshAddress({required BasedUtxoNetwork network}) {
     if (network is! LitecoinNetwork && network is! BitcoinNetwork) {
-      throw BitcoinBasePluginException(
+      throw DartBitcoinPluginException(
           "${network.conf.coinName.name} Bitcoin forks that do not support Segwit. use toP2shAddress");
     }
     return P2wshAddress.fromScript(script: multiSigScript);
@@ -66,7 +66,7 @@ class MultiSignatureAddress {
   BitcoinBaseAddress toP2shAddress(
       [P2shAddressType addressType = P2shAddressType.p2pkhInP2sh]) {
     if (!legacySupportP2shTypes.contains(addressType)) {
-      throw BitcoinBasePluginException(
+      throw DartBitcoinPluginException(
           "invalid p2sh type please use one of them ${legacySupportP2shTypes.map((e) => "$e").join(", ")}");
     }
 
@@ -94,7 +94,7 @@ class MultiSignatureAddress {
       case P2shAddressType.p2pkhInP2sh32wt:
         return toP2shAddress(addressType as P2shAddressType);
       default:
-        throw const BitcoinBasePluginException(
+        throw const DartBitcoinPluginException(
             "invalid multisig address type. use of of them [BitcoinAddressType.p2wsh, BitcoinAddressType.p2wshInP2sh, BitcoinAddressType.p2pkhInP2sh]");
     }
   }
@@ -116,15 +116,15 @@ class MultiSignatureAddress {
     final sumWeight =
         signers.fold<int>(0, (sum, signer) => sum + signer.weight);
     if (threshold > 16 || threshold < 1) {
-      throw const BitcoinBasePluginException(
+      throw const DartBitcoinPluginException(
           'The threshold should be between 1 and 16');
     }
     if (sumWeight > 16) {
-      throw const BitcoinBasePluginException(
+      throw const DartBitcoinPluginException(
           'The total weight of the owners should not exceed 16');
     }
     if (sumWeight < threshold) {
-      throw const BitcoinBasePluginException(
+      throw const DartBitcoinPluginException(
           'The total weight of the signatories should reach the threshold');
     }
     final multiSigScript = <String>['OP_$threshold'];
diff --git a/lib/src/provider/models/utxo_details.dart b/lib/src/provider/models/utxo_details.dart
index a6ecb98..4917e98 100644
--- a/lib/src/provider/models/utxo_details.dart
+++ b/lib/src/provider/models/utxo_details.dart
@@ -48,11 +48,11 @@ class UtxoWithAddress {
 
   ECPublic public() {
     if (isMultiSig()) {
-      throw const BitcoinBasePluginException(
+      throw const DartBitcoinPluginException(
           "Cannot access public key in multi-signature address");
     }
     if (ownerDetails._publicKey == null) {
-      throw const BitcoinBasePluginException(
+      throw const DartBitcoinPluginException(
           "Cannot access public key in watch only address; use UtxoAddressDetails constractor instead `UtxoAddressDetails.watchOnly`");
     }
     return ECPublic.fromHex(ownerDetails._publicKey!);
@@ -64,7 +64,7 @@ class UtxoWithAddress {
 
   MultiSignatureAddress get multiSigAddress => isMultiSig()
       ? ownerDetails._multiSigAddress!
-      : throw const BitcoinBasePluginException(
+      : throw const DartBitcoinPluginException(
           "The address is not associated with a multi-signature setup");
 }
 
diff --git a/lib/src/provider/transaction_builder/forked_transaction_builder.dart b/lib/src/provider/transaction_builder/forked_transaction_builder.dart
index 862b0f0..542c208 100644
--- a/lib/src/provider/transaction_builder/forked_transaction_builder.dart
+++ b/lib/src/provider/transaction_builder/forked_transaction_builder.dart
@@ -46,7 +46,7 @@ class ForkedTransactionBuilder implements BasedBitcoinTransacationBuilder {
 
   void _validateBuilder() {
     if (network is! BitcoinCashNetwork && network is! BitcoinSVNetwork) {
-      throw const BitcoinBasePluginException(
+      throw const DartBitcoinPluginException(
           "invalid network. use ForkedTransactionBuilder for BitcoinCashNetwork and BSVNetwork otherwise use BitcoinTransactionBuilder");
     }
     for (final i in utxosInfo) {
@@ -125,7 +125,7 @@ class ForkedTransactionBuilder implements BasedBitcoinTransacationBuilder {
         case P2shAddressType.p2pkhInP2sh32wt:
           return script;
         default:
-          throw BitcoinBasePluginException(
+          throw DartBitcoinPluginException(
               "unsuported multi-sig type ${utxo.utxo.scriptType} for ${network.conf.coinName.name}");
       }
     }
@@ -146,7 +146,7 @@ class ForkedTransactionBuilder implements BasedBitcoinTransacationBuilder {
       case P2shAddressType.p2pkhInP2sh32wt:
         return senderPub.toAddress().toScriptPubKey();
       default:
-        throw BitcoinBasePluginException(
+        throw DartBitcoinPluginException(
             "${utxo.utxo.scriptType} does not sudpport on ${network.conf.coinName.name}");
     }
   }
@@ -225,7 +225,7 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
         final script = senderPub.toRedeemScript();
         return [signedDigest, script.toHex()];
       default:
-        throw BitcoinBasePluginException(
+        throw DartBitcoinPluginException(
             'Cannot send from this type of address ${utx.utxo.scriptType}');
     }
   }
@@ -328,7 +328,7 @@ be retrieved by anyone who examines the blockchain's history.
       required BigInt sumUtxoAmount,
       required BigInt sumOutputAmounts}) {
     if (!isFakeTransaction && sumAmountsWithFee != sumUtxoAmount) {
-      throw BitcoinBasePluginException('Sum value of utxo not spending',
+      throw DartBitcoinPluginException('Sum value of utxo not spending',
           details: {
             "inputAmount": sumUtxoAmount,
             "fee": fee,
@@ -353,7 +353,7 @@ be retrieved by anyone who examines the blockchain's history.
                       previousValue + (element.value ?? BigInt.zero));
 
           if (amount != i.value) {
-            throw BitcoinBasePluginException(
+            throw DartBitcoinPluginException(
                 'Sum token value of UTXOs not spending. use BitcoinBurnableOutput if you want to burn tokens.',
                 details: {
                   "token": i.key,
@@ -379,7 +379,7 @@ be retrieved by anyone who examines the blockchain's history.
                   element.utxoHash == i.utxo.txHash &&
                   element.categoryID == token.category);
           if (hasBurnableOutput) continue;
-          throw BitcoinBasePluginException(
+          throw DartBitcoinPluginException(
               'Some NFTs in the inputs lack the corresponding spending in the outputs. If you intend to burn tokens, consider utilizing the BitcoinBurnableOutput.',
               details: {"category id": token.category});
         }
@@ -420,7 +420,7 @@ be retrieved by anyone who examines the blockchain's history.
           }
         }
         if (sumMultiSigWeight != multiSigAddress.threshold) {
-          throw const BitcoinBasePluginException(
+          throw const DartBitcoinPluginException(
               "some multisig signature does not exist");
         }
         continue;
@@ -503,7 +503,7 @@ be retrieved by anyone who examines the blockchain's history.
           }
         }
         if (sumMultiSigWeight != multiSigAddress.threshold) {
-          throw const BitcoinBasePluginException(
+          throw const DartBitcoinPluginException(
               "some multisig signature does not exist");
         }
 
@@ -593,7 +593,7 @@ be retrieved by anyone who examines the blockchain's history.
           }
         }
         if (sumMultiSigWeight != multiSigAddress.threshold) {
-          throw const BitcoinBasePluginException(
+          throw const DartBitcoinPluginException(
               "some multisig signature does not exist");
         }
 
diff --git a/lib/src/provider/transaction_builder/transaction_builder.dart b/lib/src/provider/transaction_builder/transaction_builder.dart
index a20130d..07587c6 100644
--- a/lib/src/provider/transaction_builder/transaction_builder.dart
+++ b/lib/src/provider/transaction_builder/transaction_builder.dart
@@ -48,14 +48,14 @@ class BitcoinTransactionBuilder implements BasedBitcoinTransacationBuilder {
   /// validate network and address suport before create transaction
   void _validateBuilder() {
     if (network is BitcoinCashNetwork || network is BitcoinSVNetwork) {
-      throw const BitcoinBasePluginException(
+      throw const DartBitcoinPluginException(
           "invalid network for BitcoinCashNetwork and BSVNetwork use ForkedTransactionBuilder");
     }
     final token = utxosInfo.any((element) => element.utxo.token != null);
     final tokenInput = outPuts.whereType<BitcoinTokenOutput>();
     final burn = outPuts.whereType<BitcoinBurnableOutput>();
     if (token || tokenInput.isNotEmpty || burn.isNotEmpty) {
-      throw const BitcoinBasePluginException(
+      throw const DartBitcoinPluginException(
           "Cash Token only work on Bitcoin cash network");
     }
     for (final i in utxosInfo) {
@@ -193,7 +193,7 @@ class BitcoinTransactionBuilder implements BasedBitcoinTransacationBuilder {
           }
           return script;
         default:
-          throw BitcoinBasePluginException(
+          throw DartBitcoinPluginException(
               "unsuported multi-sig type ${utxo.utxo.scriptType}");
       }
     }
@@ -237,7 +237,7 @@ class BitcoinTransactionBuilder implements BasedBitcoinTransacationBuilder {
         }
         return senderPub.toRedeemScript();
     }
-    throw const BitcoinBasePluginException("invalid bitcoin address type");
+    throw const DartBitcoinPluginException("invalid bitcoin address type");
   }
 
   /// generateTransactionDigest generates and returns a transaction digest for a given input in the context of a Bitcoin
@@ -314,7 +314,7 @@ class BitcoinTransactionBuilder implements BasedBitcoinTransacationBuilder {
           final p2wsh = P2wshAddress.fromScript(script: script);
           return [p2wsh.toScriptPubKey().toHex()];
         default:
-          throw BitcoinBasePluginException(
+          throw DartBitcoinPluginException(
               "Invalid p2sh nested segwit type ${utxo.utxo.scriptType.value}");
       }
     }
@@ -327,7 +327,7 @@ class BitcoinTransactionBuilder implements BasedBitcoinTransacationBuilder {
         final script = senderPub.toSegwitAddress().toScriptPubKey();
         return [script.toHex()];
       default:
-        throw BitcoinBasePluginException(
+        throw DartBitcoinPluginException(
             "Invalid p2sh nested segwit type ${utxo.utxo.scriptType.value}");
     }
   }
@@ -353,7 +353,7 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
         case P2shAddressType.p2wpkhInP2sh:
           return [signedDigest, senderPub.toHex()];
         default:
-          throw BitcoinBasePluginException(
+          throw DartBitcoinPluginException(
               "invalid segwit address type ${utx.utxo.scriptType.value}");
       }
     } else {
@@ -369,7 +369,7 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
           final script = senderPub.toRedeemScript();
           return [signedDigest, script.toHex()];
         default:
-          throw BitcoinBasePluginException(
+          throw DartBitcoinPluginException(
               "invalid address type ${utx.utxo.scriptType.value}");
       }
     }
@@ -494,7 +494,7 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
 
     /// We will check whether you have spent the correct amounts or not
     if (!isFakeTransaction && sumAmountsWithFee != sumUtxoAmount) {
-      throw const BitcoinBasePluginException('Sum value of utxo not spending');
+      throw const DartBitcoinPluginException('Sum value of utxo not spending');
     }
 
     /// create new transaction with inputs and outputs and isSegwit transaction or not
@@ -552,7 +552,7 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
           }
         }
         if (sumMultiSigWeight != multiSigAddress.threshold) {
-          throw const BitcoinBasePluginException(
+          throw const DartBitcoinPluginException(
               "some multisig signature does not exist");
         }
         _addUnlockScriptScript(
@@ -615,7 +615,7 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
           }
         }
         if (sumMultiSigWeight != multiSigAddress.threshold) {
-          throw const BitcoinBasePluginException(
+          throw const DartBitcoinPluginException(
               "some multisig signature does not exist");
         }
         continue;
@@ -656,7 +656,7 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
 
     /// We will check whether you have spent the correct amounts or not
     if (!isFakeTransaction && sumAmountsWithFee != sumUtxoAmount) {
-      throw const BitcoinBasePluginException('Sum value of utxo not spending');
+      throw const DartBitcoinPluginException('Sum value of utxo not spending');
     }
 
     /// create new transaction with inputs and outputs and isSegwit transaction or not
@@ -714,7 +714,7 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
           }
         }
         if (sumMultiSigWeight != multiSigAddress.threshold) {
-          throw const BitcoinBasePluginException(
+          throw const DartBitcoinPluginException(
               "some multisig signature does not exist");
         }
         _addUnlockScriptScript(
diff --git a/pubspec.yaml b/pubspec.yaml
index b86dce4..f1c3442 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: bitcoin_base
 description: A versatile library for Bitcoin, Dogecoin, Litecoin, Dash, BSV, and BCH. Supports P2PKH, P2SH, P2WPKH, P2WSH, P2TR, with advanced creation, signing, and spending capabilities.
-version: 4.7.0
+version: 4.8.0
 homepage: "https://github.com/mrtnetwork/bitcoin_base"
 repository: "https://github.com/mrtnetwork/bitcoin_base"
 Author: mrhaydari.t@gmail.com
@@ -16,14 +16,14 @@ environment:
 
 
 dependencies:
-  blockchain_utils: ^3.3.0
+  blockchain_utils: ^3.4.0
   
   # blockchain_utils:
   #   path: ../blockchain_utils
     
 
 dev_dependencies:
-  test: ^1.25.5
+  test: ^1.25.8
   lints: ^4.0.0
   flutter_lints: ^4.0.0
  

From d42a8be8d2197eee029bf94a27d87fed6f52cb63 Mon Sep 17 00:00:00 2001
From: Mohsen <56779182+mrtnetwork@users.noreply.github.com>
Date: Thu, 10 Oct 2024 09:02:35 +0330
Subject: [PATCH 02/62] Update network_address.dart

---
 lib/src/bitcoin/address/network_address.dart | 115 +++++++++----------
 1 file changed, 55 insertions(+), 60 deletions(-)

diff --git a/lib/src/bitcoin/address/network_address.dart b/lib/src/bitcoin/address/network_address.dart
index 69950da..b15aa3c 100644
--- a/lib/src/bitcoin/address/network_address.dart
+++ b/lib/src/bitcoin/address/network_address.dart
@@ -2,104 +2,105 @@ part of 'package:bitcoin_base/src/bitcoin/address/address.dart';
 
 /// An abstract class representing a forked address for a specific network.
 abstract class BitcoinNetworkAddress<T extends BasedUtxoNetwork> {
-  const BitcoinNetworkAddress();
+  const BitcoinNetworkAddress._(
+      {required this.address,
+      required this.network,
+      required this.baseAddress});
 
   /// The underlying Bitcoin base address.
-  abstract final BitcoinBaseAddress baseAddress;
+  final BitcoinBaseAddress baseAddress;
 
   /// Converts the address to a string representation for the specified network [T].
-  String toAddress([T? network]) {
-    return network == null ? address : baseAddress.toAddress(network);
+  String toAddress([T? updateNetwork]) {
+    return updateNetwork == null
+        ? address
+        : baseAddress.toAddress(updateNetwork);
   }
 
   /// The type of the Bitcoin address.
   BitcoinAddressType get type => baseAddress.type;
 
   /// The string representation of the address.
-  abstract final String address;
+  final String address;
+
+  final T network;
 }
 
 /// A concrete implementation of [BitcoinNetworkAddress] for Bitcoin network.
 class BitcoinAddress extends BitcoinNetworkAddress<BitcoinNetwork> {
-  const BitcoinAddress._(this.baseAddress, this.address);
+  const BitcoinAddress._(
+      BitcoinBaseAddress baseAddress, String address, BitcoinNetwork network)
+      : super._(address: address, baseAddress: baseAddress, network: network);
   factory BitcoinAddress(String address,
       {BitcoinNetwork network = BitcoinNetwork.mainnet}) {
     return BitcoinAddress._(
-        _BitcoinAddressUtils.decodeAddress(address, network), address);
+        _BitcoinAddressUtils.decodeAddress(address, network), address, network);
   }
   factory BitcoinAddress.fromBaseAddress(BitcoinBaseAddress address,
-      {DashNetwork network = DashNetwork.mainnet}) {
+      {BitcoinNetwork network = BitcoinNetwork.mainnet}) {
     final baseAddress = _BitcoinAddressUtils.validateAddress(address, network);
-    return BitcoinAddress._(baseAddress, baseAddress.toAddress(network));
+    return BitcoinAddress._(
+        baseAddress, baseAddress.toAddress(network), network);
   }
-  @override
-  final BitcoinBaseAddress baseAddress;
-  @override
-  final String address;
 }
 
 /// A concrete implementation of [BitcoinNetworkAddress] for Doge network.
 class DogeAddress extends BitcoinNetworkAddress<DogecoinNetwork> {
-  const DogeAddress._(this.baseAddress, this.address);
+  const DogeAddress._(
+      BitcoinBaseAddress baseAddress, String address, DogecoinNetwork network)
+      : super._(address: address, baseAddress: baseAddress, network: network);
   factory DogeAddress(String address,
       {DogecoinNetwork network = DogecoinNetwork.mainnet}) {
     return DogeAddress._(
-        _BitcoinAddressUtils.decodeAddress(address, network), address);
+        _BitcoinAddressUtils.decodeAddress(address, network), address, network);
   }
   factory DogeAddress.fromBaseAddress(BitcoinBaseAddress address,
       {DogecoinNetwork network = DogecoinNetwork.mainnet}) {
     final baseAddress = _BitcoinAddressUtils.validateAddress(address, network);
-    return DogeAddress._(baseAddress, baseAddress.toAddress(network));
+    return DogeAddress._(baseAddress, baseAddress.toAddress(network), network);
   }
-  @override
-  final BitcoinBaseAddress baseAddress;
-
-  @override
-  final String address;
 }
 
 /// A concrete implementation of [BitcoinNetworkAddress] for Pepecoin network.
 class PepeAddress extends BitcoinNetworkAddress<PepeNetwork> {
-  const PepeAddress._(this.baseAddress, this.address);
+  const PepeAddress._(
+      BitcoinBaseAddress baseAddress, String address, PepeNetwork network)
+      : super._(address: address, network: network, baseAddress: baseAddress);
   factory PepeAddress(String address,
       {PepeNetwork network = PepeNetwork.mainnet}) {
     return PepeAddress._(
-        _BitcoinAddressUtils.decodeAddress(address, network), address);
+        _BitcoinAddressUtils.decodeAddress(address, network), address, network);
   }
   factory PepeAddress.fromBaseAddress(BitcoinBaseAddress address,
       {PepeNetwork network = PepeNetwork.mainnet}) {
     final baseAddress = _BitcoinAddressUtils.validateAddress(address, network);
-    return PepeAddress._(baseAddress, baseAddress.toAddress(network));
+    return PepeAddress._(baseAddress, baseAddress.toAddress(network), network);
   }
-  @override
-  final BitcoinBaseAddress baseAddress;
-
-  @override
-  final String address;
 }
 
 /// A concrete implementation of [BitcoinNetworkAddress] for Litecoin network.
 class LitecoinAddress extends BitcoinNetworkAddress<LitecoinNetwork> {
-  LitecoinAddress._(this.baseAddress, this.address);
+  const LitecoinAddress._(
+      BitcoinBaseAddress baseAddress, String address, LitecoinNetwork network)
+      : super._(address: address, baseAddress: baseAddress, network: network);
   factory LitecoinAddress(String address,
       {LitecoinNetwork network = LitecoinNetwork.mainnet}) {
     return LitecoinAddress._(
-        _BitcoinAddressUtils.decodeAddress(address, network), address);
+        _BitcoinAddressUtils.decodeAddress(address, network), address, network);
   }
   factory LitecoinAddress.fromBaseAddress(BitcoinBaseAddress address,
       {LitecoinNetwork network = LitecoinNetwork.mainnet}) {
     final baseAddress = _BitcoinAddressUtils.validateAddress(address, network);
-    return LitecoinAddress._(baseAddress, baseAddress.toAddress(network));
+    return LitecoinAddress._(
+        baseAddress, baseAddress.toAddress(network), network);
   }
-  @override
-  final BitcoinBaseAddress baseAddress;
-  @override
-  final String address;
 }
 
 /// A concrete implementation of [BitcoinNetworkAddress] for Bitcoin cash network.
 class BitcoinCashAddress extends BitcoinNetworkAddress<BitcoinCashNetwork> {
-  const BitcoinCashAddress._(this.baseAddress, this.address);
+  const BitcoinCashAddress._(BitcoinBaseAddress baseAddress, String address,
+      BitcoinCashNetwork network)
+      : super._(address: address, baseAddress: baseAddress, network: network);
   factory BitcoinCashAddress(String address,
       {BitcoinCashNetwork network = BitcoinCashNetwork.mainnet,
       bool validateNetworkPrefix = false}) {
@@ -109,61 +110,55 @@ class BitcoinCashAddress extends BitcoinNetworkAddress<BitcoinCashNetwork> {
     if (decodeAddress == null) {
       throw DartBitcoinPluginException("Invalid ${network.value} address.");
     }
-    return BitcoinCashAddress._(decodeAddress, address);
+    return BitcoinCashAddress._(decodeAddress, address, network);
   }
   factory BitcoinCashAddress.fromBaseAddress(BitcoinBaseAddress address,
       {BitcoinCashNetwork network = BitcoinCashNetwork.mainnet}) {
     final baseAddress = _BitcoinAddressUtils.validateAddress(address, network);
-    return BitcoinCashAddress._(baseAddress, baseAddress.toAddress(network));
+    return BitcoinCashAddress._(
+        baseAddress, baseAddress.toAddress(network), network);
   }
-  @override
-  final BitcoinBaseAddress baseAddress;
-  @override
-  final String address;
 
   @override
-  String toAddress([BitcoinCashNetwork? network, String? prefix]) {
+  String toAddress([BitcoinCashNetwork? updateNetwork, String? prefix]) {
     if (prefix != null) {
       return BchAddrConverter.convert(address, prefix, null);
     }
-    return super.toAddress(network);
+    return super.toAddress(updateNetwork);
   }
 }
 
 /// A concrete implementation of [BitcoinNetworkAddress] for Dash network.
 class DashAddress extends BitcoinNetworkAddress<DashNetwork> {
-  const DashAddress._(this.baseAddress, this.address);
+  const DashAddress._(
+      BitcoinBaseAddress baseAddress, String address, DashNetwork network)
+      : super._(address: address, baseAddress: baseAddress, network: network);
   factory DashAddress(String address,
       {DashNetwork network = DashNetwork.mainnet}) {
     return DashAddress._(
-        _BitcoinAddressUtils.decodeAddress(address, network), address);
+        _BitcoinAddressUtils.decodeAddress(address, network), address, network);
   }
   factory DashAddress.fromBaseAddress(BitcoinBaseAddress address,
       {DashNetwork network = DashNetwork.mainnet}) {
     final baseAddress = _BitcoinAddressUtils.validateAddress(address, network);
-    return DashAddress._(baseAddress, baseAddress.toAddress(network));
+    return DashAddress._(baseAddress, baseAddress.toAddress(network), network);
   }
-  @override
-  final BitcoinBaseAddress baseAddress;
-  @override
-  final String address;
 }
 
 /// A concrete implementation of [BitcoinNetworkAddress] for bitcoinSV network.
-class BitcoinSVAddress extends BitcoinNetworkAddress<DashNetwork> {
-  const BitcoinSVAddress._(this.baseAddress, this.address);
+class BitcoinSVAddress extends BitcoinNetworkAddress<BitcoinSVNetwork> {
+  const BitcoinSVAddress._(
+      BitcoinBaseAddress baseAddress, String address, BitcoinSVNetwork network)
+      : super._(address: address, baseAddress: baseAddress, network: network);
   factory BitcoinSVAddress(String address,
       {BitcoinSVNetwork network = BitcoinSVNetwork.mainnet}) {
     return BitcoinSVAddress._(
-        _BitcoinAddressUtils.decodeAddress(address, network), address);
+        _BitcoinAddressUtils.decodeAddress(address, network), address, network);
   }
   factory BitcoinSVAddress.fromBaseAddress(BitcoinBaseAddress address,
       {BitcoinSVNetwork network = BitcoinSVNetwork.mainnet}) {
     final baseAddress = _BitcoinAddressUtils.validateAddress(address, network);
-    return BitcoinSVAddress._(baseAddress, baseAddress.toAddress(network));
+    return BitcoinSVAddress._(
+        baseAddress, baseAddress.toAddress(network), network);
   }
-  @override
-  final BitcoinBaseAddress baseAddress;
-  @override
-  final String address;
 }

From 9bfdd2fba2a4cd4d87ea53069ad35a13f239efd0 Mon Sep 17 00:00:00 2001
From: Mohsen <56779182+mrtnetwork@users.noreply.github.com>
Date: Thu, 10 Oct 2024 09:18:49 +0330
Subject: [PATCH 03/62] fix ElectrumEstimateFee

---
 .../transfer_from_7_account_to_6_accout_example.dart      | 5 +++++
 example/lib/global/transfer_to_8_account_example.dart     | 5 +++++
 .../provider/electrum_methods/methods/estimate_fee.dart   | 8 +++++---
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/example/lib/global/transfer_from_7_account_to_6_accout_example.dart b/example/lib/global/transfer_from_7_account_to_6_accout_example.dart
index a441543..295d906 100644
--- a/example/lib/global/transfer_from_7_account_to_6_accout_example.dart
+++ b/example/lib/global/transfer_from_7_account_to_6_accout_example.dart
@@ -123,6 +123,11 @@ void main() async {
   /// get network fee esmtimate (fee per kilobyte)
   final networkEstimate = await provider.request(ElectrumEstimateFee());
 
+  /// the daemon does not have enough information to make an estimate
+  if (networkEstimate == null) {
+    return;
+  }
+
   /// Convert kilobytes to bytes, multiply by the transaction size, and the result yields the transaction fees.
   final fee =
       BigInt.from(transactionSize) * (networkEstimate ~/ BigInt.from(1000));
diff --git a/example/lib/global/transfer_to_8_account_example.dart b/example/lib/global/transfer_to_8_account_example.dart
index 90f21f7..6830feb 100644
--- a/example/lib/global/transfer_to_8_account_example.dart
+++ b/example/lib/global/transfer_to_8_account_example.dart
@@ -102,6 +102,11 @@ void main() async {
   /// get network fee esmtimate (kb/s)
   final networkEstimate = await provider.request(ElectrumEstimateFee());
 
+  /// the daemon does not have enough information to make an estimate
+  if (networkEstimate == null) {
+    return;
+  }
+
   /// kb to bytes and mul with transaction size and now we have fee
   final fee =
       BigInt.from(estimateSize) * (networkEstimate ~/ BigInt.from(1000));
diff --git a/lib/src/provider/electrum_methods/methods/estimate_fee.dart b/lib/src/provider/electrum_methods/methods/estimate_fee.dart
index 9e3b2f5..859dfd8 100644
--- a/lib/src/provider/electrum_methods/methods/estimate_fee.dart
+++ b/lib/src/provider/electrum_methods/methods/estimate_fee.dart
@@ -3,7 +3,7 @@ import 'package:bitcoin_base/src/utils/btc_utils.dart';
 
 /// Return the estimated transaction fee per kilobyte for a transaction to be confirmed within a certain number of blocks.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumEstimateFee extends ElectrumRequest<BigInt, dynamic> {
+class ElectrumEstimateFee extends ElectrumRequest<BigInt?, dynamic> {
   ElectrumEstimateFee({this.numberOfBlock = 2});
 
   /// The number of blocks to target for confirmation.
@@ -20,7 +20,9 @@ class ElectrumEstimateFee extends ElectrumRequest<BigInt, dynamic> {
 
   /// The estimated transaction fee in Bigint(satoshi)
   @override
-  BigInt onResonse(result) {
-    return BtcUtils.toSatoshi(result.toString()).abs();
+  BigInt? onResonse(result) {
+    final fee = BtcUtils.toSatoshi(result.toString());
+    if (fee.isNegative) return null;
+    return fee;
   }
 }

From a2edeceb2cc39e3d056440fbc4a1b41e178d3fe0 Mon Sep 17 00:00:00 2001
From: Mohsen <56779182+mrtnetwork@users.noreply.github.com>
Date: Thu, 10 Oct 2024 19:17:48 +0330
Subject: [PATCH 04/62] v4.9.0

Correct Bitcoin address network configuration.
Resolve issue with Electrum fee estimation results.
---
 CHANGELOG.md | 6 ++++++
 pubspec.yaml | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dc41c5e..1e6a3cf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 4.9.0
+
+* Correct Bitcoin address network configuration.
+* Resolve issue with Electrum fee estimation results.
+
+
 ## 4.8.0
 
 * Update dependencies
diff --git a/pubspec.yaml b/pubspec.yaml
index f1c3442..359c7ef 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: bitcoin_base
 description: A versatile library for Bitcoin, Dogecoin, Litecoin, Dash, BSV, and BCH. Supports P2PKH, P2SH, P2WPKH, P2WSH, P2TR, with advanced creation, signing, and spending capabilities.
-version: 4.8.0
+version: 4.9.0
 homepage: "https://github.com/mrtnetwork/bitcoin_base"
 repository: "https://github.com/mrtnetwork/bitcoin_base"
 Author: mrhaydari.t@gmail.com

From 5c844aee9ab3b3f53cbe45b19655928892b59d7f Mon Sep 17 00:00:00 2001
From: Sandro Simas <sandro.csimas@gmail.com>
Date: Mon, 14 Oct 2024 20:02:00 -0300
Subject: [PATCH 05/62] Adding Omni XEP support

---
 lib/src/models/network.dart | 54 ++++++++++++++++++++++++++++++++++++-
 pubspec.yaml                | 10 ++++---
 2 files changed, 59 insertions(+), 5 deletions(-)

diff --git a/lib/src/models/network.dart b/lib/src/models/network.dart
index 67c1277..ac324ea 100644
--- a/lib/src/models/network.dart
+++ b/lib/src/models/network.dart
@@ -48,7 +48,8 @@ abstract class BasedUtxoNetwork implements Enumerate {
     BitcoinCashNetwork.testnet,
     BitcoinSVNetwork.mainnet,
     BitcoinSVNetwork.testnet,
-    PepeNetwork.mainnet
+    PepeNetwork.mainnet,
+    OmniXepNetwork.mainnet,
   ];
 
   static BasedUtxoNetwork fromName(String name) {
@@ -493,3 +494,54 @@ class PepeNetwork implements BasedUtxoNetwork {
     return [Bip44Coins.pepecoinTestnet, Bip49Coins.pepecoinTestnet];
   }
 }
+
+/// Class representing a Dogecoin network, implementing the `BasedUtxoNetwork` abstract class.
+class OmniXepNetwork implements BasedUtxoNetwork {
+  /// Mainnet configuration with associated `CoinConf`.
+  static const OmniXepNetwork mainnet =
+      OmniXepNetwork._("omniXepMainnet", CoinsConf.omniXepMainNet);
+
+  /// Overrides the `conf` property from `BasedUtxoNetwork` with the associated `CoinConf`.
+  @override
+  final CoinConf conf;
+
+  /// Constructor for creating a Dogecoin network with a specific configuration.
+  const OmniXepNetwork._(this.value, this.conf);
+
+  @override
+  final String value;
+
+  /// Retrieves the Wallet Import Format (WIF) version bytes from the associated `CoinConf`.
+  @override
+  List<int> get wifNetVer => conf.params.wifNetVer!;
+
+  /// Retrieves the Pay-to-Public-Key-Hash (P2PKH) version bytes from the associated `CoinConf`.
+  @override
+  List<int> get p2pkhNetVer => conf.params.p2pkhNetVer!;
+
+  /// Retrieves the Pay-to-Script-Hash (P2SH) version bytes from the associated `CoinConf`.
+  @override
+  List<int> get p2shNetVer => conf.params.p2shNetVer!;
+
+  /// Retrieves the Human-Readable Part (HRP) for Pay-to-Witness-Public-Key-Hash (P2WPKH) addresses.
+  @override
+  String get p2wpkhHrp => throw const DartBitcoinPluginException(
+      "Omni XEP network does not support P2WPKH/P2WSH");
+
+  /// Checks if the current network is the mainnet.
+  @override
+  bool get isMainnet => true;
+
+  @override
+  final List<BitcoinAddressType> supportedAddress = const [
+    P2shAddressType.p2wpkhInP2sh,
+  ];
+
+  @override
+  List<BipCoins> get coins {
+    if (isMainnet) {
+      return [Bip49Coins.omniXep];
+    }
+    return [];
+  }
+}
\ No newline at end of file
diff --git a/pubspec.yaml b/pubspec.yaml
index 359c7ef..0538952 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -11,15 +11,17 @@ topics:
   - bitcoincash
   - dash
   
+publish_to: 'none'
+
 environment:
   sdk: '>=2.15.0 <4.0.0'
 
 
 dependencies:
-  blockchain_utils: ^3.4.0
-  
-  # blockchain_utils:
-  #   path: ../blockchain_utils
+  # blockchain_utils: ^3.4.0
+
+  blockchain_utils:
+    path: ../blockchain_utils
     
 
 dev_dependencies:

From 3b7db06c7c3d1312be462fec3d2550b1e617ee65 Mon Sep 17 00:00:00 2001
From: Mohsen <56779182+mrtnetwork@users.noreply.github.com>
Date: Wed, 16 Oct 2024 09:20:30 +0330
Subject: [PATCH 06/62] 4.9.1

Resolved issue with transaction deserialization (Issue #9)
---
 CHANGELOG.md                       |  4 ++++
 example/pubspec.lock               | 16 ++++++++--------
 lib/src/bitcoin/script/script.dart |  3 +--
 pubspec.yaml                       |  4 ++--
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1e6a3cf..a086184 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 4.9.1
+
+* Resolved issue with transaction deserialization (Issue #9)
+
 ## 4.9.0
 
 * Correct Bitcoin address network configuration.
diff --git a/example/pubspec.lock b/example/pubspec.lock
index 9cabb7b..14f2df9 100644
--- a/example/pubspec.lock
+++ b/example/pubspec.lock
@@ -15,7 +15,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "4.8.0"
+    version: "4.9.0"
   blockchain_utils:
     dependency: "direct main"
     description:
@@ -60,10 +60,10 @@ packages:
     dependency: "direct main"
     description:
       name: cupertino_icons
-      sha256: d57953e10f9f8327ce64a508a355f0b1ec902193f66288e8cb5070e7c47eeb2d
+      sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.6"
+    version: "1.0.8"
   fake_async:
     dependency: transitive
     description:
@@ -94,10 +94,10 @@ packages:
     dependency: "direct main"
     description:
       name: http
-      sha256: "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938"
+      sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.1"
+    version: "1.2.2"
   http_parser:
     dependency: transitive
     description:
@@ -251,10 +251,10 @@ packages:
     dependency: transitive
     description:
       name: web
-      sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27"
+      sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.1"
+    version: "1.1.0"
 sdks:
-  dart: ">=3.3.0 <4.0.0"
+  dart: ">=3.4.0 <4.0.0"
   flutter: ">=3.18.0-18.0.pre.54"
diff --git a/lib/src/bitcoin/script/script.dart b/lib/src/bitcoin/script/script.dart
index 7c46945..5228776 100644
--- a/lib/src/bitcoin/script/script.dart
+++ b/lib/src/bitcoin/script/script.dart
@@ -46,8 +46,7 @@ class Script {
             scriptBytes.sublist(index, index + bytesToRead)));
         index = index + bytesToRead;
       } else {
-        final viAndSize =
-            IntUtils.decodeVarint(scriptBytes.sublist(index, index + 9));
+        final viAndSize = IntUtils.decodeVarint(scriptBytes.sublist(index));
         int dataSize = viAndSize.item1;
         int size = viAndSize.item2;
         final lastIndex = (index + size + dataSize) > scriptBytes.length
diff --git a/pubspec.yaml b/pubspec.yaml
index 359c7ef..7f21203 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: bitcoin_base
 description: A versatile library for Bitcoin, Dogecoin, Litecoin, Dash, BSV, and BCH. Supports P2PKH, P2SH, P2WPKH, P2WSH, P2TR, with advanced creation, signing, and spending capabilities.
-version: 4.9.0
+version: 4.9.1
 homepage: "https://github.com/mrtnetwork/bitcoin_base"
 repository: "https://github.com/mrtnetwork/bitcoin_base"
 Author: mrhaydari.t@gmail.com
@@ -23,7 +23,7 @@ dependencies:
     
 
 dev_dependencies:
-  test: ^1.25.8
+  test: ^1.25.5
   lints: ^4.0.0
   flutter_lints: ^4.0.0
  

From 81082e26c668a8e1561e3f8da2d214dc15306448 Mon Sep 17 00:00:00 2001
From: Sandro Simas <sandro.csimas@gmail.com>
Date: Fri, 18 Oct 2024 16:11:24 -0300
Subject: [PATCH 07/62] Small improvement

---
 lib/src/models/network.dart | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/src/models/network.dart b/lib/src/models/network.dart
index ac324ea..3280519 100644
--- a/lib/src/models/network.dart
+++ b/lib/src/models/network.dart
@@ -525,8 +525,7 @@ class OmniXepNetwork implements BasedUtxoNetwork {
 
   /// Retrieves the Human-Readable Part (HRP) for Pay-to-Witness-Public-Key-Hash (P2WPKH) addresses.
   @override
-  String get p2wpkhHrp => throw const DartBitcoinPluginException(
-      "Omni XEP network does not support P2WPKH/P2WSH");
+  String get p2wpkhHrp => conf.params.p2wpkhHrp!;
 
   /// Checks if the current network is the mainnet.
   @override
@@ -534,6 +533,7 @@ class OmniXepNetwork implements BasedUtxoNetwork {
 
   @override
   final List<BitcoinAddressType> supportedAddress = const [
+    SegwitAddresType.p2wpkh,
     P2shAddressType.p2wpkhInP2sh,
   ];
 

From 7929af9c44e66e9542aa48915eb08014b8390aae Mon Sep 17 00:00:00 2001
From: Mohsen <56779182+mrtnetwork@users.noreply.github.com>
Date: Mon, 28 Oct 2024 10:52:10 +0330
Subject: [PATCH 08/62] fix empty segwit deserialization

---
 lib/src/bitcoin/script/transaction.dart | 41 +++++++++++++++----------
 test/p2wsh_test.dart                    |  6 ++++
 2 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/lib/src/bitcoin/script/transaction.dart b/lib/src/bitcoin/script/transaction.dart
index 380067f..8ad7206 100644
--- a/lib/src/bitcoin/script/transaction.dart
+++ b/lib/src/bitcoin/script/transaction.dart
@@ -83,7 +83,7 @@ class BtcTransaction {
       }
       cursor += 2;
     }
-    final vi = IntUtils.decodeVarint(rawtx.sublist(cursor, cursor + 9));
+    final vi = IntUtils.decodeVarint(rawtx.sublist(cursor));
     cursor += vi.item2;
 
     List<TxInput> inputs = [];
@@ -96,7 +96,7 @@ class BtcTransaction {
     }
 
     List<TxOutput> outputs = [];
-    final viOut = IntUtils.decodeVarint(rawtx.sublist(cursor, cursor + 9));
+    final viOut = IntUtils.decodeVarint(rawtx.sublist(cursor));
     cursor += viOut.item2;
     for (int index = 0; index < viOut.item1; index++) {
       final inp =
@@ -106,25 +106,32 @@ class BtcTransaction {
     }
     List<TxWitnessInput> witnesses = [];
     if (hasSegwit) {
-      for (int n = 0; n < inputs.length; n++) {
-        final wVi = IntUtils.decodeVarint(rawtx.sublist(cursor, cursor + 9));
-        cursor += wVi.item2;
-        List<String> witnessesTmp = [];
-        for (int n = 0; n < wVi.item1; n++) {
-          List<int> witness = <int>[];
-          final wtVi = IntUtils.decodeVarint(rawtx.sublist(cursor, cursor + 9));
-          if (wtVi.item1 != 0) {
-            witness = rawtx.sublist(
-                cursor + wtVi.item2, cursor + wtVi.item1 + wtVi.item2);
+      if (cursor + 4 < rawtx.length) {
+        // in this case the tx contains wintness data.
+        for (int n = 0; n < inputs.length; n++) {
+          final wVi = IntUtils.decodeVarint(rawtx.sublist(cursor));
+          cursor += wVi.item2;
+          List<String> witnessesTmp = [];
+          for (int n = 0; n < wVi.item1; n++) {
+            List<int> witness = <int>[];
+            final wtVi = IntUtils.decodeVarint(rawtx.sublist(cursor));
+            if (wtVi.item1 != 0) {
+              witness = rawtx.sublist(
+                  cursor + wtVi.item2, cursor + wtVi.item1 + wtVi.item2);
+            }
+            cursor += wtVi.item1 + wtVi.item2;
+            witnessesTmp.add(BytesUtils.toHexString(witness));
           }
-          cursor += wtVi.item1 + wtVi.item2;
-          witnessesTmp.add(BytesUtils.toHexString(witness));
-        }
 
-        witnesses.add(TxWitnessInput(stack: witnessesTmp));
+          witnesses.add(TxWitnessInput(stack: witnessesTmp));
+        }
       }
     }
-    List<int> lock = rawtx.sublist(cursor, cursor + 4);
+    List<int>? lock;
+    if ((rawtx.length - cursor) >= 4) {
+      lock = rawtx.sublist(cursor, cursor + 4);
+    }
+    print("lock $lock");
     return BtcTransaction(
         inputs: inputs,
         outputs: outputs,
diff --git a/test/p2wsh_test.dart b/test/p2wsh_test.dart
index 1b78659..deeed33 100644
--- a/test/p2wsh_test.dart
+++ b/test/p2wsh_test.dart
@@ -2,6 +2,12 @@ import 'package:bitcoin_base/bitcoin_base.dart';
 import 'package:test/test.dart';
 
 void main() {
+  final sx =
+      "020000000001019361bb41042ba1b84bfd0adf549fd71d0100d523c96f235c0303a820ebe97b6f00000000000100000002f3e0010000000000225120eeef21c790e883138874de40105c2900e95d03b5f2964f6164afde5dfacec01d33e4e902000000001600142d8db3142cf97e996977fed9aec74021395c036900000000";
+  final tx = BtcTransaction.fromRaw(sx);
+  print(tx.inputs.length);
+  print(tx.serialize() == sx);
+  return;
   group("P2WSH", () {
     final sk1 = ECPrivate.fromWif(
         "cTALNpTpRbbxTCJ2A5Vq88UxT44w1PE2cYqiB3n4hRvzyCev1Wwo",

From 940518a1ec9d2a04de0dc40f45dfd1adac719739 Mon Sep 17 00:00:00 2001
From: Mohsen <56779182+mrtnetwork@users.noreply.github.com>
Date: Mon, 28 Oct 2024 10:52:32 +0330
Subject: [PATCH 09/62] remove junk code

---
 lib/src/bitcoin/script/transaction.dart | 1 -
 test/p2wsh_test.dart                    | 6 ------
 2 files changed, 7 deletions(-)

diff --git a/lib/src/bitcoin/script/transaction.dart b/lib/src/bitcoin/script/transaction.dart
index 8ad7206..28e8333 100644
--- a/lib/src/bitcoin/script/transaction.dart
+++ b/lib/src/bitcoin/script/transaction.dart
@@ -131,7 +131,6 @@ class BtcTransaction {
     if ((rawtx.length - cursor) >= 4) {
       lock = rawtx.sublist(cursor, cursor + 4);
     }
-    print("lock $lock");
     return BtcTransaction(
         inputs: inputs,
         outputs: outputs,
diff --git a/test/p2wsh_test.dart b/test/p2wsh_test.dart
index deeed33..1b78659 100644
--- a/test/p2wsh_test.dart
+++ b/test/p2wsh_test.dart
@@ -2,12 +2,6 @@ import 'package:bitcoin_base/bitcoin_base.dart';
 import 'package:test/test.dart';
 
 void main() {
-  final sx =
-      "020000000001019361bb41042ba1b84bfd0adf549fd71d0100d523c96f235c0303a820ebe97b6f00000000000100000002f3e0010000000000225120eeef21c790e883138874de40105c2900e95d03b5f2964f6164afde5dfacec01d33e4e902000000001600142d8db3142cf97e996977fed9aec74021395c036900000000";
-  final tx = BtcTransaction.fromRaw(sx);
-  print(tx.inputs.length);
-  print(tx.serialize() == sx);
-  return;
   group("P2WSH", () {
     final sk1 = ECPrivate.fromWif(
         "cTALNpTpRbbxTCJ2A5Vq88UxT44w1PE2cYqiB3n4hRvzyCev1Wwo",

From bedd81e8f5e457465a8581e112489861bac3bc43 Mon Sep 17 00:00:00 2001
From: Rafael Saes <git@rafael.saes.dev>
Date: Tue, 5 Nov 2024 13:10:01 -0300
Subject: [PATCH 10/62] feat: worker changes

---
 .../global/old_examples/bitcoin_example.dart  | 100 +++----
 .../spending_single_type.dart                 | 109 +++-----
 .../multi_sig_transactions.dart               |  39 +--
 .../transaction_builder_example.dart          |  34 +--
 .../electrum/electrum_ssl_service.dart        | 107 +++++---
 .../electrum/electrum_tcp_service.dart        |  97 +++++--
 .../electrum/electrum_websocket_service.dart  |  39 ++-
 .../electrum/request_completer.dart           |   7 -
 example/pubspec.lock                          |  90 +++++-
 example/pubspec.yaml                          |   4 +-
 lib/bitcoin_base.dart                         |   4 +
 lib/src/bitcoin/address/address.dart          |   2 +-
 lib/src/bitcoin/address/core.dart             |   5 +-
 lib/src/bitcoin/address/derivations.dart      | 216 +++++++++++++++
 lib/src/bitcoin/address/legacy_address.dart   |  99 ++++---
 lib/src/bitcoin/address/network_address.dart  |  16 +-
 lib/src/bitcoin/address/segwit_address.dart   |  87 ++++--
 lib/src/bitcoin/address/util.dart             |  71 +++++
 lib/src/bitcoin/amount/amount.dart            |   5 +
 lib/src/bitcoin/amount/utils.dart             |  33 +++
 lib/src/bitcoin/script/transaction.dart       |  21 +-
 lib/src/bitcoin/silent_payments/address.dart  |  70 +++--
 lib/src/crypto/keypair/ec_private.dart        |  14 +-
 lib/src/crypto/keypair/ec_public.dart         |   4 +
 .../provider/api_provider/api_provider.dart   |  13 +-
 .../api_provider/electrum_api_provider.dart   |  93 +++++--
 .../provider/electrum_methods/methods.dart    |   1 +
 .../electrum_methods/methods/add_peer.dart    |   2 +-
 .../methods/block_headers.dart                |   8 +-
 .../electrum_methods/methods/broad_cast.dart  |   4 +-
 .../methods/donate_address.dart               |   2 +-
 .../methods/electrum_version.dart             |   2 +-
 .../methods/estimate_fee.dart                 |   2 +-
 .../electrum_methods/methods/get_balance.dart |   2 +-
 .../methods/get_fee_histogram.dart            |   5 +-
 .../electrum_methods/methods/get_history.dart |   2 +-
 .../electrum_methods/methods/get_mempool.dart |   2 +-
 .../electrum_methods/methods/get_merkle.dart  |   5 +-
 .../methods/get_transaction.dart              |  36 ++-
 .../electrum_methods/methods/get_unspet.dart  |  11 +-
 .../methods/get_value_proof.dart              |   2 +-
 .../electrum_methods/methods/header.dart      |   2 +-
 .../methods/headers_subscribe.dart            |  21 +-
 .../electrum_methods/methods/id_from_pos.dart |   2 +-
 .../masternode_announce_broadcast.dart        |   2 +-
 .../methods/masternode_list.dart              |   5 +-
 .../methods/masternode_subscribe.dart         |   2 +-
 .../electrum_methods/methods/ping.dart        |   2 +-
 .../electrum_methods/methods/protx_diff.dart  |   2 +-
 .../electrum_methods/methods/protx_info.dart  |   2 +-
 .../electrum_methods/methods/relay_fee.dart   |   2 +-
 .../methods/scripthash_unsubscribe.dart       |   2 +-
 .../methods/server_banner.dart                |   2 +-
 .../methods/server_features.dart              |   2 +-
 .../methods/server_peer_subscribe.dart        |   5 +-
 .../electrum_methods/methods/status.dart      |   7 +-
 .../methods/tweaks_subscribe.dart             |  98 +++++++
 lib/src/provider/models/config.dart           |  28 +-
 .../models/electrum/electrum_utxo.dart        |  26 +-
 .../provider/models/fee_rate/fee_rate.dart    |  79 ++++--
 .../provider/service/electrum/electrum.dart   |   4 +
 .../electrum/electrum_ssl_service.dart        | 258 ++++++++++++++++++
 .../electrum/electrum_tcp_service.dart        | 258 ++++++++++++++++++
 .../electrum/electrum_websocket_service.dart  |  85 ++++++
 .../provider/service/electrum/methods.dart    |  27 +-
 lib/src/provider/service/electrum/params.dart |   2 +-
 .../service/electrum/request_completer.dart   |  14 +
 .../provider/service/electrum/service.dart    |  46 +++-
 .../provider/service/http/http_service.dart   |  70 +++++
 pubspec.yaml                                  |   7 +-
 test/encode_decode_transaction_test.dart      |  15 +-
 71 files changed, 1995 insertions(+), 547 deletions(-)
 delete mode 100644 example/lib/services_examples/electrum/request_completer.dart
 create mode 100644 lib/src/bitcoin/address/derivations.dart
 create mode 100644 lib/src/bitcoin/amount/amount.dart
 create mode 100644 lib/src/bitcoin/amount/utils.dart
 create mode 100644 lib/src/provider/electrum_methods/methods/tweaks_subscribe.dart
 create mode 100644 lib/src/provider/service/electrum/electrum_ssl_service.dart
 create mode 100644 lib/src/provider/service/electrum/electrum_tcp_service.dart
 create mode 100644 lib/src/provider/service/electrum/electrum_websocket_service.dart
 create mode 100644 lib/src/provider/service/electrum/request_completer.dart

diff --git a/example/lib/global/old_examples/bitcoin_example.dart b/example/lib/global/old_examples/bitcoin_example.dart
index 3ce647d..a24aaf2 100644
--- a/example/lib/global/old_examples/bitcoin_example.dart
+++ b/example/lib/global/old_examples/bitcoin_example.dart
@@ -2,7 +2,6 @@
 
 import 'package:bitcoin_base/bitcoin_base.dart';
 import 'package:blockchain_utils/blockchain_utils.dart';
-import 'package:example/services_examples/explorer_service/explorer_service.dart';
 
 /// Calculates the change value based on the sum of all provided values.
 ///
@@ -19,8 +18,7 @@ import 'package:example/services_examples/explorer_service/explorer_service.dart
 /// Returns:
 /// - The change value.
 BigInt _changeValue(BigInt sum, List<BigInt> all) {
-  final sumAll = all.fold<BigInt>(
-      BigInt.zero, (previousValue, element) => previousValue + element);
+  final sumAll = all.fold<BigInt>(BigInt.zero, (previousValue, element) => previousValue + element);
 
   final remind = sum - sumAll;
   if (remind < BigInt.zero) {
@@ -61,27 +59,25 @@ void _spendFromP2pkhTo10DifferentType() async {
   final examplePublicKey2 = examplePrivateKey.getPublic();
 
   /// Define transaction outputs
-  final out1 = P2pkhAddress.fromAddress(
-      address: "msxiCJXD2WB43wK2PpTUvoqQLF7ZP98qqM", network: network);
+  final out1 =
+      P2pkhAddress.fromAddress(address: "msxiCJXD2WB43wK2PpTUvoqQLF7ZP98qqM", network: network);
   final out2 = P2trAddress.fromAddress(
-      address: "tb1plq65drqavf93wf63d8g7d8ypuzaargd5h9d35u05ktrcwxq4a6ss0gpvrt",
-      network: network);
+      address: "tb1plq65drqavf93wf63d8g7d8ypuzaargd5h9d35u05ktrcwxq4a6ss0gpvrt", network: network);
   final out3 = P2wpkhAddress.fromAddress(
       address: "tb1q3zqgu9j368wgk8u5f9vtmkdwq8geetdxry690d", network: network);
-  final out4 = P2pkAddress.fromPubkey(pubkey: examplePublicKey.publicKey.toHex());
-  final out5 = P2shAddress.fromAddress(
-      address: "2N5hVdETdJMwLDxxttfqeWgMuny6K4SYGSc", network: network);
-  final out6 = P2shAddress.fromAddress(
-      address: "2NDAUpeUB1kGAQET8SojF8seXNrk3uudtCb", network: network);
-  final out7 = P2shAddress.fromAddress(
-      address: "2NE9CYdxju2iEAfR4FMdKPUcZbnKcfCiLhM", network: network);
-  final out8 = P2shAddress.fromAddress(
-      address: "2MwGRf8wNJsaYKdigqPwikPpg9JAT2faaPB", network: network);
+  final out4 = P2pkAddress.fromPubkey(pubkey: ECPublic.fromBip32(examplePublicKey.publicKey));
+  final out5 =
+      P2shAddress.fromAddress(address: "2N5hVdETdJMwLDxxttfqeWgMuny6K4SYGSc", network: network);
+  final out6 =
+      P2shAddress.fromAddress(address: "2NDAUpeUB1kGAQET8SojF8seXNrk3uudtCb", network: network);
+  final out7 =
+      P2shAddress.fromAddress(address: "2NE9CYdxju2iEAfR4FMdKPUcZbnKcfCiLhM", network: network);
+  final out8 =
+      P2shAddress.fromAddress(address: "2MwGRf8wNJsaYKdigqPwikPpg9JAT2faaPB", network: network);
   final out9 = P2wshAddress.fromAddress(
-      address: "tb1qes3upam2nv3rc6s38tqgk0cqh6dlycvk6cjydyvpx9zlumh4h4lsjq26p8",
-      network: network);
-  final out10 = P2shAddress.fromAddress(
-      address: "2N2aRKjTQ3uzgUSLWFQAUDvKLnKCiBfCSAh", network: network);
+      address: "tb1qes3upam2nv3rc6s38tqgk0cqh6dlycvk6cjydyvpx9zlumh4h4lsjq26p8", network: network);
+  final out10 =
+      P2shAddress.fromAddress(address: "2N2aRKjTQ3uzgUSLWFQAUDvKLnKCiBfCSAh", network: network);
 
   /// Calculate the change value for the transaction
   final change = _changeValue(
@@ -130,8 +126,7 @@ void _spendFromP2pkhTo10DifferentType() async {
             /// Create a UTXO using a BitcoinUtxo with specific details
             utxo: BitcoinUtxo(
               /// Transaction hash uniquely identifies the referenced transaction
-              txHash:
-                  "b06f4ed0b49a5092a9ea206553ddc5fc469be694d0d28c95598c653e66cdeb5e",
+              txHash: "b06f4ed0b49a5092a9ea206553ddc5fc469be694d0d28c95598c653e66cdeb5e",
 
               /// Value represents the amount of the UTXO in satoshis.
               value: BigInt.from(250000),
@@ -145,19 +140,16 @@ void _spendFromP2pkhTo10DifferentType() async {
 
             /// Include owner details with the public key and address associated with the UTXO
             ownerDetails: UtxoAddressDetails(
-                publicKey: examplePublicKey2.toHex(),
-                address: examplePublicKey2.toP2pkhAddress())),
+                publicKey: examplePublicKey2.toHex(), address: examplePublicKey2.toP2pkhAddress())),
         UtxoWithAddress(
             utxo: BitcoinUtxo(
-              txHash:
-                  "6ff0bdb2966f62f5e202c924e1cab1368b0258833e48986cc0a70fbca624ba93",
+              txHash: "6ff0bdb2966f62f5e202c924e1cab1368b0258833e48986cc0a70fbca624ba93",
               value: BigInt.from(812830),
               vout: 0,
               scriptType: examplePublicKey2.toP2pkhAddress().type,
             ),
             ownerDetails: UtxoAddressDetails(
-                publicKey: examplePublicKey2.toHex(),
-                address: examplePublicKey2.toP2pkhAddress())),
+                publicKey: examplePublicKey2.toHex(), address: examplePublicKey2.toP2pkhAddress())),
       ]);
 
   /// Build the transaction by invoking the buildTransaction method on the BitcoinTransactionBuilder
@@ -249,8 +241,8 @@ void _spendFrom10DifferentTypeToP2pkh() async {
 
   /// outputs
   /// make sure pass network to address for validate, before sending create transaction
-  final out1 = P2pkhAddress.fromAddress(
-      address: "n4bkvTyU1dVdzsrhWBqBw8fEMbHjJvtmJR", network: network);
+  final out1 =
+      P2pkhAddress.fromAddress(address: "n4bkvTyU1dVdzsrhWBqBw8fEMbHjJvtmJR", network: network);
 
   final builder = BitcoinTransactionBuilder(
 
@@ -272,8 +264,7 @@ void _spendFrom10DifferentTypeToP2pkh() async {
         UtxoWithAddress(
             utxo: BitcoinUtxo(
               /// Transaction hash uniquely identifies the referenced transaction
-              txHash:
-                  "05411dce1a1c9e3f44b54413bdf71e7ab3eff1e2f94818a3568c39814c27b258",
+              txHash: "05411dce1a1c9e3f44b54413bdf71e7ab3eff1e2f94818a3568c39814c27b258",
 
               /// Value represents the amount of the UTXO in satoshis.
               value: BtcUtils.toSatoshi("0.001"),
@@ -291,8 +282,7 @@ void _spendFrom10DifferentTypeToP2pkh() async {
                 address: childKey1PublicKey.toP2pkhAddress())),
         UtxoWithAddress(
             utxo: BitcoinUtxo(
-              txHash:
-                  "05411dce1a1c9e3f44b54413bdf71e7ab3eff1e2f94818a3568c39814c27b258",
+              txHash: "05411dce1a1c9e3f44b54413bdf71e7ab3eff1e2f94818a3568c39814c27b258",
               value: BtcUtils.toSatoshi("0.001"),
               vout: 1,
               scriptType: childKey1PublicKey.toTaprootAddress().type,
@@ -302,8 +292,7 @@ void _spendFrom10DifferentTypeToP2pkh() async {
                 address: childKey1PublicKey.toTaprootAddress())),
         UtxoWithAddress(
             utxo: BitcoinUtxo(
-              txHash:
-                  "05411dce1a1c9e3f44b54413bdf71e7ab3eff1e2f94818a3568c39814c27b258",
+              txHash: "05411dce1a1c9e3f44b54413bdf71e7ab3eff1e2f94818a3568c39814c27b258",
               value: BtcUtils.toSatoshi("0.001"),
               vout: 2,
               scriptType: childKey1PublicKey.toP2wpkhAddress().type,
@@ -313,53 +302,44 @@ void _spendFrom10DifferentTypeToP2pkh() async {
                 address: childKey1PublicKey.toP2wpkhAddress())),
         UtxoWithAddress(
             utxo: BitcoinUtxo(
-              txHash:
-                  "05411dce1a1c9e3f44b54413bdf71e7ab3eff1e2f94818a3568c39814c27b258",
+              txHash: "05411dce1a1c9e3f44b54413bdf71e7ab3eff1e2f94818a3568c39814c27b258",
               value: BtcUtils.toSatoshi("0.001"),
               vout: 3,
               scriptType: examplePublicKey.toP2pkAddress().type,
             ),
             ownerDetails: UtxoAddressDetails(
-                publicKey: examplePublicKey.toHex(),
-                address: examplePublicKey.toP2pkAddress())),
+                publicKey: examplePublicKey.toHex(), address: examplePublicKey.toP2pkAddress())),
         UtxoWithAddress(
             utxo: BitcoinUtxo(
-              txHash:
-                  "05411dce1a1c9e3f44b54413bdf71e7ab3eff1e2f94818a3568c39814c27b258",
+              txHash: "05411dce1a1c9e3f44b54413bdf71e7ab3eff1e2f94818a3568c39814c27b258",
               value: BtcUtils.toSatoshi("0.001"),
               vout: 4,
               scriptType: examplePublicKey.toP2pkInP2sh().type,
             ),
             ownerDetails: UtxoAddressDetails(
-                publicKey: examplePublicKey.toHex(),
-                address: examplePublicKey.toP2pkInP2sh())),
+                publicKey: examplePublicKey.toHex(), address: examplePublicKey.toP2pkInP2sh())),
         UtxoWithAddress(
             utxo: BitcoinUtxo(
-              txHash:
-                  "05411dce1a1c9e3f44b54413bdf71e7ab3eff1e2f94818a3568c39814c27b258",
+              txHash: "05411dce1a1c9e3f44b54413bdf71e7ab3eff1e2f94818a3568c39814c27b258",
               value: BtcUtils.toSatoshi("0.001"),
               vout: 5,
               scriptType: examplePublicKey.toP2pkhInP2sh().type,
             ),
             ownerDetails: UtxoAddressDetails(
-                publicKey: examplePublicKey.toHex(),
-                address: examplePublicKey.toP2pkhInP2sh())),
+                publicKey: examplePublicKey.toHex(), address: examplePublicKey.toP2pkhInP2sh())),
         UtxoWithAddress(
             utxo: BitcoinUtxo(
-              txHash:
-                  "05411dce1a1c9e3f44b54413bdf71e7ab3eff1e2f94818a3568c39814c27b258",
+              txHash: "05411dce1a1c9e3f44b54413bdf71e7ab3eff1e2f94818a3568c39814c27b258",
               value: BtcUtils.toSatoshi("0.001"),
               vout: 6,
               scriptType: examplePublicKey.toP2wpkhInP2sh().type,
               blockHeight: 0,
             ),
             ownerDetails: UtxoAddressDetails(
-                publicKey: examplePublicKey.toHex(),
-                address: examplePublicKey.toP2wpkhInP2sh())),
+                publicKey: examplePublicKey.toHex(), address: examplePublicKey.toP2wpkhInP2sh())),
         UtxoWithAddress(
             utxo: BitcoinUtxo(
-              txHash:
-                  "05411dce1a1c9e3f44b54413bdf71e7ab3eff1e2f94818a3568c39814c27b258",
+              txHash: "05411dce1a1c9e3f44b54413bdf71e7ab3eff1e2f94818a3568c39814c27b258",
               value: BtcUtils.toSatoshi("0.001"),
               vout: 7,
               scriptType: msig.toP2shAddress().type,
@@ -371,28 +351,24 @@ void _spendFrom10DifferentTypeToP2pkh() async {
                 multiSigAddress: msig, address: msig.toP2shAddress())),
         UtxoWithAddress(
             utxo: BitcoinUtxo(
-              txHash:
-                  "05411dce1a1c9e3f44b54413bdf71e7ab3eff1e2f94818a3568c39814c27b258",
+              txHash: "05411dce1a1c9e3f44b54413bdf71e7ab3eff1e2f94818a3568c39814c27b258",
               value: BtcUtils.toSatoshi("0.001"),
               vout: 8,
               scriptType: msig.toP2wshAddress(network: network).type,
               blockHeight: 0,
             ),
             ownerDetails: UtxoAddressDetails.multiSigAddress(
-                multiSigAddress: msig,
-                address: msig.toP2wshAddress(network: network))),
+                multiSigAddress: msig, address: msig.toP2wshAddress(network: network))),
         UtxoWithAddress(
             utxo: BitcoinUtxo(
-              txHash:
-                  "05411dce1a1c9e3f44b54413bdf71e7ab3eff1e2f94818a3568c39814c27b258",
+              txHash: "05411dce1a1c9e3f44b54413bdf71e7ab3eff1e2f94818a3568c39814c27b258",
               value: BtcUtils.toSatoshi("0.0015783"),
               vout: 9,
               scriptType: msig2.toP2wshInP2shAddress(network: network).type,
               blockHeight: 0,
             ),
             ownerDetails: UtxoAddressDetails.multiSigAddress(
-                multiSigAddress: msig2,
-                address: msig2.toP2wshInP2shAddress(network: network))),
+                multiSigAddress: msig2, address: msig2.toP2wshInP2shAddress(network: network))),
       ]);
 
   /// Build the transaction by invoking the buildTransaction method on the BitcoinTransactionBuilder
diff --git a/example/lib/global/old_examples/spending_with_scripts/spending_single_type.dart b/example/lib/global/old_examples/spending_with_scripts/spending_single_type.dart
index 4f16538..12b0f72 100644
--- a/example/lib/global/old_examples/spending_with_scripts/spending_single_type.dart
+++ b/example/lib/global/old_examples/spending_with_scripts/spending_single_type.dart
@@ -1,16 +1,14 @@
 // ignore_for_file: unused_local_variable
 
 import 'package:bitcoin_base/bitcoin_base.dart';
-import 'package:example/services_examples/explorer_service/explorer_service.dart';
 
 import 'spending_builders.dart';
 
 // Define the network as the Testnet (used for testing and development purposes).
 const network = BitcoinNetwork.testnet;
-final service = BitcoinApiService();
 
 // Initialize an API provider for interacting with the Testnet's blockchain data.
-final api = ApiProvider.fromMempool(network, service);
+final api = ApiProvider.fromMempool(network);
 
 // In these tutorials, you will learn how to spend various types of UTXOs.
 // Each method is specific to a type of UTXO.
@@ -28,16 +26,15 @@ Future<void> spendingP2WPKH(ECPrivate sWallet, ECPrivate rWallet) async {
   // P2WPKH
   final sender = publicKey.toP2wpkhAddress();
   // Read UTXOs of accounts from the BlockCypher API.
-  final utxo = await api.getAccountUtxo(
-      UtxoAddressDetails(address: sender, publicKey: publicKey.toHex()));
+  final utxo =
+      await api.getAccountUtxo(UtxoAddressDetails(address: sender, publicKey: publicKey.toHex()));
   // The total amount of UTXOs that we can spend.
   final sumOfUtxo = utxo.sumOfUtxosValue();
   if (sumOfUtxo == BigInt.zero) {
-    throw Exception(
-        "account does not have any unspent transaction or mybe no confirmed");
+    throw Exception("account does not have any unspent transaction or mybe no confirmed");
   }
   // Receive network fees
-  final feeRate = await api.getNetworkFeeRate();
+  final feeRate = await api.getRecommendedFeeRate();
   // feeRate.medium, feeRate.high ,feeRate.low P/KB
 
   // In this section, we select the transaction outputs; the number and type of addresses are not important
@@ -64,8 +61,7 @@ Future<void> spendingP2WPKH(ECPrivate sWallet, ECPrivate rWallet) async {
 
   // Now that we've determined the transaction size, let's calculate the transaction fee
   // based on the transaction size and the desired fee rate.
-  final estimateFee = feeRate.getEstimate(transactionSize,
-      feeRateType: BitcoinFeeRateType.medium);
+  final estimateFee = feeRate.getEstimate(transactionSize, feeRateType: BitcoinFeeRateType.medium);
 
   // We subtract the fee from the total amount of UTXOs to calculate
   // the actual amount we can spend in this transaction.
@@ -74,9 +70,8 @@ Future<void> spendingP2WPKH(ECPrivate sWallet, ECPrivate rWallet) async {
   // We specify the desired amount for each address. Here, I have divided the desired total
   // amount by the number of outputs to ensure an equal amount for each.
   final outPutWithValue = outputsAdress
-      .map((e) => BitcoinOutput(
-          address: e.address,
-          value: canSpend ~/ BigInt.from(outputsAdress.length)))
+      .map((e) =>
+          BitcoinOutput(address: e.address, value: canSpend ~/ BigInt.from(outputsAdress.length)))
       .toList();
 
   // I use the 'buildP2wpkTransaction' method to create a transaction.
@@ -112,15 +107,14 @@ Future<void> spendingP2WSH(ECPrivate sWallet, ECPrivate rWallet) async {
   final addr = sWallet.getPublic();
   // P2WSH ADDRESS
   final sender = addr.toP2wshAddress();
-  final utxo = await api.getAccountUtxo(
-      UtxoAddressDetails(address: sender, publicKey: addr.toHex()));
+  final utxo =
+      await api.getAccountUtxo(UtxoAddressDetails(address: sender, publicKey: addr.toHex()));
   final sumOfUtxo = utxo.sumOfUtxosValue();
   if (sumOfUtxo == BigInt.zero) {
-    throw Exception(
-        "account does not have any unspent transaction or mybe no confirmed");
+    throw Exception("account does not have any unspent transaction or mybe no confirmed");
   }
 
-  final feeRate = await api.getNetworkFeeRate();
+  final feeRate = await api.getRecommendedFeeRate();
   final prive = sWallet;
 
   final recPub = rWallet.getPublic();
@@ -133,13 +127,11 @@ Future<void> spendingP2WSH(ECPrivate sWallet, ECPrivate rWallet) async {
   ];
   final transactionSize = BitcoinTransactionBuilder.estimateTransactionSize(
       utxos: utxo, outputs: outputsAdress, network: network);
-  final estimateFee = feeRate.getEstimate(transactionSize,
-      feeRateType: BitcoinFeeRateType.medium);
+  final estimateFee = feeRate.getEstimate(transactionSize, feeRateType: BitcoinFeeRateType.medium);
   final canSpend = sumOfUtxo - estimateFee;
   final outPutWithValue = outputsAdress
-      .map((e) => BitcoinOutput(
-          address: e.address,
-          value: canSpend ~/ BigInt.from(outputsAdress.length)))
+      .map((e) =>
+          BitcoinOutput(address: e.address, value: canSpend ~/ BigInt.from(outputsAdress.length)))
       .toList();
   final transaction = buildP2WSHTransaction(
     receiver: outPutWithValue,
@@ -161,15 +153,14 @@ Future<void> spendingP2PKH(ECPrivate sWallet, ECPrivate rWallet) async {
   final addr = sWallet.getPublic();
   // P2PKH
   final sender = addr.toP2pkhAddress();
-  final utxo = await api.getAccountUtxo(
-      UtxoAddressDetails(address: sender, publicKey: addr.toHex()));
+  final utxo =
+      await api.getAccountUtxo(UtxoAddressDetails(address: sender, publicKey: addr.toHex()));
   final sumOfUtxo = utxo.sumOfUtxosValue();
   if (sumOfUtxo == BigInt.zero) {
-    throw Exception(
-        "account does not have any unspent transaction or mybe no confirmed");
+    throw Exception("account does not have any unspent transaction or mybe no confirmed");
   }
 
-  final feeRate = await api.getNetworkFeeRate();
+  final feeRate = await api.getRecommendedFeeRate();
   final prive = sWallet;
 
   final recPub = rWallet.getPublic();
@@ -181,13 +172,11 @@ Future<void> spendingP2PKH(ECPrivate sWallet, ECPrivate rWallet) async {
   ];
   final transactionSize = BitcoinTransactionBuilder.estimateTransactionSize(
       utxos: utxo, outputs: outputsAdress, network: network);
-  final estimateFee = feeRate.getEstimate(transactionSize,
-      feeRateType: BitcoinFeeRateType.medium);
+  final estimateFee = feeRate.getEstimate(transactionSize, feeRateType: BitcoinFeeRateType.medium);
   final canSpend = sumOfUtxo - estimateFee;
   final outPutWithValue = outputsAdress
-      .map((e) => BitcoinOutput(
-          address: e.address,
-          value: canSpend ~/ BigInt.from(outputsAdress.length)))
+      .map((e) =>
+          BitcoinOutput(address: e.address, value: canSpend ~/ BigInt.from(outputsAdress.length)))
       .toList();
 
   final transaction = buildP2pkhTransaction(
@@ -205,23 +194,21 @@ Future<void> spendingP2PKH(ECPrivate sWallet, ECPrivate rWallet) async {
 // Spend P2SH(P2PKH) or P2SH(P2PK): Please note that all input addresses must be of P2SH(P2PKH) or P2SH(P2PK) type; otherwise, the transaction will fail.
 // This method is for standard 1-1 Multisig P2SH.
 // For standard n-of-m multi-signature scripts, please refer to the 'multi_sig_transactions.dart' tutorial.
-Future<void> spendingP2SHNoneSegwit(
-    ECPrivate sWallet, ECPrivate rWallet) async {
+Future<void> spendingP2SHNoneSegwit(ECPrivate sWallet, ECPrivate rWallet) async {
   // All the steps are the same as in the first tutorial;
   // the only difference is the transaction input type,
   // and we use method `buildP2shNoneSegwitTransaction` to create the transaction.
   final addr = sWallet.getPublic();
   // P2SH(P2PK)
   final sender = addr.toP2pkInP2sh();
-  final utxo = await api.getAccountUtxo(
-      UtxoAddressDetails(address: sender, publicKey: addr.toHex()));
+  final utxo =
+      await api.getAccountUtxo(UtxoAddressDetails(address: sender, publicKey: addr.toHex()));
   final sumOfUtxo = utxo.sumOfUtxosValue();
   if (sumOfUtxo == BigInt.zero) {
-    throw Exception(
-        "account does not have any unspent transaction or mybe no confirmed");
+    throw Exception("account does not have any unspent transaction or mybe no confirmed");
   }
 
-  final feeRate = await api.getNetworkFeeRate();
+  final feeRate = await api.getRecommendedFeeRate();
   final prive = sWallet;
 
   final recPub = rWallet.getPublic();
@@ -233,13 +220,11 @@ Future<void> spendingP2SHNoneSegwit(
   ];
   final transactionSize = BitcoinTransactionBuilder.estimateTransactionSize(
       utxos: utxo, outputs: outputsAdress, network: network);
-  final estimateFee = feeRate.getEstimate(transactionSize,
-      feeRateType: BitcoinFeeRateType.medium);
+  final estimateFee = feeRate.getEstimate(transactionSize, feeRateType: BitcoinFeeRateType.medium);
   final canSpend = sumOfUtxo - estimateFee;
   final outPutWithValue = outputsAdress
-      .map((e) => BitcoinOutput(
-          address: e.address,
-          value: canSpend ~/ BigInt.from(outputsAdress.length)))
+      .map((e) =>
+          BitcoinOutput(address: e.address, value: canSpend ~/ BigInt.from(outputsAdress.length)))
       .toList();
   final transaction = buildP2shNoneSegwitTransaction(
     receiver: outPutWithValue,
@@ -263,15 +248,14 @@ Future<void> spendingP2shSegwit(ECPrivate sWallet, ECPrivate rWallet) async {
   final addr = sWallet.getPublic();
   // P2SH(P2PWKH)
   final sender = addr.toP2wpkhInP2sh();
-  final utxo = await api.getAccountUtxo(
-      UtxoAddressDetails(address: sender, publicKey: addr.toHex()));
+  final utxo =
+      await api.getAccountUtxo(UtxoAddressDetails(address: sender, publicKey: addr.toHex()));
   final sumOfUtxo = utxo.sumOfUtxosValue();
   if (sumOfUtxo == BigInt.zero) {
-    throw Exception(
-        "account does not have any unspent transaction or mybe no confirmed");
+    throw Exception("account does not have any unspent transaction or mybe no confirmed");
   }
 
-  final feeRate = await api.getNetworkFeeRate();
+  final feeRate = await api.getRecommendedFeeRate();
   final prive = sWallet;
 
   final recPub = rWallet.getPublic();
@@ -284,13 +268,11 @@ Future<void> spendingP2shSegwit(ECPrivate sWallet, ECPrivate rWallet) async {
   ];
   final transactionSize = BitcoinTransactionBuilder.estimateTransactionSize(
       utxos: utxo, outputs: outputsAdress, network: network);
-  final estimateFee = feeRate.getEstimate(transactionSize,
-      feeRateType: BitcoinFeeRateType.medium);
+  final estimateFee = feeRate.getEstimate(transactionSize, feeRateType: BitcoinFeeRateType.medium);
   final canSpend = sumOfUtxo - estimateFee;
   final outPutWithValue = outputsAdress
-      .map((e) => BitcoinOutput(
-          address: e.address,
-          value: canSpend ~/ BigInt.from(outputsAdress.length)))
+      .map((e) =>
+          BitcoinOutput(address: e.address, value: canSpend ~/ BigInt.from(outputsAdress.length)))
       .toList();
 
   // return;
@@ -315,15 +297,14 @@ Future<void> spendingP2TR(ECPrivate sWallet, ECPrivate rWallet) async {
   final addr = sWallet.getPublic();
   // P2TR address
   final sender = addr.toTaprootAddress();
-  final utxo = await api.getAccountUtxo(
-      UtxoAddressDetails(address: sender, publicKey: addr.toHex()));
+  final utxo =
+      await api.getAccountUtxo(UtxoAddressDetails(address: sender, publicKey: addr.toHex()));
   final sumOfUtxo = utxo.sumOfUtxosValue();
   if (sumOfUtxo == BigInt.zero) {
-    throw Exception(
-        "account does not have any unspent transaction or mybe no confirmed");
+    throw Exception("account does not have any unspent transaction or mybe no confirmed");
   }
 
-  final feeRate = await api.getNetworkFeeRate();
+  final feeRate = await api.getRecommendedFeeRate();
   final prive = sWallet;
 
   final recPub = rWallet.getPublic();
@@ -335,13 +316,11 @@ Future<void> spendingP2TR(ECPrivate sWallet, ECPrivate rWallet) async {
   ];
   final transactionSize = BitcoinTransactionBuilder.estimateTransactionSize(
       utxos: utxo, outputs: outputsAdress, network: network);
-  final estimateFee = feeRate.getEstimate(transactionSize,
-      feeRateType: BitcoinFeeRateType.medium);
+  final estimateFee = feeRate.getEstimate(transactionSize, feeRateType: BitcoinFeeRateType.medium);
   final canSpend = sumOfUtxo - estimateFee;
   final outPutWithValue = outputsAdress
-      .map((e) => BitcoinOutput(
-          address: e.address,
-          value: canSpend ~/ BigInt.from(outputsAdress.length)))
+      .map((e) =>
+          BitcoinOutput(address: e.address, value: canSpend ~/ BigInt.from(outputsAdress.length)))
       .toList();
 
   final transaction = buildP2trTransaction(
diff --git a/example/lib/global/old_examples/spending_with_transaction_builder/multi_sig_transactions.dart b/example/lib/global/old_examples/spending_with_transaction_builder/multi_sig_transactions.dart
index 794deb6..98d0e9c 100644
--- a/example/lib/global/old_examples/spending_with_transaction_builder/multi_sig_transactions.dart
+++ b/example/lib/global/old_examples/spending_with_transaction_builder/multi_sig_transactions.dart
@@ -4,7 +4,6 @@
 import 'package:bitcoin_base/bitcoin_base.dart';
 
 import 'package:blockchain_utils/blockchain_utils.dart';
-import 'package:example/services_examples/explorer_service/explorer_service.dart';
 
 void main() async {
   final service = BitcoinApiService();
@@ -13,7 +12,7 @@ void main() async {
 
   // select api for read accounts UTXOs and send transaction
   // Mempool or BlockCypher
-  final api = ApiProvider.fromMempool(network, service);
+  final api = ApiProvider.fromMempool(network);
 
   final mnemonic = Bip39SeedGenerator(Mnemonic.fromString(
           "spy often critic spawn produce volcano depart fire theory fog turn retire"))
@@ -59,18 +58,14 @@ void main() async {
   // P2WSH Multisig 4-6
   // tb1qxt3c7849m0m6cv3z3s35c3zvdna3my3yz0r609qd9g0dcyyk580sgyldhe
 
-  final p2wshMultiSigAddress =
-      multiSignatureAddress.toP2wshAddress(network: network).toP2pkhAddress(network);
+  final p2wshMultiSigAddress = multiSignatureAddress.toP2wshAddress(network: network);
 
   // p2sh(p2wsh) multisig
-  final signerP2sh1 =
-      MultiSignatureSigner(publicKey: public5.toHex(), weight: 1);
+  final signerP2sh1 = MultiSignatureSigner(publicKey: public5.toHex(), weight: 1);
 
-  final signerP2sh2 =
-      MultiSignatureSigner(publicKey: public6.toHex(), weight: 1);
+  final signerP2sh2 = MultiSignatureSigner(publicKey: public6.toHex(), weight: 1);
 
-  final signerP2sh3 =
-      MultiSignatureSigner(publicKey: public1.toHex(), weight: 1);
+  final signerP2sh3 = MultiSignatureSigner(publicKey: public1.toHex(), weight: 1);
 
   final MultiSignatureAddress p2shMultiSignature = MultiSignatureAddress(
     threshold: 2,
@@ -78,9 +73,7 @@ void main() async {
   );
   // P2SH(P2WSH) miltisig 2-3
   // 2N8co8bth9CNKtnWGfHW6HuUNgnNPNdpsMj
-  final p2shMultisigAddress = p2shMultiSignature
-      .toP2wshInP2shAddress(network: network)
-      .toP2pkhAddress(network);
+  final p2shMultisigAddress = p2shMultiSignature.toP2wshInP2shAddress(network: network);
 
   // P2TR
   final exampleAddr2 = public2.toTaprootAddress();
@@ -149,11 +142,9 @@ void main() async {
       utxos: utxos,
       outputs: [
         BitcoinOutput(
-            address: p2shMultiSignature.toP2wshInP2shAddress(network: network),
-            value: BigInt.zero),
+            address: p2shMultiSignature.toP2wshInP2shAddress(network: network), value: BigInt.zero),
         BitcoinOutput(
-            address: multiSignatureAddress.toP2wshAddress(network: network),
-            value: BigInt.zero),
+            address: multiSignatureAddress.toP2wshAddress(network: network), value: BigInt.zero),
         BitcoinOutput(address: exampleAddr2, value: BigInt.zero),
         BitcoinOutput(address: exampleAddr4, value: BigInt.zero)
       ],
@@ -168,7 +159,7 @@ void main() async {
   // That's my perspective, of course.
   final blockCypher = ApiProvider.fromBlocCypher(network, service);
 
-  final feeRate = await blockCypher.getNetworkFeeRate();
+  final feeRate = await blockCypher.getRecommendedFeeRate();
   // fee rate inKB
   // feeRate.medium: 32279 P/KB
   // feeRate.high: 43009  P/KB
@@ -190,12 +181,9 @@ void main() async {
       address: p2shMultiSignature.toP2wshInP2shAddress(network: network),
       value: BigInt.from(365449));
   final output2 = BitcoinOutput(
-      address: multiSignatureAddress.toP2wshAddress(network: network),
-      value: BigInt.from(365449));
-  final output3 =
-      BitcoinOutput(address: exampleAddr2, value: BigInt.from(365448));
-  final output4 =
-      BitcoinOutput(address: exampleAddr4, value: BigInt.from(365448));
+      address: multiSignatureAddress.toP2wshAddress(network: network), value: BigInt.from(365449));
+  final output3 = BitcoinOutput(address: exampleAddr2, value: BigInt.from(365448));
+  final output4 = BitcoinOutput(address: exampleAddr4, value: BigInt.from(365448));
 
   // Well, now it is clear to whom we are going to pay the amount
   // Now let's create the transaction
@@ -233,8 +221,7 @@ void main() async {
   // I've added a method for signing the transaction as a parameter.
   // This method sends you the public key for each UTXO,
   // allowing you to sign the desired input with the associated private key
-  final transaction =
-      transactionBuilder.buildTransaction((trDigest, utxo, publicKey, sighash) {
+  final transaction = transactionBuilder.buildTransaction((trDigest, utxo, publicKey, sighash) {
     late ECPrivate key;
 
     // ok we have the public key of the current UTXO and we use some conditions to find private  key and sign transaction
diff --git a/example/lib/global/old_examples/spending_with_transaction_builder/transaction_builder_example.dart b/example/lib/global/old_examples/spending_with_transaction_builder/transaction_builder_example.dart
index 851259f..701f72b 100644
--- a/example/lib/global/old_examples/spending_with_transaction_builder/transaction_builder_example.dart
+++ b/example/lib/global/old_examples/spending_with_transaction_builder/transaction_builder_example.dart
@@ -1,6 +1,5 @@
 import 'package:bitcoin_base/bitcoin_base.dart';
 import 'package:blockchain_utils/blockchain_utils.dart';
-import 'package:example/services_examples/explorer_service/explorer_service.dart';
 
 // spend from 8 different address type to 10 different output
 void main() async {
@@ -116,26 +115,16 @@ void main() async {
   // now we have 1,174,140 satoshi for spending let do it
   // we create 10 different output with  different address type like (pt2r, p2sh(p2wpkh), p2sh(p2wsh), p2pkh, etc.)
   // We consider the spendable amount for 10 outputs and divide by 10, each output 117,414
-  final output1 =
-      BitcoinOutput(address: exampleAddr4, value: BigInt.from(117414));
-  final output2 =
-      BitcoinOutput(address: exampleAddr9, value: BigInt.from(117414));
-  final output3 =
-      BitcoinOutput(address: exampleAddr10, value: BigInt.from(117414));
-  final output4 =
-      BitcoinOutput(address: exampleAddr1, value: BigInt.from(117414));
-  final output5 =
-      BitcoinOutput(address: exampleAddr3, value: BigInt.from(117414));
-  final output6 =
-      BitcoinOutput(address: exampleAddr2, value: BigInt.from(117414));
-  final output7 =
-      BitcoinOutput(address: exampleAddr7, value: BigInt.from(117414));
-  final output8 =
-      BitcoinOutput(address: exampleAddr8, value: BigInt.from(117414));
-  final output9 =
-      BitcoinOutput(address: exampleAddr5, value: BigInt.from(117414));
-  final output10 =
-      BitcoinOutput(address: exampleAddr6, value: BigInt.from(117414));
+  final output1 = BitcoinOutput(address: exampleAddr4, value: BigInt.from(117414));
+  final output2 = BitcoinOutput(address: exampleAddr9, value: BigInt.from(117414));
+  final output3 = BitcoinOutput(address: exampleAddr10, value: BigInt.from(117414));
+  final output4 = BitcoinOutput(address: exampleAddr1, value: BigInt.from(117414));
+  final output5 = BitcoinOutput(address: exampleAddr3, value: BigInt.from(117414));
+  final output6 = BitcoinOutput(address: exampleAddr2, value: BigInt.from(117414));
+  final output7 = BitcoinOutput(address: exampleAddr7, value: BigInt.from(117414));
+  final output8 = BitcoinOutput(address: exampleAddr8, value: BigInt.from(117414));
+  final output9 = BitcoinOutput(address: exampleAddr5, value: BigInt.from(117414));
+  final output10 = BitcoinOutput(address: exampleAddr6, value: BigInt.from(117414));
 
   // Well, now it is clear to whom we are going to pay the amount
   // Now let's create the transaction
@@ -183,8 +172,7 @@ void main() async {
   // parameters
   // utxo  infos with owner details
   // trDigest transaction digest of current UTXO (must be sign with correct privateKey)
-  final transaction =
-      transactionBuilder.buildTransaction((trDigest, utxo, publicKey, sighash) {
+  final transaction = transactionBuilder.buildTransaction((trDigest, utxo, publicKey, sighash) {
     late ECPrivate key;
 
     // ok we have the public key of the current UTXO and we use some conditions to find private  key and sign transaction
diff --git a/example/lib/services_examples/electrum/electrum_ssl_service.dart b/example/lib/services_examples/electrum/electrum_ssl_service.dart
index 362c306..1313aa7 100644
--- a/example/lib/services_examples/electrum/electrum_ssl_service.dart
+++ b/example/lib/services_examples/electrum/electrum_ssl_service.dart
@@ -1,41 +1,49 @@
-/// Simple example how to send request to electurm  with secure socket
+/// Simple example how to send request to electurm  with tcp
 
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 import 'package:bitcoin_base/bitcoin_base.dart';
-import 'package:example/services_examples/electrum/request_completer.dart';
+import 'package:rxdart/rxdart.dart';
 
-class ElectrumSSLService with BitcoinBaseElectrumRPCService {
-  ElectrumSSLService._(
+class SocketTask {
+  SocketTask({required this.isSubscription, this.completer, this.subject});
+
+  final Completer<dynamic>? completer;
+  final BehaviorSubject<dynamic>? subject;
+  final bool isSubscription;
+}
+
+class ElectrumTCPService implements BitcoinBaseElectrumRPCService {
+  ElectrumTCPService._(
     this.url,
     SecureSocket channel, {
     this.defaultRequestTimeOut = const Duration(seconds: 30),
   }) : _socket = channel {
-    _subscription =
-        _socket!.listen(_onMessge, onError: _onClose, onDone: _onDone);
+    _subscription = _socket!.listen(_onMessage, onError: _onClose, onDone: _onDone);
   }
   SecureSocket? _socket;
   StreamSubscription<List<int>>? _subscription;
   final Duration defaultRequestTimeOut;
 
-  Map<int, AsyncRequestCompleter> requests = {};
-  bool _isDiscounnect = false;
+  final Map<int, SocketTask> _tasks = {};
 
-  bool get isConnected => _isDiscounnect;
+  bool _isDisconnected = false;
+  @override
+  bool get isConnected => !_isDisconnected;
 
   @override
   final String url;
 
   void add(List<int> params) {
-    if (_isDiscounnect) {
-      throw StateError("socket has been discounected");
+    if (_isDisconnected) {
+      throw StateError("socket has been disconnected");
     }
     _socket?.add(params);
   }
 
   void _onClose(Object? error) {
-    _isDiscounnect = true;
+    _isDisconnected = true;
 
     _socket = null;
     _subscription?.cancel().catchError((e) {});
@@ -46,50 +54,83 @@ class ElectrumSSLService with BitcoinBaseElectrumRPCService {
     _onClose(null);
   }
 
-  void discounnect() {
+  @override
+  void disconnect() {
     _onClose(null);
   }
 
-  static Future<ElectrumSSLService> connect(
+  static Future<ElectrumTCPService> connect(
     String url, {
     Iterable<String>? protocols,
     Duration defaultRequestTimeOut = const Duration(seconds: 30),
     final Duration connectionTimeOut = const Duration(seconds: 30),
   }) async {
     final parts = url.split(":");
-    final channel = await SecureSocket.connect(
-      parts[0],
-      int.parse(parts[1]),
-      onBadCertificate: (certificate) => true,
-    ).timeout(connectionTimeOut);
-
-    return ElectrumSSLService._(url, channel,
-        defaultRequestTimeOut: defaultRequestTimeOut);
+    final channel =
+        await SecureSocket.connect(parts[0], int.parse(parts[1])).timeout(connectionTimeOut);
+
+    return ElectrumTCPService._(url, channel, defaultRequestTimeOut: defaultRequestTimeOut);
   }
 
-  void _onMessge(List<int> event) {
+  void _onMessage(List<int> event) {
     final Map<String, dynamic> decode = json.decode(utf8.decode(event));
     if (decode.containsKey("id")) {
+      _finish(decode["id"]!.toString(), decode);
       final int id = int.parse(decode["id"]!.toString());
-      final request = requests.remove(id);
-      request?.completer.complete(decode);
+      final request = _tasks.remove(id);
+      request?.completer?.complete(decode);
     }
   }
 
+  void _finish(String id, Map<String, dynamic> decode) {
+    final int id = int.parse(decode["id"]!.toString());
+    if (_tasks[id] == null) {
+      return;
+    }
+
+    if (!(_tasks[id]?.completer?.isCompleted ?? false)) {
+      _tasks[id]?.completer!.complete(decode);
+    }
+
+    final isSubscription = _tasks[id]?.isSubscription ?? false;
+    if (!isSubscription) {
+      _tasks.remove(id);
+    } else {
+      _tasks[id]?.subject?.add(decode);
+    }
+  }
+
+  void _registerSubscription(int id, BehaviorSubject<dynamic> subject) =>
+      _tasks[id] = SocketTask(subject: subject, isSubscription: true);
+
+  @override
+  AsyncBehaviorSubject<T>? subscribe<T>(ElectrumRequestDetails params) {
+    final subscription = AsyncBehaviorSubject<T>(params.params);
+
+    try {
+      _registerSubscription(params.id, subscription.subscription);
+      add(params.toTCPParams());
+
+      return subscription;
+    } catch (e) {
+      return null;
+    }
+  }
+
+  void _registerTask(int id, Completer<dynamic> completer) =>
+      _tasks[id] = SocketTask(completer: completer, isSubscription: false);
+
   @override
-  Future<Map<String, dynamic>> call(ElectrumRequestDetails params,
-      [Duration? timeout]) async {
-    final AsyncRequestCompleter compeleter =
-        AsyncRequestCompleter(params.params);
+  Future<Map<String, dynamic>> call(ElectrumRequestDetails params, [Duration? timeout]) async {
+    final completer = AsyncRequestCompleter(params.params);
 
     try {
-      requests[params.id] = compeleter;
+      _registerTask(params.id, completer.completer);
       add(params.toTCPParams());
-      final result = await compeleter.completer.future
-          .timeout(timeout ?? defaultRequestTimeOut);
+      final result = await completer.completer.future.timeout(timeout ?? defaultRequestTimeOut);
       return result;
     } finally {
-      requests.remove(params.id);
+      _tasks.remove(params.id);
     }
   }
 }
diff --git a/example/lib/services_examples/electrum/electrum_tcp_service.dart b/example/lib/services_examples/electrum/electrum_tcp_service.dart
index 750aad0..efc2506 100644
--- a/example/lib/services_examples/electrum/electrum_tcp_service.dart
+++ b/example/lib/services_examples/electrum/electrum_tcp_service.dart
@@ -4,38 +4,46 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 import 'package:bitcoin_base/bitcoin_base.dart';
-import 'package:example/services_examples/electrum/request_completer.dart';
+import 'package:rxdart/rxdart.dart';
 
-class ElectrumTCPService with BitcoinBaseElectrumRPCService {
+class SocketTask {
+  SocketTask({required this.isSubscription, this.completer, this.subject});
+
+  final Completer<dynamic>? completer;
+  final BehaviorSubject<dynamic>? subject;
+  final bool isSubscription;
+}
+
+class ElectrumTCPService implements BitcoinBaseElectrumRPCService {
   ElectrumTCPService._(
     this.url,
     Socket channel, {
     this.defaultRequestTimeOut = const Duration(seconds: 30),
   }) : _socket = channel {
-    _subscription =
-        _socket!.listen(_onMessge, onError: _onClose, onDone: _onDone);
+    _subscription = _socket!.listen(_onMessage, onError: _onClose, onDone: _onDone);
   }
   Socket? _socket;
   StreamSubscription<List<int>>? _subscription;
   final Duration defaultRequestTimeOut;
 
-  Map<int, AsyncRequestCompleter> requests = {};
-  bool _isDiscounnect = false;
+  final Map<int, SocketTask> _tasks = {};
 
-  bool get isConnected => _isDiscounnect;
+  bool _isDisconnected = false;
+  @override
+  bool get isConnected => !_isDisconnected;
 
   @override
   final String url;
 
   void add(List<int> params) {
-    if (_isDiscounnect) {
-      throw StateError("socket has been discounected");
+    if (_isDisconnected) {
+      throw StateError("socket has been disconnected");
     }
     _socket?.add(params);
   }
 
   void _onClose(Object? error) {
-    _isDiscounnect = true;
+    _isDisconnected = true;
 
     _socket = null;
     _subscription?.cancel().catchError((e) {});
@@ -46,7 +54,8 @@ class ElectrumTCPService with BitcoinBaseElectrumRPCService {
     _onClose(null);
   }
 
-  void discounnect() {
+  @override
+  void disconnect() {
     _onClose(null);
   }
 
@@ -57,36 +66,70 @@ class ElectrumTCPService with BitcoinBaseElectrumRPCService {
     final Duration connectionTimeOut = const Duration(seconds: 30),
   }) async {
     final parts = url.split(":");
-    final channel = await Socket.connect(parts[0], int.parse(parts[1]))
-        .timeout(connectionTimeOut);
+    final channel = await Socket.connect(parts[0], int.parse(parts[1])).timeout(connectionTimeOut);
 
-    return ElectrumTCPService._(url, channel,
-        defaultRequestTimeOut: defaultRequestTimeOut);
+    return ElectrumTCPService._(url, channel, defaultRequestTimeOut: defaultRequestTimeOut);
   }
 
-  void _onMessge(List<int> event) {
+  void _onMessage(List<int> event) {
     final Map<String, dynamic> decode = json.decode(utf8.decode(event));
     if (decode.containsKey("id")) {
+      _finish(decode["id"]!.toString(), decode);
       final int id = int.parse(decode["id"]!.toString());
-      final request = requests.remove(id);
-      request?.completer.complete(decode);
+      final request = _tasks.remove(id);
+      request?.completer?.complete(decode);
     }
   }
 
+  void _finish(String id, Map<String, dynamic> decode) {
+    final int id = int.parse(decode["id"]!.toString());
+    if (_tasks[id] == null) {
+      return;
+    }
+
+    if (!(_tasks[id]?.completer?.isCompleted ?? false)) {
+      _tasks[id]?.completer!.complete(decode);
+    }
+
+    final isSubscription = _tasks[id]?.isSubscription ?? false;
+    if (!isSubscription) {
+      _tasks.remove(id);
+    } else {
+      _tasks[id]?.subject?.add(decode);
+    }
+  }
+
+  void _registerSubscription(int id, BehaviorSubject<dynamic> subject) =>
+      _tasks[id] = SocketTask(subject: subject, isSubscription: true);
+
+  @override
+  AsyncBehaviorSubject<T>? subscribe<T>(ElectrumRequestDetails params) {
+    final subscription = AsyncBehaviorSubject<T>(params.params);
+
+    try {
+      _registerSubscription(params.id, subscription.subscription);
+      add(params.toTCPParams());
+
+      return subscription;
+    } catch (e) {
+      return null;
+    }
+  }
+
+  void _registerTask(int id, Completer<dynamic> completer) =>
+      _tasks[id] = SocketTask(completer: completer, isSubscription: false);
+
   @override
-  Future<Map<String, dynamic>> call(ElectrumRequestDetails params,
-      [Duration? timeout]) async {
-    final AsyncRequestCompleter compeleter =
-        AsyncRequestCompleter(params.params);
+  Future<Map<String, dynamic>> call(ElectrumRequestDetails params, [Duration? timeout]) async {
+    final completer = AsyncRequestCompleter(params.params);
 
     try {
-      requests[params.id] = compeleter;
-      add(params.toWebSocketParams());
-      final result = await compeleter.completer.future
-          .timeout(timeout ?? defaultRequestTimeOut);
+      _registerTask(params.id, completer.completer);
+      add(params.toTCPParams());
+      final result = await completer.completer.future.timeout(timeout ?? defaultRequestTimeOut);
       return result;
     } finally {
-      requests.remove(params.id);
+      _tasks.remove(params.id);
     }
   }
 }
diff --git a/example/lib/services_examples/electrum/electrum_websocket_service.dart b/example/lib/services_examples/electrum/electrum_websocket_service.dart
index 6ca10a2..2ec9bb7 100644
--- a/example/lib/services_examples/electrum/electrum_websocket_service.dart
+++ b/example/lib/services_examples/electrum/electrum_websocket_service.dart
@@ -3,40 +3,39 @@ import 'dart:async';
 import 'dart:convert';
 import 'package:bitcoin_base/bitcoin_base.dart';
 import 'package:example/services_examples/cross_platform_websocket/core.dart';
-import 'package:example/services_examples/electrum/request_completer.dart';
 
-class ElectrumWebSocketService with BitcoinBaseElectrumRPCService {
+class ElectrumWebSocketService implements BitcoinBaseElectrumRPCService {
   ElectrumWebSocketService._(
     this.url,
     WebSocketCore channel, {
     this.defaultRequestTimeOut = const Duration(seconds: 30),
   }) : _socket = channel {
-    _subscription = channel.stream
-        .cast<String>()
-        .listen(_onMessge, onError: _onClose, onDone: _onDone);
+    _subscription =
+        channel.stream.cast<String>().listen(_onMessage, onError: _onClose, onDone: _onDone);
   }
   WebSocketCore? _socket;
   StreamSubscription<String>? _subscription;
   final Duration defaultRequestTimeOut;
 
   Map<int, AsyncRequestCompleter> requests = {};
-  bool _isDiscounnect = false;
+  bool _isDisconnected = false;
 
-  bool get isConnected => _isDiscounnect;
+  bool get isConnected => !_isDisconnected;
 
   @override
   final String url;
 
   void add(List<int> params) {
-    if (_isDiscounnect) {
-      throw StateError("socket has been discounected");
+    if (_isDisconnected) {
+      throw StateError("socket has been disconnected");
     }
     _socket?.sink(params);
   }
 
   void _onClose(Object? error) {
-    _isDiscounnect = true;
+    _isDisconnected = true;
 
+    _socket?.close();
     _socket = null;
     _subscription?.cancel().catchError((e) {});
     _subscription = null;
@@ -46,7 +45,8 @@ class ElectrumWebSocketService with BitcoinBaseElectrumRPCService {
     _onClose(null);
   }
 
-  void discounnect() {
+  @override
+  void disconnect() {
     _onClose(null);
   }
 
@@ -56,14 +56,12 @@ class ElectrumWebSocketService with BitcoinBaseElectrumRPCService {
     Duration defaultRequestTimeOut = const Duration(seconds: 30),
     final Duration connectionTimeOut = const Duration(seconds: 30),
   }) async {
-    final channel =
-        await WebSocketCore.connect(url, protocols: protocols?.toList());
+    final channel = await WebSocketCore.connect(url, protocols: protocols?.toList());
 
-    return ElectrumWebSocketService._(url, channel,
-        defaultRequestTimeOut: defaultRequestTimeOut);
+    return ElectrumWebSocketService._(url, channel, defaultRequestTimeOut: defaultRequestTimeOut);
   }
 
-  void _onMessge(String event) {
+  void _onMessage(String event) {
     final Map<String, dynamic> decode = json.decode(event);
     if (decode.containsKey("id")) {
       final int id = int.parse(decode["id"]!.toString());
@@ -73,16 +71,13 @@ class ElectrumWebSocketService with BitcoinBaseElectrumRPCService {
   }
 
   @override
-  Future<Map<String, dynamic>> call(ElectrumRequestDetails params,
-      [Duration? timeout]) async {
-    final AsyncRequestCompleter compeleter =
-        AsyncRequestCompleter(params.params);
+  Future<Map<String, dynamic>> call(ElectrumRequestDetails params, [Duration? timeout]) async {
+    final AsyncRequestCompleter compeleter = AsyncRequestCompleter(params.params);
 
     try {
       requests[params.id] = compeleter;
       add(params.toWebSocketParams());
-      final result = await compeleter.completer.future
-          .timeout(timeout ?? defaultRequestTimeOut);
+      final result = await compeleter.completer.future.timeout(timeout ?? defaultRequestTimeOut);
       return result;
     } finally {
       requests.remove(params.id);
diff --git a/example/lib/services_examples/electrum/request_completer.dart b/example/lib/services_examples/electrum/request_completer.dart
deleted file mode 100644
index e6f00dc..0000000
--- a/example/lib/services_examples/electrum/request_completer.dart
+++ /dev/null
@@ -1,7 +0,0 @@
-import 'dart:async';
-
-class AsyncRequestCompleter {
-  AsyncRequestCompleter(this.params);
-  final Completer<Map<String, dynamic>> completer = Completer();
-  final Map<String, dynamic> params;
-}
diff --git a/example/pubspec.lock b/example/pubspec.lock
index 318e7a4..0aa5320 100644
--- a/example/pubspec.lock
+++ b/example/pubspec.lock
@@ -9,6 +9,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.11.0"
+  bip32:
+    dependency: transitive
+    description:
+      name: bip32
+      sha256: "54787cd7a111e9d37394aabbf53d1fc5e2e0e0af2cd01c459147a97c0e3f8a97"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.0"
   bitcoin_base:
     dependency: "direct main"
     description:
@@ -19,11 +27,9 @@ packages:
   blockchain_utils:
     dependency: "direct main"
     description:
-      path: "."
-      ref: cake-update-v2
-      resolved-ref: "2767a54ed2b0a23494e4e96a3fe5b5022b834b70"
-      url: "https://github.com/cake-tech/blockchain_utils"
-    source: git
+      path: "/home/rafael/Working/blockchain_utils/"
+      relative: false
+    source: path
     version: "3.3.0"
   boolean_selector:
     dependency: transitive
@@ -33,6 +39,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.1"
+  bs58check:
+    dependency: transitive
+    description:
+      name: bs58check
+      sha256: c4a164d42b25c2f6bc88a8beccb9fc7d01440f3c60ba23663a20a70faf484ea9
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.2"
   characters:
     dependency: transitive
     description:
@@ -57,6 +71,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.18.0"
+  convert:
+    dependency: transitive
+    description:
+      name: convert
+      sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.1"
+  crypto:
+    dependency: transitive
+    description:
+      name: crypto
+      sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.3"
   cupertino_icons:
     dependency: "direct main"
     description:
@@ -91,14 +121,22 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  hex:
+    dependency: transitive
+    description:
+      name: hex
+      sha256: "4e7cd54e4b59ba026432a6be2dd9d96e4c5205725194997193bf871703b82c4a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.0"
   http:
     dependency: "direct main"
     description:
       name: http
-      sha256: "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938"
+      sha256: a2bbf9d017fcced29139daa8ed2bba4ece450ab222871df93ca9eec6f80c34ba
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.1"
+    version: "1.2.0"
   http_parser:
     dependency: transitive
     description:
@@ -107,6 +145,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.0.2"
+  intl:
+    dependency: transitive
+    description:
+      name: intl
+      sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.18.1"
+  js:
+    dependency: transitive
+    description:
+      name: js
+      sha256: c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.7.1"
   leak_tracker:
     dependency: transitive
     description:
@@ -171,6 +225,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.9.0"
+  pointycastle:
+    dependency: transitive
+    description:
+      name: pointycastle
+      sha256: "4be0097fcf3fd3e8449e53730c631200ebc7b88016acecab2b0da2f0149222fe"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.9.1"
+  rxdart:
+    dependency: transitive
+    description:
+      name: rxdart
+      sha256: "5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.28.0"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -252,9 +322,9 @@ packages:
     dependency: transitive
     description:
       name: web
-      sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27"
+      sha256: "4188706108906f002b3a293509234588823c8c979dc83304e229ff400c996b05"
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.1"
+    version: "0.4.2"
 sdks:
-  dart: ">=3.3.0 <4.0.0"
+  dart: ">=3.2.0 <4.0.0"
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
index 25d16d4..11a339d 100644
--- a/example/pubspec.yaml
+++ b/example/pubspec.yaml
@@ -38,9 +38,7 @@ dependencies:
   bitcoin_base: 
     path: ../
   blockchain_utils:
-    git:
-      url: https://github.com/cake-tech/blockchain_utils
-      ref: cake-update-v2
+    path: /home/rafael/Working/blockchain_utils/
   http: ^1.2.0
 
 dev_dependencies:
diff --git a/lib/bitcoin_base.dart b/lib/bitcoin_base.dart
index cb559d7..a2c93a8 100644
--- a/lib/bitcoin_base.dart
+++ b/lib/bitcoin_base.dart
@@ -12,12 +12,16 @@ export 'package:bitcoin_base/src/bitcoin/address/util.dart';
 
 export 'package:bitcoin_base/src/bitcoin/script/scripts.dart';
 
+export 'package:bitcoin_base/src/bitcoin/amount/amount.dart';
+
 export 'package:bitcoin_base/src/crypto/crypto.dart';
 
 export 'package:bitcoin_base/src/models/network.dart';
 
 export 'package:bitcoin_base/src/provider/api_provider.dart';
 
+export 'package:bitcoin_base/src/provider/models/electrum/electrum_utxo.dart';
+
 export 'package:bitcoin_base/src/utils/utils.dart';
 
 export 'package:bitcoin_base/src/cash_token/cash_token.dart';
diff --git a/lib/src/bitcoin/address/address.dart b/lib/src/bitcoin/address/address.dart
index 4dd7d7e..c644cf8 100644
--- a/lib/src/bitcoin/address/address.dart
+++ b/lib/src/bitcoin/address/address.dart
@@ -10,7 +10,6 @@ library bitcoin_base.address;
 
 import 'package:bitcoin_base/bitcoin_base.dart';
 import 'package:bitcoin_base/src/exception/exception.dart';
-import 'package:bitcoin_base/src/utils/enumerate.dart';
 import 'package:blockchain_utils/blockchain_utils.dart';
 import 'package:bitcoin_base/src/utils/script.dart';
 part 'core.dart';
@@ -18,3 +17,4 @@ part 'legacy_address.dart';
 part 'utils/address_utils.dart';
 part 'segwit_address.dart';
 part 'network_address.dart';
+part 'derivations.dart';
diff --git a/lib/src/bitcoin/address/core.dart b/lib/src/bitcoin/address/core.dart
index f5daaba..368e198 100644
--- a/lib/src/bitcoin/address/core.dart
+++ b/lib/src/bitcoin/address/core.dart
@@ -60,14 +60,13 @@ abstract class BitcoinAddressType implements Enumerate {
 }
 
 abstract class BitcoinBaseAddress {
-  BitcoinBaseAddress({this.network});
+  BitcoinBaseAddress();
 
   BitcoinAddressType get type;
-  String toAddress([BasedUtxoNetwork? network]);
+  String toAddress(BasedUtxoNetwork network);
   Script toScriptPubKey();
   String pubKeyHash();
   String get addressProgram;
-  BasedUtxoNetwork? network;
 
   static BitcoinBaseAddress fromString(
     String address, [
diff --git a/lib/src/bitcoin/address/derivations.dart b/lib/src/bitcoin/address/derivations.dart
new file mode 100644
index 0000000..303a889
--- /dev/null
+++ b/lib/src/bitcoin/address/derivations.dart
@@ -0,0 +1,216 @@
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: non_constant_identifier_names
+part of 'package:bitcoin_base/src/bitcoin/address/address.dart';
+
+class BitcoinDerivationInfo {
+  BitcoinDerivationInfo({
+    required this.derivationType,
+    required String derivationPath,
+    required this.scriptType,
+    this.description,
+  }) : derivationPath = Bip32PathParser.parse(derivationPath);
+  final BitcoinDerivationType derivationType;
+  final Bip32Path derivationPath;
+  final BitcoinAddressType scriptType;
+  final String? description;
+
+  factory BitcoinDerivationInfo.fromJSON(Map<String, dynamic> json) {
+    return BitcoinDerivationInfo(
+      derivationType: BitcoinDerivationType.values[json['derivationType']],
+      derivationPath: json['derivationPath'],
+      scriptType: BitcoinAddressType.values.firstWhere(
+        (type) => type.toString() == json['scriptType'],
+      ),
+      description: json['description'],
+    );
+  }
+
+  Map<String, dynamic> toJSON() {
+    return {
+      'derivationType': derivationType.index,
+      'derivationPath': derivationPath.toString(),
+      'scriptType': scriptType.toString(),
+      'description': description,
+    };
+  }
+}
+
+enum BitcoinDerivationType { bip39, electrum }
+
+// Define constant paths
+abstract class BitcoinDerivationPaths {
+  static const String ELECTRUM = "m/0'";
+  static const String BIP44 = "m/44'/0'/0'";
+  static const String BIP49 = "m/49'/0'/0'";
+  static const String BIP84 = "m/84'/0'/0'";
+  static const String BIP86 = "m/86'/0'/0'";
+  static const String NON_STANDARD = "m/0'";
+
+  static const String SILENT_PAYMENTS_SCAN = "m/352'/0'/0'/1'";
+  static const String SILENT_PAYMENTS_SPEND = "m/352'/0'/0'/0'";
+
+  static const String LITECOIN = "m/84'/2'/0'";
+
+  static const String SAMOURAI_BAD_BANK = "m/84'/0'/2147483644'";
+  static const String SAMOURAI_WHIRLPOOL_PREMIX = "m/84'/0'/2147483645'";
+  static const String SAMOURAI_WHIRLPOOL_POSTMIX = "m/84'/0'/2147483646'";
+  static const String SAMOURAI_RICOCHET_LEGACY = "m/44'/0'/2147483647'";
+  static const String SAMOURAI_RICOCHET_COMPATIBILITY_SEGWIT = "m/49'/0'/2147483647'";
+  static const String SAMOURAI_RICOCHET_NATIVE_SEGWIT = "m/84'/0'/2147483647'";
+}
+
+abstract class BitcoinDerivationInfos {
+  static final BitcoinDerivationInfo ELECTRUM = BitcoinDerivationInfo(
+    derivationType: BitcoinDerivationType.electrum,
+    derivationPath: BitcoinDerivationPaths.ELECTRUM,
+    description: "Electrum",
+    scriptType: SegwitAddresType.p2wpkh,
+  );
+
+  static final BitcoinDerivationInfo BIP44 = BitcoinDerivationInfo(
+    derivationType: BitcoinDerivationType.bip39,
+    derivationPath: BitcoinDerivationPaths.BIP44,
+    description: "Standard BIP44",
+    scriptType: P2pkhAddressType.p2pkh,
+  );
+  static final BitcoinDerivationInfo BIP49 = BitcoinDerivationInfo(
+    derivationType: BitcoinDerivationType.bip39,
+    derivationPath: BitcoinDerivationPaths.BIP49,
+    description: "Standard BIP49 compatibility segwit",
+    scriptType: P2shAddressType.p2wpkhInP2sh,
+  );
+  static final BitcoinDerivationInfo BIP84 = BitcoinDerivationInfo(
+    derivationType: BitcoinDerivationType.bip39,
+    derivationPath: BitcoinDerivationPaths.BIP84,
+    description: "Standard BIP84 native segwit",
+    scriptType: SegwitAddresType.p2wpkh,
+  );
+  static final BitcoinDerivationInfo BIP86 = BitcoinDerivationInfo(
+    derivationType: BitcoinDerivationType.bip39,
+    derivationPath: BitcoinDerivationPaths.BIP86,
+    description: "Standard BIP86 Taproot",
+    scriptType: SegwitAddresType.p2tr,
+  );
+
+  static final BitcoinDerivationInfo LITECOIN = BitcoinDerivationInfo(
+    derivationType: BitcoinDerivationType.bip39,
+    derivationPath: BitcoinDerivationPaths.LITECOIN,
+    description: "Default Litecoin",
+    scriptType: SegwitAddresType.p2wpkh,
+  );
+
+  static final BitcoinDerivationInfo SILENT_PAYMENTS_SCAN = BitcoinDerivationInfo(
+    derivationType: BitcoinDerivationType.bip39,
+    derivationPath: BitcoinDerivationPaths.SILENT_PAYMENTS_SCAN,
+    description: "Silent Payments Scan",
+    scriptType: SilentPaymentsAddresType.p2sp,
+  );
+
+  static final BitcoinDerivationInfo SILENT_PAYMENTS_SPEND = BitcoinDerivationInfo(
+    derivationType: BitcoinDerivationType.bip39,
+    derivationPath: BitcoinDerivationPaths.SILENT_PAYMENTS_SPEND,
+    description: "Silent Payments Spend",
+    scriptType: SilentPaymentsAddresType.p2sp,
+  );
+}
+
+final Map<BitcoinDerivationType, List<BitcoinDerivationInfo>> BITCOIN_DERIVATIONS = {
+  BitcoinDerivationType.electrum: [BitcoinDerivationInfos.ELECTRUM],
+  BitcoinDerivationType.bip39: [
+    BitcoinDerivationInfo(
+      derivationType: BitcoinDerivationType.bip39,
+      derivationPath: BitcoinDerivationPaths.BIP44,
+      description: "Standard BIP44",
+      scriptType: P2pkhAddressType.p2pkh,
+    ),
+    BitcoinDerivationInfo(
+      derivationType: BitcoinDerivationType.bip39,
+      derivationPath: BitcoinDerivationPaths.BIP49,
+      description: "Standard BIP49 compatibility segwit",
+      scriptType: P2shAddressType.p2wpkhInP2sh,
+    ),
+    BitcoinDerivationInfo(
+      derivationType: BitcoinDerivationType.bip39,
+      derivationPath: BitcoinDerivationPaths.BIP84,
+      description: "Standard BIP84 native segwit",
+      scriptType: SegwitAddresType.p2wpkh,
+    ),
+    BitcoinDerivationInfo(
+      derivationType: BitcoinDerivationType.bip39,
+      derivationPath: BitcoinDerivationPaths.BIP86,
+      description: "Standard BIP86 Taproot",
+      scriptType: SegwitAddresType.p2tr,
+    ),
+    BitcoinDerivationInfo(
+      derivationType: BitcoinDerivationType.bip39,
+      derivationPath: BitcoinDerivationPaths.NON_STANDARD,
+      description: "Non-standard legacy",
+      scriptType: P2pkhAddressType.p2pkh,
+    ),
+    BitcoinDerivationInfo(
+      derivationType: BitcoinDerivationType.bip39,
+      derivationPath: BitcoinDerivationPaths.NON_STANDARD,
+      description: "Non-standard compatibility segwit",
+      scriptType: P2shAddressType.p2wpkhInP2sh,
+    ),
+    BitcoinDerivationInfo(
+      derivationType: BitcoinDerivationType.bip39,
+      derivationPath: BitcoinDerivationPaths.NON_STANDARD,
+      description: "Non-standard native segwit",
+      scriptType: SegwitAddresType.p2wpkh,
+    ),
+    BitcoinDerivationInfo(
+      derivationType: BitcoinDerivationType.bip39,
+      derivationPath: BitcoinDerivationPaths.BIP44,
+      description: "Samourai Deposit",
+      scriptType: SegwitAddresType.p2wpkh,
+    ),
+    BitcoinDerivationInfo(
+      derivationType: BitcoinDerivationType.bip39,
+      derivationPath: BitcoinDerivationPaths.BIP49,
+      description: "Samourai Deposit",
+      scriptType: SegwitAddresType.p2wpkh,
+    ),
+    BitcoinDerivationInfo(
+      derivationType: BitcoinDerivationType.bip39,
+      derivationPath: BitcoinDerivationPaths.SAMOURAI_BAD_BANK,
+      description: "Samourai Bad Bank (toxic change)",
+      scriptType: SegwitAddresType.p2wpkh,
+    ),
+    BitcoinDerivationInfo(
+      derivationType: BitcoinDerivationType.bip39,
+      derivationPath: BitcoinDerivationPaths.SAMOURAI_WHIRLPOOL_PREMIX,
+      description: "Samourai Whirlpool Pre Mix",
+      scriptType: SegwitAddresType.p2wpkh,
+    ),
+    BitcoinDerivationInfo(
+      derivationType: BitcoinDerivationType.bip39,
+      derivationPath: BitcoinDerivationPaths.SAMOURAI_WHIRLPOOL_POSTMIX,
+      description: "Samourai Whirlpool Post Mix",
+      scriptType: SegwitAddresType.p2wpkh,
+    ),
+    BitcoinDerivationInfo(
+      derivationType: BitcoinDerivationType.bip39,
+      derivationPath: BitcoinDerivationPaths.SAMOURAI_RICOCHET_LEGACY,
+      description: "Samourai Ricochet legacy",
+      scriptType: P2pkhAddressType.p2pkh,
+    ),
+    BitcoinDerivationInfo(
+      derivationType: BitcoinDerivationType.bip39,
+      derivationPath: BitcoinDerivationPaths.SAMOURAI_RICOCHET_COMPATIBILITY_SEGWIT,
+      description: "Samourai Ricochet compatibility segwit",
+      scriptType: P2shAddressType.p2wpkhInP2sh,
+    ),
+    BitcoinDerivationInfo(
+      derivationType: BitcoinDerivationType.bip39,
+      derivationPath: BitcoinDerivationPaths.SAMOURAI_RICOCHET_NATIVE_SEGWIT,
+      description: "Samourai Ricochet native segwit",
+      scriptType: SegwitAddresType.p2wpkh,
+    ),
+    BitcoinDerivationInfos.LITECOIN,
+    BitcoinDerivationInfos.SILENT_PAYMENTS_SCAN,
+    BitcoinDerivationInfos.SILENT_PAYMENTS_SPEND,
+  ],
+};
+
+const String ELECTRUM_PATH = BitcoinDerivationPaths.ELECTRUM;
diff --git a/lib/src/bitcoin/address/legacy_address.dart b/lib/src/bitcoin/address/legacy_address.dart
index c2b9798..f998c15 100644
--- a/lib/src/bitcoin/address/legacy_address.dart
+++ b/lib/src/bitcoin/address/legacy_address.dart
@@ -9,12 +9,11 @@ abstract class LegacyAddress extends BitcoinBaseAddress {
   LegacyAddress.fromHash160({
     required String h160,
     required BitcoinAddressType type,
-    super.network,
   })  : _addressProgram = _BitcoinAddressUtils.validateAddressProgram(h160, type),
         super();
 
   LegacyAddress.fromAddress({required String address, required BasedUtxoNetwork network})
-      : super(network: network) {
+      : super() {
     final decode = _BitcoinAddressUtils.decodeLegacyAddressWithNetworkAndType(
       address: address,
       type: type,
@@ -28,14 +27,14 @@ abstract class LegacyAddress extends BitcoinBaseAddress {
     _addressProgram = decode;
   }
 
-  LegacyAddress.fromPubkey({required ECPublic pubkey, super.network})
+  LegacyAddress.fromPubkey({required ECPublic pubkey})
       : _pubkey = pubkey,
         _addressProgram = _BitcoinAddressUtils.pubkeyToHash160(pubkey.toHex());
 
-  LegacyAddress.fromRedeemScript({required Script script, super.network})
+  LegacyAddress.fromRedeemScript({required Script script})
       : _addressProgram = _BitcoinAddressUtils.scriptToHash160(script);
 
-  LegacyAddress.fromScriptSig({required Script script, super.network}) {
+  LegacyAddress.fromScriptSig({required Script script}) {
     switch (type) {
       case PubKeyAddressType.p2pk:
         _signature = script.findScriptParam(0);
@@ -79,13 +78,7 @@ abstract class LegacyAddress extends BitcoinBaseAddress {
   }
 
   @override
-  String toAddress([BasedUtxoNetwork? network]) {
-    network ??= this.network;
-
-    if (network == null) {
-      throw const BitcoinBasePluginException("Network is required");
-    }
-
+  String toAddress(BasedUtxoNetwork network) {
     if (!network.supportedAddress.contains(type)) {
       throw BitcoinBasePluginException("network does not support ${type.value} address");
     }
@@ -104,11 +97,10 @@ abstract class LegacyAddress extends BitcoinBaseAddress {
 }
 
 class P2shAddress extends LegacyAddress {
-  static RegExp get regex => RegExp(r'[23M][a-km-zA-HJ-NP-Z1-9]{25,34}');
+  static final regex = RegExp(r'[23M][a-km-zA-HJ-NP-Z1-9]{25,34}');
 
   P2shAddress.fromRedeemScript({
     required super.script,
-    super.network,
     this.type = P2shAddressType.p2pkInP2sh,
   }) : super.fromRedeemScript();
 
@@ -120,20 +112,48 @@ class P2shAddress extends LegacyAddress {
 
   P2shAddress.fromHash160({
     required super.h160,
-    super.network,
     this.type = P2shAddressType.p2pkInP2sh,
   }) : super.fromHash160(type: type);
 
+  factory P2shAddress.fromDerivation({
+    required Bip32Base bip32,
+    required BitcoinDerivationInfo derivationInfo,
+    required bool isChange,
+    required int index,
+    P2shAddressType type = P2shAddressType.p2pkInP2sh,
+  }) {
+    final fullPath = derivationInfo.derivationPath
+        .addElem(Bip32KeyIndex(BitcoinAddressUtils.getAccountFromChange(isChange)))
+        .addElem(Bip32KeyIndex(index));
+    final pubkey = ECPublic.fromBip32(bip32.derive(fullPath).publicKey);
+
+    switch (type) {
+      case P2shAddressType.p2pkInP2sh:
+        return pubkey.toP2pkInP2sh();
+      case P2shAddressType.p2pkhInP2sh:
+        return pubkey.toP2pkhInP2sh();
+      case P2shAddressType.p2wshInP2sh:
+        return pubkey.toP2wshInP2sh();
+      case P2shAddressType.p2wpkhInP2sh:
+        return pubkey.toP2wpkhInP2sh();
+      default:
+        throw UnimplementedError();
+    }
+  }
+
+  factory P2shAddress.fromPath({required Bip32Base bip32, required Bip32Path path}) {
+    return ECPublic.fromBip32(bip32.derive(path).publicKey).toP2wpkhInP2sh();
+  }
+
   factory P2shAddress.fromScriptPubkey({
     required Script script,
-    BasedUtxoNetwork? network,
     type = P2shAddressType.p2pkInP2sh,
   }) {
     if (script.getAddressType() is! P2shAddressType) {
       throw ArgumentError("Invalid scriptPubKey");
     }
 
-    return P2shAddress.fromHash160(h160: script.findScriptParam(1), network: network, type: type);
+    return P2shAddress.fromHash160(h160: script.findScriptParam(1), type: type);
   }
 
   @override
@@ -155,18 +175,17 @@ class P2shAddress extends LegacyAddress {
 }
 
 class P2pkhAddress extends LegacyAddress {
-  static RegExp get regex => RegExp(r'[1mnL][a-km-zA-HJ-NP-Z1-9]{25,34}');
+  static final regex = RegExp(r'[1mnL][a-km-zA-HJ-NP-Z1-9]{25,34}');
 
   factory P2pkhAddress.fromScriptPubkey({
     required Script script,
-    BasedUtxoNetwork? network,
     P2pkhAddressType type = P2pkhAddressType.p2pkh,
   }) {
     if (script.getAddressType() != P2pkhAddressType.p2pkh) {
       throw ArgumentError("Invalid scriptPubKey");
     }
 
-    return P2pkhAddress.fromHash160(h160: script.findScriptParam(2), network: network, type: type);
+    return P2pkhAddress.fromHash160(h160: script.findScriptParam(2), type: type);
   }
 
   P2pkhAddress.fromAddress({
@@ -175,17 +194,27 @@ class P2pkhAddress extends LegacyAddress {
     this.type = P2pkhAddressType.p2pkh,
   }) : super.fromAddress();
 
-  P2pkhAddress.fromHash160({
-    required super.h160,
-    super.network,
-    this.type = P2pkhAddressType.p2pkh,
-  }) : super.fromHash160(type: type);
+  P2pkhAddress.fromHash160({required super.h160, this.type = P2pkhAddressType.p2pkh})
+      : super.fromHash160(type: type);
 
-  P2pkhAddress.fromScriptSig({
-    required super.script,
-    super.network,
-    this.type = P2pkhAddressType.p2pkh,
-  }) : super.fromScriptSig();
+  P2pkhAddress.fromScriptSig({required super.script, this.type = P2pkhAddressType.p2pkh})
+      : super.fromScriptSig();
+
+  factory P2pkhAddress.fromDerivation({
+    required Bip32Base bip32,
+    required BitcoinDerivationInfo derivationInfo,
+    required bool isChange,
+    required int index,
+  }) {
+    final fullPath = derivationInfo.derivationPath
+        .addElem(Bip32KeyIndex(BitcoinAddressUtils.getAccountFromChange(isChange)))
+        .addElem(Bip32KeyIndex(index));
+    return ECPublic.fromBip32(bip32.derive(fullPath).publicKey).toP2pkhAddress();
+  }
+
+  factory P2pkhAddress.fromPath({required Bip32Base bip32, required Bip32Path path}) {
+    return ECPublic.fromBip32(bip32.derive(path).publicKey).toP2pkhAddress();
+  }
 
   @override
   Script toScriptPubKey() {
@@ -209,7 +238,7 @@ class P2pkhAddress extends LegacyAddress {
 class P2pkAddress extends LegacyAddress {
   static RegExp get regex => RegExp(r'1([A-Za-z0-9]{34})');
 
-  P2pkAddress({required ECPublic publicKey, super.network})
+  P2pkAddress({required ECPublic publicKey})
       : _pubkeyHex = publicKey.toHex(),
         super.fromPubkey(pubkey: publicKey);
 
@@ -233,13 +262,7 @@ class P2pkAddress extends LegacyAddress {
   }
 
   @override
-  String toAddress([BasedUtxoNetwork? network]) {
-    network ??= this.network;
-
-    if (network == null) {
-      throw const BitcoinBasePluginException("Network is required");
-    }
-
+  String toAddress(BasedUtxoNetwork network) {
     return _BitcoinAddressUtils.legacyToAddress(
       network: network,
       addressProgram: _BitcoinAddressUtils.pubkeyToHash160(_pubkeyHex),
diff --git a/lib/src/bitcoin/address/network_address.dart b/lib/src/bitcoin/address/network_address.dart
index 8b8fd7f..bed4732 100644
--- a/lib/src/bitcoin/address/network_address.dart
+++ b/lib/src/bitcoin/address/network_address.dart
@@ -9,7 +9,7 @@ abstract class BitcoinNetworkAddress<T extends BasedUtxoNetwork> {
 
   /// Converts the address to a string representation for the specified network [T].
   String toAddress([T? network]) {
-    return network == null ? address : baseAddress.toAddress();
+    return network == null ? address : baseAddress.toAddress(network);
   }
 
   /// The type of the Bitcoin address.
@@ -28,7 +28,7 @@ class BitcoinAddress extends BitcoinNetworkAddress<BitcoinNetwork> {
   factory BitcoinAddress.fromBaseAddress(BitcoinBaseAddress address,
       {DashNetwork network = DashNetwork.mainnet}) {
     final baseAddress = _BitcoinAddressUtils.validateAddress(address, network);
-    return BitcoinAddress._(baseAddress, baseAddress.toAddress());
+    return BitcoinAddress._(baseAddress, baseAddress.toAddress(network));
   }
   @override
   final BitcoinBaseAddress baseAddress;
@@ -45,7 +45,7 @@ class DogeAddress extends BitcoinNetworkAddress<DogecoinNetwork> {
   factory DogeAddress.fromBaseAddress(BitcoinBaseAddress address,
       {DogecoinNetwork network = DogecoinNetwork.mainnet}) {
     final baseAddress = _BitcoinAddressUtils.validateAddress(address, network);
-    return DogeAddress._(baseAddress, baseAddress.toAddress());
+    return DogeAddress._(baseAddress, baseAddress.toAddress(network));
   }
   @override
   final BitcoinBaseAddress baseAddress;
@@ -63,7 +63,7 @@ class PepeAddress extends BitcoinNetworkAddress<PepeNetwork> {
   factory PepeAddress.fromBaseAddress(BitcoinBaseAddress address,
       {PepeNetwork network = PepeNetwork.mainnet}) {
     final baseAddress = _BitcoinAddressUtils.validateAddress(address, network);
-    return PepeAddress._(baseAddress, baseAddress.toAddress());
+    return PepeAddress._(baseAddress, baseAddress.toAddress(network));
   }
   @override
   final BitcoinBaseAddress baseAddress;
@@ -81,7 +81,7 @@ class LitecoinAddress extends BitcoinNetworkAddress<LitecoinNetwork> {
   factory LitecoinAddress.fromBaseAddress(BitcoinBaseAddress address,
       {LitecoinNetwork network = LitecoinNetwork.mainnet}) {
     final baseAddress = _BitcoinAddressUtils.validateAddress(address, network);
-    return LitecoinAddress._(baseAddress, baseAddress.toAddress());
+    return LitecoinAddress._(baseAddress, baseAddress.toAddress(network));
   }
   @override
   final BitcoinBaseAddress baseAddress;
@@ -108,7 +108,7 @@ class BitcoinCashAddress extends BitcoinNetworkAddress<BitcoinCashNetwork> {
   factory BitcoinCashAddress.fromBaseAddress(BitcoinBaseAddress address,
       {BitcoinCashNetwork network = BitcoinCashNetwork.mainnet}) {
     final baseAddress = _BitcoinAddressUtils.validateAddress(address, network);
-    return BitcoinCashAddress._(baseAddress, baseAddress.toAddress());
+    return BitcoinCashAddress._(baseAddress, baseAddress.toAddress(network));
   }
   @override
   final BitcoinBaseAddress baseAddress;
@@ -133,7 +133,7 @@ class DashAddress extends BitcoinNetworkAddress<DashNetwork> {
   factory DashAddress.fromBaseAddress(BitcoinBaseAddress address,
       {DashNetwork network = DashNetwork.mainnet}) {
     final baseAddress = _BitcoinAddressUtils.validateAddress(address, network);
-    return DashAddress._(baseAddress, baseAddress.toAddress());
+    return DashAddress._(baseAddress, baseAddress.toAddress(network));
   }
   @override
   final BitcoinBaseAddress baseAddress;
@@ -150,7 +150,7 @@ class BitcoinSVAddress extends BitcoinNetworkAddress<DashNetwork> {
   factory BitcoinSVAddress.fromBaseAddress(BitcoinBaseAddress address,
       {BitcoinSVNetwork network = BitcoinSVNetwork.mainnet}) {
     final baseAddress = _BitcoinAddressUtils.validateAddress(address, network);
-    return BitcoinSVAddress._(baseAddress, baseAddress.toAddress());
+    return BitcoinSVAddress._(baseAddress, baseAddress.toAddress(network));
   }
   @override
   final BitcoinBaseAddress baseAddress;
diff --git a/lib/src/bitcoin/address/segwit_address.dart b/lib/src/bitcoin/address/segwit_address.dart
index 740e1ea..b45f4b0 100644
--- a/lib/src/bitcoin/address/segwit_address.dart
+++ b/lib/src/bitcoin/address/segwit_address.dart
@@ -5,7 +5,7 @@ abstract class SegwitAddress extends BitcoinBaseAddress {
     required String address,
     required BasedUtxoNetwork network,
     required this.segwitVersion,
-  }) : super(network: network) {
+  }) : super() {
     addressProgram = _BitcoinAddressUtils.toSegwitProgramWithVersionAndNetwork(
       address: address,
       version: segwitVersion,
@@ -16,7 +16,6 @@ abstract class SegwitAddress extends BitcoinBaseAddress {
   SegwitAddress.fromProgram({
     required String program,
     required SegwitAddresType addressType,
-    super.network,
     required this.segwitVersion,
     this.pubkey,
   })  : addressProgram = _BitcoinAddressUtils.validateAddressProgram(program, addressType),
@@ -24,7 +23,6 @@ abstract class SegwitAddress extends BitcoinBaseAddress {
 
   SegwitAddress.fromRedeemScript({
     required Script script,
-    super.network,
     required this.segwitVersion,
   }) : addressProgram = _BitcoinAddressUtils.segwitScriptToSHA256(script);
 
@@ -34,13 +32,7 @@ abstract class SegwitAddress extends BitcoinBaseAddress {
   ECPublic? pubkey;
 
   @override
-  String toAddress([BasedUtxoNetwork? network]) {
-    network ??= this.network;
-
-    if (network == null) {
-      throw const BitcoinBasePluginException("Network is required");
-    }
-
+  String toAddress(BasedUtxoNetwork network) {
     if (!network.supportedAddress.contains(type)) {
       throw BitcoinBasePluginException("network does not support ${type.value} address");
     }
@@ -59,26 +51,43 @@ abstract class SegwitAddress extends BitcoinBaseAddress {
 }
 
 class P2wpkhAddress extends SegwitAddress {
-  static RegExp get regex => RegExp(r'(bc|tb|ltc)1q[ac-hj-np-z02-9]{25,39}');
+  static final regex = RegExp(r'(bc|tb|ltc)1q[ac-hj-np-z02-9]{25,39}');
 
   P2wpkhAddress.fromAddress({required super.address, required super.network})
       : super.fromAddress(segwitVersion: _BitcoinAddressUtils.segwitV0);
 
-  P2wpkhAddress.fromProgram({required super.program, super.network})
+  P2wpkhAddress.fromProgram({required super.program})
       : super.fromProgram(
           segwitVersion: _BitcoinAddressUtils.segwitV0,
           addressType: SegwitAddresType.p2wpkh,
         );
 
-  P2wpkhAddress.fromRedeemScript({required super.script, super.network})
+  P2wpkhAddress.fromRedeemScript({required super.script})
       : super.fromRedeemScript(segwitVersion: _BitcoinAddressUtils.segwitV0);
 
-  factory P2wpkhAddress.fromScriptPubkey({required Script script, BasedUtxoNetwork? network}) {
+  factory P2wpkhAddress.fromDerivation({
+    required Bip32Base bip32,
+    required BitcoinDerivationInfo derivationInfo,
+    required bool isChange,
+    required int index,
+  }) {
+    final fullPath = derivationInfo.derivationPath
+        .addElem(Bip32KeyIndex(BitcoinAddressUtils.getAccountFromChange(isChange)))
+        .addElem(Bip32KeyIndex(index));
+
+    return ECPublic.fromBip32(bip32.derive(fullPath).publicKey).toP2wpkhAddress();
+  }
+
+  factory P2wpkhAddress.fromPath({required Bip32Base bip32, required Bip32Path path}) {
+    return ECPublic.fromBip32(bip32.derive(path).publicKey).toP2wpkhAddress();
+  }
+
+  factory P2wpkhAddress.fromScriptPubkey({required Script script}) {
     if (script.getAddressType() != SegwitAddresType.p2wpkh) {
       throw ArgumentError("Invalid scriptPubKey");
     }
 
-    return P2wpkhAddress.fromProgram(program: script.findScriptParam(1), network: network);
+    return P2wpkhAddress.fromProgram(program: script.findScriptParam(1));
   }
 
   /// returns the scriptPubKey of a P2WPKH witness script
@@ -93,27 +102,43 @@ class P2wpkhAddress extends SegwitAddress {
 }
 
 class P2trAddress extends SegwitAddress {
-  static RegExp get regex =>
+  static final regex =
       RegExp(r'(bc|tb)1p([ac-hj-np-z02-9]{39}|[ac-hj-np-z02-9]{59}|[ac-hj-np-z02-9]{8,89})');
 
   P2trAddress.fromAddress({required super.address, required super.network})
       : super.fromAddress(segwitVersion: _BitcoinAddressUtils.segwitV1);
 
-  P2trAddress.fromProgram({required super.program, super.network, super.pubkey})
+  P2trAddress.fromProgram({required super.program, super.pubkey})
       : super.fromProgram(
           segwitVersion: _BitcoinAddressUtils.segwitV1,
           addressType: SegwitAddresType.p2tr,
         );
 
-  P2trAddress.fromRedeemScript({required super.script, super.network})
+  P2trAddress.fromRedeemScript({required super.script})
       : super.fromRedeemScript(segwitVersion: _BitcoinAddressUtils.segwitV1);
 
-  factory P2trAddress.fromScriptPubkey({required Script script, BasedUtxoNetwork? network}) {
+  factory P2trAddress.fromDerivation({
+    required Bip32Base bip32,
+    required BitcoinDerivationInfo derivationInfo,
+    required bool isChange,
+    required int index,
+  }) {
+    final fullPath = derivationInfo.derivationPath
+        .addElem(Bip32KeyIndex(BitcoinAddressUtils.getAccountFromChange(isChange)))
+        .addElem(Bip32KeyIndex(index));
+    return ECPublic.fromBip32(bip32.derive(fullPath).publicKey).toP2trAddress();
+  }
+
+  factory P2trAddress.fromPath({required Bip32Base bip32, required Bip32Path path}) {
+    return ECPublic.fromBip32(bip32.derive(path).publicKey).toP2trAddress();
+  }
+
+  factory P2trAddress.fromScriptPubkey({required Script script}) {
     if (script.getAddressType() != SegwitAddresType.p2tr) {
       throw ArgumentError("Invalid scriptPubKey");
     }
 
-    return P2trAddress.fromProgram(program: script.findScriptParam(1), network: network);
+    return P2trAddress.fromProgram(program: script.findScriptParam(1));
   }
 
   /// returns the scriptPubKey of a P2TR witness script
@@ -128,26 +153,38 @@ class P2trAddress extends SegwitAddress {
 }
 
 class P2wshAddress extends SegwitAddress {
-  static RegExp get regex => RegExp(r'(bc|tb)1q[ac-hj-np-z02-9]{40,80}');
+  static final regex = RegExp(r'(bc|tb)1q[ac-hj-np-z02-9]{40,80}');
 
   P2wshAddress.fromAddress({required super.address, required super.network})
       : super.fromAddress(segwitVersion: _BitcoinAddressUtils.segwitV0);
 
-  P2wshAddress.fromProgram({required super.program, super.network})
+  P2wshAddress.fromProgram({required super.program})
       : super.fromProgram(
           segwitVersion: _BitcoinAddressUtils.segwitV0,
           addressType: SegwitAddresType.p2wsh,
         );
 
-  P2wshAddress.fromRedeemScript({required super.script, super.network})
+  P2wshAddress.fromRedeemScript({required super.script})
       : super.fromRedeemScript(segwitVersion: _BitcoinAddressUtils.segwitV0);
 
-  factory P2wshAddress.fromScriptPubkey({required Script script, BasedUtxoNetwork? network}) {
+  factory P2wshAddress.fromDerivation({
+    required Bip32Base bip32,
+    required BitcoinDerivationInfo derivationInfo,
+    required bool isChange,
+    required int index,
+  }) {
+    final fullPath = derivationInfo.derivationPath
+        .addElem(Bip32KeyIndex(BitcoinAddressUtils.getAccountFromChange(isChange)))
+        .addElem(Bip32KeyIndex(index));
+    return ECPublic.fromBip32(bip32.derive(fullPath).publicKey).toP2wshAddress();
+  }
+
+  factory P2wshAddress.fromScriptPubkey({required Script script}) {
     if (script.getAddressType() != SegwitAddresType.p2wsh) {
       throw ArgumentError("Invalid scriptPubKey");
     }
 
-    return P2wshAddress.fromProgram(program: script.findScriptParam(1), network: network);
+    return P2wshAddress.fromProgram(program: script.findScriptParam(1));
   }
 
   /// Returns the scriptPubKey of a P2WPKH witness script
diff --git a/lib/src/bitcoin/address/util.dart b/lib/src/bitcoin/address/util.dart
index 7ec257d..b878886 100644
--- a/lib/src/bitcoin/address/util.dart
+++ b/lib/src/bitcoin/address/util.dart
@@ -1,3 +1,4 @@
+import 'package:bitcoin_base/src/bitcoin/script/scripts.dart';
 import 'package:bitcoin_base/src/utils/utils.dart';
 import 'package:blockchain_utils/blockchain_utils.dart';
 import 'package:bitcoin_base/src/bitcoin/address/address.dart';
@@ -26,6 +27,28 @@ class BitcoinAddressUtils {
     return addressType.toScriptPubKey().toBytes();
   }
 
+  static String addressFromOutputScript(Script script, BasedUtxoNetwork network) {
+    try {
+      switch (script.getAddressType()) {
+        case P2pkhAddressType.p2pkh:
+          return P2pkhAddress.fromScriptPubkey(script: script).toAddress(network);
+        case P2shAddressType.p2pkInP2sh:
+          return P2shAddress.fromScriptPubkey(script: script).toAddress(network);
+        case SegwitAddresType.p2wpkh:
+          return P2wpkhAddress.fromScriptPubkey(script: script).toAddress(network);
+        case P2shAddressType.p2pkhInP2sh:
+          return P2shAddress.fromScriptPubkey(script: script).toAddress(network);
+        case SegwitAddresType.p2wsh:
+          return P2wshAddress.fromScriptPubkey(script: script).toAddress(network);
+        case SegwitAddresType.p2tr:
+          return P2trAddress.fromScriptPubkey(script: script).toAddress(network);
+        default:
+      }
+    } catch (_) {}
+
+    return '';
+  }
+
   static String scriptHash(String address, {required BasedUtxoNetwork network}) {
     final outputScript = addressToOutputScript(address: address, network: network);
     final parts = BytesUtils.toHexString(QuickCrypto.sha256Hash(outputScript)).split('');
@@ -41,4 +64,52 @@ class BitcoinAddressUtils {
 
     return res;
   }
+
+  static BitcoinAddressType getScriptType(BitcoinBaseAddress type) {
+    if (type is P2pkhAddress) {
+      return P2pkhAddressType.p2pkh;
+    } else if (type is P2shAddress) {
+      return P2shAddressType.p2wpkhInP2sh;
+    } else if (type is P2wshAddress) {
+      return SegwitAddresType.p2wsh;
+    } else if (type is P2trAddress) {
+      return SegwitAddresType.p2tr;
+    } else if (type is MwebAddress) {
+      return SegwitAddresType.mweb;
+    } else if (type is SilentPaymentsAddresType) {
+      return SilentPaymentsAddresType.p2sp;
+    } else {
+      return SegwitAddresType.p2wpkh;
+    }
+  }
+
+  static int getAccountFromChange(bool isChange) {
+    return isChange ? 1 : 0;
+  }
+
+  static BitcoinDerivationInfo getDerivationFromType(
+    BitcoinAddressType scriptType, {
+    bool? isElectrum = false,
+  }) {
+    switch (scriptType) {
+      case P2pkhAddressType.p2pkh:
+        return BitcoinDerivationInfos.BIP44;
+      case P2shAddressType.p2wpkhInP2sh:
+        return BitcoinDerivationInfos.BIP49;
+      case SegwitAddresType.p2wpkh:
+        if (isElectrum == true) {
+          return BitcoinDerivationInfos.ELECTRUM;
+        } else {
+          return BitcoinDerivationInfos.BIP84;
+        }
+      case SegwitAddresType.p2tr:
+        return BitcoinDerivationInfos.BIP86;
+      case SegwitAddresType.mweb:
+        return BitcoinDerivationInfos.BIP86;
+      case SegwitAddresType.p2wsh:
+        return BitcoinDerivationInfos.BIP84;
+      default:
+        throw Exception("Derivation not available for $scriptType");
+    }
+  }
 }
diff --git a/lib/src/bitcoin/amount/amount.dart b/lib/src/bitcoin/amount/amount.dart
new file mode 100644
index 0000000..df7f858
--- /dev/null
+++ b/lib/src/bitcoin/amount/amount.dart
@@ -0,0 +1,5 @@
+library bitcoin_base.amount;
+
+import 'package:intl/intl.dart';
+
+part 'utils.dart';
diff --git a/lib/src/bitcoin/amount/utils.dart b/lib/src/bitcoin/amount/utils.dart
new file mode 100644
index 0000000..8b1f8bc
--- /dev/null
+++ b/lib/src/bitcoin/amount/utils.dart
@@ -0,0 +1,33 @@
+part of 'package:bitcoin_base/src/bitcoin/amount/amount.dart';
+
+class BitcoinAmountUtils {
+  static const bitcoinAmountLength = 8;
+  static const bitcoinAmountDivider = 100000000;
+  static final bitcoinAmountFormat = NumberFormat()
+    ..maximumFractionDigits = bitcoinAmountLength
+    ..minimumFractionDigits = 1;
+
+  static double cryptoAmountToDouble({required num amount, required num divider}) =>
+      amount / divider;
+
+  static String bitcoinAmountToString({required int amount}) =>
+      bitcoinAmountFormat.format(cryptoAmountToDouble(
+        amount: amount,
+        divider: bitcoinAmountDivider,
+      ));
+
+  static double bitcoinAmountToDouble({required int amount}) =>
+      cryptoAmountToDouble(amount: amount, divider: bitcoinAmountDivider);
+
+  static int stringDoubleToBitcoinAmount(String amount) {
+    int result = 0;
+
+    try {
+      result = (double.parse(amount) * bitcoinAmountDivider).round();
+    } catch (e) {
+      result = 0;
+    }
+
+    return result;
+  }
+}
diff --git a/lib/src/bitcoin/script/transaction.dart b/lib/src/bitcoin/script/transaction.dart
index 3ea3079..4169ddc 100644
--- a/lib/src/bitcoin/script/transaction.dart
+++ b/lib/src/bitcoin/script/transaction.dart
@@ -148,16 +148,17 @@ class BtcTransaction {
       mwebBytes = rawtx.sublist(cursor, rawtx.length - 4);
       cursor = rawtx.length - 4;
     }
-    List<int> lock = rawtx.sublist(cursor, cursor + 4);
+    List<int> lock = rawtx.sublist(rawtx.length - 4);
     return BtcTransaction(
-        inputs: inputs,
-        outputs: outputs,
-        witnesses: witnesses,
-        hasSegwit: hasSegwit,
-        canReplaceByFee: canReplaceByFee,
-        mwebBytes: mwebBytes,
-        version: version,
-        lock: lock);
+      inputs: inputs,
+      outputs: outputs,
+      witnesses: witnesses,
+      hasSegwit: hasSegwit,
+      canReplaceByFee: canReplaceByFee,
+      mwebBytes: mwebBytes,
+      version: version,
+      lock: lock,
+    );
   }
 
   /// returns the transaction input's digest that is to be signed according.
@@ -242,7 +243,7 @@ class BtcTransaction {
     if (mwebBytes != null) {
       data.add(mwebBytes!);
     }
-    data.add(locktime);
+    data.add([0, 0, 0, 0]);
     return data.toBytes();
   }
 
diff --git a/lib/src/bitcoin/silent_payments/address.dart b/lib/src/bitcoin/silent_payments/address.dart
index e622851..4c3afea 100644
--- a/lib/src/bitcoin/silent_payments/address.dart
+++ b/lib/src/bitcoin/silent_payments/address.dart
@@ -2,10 +2,6 @@
 // ignore_for_file: non_constant_identifier_names
 part of 'package:bitcoin_base/src/bitcoin/silent_payments/silent_payments.dart';
 
-const SCAN_PATH = "m/352'/1'/0'/1'/0";
-
-const SPEND_PATH = "m/352'/1'/0'/0'/0";
-
 class SilentPaymentOwner extends SilentPaymentAddress {
   final ECPrivate b_scan;
   final ECPrivate b_spend;
@@ -16,7 +12,6 @@ class SilentPaymentOwner extends SilentPaymentAddress {
     required super.B_spend,
     required this.b_scan,
     required this.b_spend,
-    super.network,
   }) : super();
 
   factory SilentPaymentOwner.fromPrivateKeys({
@@ -30,33 +25,38 @@ class SilentPaymentOwner extends SilentPaymentAddress {
       b_spend: b_spend,
       B_scan: b_scan.getPublic(),
       B_spend: b_spend.getPublic(),
-      network: network,
       version: version ?? 0,
     );
   }
 
-  factory SilentPaymentOwner.fromHd(Bip32Slip10Secp256k1 bip32, {String? hrp, int? version}) {
-    final scanDerivation = bip32.derivePath(SCAN_PATH);
-    final spendDerivation = bip32.derivePath(SPEND_PATH);
+  factory SilentPaymentOwner.fromBip32(Bip32Slip10Secp256k1 bip32, {int? version}) {
+    final scanDerivation = bip32.derive(
+      Bip32PathParser.parse(BitcoinDerivationPaths.SILENT_PAYMENTS_SCAN),
+    );
+    final spendDerivation = bip32.derive(
+      Bip32PathParser.parse(BitcoinDerivationPaths.SILENT_PAYMENTS_SPEND),
+    );
 
     return SilentPaymentOwner(
       b_scan: ECPrivate(scanDerivation.privateKey),
       b_spend: ECPrivate(spendDerivation.privateKey),
       B_scan: ECPublic.fromBip32(scanDerivation.publicKey),
       B_spend: ECPublic.fromBip32(spendDerivation.publicKey),
-      network: hrp == "tsp" ? BitcoinNetwork.testnet : BitcoinNetwork.mainnet,
       version: version ?? 0,
     );
   }
 
-  factory SilentPaymentOwner.fromMnemonic(String mnemonic, {String? hrp, int? version}) {
-    return SilentPaymentOwner.fromHd(
-        Bip32Slip10Secp256k1.fromSeed(
-          Bip39MnemonicDecoder().decode(mnemonic),
-          hrp == "tsp" ? Bip32Const.testNetKeyNetVersions : Bip32Const.mainNetKeyNetVersions,
-        ),
-        hrp: hrp,
-        version: version);
+  factory SilentPaymentOwner.fromMnemonic(String mnemonic,
+      {BasedUtxoNetwork? network, int? version}) {
+    return SilentPaymentOwner.fromBip32(
+      Bip32Slip10Secp256k1.fromSeed(
+        Bip39MnemonicDecoder().decode(mnemonic),
+        network == BitcoinNetwork.testnet
+            ? Bip32Const.testNetKeyNetVersions
+            : Bip32Const.mainNetKeyNetVersions,
+      ),
+      version: version,
+    );
   }
 
   List<int> generateLabel(int m) {
@@ -70,10 +70,29 @@ class SilentPaymentOwner extends SilentPaymentAddress {
       b_spend: b_spend,
       B_scan: B_scan,
       B_spend: B_m,
-      network: network,
       version: version,
     );
   }
+
+  Map<String, dynamic> toJson() {
+    return {
+      'version': version,
+      'B_scan': B_scan.toHex(),
+      'B_spend': B_spend.toHex(),
+      'b_scan': b_scan.toHex(),
+      'b_spend': b_spend.toHex(),
+    };
+  }
+
+  static SilentPaymentOwner fromJson(Map<String, dynamic> json) {
+    return SilentPaymentOwner(
+      version: json['version'] as int,
+      B_scan: ECPublic.fromHex(json['B_scan'] as String),
+      B_spend: ECPublic.fromHex(json['B_spend'] as String),
+      b_scan: ECPrivate.fromHex(json['b_scan'] as String),
+      b_spend: ECPrivate.fromHex(json['b_spend'] as String),
+    );
+  }
 }
 
 class SilentPaymentDestination extends SilentPaymentAddress {
@@ -81,7 +100,6 @@ class SilentPaymentDestination extends SilentPaymentAddress {
     required super.version,
     required ECPublic scanPubkey,
     required ECPublic spendPubkey,
-    super.network,
     required this.amount,
   }) : super(B_scan: scanPubkey, B_spend: spendPubkey);
 
@@ -93,7 +111,6 @@ class SilentPaymentDestination extends SilentPaymentAddress {
     return SilentPaymentDestination(
       scanPubkey: receiver.B_scan,
       spendPubkey: receiver.B_spend,
-      network: receiver.network,
       version: receiver.version,
       amount: amount,
     );
@@ -106,16 +123,12 @@ class SilentPaymentAddress implements BitcoinBaseAddress {
   final int version;
   final ECPublic B_scan;
   final ECPublic B_spend;
-  @override
-  BasedUtxoNetwork? network;
-  final String hrp;
 
   SilentPaymentAddress({
     required this.B_scan,
     required this.B_spend,
-    this.network = BitcoinNetwork.mainnet,
     this.version = 0,
-  }) : hrp = (network == BitcoinNetwork.testnet ? "tsp" : "sp") {
+  }) {
     if (version != 0) {
       throw Exception("Can't have other version than 0 for now");
     }
@@ -143,20 +156,19 @@ class SilentPaymentAddress implements BitcoinBaseAddress {
     return SilentPaymentAddress(
       B_scan: ECPublic.fromBytes(key.sublist(0, 33)),
       B_spend: ECPublic.fromBytes(key.sublist(33)),
-      network: prefix == 'tsp' ? BitcoinNetwork.testnet : BitcoinNetwork.mainnet,
       version: version,
     );
   }
 
   @override
-  String toAddress([BasedUtxoNetwork? network]) {
+  String toAddress(BasedUtxoNetwork network) {
     return toString(network: network);
   }
 
   @override
   String toString({BasedUtxoNetwork? network}) {
     return Bech32EncoderBase.encodeBech32(
-      hrp,
+      network == BitcoinNetwork.testnet ? 'tsp' : 'sp',
       [
         version,
         ...Bech32BaseUtils.convertToBase32(
diff --git a/lib/src/crypto/keypair/ec_private.dart b/lib/src/crypto/keypair/ec_private.dart
index e8ace7a..c5ace75 100644
--- a/lib/src/crypto/keypair/ec_private.dart
+++ b/lib/src/crypto/keypair/ec_private.dart
@@ -4,7 +4,6 @@ import 'package:bitcoin_base/bitcoin_base.dart';
 import 'package:bitcoin_base/src/crypto/keypair/sign_utils.dart';
 import 'package:blockchain_utils/blockchain_utils.dart';
 import 'package:pointycastle/export.dart';
-import 'package:bip32/bip32.dart' as bip32;
 import 'package:bip32/src/utils/ecurve.dart' as ecc;
 
 /// Represents an ECDSA private key.
@@ -33,6 +32,18 @@ class ECPrivate {
     return ECPrivate.fromBytes(decode.item1);
   }
 
+  factory ECPrivate.fromBip32({required Bip32Base bip32, int? account, int? index}) {
+    if (account != null) {
+      bip32 = bip32.childKey(Bip32KeyIndex(account));
+
+      if (index != null) {
+        bip32 = bip32.childKey(Bip32KeyIndex(index));
+      }
+    }
+
+    return ECPrivate(bip32.privateKey);
+  }
+
   /// returns as WIFC (compressed) or WIF format (string)
   String toWif({bool compressed = true, BitcoinNetwork? network}) {
     List<int> bytes = <int>[...(network ?? BitcoinNetwork.mainnet).wifNetVer, ...toBytes()];
@@ -57,7 +68,6 @@ class ECPrivate {
 
   /// Returns a Bitcoin compact signature in hex
   String signMessage(List<int> message, {String messagePrefix = '\x18Bitcoin Signed Message:\n'}) {
-
     final messageHash =
         QuickCrypto.sha256Hash(BitcoinSignerUtils.magicMessage(message, messagePrefix));
 
diff --git a/lib/src/crypto/keypair/ec_public.dart b/lib/src/crypto/keypair/ec_public.dart
index 18a5ec4..045f993 100644
--- a/lib/src/crypto/keypair/ec_public.dart
+++ b/lib/src/crypto/keypair/ec_public.dart
@@ -116,6 +116,10 @@ class ECPublic {
     return P2trAddress.fromProgram(program: pubKey, pubkey: ECPublic.fromHex(pubKey));
   }
 
+  P2trAddress toP2trAddress({List<List<Script>>? scripts, bool tweak = true}) {
+    return toTaprootAddress(scripts: scripts, tweak: tweak);
+  }
+
   /// toP2wpkhInP2sh generates a P2SH (Pay-to-Script-Hash) address
   /// wrapping a P2WPKH (Pay-to-Witness-Public-Key-Hash) script derived from the ECPublic key.
   /// If 'compressed' is true, the key is in compressed format.
diff --git a/lib/src/provider/api_provider/api_provider.dart b/lib/src/provider/api_provider/api_provider.dart
index 3f470df..81a09ac 100644
--- a/lib/src/provider/api_provider/api_provider.dart
+++ b/lib/src/provider/api_provider/api_provider.dart
@@ -7,10 +7,13 @@ import 'package:blockchain_utils/utils/string/string.dart';
 class ApiProvider {
   ApiProvider({required this.api, Map<String, String>? header, required this.service})
       : _header = header ?? {"Content-Type": "application/json"};
-  factory ApiProvider.fromMempool(BasedUtxoNetwork network, ApiService service,
-      {Map<String, String>? header}) {
-    final api = APIConfig.mempool(network);
-    return ApiProvider(api: api, header: header, service: service);
+  factory ApiProvider.fromMempool(
+    BasedUtxoNetwork network, {
+    Map<String, String>? header,
+    String? baseUrl,
+  }) {
+    final api = APIConfig.mempool(network, baseUrl);
+    return ApiProvider(api: api, header: header, service: BitcoinApiService());
   }
   factory ApiProvider.fromBlocCypher(BasedUtxoNetwork network, ApiService service,
       {Map<String, String>? header}) {
@@ -80,7 +83,7 @@ class ApiProvider {
     }
   }
 
-  Future<BitcoinFeeRate> getNetworkFeeRate({String Function(String)? tokenize}) async {
+  Future<BitcoinFeeRate> getRecommendedFeeRate({String Function(String)? tokenize}) async {
     final apiUrl = api.getFeeApiUrl();
     final url = tokenize?.call(apiUrl) ?? apiUrl;
     final response = await _getRequest<Map<String, dynamic>>(url);
diff --git a/lib/src/provider/api_provider/electrum_api_provider.dart b/lib/src/provider/api_provider/electrum_api_provider.dart
index 4db27db..e9a348e 100644
--- a/lib/src/provider/api_provider/electrum_api_provider.dart
+++ b/lib/src/provider/api_provider/electrum_api_provider.dart
@@ -1,35 +1,96 @@
+import 'package:bitcoin_base/src/bitcoin/amount/amount.dart';
 import 'package:bitcoin_base/src/provider/api_provider.dart';
 import 'dart:async';
 
-import 'package:blockchain_utils/exception/exceptions.dart';
+typedef ListenerCallback<T> = StreamSubscription<T> Function(
+  void Function(T)? onData, {
+  Function? onError,
+  void Function()? onDone,
+  bool? cancelOnError,
+});
 
 class ElectrumApiProvider {
   final BitcoinBaseElectrumRPCService rpc;
-  ElectrumApiProvider(this.rpc);
+  ElectrumApiProvider._(this.rpc);
   int _id = 0;
+  Timer? _aliveTimer;
+
+  static Future<ElectrumApiProvider> connect(Future<BitcoinBaseElectrumRPCService> rpc) async {
+    final provider = ElectrumApiProvider._(await rpc);
+    provider.keepAlive();
+    return provider;
+  }
 
   /// Sends a request to the Electrum server using the specified [request] parameter.
   ///
   /// The [timeout] parameter, if provided, sets the maximum duration for the request.
-  Future<T> request<T>(ElectrumRequest<T, dynamic> request, [Duration? timeout]) async {
+  Future<T> request<T, U>(ElectrumRequest<T, U> request, [Duration? timeout]) async {
     final id = ++_id;
     final params = request.toRequest(id);
-    final data = await rpc.call(params, timeout);
-    return request.onResonse(_findResult(data, params));
+    final result = await rpc.call<U>(params, timeout);
+    return request.onResponse(result);
+  }
+
+  // Preserving generic type T in subscribe method
+  ListenerCallback<T>? subscribe<T, U>(ElectrumRequest<T, U> request) {
+    final id = ++_id;
+    final params = request.toRequest(id);
+    final subscription = rpc.subscribe<U>(params);
+
+    if (subscription == null) return null;
+
+    try {
+      // Create a transformer that uses the request's response handler
+      final stream = subscription.subscription.map(request.onResponse);
+
+      // Return a properly typed listener callback
+      return (
+        void Function(T)? onData, {
+        Function? onError,
+        void Function()? onDone,
+        bool? cancelOnError,
+      }) {
+        return stream.listen(
+          onData,
+          onError: onError,
+          onDone: onDone,
+          cancelOnError: cancelOnError,
+        );
+      };
+    } catch (_) {
+      return null;
+    }
   }
 
-  dynamic _findResult(Map<String, dynamic> data, ElectrumRequestDetails request) {
-    if (data["error"] != null) {
-      final code = int.tryParse(((data["error"]?['code']?.toString()) ?? "0")) ?? 0;
-      final message = data["error"]?['message'] ?? "";
-      throw RPCError(
-        errorCode: code,
-        message: message,
-        data: data["error"]?["data"],
-        request: data["request"] ?? request.params,
-      );
+  Future<List<int>> getFeeRates() async {
+    try {
+      final topDoubleString = await request(ElectrumEstimateFee(numberOfBlock: 1));
+      final middleDoubleString = await request(ElectrumEstimateFee(numberOfBlock: 5));
+      final bottomDoubleString = await request(ElectrumEstimateFee(numberOfBlock: 10));
+      final top =
+          (BitcoinAmountUtils.stringDoubleToBitcoinAmount(topDoubleString.toString()) / 1000)
+              .round();
+      final middle =
+          (BitcoinAmountUtils.stringDoubleToBitcoinAmount(middleDoubleString.toString()) / 1000)
+              .round();
+      final bottom =
+          (BitcoinAmountUtils.stringDoubleToBitcoinAmount(bottomDoubleString.toString()) / 1000)
+              .round();
+
+      return [bottom, middle, top];
+    } catch (_) {
+      return [];
     }
+  }
+
+  void keepAlive() {
+    _aliveTimer?.cancel();
+    _aliveTimer = Timer.periodic(const Duration(seconds: 6), (_) async => ping());
+  }
 
-    return data["result"];
+  void ping() async {
+    try {
+      return await request(ElectrumPing());
+    } catch (_) {}
   }
 }
diff --git a/lib/src/provider/electrum_methods/methods.dart b/lib/src/provider/electrum_methods/methods.dart
index 052a047..39733df 100644
--- a/lib/src/provider/electrum_methods/methods.dart
+++ b/lib/src/provider/electrum_methods/methods.dart
@@ -27,3 +27,4 @@ export 'methods/relay_fee.dart';
 export 'methods/scripthash_unsubscribe.dart';
 export 'methods/server_peer_subscribe.dart';
 export 'methods/status.dart';
+export 'methods/tweaks_subscribe.dart';
diff --git a/lib/src/provider/electrum_methods/methods/add_peer.dart b/lib/src/provider/electrum_methods/methods/add_peer.dart
index fb23bba..2488bb1 100644
--- a/lib/src/provider/electrum_methods/methods/add_peer.dart
+++ b/lib/src/provider/electrum_methods/methods/add_peer.dart
@@ -21,7 +21,7 @@ class ElectrumAddPeer extends ElectrumRequest<bool, bool> {
   /// A boolean indicating whether the request was tentatively accepted
   /// The requesting server will appear in server.peers.subscribe() when further sanity checks complete successfully.
   @override
-  bool onResonse(result) {
+  bool onResponse(result) {
     return result;
   }
 }
diff --git a/lib/src/provider/electrum_methods/methods/block_headers.dart b/lib/src/provider/electrum_methods/methods/block_headers.dart
index ef75150..2f24a6a 100644
--- a/lib/src/provider/electrum_methods/methods/block_headers.dart
+++ b/lib/src/provider/electrum_methods/methods/block_headers.dart
@@ -2,10 +2,8 @@ import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
 
 /// Return a concatenated chunk of block headers from the main chain.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumBlockHeaders
-    extends ElectrumRequest<Map<String, dynamic>, Map<String, dynamic>> {
-  ElectrumBlockHeaders(
-      {required this.startHeight, required this.count, required this.cpHeight});
+class ElectrumBlockHeaders extends ElectrumRequest<Map<String, dynamic>, Map<String, dynamic>> {
+  ElectrumBlockHeaders({required this.startHeight, required this.count, required this.cpHeight});
 
   /// The height of the first header requested, a non-negative integer.
   final int startHeight;
@@ -27,7 +25,7 @@ class ElectrumBlockHeaders
 
   /// A dictionary
   @override
-  Map<String, dynamic> onResonse(result) {
+  Map<String, dynamic> onResponse(result) {
     return result;
   }
 }
diff --git a/lib/src/provider/electrum_methods/methods/broad_cast.dart b/lib/src/provider/electrum_methods/methods/broad_cast.dart
index fef43d0..1dfdc1c 100644
--- a/lib/src/provider/electrum_methods/methods/broad_cast.dart
+++ b/lib/src/provider/electrum_methods/methods/broad_cast.dart
@@ -11,7 +11,7 @@ class ElectrumBroadCastTransaction extends ElectrumRequest<String, String> {
 
   /// blockchain.transaction.broadcast
   @override
-  String get method => ElectrumRequestMethods.broadCast.method;
+  String get method => ElectrumRequestMethods.broadcast.method;
 
   @override
   List toJson() {
@@ -20,7 +20,7 @@ class ElectrumBroadCastTransaction extends ElectrumRequest<String, String> {
 
   /// The transaction hash as a hexadecimal string.
   @override
-  String onResonse(result) {
+  String onResponse(result) {
     return result;
   }
 }
diff --git a/lib/src/provider/electrum_methods/methods/donate_address.dart b/lib/src/provider/electrum_methods/methods/donate_address.dart
index 4f59989..f66127f 100644
--- a/lib/src/provider/electrum_methods/methods/donate_address.dart
+++ b/lib/src/provider/electrum_methods/methods/donate_address.dart
@@ -13,7 +13,7 @@ class ElectrumDonationAddress extends ElectrumRequest<String, String> {
   }
 
   @override
-  String onResonse(result) {
+  String onResponse(result) {
     return result;
   }
 }
diff --git a/lib/src/provider/electrum_methods/methods/electrum_version.dart b/lib/src/provider/electrum_methods/methods/electrum_version.dart
index 1a1f858..5fb0e63 100644
--- a/lib/src/provider/electrum_methods/methods/electrum_version.dart
+++ b/lib/src/provider/electrum_methods/methods/electrum_version.dart
@@ -22,7 +22,7 @@ class ElectrumVersion extends ElectrumRequest<List<String>, List<dynamic>> {
 
   /// identifying the server and the protocol version that will be used for future communication.
   @override
-  List<String> onResonse(result) {
+  List<String> onResponse(result) {
     return List<String>.from(result);
   }
 }
diff --git a/lib/src/provider/electrum_methods/methods/estimate_fee.dart b/lib/src/provider/electrum_methods/methods/estimate_fee.dart
index 9e3b2f5..5e59971 100644
--- a/lib/src/provider/electrum_methods/methods/estimate_fee.dart
+++ b/lib/src/provider/electrum_methods/methods/estimate_fee.dart
@@ -20,7 +20,7 @@ class ElectrumEstimateFee extends ElectrumRequest<BigInt, dynamic> {
 
   /// The estimated transaction fee in Bigint(satoshi)
   @override
-  BigInt onResonse(result) {
+  BigInt onResponse(result) {
     return BtcUtils.toSatoshi(result.toString()).abs();
   }
 }
diff --git a/lib/src/provider/electrum_methods/methods/get_balance.dart b/lib/src/provider/electrum_methods/methods/get_balance.dart
index c9a49e0..a8a0ef9 100644
--- a/lib/src/provider/electrum_methods/methods/get_balance.dart
+++ b/lib/src/provider/electrum_methods/methods/get_balance.dart
@@ -22,7 +22,7 @@ class ElectrumGetScriptHashBalance
   /// A dictionary with keys confirmed and unconfirmed.
   /// The value of each is the appropriate balance in minimum coin units (satoshis).
   @override
-  Map<String, dynamic> onResonse(Map<String, dynamic> result) {
+  Map<String, dynamic> onResponse(Map<String, dynamic> result) {
     return result;
   }
 }
diff --git a/lib/src/provider/electrum_methods/methods/get_fee_histogram.dart b/lib/src/provider/electrum_methods/methods/get_fee_histogram.dart
index 8c89c23..512da7a 100644
--- a/lib/src/provider/electrum_methods/methods/get_fee_histogram.dart
+++ b/lib/src/provider/electrum_methods/methods/get_fee_histogram.dart
@@ -3,8 +3,7 @@ import 'package:bitcoin_base/src/provider/service/electrum/params.dart';
 
 /// Return a histogram of the fee rates paid by transactions in the memory pool, weighted by transaction size.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumGetFeeHistogram
-    extends ElectrumRequest<List<List<int>>, List<dynamic>> {
+class ElectrumGetFeeHistogram extends ElectrumRequest<List<List<int>>, List<dynamic>> {
   /// mempool.get_fee_histogram
   @override
   String get method => ElectrumRequestMethods.getFeeHistogram.method;
@@ -19,7 +18,7 @@ class ElectrumGetFeeHistogram
   /// fee uses sat/vbyte as unit, and must be a non-negative integer or float.
   /// vsize uses vbyte as unit, and must be a non-negative integer.
   @override
-  List<List<int>> onResonse(result) {
+  List<List<int>> onResponse(result) {
     return result.map((e) => List<int>.from(e)).toList();
   }
 }
diff --git a/lib/src/provider/electrum_methods/methods/get_history.dart b/lib/src/provider/electrum_methods/methods/get_history.dart
index 9f8efa2..ccf3ccd 100644
--- a/lib/src/provider/electrum_methods/methods/get_history.dart
+++ b/lib/src/provider/electrum_methods/methods/get_history.dart
@@ -23,7 +23,7 @@ class ElectrumScriptHashGetHistory
   ///  with the output of blockchain.scripthash.get_mempool() appended to the list.
   ///  Each confirmed transaction is a dictionary
   @override
-  List<Map<String, dynamic>> onResonse(List<dynamic> result) {
+  List<Map<String, dynamic>> onResponse(List<dynamic> result) {
     return result.map((e) => Map<String, dynamic>.from(e)).toList();
   }
 }
diff --git a/lib/src/provider/electrum_methods/methods/get_mempool.dart b/lib/src/provider/electrum_methods/methods/get_mempool.dart
index fcd33a2..3fc91a7 100644
--- a/lib/src/provider/electrum_methods/methods/get_mempool.dart
+++ b/lib/src/provider/electrum_methods/methods/get_mempool.dart
@@ -21,7 +21,7 @@ class ElectrumScriptHashGetMempool
 
   /// A list of mempool transactions in arbitrary order. Each mempool transaction is a dictionary
   @override
-  List<Map<String, dynamic>> onResonse(List<dynamic> result) {
+  List<Map<String, dynamic>> onResponse(List<dynamic> result) {
     return result.map((e) => Map<String, dynamic>.from(e)).toList();
   }
 }
diff --git a/lib/src/provider/electrum_methods/methods/get_merkle.dart b/lib/src/provider/electrum_methods/methods/get_merkle.dart
index a39cd8a..a4d196c 100644
--- a/lib/src/provider/electrum_methods/methods/get_merkle.dart
+++ b/lib/src/provider/electrum_methods/methods/get_merkle.dart
@@ -3,8 +3,7 @@ import 'package:bitcoin_base/src/provider/service/electrum/params.dart';
 
 /// Return the merkle branch to a confirmed transaction given its hash and height.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumGetMerkle
-    extends ElectrumRequest<Map<String, dynamic>, Map<String, dynamic>> {
+class ElectrumGetMerkle extends ElectrumRequest<Map<String, dynamic>, Map<String, dynamic>> {
   ElectrumGetMerkle({required this.transactionHash, required this.height});
 
   /// The transaction hash as a hexadecimal string.
@@ -23,7 +22,7 @@ class ElectrumGetMerkle
   }
 
   @override
-  Map<String, dynamic> onResonse(result) {
+  Map<String, dynamic> onResponse(result) {
     return result;
   }
 }
diff --git a/lib/src/provider/electrum_methods/methods/get_transaction.dart b/lib/src/provider/electrum_methods/methods/get_transaction.dart
index f18dd84..2fbb74a 100644
--- a/lib/src/provider/electrum_methods/methods/get_transaction.dart
+++ b/lib/src/provider/electrum_methods/methods/get_transaction.dart
@@ -3,14 +3,38 @@ import 'package:bitcoin_base/src/provider/service/electrum/params.dart';
 
 /// Return a raw transaction.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumGetTransaction extends ElectrumRequest<dynamic, dynamic> {
-  ElectrumGetTransaction({required this.transactionHash, this.verbose = false});
+class ElectrumGetTransactionHex extends ElectrumRequest<String, String> {
+  ElectrumGetTransactionHex({required this.transactionHash});
 
   /// The transaction hash as a hexadecimal string.
   final String transactionHash;
 
-  /// Whether a verbose coin-specific response is required.
-  final bool verbose;
+  /// blockchain.transaction.get
+  @override
+  String get method => ElectrumRequestMethods.getTransaction.method;
+
+  @override
+  List toJson() {
+    return [transactionHash, false];
+  }
+
+  /// If verbose is false:
+  /// The raw transaction as a hexadecimal string.
+  ///
+  /// If verbose is true:
+  /// The result is a coin-specific dictionary – whatever the coin daemon returns when asked for a verbose form of the raw transaction.
+  @override
+  String onResponse(result) {
+    return result;
+  }
+}
+
+class ElectrumGetTransactionVerbose
+    extends ElectrumRequest<Map<String, dynamic>, Map<String, dynamic>> {
+  ElectrumGetTransactionVerbose({required this.transactionHash});
+
+  /// The transaction hash as a hexadecimal string.
+  final String transactionHash;
 
   /// blockchain.transaction.get
   @override
@@ -18,7 +42,7 @@ class ElectrumGetTransaction extends ElectrumRequest<dynamic, dynamic> {
 
   @override
   List toJson() {
-    return [transactionHash, verbose];
+    return [transactionHash, true];
   }
 
   /// If verbose is false:
@@ -27,7 +51,7 @@ class ElectrumGetTransaction extends ElectrumRequest<dynamic, dynamic> {
   /// If verbose is true:
   /// The result is a coin-specific dictionary – whatever the coin daemon returns when asked for a verbose form of the raw transaction.
   @override
-  dynamic onResonse(result) {
+  Map<String, dynamic> onResponse(result) {
     return result;
   }
 }
diff --git a/lib/src/provider/electrum_methods/methods/get_unspet.dart b/lib/src/provider/electrum_methods/methods/get_unspet.dart
index 2a957d1..c9e3dd1 100644
--- a/lib/src/provider/electrum_methods/methods/get_unspet.dart
+++ b/lib/src/provider/electrum_methods/methods/get_unspet.dart
@@ -4,10 +4,8 @@ import 'package:bitcoin_base/src/provider/service/electrum/params.dart';
 
 /// Return an ordered list of UTXOs sent to a script hash.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumScriptHashListUnspent
-    extends ElectrumRequest<List<ElectrumUtxo>, List<dynamic>> {
-  ElectrumScriptHashListUnspent(
-      {required this.scriptHash, this.includeTokens = false});
+class ElectrumScriptHashListUnspent extends ElectrumRequest<List<ElectrumUtxo>, List<dynamic>> {
+  ElectrumScriptHashListUnspent({required this.scriptHash, this.includeTokens = false});
 
   /// The script hash as a hexadecimal string (BitcoinBaseAddress.pubKeyHash())
   final String scriptHash;
@@ -29,9 +27,8 @@ class ElectrumScriptHashListUnspent
   /// Mempool transactions paying to the address are included at the end of the list in an undefined order.
   /// Any output that is spent in the mempool does not appear.
   @override
-  List<ElectrumUtxo> onResonse(result) {
-    final List<ElectrumUtxo> utxos =
-        result.map((e) => ElectrumUtxo.fromJson(e)).toList();
+  List<ElectrumUtxo> onResponse(result) {
+    final List<ElectrumUtxo> utxos = result.map((e) => ElectrumUtxo.fromJson(e)).toList();
     return utxos;
   }
 }
diff --git a/lib/src/provider/electrum_methods/methods/get_value_proof.dart b/lib/src/provider/electrum_methods/methods/get_value_proof.dart
index bebe814..8bfe134 100644
--- a/lib/src/provider/electrum_methods/methods/get_value_proof.dart
+++ b/lib/src/provider/electrum_methods/methods/get_value_proof.dart
@@ -25,7 +25,7 @@ class ElectrumGetValueProof
   /// from the most recent update back to either the registration transaction or a
   /// checkpointed transaction (whichever is later).
   @override
-  Map<String, dynamic> onResonse(result) {
+  Map<String, dynamic> onResponse(result) {
     return Map<String, dynamic>.from(result);
   }
 }
diff --git a/lib/src/provider/electrum_methods/methods/header.dart b/lib/src/provider/electrum_methods/methods/header.dart
index 97120b5..f961340 100644
--- a/lib/src/provider/electrum_methods/methods/header.dart
+++ b/lib/src/provider/electrum_methods/methods/header.dart
@@ -22,7 +22,7 @@ class ElectrumBlockHeader extends ElectrumRequest<dynamic, dynamic> {
   /// This provides a proof that the given header is present in the blockchain;
   /// presumably the client has the merkle root hard-coded as a checkpoint.
   @override
-  dynamic onResonse(result) {
+  dynamic onResponse(result) {
     return result;
   }
 }
diff --git a/lib/src/provider/electrum_methods/methods/headers_subscribe.dart b/lib/src/provider/electrum_methods/methods/headers_subscribe.dart
index 651c695..2d681b5 100644
--- a/lib/src/provider/electrum_methods/methods/headers_subscribe.dart
+++ b/lib/src/provider/electrum_methods/methods/headers_subscribe.dart
@@ -1,9 +1,24 @@
 import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
 
+class ElectrumHeaderResponse {
+  final String hex;
+  final int height;
+
+  ElectrumHeaderResponse(this.hex, this.height);
+
+  factory ElectrumHeaderResponse.fromJson(Map<String, dynamic> json) {
+    return ElectrumHeaderResponse(json['hex'], json['height']);
+  }
+
+  Map<String, dynamic> toJson() {
+    return {'hex': hex, 'height': height};
+  }
+}
+
 /// Subscribe to receive block headers when a new block is found.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
 class ElectrumHeaderSubscribe
-    extends ElectrumRequest<Map<String, dynamic>, Map<String, dynamic>> {
+    extends ElectrumRequest<ElectrumHeaderResponse, Map<String, dynamic>> {
   /// blockchain.headers.subscribe
   @override
   String get method => ElectrumRequestMethods.headersSubscribe.method;
@@ -15,7 +30,7 @@ class ElectrumHeaderSubscribe
 
   /// The header of the current block chain tip.
   @override
-  Map<String, dynamic> onResonse(result) {
-    return result;
+  ElectrumHeaderResponse onResponse(result) {
+    return ElectrumHeaderResponse.fromJson(result);
   }
 }
diff --git a/lib/src/provider/electrum_methods/methods/id_from_pos.dart b/lib/src/provider/electrum_methods/methods/id_from_pos.dart
index 865f0b2..cf7b2e8 100644
--- a/lib/src/provider/electrum_methods/methods/id_from_pos.dart
+++ b/lib/src/provider/electrum_methods/methods/id_from_pos.dart
@@ -27,7 +27,7 @@ class ElectrumIdFromPos extends ElectrumRequest<dynamic, dynamic> {
 
   /// If merkle is false, the transaction hash as a hexadecimal string. If true, a dictionary
   @override
-  dynamic onResonse(result) {
+  dynamic onResponse(result) {
     return result;
   }
 }
diff --git a/lib/src/provider/electrum_methods/methods/masternode_announce_broadcast.dart b/lib/src/provider/electrum_methods/methods/masternode_announce_broadcast.dart
index f3169d3..64be82a 100644
--- a/lib/src/provider/electrum_methods/methods/masternode_announce_broadcast.dart
+++ b/lib/src/provider/electrum_methods/methods/masternode_announce_broadcast.dart
@@ -20,7 +20,7 @@ class ElectrumMasternodeAnnounceBroadcast extends ElectrumRequest<bool, bool> {
 
   /// true if the message was broadcasted successfully otherwise false.
   @override
-  bool onResonse(result) {
+  bool onResponse(result) {
     return result;
   }
 }
diff --git a/lib/src/provider/electrum_methods/methods/masternode_list.dart b/lib/src/provider/electrum_methods/methods/masternode_list.dart
index 437dc3b..316767d 100644
--- a/lib/src/provider/electrum_methods/methods/masternode_list.dart
+++ b/lib/src/provider/electrum_methods/methods/masternode_list.dart
@@ -2,8 +2,7 @@ import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
 
 /// Returns the list of masternodes.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumMasternodeList
-    extends ElectrumRequest<List<String>, List<dynamic>> {
+class ElectrumMasternodeList extends ElectrumRequest<List<String>, List<dynamic>> {
   ElectrumMasternodeList({required this.payees});
 
   /// An array of masternode payee addresses.
@@ -20,7 +19,7 @@ class ElectrumMasternodeList
 
   /// An array with the masternodes information.
   @override
-  List<String> onResonse(result) {
+  List<String> onResponse(result) {
     return List<String>.from(result);
   }
 }
diff --git a/lib/src/provider/electrum_methods/methods/masternode_subscribe.dart b/lib/src/provider/electrum_methods/methods/masternode_subscribe.dart
index 2734415..e9b1445 100644
--- a/lib/src/provider/electrum_methods/methods/masternode_subscribe.dart
+++ b/lib/src/provider/electrum_methods/methods/masternode_subscribe.dart
@@ -22,7 +22,7 @@ class ElectrumMasternodeSubscribe extends ElectrumRequest<String, String> {
   /// the internet connection, the offline time and even the collateral
   /// amount, so this subscription notice these changes to the user.
   @override
-  String onResonse(result) {
+  String onResponse(result) {
     return result;
   }
 }
diff --git a/lib/src/provider/electrum_methods/methods/ping.dart b/lib/src/provider/electrum_methods/methods/ping.dart
index 4d41704..d29fdb8 100644
--- a/lib/src/provider/electrum_methods/methods/ping.dart
+++ b/lib/src/provider/electrum_methods/methods/ping.dart
@@ -12,7 +12,7 @@ class ElectrumPing extends ElectrumRequest<dynamic, dynamic> {
   }
 
   @override
-  dynamic onResonse(result) {
+  dynamic onResponse(result) {
     return null;
   }
 }
diff --git a/lib/src/provider/electrum_methods/methods/protx_diff.dart b/lib/src/provider/electrum_methods/methods/protx_diff.dart
index cca5d7d..7004fae 100644
--- a/lib/src/provider/electrum_methods/methods/protx_diff.dart
+++ b/lib/src/provider/electrum_methods/methods/protx_diff.dart
@@ -22,7 +22,7 @@ class ElectrumProtXDiff extends ElectrumRequest<Map<String, dynamic>, dynamic> {
 
   /// A dictionary with deterministic masternode lists diff plus proof data.
   @override
-  Map<String, dynamic> onResonse(result) {
+  Map<String, dynamic> onResponse(result) {
     return Map<String, dynamic>.from(result);
   }
 }
diff --git a/lib/src/provider/electrum_methods/methods/protx_info.dart b/lib/src/provider/electrum_methods/methods/protx_info.dart
index 7685699..1f78505 100644
--- a/lib/src/provider/electrum_methods/methods/protx_info.dart
+++ b/lib/src/provider/electrum_methods/methods/protx_info.dart
@@ -19,7 +19,7 @@ class ElectrumProtXInfo extends ElectrumRequest<Map<String, dynamic>, dynamic> {
 
   /// A dictionary with detailed deterministic masternode data
   @override
-  Map<String, dynamic> onResonse(result) {
+  Map<String, dynamic> onResponse(result) {
     return Map<String, dynamic>.from(result);
   }
 }
diff --git a/lib/src/provider/electrum_methods/methods/relay_fee.dart b/lib/src/provider/electrum_methods/methods/relay_fee.dart
index 267dccf..aea1478 100644
--- a/lib/src/provider/electrum_methods/methods/relay_fee.dart
+++ b/lib/src/provider/electrum_methods/methods/relay_fee.dart
@@ -15,7 +15,7 @@ class ElectrumRelayFee extends ElectrumRequest<BigInt, dynamic> {
 
   /// relay fee in Bigint(satoshi)
   @override
-  BigInt onResonse(result) {
+  BigInt onResponse(result) {
     return BtcUtils.toSatoshi(result.toString());
   }
 }
diff --git a/lib/src/provider/electrum_methods/methods/scripthash_unsubscribe.dart b/lib/src/provider/electrum_methods/methods/scripthash_unsubscribe.dart
index 4990b6d..90cfcb8 100644
--- a/lib/src/provider/electrum_methods/methods/scripthash_unsubscribe.dart
+++ b/lib/src/provider/electrum_methods/methods/scripthash_unsubscribe.dart
@@ -21,7 +21,7 @@ class ElectrumScriptHashUnSubscribe extends ElectrumRequest<bool, bool> {
   /// otherwise False. Note that False might be returned even
   /// for something subscribed to earlier, because the server can drop subscriptions in rare circumstances.
   @override
-  bool onResonse(result) {
+  bool onResponse(result) {
     return result;
   }
 }
diff --git a/lib/src/provider/electrum_methods/methods/server_banner.dart b/lib/src/provider/electrum_methods/methods/server_banner.dart
index 92e3ab4..4a2c0ac 100644
--- a/lib/src/provider/electrum_methods/methods/server_banner.dart
+++ b/lib/src/provider/electrum_methods/methods/server_banner.dart
@@ -12,7 +12,7 @@ class ElectrumServerBanner extends ElectrumRequest<String, dynamic> {
   }
 
   @override
-  String onResonse(result) {
+  String onResponse(result) {
     return result.toString();
   }
 }
diff --git a/lib/src/provider/electrum_methods/methods/server_features.dart b/lib/src/provider/electrum_methods/methods/server_features.dart
index 7e9c939..725d6ef 100644
--- a/lib/src/provider/electrum_methods/methods/server_features.dart
+++ b/lib/src/provider/electrum_methods/methods/server_features.dart
@@ -15,7 +15,7 @@ class ElectrumServerFeatures extends ElectrumRequest<dynamic, dynamic> {
   /// A dictionary of keys and values. Each key represents a feature or service of the server,
   ///  and the value gives additional information.
   @override
-  dynamic onResonse(result) {
+  dynamic onResponse(result) {
     return result;
   }
 }
diff --git a/lib/src/provider/electrum_methods/methods/server_peer_subscribe.dart b/lib/src/provider/electrum_methods/methods/server_peer_subscribe.dart
index d1a3db5..04e8709 100644
--- a/lib/src/provider/electrum_methods/methods/server_peer_subscribe.dart
+++ b/lib/src/provider/electrum_methods/methods/server_peer_subscribe.dart
@@ -2,8 +2,7 @@ import 'package:bitcoin_base/src/provider/api_provider.dart';
 
 /// Return a list of peer servers. Despite the name this is not a subscription and the server must send no notifications..
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumServerPeersSubscribe
-    extends ElectrumRequest<List<dynamic>, List<dynamic>> {
+class ElectrumServerPeersSubscribe extends ElectrumRequest<List<dynamic>, List<dynamic>> {
   /// server.peers.subscribe
   @override
   String get method => ElectrumRequestMethods.serverPeersSubscribe.method;
@@ -15,7 +14,7 @@ class ElectrumServerPeersSubscribe
 
   /// An array of peer servers, each returned as a 3-element array
   @override
-  List<dynamic> onResonse(result) {
+  List<dynamic> onResponse(result) {
     return result;
   }
 }
diff --git a/lib/src/provider/electrum_methods/methods/status.dart b/lib/src/provider/electrum_methods/methods/status.dart
index f12a0fa..2967676 100644
--- a/lib/src/provider/electrum_methods/methods/status.dart
+++ b/lib/src/provider/electrum_methods/methods/status.dart
@@ -2,8 +2,7 @@ import 'package:bitcoin_base/src/provider/api_provider.dart';
 
 /// Subscribe to a script hash.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumScriptHashSubscribe
-    extends ElectrumRequest<Map<String, dynamic>, dynamic> {
+class ElectrumScriptHashSubscribe extends ElectrumRequest<String, dynamic> {
   ElectrumScriptHashSubscribe({required this.scriptHash});
 
   /// /// The script hash as a hexadecimal string (BitcoinBaseAddress.pubKeyHash())
@@ -20,7 +19,7 @@ class ElectrumScriptHashSubscribe
 
   /// The status of the script hash.
   @override
-  Map<String, dynamic> onResonse(result) {
-    return Map<String, dynamic>.from(result);
+  String onResponse(result) {
+    return result;
   }
 }
diff --git a/lib/src/provider/electrum_methods/methods/tweaks_subscribe.dart b/lib/src/provider/electrum_methods/methods/tweaks_subscribe.dart
new file mode 100644
index 0000000..18cf2ee
--- /dev/null
+++ b/lib/src/provider/electrum_methods/methods/tweaks_subscribe.dart
@@ -0,0 +1,98 @@
+import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
+
+class TweakOutputData {
+  final int vout;
+  final int amount;
+  final dynamic spendingInput;
+
+  TweakOutputData({
+    required this.vout,
+    required this.amount,
+    this.spendingInput,
+  });
+}
+
+class TweakData {
+  final String tweak;
+  final Map<String, TweakOutputData> outputPubkeys;
+
+  TweakData({required this.tweak, required this.outputPubkeys});
+}
+
+class ElectrumTweaksSubscribeResponse {
+  final String? message;
+  final int block;
+  final Map<String, TweakData> blockTweaks;
+
+  ElectrumTweaksSubscribeResponse({required this.block, required this.blockTweaks, this.message});
+
+  factory ElectrumTweaksSubscribeResponse.fromJson(Map<String, dynamic> json) {
+    late int block;
+    final blockTweaks = <String, TweakData>{};
+
+    try {
+      for (final key in json.keys) {
+        block = int.parse(key);
+        final txs = json[key] as Map<String, dynamic>;
+
+        for (final txid in txs.keys) {
+          final tweakResponseData = txs[txid] as Map<String, dynamic>;
+
+          final tweakHex = tweakResponseData["tweak"].toString();
+          final outputPubkeys = (tweakResponseData["output_pubkeys"] as Map<dynamic, dynamic>);
+
+          final tweakOutputData = <String, TweakOutputData>{};
+
+          for (final vout in outputPubkeys.keys) {
+            final outputData = outputPubkeys[vout];
+            tweakOutputData[outputData[0]] = TweakOutputData(
+              vout: int.parse(vout.toString()),
+              amount: outputData[1],
+              spendingInput: outputData.length > 2 ? outputData[2] : null,
+            );
+          }
+
+          final tweakData = TweakData(tweak: tweakHex, outputPubkeys: tweakOutputData);
+          blockTweaks[txid] = tweakData;
+        }
+      }
+    } catch (_) {
+      return ElectrumTweaksSubscribeResponse(
+        message: json.containsKey('message') ? json['message'] : null,
+        block: 0,
+        blockTweaks: {},
+      );
+    }
+
+    return ElectrumTweaksSubscribeResponse(
+      message: json.containsKey('message') ? json['message'] : null,
+      block: block,
+      blockTweaks: blockTweaks,
+    );
+  }
+}
+
+/// Subscribe to receive block headers when a new block is found.
+/// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
+class ElectrumTweaksSubscribe
+    extends ElectrumRequest<ElectrumTweaksSubscribeResponse, Map<String, dynamic>> {
+  /// blockchain.tweaks.subscribe
+  ElectrumTweaksSubscribe({required this.height, required this.count});
+
+  final int height;
+  final int count;
+
+  @override
+  String get method => ElectrumRequestMethods.tweaksSubscribe.method;
+
+  @override
+  List toJson() {
+    return [height, count];
+  }
+
+  /// The header of the current block chain tip.
+  @override
+  ElectrumTweaksSubscribeResponse onResponse(result) {
+    return ElectrumTweaksSubscribeResponse.fromJson(result);
+  }
+}
diff --git a/lib/src/provider/models/config.dart b/lib/src/provider/models/config.dart
index 9369398..444098e 100644
--- a/lib/src/provider/models/config.dart
+++ b/lib/src/provider/models/config.dart
@@ -71,8 +71,7 @@ class APIConfig {
     }
 
     return APIConfig(
-        url:
-            "$baseUrl/addrs/###/?unspentOnly=true&includeScript=true&limit=2000",
+        url: "$baseUrl/addrs/###/?unspentOnly=true&includeScript=true&limit=2000",
         feeRate: baseUrl,
         transaction: "$baseUrl/txs/###",
         sendTransaction: "$baseUrl/txs/push",
@@ -82,18 +81,19 @@ class APIConfig {
         blockHeight: "$baseUrl/blocks/###");
   }
 
-  factory APIConfig.mempool(BasedUtxoNetwork network) {
-    String baseUrl;
-    switch (network) {
-      case BitcoinNetwork.mainnet:
-        baseUrl = BtcApiConst.mempoolMainBaseURL;
-        break;
-      case BitcoinNetwork.testnet:
-        baseUrl = BtcApiConst.mempoolBaseURL;
-        break;
-      default:
-        throw BitcoinBasePluginException(
-            "mempool does not support ${network.conf.coinName.name}");
+  factory APIConfig.mempool(BasedUtxoNetwork network, [String? baseUrl]) {
+    if (baseUrl == null) {
+      switch (network) {
+        case BitcoinNetwork.mainnet:
+          baseUrl = BtcApiConst.mempoolMainBaseURL;
+          break;
+        case BitcoinNetwork.testnet:
+          baseUrl = BtcApiConst.mempoolBaseURL;
+          break;
+        default:
+          throw BitcoinBasePluginException(
+              "mempool does not support ${network.conf.coinName.name}");
+      }
     }
 
     return APIConfig(
diff --git a/lib/src/provider/models/electrum/electrum_utxo.dart b/lib/src/provider/models/electrum/electrum_utxo.dart
index 9fd9abc..9ec03d7 100644
--- a/lib/src/provider/models/electrum/electrum_utxo.dart
+++ b/lib/src/provider/models/electrum/electrum_utxo.dart
@@ -30,11 +30,25 @@ class ElectrumUtxo implements UTXO {
   @override
   BitcoinUtxo toUtxo(BitcoinAddressType addressType) {
     return BitcoinUtxo(
-        txHash: txId,
-        value: value,
-        vout: vout,
-        scriptType: addressType,
-        blockHeight: height,
-        token: token);
+      txHash: txId,
+      value: value,
+      vout: vout,
+      scriptType: addressType,
+      blockHeight: height,
+      token: token,
+    );
+  }
+
+  Map<String, dynamic> toJson() {
+    return {
+      "height": height,
+      "tx_hash": txId,
+      "tx_pos": vout,
+      "value": value.toString(),
+    };
+  }
+
+  static List<ElectrumUtxo> fromJsonList(List<dynamic> json) {
+    return json.map((e) => ElectrumUtxo.fromJson(e)).toList();
   }
 }
diff --git a/lib/src/provider/models/fee_rate/fee_rate.dart b/lib/src/provider/models/fee_rate/fee_rate.dart
index 09c6312..37aa345 100644
--- a/lib/src/provider/models/fee_rate/fee_rate.dart
+++ b/lib/src/provider/models/fee_rate/fee_rate.dart
@@ -2,30 +2,45 @@ import 'package:bitcoin_base/src/exception/exception.dart';
 
 enum BitcoinFeeRateType { low, medium, high }
 
+class BitcoinFee {
+  BitcoinFee({int? satoshis, BigInt? bytes})
+      : satoshis = satoshis ?? _parseKbFees(bytes!),
+        bytes = bytes ?? _parseMempoolFees(satoshis!);
+
+  final int satoshis;
+  final BigInt bytes;
+
+  @override
+  String toString() {
+    return 'satoshis: $satoshis, bytes: $bytes';
+  }
+}
+
 class BitcoinFeeRate {
-  BitcoinFeeRate(
-      {required this.high,
-      required this.medium,
-      required this.low,
-      this.economyFee,
-      this.hourFee});
+  BitcoinFeeRate({
+    required this.high,
+    required this.medium,
+    required this.low,
+    this.economyFee,
+    this.minimumFee,
+  });
 
   /// High fee rate in satoshis per kilobyte
-  final BigInt high;
+  final BitcoinFee high;
 
   /// Medium fee rate in satoshis per kilobyte
-  final BigInt medium;
+  final BitcoinFee medium;
 
   /// low fee rate in satoshis per kilobyte
-  final BigInt low;
+  final BitcoinFee low;
 
   /// only mnenpool api
-  final BigInt? economyFee;
+  final BitcoinFee? economyFee;
 
   /// only mnenpool api
-  final BigInt? hourFee;
+  final BitcoinFee? minimumFee;
 
-  BigInt _feeRatrete(BitcoinFeeRateType feeRateType) {
+  BitcoinFee _feeRate(BitcoinFeeRateType feeRateType) {
     switch (feeRateType) {
       case BitcoinFeeRateType.low:
         return low;
@@ -36,6 +51,10 @@ class BitcoinFeeRate {
     }
   }
 
+  int toSat(BigInt feeRate) {
+    return _parseKbFees(feeRate);
+  }
+
   /// GetEstimate calculates the estimated fee in satoshis for a given transaction size
   /// and fee rate (in satoshis per kilobyte) using the formula:
   //
@@ -48,16 +67,15 @@ class BitcoinFeeRate {
   /// Returns:
   /// - BigInt: A BigInt containing the estimated fee in satoshis.
   BigInt getEstimate(int trSize,
-      {BigInt? customFeeRatePerKb,
-      BitcoinFeeRateType feeRateType = BitcoinFeeRateType.medium}) {
-    BigInt feeRate = customFeeRatePerKb ?? _feeRatrete(feeRateType);
+      {BigInt? customFeeRatePerKb, BitcoinFeeRateType feeRateType = BitcoinFeeRateType.medium}) {
+    BigInt feeRate = customFeeRatePerKb ?? _feeRate(feeRateType).bytes;
     final trSizeBigInt = BigInt.from(trSize);
     return (trSizeBigInt * feeRate) ~/ BigInt.from(1000);
   }
 
   @override
   String toString() {
-    return 'high: ${high.toString()} medium: ${medium.toString()} low: ${low.toString()}, economyFee: $economyFee hourFee: $hourFee';
+    return 'high: ${high.toString()} medium: ${medium.toString()} low: ${low.toString()}, economyFee: $economyFee minimumFee: $minimumFee';
   }
 
   /// NewBitcoinFeeRateFromMempool creates a BitcoinFeeRate structure from JSON data retrieved
@@ -65,14 +83,11 @@ class BitcoinFeeRate {
   /// information for high, medium, and low fee levels.
   factory BitcoinFeeRate.fromMempool(Map<String, dynamic> json) {
     return BitcoinFeeRate(
-      high: _parseMempoolFees(json['fastestFee']),
-      medium: _parseMempoolFees(json['halfHourFee']),
-      low: _parseMempoolFees(json['minimumFee']),
-      economyFee: json['economyFee'] == null
-          ? null
-          : _parseMempoolFees(json['economyFee']),
-      hourFee:
-          json['hourFee'] == null ? null : _parseMempoolFees(json['hourFee']),
+      high: BitcoinFee(satoshis: json['fastestFee']),
+      medium: BitcoinFee(satoshis: json['halfHourFee']),
+      low: BitcoinFee(satoshis: json['hourFee']),
+      economyFee: json['economyFee'] == null ? null : BitcoinFee(satoshis: json['economyFee']),
+      minimumFee: json['minimumFee'] == null ? null : BitcoinFee(satoshis: json['minimumFee']),
     );
   }
 
@@ -81,9 +96,10 @@ class BitcoinFeeRate {
   /// information for high, medium, and low fee levels.
   factory BitcoinFeeRate.fromBlockCypher(Map<String, dynamic> json) {
     return BitcoinFeeRate(
-        high: BigInt.from((json['high_fee_per_kb'] as int)),
-        medium: BigInt.from((json['medium_fee_per_kb'] as int)),
-        low: BigInt.from((json['low_fee_per_kb'] as int)));
+      high: BitcoinFee(bytes: BigInt.from((json['high_fee_per_kb'] as int))),
+      medium: BitcoinFee(bytes: BigInt.from((json['medium_fee_per_kb'] as int))),
+      low: BitcoinFee(bytes: BigInt.from((json['low_fee_per_kb'] as int))),
+    );
   }
 }
 
@@ -103,3 +119,12 @@ BigInt _parseMempoolFees(dynamic data) {
         "cannot parse mempool fees excepted double, string got ${data.runtimeType}");
   }
 }
+
+/// ParseMempoolFees takes a data dynamic and converts it to a BigInt representing
+/// mempool fees in satoshis per kilobyte (sat/KB). The function performs the conversion
+/// based on the type of the input data, which can be either a double (floating-point
+/// fee rate) or an int (integer fee rate in satoshis per byte).
+int _parseKbFees(BigInt fee) {
+  const kb = 1024;
+  return (fee.toInt() / kb).round();
+}
diff --git a/lib/src/provider/service/electrum/electrum.dart b/lib/src/provider/service/electrum/electrum.dart
index c8b56be..8be4045 100644
--- a/lib/src/provider/service/electrum/electrum.dart
+++ b/lib/src/provider/service/electrum/electrum.dart
@@ -1,3 +1,7 @@
 export 'methods.dart';
 export 'params.dart';
 export 'service.dart';
+export 'request_completer.dart';
+// export 'electrum_ssl_service.dart';
+export 'electrum_tcp_service.dart';
+// export 'electrum_websocket_service.dart';
diff --git a/lib/src/provider/service/electrum/electrum_ssl_service.dart b/lib/src/provider/service/electrum/electrum_ssl_service.dart
new file mode 100644
index 0000000..57e1cbd
--- /dev/null
+++ b/lib/src/provider/service/electrum/electrum_ssl_service.dart
@@ -0,0 +1,258 @@
+import 'dart:async';
+import 'dart:convert';
+import 'dart:io';
+import 'package:bitcoin_base/bitcoin_base.dart';
+import 'package:blockchain_utils/exception/exceptions.dart';
+
+class ElectrumSSLService implements BitcoinBaseElectrumRPCService {
+  ElectrumSSLService._(
+    this.url,
+    SecureSocket channel, {
+    this.defaultRequestTimeOut = const Duration(seconds: 30),
+    this.onConnectionStatusChange,
+  }) : _socket = channel {
+    _setConnectionStatus(ConnectionStatus.connected);
+    _subscription = _socket!.listen(_onMessage, onError: close, onDone: _onDone);
+  }
+  SecureSocket? _socket;
+  StreamSubscription<List<int>>? _subscription;
+  final Duration defaultRequestTimeOut;
+  String unterminatedString = '';
+  final Map<int, RPCError> _errors = {};
+  final Map<int, SocketTask> _tasks = {};
+
+  ConnectionStatus _connectionStatus = ConnectionStatus.connecting;
+  bool get _isDisconnected => _connectionStatus == ConnectionStatus.disconnected;
+  @override
+  bool get isConnected => !_isDisconnected;
+  void Function(ConnectionStatus)? onConnectionStatusChange;
+
+  @override
+  final String url;
+
+  void add(List<int> params) {
+    if (_isDisconnected) {
+      throw StateError("socket has been disconnected");
+    }
+    _socket?.add(params);
+  }
+
+  void _setConnectionStatus(ConnectionStatus status) {
+    onConnectionStatusChange?.call(status);
+    _connectionStatus = status;
+    if (!isConnected) {
+      try {
+        _socket?.destroy();
+      } catch (_) {}
+      _socket = null;
+    }
+  }
+
+  @override
+  void reconnect() {
+    if (_isDisconnected) {
+      _setConnectionStatus(ConnectionStatus.connecting);
+      connect(Uri.parse(url)).then((value) {
+        _setConnectionStatus(ConnectionStatus.connected);
+      }).catchError((e) {
+        _setConnectionStatus(ConnectionStatus.failed);
+      });
+    }
+  }
+
+  void close(Object? error) async {
+    await _socket?.close();
+    _socket = null;
+    _subscription?.cancel().catchError((e) {});
+    _subscription = null;
+
+    onConnectionStatusChange = null;
+  }
+
+  void _onDone() {
+    close(null);
+  }
+
+  @override
+  void disconnect() {
+    close(null);
+  }
+
+  static Future<ElectrumSSLService> connect(
+    Uri uri, {
+    Iterable<String>? protocols,
+    Duration defaultRequestTimeOut = const Duration(seconds: 30),
+    final Duration connectionTimeOut = const Duration(seconds: 30),
+    void Function(ConnectionStatus)? onConnectionStatusChange,
+  }) async {
+    final channel = await SecureSocket.connect(uri.host, uri.port).timeout(connectionTimeOut);
+
+    return ElectrumSSLService._(
+      uri.toString(),
+      channel,
+      defaultRequestTimeOut: defaultRequestTimeOut,
+      onConnectionStatusChange: onConnectionStatusChange,
+    );
+  }
+
+  void _parseResponse(String message) {
+    try {
+      final response = json.decode(message) as Map<String, dynamic>;
+      _handleResponse(response);
+    } on FormatException catch (e) {
+      final msg = e.message.toLowerCase();
+
+      if (e.source is String) {
+        unterminatedString += e.source as String;
+      }
+
+      if (msg.contains("not a subtype of type")) {
+        unterminatedString += e.source as String;
+        return;
+      }
+
+      if (isJSONStringCorrect(unterminatedString)) {
+        final response = json.decode(unterminatedString) as Map<String, dynamic>;
+        _handleResponse(response);
+        unterminatedString = '';
+      }
+    } on TypeError catch (e) {
+      if (!e.toString().contains('Map<String, Object>') &&
+          !e.toString().contains('Map<String, dynamic>')) {
+        return;
+      }
+
+      unterminatedString += message;
+
+      if (isJSONStringCorrect(unterminatedString)) {
+        final response = json.decode(unterminatedString) as Map<String, dynamic>;
+        _handleResponse(response);
+        // unterminatedString = null;
+        unterminatedString = '';
+      }
+    } catch (_) {}
+  }
+
+  void _handleResponse(Map<String, dynamic> response) {
+    var id = response['id'] as int?;
+    if (id == null) {
+      _tasks.forEach((key, value) {
+        if (value.request.method == response['method']) {
+          id = key;
+        }
+      });
+    }
+
+    try {
+      final result = _findResult(response, _tasks[id]!.request);
+
+      if (result != null) {
+        _finish(id!, result);
+      }
+    } catch (_) {}
+  }
+
+  void _onMessage(List<int> event) {
+    final msg = utf8.decode(event.toList());
+    final messagesList = msg.split("\n");
+    for (var message in messagesList) {
+      if (message.isEmpty) {
+        continue;
+      }
+
+      _parseResponse(message);
+    }
+  }
+
+  dynamic _findResult(dynamic data, ElectrumRequestDetails request) {
+    if (data["error"] != null) {
+      if (data["error"] is String) {
+        _errors[request.id] = RPCError(
+          data: data["error"],
+          errorCode: 0,
+          message: data["error"],
+          request: request.params,
+        );
+      } else {
+        final code = int.tryParse(((data["error"]?['code']?.toString()) ?? "0")) ?? 0;
+        final message = data["error"]?['message'] ?? "";
+        _errors[request.id] = RPCError(
+          errorCode: code,
+          message: message,
+          data: data["error"]?["data"],
+          request: data["request"] ?? request.params,
+        );
+      }
+
+      throw _errors[request.id]!;
+    }
+
+    return data["result"] ?? data["params"]?[0];
+  }
+
+  void _finish(int id, dynamic result) {
+    final task = _tasks[id];
+    if (task == null) {
+      return;
+    }
+
+    final notCompleted = task.completer != null && task.completer!.isCompleted == false;
+    if (notCompleted) {
+      task.completer!.complete(result);
+    }
+
+    if (!task.isSubscription) {
+      _tasks.remove(id);
+    } else {
+      task.subject?.add(result);
+    }
+  }
+
+  AsyncBehaviorSubject<T> _registerSubscription<T>(ElectrumRequestDetails params) {
+    final subscription = AsyncBehaviorSubject<T>(params.params);
+    _tasks[params.id] = SocketTask(
+      subject: subscription.subscription,
+      request: params,
+      isSubscription: true,
+    );
+    return subscription;
+  }
+
+  @override
+  AsyncBehaviorSubject<T>? subscribe<T>(ElectrumRequestDetails params) {
+    try {
+      final subscription = _registerSubscription<T>(params);
+      add(params.toTCPParams());
+
+      return subscription;
+    } catch (e) {
+      return null;
+    }
+  }
+
+  AsyncRequestCompleter<T> _registerTask<T>(ElectrumRequestDetails params) {
+    final completer = AsyncRequestCompleter<T>(params.params);
+
+    _tasks[params.id] = SocketTask(
+      completer: completer.completer,
+      request: params,
+      isSubscription: false,
+    );
+
+    return completer;
+  }
+
+  @override
+  Future<T> call<T>(ElectrumRequestDetails params, [Duration? timeout]) async {
+    try {
+      final completer = _registerTask<T>(params);
+      add(params.toTCPParams());
+      final result = await completer.completer.future.timeout(timeout ?? defaultRequestTimeOut);
+      return result;
+    } finally {
+      _tasks.remove(params.id);
+    }
+  }
+
+  String getErrorMessage(int id) => _errors[id]?.data ?? '';
+}
diff --git a/lib/src/provider/service/electrum/electrum_tcp_service.dart b/lib/src/provider/service/electrum/electrum_tcp_service.dart
new file mode 100644
index 0000000..ea965af
--- /dev/null
+++ b/lib/src/provider/service/electrum/electrum_tcp_service.dart
@@ -0,0 +1,258 @@
+import 'dart:async';
+import 'dart:convert';
+import 'dart:io';
+import 'package:bitcoin_base/bitcoin_base.dart';
+import 'package:blockchain_utils/exception/exceptions.dart';
+
+class ElectrumTCPService implements BitcoinBaseElectrumRPCService {
+  ElectrumTCPService._(
+    this.url,
+    Socket channel, {
+    this.defaultRequestTimeOut = const Duration(seconds: 30),
+    this.onConnectionStatusChange,
+  }) : _socket = channel {
+    _setConnectionStatus(ConnectionStatus.connected);
+    _subscription = _socket!.listen(_onMessage, onError: close, onDone: _onDone);
+  }
+  Socket? _socket;
+  StreamSubscription<List<int>>? _subscription;
+  final Duration defaultRequestTimeOut;
+  String unterminatedString = '';
+  final Map<int, RPCError> _errors = {};
+  final Map<int, SocketTask> _tasks = {};
+
+  ConnectionStatus _connectionStatus = ConnectionStatus.connecting;
+  bool get _isDisconnected => _connectionStatus == ConnectionStatus.disconnected;
+  @override
+  bool get isConnected => !_isDisconnected;
+  void Function(ConnectionStatus)? onConnectionStatusChange;
+
+  @override
+  final String url;
+
+  void add(List<int> params) {
+    if (_isDisconnected) {
+      throw StateError("socket has been disconnected");
+    }
+    _socket?.add(params);
+  }
+
+  void _setConnectionStatus(ConnectionStatus status) {
+    onConnectionStatusChange?.call(status);
+    _connectionStatus = status;
+    if (!isConnected) {
+      try {
+        _socket?.destroy();
+      } catch (_) {}
+      _socket = null;
+    }
+  }
+
+  @override
+  void reconnect() {
+    if (_isDisconnected) {
+      _setConnectionStatus(ConnectionStatus.connecting);
+      connect(Uri.parse(url)).then((value) {
+        _setConnectionStatus(ConnectionStatus.connected);
+      }).catchError((e) {
+        _setConnectionStatus(ConnectionStatus.failed);
+      });
+    }
+  }
+
+  void close(Object? error) async {
+    await _socket?.close();
+    _socket = null;
+    _subscription?.cancel().catchError((e) {});
+    _subscription = null;
+
+    onConnectionStatusChange = null;
+  }
+
+  void _onDone() {
+    close(null);
+  }
+
+  @override
+  void disconnect() {
+    close(null);
+  }
+
+  static Future<ElectrumTCPService> connect(
+    Uri uri, {
+    Iterable<String>? protocols,
+    Duration defaultRequestTimeOut = const Duration(seconds: 30),
+    final Duration connectionTimeOut = const Duration(seconds: 30),
+    void Function(ConnectionStatus)? onConnectionStatusChange,
+  }) async {
+    final channel = await Socket.connect(uri.host, uri.port).timeout(connectionTimeOut);
+
+    return ElectrumTCPService._(
+      uri.toString(),
+      channel,
+      defaultRequestTimeOut: defaultRequestTimeOut,
+      onConnectionStatusChange: onConnectionStatusChange,
+    );
+  }
+
+  void _parseResponse(String message) {
+    try {
+      final response = json.decode(message) as Map<String, dynamic>;
+      _handleResponse(response);
+    } on FormatException catch (e) {
+      final msg = e.message.toLowerCase();
+
+      if (e.source is String) {
+        unterminatedString += e.source as String;
+      }
+
+      if (msg.contains("not a subtype of type")) {
+        unterminatedString += e.source as String;
+        return;
+      }
+
+      if (isJSONStringCorrect(unterminatedString)) {
+        final response = json.decode(unterminatedString) as Map<String, dynamic>;
+        _handleResponse(response);
+        unterminatedString = '';
+      }
+    } on TypeError catch (e) {
+      if (!e.toString().contains('Map<String, Object>') &&
+          !e.toString().contains('Map<String, dynamic>')) {
+        return;
+      }
+
+      unterminatedString += message;
+
+      if (isJSONStringCorrect(unterminatedString)) {
+        final response = json.decode(unterminatedString) as Map<String, dynamic>;
+        _handleResponse(response);
+        // unterminatedString = null;
+        unterminatedString = '';
+      }
+    } catch (_) {}
+  }
+
+  void _handleResponse(Map<String, dynamic> response) {
+    var id = response['id'] as int?;
+    if (id == null) {
+      _tasks.forEach((key, value) {
+        if (value.request.method == response['method']) {
+          id = key;
+        }
+      });
+    }
+
+    try {
+      final result = _findResult(response, _tasks[id]!.request);
+
+      if (result != null) {
+        _finish(id!, result);
+      }
+    } catch (_) {}
+  }
+
+  void _onMessage(List<int> event) {
+    final msg = utf8.decode(event.toList());
+    final messagesList = msg.split("\n");
+    for (var message in messagesList) {
+      if (message.isEmpty) {
+        continue;
+      }
+
+      _parseResponse(message);
+    }
+  }
+
+  dynamic _findResult(dynamic data, ElectrumRequestDetails request) {
+    if (data["error"] != null) {
+      if (data["error"] is String) {
+        _errors[request.id] = RPCError(
+          data: data["error"],
+          errorCode: 0,
+          message: data["error"],
+          request: request.params,
+        );
+      } else {
+        final code = int.tryParse(((data["error"]?['code']?.toString()) ?? "0")) ?? 0;
+        final message = data["error"]?['message'] ?? "";
+        _errors[request.id] = RPCError(
+          errorCode: code,
+          message: message,
+          data: data["error"]?["data"],
+          request: data["request"] ?? request.params,
+        );
+      }
+
+      throw _errors[request.id]!;
+    }
+
+    return data["result"] ?? data["params"]?[0];
+  }
+
+  void _finish(int id, dynamic result) {
+    final task = _tasks[id];
+    if (task == null) {
+      return;
+    }
+
+    final notCompleted = task.completer != null && task.completer!.isCompleted == false;
+    if (notCompleted) {
+      task.completer!.complete(result);
+    }
+
+    if (!task.isSubscription) {
+      _tasks.remove(id);
+    } else {
+      task.subject?.add(result);
+    }
+  }
+
+  AsyncBehaviorSubject<T> _registerSubscription<T>(ElectrumRequestDetails params) {
+    final subscription = AsyncBehaviorSubject<T>(params.params);
+    _tasks[params.id] = SocketTask(
+      subject: subscription.subscription,
+      request: params,
+      isSubscription: true,
+    );
+    return subscription;
+  }
+
+  @override
+  AsyncBehaviorSubject<T>? subscribe<T>(ElectrumRequestDetails params) {
+    try {
+      final subscription = _registerSubscription<T>(params);
+      add(params.toTCPParams());
+
+      return subscription;
+    } catch (e) {
+      return null;
+    }
+  }
+
+  AsyncRequestCompleter<T> _registerTask<T>(ElectrumRequestDetails params) {
+    final completer = AsyncRequestCompleter<T>(params.params);
+
+    _tasks[params.id] = SocketTask(
+      completer: completer.completer,
+      request: params,
+      isSubscription: false,
+    );
+
+    return completer;
+  }
+
+  @override
+  Future<T> call<T>(ElectrumRequestDetails params, [Duration? timeout]) async {
+    try {
+      final completer = _registerTask<T>(params);
+      add(params.toTCPParams());
+      final result = await completer.completer.future.timeout(timeout ?? defaultRequestTimeOut);
+      return result;
+    } finally {
+      _tasks.remove(params.id);
+    }
+  }
+
+  String getErrorMessage(int id) => _errors[id]?.data ?? '';
+}
diff --git a/lib/src/provider/service/electrum/electrum_websocket_service.dart b/lib/src/provider/service/electrum/electrum_websocket_service.dart
new file mode 100644
index 0000000..1a460a6
--- /dev/null
+++ b/lib/src/provider/service/electrum/electrum_websocket_service.dart
@@ -0,0 +1,85 @@
+// import 'dart:async';
+// import 'dart:convert';
+// import 'package:bitcoin_base/bitcoin_base.dart';
+// import 'package:example/services_examples/cross_platform_websocket/core.dart';
+
+// class ElectrumWebSocketService implements BitcoinBaseElectrumRPCService {
+//   ElectrumWebSocketService._(
+//     this.url,
+//     WebSocketCore channel, {
+//     this.defaultRequestTimeOut = const Duration(seconds: 30),
+//   }) : _socket = channel {
+//     _subscription =
+//         channel.stream.cast<String>().listen(_onMessage, onError: _onClose, onDone: _onDone);
+//   }
+//   WebSocketCore? _socket;
+//   StreamSubscription<String>? _subscription;
+//   final Duration defaultRequestTimeOut;
+
+//   Map<int, AsyncRequestCompleter> requests = {};
+//   bool _isDisconnected = false;
+
+//   bool get isConnected => !_isDisconnected;
+
+//   @override
+//   final String url;
+
+//   void add(List<int> params) {
+//     if (_isDisconnected) {
+//       throw StateError("socket has been disconnected");
+//     }
+//     _socket?.sink(params);
+//   }
+
+//   void _onClose(Object? error) {
+//     _isDisconnected = true;
+
+//     _socket?.close();
+//     _socket = null;
+//     _subscription?.cancel().catchError((e) {});
+//     _subscription = null;
+//   }
+
+//   void _onDone() {
+//     _onClose(null);
+//   }
+
+//   @override
+//   void disconnect() {
+//     _onClose(null);
+//   }
+
+//   static Future<ElectrumWebSocketService> connect(
+//     String url, {
+//     Iterable<String>? protocols,
+//     Duration defaultRequestTimeOut = const Duration(seconds: 30),
+//     final Duration connectionTimeOut = const Duration(seconds: 30),
+//   }) async {
+//     final channel = await WebSocketCore.connect(url, protocols: protocols?.toList());
+
+//     return ElectrumWebSocketService._(url, channel, defaultRequestTimeOut: defaultRequestTimeOut);
+//   }
+
+//   void _onMessage(String event) {
+//     final Map<String, dynamic> decode = json.decode(event);
+//     if (decode.containsKey("id")) {
+//       final int id = int.parse(decode["id"]!.toString());
+//       final request = requests.remove(id);
+//       request?.completer.complete(decode);
+//     }
+//   }
+
+//   @override
+//   Future<Map<String, dynamic>> call(ElectrumRequestDetails params, [Duration? timeout]) async {
+//     final AsyncRequestCompleter compeleter = AsyncRequestCompleter(params.params);
+
+//     try {
+//       requests[params.id] = compeleter;
+//       add(params.toWebSocketParams());
+//       final result = await compeleter.completer.future.timeout(timeout ?? defaultRequestTimeOut);
+//       return result;
+//     } finally {
+//       requests.remove(params.id);
+//     }
+//   }
+// }
diff --git a/lib/src/provider/service/electrum/methods.dart b/lib/src/provider/service/electrum/methods.dart
index 66984e5..e5fe2df 100644
--- a/lib/src/provider/service/electrum/methods.dart
+++ b/lib/src/provider/service/electrum/methods.dart
@@ -15,20 +15,21 @@ class ElectrumRequestMethods {
   static const ElectrumRequestMethods serverAddPeer = ElectrumRequestMethods._("server.add_peer");
 
   /// Subscribe to a script hash.
+  static const String scripthashesSubscribeMethod = "blockchain.scripthash.subscribe";
   static const ElectrumRequestMethods scriptHashSubscribe =
-      ElectrumRequestMethods._("blockchain.scripthash.subscribe");
+      ElectrumRequestMethods._(scripthashesSubscribeMethod);
 
   /// Unsubscribe from a script hash, preventing future notifications if its status changes.
   static const ElectrumRequestMethods scriptHashUnSubscribe =
       ElectrumRequestMethods._("blockchain.scripthash.unsubscribe");
 
   /// Return an ordered list of UTXOs sent to a script hash.
-  static const ElectrumRequestMethods listunspent =
-      ElectrumRequestMethods._("blockchain.scripthash.listunspent");
+  static const String listunspentMethod = "blockchain.scripthash.listunspent";
+  static const ElectrumRequestMethods listunspent = ElectrumRequestMethods._(listunspentMethod);
 
   /// Return the confirmed and unconfirmed balances of a script hash.
-  static const ElectrumRequestMethods getBalance =
-      ElectrumRequestMethods._("blockchain.scripthash.get_balance");
+  static const String getBalanceMethod = "blockchain.scripthash.get_balance";
+  static const ElectrumRequestMethods getBalance = ElectrumRequestMethods._(getBalanceMethod);
 
   /// Return a raw transaction.
   static const ElectrumRequestMethods getTransaction =
@@ -59,16 +60,16 @@ class ElectrumRequestMethods {
       ElectrumRequestMethods._("blockchain.estimatefee");
 
   /// Return the confirmed and unconfirmed history of a script hash.
-  static const ElectrumRequestMethods getHistory =
-      ElectrumRequestMethods._("blockchain.scripthash.get_history");
+  static const String getHistoryMethod = "blockchain.scripthash.get_history";
+  static const ElectrumRequestMethods getHistory = ElectrumRequestMethods._(getHistoryMethod);
 
   /// Return the unconfirmed transactions of a script hash.
   static const ElectrumRequestMethods getMempool =
       ElectrumRequestMethods._("blockchain.scripthash.get_mempool");
 
   /// Broadcast a transaction to the network.
-  static const ElectrumRequestMethods broadCast =
-      ElectrumRequestMethods._("blockchain.transaction.broadcast");
+  static const String broadcastMethod = "blockchain.transaction.broadcast";
+  static const ElectrumRequestMethods broadcast = ElectrumRequestMethods._(broadcastMethod);
 
   /// Return a banner to be shown in the Electrum console.
   static const ElectrumRequestMethods serverBanner = ElectrumRequestMethods._("server.banner");
@@ -83,8 +84,14 @@ class ElectrumRequestMethods {
   static const ElectrumRequestMethods version = ElectrumRequestMethods._("server.version");
 
   /// Subscribe to receive block headers when a new block is found.
+  static const String headersSubscribeMethod = "blockchain.headers.subscribe";
   static const ElectrumRequestMethods headersSubscribe =
-      ElectrumRequestMethods._("blockchain.headers.subscribe");
+      ElectrumRequestMethods._(headersSubscribeMethod);
+
+  /// Subscribe to receive block headers when a new block is found.
+  static const String tweaksSubscribeMethod = "blockchain.tweaks.subscribe";
+  static const ElectrumRequestMethods tweaksSubscribe =
+      ElectrumRequestMethods._(tweaksSubscribeMethod);
 
   /// Return the minimum fee a low-priority transaction must pay in order to be accepted to the daemon’s memory pool.
   static const ElectrumRequestMethods relayFee = ElectrumRequestMethods._("blockchain.relayfee");
diff --git a/lib/src/provider/service/electrum/params.dart b/lib/src/provider/service/electrum/params.dart
index 2945af7..d253ff7 100644
--- a/lib/src/provider/service/electrum/params.dart
+++ b/lib/src/provider/service/electrum/params.dart
@@ -34,7 +34,7 @@ class ElectrumRequestDetails {
 abstract class ElectrumRequest<RESULT, RESPONSE> implements ElectrumRequestParams {
   String? get validate => null;
 
-  RESULT onResonse(RESPONSE result) {
+  RESULT onResponse(RESPONSE result) {
     return result as RESULT;
   }
 
diff --git a/lib/src/provider/service/electrum/request_completer.dart b/lib/src/provider/service/electrum/request_completer.dart
new file mode 100644
index 0000000..d238dbc
--- /dev/null
+++ b/lib/src/provider/service/electrum/request_completer.dart
@@ -0,0 +1,14 @@
+import 'dart:async';
+import 'package:rxdart/rxdart.dart';
+
+class AsyncRequestCompleter<T> {
+  AsyncRequestCompleter(this.params);
+  final Completer<T> completer = Completer<T>();
+  final Map<String, dynamic> params;
+}
+
+class AsyncBehaviorSubject<T> {
+  AsyncBehaviorSubject(this.params);
+  final BehaviorSubject<T> subscription = BehaviorSubject<T>();
+  final Map<String, dynamic> params;
+}
diff --git a/lib/src/provider/service/electrum/service.dart b/lib/src/provider/service/electrum/service.dart
index 03e4ca2..972641d 100644
--- a/lib/src/provider/service/electrum/service.dart
+++ b/lib/src/provider/service/electrum/service.dart
@@ -1,12 +1,50 @@
+import 'dart:convert';
+
 import 'package:bitcoin_base/src/provider/service/electrum/params.dart';
+import 'package:bitcoin_base/src/provider/service/electrum/request_completer.dart';
+import 'dart:async';
+import 'package:rxdart/rxdart.dart';
+
+enum ConnectionStatus { connected, disconnected, connecting, failed }
+
+class SocketTask {
+  SocketTask({
+    required this.isSubscription,
+    required this.request,
+    this.completer,
+    this.subject,
+  });
+
+  final Completer<dynamic>? completer;
+  final BehaviorSubject<dynamic>? subject;
+  final bool isSubscription;
+  final ElectrumRequestDetails request;
+}
+
+/// Abstract class for providing JSON-RPC service functionality.
+abstract class BitcoinBaseElectrumRPCService {
+  BitcoinBaseElectrumRPCService();
 
-/// A mixin for providing JSON-RPC service functionality.
-mixin BitcoinBaseElectrumRPCService {
   /// Represents the URL endpoint for JSON-RPC calls.
   String get url;
 
-  /// Makes an HTTP GET request to the Tron network with the specified [params].
+  AsyncBehaviorSubject<T>? subscribe<T>(ElectrumRequestDetails params);
+
+  /// Makes an HTTP GET request with the specified [params].
   ///
   /// The optional [timeout] parameter sets the maximum duration for the request.
-  Future<Map<String, dynamic>> call(ElectrumRequestDetails params, [Duration? timeout]);
+  Future<T> call<T>(ElectrumRequestDetails params, [Duration? timeout]);
+
+  bool get isConnected;
+  void disconnect();
+  void reconnect();
+}
+
+bool isJSONStringCorrect(String source) {
+  try {
+    json.decode(source);
+    return true;
+  } catch (_) {
+    return false;
+  }
 }
diff --git a/lib/src/provider/service/http/http_service.dart b/lib/src/provider/service/http/http_service.dart
index be0e94a..c0ddd78 100644
--- a/lib/src/provider/service/http/http_service.dart
+++ b/lib/src/provider/service/http/http_service.dart
@@ -1,3 +1,8 @@
+import 'dart:convert';
+
+import 'package:blockchain_utils/blockchain_utils.dart';
+import 'package:http/http.dart' as http;
+
 /// The [ApiService] abstract class defines a contract for making HTTP requests.
 abstract class ApiService {
   /// Performs an HTTP GET request to the specified [url].
@@ -15,3 +20,68 @@ abstract class ApiService {
   Future<T> post<T>(String url,
       {Map<String, String> headers = const {"Content-Type": "application/json"}, Object? body});
 }
+
+class ApiProviderException implements Exception {
+  final String message;
+  final int? statusCode;
+  final Map<String, dynamic>? responseData;
+  const ApiProviderException(this.message, [this.statusCode, this.responseData]);
+  @override
+  String toString() {
+    return "status: $statusCode $message ${responseData ?? ""}";
+  }
+}
+
+class BitcoinApiService implements ApiService {
+  BitcoinApiService([http.Client? client]) : _client = client ?? http.Client();
+  final http.Client _client;
+  @override
+  Future<T> get<T>(String url) async {
+    final response = await _client.get(Uri.parse(url));
+    return _readResponse<T>(response);
+  }
+
+  @override
+  Future<T> post<T>(String url,
+      {Map<String, String> headers = const {"Content-Type": "application/json"},
+      Object? body}) async {
+    final response = await _client.post(Uri.parse(url), headers: headers, body: body);
+    return _readResponse<T>(response);
+  }
+
+  T _readResponse<T>(http.Response response) {
+    final String toString = _readBody(response);
+    switch (T) {
+      case String:
+        return toString as T;
+      case List:
+      case Map:
+        return jsonDecode(toString) as T;
+      default:
+        try {
+          return jsonDecode(toString) as T;
+        } catch (e) {
+          throw const ApiProviderException("invalid request");
+        }
+    }
+  }
+
+  String _readBody(http.Response response) {
+    _readErr(response);
+    return StringUtils.decode(response.bodyBytes);
+  }
+
+  void _readErr(http.Response response) {
+    if (response.statusCode == 200 || response.statusCode == 201) return;
+    String toString = StringUtils.decode(response.bodyBytes);
+    Map<String, dynamic>? errorResult;
+    try {
+      if (toString.isNotEmpty) {
+        errorResult = StringUtils.toJson(toString);
+      }
+      // ignore: empty_catches
+    } catch (e) {}
+    toString = toString.isEmpty ? "request_error" : toString;
+    throw ApiProviderException(toString, response.statusCode, errorResult);
+  }
+}
diff --git a/pubspec.yaml b/pubspec.yaml
index a4d6530..059c368 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -20,9 +20,10 @@ dependencies:
   pointycastle: ^3.7.4
   bip32: ^2.0.0
   blockchain_utils:
-    git:
-      url: https://github.com/cake-tech/blockchain_utils
-      ref: cake-update-v2
+    path: /home/rafael/Working/blockchain_utils/
+  rxdart: ^0.28.0
+  intl: ^0.18.0
+  http: ^1.1.0
     
 
 dev_dependencies:
diff --git a/test/encode_decode_transaction_test.dart b/test/encode_decode_transaction_test.dart
index b77dfdb..d3588a1 100644
--- a/test/encode_decode_transaction_test.dart
+++ b/test/encode_decode_transaction_test.dart
@@ -5,8 +5,7 @@ void main() {
   test("test1", () {
     final tx = BtcTransaction(inputs: [
       TxInput(
-        txId:
-            "daaa0beab7411cee74768b3f1d7da7ad55fcbc9d835fda0afbe1b9a41ae42f75",
+        txId: "daaa0beab7411cee74768b3f1d7da7ad55fcbc9d835fda0afbe1b9a41ae42f75",
         txIndex: 0,
         scriptSig: Script(
           script: [
@@ -16,8 +15,7 @@ void main() {
         ),
       ),
       TxInput(
-          txId:
-              "daaa0beab7411cee74768b3f1d7da7ad55fcbc9d835fda0afbe1b9a41ae42f75",
+          txId: "daaa0beab7411cee74768b3f1d7da7ad55fcbc9d835fda0afbe1b9a41ae42f75",
           txIndex: 2,
           scriptSig: Script(script: [
             "3044022071b39d6aefdea7a7837310e5d78b1069ae82ed007991f8bca80bf3baf26340cc02200bc356be6e9f0019849b75b00322262a23ce179e7c0313207addfdbe596dabfd41",
@@ -38,8 +36,7 @@ void main() {
       TxOutput(
           amount: BigInt.from(1000),
           cashToken: CashToken(
-            category:
-                "4e7873d4529edfd2c6459139257042950230baa9297f111b8675829443f70430",
+            category: "4e7873d4529edfd2c6459139257042950230baa9297f111b8675829443f70430",
             bitfield: 16,
             amount: BigInt.from(2000),
           ),
@@ -53,8 +50,7 @@ void main() {
       TxOutput(
           amount: BigInt.from(1000),
           cashToken: CashToken(
-            category:
-                "4e7873d4529edfd2c6459139257042950230baa9297f111b8675829443f70430",
+            category: "4e7873d4529edfd2c6459139257042950230baa9297f111b8675829443f70430",
             bitfield: 16,
             amount: BigInt.parse("799999999999996000"),
           ),
@@ -69,8 +65,9 @@ void main() {
           )),
     ]);
     const String raw =
-        "0200000002752fe41aa4b9e1fb0ada5f839dbcfc55ada77d1d3f8b7674ee1c41b7ea0baada000000006a47304402203795e2aa978afbbd676b36c0edd1a39478744d320c5e02dd6a39d154755a5a3e02205545a7765bae3db9b820b1db9be2f8955a8998fa92ac08b0d7416aa30a3cee42412103ac064f4489ff812c643471ed25b990e6be7212566c932b8680b900c8e6db0fd9ffffffff752fe41aa4b9e1fb0ada5f839dbcfc55ada77d1d3f8b7674ee1c41b7ea0baada020000006a473044022071b39d6aefdea7a7837310e5d78b1069ae82ed007991f8bca80bf3baf26340cc02200bc356be6e9f0019849b75b00322262a23ce179e7c0313207addfdbe596dabfd412103ac064f4489ff812c643471ed25b990e6be7212566c932b8680b900c8e6db0fd9ffffffff03389c9900000000001976a914b8d913342894ec7b066420952a618ec2a8269bc288ace80300000000000048ef3004f743948275861b117f29a9ba300295427025399145c6d2df9e52d473784e10fdd007aa201d12ffe8e85fdab36794cb09418982efdbd5c8cee5fbeb216ac43887ea4817b887e80300000000000044ef3004f743948275861b117f29a9ba300295427025399145c6d2df9e52d473784e10ff60f04fecc22b1a0b76a914b8d913342894ec7b066420952a618ec2a8269bc288ac00000000";
+        "010000000001072b50f5750fc84801618b558e79d8e3c37d2c513c59cdbb590d90d043d3a9aa83000000001716001496de4122da32c2d428e70b44f8d07f2b26334b6ff0ffffffbcf5ae0a0c5efd15b06b380d59e535cf4fec65150ad301906012ea796f3a4607000000001716001496de4122da32c2d428e70b44f8d07f2b26334b6ff0ffffff4be773c0882999ba5ae2ee574951f926a72037637aeda4344fa37655769ed78d000000001716001496de4122da32c2d428e70b44f8d07f2b26334b6ff0ffffff4b29cb407a116c0c26c73332a3a2dd5e878b3c66dd0bdc516c9b763344cb8119000000001716001496de4122da32c2d428e70b44f8d07f2b26334b6ff0ffffff0b76aceb79e3f2570b82fe4ec5709b5affd04ac9bf7898fdee4a5dac5a429c82000000001716001496de4122da32c2d428e70b44f8d07f2b26334b6ff0ffffff5469f86d1c2ceb0d7da957f6d82d98f3b0f3e4138800fb9f2fb23444476c4ed7000000001716001496de4122da32c2d428e70b44f8d07f2b26334b6ff0ffffffc1fb64b4a9153728ccdfb8f5a2f0d60d42644bb39f0be24408f181c369c9337f000000001716001496de4122da32c2d428e70b44f8d07f2b26334b6ff0ffffff028c43e32e00000000160014455980d0b130ff894536fa79a322db815ab9cde4d9efb0000000000017a914424f29a8a84fa867814ff9ded43379c9dc9a6814870248304502210096990ba2bb32d80dc35ee55548bb300237744e9fdf08fcaf918672c60698da7b02202fe20657730114cdcbe01eef860b537be0b34380505d3d891d741ef2344330ca012102550e8b9eaa471d31c4a544a6aad1d8a3b6e4c4b127ddfdd629e85a888d3f8dd602473044022010699f80eb6495d01ce1b00c70dacc76ed8ea5b1652f9cb04b91456d94cfafe30220111ca2bbb5192ec35247cb6250d1a68f84bf93fe0151f330f20077d3b9b4b5af012102550e8b9eaa471d31c4a544a6aad1d8a3b6e4c4b127ddfdd629e85a888d3f8dd6024730440220170abcd7371d5ac83afff93751e3ea028627d1b38f4bed7da2c897d73d61420402205af8871c7befa740f325deb83483c1450dbcf5388e2836582c8bdaab8bf6a35b012102550e8b9eaa471d31c4a544a6aad1d8a3b6e4c4b127ddfdd629e85a888d3f8dd602483045022100b0702718bc906cf8691b7cbc95baf64e0ab3312a2abfd139b1928715757c0dbc022054f45fbc4cd9517eca6da4771dd8c23e5b0d393e61f5b7dd488086fe24029f80012102550e8b9eaa471d31c4a544a6aad1d8a3b6e4c4b127ddfdd629e85a888d3f8dd602483045022100d8055802be7aabefc62c6f5da69ee556be064c9727c8eab4d6e26ced2f81472c0220294599ad7b030c908923cb3ae1227b2b3f91275e3c00bc4943cdfe1c5e0b6843012102550e8b9eaa471d31c4a544a6aad1d8a3b6e4c4b127ddfdd629e85a888d3f8dd602473044022011a60277e781e891fce3dc920d0f2a0785b0561eb033c54a15a5c06e7c8bfa5a02207bec23c576fcafc1da59936dd6d35e526d3631f20e089f199245a1c4dcf96bb6012102550e8b9eaa471d31c4a544a6aad1d8a3b6e4c4b127ddfdd629e85a888d3f8dd602483045022100c58ee4955ec0d8d84e1b89e4dd4435ab02776dcf5b3b7cb45b837483c157be1002201733ad33460d48e69558bfac47fe045194b3840046c80e4005daff272401d030012102550e8b9eaa471d31c4a544a6aad1d8a3b6e4c4b127ddfdd629e85a888d3f8dd600000000";
     final tr = BtcTransaction.fromRaw(raw);
+    print(tr.txId());
     expect(tx.toHex(), raw);
     expect(tr.toHex(), raw);
 

From 49db5748d2edc73c0c8213e11ab6a39fa3a7ff7f Mon Sep 17 00:00:00 2001
From: Rafael Saes <git@rafael.saes.dev>
Date: Tue, 5 Nov 2024 13:15:34 -0300
Subject: [PATCH 11/62] chore: deps

---
 pubspec.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index 059c368..20e5037 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -20,7 +20,9 @@ dependencies:
   pointycastle: ^3.7.4
   bip32: ^2.0.0
   blockchain_utils:
-    path: /home/rafael/Working/blockchain_utils/
+    git:
+      url: https://github.com/cake-tech/blockchain_utils
+      ref: cake-update-v3
   rxdart: ^0.28.0
   intl: ^0.18.0
   http: ^1.1.0

From 0fab5761517a6da7b87791fe8065b9312d8fe4c2 Mon Sep 17 00:00:00 2001
From: Rafael Saes <git@rafael.saes.dev>
Date: Wed, 6 Nov 2024 12:06:12 -0300
Subject: [PATCH 12/62] feat: new method strings

---
 lib/src/provider/service/electrum/methods.dart | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/src/provider/service/electrum/methods.dart b/lib/src/provider/service/electrum/methods.dart
index e5fe2df..bd4121a 100644
--- a/lib/src/provider/service/electrum/methods.dart
+++ b/lib/src/provider/service/electrum/methods.dart
@@ -56,8 +56,8 @@ class ElectrumRequestMethods {
       ElectrumRequestMethods._("blockchain.block.headers");
 
   /// Return the estimated transaction fee per kilobyte for a transaction to be confirmed within a certain number of blocks.
-  static const ElectrumRequestMethods estimateFee =
-      ElectrumRequestMethods._("blockchain.estimatefee");
+  static const String estimateFeeMethod = "blockchain.estimatefee";
+  static const ElectrumRequestMethods estimateFee = ElectrumRequestMethods._(estimateFeeMethod);
 
   /// Return the confirmed and unconfirmed history of a script hash.
   static const String getHistoryMethod = "blockchain.scripthash.get_history";
@@ -81,7 +81,8 @@ class ElectrumRequestMethods {
   static const ElectrumRequestMethods ping = ElectrumRequestMethods._("server.ping");
 
   /// Identify the client to the server and negotiate the protocol version. Only the first server.version() message is accepted.
-  static const ElectrumRequestMethods version = ElectrumRequestMethods._("server.version");
+  static const String versionMethod = "server.version";
+  static const ElectrumRequestMethods version = ElectrumRequestMethods._(versionMethod);
 
   /// Subscribe to receive block headers when a new block is found.
   static const String headersSubscribeMethod = "blockchain.headers.subscribe";

From 1cf5abb68e17284c21936572d685972edaee9866 Mon Sep 17 00:00:00 2001
From: Rafael Saes <git@rafael.saes.dev>
Date: Sun, 17 Nov 2024 12:22:36 -0300
Subject: [PATCH 13/62] feat: ssl, historical mode

---
 .../api_provider/electrum_api_provider.dart   | 26 +++----------------
 .../methods/tweaks_subscribe.dart             | 15 ++++++++---
 .../provider/service/electrum/electrum.dart   |  2 +-
 .../electrum/electrum_ssl_service.dart        |  6 ++++-
 .../provider/service/electrum/service.dart    |  9 +++++++
 5 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/lib/src/provider/api_provider/electrum_api_provider.dart b/lib/src/provider/api_provider/electrum_api_provider.dart
index e9a348e..c9d59cf 100644
--- a/lib/src/provider/api_provider/electrum_api_provider.dart
+++ b/lib/src/provider/api_provider/electrum_api_provider.dart
@@ -2,6 +2,8 @@ import 'package:bitcoin_base/src/bitcoin/amount/amount.dart';
 import 'package:bitcoin_base/src/provider/api_provider.dart';
 import 'dart:async';
 
+import 'package:rxdart/rxdart.dart';
+
 typedef ListenerCallback<T> = StreamSubscription<T> Function(
   void Function(T)? onData, {
   Function? onError,
@@ -32,34 +34,14 @@ class ElectrumApiProvider {
   }
 
   // Preserving generic type T in subscribe method
-  ListenerCallback<T>? subscribe<T, U>(ElectrumRequest<T, U> request) {
+  BehaviorSubject<U>? subscribe<T, U>(ElectrumRequest<T, U> request) {
     final id = ++_id;
     final params = request.toRequest(id);
     final subscription = rpc.subscribe<U>(params);
 
     if (subscription == null) return null;
 
-    try {
-      // Create a transformer that uses the request's response handler
-      final stream = subscription.subscription.map(request.onResponse);
-
-      // Return a properly typed listener callback
-      return (
-        void Function(T)? onData, {
-        Function? onError,
-        void Function()? onDone,
-        bool? cancelOnError,
-      }) {
-        return stream.listen(
-          onData,
-          onError: onError,
-          onDone: onDone,
-          cancelOnError: cancelOnError,
-        );
-      };
-    } catch (_) {
-      return null;
-    }
+    return subscription.subscription;
   }
 
   Future<List<int>> getFeeRates() async {
diff --git a/lib/src/provider/electrum_methods/methods/tweaks_subscribe.dart b/lib/src/provider/electrum_methods/methods/tweaks_subscribe.dart
index 18cf2ee..61941c4 100644
--- a/lib/src/provider/electrum_methods/methods/tweaks_subscribe.dart
+++ b/lib/src/provider/electrum_methods/methods/tweaks_subscribe.dart
@@ -24,7 +24,11 @@ class ElectrumTweaksSubscribeResponse {
   final int block;
   final Map<String, TweakData> blockTweaks;
 
-  ElectrumTweaksSubscribeResponse({required this.block, required this.blockTweaks, this.message});
+  ElectrumTweaksSubscribeResponse({
+    required this.block,
+    required this.blockTweaks,
+    this.message,
+  });
 
   factory ElectrumTweaksSubscribeResponse.fromJson(Map<String, dynamic> json) {
     late int block;
@@ -77,17 +81,22 @@ class ElectrumTweaksSubscribeResponse {
 class ElectrumTweaksSubscribe
     extends ElectrumRequest<ElectrumTweaksSubscribeResponse, Map<String, dynamic>> {
   /// blockchain.tweaks.subscribe
-  ElectrumTweaksSubscribe({required this.height, required this.count});
+  ElectrumTweaksSubscribe({
+    required this.height,
+    required this.count,
+    required this.historicalMode,
+  });
 
   final int height;
   final int count;
+  final bool historicalMode;
 
   @override
   String get method => ElectrumRequestMethods.tweaksSubscribe.method;
 
   @override
   List toJson() {
-    return [height, count];
+    return [height, count, historicalMode];
   }
 
   /// The header of the current block chain tip.
diff --git a/lib/src/provider/service/electrum/electrum.dart b/lib/src/provider/service/electrum/electrum.dart
index 8be4045..bf6e9cb 100644
--- a/lib/src/provider/service/electrum/electrum.dart
+++ b/lib/src/provider/service/electrum/electrum.dart
@@ -2,6 +2,6 @@ export 'methods.dart';
 export 'params.dart';
 export 'service.dart';
 export 'request_completer.dart';
-// export 'electrum_ssl_service.dart';
+export 'electrum_ssl_service.dart';
 export 'electrum_tcp_service.dart';
 // export 'electrum_websocket_service.dart';
diff --git a/lib/src/provider/service/electrum/electrum_ssl_service.dart b/lib/src/provider/service/electrum/electrum_ssl_service.dart
index 57e1cbd..880e4d8 100644
--- a/lib/src/provider/service/electrum/electrum_ssl_service.dart
+++ b/lib/src/provider/service/electrum/electrum_ssl_service.dart
@@ -85,7 +85,11 @@ class ElectrumSSLService implements BitcoinBaseElectrumRPCService {
     final Duration connectionTimeOut = const Duration(seconds: 30),
     void Function(ConnectionStatus)? onConnectionStatusChange,
   }) async {
-    final channel = await SecureSocket.connect(uri.host, uri.port).timeout(connectionTimeOut);
+    final channel = await SecureSocket.connect(
+      uri.host,
+      uri.port,
+      onBadCertificate: (_) => true,
+    ).timeout(connectionTimeOut);
 
     return ElectrumSSLService._(
       uri.toString(),
diff --git a/lib/src/provider/service/electrum/service.dart b/lib/src/provider/service/electrum/service.dart
index 972641d..96090d7 100644
--- a/lib/src/provider/service/electrum/service.dart
+++ b/lib/src/provider/service/electrum/service.dart
@@ -38,6 +38,15 @@ abstract class BitcoinBaseElectrumRPCService {
   bool get isConnected;
   void disconnect();
   void reconnect();
+  static Future<BitcoinBaseElectrumRPCService> connect(
+    Uri uri, {
+    Iterable<String>? protocols,
+    Duration defaultRequestTimeOut = const Duration(seconds: 30),
+    final Duration connectionTimeOut = const Duration(seconds: 30),
+    void Function(ConnectionStatus)? onConnectionStatusChange,
+  }) {
+    throw UnimplementedError();
+  }
 }
 
 bool isJSONStringCorrect(String source) {

From 3be1d3c1007e796023364fdc3fa925830135a86b Mon Sep 17 00:00:00 2001
From: Mohsen <56779182+mrtnetwork@users.noreply.github.com>
Date: Sun, 17 Nov 2024 21:30:28 +0330
Subject: [PATCH 14/62] V4.9.2

Update dependencies
---
 CHANGELOG.md | 5 +++++
 pubspec.yaml | 8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a086184..dc0f857 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 4.9.2
+
+* Update dependencies
+* Resolved issue with transaction deserialization (unsigned tx)
+
 ## 4.9.1
 
 * Resolved issue with transaction deserialization (Issue #9)
diff --git a/pubspec.yaml b/pubspec.yaml
index 7f21203..3c57644 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: bitcoin_base
 description: A versatile library for Bitcoin, Dogecoin, Litecoin, Dash, BSV, and BCH. Supports P2PKH, P2SH, P2WPKH, P2WSH, P2TR, with advanced creation, signing, and spending capabilities.
-version: 4.9.1
+version: 4.9.2
 homepage: "https://github.com/mrtnetwork/bitcoin_base"
 repository: "https://github.com/mrtnetwork/bitcoin_base"
 Author: mrhaydari.t@gmail.com
@@ -16,10 +16,10 @@ environment:
 
 
 dependencies:
-  blockchain_utils: ^3.4.0
+  # blockchain_utils: ^3.4.0
   
-  # blockchain_utils:
-  #   path: ../blockchain_utils
+  blockchain_utils:
+    path: ../blockchain_utils
     
 
 dev_dependencies:

From 89caf39a19f4f0eb79a3642bd0e918b16cc1119b Mon Sep 17 00:00:00 2001
From: Mohsen <56779182+mrtnetwork@users.noreply.github.com>
Date: Sun, 17 Nov 2024 21:31:44 +0330
Subject: [PATCH 15/62] Update dependencies

---
 example/pubspec.lock | 6 +++---
 example/pubspec.yaml | 2 +-
 pubspec.yaml         | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/example/pubspec.lock b/example/pubspec.lock
index 14f2df9..b2187bd 100644
--- a/example/pubspec.lock
+++ b/example/pubspec.lock
@@ -15,15 +15,15 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "4.9.0"
+    version: "4.9.2"
   blockchain_utils:
     dependency: "direct main"
     description:
       name: blockchain_utils
-      sha256: ebb6c336ba0120de0982c50d8bc597cb494a530bd22bd462895bb5cebde405af
+      sha256: eebd06ff3709be5c660be72f0b0ee8f524fbb9e20752436f19f07f3be8ee6d1f
       url: "https://pub.dev"
     source: hosted
-    version: "3.4.0"
+    version: "3.5.0"
   boolean_selector:
     dependency: transitive
     description:
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
index 2fad8b2..bce4f5a 100644
--- a/example/pubspec.yaml
+++ b/example/pubspec.yaml
@@ -39,7 +39,7 @@ dependencies:
     path: ../
   # blockchain_utils: 
   #   path: ../../blockchain_utils
-  blockchain_utils: ^3.4.0
+  blockchain_utils: ^3.5.0
   http: ^1.2.0
 
 dev_dependencies:
diff --git a/pubspec.yaml b/pubspec.yaml
index 3c57644..73f4adf 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -16,10 +16,10 @@ environment:
 
 
 dependencies:
-  # blockchain_utils: ^3.4.0
+  blockchain_utils: ^3.5.0
   
-  blockchain_utils:
-    path: ../blockchain_utils
+  # blockchain_utils:
+  #   path: ../blockchain_utils
     
 
 dev_dependencies:

From 7b202b8e39f9a15f72f128cd9aa8530a0ceb21c0 Mon Sep 17 00:00:00 2001
From: Rafael Saes <git@rafael.saes.dev>
Date: Fri, 22 Nov 2024 18:40:20 -0300
Subject: [PATCH 16/62] feat: fix disconnect & find unsupported methods

---
 .../methods/tweaks_subscribe.dart             | 19 +++++++++--
 .../electrum/electrum_ssl_service.dart        | 32 +++++++++++++++----
 .../electrum/electrum_tcp_service.dart        | 32 +++++++++++++++----
 3 files changed, 66 insertions(+), 17 deletions(-)

diff --git a/lib/src/provider/electrum_methods/methods/tweaks_subscribe.dart b/lib/src/provider/electrum_methods/methods/tweaks_subscribe.dart
index 61941c4..b2f6bea 100644
--- a/lib/src/provider/electrum_methods/methods/tweaks_subscribe.dart
+++ b/lib/src/provider/electrum_methods/methods/tweaks_subscribe.dart
@@ -30,7 +30,20 @@ class ElectrumTweaksSubscribeResponse {
     this.message,
   });
 
-  factory ElectrumTweaksSubscribeResponse.fromJson(Map<String, dynamic> json) {
+  static ElectrumTweaksSubscribeResponse? fromJson(Map<String, dynamic> json) {
+    if (json.isEmpty) {
+      return null;
+    }
+
+    if (json.containsKey('params')) {
+      final params = json['params'] as List<dynamic>;
+      final message = params.first["message"];
+
+      if (message != null) {
+        return null;
+      }
+    }
+
     late int block;
     final blockTweaks = <String, TweakData>{};
 
@@ -79,7 +92,7 @@ class ElectrumTweaksSubscribeResponse {
 /// Subscribe to receive block headers when a new block is found.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
 class ElectrumTweaksSubscribe
-    extends ElectrumRequest<ElectrumTweaksSubscribeResponse, Map<String, dynamic>> {
+    extends ElectrumRequest<ElectrumTweaksSubscribeResponse?, Map<String, dynamic>> {
   /// blockchain.tweaks.subscribe
   ElectrumTweaksSubscribe({
     required this.height,
@@ -101,7 +114,7 @@ class ElectrumTweaksSubscribe
 
   /// The header of the current block chain tip.
   @override
-  ElectrumTweaksSubscribeResponse onResponse(result) {
+  ElectrumTweaksSubscribeResponse? onResponse(result) {
     return ElectrumTweaksSubscribeResponse.fromJson(result);
   }
 }
diff --git a/lib/src/provider/service/electrum/electrum_ssl_service.dart b/lib/src/provider/service/electrum/electrum_ssl_service.dart
index 880e4d8..2e3c8ab 100644
--- a/lib/src/provider/service/electrum/electrum_ssl_service.dart
+++ b/lib/src/provider/service/electrum/electrum_ssl_service.dart
@@ -66,7 +66,7 @@ class ElectrumSSLService implements BitcoinBaseElectrumRPCService {
     _subscription?.cancel().catchError((e) {});
     _subscription = null;
 
-    onConnectionStatusChange = null;
+    _setConnectionStatus(ConnectionStatus.disconnected);
   }
 
   void _onDone() {
@@ -138,10 +138,26 @@ class ElectrumSSLService implements BitcoinBaseElectrumRPCService {
   }
 
   void _handleResponse(Map<String, dynamic> response) {
-    var id = response['id'] as int?;
+    var id = response['id'] == null ? null : int.parse(response['id']!.toString());
+
     if (id == null) {
+      String? method = response['method'];
+
+      if (method == null) {
+        final error = response["error"];
+        if (response["error"] != null) {
+          final message = error["message"];
+          if (message != null) {
+            final isFulcrum = message.toLowerCase().contains("unsupported request");
+            final match = (isFulcrum ? RegExp(r'request:\s*(\S+)') : RegExp(r'"([^"]*)"'))
+                .firstMatch(message);
+            method = match?.group(1) ?? '';
+          }
+        }
+      }
+
       _tasks.forEach((key, value) {
-        if (value.request.method == response['method']) {
+        if (value.request.method == method) {
           id = key;
         }
       });
@@ -149,10 +165,7 @@ class ElectrumSSLService implements BitcoinBaseElectrumRPCService {
 
     try {
       final result = _findResult(response, _tasks[id]!.request);
-
-      if (result != null) {
-        _finish(id!, result);
-      }
+      _finish(id!, result);
     } catch (_) {}
   }
 
@@ -186,6 +199,11 @@ class ElectrumSSLService implements BitcoinBaseElectrumRPCService {
           data: data["error"]?["data"],
           request: data["request"] ?? request.params,
         );
+
+        if (message.toLowerCase().contains("unknown method") ||
+            message.toLowerCase().contains("unsupported request")) {
+          return <String, dynamic>{};
+        }
       }
 
       throw _errors[request.id]!;
diff --git a/lib/src/provider/service/electrum/electrum_tcp_service.dart b/lib/src/provider/service/electrum/electrum_tcp_service.dart
index ea965af..bddecb1 100644
--- a/lib/src/provider/service/electrum/electrum_tcp_service.dart
+++ b/lib/src/provider/service/electrum/electrum_tcp_service.dart
@@ -66,7 +66,7 @@ class ElectrumTCPService implements BitcoinBaseElectrumRPCService {
     _subscription?.cancel().catchError((e) {});
     _subscription = null;
 
-    onConnectionStatusChange = null;
+    _setConnectionStatus(ConnectionStatus.disconnected);
   }
 
   void _onDone() {
@@ -134,10 +134,26 @@ class ElectrumTCPService implements BitcoinBaseElectrumRPCService {
   }
 
   void _handleResponse(Map<String, dynamic> response) {
-    var id = response['id'] as int?;
+    var id = response['id'] == null ? null : int.parse(response['id']!.toString());
+
     if (id == null) {
+      String? method = response['method'];
+
+      if (method == null) {
+        final error = response["error"];
+        if (response["error"] != null) {
+          final message = error["message"];
+          if (message != null) {
+            final isFulcrum = message.toLowerCase().contains("unsupported request");
+            final match = (isFulcrum ? RegExp(r'request:\s*(\S+)') : RegExp(r'"([^"]*)"'))
+                .firstMatch(message);
+            method = match?.group(1) ?? '';
+          }
+        }
+      }
+
       _tasks.forEach((key, value) {
-        if (value.request.method == response['method']) {
+        if (value.request.method == method) {
           id = key;
         }
       });
@@ -145,10 +161,7 @@ class ElectrumTCPService implements BitcoinBaseElectrumRPCService {
 
     try {
       final result = _findResult(response, _tasks[id]!.request);
-
-      if (result != null) {
-        _finish(id!, result);
-      }
+      _finish(id!, result);
     } catch (_) {}
   }
 
@@ -182,6 +195,11 @@ class ElectrumTCPService implements BitcoinBaseElectrumRPCService {
           data: data["error"]?["data"],
           request: data["request"] ?? request.params,
         );
+
+        if (message.toLowerCase().contains("unknown method") ||
+            message.toLowerCase().contains("unsupported request")) {
+          return <String, dynamic>{};
+        }
       }
 
       throw _errors[request.id]!;

From bff40edbeb609fa51fa23e572eb7b6f3e99e65af Mon Sep 17 00:00:00 2001
From: Rafael Saes <git@rafael.saes.dev>
Date: Sun, 24 Nov 2024 19:05:44 -0300
Subject: [PATCH 17/62] fix: electrum protocol version

---
 .../provider/electrum_methods/methods/electrum_version.dart    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/src/provider/electrum_methods/methods/electrum_version.dart b/lib/src/provider/electrum_methods/methods/electrum_version.dart
index 5fb0e63..d080b7d 100644
--- a/lib/src/provider/electrum_methods/methods/electrum_version.dart
+++ b/lib/src/provider/electrum_methods/methods/electrum_version.dart
@@ -8,8 +8,7 @@ class ElectrumVersion extends ElectrumRequest<List<String>, List<dynamic>> {
   /// A string identifying the connecting client software.
   final String clientName;
 
-  /// An array [protocol_min, protocol_max], each of which is a string.
-  final List<String> protocolVersion;
+  final String protocolVersion;
 
   /// blockchain.version
   @override

From 82306ae21ea247ba400b9dc3823631d69ae45699 Mon Sep 17 00:00:00 2001
From: Rafael Saes <git@rafael.saes.dev>
Date: Mon, 25 Nov 2024 12:45:22 -0300
Subject: [PATCH 18/62] chore: intl dep

---
 pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index 20e5037..d14b166 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -24,7 +24,7 @@ dependencies:
       url: https://github.com/cake-tech/blockchain_utils
       ref: cake-update-v3
   rxdart: ^0.28.0
-  intl: ^0.18.0
+  intl: ^0.19.0
   http: ^1.1.0
     
 

From 997762fa354e3ac70dfd7061f900232434eb43a1 Mon Sep 17 00:00:00 2001
From: Sandro Simas <sandro.csimas@gmail.com>
Date: Fri, 29 Nov 2024 18:11:40 -0300
Subject: [PATCH 19/62] Small fix in omnixep network description

---
 lib/src/models/network.dart | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/src/models/network.dart b/lib/src/models/network.dart
index 3280519..fd293a4 100644
--- a/lib/src/models/network.dart
+++ b/lib/src/models/network.dart
@@ -495,7 +495,7 @@ class PepeNetwork implements BasedUtxoNetwork {
   }
 }
 
-/// Class representing a Dogecoin network, implementing the `BasedUtxoNetwork` abstract class.
+/// Class representing a OmniXEP network, implementing the `BasedUtxoNetwork` abstract class.
 class OmniXepNetwork implements BasedUtxoNetwork {
   /// Mainnet configuration with associated `CoinConf`.
   static const OmniXepNetwork mainnet =
@@ -505,7 +505,7 @@ class OmniXepNetwork implements BasedUtxoNetwork {
   @override
   final CoinConf conf;
 
-  /// Constructor for creating a Dogecoin network with a specific configuration.
+  /// Constructor for creating a OmniXEP network with a specific configuration.
   const OmniXepNetwork._(this.value, this.conf);
 
   @override

From b1c3ebf0dbb783dde4ab067bd0922b2cfd243701 Mon Sep 17 00:00:00 2001
From: Sandro Simas <sandro.csimas@gmail.com>
Date: Fri, 29 Nov 2024 18:12:35 -0300
Subject: [PATCH 20/62] Small fix in omnixep network description

---
 lib/src/models/network.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/models/network.dart b/lib/src/models/network.dart
index fd293a4..d8194c6 100644
--- a/lib/src/models/network.dart
+++ b/lib/src/models/network.dart
@@ -544,4 +544,4 @@ class OmniXepNetwork implements BasedUtxoNetwork {
     }
     return [];
   }
-}
\ No newline at end of file
+}

From 1e1b0d46eb70bbb3c7b047942481c735cfe620d4 Mon Sep 17 00:00:00 2001
From: Sandro Simas <sandro.csimas@gmail.com>
Date: Fri, 29 Nov 2024 18:13:01 -0300
Subject: [PATCH 21/62] Updating pubspec

---
 pubspec.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index 66b442c..73f4adf 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -11,8 +11,6 @@ topics:
   - bitcoincash
   - dash
   
-publish_to: 'none'
-
 environment:
   sdk: '>=2.15.0 <4.0.0'
 

From 9e22e516daf0598cad328c8536e851a5a7d47e32 Mon Sep 17 00:00:00 2001
From: Mohsen <mrhaydari.t@gmail.com>
Date: Sat, 30 Nov 2024 21:59:25 +0330
Subject: [PATCH 22/62] Support for uncompressed non-SegWit addresses

---
 ...amples_multisig_taproot_legacy_uncomp.dart | 131 ++++++++++++++++
 .../global/old_examples/bitcoin_example.dart  |   8 +-
 .../multi_sig_transactions.dart               |   2 +-
 .../transaction_builder_example.dart          |   2 +-
 ...er_from_7_account_to_6_accout_example.dart |   2 +-
 .../global/transfer_to_8_account_example.dart |   2 +-
 .../electrum/electrum_ssl_service.dart        |   1 +
 example/pubspec.lock                          |   7 +-
 example/pubspec.yaml                          |   6 +-
 example/test/bch_test.dart                    |   1 +
 example/test/btc2_test.dart                   |   1 +
 example/test/btc_test.dart                    | 118 +++++++++++++++
 example/test/e_test.dart                      |   1 +
 example/test/widget_test.dart                 |  98 +++++++++++-
 lib/src/bitcoin/address/core.dart             |  37 +++--
 lib/src/bitcoin/script/input.dart             |  51 ++++---
 lib/src/bitcoin/script/op_code/constant.dart  |   9 ++
 lib/src/bitcoin/script/op_code/tools.dart     |  24 +--
 lib/src/bitcoin/script/output.dart            |  26 ++--
 lib/src/bitcoin/script/script.dart            |  69 +++++----
 lib/src/bitcoin/script/transaction.dart       |  33 ++--
 lib/src/bitcoin/script/witness.dart           |   8 +-
 lib/src/cash_token/cash_token.dart            |   9 ++
 lib/src/crypto/keypair/ec_public.dart         |  26 ++--
 lib/src/provider/models/multisig_script.dart  |  34 +++--
 lib/src/provider/models/utxo_details.dart     | 106 +++++++------
 .../provider/service/electrum/exception.dart  |  51 -------
 .../forked_transaction_builder.dart           | 142 ++++++++++--------
 .../transaction_builder.dart                  |  92 ++++++------
 lib/src/utils/btc_utils.dart                  |   5 +
 pubspec.yaml                                  |   2 +-
 test/deserialize_test.dart                    |  21 +++
 test/p2tr_test.dart                           |   8 +
 33 files changed, 773 insertions(+), 360 deletions(-)
 create mode 100644 example/lib/global/btc_examples_multisig_taproot_legacy_uncomp.dart
 create mode 100644 example/test/bch_test.dart
 create mode 100644 example/test/btc2_test.dart
 create mode 100644 example/test/btc_test.dart
 create mode 100644 example/test/e_test.dart
 delete mode 100644 lib/src/provider/service/electrum/exception.dart
 create mode 100644 test/deserialize_test.dart

diff --git a/example/lib/global/btc_examples_multisig_taproot_legacy_uncomp.dart b/example/lib/global/btc_examples_multisig_taproot_legacy_uncomp.dart
new file mode 100644
index 0000000..1bd9fc1
--- /dev/null
+++ b/example/lib/global/btc_examples_multisig_taproot_legacy_uncomp.dart
@@ -0,0 +1,131 @@
+import 'package:bitcoin_base/bitcoin_base.dart';
+import 'package:example/services_examples/electrum/electrum_ssl_service.dart';
+
+void main() async {
+  final one = ECPrivate.fromBytes(List<int>.filled(32, 12));
+  final two = ECPrivate.fromBytes(List<int>.filled(32, 13));
+  final three = ECPrivate.fromBytes(List<int>.filled(32, 14));
+  final four = ECPrivate.fromBytes(List<int>.filled(32, 15));
+  final five = ECPrivate.fromBytes(List<int>.filled(32, 16));
+  final six = ECPrivate.fromBytes(List<int>.filled(32, 17));
+  final seven = ECPrivate.fromBytes(List<int>.filled(32, 18));
+  final eight = ECPrivate.fromBytes(List<int>.filled(32, 19));
+  final Map<String, ECPrivate> keys = {
+    for (final i in [one, two, three, four, five, six, seven, eight])
+      i.getPublic().toHex(): i
+  };
+  final account = MultiSignatureAddress(threshold: 8, signers: [
+    MultiSignatureSigner(
+        publicKey: one.getPublic().toHex(compressed: false), weight: 1),
+    MultiSignatureSigner(publicKey: two.getPublic().toHex(), weight: 1),
+    MultiSignatureSigner(publicKey: three.getPublic().toHex(), weight: 1),
+    MultiSignatureSigner(
+        publicKey: four.getPublic().toHex(compressed: false), weight: 1),
+    MultiSignatureSigner(publicKey: five.getPublic().toHex(), weight: 1),
+    MultiSignatureSigner(publicKey: six.getPublic().toHex(), weight: 1),
+    MultiSignatureSigner(
+        publicKey: seven.getPublic().toHex(compressed: false), weight: 1),
+    MultiSignatureSigner(publicKey: eight.getPublic().toHex(), weight: 1),
+  ]);
+
+  /// connect to electrum service with websocket
+  /// please see `services_examples` folder for how to create electrum websocket service
+  final service = await ElectrumSSLService.connect(
+      "testnet4-electrumx.wakiyamap.dev:51002");
+
+  /// create provider with service
+  final provider = ElectrumApiProvider(service);
+
+  final addrOne = one.getPublic().toP2pkAddress(compressed: false);
+
+  final addrTwo = two.getPublic().toAddress(compressed: false);
+
+  final addrThree = three.getPublic().toP2pkInP2sh(compressed: false);
+  final addrFour = four.getPublic().toP2pkhInP2sh(compressed: false);
+  final addrFive = four.getPublic().toSegwitAddress();
+  final addrSix = account.toP2shAddress();
+  final addr7 = eight.getPublic().toTaprootAddress();
+  final addr8 = eight.getPublic().toP2wshAddress();
+  final addr9 = eight.getPublic().toP2wshInP2sh();
+  final List<String> pubkys = [
+    one.getPublic().toHex(compressed: false),
+    two.getPublic().toHex(compressed: false),
+    three.getPublic().toHex(compressed: false),
+    four.getPublic().toHex(compressed: false),
+    four.getPublic().toHex(),
+    four.getPublic().toHex(),
+    eight.getPublic().toHex(),
+    eight.getPublic().toHex(),
+    eight.getPublic().toHex(),
+    eight.getPublic().toHex(),
+  ];
+  final addresses = [
+    one.getPublic().toP2pkAddress(compressed: false),
+    two.getPublic().toAddress(compressed: false),
+    three.getPublic().toP2pkInP2sh(compressed: false),
+    four.getPublic().toP2pkhInP2sh(compressed: false),
+    four.getPublic().toSegwitAddress(),
+    four.getPublic().toP2wshInP2sh(),
+    addrSix,
+    addr7,
+    addr8,
+    addr9
+  ];
+  List<UtxoWithAddress> utxos = [];
+  for (int i = 0; i < addresses.length; i++) {
+    final address = addresses[i];
+    final elctrumUtxos = await provider.request(ElectrumScriptHashListUnspent(
+        scriptHash: address.pubKeyHash(), includeTokens: false));
+    if (elctrumUtxos.isEmpty) continue;
+    if (i == 6) {
+      utxos.addAll(elctrumUtxos.map((e) => UtxoWithAddress(
+          utxo: e.toUtxo(address.type),
+          ownerDetails: UtxoAddressDetails.multiSigAddress(
+              multiSigAddress: account, address: address))));
+      continue;
+    }
+    utxos.addAll(elctrumUtxos
+        .map((e) => UtxoWithAddress(
+            utxo: e.toUtxo(address.type),
+            ownerDetails:
+                UtxoAddressDetails(publicKey: pubkys[i], address: address)))
+        .toList());
+  }
+
+  final sumOfUtxo = utxos.sumOfUtxosValue();
+
+  if (sumOfUtxo == BigInt.zero) {
+    return;
+  }
+  final change =
+      sumOfUtxo - (BigInt.from(1000) * BigInt.from(11) + BigInt.from(4295));
+  final bchTransaction = BitcoinTransactionBuilder(outPuts: [
+    /// change input (sumofutxos - spend)
+    BitcoinOutput(address: addrOne, value: change),
+    BitcoinOutput(address: addrOne, value: BigInt.from(1000)),
+    BitcoinOutput(address: addrTwo, value: BigInt.from(1000)),
+    BitcoinOutput(address: addrThree, value: BigInt.from(1000)),
+    BitcoinOutput(address: addrFour, value: BigInt.from(1000)),
+    BitcoinOutput(address: addrFour, value: BigInt.from(1000)),
+    BitcoinOutput(address: addrFive, value: BigInt.from(1000)),
+    BitcoinOutput(address: addrSix, value: BigInt.from(1000)),
+    BitcoinOutput(address: addrSix, value: BigInt.from(1000)),
+    BitcoinOutput(address: addr7, value: BigInt.from(1000)),
+    BitcoinOutput(address: addr8, value: BigInt.from(1000)),
+    BitcoinOutput(address: addr9, value: BigInt.from(1000)),
+  ], fee: BigInt.from(4295), network: BitcoinNetwork.testnet, utxos: utxos);
+  final transaaction =
+      bchTransaction.buildTransaction((trDigest, utxo, publicKey, sighash) {
+    final pk = ECPublic.fromHex(publicKey);
+    if (utxo.utxo.isP2tr) {
+      return keys[pk.toHex()]!.signTapRoot(trDigest, sighash: sighash);
+    }
+    return keys[pk.toHex()]!.signInput(trDigest, sigHash: sighash);
+  });
+
+  final transactionRaw = transaaction.toHex();
+  await provider
+      .request(ElectrumBroadCastTransaction(transactionRaw: transactionRaw));
+}
+
+/// https://mempool.space/testnet4/tx/a7f08f07739de45a6a4f8871f8e6ad79e0aefbc940086df76571354ba22263fa
diff --git a/example/lib/global/old_examples/bitcoin_example.dart b/example/lib/global/old_examples/bitcoin_example.dart
index 0ef7b04..98c3412 100644
--- a/example/lib/global/old_examples/bitcoin_example.dart
+++ b/example/lib/global/old_examples/bitcoin_example.dart
@@ -166,7 +166,7 @@ void _spendFromP2pkhTo10DifferentType() async {
     /// and sign the transaction digest to construct the unlocking script.
 
     if (publicKey == examplePublicKey2.toHex()) {
-      if (utxo.utxo.isP2tr()) {
+      if (utxo.utxo.isP2tr) {
         return examplePrivateKey.signTapRoot(trDigest);
       }
       return examplePrivateKey.signInput(trDigest, sigHash: sighash);
@@ -400,19 +400,19 @@ void _spendFrom10DifferentTypeToP2pkh() async {
     /// For each input in the transaction, locate the corresponding private key
     /// and sign the transaction digest to construct the unlocking script.
     if (publicKey == childKey1PublicKey.toHex()) {
-      if (utxo.utxo.isP2tr()) {
+      if (utxo.utxo.isP2tr) {
         return childKey1PrivateKey.signTapRoot(trDigest, sighash: sighash);
       }
       return childKey1PrivateKey.signInput(trDigest, sigHash: sighash);
     }
     if (publicKey == examplePublicKey.toHex()) {
-      if (utxo.utxo.isP2tr()) {
+      if (utxo.utxo.isP2tr) {
         return childKey2PrivateKey.signTapRoot(trDigest, sighash: sighash);
       }
       return childKey2PrivateKey.signInput(trDigest, sigHash: sighash);
     }
     if (publicKey == examplePublicKey2.toHex()) {
-      if (utxo.utxo.isP2tr()) {
+      if (utxo.utxo.isP2tr) {
         return examplePrivateKey.signTapRoot(trDigest, sighash: sighash);
       }
       return examplePrivateKey.signInput(trDigest, sigHash: sighash);
diff --git a/example/lib/global/old_examples/spending_with_transaction_builder/multi_sig_transactions.dart b/example/lib/global/old_examples/spending_with_transaction_builder/multi_sig_transactions.dart
index 6b4542e..8166e85 100644
--- a/example/lib/global/old_examples/spending_with_transaction_builder/multi_sig_transactions.dart
+++ b/example/lib/global/old_examples/spending_with_transaction_builder/multi_sig_transactions.dart
@@ -265,7 +265,7 @@ void main() async {
 
     // Ok, now we have the private key, we need to check which method to use for signing
     // We check whether the UTX corresponds to the P2TR address or not.
-    if (utxo.utxo.isP2tr()) {
+    if (utxo.utxo.isP2tr) {
       // yes is p2tr utxo and now we use SignTaprootTransaction(Schnorr sign)
       // for now this transaction builder support only tweak transaction
       // If you want to spend a Taproot script-path spending, you must create your own transaction builder.
diff --git a/example/lib/global/old_examples/spending_with_transaction_builder/transaction_builder_example.dart b/example/lib/global/old_examples/spending_with_transaction_builder/transaction_builder_example.dart
index 5da3143..a303df7 100644
--- a/example/lib/global/old_examples/spending_with_transaction_builder/transaction_builder_example.dart
+++ b/example/lib/global/old_examples/spending_with_transaction_builder/transaction_builder_example.dart
@@ -212,7 +212,7 @@ void main() async {
 
     // Ok, now we have the private key, we need to check which method to use for signing
     // We check whether the UTX corresponds to the P2TR address or not.
-    if (utxo.utxo.isP2tr()) {
+    if (utxo.utxo.isP2tr) {
       // yes is p2tr utxo and now we use SignTaprootTransaction(Schnorr sign)
       // for now this transaction builder support only tweak transaction
       // If you want to spend a Taproot script-path spending, you must create your own transaction builder.
diff --git a/example/lib/global/transfer_from_7_account_to_6_accout_example.dart b/example/lib/global/transfer_from_7_account_to_6_accout_example.dart
index 295d906..61d02cc 100644
--- a/example/lib/global/transfer_from_7_account_to_6_accout_example.dart
+++ b/example/lib/global/transfer_from_7_account_to_6_accout_example.dart
@@ -158,7 +158,7 @@ void main() async {
   /// create transaction and sign it
   final transaction =
       builder.buildTransaction((trDigest, utxo, publicKey, sighash) {
-    if (utxo.utxo.isP2tr()) {
+    if (utxo.utxo.isP2tr) {
       return privateKey.signTapRoot(trDigest, sighash: sighash);
     }
     return privateKey.signInput(trDigest, sigHash: sighash);
diff --git a/example/lib/global/transfer_to_8_account_example.dart b/example/lib/global/transfer_to_8_account_example.dart
index 6830feb..235c673 100644
--- a/example/lib/global/transfer_to_8_account_example.dart
+++ b/example/lib/global/transfer_to_8_account_example.dart
@@ -136,7 +136,7 @@ void main() async {
   /// create transaction and sign it
   final transaction =
       builder.buildTransaction((trDigest, utxo, publicKey, sighash) {
-    if (utxo.utxo.isP2tr()) {
+    if (utxo.utxo.isP2tr) {
       return examplePrivateKey2.signTapRoot(trDigest, sighash: sighash);
     }
     return examplePrivateKey2.signInput(trDigest, sigHash: sighash);
diff --git a/example/lib/services_examples/electrum/electrum_ssl_service.dart b/example/lib/services_examples/electrum/electrum_ssl_service.dart
index 362c306..cf404a1 100644
--- a/example/lib/services_examples/electrum/electrum_ssl_service.dart
+++ b/example/lib/services_examples/electrum/electrum_ssl_service.dart
@@ -68,6 +68,7 @@ class ElectrumSSLService with BitcoinBaseElectrumRPCService {
   }
 
   void _onMessge(List<int> event) {
+    print("Event ${utf8.decode(event)}");
     final Map<String, dynamic> decode = json.decode(utf8.decode(event));
     if (decode.containsKey("id")) {
       final int id = int.parse(decode["id"]!.toString());
diff --git a/example/pubspec.lock b/example/pubspec.lock
index b2187bd..7873d10 100644
--- a/example/pubspec.lock
+++ b/example/pubspec.lock
@@ -19,10 +19,9 @@ packages:
   blockchain_utils:
     dependency: "direct main"
     description:
-      name: blockchain_utils
-      sha256: eebd06ff3709be5c660be72f0b0ee8f524fbb9e20752436f19f07f3be8ee6d1f
-      url: "https://pub.dev"
-    source: hosted
+      path: "../../blockchain_utils"
+      relative: true
+    source: path
     version: "3.5.0"
   boolean_selector:
     dependency: transitive
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
index bce4f5a..c2fdaea 100644
--- a/example/pubspec.yaml
+++ b/example/pubspec.yaml
@@ -37,9 +37,9 @@ dependencies:
   cupertino_icons: ^1.0.2
   bitcoin_base: 
     path: ../
-  # blockchain_utils: 
-  #   path: ../../blockchain_utils
-  blockchain_utils: ^3.5.0
+  blockchain_utils:
+    path: ../../../blockchain_utils
+  # blockchain_utils: ^3.5.0
   http: ^1.2.0
 
 dev_dependencies:
diff --git a/example/test/bch_test.dart b/example/test/bch_test.dart
new file mode 100644
index 0000000..f76cc54
--- /dev/null
+++ b/example/test/bch_test.dart
@@ -0,0 +1 @@
+void main() async {}
diff --git a/example/test/btc2_test.dart b/example/test/btc2_test.dart
new file mode 100644
index 0000000..f76cc54
--- /dev/null
+++ b/example/test/btc2_test.dart
@@ -0,0 +1 @@
+void main() async {}
diff --git a/example/test/btc_test.dart b/example/test/btc_test.dart
new file mode 100644
index 0000000..4690921
--- /dev/null
+++ b/example/test/btc_test.dart
@@ -0,0 +1,118 @@
+void main() async {
+  // final one = ECPrivate.fromBytes(List<int>.filled(32, 12));
+  // final two = ECPrivate.fromBytes(List<int>.filled(32, 13));
+  // final three = ECPrivate.fromBytes(List<int>.filled(32, 14));
+  // final four = ECPrivate.fromBytes(List<int>.filled(32, 15));
+  // final five = ECPrivate.fromBytes(List<int>.filled(32, 16));
+  // final six = ECPrivate.fromBytes(List<int>.filled(32, 17));
+  // final seven = ECPrivate.fromBytes(List<int>.filled(32, 18));
+  // final eight = ECPrivate.fromBytes(List<int>.filled(32, 19));
+  // final Map<String, ECPrivate> keys = {
+  //   for (final i in [one, two, three, four, five, six, seven, eight])
+  //     i.getPublic().toHex(): i
+  // };
+  // final account = MultiSignatureAddress(threshold: 8, signers: [
+  //   MultiSignatureSigner(publicKey: one.getPublic().toHex(), weight: 1),
+  //   MultiSignatureSigner(publicKey: two.getPublic().toHex(), weight: 1),
+  //   MultiSignatureSigner(publicKey: three.getPublic().toHex(), weight: 1),
+  //   MultiSignatureSigner(publicKey: four.getPublic().toHex(), weight: 1),
+  //   MultiSignatureSigner(publicKey: five.getPublic().toHex(), weight: 1),
+  //   MultiSignatureSigner(publicKey: six.getPublic().toHex(), weight: 1),
+  //   MultiSignatureSigner(publicKey: seven.getPublic().toHex(), weight: 1),
+  //   MultiSignatureSigner(publicKey: eight.getPublic().toHex(), weight: 1),
+  // ]);
+  // final addr = account.toP2shAddress();
+  // // return;
+
+  // /// connect to electrum service with websocket
+  // /// please see `services_examples` folder for how to create electrum websocket service
+  // final service = await ElectrumSSLService.connect(
+  //     "testnet4-electrumx.wakiyamap.dev:51002");
+
+  // /// create provider with service
+  // final provider = ElectrumApiProvider(service);
+
+  // final elctrumUtxos = await provider.request(ElectrumScriptHashListUnspent(
+  //   scriptHash: addr.pubKeyHash(),
+  //   includeTokens: false,
+  // ));
+  // final List<UtxoWithAddress> utxos = elctrumUtxos
+  //     .map((e) => UtxoWithAddress(
+  //         utxo: e.toUtxo(addr.type),
+  //         ownerDetails: UtxoAddressDetails.multiSigAddress(
+  //             multiSigAddress: account, address: addr)))
+  //     .toList();
+
+  // final sumOfUtxo = utxos.sumOfUtxosValue();
+  // if (sumOfUtxo == BigInt.zero) {
+  //   return;
+  // }
+  // final addrOne = one.getPublic().toP2pkAddress(compressed: false);
+  // final addrTwo = two.getPublic().toAddress(compressed: false);
+  // final addrThree = three.getPublic().toP2pkInP2sh(compressed: false);
+  // final addrFour = four.getPublic().toP2pkhInP2sh(compressed: false);
+  // final addrFive = four.getPublic().toSegwitAddress();
+  // final addrSix = four.getPublic().toP2wshInP2sh();
+  // // print(sumOfUtxo);
+  // // return;
+  // final bchTransaction = BitcoinTransactionBuilder(
+  //   outPuts: [
+  //     /// change input (sumofutxos - spend)
+  //     BitcoinOutput(
+  //       address: addr,
+  //       value: sumOfUtxo -
+  //           (BigInt.from(1000) * BigInt.from(7) + BigInt.from(2200)),
+  //     ),
+  //     BitcoinOutput(
+  //       address: addrOne,
+  //       value: BigInt.from(1000),
+  //     ),
+  //     BitcoinOutput(
+  //       address: addrTwo,
+  //       value: BigInt.from(1000),
+  //     ),
+  //     BitcoinOutput(
+  //       address: addrThree,
+  //       value: BigInt.from(1000),
+  //     ),
+  //     BitcoinOutput(
+  //       address: addrFour,
+  //       value: BigInt.from(1000),
+  //     ),
+  //     BitcoinOutput(
+  //       address: addrFour,
+  //       value: BigInt.from(1000),
+  //     ),
+  //     BitcoinOutput(
+  //       address: addrFive,
+  //       value: BigInt.from(1000),
+  //     ),
+  //     BitcoinOutput(
+  //       address: addrSix,
+  //       value: BigInt.from(1000),
+  //     ),
+  //   ],
+  //   fee: BigInt.from(2200),
+  //   network: BitcoinNetwork.testnet,
+  //   utxos: utxos,
+  // );
+  // final transaaction =
+  //     bchTransaction.buildTransaction((trDigest, utxo, publicKey, sighash) {
+  //   return keys[publicKey]!.signInput(trDigest, sigHash: sighash);
+  // });
+
+  // /// transaction ID
+  // transaaction.txId();
+
+  // /// for calculation fee
+  // print(transaaction.getSize());
+  // // return;
+
+  // /// raw of encoded transaction in hex
+  // final transactionRaw = transaaction.toHex();
+  // print(transactionRaw);
+  // // print(elctrumUtxos.length);
+  // final d = await provider
+  //     .request(ElectrumBroadCastTransaction(transactionRaw: transactionRaw));
+  // print(d);
+}
diff --git a/example/test/e_test.dart b/example/test/e_test.dart
new file mode 100644
index 0000000..ab73b3a
--- /dev/null
+++ b/example/test/e_test.dart
@@ -0,0 +1 @@
+void main() {}
diff --git a/example/test/widget_test.dart b/example/test/widget_test.dart
index f76cc54..4f8fc15 100644
--- a/example/test/widget_test.dart
+++ b/example/test/widget_test.dart
@@ -1 +1,97 @@
-void main() async {}
+void main() async {
+  // final one = ECPrivate.fromBytes(List<int>.filled(32, 12));
+  // final two = ECPrivate.fromBytes(List<int>.filled(32, 13));
+  // final three = ECPrivate.fromBytes(List<int>.filled(32, 14));
+  // final four = ECPrivate.fromBytes(List<int>.filled(32, 15));
+  // final five = ECPrivate.fromBytes(List<int>.filled(32, 16));
+  // final six = ECPrivate.fromBytes(List<int>.filled(32, 17));
+  // final seven = ECPrivate.fromBytes(List<int>.filled(32, 18));
+  // final eight = ECPrivate.fromBytes(List<int>.filled(32, 19));
+  // final Map<String, ECPrivate> keys = {
+  //   for (final i in [one, two, three, four, five, six, seven, eight])
+  //     i.getPublic().toHex(): i
+  // };
+  // final account = MultiSignatureAddress(threshold: 8, signers: [
+  //   MultiSignatureSigner(publicKey: one.getPublic().toHex(), weight: 1),
+  //   MultiSignatureSigner(publicKey: two.getPublic().toHex(), weight: 1),
+  //   MultiSignatureSigner(publicKey: three.getPublic().toHex(), weight: 1),
+  //   MultiSignatureSigner(publicKey: four.getPublic().toHex(), weight: 1),
+  //   MultiSignatureSigner(publicKey: five.getPublic().toHex(), weight: 1),
+  //   MultiSignatureSigner(publicKey: six.getPublic().toHex(), weight: 1),
+  //   MultiSignatureSigner(publicKey: seven.getPublic().toHex(), weight: 1),
+  //   MultiSignatureSigner(publicKey: eight.getPublic().toHex(), weight: 1),
+  // ]);
+  // final addr = account.toP2shAddress();
+  // // print(account.multiSigScript.script);
+  // // return;
+
+  // /// connect to electrum service with websocket
+  // /// please see `services_examples` folder for how to create electrum websocket service
+  // final service = await ElectrumWebSocketService.connect(
+  //     "wss://chipnet.imaginary.cash:50004");
+
+  // /// create provider with service
+  // final provider = ElectrumApiProvider(service);
+
+  // final elctrumUtxos = await provider.request(ElectrumScriptHashListUnspent(
+  //   scriptHash: addr.pubKeyHash(),
+  //   includeTokens: false,
+  // ));
+  // final List<UtxoWithAddress> utxos = elctrumUtxos
+  //     .map((e) => UtxoWithAddress(
+  //         utxo: e.toUtxo(addr.type),
+  //         ownerDetails: UtxoAddressDetails.multiSigAddress(
+  //             multiSigAddress: account, address: addr)))
+  //     .toList();
+
+  // final sumOfUtxo = utxos.sumOfUtxosValue();
+  // if (sumOfUtxo == BigInt.zero) {
+  //   return;
+  // }
+  // final bchTransaction = ForkedTransactionBuilder(
+  //   outPuts: [
+  //     /// change input (sumofutxos - spend)
+  //     BitcoinOutput(
+  //       address: addr,
+  //       value: sumOfUtxo -
+  //           (BtcUtils.toSatoshi("0.0001") + BtcUtils.toSatoshi("0.00003")),
+  //     ),
+  //     BitcoinOutput(
+  //       address: BitcoinCashAddress(
+  //               "bchtest:pw054wtjjc70rrvx4ftl4p63gluedyt0qmpgz705f8x3gxygrzarzls7vp2sj",
+  //               network: BitcoinCashNetwork.testnet)
+  //           .baseAddress,
+  //       value: BtcUtils.toSatoshi("0.0001"),
+  //     ),
+  //   ],
+  //   fee: BtcUtils.toSatoshi("0.00003"),
+  //   network: BitcoinCashNetwork.testnet,
+  //   utxos: utxos,
+  // );
+  // final transaaction =
+  //     bchTransaction.buildTransaction((trDigest, utxo, publicKey, sighash) {
+  //   final sing = keys[publicKey]!.signInput(trDigest, sigHash: sighash);
+  //   print("=====================");
+  //   print("key ${keys[publicKey]?.prive.toHex()}");
+  //   print("diget ${BytesUtils.toHexString(trDigest)}");
+  //   print("sign ${sing}");
+  //   print("Sighash $sighash");
+
+  //   return keys[publicKey]!.signInput(trDigest, sigHash: sighash);
+  // });
+
+  // /// transaction ID
+  // transaaction.txId();
+
+  // /// for calculation fee
+  // transaaction.getSize();
+
+  // /// raw of encoded transaction in hex
+  // final transactionRaw = transaaction.toHex();
+  // print(transactionRaw);
+  // return;
+  // // print(elctrumUtxos.length);
+  // final d = await provider
+  //     .request(ElectrumBroadCastTransaction(transactionRaw: transactionRaw));
+  // print(d);
+}
diff --git a/lib/src/bitcoin/address/core.dart b/lib/src/bitcoin/address/core.dart
index 51a04e8..a8a1bd7 100644
--- a/lib/src/bitcoin/address/core.dart
+++ b/lib/src/bitcoin/address/core.dart
@@ -36,6 +36,14 @@ abstract class BitcoinAddressType implements Enumerate {
     P2shAddressType.p2pkInP2shwt,
     P2pkhAddressType.p2pkhwt
   ];
+  T cast<T extends BitcoinAddressType>() {
+    if (this is! T) {
+      throw DartBitcoinPluginException("BitcoinAddressType casting failed.",
+          details: {"excepted": "$T", "type": value});
+    }
+    return this as T;
+  }
+
   @override
   String toString() {
     return "BitcoinAddressType.$value";
@@ -50,15 +58,14 @@ abstract class BitcoinBaseAddress {
   String get addressProgram;
 }
 
-class PubKeyAddressType implements BitcoinAddressType {
-  const PubKeyAddressType._(this.value);
+class PubKeyAddressType extends BitcoinAddressType {
+  const PubKeyAddressType._(String value) : super._(value);
   static const PubKeyAddressType p2pk = PubKeyAddressType._("P2PK");
   @override
   bool get isP2sh => false;
   @override
   bool get isSegwit => false;
-  @override
-  final String value;
+
   @override
   int get hashLength => 20;
   @override
@@ -67,8 +74,8 @@ class PubKeyAddressType implements BitcoinAddressType {
   }
 }
 
-class P2pkhAddressType implements BitcoinAddressType {
-  const P2pkhAddressType._(this.value);
+class P2pkhAddressType extends BitcoinAddressType {
+  const P2pkhAddressType._(String value) : super._(value);
   static const P2pkhAddressType p2pkh = P2pkhAddressType._("P2PKH");
   static const P2pkhAddressType p2pkhwt = P2pkhAddressType._("P2PKHWT");
 
@@ -77,9 +84,6 @@ class P2pkhAddressType implements BitcoinAddressType {
   @override
   bool get isSegwit => false;
 
-  @override
-  final String value;
-
   @override
   int get hashLength => 20;
   @override
@@ -88,8 +92,9 @@ class P2pkhAddressType implements BitcoinAddressType {
   }
 }
 
-class P2shAddressType implements BitcoinAddressType {
-  const P2shAddressType._(this.value, this.hashLength, this.withToken);
+class P2shAddressType extends BitcoinAddressType {
+  const P2shAddressType._(String value, this.hashLength, this.withToken)
+      : super._(value);
   static const P2shAddressType p2wshInP2sh = P2shAddressType._(
       "P2SH/P2WSH", _BitcoinAddressUtils.hash160DigestLength, false);
   static const P2shAddressType p2wpkhInP2sh = P2shAddressType._(
@@ -131,17 +136,14 @@ class P2shAddressType implements BitcoinAddressType {
   static const P2shAddressType p2pkInP2shwt = P2shAddressType._(
       "P2SHWT/P2PK", _BitcoinAddressUtils.hash160DigestLength, true);
 
-  @override
-  final String value;
-
   @override
   String toString() {
     return "P2shAddressType.$value";
   }
 }
 
-class SegwitAddresType implements BitcoinAddressType {
-  const SegwitAddresType._(this.value);
+class SegwitAddresType extends BitcoinAddressType {
+  const SegwitAddresType._(String value) : super._(value);
   static const SegwitAddresType p2wpkh = SegwitAddresType._("P2WPKH");
   static const SegwitAddresType p2tr = SegwitAddresType._("P2TR");
   static const SegwitAddresType p2wsh = SegwitAddresType._("P2WSH");
@@ -150,9 +152,6 @@ class SegwitAddresType implements BitcoinAddressType {
   @override
   bool get isSegwit => true;
 
-  @override
-  final String value;
-
   @override
   int get hashLength {
     switch (this) {
diff --git a/lib/src/bitcoin/script/input.dart b/lib/src/bitcoin/script/input.dart
index c9d0aee..70d2b57 100644
--- a/lib/src/bitcoin/script/input.dart
+++ b/lib/src/bitcoin/script/input.dart
@@ -1,3 +1,5 @@
+import 'dart:typed_data';
+
 import 'package:bitcoin_base/src/bitcoin/script/op_code/constant.dart';
 import 'package:bitcoin_base/src/exception/exception.dart';
 import 'package:blockchain_utils/utils/utils.dart';
@@ -42,50 +44,53 @@ class TxInput {
   List<int> toBytes() {
     final txidBytes = BytesUtils.fromHexString(txId).reversed.toList();
 
-    final txoutBytes = List<int>.filled(4, 0);
-    writeUint32LE(txIndex, txoutBytes);
+    final txoutBytes =
+        IntUtils.toBytes(txIndex, length: 4, byteOrder: Endian.little);
+    // writeUint32LE(txIndex, txoutBytes);
     final scriptSigBytes = scriptSig.toBytes();
-
     final scriptSigLengthVarint = IntUtils.encodeVarint(scriptSigBytes.length);
     final data = List<int>.from([
       ...txidBytes,
       ...txoutBytes,
       ...scriptSigLengthVarint,
       ...scriptSigBytes,
-      ...sequence,
+      ...sequence
     ]);
     return data;
   }
 
-  static Tuple<TxInput, int> fromRaw(
-      {required String raw, int cursor = 0, bool hasSegwit = false}) {
-    final txInputRaw = BytesUtils.fromHexString(raw);
-    List<int> inpHash =
-        txInputRaw.sublist(cursor, cursor + 32).reversed.toList();
-    if (inpHash.isEmpty) {
-      throw const DartBitcoinPluginException(
-          "Input transaction hash not found. Probably malformed raw transaction");
-    }
-    List<int> outputN =
-        txInputRaw.sublist(cursor + 32, cursor + 36).reversed.toList();
-    cursor += 36;
-    final vi = IntUtils.decodeVarint(txInputRaw.sublist(cursor, cursor + 9));
+  static Tuple<TxInput, int> deserialize(
+      {required List<int> bytes, int cursor = 0, bool hasSegwit = false}) {
+    List<int> inpHash = bytes.sublist(cursor, cursor + 32).reversed.toList();
+    cursor += 32;
+    int outputN = IntUtils.fromBytes(bytes.sublist(cursor, cursor + 4),
+        byteOrder: Endian.little);
+    cursor += 4;
+    final vi = IntUtils.decodeVarint(bytes.sublist(cursor));
     cursor += vi.item2;
-    List<int> unlockingScript = txInputRaw.sublist(cursor, cursor + vi.item1);
+    List<int> unlockingScript = bytes.sublist(cursor, cursor + vi.item1);
     cursor += vi.item1;
-    List<int> sequenceNumberData = txInputRaw.sublist(cursor, cursor + 4);
+    List<int> sequenceNumberData = bytes.sublist(cursor, cursor + 4);
     cursor += 4;
     return Tuple(
         TxInput(
             txId: BytesUtils.toHexString(inpHash),
-            txIndex: int.parse(BytesUtils.toHexString(outputN), radix: 16),
-            scriptSig: Script.fromRaw(
-                hexData: BytesUtils.toHexString(unlockingScript),
-                hasSegwit: hasSegwit),
+            txIndex: outputN,
+            scriptSig: Script.deserialize(
+                bytes: unlockingScript, hasSegwit: hasSegwit),
             sequance: sequenceNumberData),
         cursor);
   }
 
+  Map<String, dynamic> toJson() {
+    return {
+      "txid": txId,
+      "txIndex": txIndex,
+      "scriptSig": scriptSig.script,
+      "sequance": BytesUtils.toHexString(sequence),
+    };
+  }
+
   @override
   String toString() {
     return "TxInput{txId: $txId, txIndex: $txIndex, scriptSig: $scriptSig, sequence: ${BytesUtils.toHexString(sequence)}}";
diff --git a/lib/src/bitcoin/script/op_code/constant.dart b/lib/src/bitcoin/script/op_code/constant.dart
index cb6b952..4825e66 100644
--- a/lib/src/bitcoin/script/op_code/constant.dart
+++ b/lib/src/bitcoin/script/op_code/constant.dart
@@ -2,6 +2,15 @@
 /// Constants and identifiers used in the Bitcoin-related code.
 // ignore_for_file: constant_identifier_names, non_constant_identifier_names, equal_keys_in_map
 class BitcoinOpCodeConst {
+  static const int opPushData1 = 0x4c;
+  static const int opPushData2 = 0x4d;
+  static const int opPushData4 = 0x4e;
+  static bool isOpPushData(int byte) {
+    return byte == BitcoinOpCodeConst.opPushData1 ||
+        byte == BitcoinOpCodeConst.opPushData2 ||
+        byte == BitcoinOpCodeConst.opPushData4;
+  }
+
   static const Map<String, List<int>> OP_CODES = {
     'OP_0': [0x00],
     'OP_FALSE': [0x00],
diff --git a/lib/src/bitcoin/script/op_code/tools.dart b/lib/src/bitcoin/script/op_code/tools.dart
index 8d17869..94977e6 100644
--- a/lib/src/bitcoin/script/op_code/tools.dart
+++ b/lib/src/bitcoin/script/op_code/tools.dart
@@ -1,23 +1,23 @@
+import 'dart:typed_data';
+
+import 'package:bitcoin_base/src/bitcoin/script/op_code/constant.dart';
 import 'package:bitcoin_base/src/exception/exception.dart';
 import 'package:blockchain_utils/utils/utils.dart';
 
 List<int> opPushData(String hexData) {
   final List<int> dataBytes = BytesUtils.fromHexString(hexData);
-  if (dataBytes.length < 0x4c) {
-    return List<int>.from([dataBytes.length]) + dataBytes;
+  if (dataBytes.length < BitcoinOpCodeConst.opPushData1) {
+    return [dataBytes.length, ...dataBytes];
   } else if (dataBytes.length < mask8) {
-    return List<int>.from([0x4c]) +
-        List<int>.from([dataBytes.length]) +
-        dataBytes;
+    return [BitcoinOpCodeConst.opPushData1, dataBytes.length, ...dataBytes];
   } else if (dataBytes.length < mask16) {
-    var lengthBytes = List<int>.filled(2, 0);
-
-    writeUint16LE(dataBytes.length, lengthBytes);
-    return List<int>.from([0x4d, ...lengthBytes, ...dataBytes]);
+    final lengthBytes =
+        IntUtils.toBytes(dataBytes.length, length: 2, byteOrder: Endian.little);
+    return [BitcoinOpCodeConst.opPushData2, ...lengthBytes, ...dataBytes];
   } else if (dataBytes.length < mask32) {
-    var lengthBytes = List<int>.filled(4, 0);
-    writeUint32LE(lengthBytes.length, lengthBytes);
-    return List<int>.from([0x4e, ...lengthBytes, ...dataBytes]);
+    final lengthBytes =
+        IntUtils.toBytes(dataBytes.length, length: 4, byteOrder: Endian.little);
+    return [BitcoinOpCodeConst.opPushData4, ...lengthBytes, ...dataBytes];
   } else {
     throw const DartBitcoinPluginException(
         "Data too large. Cannot push into script");
diff --git a/lib/src/bitcoin/script/output.dart b/lib/src/bitcoin/script/output.dart
index 8a25497..8547fd3 100644
--- a/lib/src/bitcoin/script/output.dart
+++ b/lib/src/bitcoin/script/output.dart
@@ -14,6 +14,14 @@ class TxOutput {
   final BigInt amount;
   final Script scriptPubKey;
 
+  Map<String, dynamic> toJson() {
+    return {
+      "cashToken": cashToken?.toJson(),
+      "amount": amount.toString(),
+      "scriptPubKey": scriptPubKey.script
+    };
+  }
+
   ///  creates a copy of the object
   TxOutput copy() {
     return TxOutput(
@@ -37,27 +45,25 @@ class TxOutput {
     return data;
   }
 
-  static Tuple<TxOutput, int> fromRaw(
-      {required String raw, required int cursor, bool hasSegwit = false}) {
-    final txBytes = BytesUtils.fromHexString(raw);
-    final value = BigintUtils.fromBytes(txBytes.sublist(cursor, cursor + 8),
+  static Tuple<TxOutput, int> deserialize(
+      {required List<int> bytes, required int cursor, bool hasSegwit = false}) {
+    final value = BigintUtils.fromBytes(bytes.sublist(cursor, cursor + 8),
             byteOrder: Endian.little)
         .toSigned(64);
     cursor += 8;
 
-    final vi = IntUtils.decodeVarint(txBytes.sublist(cursor, cursor + 9));
+    final vi = IntUtils.decodeVarint(bytes.sublist(cursor));
     cursor += vi.item2;
-    final token = CashToken.fromRaw(txBytes.sublist(cursor));
+    final token = CashToken.fromRaw(bytes.sublist(cursor));
     List<int> lockScript =
-        txBytes.sublist(cursor + token.item2, cursor + vi.item1);
+        bytes.sublist(cursor + token.item2, cursor + vi.item1);
     cursor += vi.item1;
     return Tuple(
         TxOutput(
             amount: value,
             cashToken: token.item1,
-            scriptPubKey: Script.fromRaw(
-                hexData: BytesUtils.toHexString(lockScript),
-                hasSegwit: hasSegwit)),
+            scriptPubKey:
+                Script.deserialize(bytes: lockScript, hasSegwit: hasSegwit)),
         cursor);
   }
 
diff --git a/lib/src/bitcoin/script/script.dart b/lib/src/bitcoin/script/script.dart
index 5228776..8073a9d 100644
--- a/lib/src/bitcoin/script/script.dart
+++ b/lib/src/bitcoin/script/script.dart
@@ -16,44 +16,54 @@ class Script {
         script = List.unmodifiable(script);
   final List<dynamic> script;
 
-  static Script fromRaw({required String hexData, bool hasSegwit = false}) {
+  static Script deserialize(
+      {required List<int> bytes, bool hasSegwit = false}) {
     List<String> commands = [];
     int index = 0;
-    final scriptBytes = BytesUtils.fromHexString(hexData);
-    while (index < scriptBytes.length) {
-      int byte = scriptBytes[index];
+    // final scriptBytes = BytesUtils.fromHexString(hexData);
+    while (index < bytes.length) {
+      int byte = bytes[index];
       if (BitcoinOpCodeConst.CODE_OPS.containsKey(byte)) {
-        commands.add(BitcoinOpCodeConst.CODE_OPS[byte]!);
-        index = index + 1;
-      } else if (!hasSegwit && byte == 0x4c) {
-        int bytesToRead = scriptBytes[index + 1];
+        if (!BitcoinOpCodeConst.isOpPushData(byte)) {
+          commands.add(BitcoinOpCodeConst.CODE_OPS[byte]!);
+        }
+
+        /// skip op
         index = index + 1;
-        commands.add(BytesUtils.toHexString(
-            scriptBytes.sublist(index, index + bytesToRead)));
-        index = index + bytesToRead;
-      } else if (!hasSegwit && byte == 0x4d) {
-        int bytesToRead = readUint16LE(scriptBytes, index + 1);
+        if (byte == BitcoinOpCodeConst.opPushData1) {
+          // get len
+          int bytesToRead = bytes[index];
+          // skip len
+          index = index + 1;
+          commands.add(BytesUtils.toHexString(
+              bytes.sublist(index, index + bytesToRead)));
 
-        index = index + 3;
-        commands.add(BytesUtils.toHexString(
-            scriptBytes.sublist(index, index + bytesToRead)));
-        index = index + bytesToRead;
-      } else if (!hasSegwit && byte == 0x4e) {
-        int bytesToRead = readUint32LE(scriptBytes, index + 1);
+          /// add length
+          index = index + bytesToRead;
+        } else if (byte == BitcoinOpCodeConst.opPushData2) {
+          /// get len
+          int bytesToRead = readUint16LE(bytes, index);
+          index = index + 2;
+          commands.add(BytesUtils.toHexString(
+              bytes.sublist(index, index + bytesToRead)));
+          index = index + bytesToRead;
+        } else if (byte == BitcoinOpCodeConst.opPushData4) {
+          int bytesToRead = readUint32LE(bytes, index);
 
-        index = index + 5;
-        commands.add(BytesUtils.toHexString(
-            scriptBytes.sublist(index, index + bytesToRead)));
-        index = index + bytesToRead;
+          index = index + 4;
+          commands.add(BytesUtils.toHexString(
+              bytes.sublist(index, index + bytesToRead)));
+          index = index + bytesToRead;
+        }
       } else {
-        final viAndSize = IntUtils.decodeVarint(scriptBytes.sublist(index));
+        final viAndSize = IntUtils.decodeVarint(bytes.sublist(index));
         int dataSize = viAndSize.item1;
         int size = viAndSize.item2;
-        final lastIndex = (index + size + dataSize) > scriptBytes.length
-            ? scriptBytes.length
+        final lastIndex = (index + size + dataSize) > bytes.length
+            ? bytes.length
             : (index + size + dataSize);
-        commands.add(BytesUtils.toHexString(
-            scriptBytes.sublist(index + size, lastIndex)));
+        commands.add(
+            BytesUtils.toHexString(bytes.sublist(index + size, lastIndex)));
         index = index + dataSize + size;
       }
     }
@@ -72,6 +82,9 @@ class Script {
         if (token is int) {
           scriptBytes.add(pushInteger(token));
         } else {
+          final pl = opPushData(token);
+          print("Large ${pl.length}");
+
           scriptBytes.add(opPushData(token));
         }
       }
diff --git a/lib/src/bitcoin/script/transaction.dart b/lib/src/bitcoin/script/transaction.dart
index 28e8333..c1b4aa3 100644
--- a/lib/src/bitcoin/script/transaction.dart
+++ b/lib/src/bitcoin/script/transaction.dart
@@ -49,13 +49,12 @@ class BtcTransaction {
     List<int>? version,
   }) {
     return BtcTransaction(
-      inputs: inputs ?? this.inputs,
-      outputs: outputs ?? this.outputs,
-      witnesses: witnesses ?? this.witnesses,
-      hasSegwit: hasSegwit ?? this.hasSegwit,
-      lock: lock ?? List<int>.from(locktime),
-      version: version ?? List<int>.from(this.version),
-    );
+        inputs: inputs ?? this.inputs,
+        outputs: outputs ?? this.outputs,
+        witnesses: witnesses ?? this.witnesses,
+        hasSegwit: hasSegwit ?? this.hasSegwit,
+        lock: lock ?? List<int>.from(locktime),
+        version: version ?? List<int>.from(this.version));
   }
 
   /// creates a copy of the object (classmethod)
@@ -88,19 +87,17 @@ class BtcTransaction {
 
     List<TxInput> inputs = [];
     for (int index = 0; index < vi.item1; index++) {
-      final inp =
-          TxInput.fromRaw(raw: raw, hasSegwit: hasSegwit, cursor: cursor);
-
+      final inp = TxInput.deserialize(
+          bytes: rawtx, hasSegwit: hasSegwit, cursor: cursor);
       inputs.add(inp.item1);
       cursor = inp.item2;
     }
-
     List<TxOutput> outputs = [];
     final viOut = IntUtils.decodeVarint(rawtx.sublist(cursor));
     cursor += viOut.item2;
     for (int index = 0; index < viOut.item1; index++) {
-      final inp =
-          TxOutput.fromRaw(raw: raw, hasSegwit: hasSegwit, cursor: cursor);
+      final inp = TxOutput.deserialize(
+          bytes: rawtx, hasSegwit: hasSegwit, cursor: cursor);
       outputs.add(inp.item1);
       cursor = inp.item2;
     }
@@ -493,6 +490,16 @@ class BtcTransaction {
     return BytesUtils.toHexString(reversedHash);
   }
 
+  Map<String, dynamic> toJson() {
+    return {
+      "inputs": inputs.map((e) => e.toJson()).toList(),
+      "outputs": outputs.map((e) => e.toJson()).toList(),
+      "locktime": BytesUtils.toHexString(locktime),
+      "version": BytesUtils.toHexString(version),
+      "witnesses": witnesses.map((e) => e.toJson()).toList()
+    };
+  }
+
   @override
   String toString() {
     return "BtcTransaction{inputs: ${inputs.join(", ")}, outputs: ${outputs.join(", ")}, locktime: ${BytesUtils.toHexString(locktime)}}, version: ${BytesUtils.toHexString(version)}, hasSegwit: $hasSegwit, witnesses:${witnesses.join(",")} ";
diff --git a/lib/src/bitcoin/script/witness.dart b/lib/src/bitcoin/script/witness.dart
index 86b0db5..0a53939 100644
--- a/lib/src/bitcoin/script/witness.dart
+++ b/lib/src/bitcoin/script/witness.dart
@@ -1,11 +1,11 @@
+import 'package:blockchain_utils/helper/extensions/extensions.dart';
 import 'package:blockchain_utils/utils/utils.dart';
 
 /// A list of the witness items required to satisfy the locking conditions of a segwit input (aka witness stack).
 ///
 /// [stack] the witness items (hex str) list
 class TxWitnessInput {
-  TxWitnessInput({required List<String> stack})
-      : stack = List.unmodifiable(stack);
+  TxWitnessInput({required List<String> stack}) : stack = stack.immutable;
   final List<String> stack;
 
   /// creates a copy of the object (classmethod)
@@ -26,6 +26,10 @@ class TxWitnessInput {
     return stackBytes;
   }
 
+  Map<String, dynamic> toJson() {
+    return {"stack": stack};
+  }
+
   @override
   String toString() {
     return "TxWitnessInput{stack: ${stack.join(", ")}}";
diff --git a/lib/src/cash_token/cash_token.dart b/lib/src/cash_token/cash_token.dart
index e322257..bcb0fd3 100644
--- a/lib/src/cash_token/cash_token.dart
+++ b/lib/src/cash_token/cash_token.dart
@@ -261,6 +261,7 @@ class CashToken {
   /// The commitment contents of the NFT held in this output (0 to 40 bytes). This field is omitted if no NFT is present.
   final List<int> commitment;
   final int bitfield;
+
   CashToken.noValidate(
       {required this.category,
       required this.amount,
@@ -412,6 +413,14 @@ class CashToken {
   /// Initialized only if the Cash Token has a commitment length.
   late final String? commitmentInHex =
       hasCommitment ? BytesUtils.toHexString(commitment) : null;
+  Map<String, dynamic> toJson() {
+    return {
+      "category": category,
+      "amount": amount.toString(),
+      "bitfield": bitfield,
+      "commitment": BytesUtils.toHexString(commitment),
+    };
+  }
 
   @override
   String toString() {
diff --git a/lib/src/crypto/keypair/ec_public.dart b/lib/src/crypto/keypair/ec_public.dart
index b33e29f..26eaed4 100644
--- a/lib/src/crypto/keypair/ec_public.dart
+++ b/lib/src/crypto/keypair/ec_public.dart
@@ -60,8 +60,8 @@ class ECPublic {
 
   /// toSegwitAddress generates a P2WPKH (Pay-to-Witness-Public-Key-Hash) SegWit address
   /// from the ECPublic key. If 'compressed' is true, the key is in compressed format.
-  P2wpkhAddress toSegwitAddress({bool compressed = true}) {
-    final h16 = _toHash160(compressed: compressed);
+  P2wpkhAddress toSegwitAddress() {
+    final h16 = _toHash160();
     final toHex = BytesUtils.toHexString(h16);
 
     return P2wpkhAddress.fromProgram(program: toHex);
@@ -124,35 +124,29 @@ class ECPublic {
   /// toP2wpkhInP2sh generates a P2SH (Pay-to-Script-Hash) address
   /// wrapping a P2WPKH (Pay-to-Witness-Public-Key-Hash) script derived from the ECPublic key.
   /// If 'compressed' is true, the key is in compressed format.
-  P2shAddress toP2wpkhInP2sh({bool compressed = true}) {
-    final addr = toSegwitAddress(compressed: compressed);
+  P2shAddress toP2wpkhInP2sh() {
+    final addr = toSegwitAddress();
     return P2shAddress.fromScript(
         script: addr.toScriptPubKey(), type: P2shAddressType.p2wpkhInP2sh);
   }
 
   /// toP2wshScript generates a P2WSH (Pay-to-Witness-Script-Hash) script
   /// derived from the ECPublic key. If 'compressed' is true, the key is in compressed format.
-  Script toP2wshScript({bool compressed = true}) {
-    return Script(script: [
-      'OP_1',
-      toHex(compressed: compressed),
-      "OP_1",
-      "OP_CHECKMULTISIG"
-    ]);
+  Script toP2wshScript() {
+    return Script(script: ['OP_1', toHex(), "OP_1", "OP_CHECKMULTISIG"]);
   }
 
   /// toP2wshAddress generates a P2WSH (Pay-to-Witness-Script-Hash) address
   /// from the ECPublic key. If 'compressed' is true, the key is in compressed format.
-  P2wshAddress toP2wshAddress({bool compressed = true}) {
-    return P2wshAddress.fromScript(
-        script: toP2wshScript(compressed: compressed));
+  P2wshAddress toP2wshAddress() {
+    return P2wshAddress.fromScript(script: toP2wshScript());
   }
 
   /// toP2wshInP2sh generates a P2SH (Pay-to-Script-Hash) address
   /// wrapping a P2WSH (Pay-to-Witness-Script-Hash) script derived from the ECPublic key.
   /// If 'compressed' is true, the key is in compressed format.
-  P2shAddress toP2wshInP2sh({bool compressed = true}) {
-    final p2sh = toP2wshAddress(compressed: compressed);
+  P2shAddress toP2wshInP2sh() {
+    final p2sh = toP2wshAddress();
     return P2shAddress.fromScript(
         script: p2sh.toScriptPubKey(), type: P2shAddressType.p2wshInP2sh);
   }
diff --git a/lib/src/provider/models/multisig_script.dart b/lib/src/provider/models/multisig_script.dart
index 7a8aed6..3ae38fb 100644
--- a/lib/src/provider/models/multisig_script.dart
+++ b/lib/src/provider/models/multisig_script.dart
@@ -6,7 +6,7 @@ import 'package:blockchain_utils/blockchain_utils.dart';
 /// signers in a multi-signature scheme. A multi-signature signer typically includes
 /// information about their public key and weight within the scheme.
 class MultiSignatureSigner {
-  MultiSignatureSigner._(this.publicKey, this.weight);
+  MultiSignatureSigner._(this.publicKey, this.weight, this.isCompressed);
 
   /// PublicKey returns the public key associated with the signer.
   final String publicKey;
@@ -15,12 +15,15 @@ class MultiSignatureSigner {
   /// The weight is used to determine the number of signatures required for a valid transaction.
   final int weight;
 
+  final bool isCompressed;
+
   /// creates a new instance of a multi-signature signer with the
   /// specified public key and weight.
   factory MultiSignatureSigner(
       {required String publicKey, required int weight}) {
     ECPublic.fromHex(publicKey);
-    return MultiSignatureSigner._(publicKey, weight);
+    return MultiSignatureSigner._(
+        publicKey, weight, BtcUtils.isCompressedPubKey(publicKey));
   }
 }
 
@@ -34,6 +37,7 @@ class MultiSignatureAddress {
     P2shAddressType.p2pkhInP2shwt,
     P2shAddressType.p2pkhInP2sh32wt
   ];
+  final bool canSelectSegwit;
 
   /// Signers is a collection of signers participating in the multi-signature scheme.
   final List<MultiSignatureSigner> signers;
@@ -54,6 +58,10 @@ class MultiSignatureAddress {
       throw DartBitcoinPluginException(
           "${network.conf.coinName.name} Bitcoin forks that do not support Segwit. use toP2shAddress");
     }
+    if (!canSelectSegwit) {
+      throw const DartBitcoinPluginException(
+          "One of the signer's accounts used an uncompressed public key.");
+    }
     return P2wshAddress.fromScript(script: multiSigScript);
   }
 
@@ -79,10 +87,9 @@ class MultiSignatureAddress {
     return P2shAddress.fromScript(script: multiSigScript, type: addressType);
   }
 
-  BitcoinBaseAddress fromType({
-    required BasedUtxoNetwork network,
-    required BitcoinAddressType addressType,
-  }) {
+  BitcoinBaseAddress fromType(
+      {required BasedUtxoNetwork network,
+      required BitcoinAddressType addressType}) {
     switch (addressType) {
       case SegwitAddresType.p2wsh:
         return toP2wshAddress(network: network);
@@ -102,17 +109,15 @@ class MultiSignatureAddress {
   MultiSignatureAddress._(
       {required this.signers,
       required this.threshold,
-      // required this.address,
-      required this.multiSigScript});
+      required this.multiSigScript,
+      required this.canSelectSegwit});
 
   /// CreateMultiSignatureAddress creates a new instance of a MultiSignatureAddress, representing
   /// a multi-signature Bitcoin address configuration. It allows you to specify the minimum number
   /// of required signatures (threshold), provide the collection of signers participating in the
   /// multi-signature scheme, and specify the address type.
-  factory MultiSignatureAddress({
-    required int threshold,
-    required List<MultiSignatureSigner> signers,
-  }) {
+  factory MultiSignatureAddress(
+      {required int threshold, required List<MultiSignatureSigner> signers}) {
     final sumWeight =
         signers.fold<int>(0, (sum, signer) => sum + signer.weight);
     if (threshold > 16 || threshold < 1) {
@@ -136,6 +141,9 @@ class MultiSignatureAddress {
     multiSigScript.addAll(['OP_$sumWeight', 'OP_CHECKMULTISIG']);
     final script = Script(script: multiSigScript);
     return MultiSignatureAddress._(
-        signers: signers, threshold: threshold, multiSigScript: script);
+        signers: signers,
+        threshold: threshold,
+        multiSigScript: script,
+        canSelectSegwit: signers.every((e) => e.isCompressed));
   }
 }
diff --git a/lib/src/provider/models/utxo_details.dart b/lib/src/provider/models/utxo_details.dart
index 4917e98..063da98 100644
--- a/lib/src/provider/models/utxo_details.dart
+++ b/lib/src/provider/models/utxo_details.dart
@@ -16,11 +16,16 @@ class UtxoAddressDetails {
   /// associated with the UTXO owner. It may be null if the UTXO owner is not using a multi-signature scheme.
   final MultiSignatureAddress? _multiSigAddress;
 
-  UtxoAddressDetails({
+  UtxoAddressDetails._({
     required String publicKey,
     required this.address,
   })  : _multiSigAddress = null,
         _publicKey = publicKey;
+  factory UtxoAddressDetails(
+      {required String publicKey, required BitcoinBaseAddress address}) {
+    ECPublic.fromHex(publicKey);
+    return UtxoAddressDetails._(publicKey: publicKey, address: address);
+  }
 
   UtxoAddressDetails.multiSigAddress(
       {required MultiSignatureAddress multiSigAddress, required this.address})
@@ -41,10 +46,19 @@ class UtxoWithAddress {
   /// OwnerDetails is a UtxoAddressDetails instance containing information about the UTXO owner.
   final UtxoAddressDetails ownerDetails;
 
-  UtxoWithAddress({
-    required this.utxo,
-    required this.ownerDetails,
-  });
+  const UtxoWithAddress._(
+      {required this.utxo,
+      required this.ownerDetails,
+      required this.isCompressed});
+  factory UtxoWithAddress(
+      {required BitcoinUtxo utxo, required UtxoAddressDetails ownerDetails}) {
+    return UtxoWithAddress._(
+        utxo: utxo,
+        ownerDetails: ownerDetails,
+        isCompressed: ownerDetails._publicKey != null && !utxo.isSegwit
+            ? BtcUtils.isCompressedPubKey(ownerDetails._publicKey!)
+            : true);
+  }
 
   ECPublic public() {
     if (isMultiSig()) {
@@ -58,6 +72,8 @@ class UtxoWithAddress {
     return ECPublic.fromHex(ownerDetails._publicKey!);
   }
 
+  final bool isCompressed;
+
   bool isMultiSig() {
     return ownerDetails._multiSigAddress != null;
   }
@@ -96,10 +112,7 @@ class BitcoinOutput implements BitcoinSpendableBaseOutput {
   @override
   final BigInt value;
   // final CashToken? token;
-  BitcoinOutput({
-    required this.address,
-    required this.value,
-  });
+  BitcoinOutput({required this.address, required this.value});
 
   @override
   TxOutput get toOutput =>
@@ -113,10 +126,7 @@ class BitcoinScriptOutput implements BitcoinBaseOutput {
 
   /// The value (amount) of the Bitcoin output.
   final BigInt value;
-  const BitcoinScriptOutput({
-    required this.script,
-    required this.value,
-  });
+  const BitcoinScriptOutput({required this.script, required this.value});
 
   /// Convert the custom script output to a standard TxOutput.
   @override
@@ -134,12 +144,11 @@ class BitcoinTokenOutput implements BitcoinSpendableBaseOutput {
   final BigInt value;
   final CashToken token;
   final String? utxoHash;
-  BitcoinTokenOutput({
-    required this.address,
-    required this.value,
-    required this.token,
-    this.utxoHash,
-  });
+  BitcoinTokenOutput(
+      {required this.address,
+      required this.value,
+      required this.token,
+      this.utxoHash});
 
   /// Convert the custom script output to a standard TxOutput.
   @override
@@ -162,11 +171,7 @@ class BitcoinBurnableOutput extends BitcoinBaseOutput {
   /// The value (amount) of the burnable output (optional only for token with hasAmount flags).
   final BigInt? value;
 
-  BitcoinBurnableOutput({
-    required this.categoryID,
-    this.utxoHash,
-    this.value,
-  });
+  BitcoinBurnableOutput({required this.categoryID, this.utxoHash, this.value});
 
   @override
   TxOutput get toOutput => throw UnimplementedError();
@@ -194,30 +199,45 @@ class BitcoinUtxo {
   /// BlockHeight represents the block height at which this UTXO was confirmed.
   final int? blockHeight;
 
-  BitcoinUtxo({
-    required this.txHash,
-    required this.value,
-    required this.vout,
-    required this.scriptType,
-    this.blockHeight,
-    this.token,
-  });
+  BitcoinUtxo._(
+      {required this.txHash,
+      required this.value,
+      required this.vout,
+      required this.scriptType,
+      this.blockHeight,
+      this.token,
+      required this.isP2tr,
+      required this.isP2shSegwit,
+      required this.isSegwit});
+  factory BitcoinUtxo(
+      {required String txHash,
+      required BigInt value,
+      required int vout,
+      required BitcoinAddressType scriptType,
+      int? blockHeight,
+      CashToken? token}) {
+    final bool isP2shSegwit = scriptType == P2shAddressType.p2wpkhInP2sh ||
+        scriptType == P2shAddressType.p2wshInP2sh;
+    return BitcoinUtxo._(
+        txHash: txHash,
+        value: value,
+        blockHeight: blockHeight,
+        token: token,
+        vout: vout,
+        scriptType: scriptType,
+        isP2tr: scriptType == SegwitAddresType.p2tr,
+        isP2shSegwit: isP2shSegwit,
+        isSegwit: isP2shSegwit || scriptType.isSegwit);
+  }
 
   /// check if utxos is p2tr
-  bool isP2tr() {
-    return scriptType == SegwitAddresType.p2tr;
-  }
+  final bool isP2tr;
 
   /// check if utxos is segwit
-  bool isSegwit() {
-    return scriptType.isSegwit || isP2shSegwit();
-  }
+  final bool isSegwit;
 
-  /// checl if utxos is p2sh neasted segwit
-  bool isP2shSegwit() {
-    return scriptType == P2shAddressType.p2wpkhInP2sh ||
-        scriptType == P2shAddressType.p2wshInP2sh;
-  }
+  /// check if utxos is p2sh neasted segwit
+  final bool isP2shSegwit;
 
   /// convert utxos to transaction input with specify sequence like ReplaceByeFee (4Bytes)
   TxInput toInput([List<int>? sequence]) {
diff --git a/lib/src/provider/service/electrum/exception.dart b/lib/src/provider/service/electrum/exception.dart
deleted file mode 100644
index 2b1e90e..0000000
--- a/lib/src/provider/service/electrum/exception.dart
+++ /dev/null
@@ -1,51 +0,0 @@
-// import 'package:blockchain_utils/blockchain_utils.dart';
-
-// /// Exception class representing errors encountered during RPC (Remote Procedure Call) requests.
-// class ElectrumRPCException implements BlockchainUtilsException {
-//   /// Constructs an instance of [ElectrumRPCException] with the provided details.
-//   const ElectrumRPCException(
-//       {required this.message,
-//       required this.code,
-//       required this.data,
-//       required this.request});
-
-//   /// The error code associated with the error.
-//   final int code;
-
-//   /// A human-readable error message describing the issue.
-//   @override
-//   final String message;
-
-//   /// Additional data providing more context about the error (nullable).
-//   final dynamic data;
-
-//   /// The original request that triggered the error.
-//   final Map<String, dynamic> request;
-
-//   @override
-//   String toString() {
-//     return 'RPC Error: Received code $code with message  "$message".';
-//   }
-
-//   /// Converts the exception details to a JSON-formatted representation.
-//   Map<String, dynamic> toJson() {
-//     final error = {"message": message, "code": code};
-//     if (data != null) {
-//       error["data"] = data;
-//     }
-//     final toJson = {
-//       "jsonrpc": "2.0",
-//       "error": error,
-//     };
-//     if (request.isNotEmpty) {
-//       if (request.containsKey("id")) {
-//         toJson["id"] = request["id"];
-//       }
-//       if (request.containsKey("params") && request.containsKey("method")) {
-//         toJson["params"] = request["params"];
-//         toJson["method"] = request["method"];
-//       }
-//     }
-//     return toJson;
-//   }
-// }
diff --git a/lib/src/provider/transaction_builder/forked_transaction_builder.dart b/lib/src/provider/transaction_builder/forked_transaction_builder.dart
index 542c208..80e1b3c 100644
--- a/lib/src/provider/transaction_builder/forked_transaction_builder.dart
+++ b/lib/src/provider/transaction_builder/forked_transaction_builder.dart
@@ -49,6 +49,9 @@ class ForkedTransactionBuilder implements BasedBitcoinTransacationBuilder {
       throw const DartBitcoinPluginException(
           "invalid network. use ForkedTransactionBuilder for BitcoinCashNetwork and BSVNetwork otherwise use BitcoinTransactionBuilder");
     }
+
+    /// validate every address is related to network
+    /// exception if failed.
     for (final i in utxosInfo) {
       i.ownerDetails.address.toAddress(network);
     }
@@ -131,20 +134,21 @@ class ForkedTransactionBuilder implements BasedBitcoinTransacationBuilder {
     }
 
     final senderPub = utxo.public();
+    final bool isCompressed = utxo.isCompressed;
     switch (utxo.utxo.scriptType) {
       case PubKeyAddressType.p2pk:
       case P2shAddressType.p2pkInP2sh:
       case P2shAddressType.p2pkInP2shwt:
       case P2shAddressType.p2pkInP2sh32:
       case P2shAddressType.p2pkInP2sh32wt:
-        return senderPub.toRedeemScript();
+        return senderPub.toRedeemScript(compressed: isCompressed);
       case P2pkhAddressType.p2pkh:
       case P2shAddressType.p2pkhInP2sh:
       case P2shAddressType.p2pkhInP2sh32:
       case P2pkhAddressType.p2pkhwt:
       case P2shAddressType.p2pkhInP2shwt:
       case P2shAddressType.p2pkhInP2sh32wt:
-        return senderPub.toAddress().toScriptPubKey();
+        return senderPub.toAddress(compressed: isCompressed).toScriptPubKey();
       default:
         throw DartBitcoinPluginException(
             "${utxo.utxo.scriptType} does not sudpport on ${network.conf.coinName.name}");
@@ -172,13 +176,14 @@ class ForkedTransactionBuilder implements BasedBitcoinTransacationBuilder {
     UtxoWithAddress utox,
     BtcTransaction transaction,
   ) {
+    const sighash =
+        BitcoinOpCodeConst.SIGHASH_ALL | BitcoinOpCodeConst.SIGHASH_FORKED;
     return transaction.getTransactionSegwitDigit(
         txInIndex: input,
         script: scriptPubKeys,
         amount: utox.utxo.value,
         token: utox.utxo.token,
-        sighash:
-            BitcoinOpCodeConst.SIGHASH_ALL | BitcoinOpCodeConst.SIGHASH_FORKED);
+        sighash: sighash);
   }
 
   /// buildP2wshOrP2shScriptSig constructs and returns a script signature (represented as a List of strings)
@@ -206,23 +211,29 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
 */
   List<String> _buildUnlockingScript(String signedDigest, UtxoWithAddress utx) {
     final senderPub = utx.public();
+    final bool isCompressed = utx.isCompressed;
     switch (utx.utxo.scriptType) {
       case PubKeyAddressType.p2pk:
         return [signedDigest];
       case P2pkhAddressType.p2pkh:
       case P2pkhAddressType.p2pkhwt:
-        return [signedDigest, senderPub.toHex()];
+        return [signedDigest, senderPub.toHex(compressed: isCompressed)];
       case P2shAddressType.p2pkhInP2sh:
       case P2shAddressType.p2pkhInP2shwt:
       case P2shAddressType.p2pkhInP2sh32:
       case P2shAddressType.p2pkhInP2sh32wt:
-        final script = senderPub.toAddress().toScriptPubKey();
-        return [signedDigest, senderPub.toHex(), script.toHex()];
+        final script =
+            senderPub.toAddress(compressed: isCompressed).toScriptPubKey();
+        return [
+          signedDigest,
+          senderPub.toHex(compressed: isCompressed),
+          script.toHex()
+        ];
       case P2shAddressType.p2pkInP2sh:
       case P2shAddressType.p2pkInP2shwt:
       case P2shAddressType.p2pkInP2sh32:
       case P2shAddressType.p2pkInP2sh32wt:
-        final script = senderPub.toRedeemScript();
+        final script = senderPub.toRedeemScript(compressed: isCompressed);
         return [signedDigest, script.toHex()];
       default:
         throw DartBitcoinPluginException(
@@ -327,7 +338,8 @@ be retrieved by anyone who examines the blockchain's history.
       required BigInt sumAmountsWithFee,
       required BigInt sumUtxoAmount,
       required BigInt sumOutputAmounts}) {
-    if (!isFakeTransaction && sumAmountsWithFee != sumUtxoAmount) {
+    if (isFakeTransaction) return;
+    if (sumAmountsWithFee != sumUtxoAmount) {
       throw DartBitcoinPluginException('Sum value of utxo not spending',
           details: {
             "inputAmount": sumUtxoAmount,
@@ -335,56 +347,54 @@ be retrieved by anyone who examines the blockchain's history.
             "outputAmount": sumOutputAmounts
           });
     }
-    if (!isFakeTransaction) {
-      /// sum of token amounts
-      final sumOfTokenUtxos = utxos.sumOfTokenUtxos();
-
-      /// sum of token output amounts
-      final sumTokenOutputAmouts = _sumTokenOutputAmounts(outputs);
-      for (final i in sumOfTokenUtxos.entries) {
-        if (sumTokenOutputAmouts[i.key] != i.value) {
-          BigInt amount = sumTokenOutputAmouts[i.key] ?? BigInt.zero;
-          amount += outPuts
-              .whereType<BitcoinBurnableOutput>()
-              .where((element) => element.categoryID == i.key)
-              .fold(
-                  BigInt.zero,
-                  (previousValue, element) =>
-                      previousValue + (element.value ?? BigInt.zero));
-
-          if (amount != i.value) {
-            throw DartBitcoinPluginException(
-                'Sum token value of UTXOs not spending. use BitcoinBurnableOutput if you want to burn tokens.',
-                details: {
-                  "token": i.key,
-                  "inputValue": i.value,
-                  "outputValue": amount
-                });
-          }
-        }
-      }
-      for (final i in utxos) {
-        if (i.utxo.token != null) {
-          final token = i.utxo.token!;
-          if (token.hasAmount) continue;
-          if (!token.hasNFT) continue;
-          final hasOneoutput = outPuts.whereType<BitcoinTokenOutput>().any(
-              (element) =>
-                  element.utxoHash == i.utxo.txHash &&
-                  element.token.category == token.category);
-          if (hasOneoutput) continue;
-          final hasBurnableOutput = outPuts
-              .whereType<BitcoinBurnableOutput>()
-              .any((element) =>
-                  element.utxoHash == i.utxo.txHash &&
-                  element.categoryID == token.category);
-          if (hasBurnableOutput) continue;
+
+    /// sum of token amounts
+    final sumOfTokenUtxos = utxos.sumOfTokenUtxos();
+
+    /// sum of token output amounts
+    final sumTokenOutputAmouts = _sumTokenOutputAmounts(outputs);
+    for (final i in sumOfTokenUtxos.entries) {
+      if (sumTokenOutputAmouts[i.key] != i.value) {
+        BigInt amount = sumTokenOutputAmouts[i.key] ?? BigInt.zero;
+        amount += outPuts
+            .whereType<BitcoinBurnableOutput>()
+            .where((element) => element.categoryID == i.key)
+            .fold(
+                BigInt.zero,
+                (previousValue, element) =>
+                    previousValue + (element.value ?? BigInt.zero));
+
+        if (amount != i.value) {
           throw DartBitcoinPluginException(
-              'Some NFTs in the inputs lack the corresponding spending in the outputs. If you intend to burn tokens, consider utilizing the BitcoinBurnableOutput.',
-              details: {"category id": token.category});
+              'Sum token value of UTXOs not spending. use BitcoinBurnableOutput if you want to burn tokens.',
+              details: {
+                "token": i.key,
+                "inputValue": i.value,
+                "outputValue": amount
+              });
         }
       }
     }
+    for (final i in utxos) {
+      final token = i.utxo.token;
+      if (token != null && token.hasNFT) {
+        if (token.hasAmount) continue;
+        final hasOneoutput = outPuts.whereType<BitcoinTokenOutput>().any(
+            (element) =>
+                element.utxoHash == i.utxo.txHash &&
+                element.token.category == token.category);
+        if (hasOneoutput) continue;
+        final hasBurnableOutput = outPuts
+            .whereType<BitcoinBurnableOutput>()
+            .any((element) =>
+                element.utxoHash == i.utxo.txHash &&
+                element.categoryID == token.category);
+        if (hasBurnableOutput) continue;
+        throw DartBitcoinPluginException(
+            'Some NFTs in the inputs lack the corresponding spending in the outputs. If you intend to burn tokens, consider utilizing the BitcoinBurnableOutput.',
+            details: {"category id": token.category});
+      }
+    }
   }
 
   @override
@@ -419,7 +429,7 @@ be retrieved by anyone who examines the blockchain's history.
             break;
           }
         }
-        if (sumMultiSigWeight != multiSigAddress.threshold) {
+        if (sumMultiSigWeight < multiSigAddress.threshold) {
           throw const DartBitcoinPluginException(
               "some multisig signature does not exist");
         }
@@ -502,7 +512,7 @@ be retrieved by anyone who examines the blockchain's history.
             break;
           }
         }
-        if (sumMultiSigWeight != multiSigAddress.threshold) {
+        if (sumMultiSigWeight < multiSigAddress.threshold) {
           throw const DartBitcoinPluginException(
               "some multisig signature does not exist");
         }
@@ -516,7 +526,8 @@ be retrieved by anyone who examines the blockchain's history.
       final sig = sign(digest, indexUtxo, indexUtxo.public().toHex(), sighash);
       _addScripts(input: inputs[i], signatures: [sig], utxo: indexUtxo);
     }
-
+    final ea = BtcTransaction.fromRaw(transaction.serialize());
+    assert(ea.serialize() == transaction.serialize(), transaction.serialize());
     return transaction;
   }
 
@@ -578,6 +589,7 @@ be retrieved by anyone who examines the blockchain's history.
           /// now we need sign the transaction digest
           final sig = await sign(digest, indexUtxo,
               multiSigAddress.signers[ownerIndex].publicKey, sighash);
+
           if (sig.isEmpty) continue;
           for (int weight = 0;
               weight < multiSigAddress.signers[ownerIndex].weight;
@@ -587,12 +599,13 @@ be retrieved by anyone who examines the blockchain's history.
             }
             mutlsiSigSignatures.add(sig);
           }
+
           sumMultiSigWeight += multiSigAddress.signers[ownerIndex].weight;
           if (sumMultiSigWeight >= multiSigAddress.threshold) {
             break;
           }
         }
-        if (sumMultiSigWeight != multiSigAddress.threshold) {
+        if (sumMultiSigWeight < multiSigAddress.threshold) {
           throw const DartBitcoinPluginException(
               "some multisig signature does not exist");
         }
@@ -607,20 +620,17 @@ be retrieved by anyone who examines the blockchain's history.
           await sign(digest, indexUtxo, indexUtxo.public().toHex(), sighash);
       _addScripts(input: inputs[i], signatures: [sig], utxo: indexUtxo);
     }
-
     return transaction;
   }
 
-  void _addScripts({
-    required UtxoWithAddress utxo,
-    required TxInput input,
-    required List<String> signatures,
-  }) {
+  void _addScripts(
+      {required UtxoWithAddress utxo,
+      required TxInput input,
+      required List<String> signatures}) {
     /// ok we signed, now we need unlocking script for this input
     final scriptSig = utxo.isMultiSig()
         ? _buildMiltisigUnlockingScript(signatures, utxo)
         : _buildUnlockingScript(signatures.first, utxo);
-
     input.scriptSig = Script(script: scriptSig);
   }
 }
diff --git a/lib/src/provider/transaction_builder/transaction_builder.dart b/lib/src/provider/transaction_builder/transaction_builder.dart
index 07587c6..8003fd2 100644
--- a/lib/src/provider/transaction_builder/transaction_builder.dart
+++ b/lib/src/provider/transaction_builder/transaction_builder.dart
@@ -122,7 +122,7 @@ class BitcoinTransactionBuilder implements BasedBitcoinTransacationBuilder {
 
     final transaction = transactionBuilder
         .buildTransaction((trDigest, utxo, multiSigPublicKey, int sighash) {
-      if (utxo.utxo.isP2tr()) {
+      if (utxo.utxo.isP2tr) {
         return fakeSchnorSignaturBytes;
       } else {
         return fakeECDSASignatureBytes;
@@ -145,7 +145,7 @@ class BitcoinTransactionBuilder implements BasedBitcoinTransacationBuilder {
   /// - bool: True if at least one UTXO in the list is a SegWit UTXO, false otherwise.
   bool _hasSegwit() {
     for (final element in utxosInfo) {
-      if (element.utxo.isSegwit()) {
+      if (element.utxo.isSegwit) {
         return true;
       }
     }
@@ -160,7 +160,7 @@ class BitcoinTransactionBuilder implements BasedBitcoinTransacationBuilder {
   /// - bool: True if at least one UTXO in the list is a P2TR UTXO, false otherwise.
   bool _hasTaproot() {
     for (final element in utxosInfo) {
-      if (element.utxo.isP2tr()) {
+      if (element.utxo.isP2tr) {
         return true;
       }
     }
@@ -201,14 +201,16 @@ class BitcoinTransactionBuilder implements BasedBitcoinTransacationBuilder {
     final senderPub = utxo.public();
     switch (utxo.utxo.scriptType) {
       case PubKeyAddressType.p2pk:
-        return senderPub.toRedeemScript();
+        return senderPub.toRedeemScript(compressed: utxo.isCompressed);
       case SegwitAddresType.p2wsh:
         if (isTaproot) {
           return senderPub.toP2wshAddress().toScriptPubKey();
         }
         return senderPub.toP2wshScript();
       case P2pkhAddressType.p2pkh:
-        return senderPub.toAddress().toScriptPubKey();
+        return senderPub
+            .toAddress(compressed: utxo.isCompressed)
+            .toScriptPubKey();
       case SegwitAddresType.p2wpkh:
         if (isTaproot) {
           return senderPub.toSegwitAddress().toScriptPubKey();
@@ -218,9 +220,13 @@ class BitcoinTransactionBuilder implements BasedBitcoinTransacationBuilder {
         return senderPub.toTaprootAddress().toScriptPubKey();
       case P2shAddressType.p2pkhInP2sh:
         if (isTaproot) {
-          return senderPub.toP2pkhInP2sh().toScriptPubKey();
+          return senderPub
+              .toP2pkhInP2sh(compressed: utxo.isCompressed)
+              .toScriptPubKey();
         }
-        return senderPub.toAddress().toScriptPubKey();
+        return senderPub
+            .toAddress(compressed: utxo.isCompressed)
+            .toScriptPubKey();
       case P2shAddressType.p2wpkhInP2sh:
         if (isTaproot) {
           return senderPub.toP2wpkhInP2sh().toScriptPubKey();
@@ -233,9 +239,11 @@ class BitcoinTransactionBuilder implements BasedBitcoinTransacationBuilder {
         return senderPub.toP2wshScript();
       case P2shAddressType.p2pkInP2sh:
         if (isTaproot) {
-          return senderPub.toP2pkInP2sh().toScriptPubKey();
+          return senderPub
+              .toP2pkInP2sh(compressed: utxo.isCompressed)
+              .toScriptPubKey();
         }
-        return senderPub.toRedeemScript();
+        return senderPub.toRedeemScript(compressed: utxo.isCompressed);
     }
     throw const DartBitcoinPluginException("invalid bitcoin address type");
   }
@@ -262,8 +270,8 @@ class BitcoinTransactionBuilder implements BasedBitcoinTransacationBuilder {
       BtcTransaction transaction,
       List<BigInt> taprootAmounts,
       List<Script> tapRootPubKeys) {
-    if (utox.utxo.isSegwit()) {
-      if (utox.utxo.isP2tr()) {
+    if (utox.utxo.isSegwit) {
+      if (utox.utxo.isP2tr) {
         return transaction.getTransactionTaprootDigset(
           txIndex: input,
           scriptPubKeys: tapRootPubKeys,
@@ -308,8 +316,8 @@ class BitcoinTransactionBuilder implements BasedBitcoinTransacationBuilder {
     if (utxo.isMultiSig()) {
       switch (utxo.utxo.scriptType) {
         case P2shAddressType.p2wshInP2sh:
-          final script = Script.fromRaw(
-              hexData: utxo.multiSigAddress.multiSigScript.toHex(),
+          final script = Script.deserialize(
+              bytes: utxo.multiSigAddress.multiSigScript.toBytes(),
               hasSegwit: true);
           final p2wsh = P2wshAddress.fromScript(script: script);
           return [p2wsh.toScriptPubKey().toHex()];
@@ -340,8 +348,8 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
 */
   List<String> _buildUnlockingScript(String signedDigest, UtxoWithAddress utx) {
     final senderPub = utx.public();
-    if (utx.utxo.isSegwit()) {
-      if (utx.utxo.isP2tr()) {
+    if (utx.utxo.isSegwit) {
+      if (utx.utxo.isP2tr) {
         return [signedDigest];
       }
       switch (utx.utxo.scriptType) {
@@ -357,16 +365,22 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
               "invalid segwit address type ${utx.utxo.scriptType.value}");
       }
     } else {
+      final bool isCompressed = utx.isCompressed;
       switch (utx.utxo.scriptType) {
         case PubKeyAddressType.p2pk:
           return [signedDigest];
         case P2pkhAddressType.p2pkh:
-          return [signedDigest, senderPub.toHex()];
+          return [signedDigest, senderPub.toHex(compressed: isCompressed)];
         case P2shAddressType.p2pkhInP2sh:
-          final script = senderPub.toAddress().toScriptPubKey();
-          return [signedDigest, senderPub.toHex(), script.toHex()];
+          final script =
+              senderPub.toAddress(compressed: isCompressed).toScriptPubKey();
+          return [
+            signedDigest,
+            senderPub.toHex(compressed: isCompressed),
+            script.toHex()
+          ];
         case P2shAddressType.p2pkInP2sh:
-          final script = senderPub.toRedeemScript();
+          final script = senderPub.toRedeemScript(compressed: isCompressed);
           return [signedDigest, script.toHex()];
         default:
           throw DartBitcoinPluginException(
@@ -400,28 +414,6 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
     return Tuple(List<TxInput>.unmodifiable(inputs),
         List<UtxoWithAddress>.unmodifiable(sortedUtxos));
   }
-  // List<TxInput> _buildInputs() {
-  //   List<TxInput> inputs = utxos.map((e) => e.utxo.toInput()).toList();
-  //   if (enableRBF && inputs.isNotEmpty) {
-  //     inputs[0] = inputs[0]
-  //         .copyWith(sequence: BitcoinOpCodeConst.REPLACE_BY_FEE_SEQUENCE);
-  //   }
-  //   if (inputOrdering == BitcoinOrdering.shuffle) {
-  //     inputs = inputs..shuffle();
-  //   } else if (inputOrdering == BitcoinOrdering.bip69) {
-  //     inputs = inputs
-  //       ..sort(
-  //         (a, b) {
-  //           final txidComparison = a.txId.compareTo(b.txId);
-  //           if (txidComparison == 0) {
-  //             return a.txIndex - b.txIndex;
-  //           }
-  //           return txidComparison;
-  //         },
-  //       );
-  //   }
-  //   return List<TxInput>.unmodifiable(inputs);
-  // }
 
   List<TxOutput> _buildOutputs() {
     List<TxOutput> outputs = outPuts.map((e) => e.toOutput).toList();
@@ -444,6 +436,12 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
           },
         );
     }
+    for (final i in outputs) {
+      if (i.amount.isNegative) {
+        throw DartBitcoinPluginException("Some output has negative amount.",
+            details: {"output": i.amount});
+      }
+    }
     return List<TxOutput>.unmodifiable(outputs);
   }
 
@@ -522,7 +520,7 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
       /// We generate transaction digest for current input
       final digest = _generateTransactionDigest(
           script, i, utxos[i], transaction, taprootAmounts, taprootScripts);
-      final int sighash = utxos[i].utxo.isP2tr()
+      final int sighash = utxos[i].utxo.isP2tr
           ? BitcoinOpCodeConst.TAPROOT_SIGHASH_ALL
           : BitcoinOpCodeConst.SIGHASH_ALL;
 
@@ -551,7 +549,7 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
             break;
           }
         }
-        if (sumMultiSigWeight != multiSigAddress.threshold) {
+        if (sumMultiSigWeight < multiSigAddress.threshold) {
           throw const DartBitcoinPluginException(
               "some multisig signature does not exist");
         }
@@ -614,7 +612,7 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
             break;
           }
         }
-        if (sumMultiSigWeight != multiSigAddress.threshold) {
+        if (sumMultiSigWeight < multiSigAddress.threshold) {
           throw const DartBitcoinPluginException(
               "some multisig signature does not exist");
         }
@@ -684,7 +682,7 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
       /// We generate transaction digest for current input
       final digest = _generateTransactionDigest(
           script, i, utxos[i], transaction, taprootAmounts, taprootScripts);
-      final int sighash = utxos[i].utxo.isP2tr()
+      final int sighash = utxos[i].utxo.isP2tr
           ? BitcoinOpCodeConst.TAPROOT_SIGHASH_ALL
           : BitcoinOpCodeConst.SIGHASH_ALL;
 
@@ -760,9 +758,9 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
 
     /// Now we need to add it to the transaction
     /// check if current utxo is segwit or not
-    if (utxo.utxo.isSegwit()) {
+    if (utxo.utxo.isSegwit) {
       witnesses.add(TxWitnessInput(stack: scriptSig));
-      if (utxo.utxo.isP2shSegwit()) {
+      if (utxo.utxo.isP2shSegwit) {
         /// check if we need redeemScriptSig or not
         /// In a Pay-to-Script-Hash (P2SH) Segregated Witness (SegWit) input,
         /// the redeemScriptSig is needed for historical and compatibility reasons,
diff --git a/lib/src/utils/btc_utils.dart b/lib/src/utils/btc_utils.dart
index 767464c..39aa0b7 100644
--- a/lib/src/utils/btc_utils.dart
+++ b/lib/src/utils/btc_utils.dart
@@ -1,6 +1,11 @@
 import 'package:blockchain_utils/utils/numbers/rational/big_rational.dart';
+import 'package:blockchain_utils/utils/string/string.dart';
 
 class BtcUtils {
+  static bool isCompressedPubKey(String publicKey) {
+    return StringUtils.strip0x(publicKey.toLowerCase()).length == 66;
+  }
+
   static BigInt toSatoshi(String decimal) {
     BigRational dec = BigRational.parseDecimal(decimal);
     dec = dec * BigRational(BigInt.from(10).pow(8));
diff --git a/pubspec.yaml b/pubspec.yaml
index 73f4adf..1c7a136 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -19,7 +19,7 @@ dependencies:
   blockchain_utils: ^3.5.0
   
   # blockchain_utils:
-  #   path: ../blockchain_utils
+  #   path: ../../blockchain_utils
     
 
 dev_dependencies:
diff --git a/test/deserialize_test.dart b/test/deserialize_test.dart
new file mode 100644
index 0000000..0d8d4bb
--- /dev/null
+++ b/test/deserialize_test.dart
@@ -0,0 +1,21 @@
+import 'package:bitcoin_base/src/bitcoin/script/transaction.dart';
+import 'package:test/test.dart';
+
+void main() {
+  _decodeTx();
+}
+
+void _decodeTx() {
+  test("decode transaction", () {
+    const data =
+        "020000000186389e3142effb82e00d38abc93ef856e543221ca6dd7d916760e0cda49f059300000000fd57030047304402204335c0185a9277c531315d0cd6c83bbe8d60d39f1b93864d9a4e67c8cccb400802207813732324a0cccf3989b4c56554bf06eaeea9175557525532926de939cfac3c414730440220515367fed3284a5469489c27fc7ea1915e7a07a939fb56d2188e5a27813b87690220578a491532d4bc84756fb489c2a5093b9f6884cfe852f2b469a89c7e35482ac0414730440220594f4cf6da2c88e430d1cc00d3b9b47b2936a9c4121be1c0e2e3b634e060c58202202c340707cc66aa27bd8fe40d9993751a0efa805b021f861fad460343b2826d4841473044022001c8e211117d20ecd3b3d7359e96485015303b4f55ba3039e40f1e035d867c2f02203c43c3e3f48a8215cb99a22b95d4d99defed9e385dbbacc4501c9c6fbc7db50141473044022000e95343e11b6765aa823c58c4fd1b78495b0a29f3fb428886ce858850827e6d02206bb967529a3289397e7c0482c063d872bc839306940b9e36e35457d840f2bfef4147304402200475c3a062644cf26269c91524cece25ff95cde8cbf52c7f180c1f7e45092fcf02207c4f4449aa69de7e8ae5825375825f5175462766e17bd1d7f96b5096f2d6ae004147304402201339113915d56209270d3be2c91ca0c04392db726a4909026924cce6236444310220476c5c6a8cdb6f973b62dad12b95a651269ad74cf767d5100d88ea98309ff9c4414730440220628dcdc3b1ed6e85d6df25c976fa09488b73e1d81f4ef80d02fcbfd852fd88a00220264ba1fc4fc6d92246f3a3511f76871954aee360c7e2e407dc317736fe910df6414d1301582102b509e03e5773ad6864d037eb1c8f9e9c39698bc5b59272d7f2156da2070d810f210369cc1b70ded5caf25b42b59ae13bdbee386e5dcaa0612a2a258dec02364040682103d850292f0e06a8e64c569a23cb310d192d4ad1b145c7050c6cb23bd9e8a4310421024fa5bd6af09db2740c39ec3e795eab200f091029b65d9013f7d3b52eb1cbc6e0210205a9f0be6d7f598c9a3b06cca6223705b49a43f5de5401eef93ee8c48ddf34b42103aaf256cb145aef9bea0bad969ca498108da7a3ad6da7cdeadcbcade2aa64fcea2103cb2ce8e4c87f7a6184abb30bf21cfb987634959f67bf20336d4208f4d7d62ac52103515a9b03688488850dd184e9229cb43634c1a39e2ccc5b8f2cf2c0a8cebb92e858aeffffffff0284030000000000001976a914e54b088d7f501604b1d85ed9d30f46b5db721ac288acc71c00000000000017a91492b98234f58410b0cea227d6e7e60ec08aa8547e8700000000";
+    final tx = BtcTransaction.fromRaw(data);
+    expect(tx.serialize(), data);
+  });
+  test("decode transaction 2", () {
+    const data =
+        "0200000000010b78c2ebf52b849090b70ba2bb3ec4a4447037ab41e56781f44f7cae3d82d356470000000000ffffffff78c2ebf52b849090b70ba2bb3ec4a4447037ab41e56781f44f7cae3d82d356470100000000ffffffff78c2ebf52b849090b70ba2bb3ec4a4447037ab41e56781f44f7cae3d82d3564702000000484730440220759a2beb31cbc0bfb30ad3cff3f3c84869b6549984ac8f5413bae19b0fed3aed022036718ddc6bbd7c7921d922fe90e7786ef67818208e268507dea99c782a578e1301ffffffff78c2ebf52b849090b70ba2bb3ec4a4447037ab41e56781f44f7cae3d82d356470300000000ffffffff78c2ebf52b849090b70ba2bb3ec4a4447037ab41e56781f44f7cae3d82d35647040000008a47304402202846a5ca5766a4ef0246e59cf11bfd0a182b5ce4fe366e43480df48efe92465f022005a47fdbefa0aa971d8804606362866bcf6d0c2bf8e4ecd0c31d04e7e28d4b7e0141042f1b310f4c065331bc0d79ba4661bb9822d67d7c4a1b0a1892e1fd0cd23aa68d2518d05511d46fc76b5bd2f94625b811df220f825786208cc5b5cca23de230ccffffffff78c2ebf52b849090b70ba2bb3ec4a4447037ab41e56781f44f7cae3d82d3564705000000a447304402203cdbff5392666f0d5bd364c9b83053e3b7508727102cba2f2110136359fd717402205069298f860fbd84f9b60466535c9ca226d92eaf9bf298c97df7f20b758248590141041a7a569e91dbf60581509c7fc946d1003b60c7dee85299538db6353538d59574b4e89d60c7d584d084632d296f125f165b4df8e061a49daeba51d36133d03e1a1976a914c880e94561d70cb61f2108deff2f1a6c10fff6a488acffffffff78c2ebf52b849090b70ba2bb3ec4a4447037ab41e56781f44f7cae3d82d3564706000000a447304402202e5f50e724c564dd1dde5cbad5ed87a803beb1b3f0a1401f3d5ee4a7e1ec9ed2022005efbc073f4862625923c68ac15a830b00f01a7e40fdebe7979528782a8c64180141041a7a569e91dbf60581509c7fc946d1003b60c7dee85299538db6353538d59574b4e89d60c7d584d084632d296f125f165b4df8e061a49daeba51d36133d03e1a1976a914c880e94561d70cb61f2108deff2f1a6c10fff6a488acffffffff78c2ebf52b849090b70ba2bb3ec4a4447037ab41e56781f44f7cae3d82d3564707000000232200209e7470b3013d2e9585f2009241f223beaefc8067f82a2a6f2dd87d74cb5969dbffffffff78c2ebf52b849090b70ba2bb3ec4a4447037ab41e56781f44f7cae3d82d35647080000008c473044022013608955698454f9eff9708cb98f2ff97d3a4d4ab9f8a80996d57a861ae712970220347ad5bca2e6773fb1fc817cd12bac451cfedae8f024e67e8fac905eaa2601370143410499c2aa85d2b21a62f396907a802a58e521dafd5bddaccbd72786eea189bc4dc9c40c3728b587c47395ce41a2afe84ee70016fafa39d3b54e66fc1f11aefda704acffffffff78c2ebf52b849090b70ba2bb3ec4a4447037ab41e56781f44f7cae3d82d3564709000000fd410400473044022062c412f612e08ed3cf5ce5aba3c8e556849a2ffdded9814525393bd4b61c76890220638557c4426a83012b0cf31fccd395c9a063f01942dcdadf5c86b174fceaffbe0147304402206bec40f5bb548e6f0e2c8b6ffe24d1173f60b1ebb0a870cef941e8499d34c9ae02204206d61ecdfd2aa0a300f91dafd9e7399f22bee9298d56d972e0d58e366977fe01473044022050f449a88e32850924a1d19ab9b82f676d2859ec38765d13b0a08902eb8bb95b02203c1bbc81ad3af940470cd100e4bf59bd92570d0dc8b76bf6196a90c8a528520a0147304402205e8e6937d25e139762ca57d4e4777e28bbd730cde2cd72d16b7f73eca04df84d022011141ef7b64b3b10ae9fc1c78c73453c1855ff997c05b2aed56ee24ee53a789f01473044022046c8000f5c97f5e8b388e6294db4ebd8cb45f4c58f844003ed571ee8b5965a6e02202f2880e91746bcf240a6cf1945de81016f6c46cb95265e67289611e1eaaffbd00147304402204610acecbda4763c3d7bcf3e656a1cdb1f0e6286dff755b36640c52d5153011b0220785bb66ff9e36d9de663379d520858d340c66845c3f9c7b4bfd4843bf6c2fc0f01473044022007c91bb30021f4b2d84ca5cc18458aeb6ee96d9d5881d09a37af845524d3ff10022068ffdca9828bc4648cdb954bd76436b373a3da07c376452325e52a01075e7b2201473044022007c91bb30021f4b2d84ca5cc18458aeb6ee96d9d5881d09a37af845524d3ff10022068ffdca9828bc4648cdb954bd76436b373a3da07c376452325e52a01075e7b2201473044022007c91bb30021f4b2d84ca5cc18458aeb6ee96d9d5881d09a37af845524d3ff10022068ffdca9828bc4648cdb954bd76436b373a3da07c376452325e52a01075e7b22014db5015941040f0fb9a244ad31a369ee02b7abfbbb0bfa3812b9a39ed93346d03d67d412d1777965c382f55222a9aed59cb8affc64bb5381f065eab9ef3baa57f2f0ac6bfae921022f1b310f4c065331bc0d79ba4661bb9822d67d7c4a1b0a1892e1fd0cd23aa68d210299c2aa85d2b21a62f396907a802a58e521dafd5bddaccbd72786eea189bc4dc921021a7a569e91dbf60581509c7fc946d1003b60c7dee85299538db6353538d595742103a92c9b7cac68758de5783ed8e5123598e4ad137091e42987d3bad8a08e35bf3d21034f355bdcb7cc0af728ef3cceb9615d90684bb5b2ca5f859ab0f0b704075871aa41046360e856310ce5d294e8be33fc807077dc56ac80d95d9cd4ddbd21325eff73f7eb1c2784a65901538479361e94c0a2597973adef0836a6a7eddf50b7997c88a341046360e856310ce5d294e8be33fc807077dc56ac80d95d9cd4ddbd21325eff73f7eb1c2784a65901538479361e94c0a2597973adef0836a6a7eddf50b7997c88a341046360e856310ce5d294e8be33fc807077dc56ac80d95d9cd4ddbd21325eff73f7eb1c2784a65901538479361e94c0a2597973adef0836a6a7eddf50b7997c88a359aeffffffff78c2ebf52b849090b70ba2bb3ec4a4447037ab41e56781f44f7cae3d82d356470a000000484730440220028b766844f8d4e5c28b2464605dfa79435c9203481976db468517ca96674b320220761f5687ce7d6067ba3cbe652e11b8495ac274b5ce0e7f1b8f59b2c34f007bf701ffffffff0be803000000000000160014b4bd9b543a615fe9b73ced34a9a38572ae18a395e8030000000000002200209e7470b3013d2e9585f2009241f223beaefc8067f82a2a6f2dd87d74cb5969dbe8030000000000004341040f0fb9a244ad31a369ee02b7abfbbb0bfa3812b9a39ed93346d03d67d412d1777965c382f55222a9aed59cb8affc64bb5381f065eab9ef3baa57f2f0ac6bfae9ace80300000000000022512039d1075e641ac7deda75bfbfa28aa5c65d7f39b1315e024f62e1064b1ec71d3ee8030000000000001976a914f9c4fccde68b163563e0d60842d1accd19c1207b88ace80300000000000017a91454db4f9a5c6f2de3110925e1f8cf42aeab807e6687e80300000000000017a91454db4f9a5c6f2de3110925e1f8cf42aeab807e6687e80300000000000017a914baf6af81b991265c3e3223f4649cf1b21afa73b987e80300000000000017a914c95d7440311017931c7adb20ab103e116e17ccbb87e80300000000000017a914d6215d5c57d6d65ae73eb0d8fe2ad7cfa07d441f879ba80000000000004341040f0fb9a244ad31a369ee02b7abfbbb0bfa3812b9a39ed93346d03d67d412d1777965c382f55222a9aed59cb8affc64bb5381f065eab9ef3baa57f2f0ac6bfae9ac02473044022044cd5a0eca8585d1dfb183dc12b37bfb41308244540d6a6ba449b6663f85f5e402206221b9980ecc54538e249a1c01972c6198c150945d12b6d124ebe523bd7bd2c30121021a7a569e91dbf60581509c7fc946d1003b60c7dee85299538db6353538d595740300473044022010b9f2310bc25214db7508df0107c8683c7c2f3eabb60aad2c35bed84d516159022059a643ad81a966716db06a2d707fefb234bffcac975ece1bc4b900239b50b7e501255121031d16453b3ab3132acb0a5bc16cc49690d819a585267a15cd5a064e2a0ad4059951ae000140daf8270bffc7a39c45114f5b180f5f82bc920803f3a612a4b517ce609e7e4ef30d8939102af08c9407f0cc4f9c63ffdda9914634dc59b1786d6d6b9d1b8a31960000000300473044022058f436dd9dc7d2966cd44a52989c972fb67e017d02e08723293fcfc4a3da3bff02200f8ff1bb6a95709ed5cfc47e9f567cba1fca8c9c10cd2db4f348152b3420361001255121031d16453b3ab3132acb0a5bc16cc49690d819a585267a15cd5a064e2a0ad4059951ae00000000000000";
+    final tx = BtcTransaction.fromRaw(data);
+    expect(tx.serialize(), data);
+  });
+}
diff --git a/test/p2tr_test.dart b/test/p2tr_test.dart
index d3bd846..5462c5f 100644
--- a/test/p2tr_test.dart
+++ b/test/p2tr_test.dart
@@ -90,6 +90,8 @@ void main() {
         TxWitnessInput(stack: [signatur])
       ]);
       expect(tx.serialize(), signedTx2);
+      final decode = BtcTransaction.fromRaw(tx.serialize());
+      expect(decode.serialize(), tx.serialize());
     });
 
     // // 3-spend taproot from script path (has single tapleaf script for spending)
@@ -115,6 +117,8 @@ void main() {
             stack: [sig, trScriptP2pk1.toHex(), controlBlock.toHex()])
       ]);
       expect(tx.serialize(), signedTx3);
+      final decode = BtcTransaction.fromRaw(tx.serialize());
+      expect(decode.serialize(), tx.serialize());
     });
   });
 
@@ -185,6 +189,8 @@ void main() {
       ]);
 
       expect(tx.serialize(), signedTx3);
+      final decode = BtcTransaction.fromRaw(tx.serialize());
+      expect(decode.serialize(), tx.serialize());
     });
   });
 
@@ -265,6 +271,8 @@ void main() {
             stack: [sig, trScriptP2pkB.toHex(), controlBlock.toHex()])
       ]);
       expect(tx.serialize(), signedTx);
+      final decode = BtcTransaction.fromRaw(tx.serialize());
+      expect(decode.serialize(), tx.serialize());
     });
   });
 }

From 01d915f231497fa79ba492441e7c89887f349c3a Mon Sep 17 00:00:00 2001
From: Mohsen <mrhaydari.t@gmail.com>
Date: Sat, 30 Nov 2024 22:04:39 +0330
Subject: [PATCH 23/62] cleanup

---
 .../lib/services_examples/electrum/electrum_ssl_service.dart   | 1 -
 lib/src/bitcoin/script/input.dart                              | 1 -
 lib/src/bitcoin/script/script.dart                             | 3 ---
 3 files changed, 5 deletions(-)

diff --git a/example/lib/services_examples/electrum/electrum_ssl_service.dart b/example/lib/services_examples/electrum/electrum_ssl_service.dart
index cf404a1..362c306 100644
--- a/example/lib/services_examples/electrum/electrum_ssl_service.dart
+++ b/example/lib/services_examples/electrum/electrum_ssl_service.dart
@@ -68,7 +68,6 @@ class ElectrumSSLService with BitcoinBaseElectrumRPCService {
   }
 
   void _onMessge(List<int> event) {
-    print("Event ${utf8.decode(event)}");
     final Map<String, dynamic> decode = json.decode(utf8.decode(event));
     if (decode.containsKey("id")) {
       final int id = int.parse(decode["id"]!.toString());
diff --git a/lib/src/bitcoin/script/input.dart b/lib/src/bitcoin/script/input.dart
index 70d2b57..95666a1 100644
--- a/lib/src/bitcoin/script/input.dart
+++ b/lib/src/bitcoin/script/input.dart
@@ -1,7 +1,6 @@
 import 'dart:typed_data';
 
 import 'package:bitcoin_base/src/bitcoin/script/op_code/constant.dart';
-import 'package:bitcoin_base/src/exception/exception.dart';
 import 'package:blockchain_utils/utils/utils.dart';
 import 'script.dart';
 
diff --git a/lib/src/bitcoin/script/script.dart b/lib/src/bitcoin/script/script.dart
index 8073a9d..fb2d2e2 100644
--- a/lib/src/bitcoin/script/script.dart
+++ b/lib/src/bitcoin/script/script.dart
@@ -82,9 +82,6 @@ class Script {
         if (token is int) {
           scriptBytes.add(pushInteger(token));
         } else {
-          final pl = opPushData(token);
-          print("Large ${pl.length}");
-
           scriptBytes.add(opPushData(token));
         }
       }

From f9b8f2486461499e4a90e73c95931941e4f9b791 Mon Sep 17 00:00:00 2001
From: Mohsen <mrhaydari.t@gmail.com>
Date: Sun, 1 Dec 2024 21:11:09 +0330
Subject: [PATCH 24/62] fix large script serialization

---
 analysis_options.yaml                         |   7 +
 example/test/bch_test.dart                    |   1 -
 example/test/btc2_test.dart                   |   1 -
 example/test/btc_test.dart                    | 118 ------------
 example/test/e_test.dart                      |   1 -
 example/test/widget_test.dart                 |  97 ----------
 lib/bitcoin_base.dart                         |   2 +-
 lib/src/bitcoin/address/address.dart          |   2 +-
 lib/src/bitcoin/address/core.dart             |  10 +-
 lib/src/bitcoin/address/legacy_address.dart   |  20 +-
 lib/src/bitcoin/address/segwit_address.dart   |  48 ++---
 .../bitcoin/address/utils/address_utils.dart  |  12 +-
 lib/src/bitcoin/script/input.dart             |   9 +-
 .../bitcoin/script/op_code/constant_lib.dart  |   2 +-
 lib/src/bitcoin/script/op_code/tools.dart     |   2 +-
 lib/src/bitcoin/script/output.dart            |   5 +-
 lib/src/bitcoin/script/script.dart            |  18 +-
 lib/src/bitcoin/script/transaction.dart       | 181 ++++++++----------
 lib/src/bitcoin/script/witness.dart           |   4 +-
 lib/src/bitcoin_cash/bcmr_registery.dart      |  36 ++--
 lib/src/cash_token/cash_token.dart            |  10 +-
 lib/src/crypto/crypto.dart                    |   2 +-
 lib/src/crypto/keypair/ec_private.dart        |  11 ++
 lib/src/exception/exception.dart              |   4 +-
 lib/src/models/network.dart                   |   2 +-
 .../block_cypher/block_cypher_models.dart     |   2 +-
 lib/src/provider/models/config.dart           |   8 +-
 .../provider/models/fee_rate/fee_rate.dart    |   2 +-
 .../models/mempool/mempol_models.dart         |   2 +-
 lib/src/provider/models/utxo_details.dart     |   6 +-
 lib/src/provider/service/electrum/params.dart |   2 +-
 .../forked_transaction_builder.dart           |  42 ++--
 .../transaction_builder.dart                  |   7 +-
 pubspec.yaml                                  |   8 +-
 test/bitcoin_cash_address_test.dart           |   2 +-
 test/keys_test.dart                           |   4 +-
 test/p2sh_test.dart                           |   1 +
 test/p2tr_test.dart                           |   2 +-
 38 files changed, 225 insertions(+), 468 deletions(-)
 delete mode 100644 example/test/bch_test.dart
 delete mode 100644 example/test/btc2_test.dart
 delete mode 100644 example/test/btc_test.dart
 delete mode 100644 example/test/e_test.dart
 delete mode 100644 example/test/widget_test.dart

diff --git a/analysis_options.yaml b/analysis_options.yaml
index d429a46..cf19463 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -2,3 +2,10 @@
 include: package:flutter_lints/flutter.yaml
 # Additional information about this file can be found at
 # https://dart.dev/guides/language/analysis-options
+# Uncomment the following section to specify additional rules.
+linter:
+  rules:
+    - unnecessary_const
+    - prefer_const_declarations
+    - prefer_final_locals      # Warns when a local variable could be final
+    - prefer_final_in_for_each # Warns when a forEach variable could be final
diff --git a/example/test/bch_test.dart b/example/test/bch_test.dart
deleted file mode 100644
index f76cc54..0000000
--- a/example/test/bch_test.dart
+++ /dev/null
@@ -1 +0,0 @@
-void main() async {}
diff --git a/example/test/btc2_test.dart b/example/test/btc2_test.dart
deleted file mode 100644
index f76cc54..0000000
--- a/example/test/btc2_test.dart
+++ /dev/null
@@ -1 +0,0 @@
-void main() async {}
diff --git a/example/test/btc_test.dart b/example/test/btc_test.dart
deleted file mode 100644
index 4690921..0000000
--- a/example/test/btc_test.dart
+++ /dev/null
@@ -1,118 +0,0 @@
-void main() async {
-  // final one = ECPrivate.fromBytes(List<int>.filled(32, 12));
-  // final two = ECPrivate.fromBytes(List<int>.filled(32, 13));
-  // final three = ECPrivate.fromBytes(List<int>.filled(32, 14));
-  // final four = ECPrivate.fromBytes(List<int>.filled(32, 15));
-  // final five = ECPrivate.fromBytes(List<int>.filled(32, 16));
-  // final six = ECPrivate.fromBytes(List<int>.filled(32, 17));
-  // final seven = ECPrivate.fromBytes(List<int>.filled(32, 18));
-  // final eight = ECPrivate.fromBytes(List<int>.filled(32, 19));
-  // final Map<String, ECPrivate> keys = {
-  //   for (final i in [one, two, three, four, five, six, seven, eight])
-  //     i.getPublic().toHex(): i
-  // };
-  // final account = MultiSignatureAddress(threshold: 8, signers: [
-  //   MultiSignatureSigner(publicKey: one.getPublic().toHex(), weight: 1),
-  //   MultiSignatureSigner(publicKey: two.getPublic().toHex(), weight: 1),
-  //   MultiSignatureSigner(publicKey: three.getPublic().toHex(), weight: 1),
-  //   MultiSignatureSigner(publicKey: four.getPublic().toHex(), weight: 1),
-  //   MultiSignatureSigner(publicKey: five.getPublic().toHex(), weight: 1),
-  //   MultiSignatureSigner(publicKey: six.getPublic().toHex(), weight: 1),
-  //   MultiSignatureSigner(publicKey: seven.getPublic().toHex(), weight: 1),
-  //   MultiSignatureSigner(publicKey: eight.getPublic().toHex(), weight: 1),
-  // ]);
-  // final addr = account.toP2shAddress();
-  // // return;
-
-  // /// connect to electrum service with websocket
-  // /// please see `services_examples` folder for how to create electrum websocket service
-  // final service = await ElectrumSSLService.connect(
-  //     "testnet4-electrumx.wakiyamap.dev:51002");
-
-  // /// create provider with service
-  // final provider = ElectrumApiProvider(service);
-
-  // final elctrumUtxos = await provider.request(ElectrumScriptHashListUnspent(
-  //   scriptHash: addr.pubKeyHash(),
-  //   includeTokens: false,
-  // ));
-  // final List<UtxoWithAddress> utxos = elctrumUtxos
-  //     .map((e) => UtxoWithAddress(
-  //         utxo: e.toUtxo(addr.type),
-  //         ownerDetails: UtxoAddressDetails.multiSigAddress(
-  //             multiSigAddress: account, address: addr)))
-  //     .toList();
-
-  // final sumOfUtxo = utxos.sumOfUtxosValue();
-  // if (sumOfUtxo == BigInt.zero) {
-  //   return;
-  // }
-  // final addrOne = one.getPublic().toP2pkAddress(compressed: false);
-  // final addrTwo = two.getPublic().toAddress(compressed: false);
-  // final addrThree = three.getPublic().toP2pkInP2sh(compressed: false);
-  // final addrFour = four.getPublic().toP2pkhInP2sh(compressed: false);
-  // final addrFive = four.getPublic().toSegwitAddress();
-  // final addrSix = four.getPublic().toP2wshInP2sh();
-  // // print(sumOfUtxo);
-  // // return;
-  // final bchTransaction = BitcoinTransactionBuilder(
-  //   outPuts: [
-  //     /// change input (sumofutxos - spend)
-  //     BitcoinOutput(
-  //       address: addr,
-  //       value: sumOfUtxo -
-  //           (BigInt.from(1000) * BigInt.from(7) + BigInt.from(2200)),
-  //     ),
-  //     BitcoinOutput(
-  //       address: addrOne,
-  //       value: BigInt.from(1000),
-  //     ),
-  //     BitcoinOutput(
-  //       address: addrTwo,
-  //       value: BigInt.from(1000),
-  //     ),
-  //     BitcoinOutput(
-  //       address: addrThree,
-  //       value: BigInt.from(1000),
-  //     ),
-  //     BitcoinOutput(
-  //       address: addrFour,
-  //       value: BigInt.from(1000),
-  //     ),
-  //     BitcoinOutput(
-  //       address: addrFour,
-  //       value: BigInt.from(1000),
-  //     ),
-  //     BitcoinOutput(
-  //       address: addrFive,
-  //       value: BigInt.from(1000),
-  //     ),
-  //     BitcoinOutput(
-  //       address: addrSix,
-  //       value: BigInt.from(1000),
-  //     ),
-  //   ],
-  //   fee: BigInt.from(2200),
-  //   network: BitcoinNetwork.testnet,
-  //   utxos: utxos,
-  // );
-  // final transaaction =
-  //     bchTransaction.buildTransaction((trDigest, utxo, publicKey, sighash) {
-  //   return keys[publicKey]!.signInput(trDigest, sigHash: sighash);
-  // });
-
-  // /// transaction ID
-  // transaaction.txId();
-
-  // /// for calculation fee
-  // print(transaaction.getSize());
-  // // return;
-
-  // /// raw of encoded transaction in hex
-  // final transactionRaw = transaaction.toHex();
-  // print(transactionRaw);
-  // // print(elctrumUtxos.length);
-  // final d = await provider
-  //     .request(ElectrumBroadCastTransaction(transactionRaw: transactionRaw));
-  // print(d);
-}
diff --git a/example/test/e_test.dart b/example/test/e_test.dart
deleted file mode 100644
index ab73b3a..0000000
--- a/example/test/e_test.dart
+++ /dev/null
@@ -1 +0,0 @@
-void main() {}
diff --git a/example/test/widget_test.dart b/example/test/widget_test.dart
deleted file mode 100644
index 4f8fc15..0000000
--- a/example/test/widget_test.dart
+++ /dev/null
@@ -1,97 +0,0 @@
-void main() async {
-  // final one = ECPrivate.fromBytes(List<int>.filled(32, 12));
-  // final two = ECPrivate.fromBytes(List<int>.filled(32, 13));
-  // final three = ECPrivate.fromBytes(List<int>.filled(32, 14));
-  // final four = ECPrivate.fromBytes(List<int>.filled(32, 15));
-  // final five = ECPrivate.fromBytes(List<int>.filled(32, 16));
-  // final six = ECPrivate.fromBytes(List<int>.filled(32, 17));
-  // final seven = ECPrivate.fromBytes(List<int>.filled(32, 18));
-  // final eight = ECPrivate.fromBytes(List<int>.filled(32, 19));
-  // final Map<String, ECPrivate> keys = {
-  //   for (final i in [one, two, three, four, five, six, seven, eight])
-  //     i.getPublic().toHex(): i
-  // };
-  // final account = MultiSignatureAddress(threshold: 8, signers: [
-  //   MultiSignatureSigner(publicKey: one.getPublic().toHex(), weight: 1),
-  //   MultiSignatureSigner(publicKey: two.getPublic().toHex(), weight: 1),
-  //   MultiSignatureSigner(publicKey: three.getPublic().toHex(), weight: 1),
-  //   MultiSignatureSigner(publicKey: four.getPublic().toHex(), weight: 1),
-  //   MultiSignatureSigner(publicKey: five.getPublic().toHex(), weight: 1),
-  //   MultiSignatureSigner(publicKey: six.getPublic().toHex(), weight: 1),
-  //   MultiSignatureSigner(publicKey: seven.getPublic().toHex(), weight: 1),
-  //   MultiSignatureSigner(publicKey: eight.getPublic().toHex(), weight: 1),
-  // ]);
-  // final addr = account.toP2shAddress();
-  // // print(account.multiSigScript.script);
-  // // return;
-
-  // /// connect to electrum service with websocket
-  // /// please see `services_examples` folder for how to create electrum websocket service
-  // final service = await ElectrumWebSocketService.connect(
-  //     "wss://chipnet.imaginary.cash:50004");
-
-  // /// create provider with service
-  // final provider = ElectrumApiProvider(service);
-
-  // final elctrumUtxos = await provider.request(ElectrumScriptHashListUnspent(
-  //   scriptHash: addr.pubKeyHash(),
-  //   includeTokens: false,
-  // ));
-  // final List<UtxoWithAddress> utxos = elctrumUtxos
-  //     .map((e) => UtxoWithAddress(
-  //         utxo: e.toUtxo(addr.type),
-  //         ownerDetails: UtxoAddressDetails.multiSigAddress(
-  //             multiSigAddress: account, address: addr)))
-  //     .toList();
-
-  // final sumOfUtxo = utxos.sumOfUtxosValue();
-  // if (sumOfUtxo == BigInt.zero) {
-  //   return;
-  // }
-  // final bchTransaction = ForkedTransactionBuilder(
-  //   outPuts: [
-  //     /// change input (sumofutxos - spend)
-  //     BitcoinOutput(
-  //       address: addr,
-  //       value: sumOfUtxo -
-  //           (BtcUtils.toSatoshi("0.0001") + BtcUtils.toSatoshi("0.00003")),
-  //     ),
-  //     BitcoinOutput(
-  //       address: BitcoinCashAddress(
-  //               "bchtest:pw054wtjjc70rrvx4ftl4p63gluedyt0qmpgz705f8x3gxygrzarzls7vp2sj",
-  //               network: BitcoinCashNetwork.testnet)
-  //           .baseAddress,
-  //       value: BtcUtils.toSatoshi("0.0001"),
-  //     ),
-  //   ],
-  //   fee: BtcUtils.toSatoshi("0.00003"),
-  //   network: BitcoinCashNetwork.testnet,
-  //   utxos: utxos,
-  // );
-  // final transaaction =
-  //     bchTransaction.buildTransaction((trDigest, utxo, publicKey, sighash) {
-  //   final sing = keys[publicKey]!.signInput(trDigest, sigHash: sighash);
-  //   print("=====================");
-  //   print("key ${keys[publicKey]?.prive.toHex()}");
-  //   print("diget ${BytesUtils.toHexString(trDigest)}");
-  //   print("sign ${sing}");
-  //   print("Sighash $sighash");
-
-  //   return keys[publicKey]!.signInput(trDigest, sigHash: sighash);
-  // });
-
-  // /// transaction ID
-  // transaaction.txId();
-
-  // /// for calculation fee
-  // transaaction.getSize();
-
-  // /// raw of encoded transaction in hex
-  // final transactionRaw = transaaction.toHex();
-  // print(transactionRaw);
-  // return;
-  // // print(elctrumUtxos.length);
-  // final d = await provider
-  //     .request(ElectrumBroadCastTransaction(transactionRaw: transactionRaw));
-  // print(d);
-}
diff --git a/lib/bitcoin_base.dart b/lib/bitcoin_base.dart
index ef45ef4..9edd8ac 100644
--- a/lib/bitcoin_base.dart
+++ b/lib/bitcoin_base.dart
@@ -4,7 +4,7 @@
 /// including spending transactions, Bitcoin address management,
 ///  Bitcoin Schnorr signatures, BIP-39 mnemonic phrase generation,
 /// hierarchical deterministic (HD) wallet derivation, and Web3 Secret Storage Definition.
-library bitcoin_base;
+library;
 
 export 'package:bitcoin_base/src/bitcoin/address/address.dart';
 
diff --git a/lib/src/bitcoin/address/address.dart b/lib/src/bitcoin/address/address.dart
index 8f1d988..f878515 100644
--- a/lib/src/bitcoin/address/address.dart
+++ b/lib/src/bitcoin/address/address.dart
@@ -6,7 +6,7 @@
 // - Utility functions for address manipulation.
 // - encode/decode Segregated Witness (SegWit) address implementation.
 // - Enhanced functionality for improved handling of addresses across diverse networks.
-library bitcoin_base.address;
+library;
 
 import 'package:bitcoin_base/bitcoin_base.dart';
 import 'package:bitcoin_base/src/exception/exception.dart';
diff --git a/lib/src/bitcoin/address/core.dart b/lib/src/bitcoin/address/core.dart
index a8a1bd7..a3fcb6d 100644
--- a/lib/src/bitcoin/address/core.dart
+++ b/lib/src/bitcoin/address/core.dart
@@ -59,7 +59,7 @@ abstract class BitcoinBaseAddress {
 }
 
 class PubKeyAddressType extends BitcoinAddressType {
-  const PubKeyAddressType._(String value) : super._(value);
+  const PubKeyAddressType._(super.value) : super._();
   static const PubKeyAddressType p2pk = PubKeyAddressType._("P2PK");
   @override
   bool get isP2sh => false;
@@ -75,7 +75,7 @@ class PubKeyAddressType extends BitcoinAddressType {
 }
 
 class P2pkhAddressType extends BitcoinAddressType {
-  const P2pkhAddressType._(String value) : super._(value);
+  const P2pkhAddressType._(super.value) : super._();
   static const P2pkhAddressType p2pkh = P2pkhAddressType._("P2PKH");
   static const P2pkhAddressType p2pkhwt = P2pkhAddressType._("P2PKHWT");
 
@@ -93,8 +93,8 @@ class P2pkhAddressType extends BitcoinAddressType {
 }
 
 class P2shAddressType extends BitcoinAddressType {
-  const P2shAddressType._(String value, this.hashLength, this.withToken)
-      : super._(value);
+  const P2shAddressType._(super.value, this.hashLength, this.withToken)
+      : super._();
   static const P2shAddressType p2wshInP2sh = P2shAddressType._(
       "P2SH/P2WSH", _BitcoinAddressUtils.hash160DigestLength, false);
   static const P2shAddressType p2wpkhInP2sh = P2shAddressType._(
@@ -143,7 +143,7 @@ class P2shAddressType extends BitcoinAddressType {
 }
 
 class SegwitAddresType extends BitcoinAddressType {
-  const SegwitAddresType._(String value) : super._(value);
+  const SegwitAddresType._(super.value) : super._();
   static const SegwitAddresType p2wpkh = SegwitAddresType._("P2WPKH");
   static const SegwitAddresType p2tr = SegwitAddresType._("P2TR");
   static const SegwitAddresType p2wsh = SegwitAddresType._("P2WSH");
diff --git a/lib/src/bitcoin/address/legacy_address.dart b/lib/src/bitcoin/address/legacy_address.dart
index 30b1445..e8b3d54 100644
--- a/lib/src/bitcoin/address/legacy_address.dart
+++ b/lib/src/bitcoin/address/legacy_address.dart
@@ -45,14 +45,14 @@ abstract class LegacyAddress implements BitcoinBaseAddress {
 
 class P2shAddress extends LegacyAddress {
   P2shAddress.fromScript(
-      {required Script script, this.type = P2shAddressType.p2pkInP2sh})
-      : super.fromScript(script: script);
+      {required super.script, this.type = P2shAddressType.p2pkInP2sh})
+      : super.fromScript();
 
   P2shAddress.fromAddress(
-      {required String address,
-      required BasedUtxoNetwork network,
+      {required super.address,
+      required super.network,
       this.type = P2shAddressType.p2pkInP2sh})
-      : super.fromAddress(address: address, network: network);
+      : super.fromAddress();
   P2shAddress.fromHash160(
       {required String addrHash, this.type = P2shAddressType.p2pkInP2sh})
       : super.fromHash160(addrHash, type);
@@ -81,13 +81,13 @@ class P2shAddress extends LegacyAddress {
 
 class P2pkhAddress extends LegacyAddress {
   P2pkhAddress.fromScript(
-      {required Script script, this.type = P2pkhAddressType.p2pkh})
-      : super.fromScript(script: script);
+      {required super.script, this.type = P2pkhAddressType.p2pkh})
+      : super.fromScript();
   P2pkhAddress.fromAddress(
-      {required String address,
-      required BasedUtxoNetwork network,
+      {required super.address,
+      required super.network,
       this.type = P2pkhAddressType.p2pkh})
-      : super.fromAddress(address: address, network: network);
+      : super.fromAddress();
   P2pkhAddress.fromHash160(
       {required String addrHash, this.type = P2pkhAddressType.p2pkh})
       : super.fromHash160(addrHash, type);
diff --git a/lib/src/bitcoin/address/segwit_address.dart b/lib/src/bitcoin/address/segwit_address.dart
index 039395d..4731973 100644
--- a/lib/src/bitcoin/address/segwit_address.dart
+++ b/lib/src/bitcoin/address/segwit_address.dart
@@ -46,21 +46,15 @@ abstract class SegwitAddress implements BitcoinBaseAddress {
 }
 
 class P2wpkhAddress extends SegwitAddress {
-  P2wpkhAddress.fromAddress(
-      {required String address, required BasedUtxoNetwork network})
-      : super.fromAddress(
-            segwitVersion: _BitcoinAddressUtils.segwitV0,
-            address: address,
-            network: network);
+  P2wpkhAddress.fromAddress({required super.address, required super.network})
+      : super.fromAddress(segwitVersion: _BitcoinAddressUtils.segwitV0);
 
-  P2wpkhAddress.fromProgram({required String program})
+  P2wpkhAddress.fromProgram({required super.program})
       : super.fromProgram(
             segwitVersion: _BitcoinAddressUtils.segwitV0,
-            program: program,
             addresType: SegwitAddresType.p2wpkh);
-  P2wpkhAddress.fromScript({required Script script})
-      : super.fromScript(
-            segwitVersion: _BitcoinAddressUtils.segwitV0, script: script);
+  P2wpkhAddress.fromScript({required super.script})
+      : super.fromScript(segwitVersion: _BitcoinAddressUtils.segwitV0);
 
   /// returns the scriptPubKey of a P2WPKH witness script
   @override
@@ -74,20 +68,14 @@ class P2wpkhAddress extends SegwitAddress {
 }
 
 class P2trAddress extends SegwitAddress {
-  P2trAddress.fromAddress(
-      {required String address, required BasedUtxoNetwork network})
-      : super.fromAddress(
-            segwitVersion: _BitcoinAddressUtils.segwitV1,
-            address: address,
-            network: network);
-  P2trAddress.fromProgram({required String program})
+  P2trAddress.fromAddress({required super.address, required super.network})
+      : super.fromAddress(segwitVersion: _BitcoinAddressUtils.segwitV1);
+  P2trAddress.fromProgram({required super.program})
       : super.fromProgram(
             segwitVersion: _BitcoinAddressUtils.segwitV1,
-            program: program,
             addresType: SegwitAddresType.p2tr);
-  P2trAddress.fromScript({required Script script})
-      : super.fromScript(
-            segwitVersion: _BitcoinAddressUtils.segwitV1, script: script);
+  P2trAddress.fromScript({required super.script})
+      : super.fromScript(segwitVersion: _BitcoinAddressUtils.segwitV1);
 
   /// returns the scriptPubKey of a P2TR witness script
   @override
@@ -101,20 +89,14 @@ class P2trAddress extends SegwitAddress {
 }
 
 class P2wshAddress extends SegwitAddress {
-  P2wshAddress.fromAddress(
-      {required String address, required BasedUtxoNetwork network})
-      : super.fromAddress(
-            segwitVersion: _BitcoinAddressUtils.segwitV0,
-            address: address,
-            network: network);
-  P2wshAddress.fromProgram({required String program})
+  P2wshAddress.fromAddress({required super.address, required super.network})
+      : super.fromAddress(segwitVersion: _BitcoinAddressUtils.segwitV0);
+  P2wshAddress.fromProgram({required super.program})
       : super.fromProgram(
             segwitVersion: _BitcoinAddressUtils.segwitV0,
-            program: program,
             addresType: SegwitAddresType.p2wsh);
-  P2wshAddress.fromScript({required Script script})
-      : super.fromScript(
-            segwitVersion: _BitcoinAddressUtils.segwitV0, script: script);
+  P2wshAddress.fromScript({required super.script})
+      : super.fromScript(segwitVersion: _BitcoinAddressUtils.segwitV0);
 
   /// Returns the scriptPubKey of a P2WPKH witness script
   @override
diff --git a/lib/src/bitcoin/address/utils/address_utils.dart b/lib/src/bitcoin/address/utils/address_utils.dart
index af88a82..5b1f431 100644
--- a/lib/src/bitcoin/address/utils/address_utils.dart
+++ b/lib/src/bitcoin/address/utils/address_utils.dart
@@ -35,13 +35,13 @@ class _BitcoinAddressUtils {
 
       /// Extract version, data, and checksum.
       final List<int> version = [decode[0]];
-      List<int> data =
+      final List<int> data =
           decode.sublist(0, decode.length - Base58Const.checksumByteLen);
-      List<int> checksum =
+      final List<int> checksum =
           decode.sublist(decode.length - Base58Const.checksumByteLen);
 
       /// Verify the checksum.
-      List<int> hash = QuickCrypto.sha256DoubleHash(data)
+      final List<int> hash = QuickCrypto.sha256DoubleHash(data)
           .sublist(0, Base58Const.checksumByteLen);
       if (!BytesUtils.bytesEqual(checksum, hash)) {
         return null;
@@ -351,7 +351,7 @@ class _BitcoinAddressUtils {
       {required BitcoinCashNetwork network,
       required String addressProgram,
       required BitcoinAddressType type}) {
-    List<int> programBytes = BytesUtils.fromHexString(addressProgram);
+    final List<int> programBytes = BytesUtils.fromHexString(addressProgram);
     final List<int> netVersion = _getBchNetVersion(
         network: network, type: type, secriptLength: programBytes.length);
 
@@ -370,7 +370,7 @@ class _BitcoinAddressUtils {
       {required BitcoinCashNetwork network,
       required BitcoinAddressType type,
       int secriptLength = hash160DigestLength}) {
-    bool isToken = type.value.contains("WT");
+    final bool isToken = type.value.contains("WT");
     if (!type.isP2sh) {
       if (!isToken) return network.p2pkhNetVer;
       return network.p2pkhWtNetVer;
@@ -431,7 +431,7 @@ class _BitcoinAddressUtils {
   /// Returns the RIPEMD-160 hash of the public key as a hexadecimal string.
   static String pubkeyToHash160(String publicKey) {
     final bytes = BytesUtils.fromHexString(publicKey);
-    List<int> ripemd160Hash = QuickCrypto.hash160(bytes);
+    final List<int> ripemd160Hash = QuickCrypto.hash160(bytes);
     return BytesUtils.toHexString(ripemd160Hash);
   }
 
diff --git a/lib/src/bitcoin/script/input.dart b/lib/src/bitcoin/script/input.dart
index 95666a1..f1b56da 100644
--- a/lib/src/bitcoin/script/input.dart
+++ b/lib/src/bitcoin/script/input.dart
@@ -60,16 +60,17 @@ class TxInput {
 
   static Tuple<TxInput, int> deserialize(
       {required List<int> bytes, int cursor = 0, bool hasSegwit = false}) {
-    List<int> inpHash = bytes.sublist(cursor, cursor + 32).reversed.toList();
+    final List<int> inpHash =
+        bytes.sublist(cursor, cursor + 32).reversed.toList();
     cursor += 32;
-    int outputN = IntUtils.fromBytes(bytes.sublist(cursor, cursor + 4),
+    final int outputN = IntUtils.fromBytes(bytes.sublist(cursor, cursor + 4),
         byteOrder: Endian.little);
     cursor += 4;
     final vi = IntUtils.decodeVarint(bytes.sublist(cursor));
     cursor += vi.item2;
-    List<int> unlockingScript = bytes.sublist(cursor, cursor + vi.item1);
+    final List<int> unlockingScript = bytes.sublist(cursor, cursor + vi.item1);
     cursor += vi.item1;
-    List<int> sequenceNumberData = bytes.sublist(cursor, cursor + 4);
+    final List<int> sequenceNumberData = bytes.sublist(cursor, cursor + 4);
     cursor += 4;
     return Tuple(
         TxInput(
diff --git a/lib/src/bitcoin/script/op_code/constant_lib.dart b/lib/src/bitcoin/script/op_code/constant_lib.dart
index 4a7c224..e6c4f56 100644
--- a/lib/src/bitcoin/script/op_code/constant_lib.dart
+++ b/lib/src/bitcoin/script/op_code/constant_lib.dart
@@ -1,4 +1,4 @@
-library bitcoin_constants;
+library;
 
 export 'constant.dart';
 export 'tools.dart';
diff --git a/lib/src/bitcoin/script/op_code/tools.dart b/lib/src/bitcoin/script/op_code/tools.dart
index 94977e6..a68492a 100644
--- a/lib/src/bitcoin/script/op_code/tools.dart
+++ b/lib/src/bitcoin/script/op_code/tools.dart
@@ -31,7 +31,7 @@ List<int> pushInteger(int integer) {
   }
 
   /// Calculate the number of bytes required to represent the integer
-  int numberOfBytes = (integer.bitLength + 7) ~/ 8;
+  final int numberOfBytes = (integer.bitLength + 7) ~/ 8;
 
   /// Convert to little-endian bytes
   List<int> integerBytes = List<int>.filled(numberOfBytes, 0);
diff --git a/lib/src/bitcoin/script/output.dart b/lib/src/bitcoin/script/output.dart
index 8547fd3..61bca22 100644
--- a/lib/src/bitcoin/script/output.dart
+++ b/lib/src/bitcoin/script/output.dart
@@ -33,7 +33,7 @@ class TxOutput {
   List<int> toBytes() {
     final amountBytes =
         BigintUtils.toBytes(amount, length: 8, order: Endian.little);
-    List<int> scriptBytes = [
+    final List<int> scriptBytes = [
       ...cashToken?.toBytes() ?? <int>[],
       ...scriptPubKey.toBytes()
     ];
@@ -55,7 +55,8 @@ class TxOutput {
     final vi = IntUtils.decodeVarint(bytes.sublist(cursor));
     cursor += vi.item2;
     final token = CashToken.fromRaw(bytes.sublist(cursor));
-    List<int> lockScript =
+
+    final List<int> lockScript =
         bytes.sublist(cursor + token.item2, cursor + vi.item1);
     cursor += vi.item1;
     return Tuple(
diff --git a/lib/src/bitcoin/script/script.dart b/lib/src/bitcoin/script/script.dart
index fb2d2e2..96c57c7 100644
--- a/lib/src/bitcoin/script/script.dart
+++ b/lib/src/bitcoin/script/script.dart
@@ -18,11 +18,11 @@ class Script {
 
   static Script deserialize(
       {required List<int> bytes, bool hasSegwit = false}) {
-    List<String> commands = [];
+    final List<String> commands = [];
     int index = 0;
     // final scriptBytes = BytesUtils.fromHexString(hexData);
     while (index < bytes.length) {
-      int byte = bytes[index];
+      final int byte = bytes[index];
       if (BitcoinOpCodeConst.CODE_OPS.containsKey(byte)) {
         if (!BitcoinOpCodeConst.isOpPushData(byte)) {
           commands.add(BitcoinOpCodeConst.CODE_OPS[byte]!);
@@ -32,7 +32,7 @@ class Script {
         index = index + 1;
         if (byte == BitcoinOpCodeConst.opPushData1) {
           // get len
-          int bytesToRead = bytes[index];
+          final int bytesToRead = bytes[index];
           // skip len
           index = index + 1;
           commands.add(BytesUtils.toHexString(
@@ -42,13 +42,13 @@ class Script {
           index = index + bytesToRead;
         } else if (byte == BitcoinOpCodeConst.opPushData2) {
           /// get len
-          int bytesToRead = readUint16LE(bytes, index);
+          final int bytesToRead = readUint16LE(bytes, index);
           index = index + 2;
           commands.add(BytesUtils.toHexString(
               bytes.sublist(index, index + bytesToRead)));
           index = index + bytesToRead;
         } else if (byte == BitcoinOpCodeConst.opPushData4) {
-          int bytesToRead = readUint32LE(bytes, index);
+          final int bytesToRead = readUint32LE(bytes, index);
 
           index = index + 4;
           commands.add(BytesUtils.toHexString(
@@ -57,8 +57,8 @@ class Script {
         }
       } else {
         final viAndSize = IntUtils.decodeVarint(bytes.sublist(index));
-        int dataSize = viAndSize.item1;
-        int size = viAndSize.item2;
+        final int dataSize = viAndSize.item1;
+        final int size = viAndSize.item2;
         final lastIndex = (index + size + dataSize) > bytes.length
             ? bytes.length
             : (index + size + dataSize);
@@ -72,8 +72,8 @@ class Script {
 
   List<int> toBytes() {
     if (script.isEmpty) return <int>[];
-    DynamicByteTracker scriptBytes = DynamicByteTracker();
-    for (var token in script) {
+    final DynamicByteTracker scriptBytes = DynamicByteTracker();
+    for (final token in script) {
       if (BitcoinOpCodeConst.OP_CODES.containsKey(token)) {
         scriptBytes.add(BitcoinOpCodeConst.OP_CODES[token]!);
       } else if (token is int && token >= 0 && token <= 16) {
diff --git a/lib/src/bitcoin/script/transaction.dart b/lib/src/bitcoin/script/transaction.dart
index c1b4aa3..a7f06a2 100644
--- a/lib/src/bitcoin/script/transaction.dart
+++ b/lib/src/bitcoin/script/transaction.dart
@@ -3,6 +3,7 @@ import 'package:bitcoin_base/src/cash_token/cash_token.dart';
 import 'package:bitcoin_base/src/bitcoin/script/op_code/constant.dart';
 import 'package:bitcoin_base/src/crypto/crypto.dart';
 import 'package:bitcoin_base/src/exception/exception.dart';
+import 'package:blockchain_utils/helper/helper.dart';
 import 'package:blockchain_utils/utils/utils.dart';
 import 'package:blockchain_utils/crypto/quick_crypto.dart';
 import 'input.dart';
@@ -26,13 +27,11 @@ class BtcTransaction {
       this.hasSegwit = false,
       List<int>? lock,
       List<int>? version})
-      : locktime = List<int>.unmodifiable(
-            lock ?? BitcoinOpCodeConst.DEFAULT_TX_LOCKTIME),
-        version = List<int>.unmodifiable(
-            version ?? BitcoinOpCodeConst.DEFAULT_TX_VERSION),
-        inputs = List<TxInput>.unmodifiable(inputs),
-        outputs = List<TxOutput>.unmodifiable(outputs),
-        witnesses = List.unmodifiable(witnesses);
+      : locktime = lock?.immutable ?? BitcoinOpCodeConst.DEFAULT_TX_LOCKTIME,
+        version = version?.immutable ?? BitcoinOpCodeConst.DEFAULT_TX_VERSION,
+        inputs = inputs.immutable,
+        outputs = outputs.immutable,
+        witnesses = witnesses.immutable;
   final List<TxInput> inputs;
   final List<TxOutput> outputs;
   final List<int> locktime;
@@ -53,8 +52,8 @@ class BtcTransaction {
         outputs: outputs ?? this.outputs,
         witnesses: witnesses ?? this.witnesses,
         hasSegwit: hasSegwit ?? this.hasSegwit,
-        lock: lock ?? List<int>.from(locktime),
-        version: version ?? List<int>.from(this.version));
+        lock: lock ?? locktime,
+        version: version ?? this.version);
   }
 
   /// creates a copy of the object (classmethod)
@@ -84,15 +83,14 @@ class BtcTransaction {
     }
     final vi = IntUtils.decodeVarint(rawtx.sublist(cursor));
     cursor += vi.item2;
-
-    List<TxInput> inputs = [];
+    final List<TxInput> inputs = [];
     for (int index = 0; index < vi.item1; index++) {
       final inp = TxInput.deserialize(
           bytes: rawtx, hasSegwit: hasSegwit, cursor: cursor);
       inputs.add(inp.item1);
       cursor = inp.item2;
     }
-    List<TxOutput> outputs = [];
+    final List<TxOutput> outputs = [];
     final viOut = IntUtils.decodeVarint(rawtx.sublist(cursor));
     cursor += viOut.item2;
     for (int index = 0; index < viOut.item1; index++) {
@@ -101,14 +99,14 @@ class BtcTransaction {
       outputs.add(inp.item1);
       cursor = inp.item2;
     }
-    List<TxWitnessInput> witnesses = [];
+    final List<TxWitnessInput> witnesses = [];
     if (hasSegwit) {
       if (cursor + 4 < rawtx.length) {
         // in this case the tx contains wintness data.
         for (int n = 0; n < inputs.length; n++) {
           final wVi = IntUtils.decodeVarint(rawtx.sublist(cursor));
           cursor += wVi.item2;
-          List<String> witnessesTmp = [];
+          final List<String> witnessesTmp = [];
           for (int n = 0; n < wVi.item1; n++) {
             List<int> witness = <int>[];
             final wtVi = IntUtils.decodeVarint(rawtx.sublist(cursor));
@@ -152,12 +150,10 @@ class BtcTransaction {
     }
     tx.inputs[txInIndex].scriptSig = script;
     if ((sighash & 0x1f) == BitcoinOpCodeConst.SIGHASH_NONE) {
-      // tx.outputs.clear();
       tx = tx.copyWith(outputs: []);
       for (int i = 0; i < tx.inputs.length; i++) {
         if (i != txInIndex) {
-          tx.inputs[i].sequence =
-              List<int>.unmodifiable(BitcoinOpCodeConst.EMPTY_TX_SEQUENCE);
+          tx.inputs[i].sequence = BitcoinOpCodeConst.EMPTY_TX_SEQUENCE;
         }
       }
     } else if ((sighash & 0x1f) == BitcoinOpCodeConst.SIGHASH_SINGLE) {
@@ -166,7 +162,7 @@ class BtcTransaction {
             "Transaction index is greater than the available outputs");
       }
 
-      List<TxOutput> outputs = [];
+      final List<TxOutput> outputs = [];
       for (int i = 0; i < txInIndex; i++) {
         outputs.add(TxOutput(
             amount: BigInt.from(BitcoinOpCodeConst.NEGATIVE_SATOSHI),
@@ -175,8 +171,7 @@ class BtcTransaction {
       tx = tx.copyWith(outputs: [...outputs, tx.outputs[txInIndex]]);
       for (int i = 0; i < tx.inputs.length; i++) {
         if (i != txInIndex) {
-          tx.inputs[i].sequence =
-              List<int>.unmodifiable(BitcoinOpCodeConst.EMPTY_TX_SEQUENCE);
+          tx.inputs[i].sequence = BitcoinOpCodeConst.EMPTY_TX_SEQUENCE;
         }
       }
     }
@@ -185,16 +180,16 @@ class BtcTransaction {
     }
     List<int> txForSign = tx.toBytes(segwit: false);
 
-    txForSign = List<int>.from([
+    txForSign = [
       ...txForSign,
       ...IntUtils.toBytes(sighash, length: 4, byteOrder: Endian.little)
-    ]);
+    ];
     return QuickCrypto.sha256DoubleHash(txForSign);
   }
 
   /// Serializes Transaction to bytes
   List<int> toBytes({bool segwit = false}) {
-    DynamicByteTracker data = DynamicByteTracker();
+    final DynamicByteTracker data = DynamicByteTracker();
     data.add(version);
     if (segwit) {
       data.add([0x00, 0x01]);
@@ -237,21 +232,22 @@ class BtcTransaction {
     List<int> hashPrevouts = List<int>.filled(32, 0);
     List<int> hashSequence = List<int>.filled(32, 0);
     List<int> hashOutputs = List<int>.filled(32, 0);
-    int basicSigHashType = sighash & 0x1F;
-    bool anyoneCanPay =
+    final int basicSigHashType = sighash & 0x1F;
+    final bool anyoneCanPay =
         (sighash & 0xF0) == BitcoinOpCodeConst.SIGHASH_ANYONECANPAY;
-    bool signAll = (basicSigHashType != BitcoinOpCodeConst.SIGHASH_SINGLE) &&
-        (basicSigHashType != BitcoinOpCodeConst.SIGHASH_NONE);
+    final bool signAll =
+        (basicSigHashType != BitcoinOpCodeConst.SIGHASH_SINGLE) &&
+            (basicSigHashType != BitcoinOpCodeConst.SIGHASH_NONE);
     if (!anyoneCanPay) {
       hashPrevouts = <int>[];
       for (final txin in tx.inputs) {
-        List<int> txidBytes = List<int>.from(
+        final List<int> txidBytes = List<int>.from(
             BytesUtils.fromHexString(txin.txId).reversed.toList());
-        hashPrevouts = List<int>.from([
+        hashPrevouts = [
           ...hashPrevouts,
           ...txidBytes,
           ...IntUtils.toBytes(txin.txIndex, length: 4, byteOrder: Endian.little)
-        ]);
+        ];
       }
       hashPrevouts = QuickCrypto.sha256DoubleHash(hashPrevouts);
     }
@@ -259,55 +255,52 @@ class BtcTransaction {
     if (!anyoneCanPay && signAll) {
       hashSequence = <int>[];
       for (final i in tx.inputs) {
-        hashSequence = List<int>.from([...hashSequence, ...i.sequence]);
+        hashSequence = [...hashSequence, ...i.sequence];
       }
       hashSequence = QuickCrypto.sha256DoubleHash(hashSequence);
     }
     if (signAll) {
       hashOutputs = <int>[];
       for (final i in tx.outputs) {
-        hashOutputs = List<int>.from([...hashOutputs, ...i.toBytes()]);
+        hashOutputs = [...hashOutputs, ...i.toBytes()];
       }
       hashOutputs = QuickCrypto.sha256DoubleHash(hashOutputs);
     } else if (basicSigHashType == BitcoinOpCodeConst.SIGHASH_SINGLE &&
         txInIndex < tx.outputs.length) {
       final out = tx.outputs[txInIndex];
-      List<int> packedAmount =
+      final List<int> packedAmount =
           BigintUtils.toBytes(out.amount, length: 8, order: Endian.little);
-      final scriptBytes = out.scriptPubKey.toBytes();
-      List<int> lenScriptBytes = List<int>.from([scriptBytes.length]);
-      hashOutputs =
-          List<int>.from([...packedAmount, ...lenScriptBytes, ...scriptBytes]);
+      final scriptBytes = IntUtils.prependVarint(out.scriptPubKey.toBytes());
+      hashOutputs = [...packedAmount, ...scriptBytes];
       hashOutputs = QuickCrypto.sha256DoubleHash(hashOutputs);
     }
 
-    DynamicByteTracker txForSigning = DynamicByteTracker();
+    final DynamicByteTracker txForSigning = DynamicByteTracker();
     txForSigning.add(version);
     txForSigning.add(hashPrevouts);
     txForSigning.add(hashSequence);
     final txIn = inputs[txInIndex];
 
-    List<int> txidBytes =
-        List<int>.from(BytesUtils.fromHexString(txIn.txId).reversed.toList());
-    txForSigning.add(List<int>.from([
+    final List<int> txidBytes =
+        BytesUtils.fromHexString(txIn.txId).reversed.toList();
+    txForSigning.add([
       ...txidBytes,
       ...IntUtils.toBytes(txIn.txIndex, length: 4, byteOrder: Endian.little)
-    ]));
+    ]);
     if (token != null) {
       txForSigning.add(token.toBytes());
     }
-    txForSigning.add(List<int>.from([script.toBytes().length]));
-    txForSigning.add(script.toBytes());
-    List<int> packedAmount =
-        BigintUtils.toBytes(amount, length: 8, order: Endian.little);
+    final varintBytes = IntUtils.prependVarint(script.toBytes());
 
+    txForSigning.add(varintBytes);
+    final List<int> packedAmount =
+        BigintUtils.toBytes(amount, length: 8, order: Endian.little);
     txForSigning.add(packedAmount);
     txForSigning.add(txIn.sequence);
     txForSigning.add(hashOutputs);
     txForSigning.add(locktime);
     txForSigning
         .add(IntUtils.toBytes(sighash, length: 4, byteOrder: Endian.little));
-
     return QuickCrypto.sha256DoubleHash(txForSigning.toBytes());
   }
 
@@ -329,11 +322,13 @@ class BtcTransaction {
       int leafVar = BitcoinOpCodeConst.LEAF_VERSION_TAPSCRIPT,
       int sighash = BitcoinOpCodeConst.TAPROOT_SIGHASH_ALL}) {
     final newTx = copy(this);
-    bool sighashNone = (sighash & 0x03) == BitcoinOpCodeConst.SIGHASH_NONE;
-    bool sighashSingle = (sighash & 0x03) == BitcoinOpCodeConst.SIGHASH_SINGLE;
-    bool anyoneCanPay =
+    final bool sighashNone =
+        (sighash & 0x03) == BitcoinOpCodeConst.SIGHASH_NONE;
+    final bool sighashSingle =
+        (sighash & 0x03) == BitcoinOpCodeConst.SIGHASH_SINGLE;
+    final bool anyoneCanPay =
         (sighash & 0x80) == BitcoinOpCodeConst.SIGHASH_ANYONECANPAY;
-    DynamicByteTracker txForSign = DynamicByteTracker();
+    final DynamicByteTracker txForSign = DynamicByteTracker();
     txForSign.add([0]);
     txForSign.add([sighash]);
     txForSign.add(version);
@@ -345,109 +340,89 @@ class BtcTransaction {
     List<int> hashOutputs = <int>[];
     if (!anyoneCanPay) {
       for (final txin in newTx.inputs) {
-        List<int> txidBytes = List<int>.from(
-            BytesUtils.fromHexString(txin.txId).reversed.toList());
-        hashPrevouts = List<int>.from([
+        final List<int> txidBytes =
+            BytesUtils.fromHexString(txin.txId).reversed.toList();
+        hashPrevouts = [
           ...hashPrevouts,
           ...txidBytes,
           ...IntUtils.toBytes(txin.txIndex, length: 4, byteOrder: Endian.little)
-        ]);
+        ];
       }
       hashPrevouts = QuickCrypto.sha256Hash(hashPrevouts);
       txForSign.add(hashPrevouts);
 
       for (final i in amounts) {
-        List<int> bytes =
-            BigintUtils.toBytes(i, length: 8, order: Endian.little);
-
-        hashAmounts = List<int>.from([...hashAmounts, ...bytes]);
+        final bytes = BigintUtils.toBytes(i, length: 8, order: Endian.little);
+        hashAmounts = [...hashAmounts, ...bytes];
       }
       hashAmounts = QuickCrypto.sha256Hash(hashAmounts);
       txForSign.add(hashAmounts);
 
       for (final s in scriptPubKeys) {
-        final h = s.toHex();
-
-        /// must checked
-        int scriptLen = h.length ~/ 2;
-        List<int> scriptBytes = BytesUtils.fromHexString(h);
-        List<int> lenBytes = List<int>.from([scriptLen]);
-        hashScriptPubkeys =
-            List<int>.from([...hashScriptPubkeys, ...lenBytes, ...scriptBytes]);
+        final scriptBytes = IntUtils.prependVarint(s.toBytes());
+        hashScriptPubkeys = [...hashScriptPubkeys, ...scriptBytes];
       }
       hashScriptPubkeys = QuickCrypto.sha256Hash(hashScriptPubkeys);
       txForSign.add(hashScriptPubkeys);
 
       for (final txIn in newTx.inputs) {
-        hashSequences = List<int>.from([...hashSequences, ...txIn.sequence]);
+        hashSequences = [...hashSequences, ...txIn.sequence];
       }
       hashSequences = QuickCrypto.sha256Hash(hashSequences);
       txForSign.add(hashSequences);
     }
     if (!(sighashNone || sighashSingle)) {
       for (final txOut in newTx.outputs) {
-        List<int> packedAmount =
+        final List<int> packedAmount =
             BigintUtils.toBytes(txOut.amount, length: 8, order: Endian.little);
-
-        List<int> scriptBytes = txOut.scriptPubKey.toBytes();
-        final lenScriptBytes = List<int>.from([scriptBytes.length]);
-        hashOutputs = List<int>.from([
-          ...hashOutputs,
-          ...packedAmount,
-          ...lenScriptBytes,
-          ...scriptBytes
-        ]);
+        final scriptBytes =
+            IntUtils.prependVarint(txOut.scriptPubKey.toBytes());
+        hashOutputs = [...hashOutputs, ...packedAmount, ...scriptBytes];
       }
       hashOutputs = QuickCrypto.sha256Hash(hashOutputs);
       txForSign.add(hashOutputs);
     }
 
     final int spendType = extFlags * 2 + 0;
-    txForSign.add(List<int>.from([spendType]));
+    txForSign.add([spendType]);
 
     if (anyoneCanPay) {
       final txin = newTx.inputs[txIndex];
-      List<int> txidBytes =
-          List<int>.from(BytesUtils.fromHexString(txin.txId).reversed.toList());
-      List<int> result = List<int>.from([
+      final txidBytes = BytesUtils.fromHexString(txin.txId).reversed.toList();
+      final result = [
         ...txidBytes,
         ...IntUtils.toBytes(txin.txIndex, length: 4, byteOrder: Endian.little)
-      ]);
+      ];
       txForSign.add(result);
       txForSign.add(BigintUtils.toBytes(amounts[txIndex],
           length: 8, order: Endian.little));
-      final sPubKey = scriptPubKeys[txIndex].toHex();
-      final sLength = sPubKey.length ~/ 2;
-      txForSign.add([sLength]);
-      txForSign.add(BytesUtils.fromHexString(sPubKey));
+      final scriptBytes =
+          IntUtils.prependVarint(scriptPubKeys[txIndex].toBytes());
+      txForSign.add(scriptBytes);
       txForSign.add(txin.sequence);
     } else {
-      int index = txIndex;
-      List<int> indexBytes = List<int>.filled(4, 0);
-      writeUint32LE(index, indexBytes);
+      final indexBytes =
+          IntUtils.toBytes(txIndex, length: 4, byteOrder: Endian.little);
       txForSign.add(indexBytes);
     }
     if (sighashSingle) {
       final txOut = newTx.outputs[txIndex];
-
-      List<int> packedAmount =
+      final packedAmount =
           BigintUtils.toBytes(txOut.amount, length: 8, order: Endian.little);
-      final sBytes = txOut.scriptPubKey.toBytes();
-      List<int> lenScriptBytes = List<int>.from([sBytes.length]);
-
-      final hashOut =
-          List<int>.from([...packedAmount, ...lenScriptBytes, ...sBytes]);
+      final scriptBytes = IntUtils.prependVarint(txOut.scriptPubKey.toBytes());
+      final hashOut = [...packedAmount, ...scriptBytes];
       txForSign.add(QuickCrypto.sha256Hash(hashOut));
     }
     if (extFlags == 1) {
-      final leafVarBytes = List<int>.from(
-          [leafVar, ...IntUtils.prependVarint(script?.toBytes() ?? <int>[])]);
+      final leafVarBytes = [
+        leafVar,
+        ...IntUtils.prependVarint(script?.toBytes() ?? <int>[])
+      ];
       txForSign.add(taggedHash(leafVarBytes, "TapLeaf"));
       txForSign.add([0]);
       txForSign.add(List<int>.filled(4, mask8));
     }
     final bytes = txForSign.toBytes();
-
     return taggedHash(bytes, "TapSighash");
   }
 
@@ -470,7 +445,7 @@ class BtcTransaction {
   /// Calculates the tx segwit size
   int getVSize() {
     if (!hasSegwit) return getSize();
-    int markerSize = 2;
+    const int markerSize = 2;
     int witSize = 0;
     List<int> data = <int>[];
     for (final w in witnesses) {
@@ -478,8 +453,8 @@ class BtcTransaction {
       data = List<int>.from([...data, ...countBytes, ...w.toBytes()]);
     }
     witSize = data.length;
-    int size = getSize() - (markerSize + witSize);
-    double vSize = size + (markerSize + witSize) / 4;
+    final int size = getSize() - (markerSize + witSize);
+    final double vSize = size + (markerSize + witSize) / 4;
     return vSize.ceil();
   }
 
diff --git a/lib/src/bitcoin/script/witness.dart b/lib/src/bitcoin/script/witness.dart
index 0a53939..075726f 100644
--- a/lib/src/bitcoin/script/witness.dart
+++ b/lib/src/bitcoin/script/witness.dart
@@ -17,8 +17,8 @@ class TxWitnessInput {
   List<int> toBytes() {
     List<int> stackBytes = [];
 
-    for (String item in stack) {
-      List<int> itemBytes =
+    for (final item in stack) {
+      final List<int> itemBytes =
           IntUtils.prependVarint(BytesUtils.fromHexString(item));
       stackBytes = [...stackBytes, ...itemBytes];
     }
diff --git a/lib/src/bitcoin_cash/bcmr_registery.dart b/lib/src/bitcoin_cash/bcmr_registery.dart
index 8d1af2d..6975089 100644
--- a/lib/src/bitcoin_cash/bcmr_registery.dart
+++ b/lib/src/bitcoin_cash/bcmr_registery.dart
@@ -700,26 +700,16 @@ class ChainSnapshot extends IdentitySnapshot {
     );
   }
   const ChainSnapshot({
-    required String name,
-    required TokenCategory token,
-    String? description,
-    List<String>? tags,
-    String? migrated,
-    String? status,
-    String? splitId,
-    URIs? uris,
-    Extensions? extensions,
-  }) : super(
-          name: name,
-          description: description,
-          tags: tags,
-          migrated: migrated,
-          token: token,
-          status: status,
-          splitId: splitId,
-          uris: uris,
-          extensions: extensions,
-        );
+    required super.name,
+    required TokenCategory super.token,
+    super.description,
+    super.tags,
+    super.migrated,
+    super.status,
+    super.splitId,
+    super.uris,
+    super.extensions,
+  });
 }
 
 class RegistryTimestampKeyedValues<T extends IdentitySnapshot> {
@@ -732,8 +722,7 @@ class RegistryTimestampKeyedValues<T extends IdentitySnapshot> {
 }
 
 class ChainHistory extends RegistryTimestampKeyedValues<ChainSnapshot> {
-  const ChainHistory({required Map<String, ChainSnapshot> timestampMap})
-      : super(timestampMap: timestampMap);
+  const ChainHistory({required super.timestampMap});
 
   factory ChainHistory.fromJson(Map<String, dynamic> json) {
     return ChainHistory(
@@ -745,8 +734,7 @@ class ChainHistory extends RegistryTimestampKeyedValues<ChainSnapshot> {
 }
 
 class IdentityHistory extends RegistryTimestampKeyedValues<IdentitySnapshot> {
-  const IdentityHistory({required Map<String, IdentitySnapshot> timestampMap})
-      : super(timestampMap: timestampMap);
+  const IdentityHistory({required super.timestampMap});
 
   factory IdentityHistory.fromJson(Map<String, dynamic> json) {
     return IdentityHistory(
diff --git a/lib/src/cash_token/cash_token.dart b/lib/src/cash_token/cash_token.dart
index bcb0fd3..a28eaaf 100644
--- a/lib/src/cash_token/cash_token.dart
+++ b/lib/src/cash_token/cash_token.dart
@@ -160,7 +160,7 @@ class CashTokenUtils {
   }
 
   static Tuple<BigInt, int> _decodeVarintBigInt(List<int> byteint) {
-    int ni = byteint[0];
+    final int ni = byteint[0];
     int size = 0;
 
     if (ni < 253) {
@@ -174,7 +174,7 @@ class CashTokenUtils {
     } else {
       size = 8;
     }
-    BigInt value = BigintUtils.fromBytes(byteint.sublist(1, 1 + size),
+    final value = BigintUtils.fromBytes(byteint.sublist(1, 1 + size),
         byteOrder: Endian.little);
     return Tuple(value, size + 1);
   }
@@ -240,7 +240,7 @@ class CashToken {
           ? null
           : BytesUtils.fromHexString(json["nft"]["commitment"]);
     }
-    int bitfield = CashTokenUtils.buildBitfield(
+    final int bitfield = CashTokenUtils.buildBitfield(
         hasNFT: capability != null,
         capability: capability ?? CashTokenCapability.noCapability,
         hasAmount: amount > BigInt.zero,
@@ -312,7 +312,7 @@ class CashToken {
       return const Tuple(null, 0);
     }
     int cursor = 1;
-    List<int> id =
+    final List<int> id =
         scriptBytes.sublist(cursor, cursor + CashTokenUtils.idBytesLength);
 
     cursor += CashTokenUtils.idBytesLength;
@@ -352,7 +352,7 @@ class CashToken {
   ///
   /// Returns a list of integers representing the serialized byte representation of the [CashToken].
   List<int> toBytes() {
-    DynamicByteTracker bytes = DynamicByteTracker();
+    final DynamicByteTracker bytes = DynamicByteTracker();
     bytes.add([CashTokenUtils.cashTokenPrefix]);
     bytes.add(BytesUtils.fromHexString(category).reversed.toList());
     bytes.add([bitfield]);
diff --git a/lib/src/crypto/crypto.dart b/lib/src/crypto/crypto.dart
index 2af7a21..2d23b95 100644
--- a/lib/src/crypto/crypto.dart
+++ b/lib/src/crypto/crypto.dart
@@ -1,4 +1,4 @@
-library bitcoin_crypto;
+library;
 
 import 'package:bitcoin_base/src/bitcoin/script/op_code/constant_lib.dart';
 import 'package:blockchain_utils/crypto/quick_crypto.dart';
diff --git a/lib/src/crypto/keypair/ec_private.dart b/lib/src/crypto/keypair/ec_private.dart
index ee1b212..d5c5735 100644
--- a/lib/src/crypto/keypair/ec_private.dart
+++ b/lib/src/crypto/keypair/ec_private.dart
@@ -67,6 +67,17 @@ class ECPrivate {
     return BytesUtils.toHexString(signature);
   }
 
+  String signSchnorr(List<int> txDigest,
+      {int sighash = BitcoinOpCodeConst.TAPROOT_SIGHASH_ALL}) {
+    final btcSigner = BitcoinSigner.fromKeyBytes(toBytes());
+    List<int> signatur = btcSigner.signSchnorrTransaction(txDigest,
+        tapScripts: [], tweak: false);
+    if (sighash != BitcoinOpCodeConst.TAPROOT_SIGHASH_ALL) {
+      signatur = <int>[...signatur, sighash];
+    }
+    return BytesUtils.toHexString(signatur);
+  }
+
   /// sign taproot transaction digest and returns the signature.
   String signTapRoot(List<int> txDigest,
       {int sighash = BitcoinOpCodeConst.TAPROOT_SIGHASH_ALL,
diff --git a/lib/src/exception/exception.dart b/lib/src/exception/exception.dart
index 09652ba..0e031c3 100644
--- a/lib/src/exception/exception.dart
+++ b/lib/src/exception/exception.dart
@@ -1,7 +1,5 @@
 import 'package:blockchain_utils/blockchain_utils.dart';
 
 class DartBitcoinPluginException extends BlockchainUtilsException {
-  const DartBitcoinPluginException(String message,
-      {Map<String, dynamic>? details})
-      : super(message, details: details);
+  const DartBitcoinPluginException(super.message, {super.details});
 }
diff --git a/lib/src/models/network.dart b/lib/src/models/network.dart
index 67c1277..0000bed 100644
--- a/lib/src/models/network.dart
+++ b/lib/src/models/network.dart
@@ -1,9 +1,9 @@
 import 'package:bitcoin_base/bitcoin_base.dart';
 import 'package:bitcoin_base/src/exception/exception.dart';
 import 'package:bitcoin_base/src/utils/enumerate.dart';
-import 'package:blockchain_utils/bip/bip/bip.dart';
 import 'package:blockchain_utils/bip/coin_conf/coin_conf.dart';
 import 'package:blockchain_utils/bip/coin_conf/coins_conf.dart';
+import 'package:blockchain_utils/blockchain_utils.dart';
 
 /// Abstract class representing a base for UTXO-based cryptocurrency networks.
 abstract class BasedUtxoNetwork implements Enumerate {
diff --git a/lib/src/provider/models/block_cypher/block_cypher_models.dart b/lib/src/provider/models/block_cypher/block_cypher_models.dart
index 5d4761b..9d49f11 100644
--- a/lib/src/provider/models/block_cypher/block_cypher_models.dart
+++ b/lib/src/provider/models/block_cypher/block_cypher_models.dart
@@ -99,7 +99,7 @@ class BlockCypherUtxo {
   }
 
   List<UtxoWithAddress> toUtxoWithOwner(UtxoAddressDetails owner) {
-    List<UtxoWithAddress> utxos = txRefs.map((ref) {
+    final List<UtxoWithAddress> utxos = txRefs.map((ref) {
       return UtxoWithAddress(
         utxo: ref.toUtxo(owner.address.type),
         ownerDetails: owner,
diff --git a/lib/src/provider/models/config.dart b/lib/src/provider/models/config.dart
index 44ebefb..fbbda69 100644
--- a/lib/src/provider/models/config.dart
+++ b/lib/src/provider/models/config.dart
@@ -24,7 +24,7 @@ class APIConfig {
   }
 
   String getUtxoUrl(String address) {
-    String baseUrl = url;
+    final String baseUrl = url;
     return baseUrl.replaceAll("###", address);
   }
 
@@ -33,17 +33,17 @@ class APIConfig {
   }
 
   String getTransactionUrl(String transactionId) {
-    String baseUrl = transaction;
+    final String baseUrl = transaction;
     return baseUrl.replaceAll("###", transactionId);
   }
 
   String getTransactionsUrl(String address) {
-    String baseUrl = transactions;
+    final String baseUrl = transactions;
     return baseUrl.replaceAll("###", address);
   }
 
   String getBlockHeight(int blockHaight) {
-    String baseUrl = blockHeight;
+    final String baseUrl = blockHeight;
     return baseUrl.replaceAll("###", "$blockHaight");
   }
 
diff --git a/lib/src/provider/models/fee_rate/fee_rate.dart b/lib/src/provider/models/fee_rate/fee_rate.dart
index 8064aaa..e3885e5 100644
--- a/lib/src/provider/models/fee_rate/fee_rate.dart
+++ b/lib/src/provider/models/fee_rate/fee_rate.dart
@@ -50,7 +50,7 @@ class BitcoinFeeRate {
   BigInt getEstimate(int trSize,
       {BigInt? customFeeRatePerKb,
       BitcoinFeeRateType feeRateType = BitcoinFeeRateType.medium}) {
-    BigInt feeRate = customFeeRatePerKb ?? _feeRatrete(feeRateType);
+    final BigInt feeRate = customFeeRatePerKb ?? _feeRatrete(feeRateType);
     final trSizeBigInt = BigInt.from(trSize);
     return (trSizeBigInt * feeRate) ~/ BigInt.from(1000);
   }
diff --git a/lib/src/provider/models/mempool/mempol_models.dart b/lib/src/provider/models/mempool/mempol_models.dart
index b1ea5b5..d194d57 100644
--- a/lib/src/provider/models/mempool/mempol_models.dart
+++ b/lib/src/provider/models/mempool/mempol_models.dart
@@ -186,7 +186,7 @@ class MempolUtxo implements UTXO {
 
 extension MempoolUtxoExtentions on List<MempolUtxo> {
   List<UtxoWithAddress> toUtxoWithOwnerList(UtxoAddressDetails owner) {
-    List<UtxoWithAddress> utxos = map((e) => UtxoWithAddress(
+    final List<UtxoWithAddress> utxos = map((e) => UtxoWithAddress(
           utxo: BitcoinUtxo(
             txHash: e.txid,
             value: e.value,
diff --git a/lib/src/provider/models/utxo_details.dart b/lib/src/provider/models/utxo_details.dart
index 063da98..606171e 100644
--- a/lib/src/provider/models/utxo_details.dart
+++ b/lib/src/provider/models/utxo_details.dart
@@ -56,7 +56,7 @@ class UtxoWithAddress {
         utxo: utxo,
         ownerDetails: ownerDetails,
         isCompressed: ownerDetails._publicKey != null && !utxo.isSegwit
-            ? BtcUtils.isCompressedPubKey(ownerDetails._publicKey!)
+            ? BtcUtils.isCompressedPubKey(ownerDetails._publicKey)
             : true);
   }
 
@@ -255,7 +255,7 @@ extension Calculate on List<UtxoWithAddress> {
   /// sum of utxos network values
   BigInt sumOfUtxosValue() {
     BigInt sum = BigInt.zero;
-    for (var utxo in this) {
+    for (final utxo in this) {
       sum += utxo.utxo.value;
     }
     return sum;
@@ -264,7 +264,7 @@ extension Calculate on List<UtxoWithAddress> {
   /// sum of utxos cash token (FToken) amounts
   Map<String, BigInt> sumOfTokenUtxos() {
     final Map<String, BigInt> tokens = {};
-    for (var utxo in this) {
+    for (final utxo in this) {
       if (utxo.utxo.token == null) continue;
       final token = utxo.utxo.token!;
       if (!token.hasAmount) continue;
diff --git a/lib/src/provider/service/electrum/params.dart b/lib/src/provider/service/electrum/params.dart
index cb245c2..da5a07a 100644
--- a/lib/src/provider/service/electrum/params.dart
+++ b/lib/src/provider/service/electrum/params.dart
@@ -40,7 +40,7 @@ abstract class ElectrumRequest<RESULT, RESPONSE>
   }
 
   ElectrumRequestDetails toRequest(int requestId) {
-    List<dynamic> inJson = toJson();
+    final List<dynamic> inJson = toJson();
     inJson.removeWhere((v) => v == null);
     final params = {
       "jsonrpc": "2.0",
diff --git a/lib/src/provider/transaction_builder/forked_transaction_builder.dart b/lib/src/provider/transaction_builder/forked_transaction_builder.dart
index 80e1b3c..1c7c55a 100644
--- a/lib/src/provider/transaction_builder/forked_transaction_builder.dart
+++ b/lib/src/provider/transaction_builder/forked_transaction_builder.dart
@@ -102,9 +102,9 @@ class ForkedTransactionBuilder implements BasedBitcoinTransacationBuilder {
         /// and doesn't generate errors when determining the transaction size.
         isFakeTransaction: true);
 
-    /// 71 bytes (64 byte signature, 6-7 byte Der encoding length)
+    /// 72 bytes (64 byte signature, 6-7 byte Der encoding length + sighash)
     const String fakeECDSASignatureBytes =
-        "0101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101";
+        "010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101";
 
     final transaction = transactionBuilder
         .buildTransaction((trDigest, utxo, multiSigPublicKey, int sighash) {
@@ -171,13 +171,12 @@ class ForkedTransactionBuilder implements BasedBitcoinTransacationBuilder {
   /// Returns:
   /// - List<int>: representing the transaction digest to be used for signing the input.
   List<int> _generateTransactionDigest(
-    Script scriptPubKeys,
-    int input,
-    UtxoWithAddress utox,
-    BtcTransaction transaction,
-  ) {
-    const sighash =
-        BitcoinOpCodeConst.SIGHASH_ALL | BitcoinOpCodeConst.SIGHASH_FORKED;
+      {required Script scriptPubKeys,
+      required int input,
+      required UtxoWithAddress utox,
+      required BtcTransaction transaction,
+      int sighash =
+          BitcoinOpCodeConst.SIGHASH_ALL | BitcoinOpCodeConst.SIGHASH_FORKED}) {
     return transaction.getTransactionSegwitDigit(
         txInIndex: input,
         script: scriptPubKeys,
@@ -258,7 +257,8 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
           },
         );
     }
-    List<TxInput> inputs = sortedUtxos.map((e) => e.utxo.toInput()).toList();
+    final List<TxInput> inputs =
+        sortedUtxos.map((e) => e.utxo.toInput()).toList();
     if (enableRBF && inputs.isNotEmpty) {
       inputs[0] = inputs[0]
           .copyWith(sequence: BitcoinOpCodeConst.REPLACE_BY_FEE_SEQUENCE);
@@ -319,7 +319,7 @@ be retrieved by anyone who examines the blockchain's history.
   /// Total token amount to spend.
   Map<String, BigInt> _sumTokenOutputAmounts(List<TxOutput> outputs) {
     final Map<String, BigInt> tokens = {};
-    for (var utxo in outputs) {
+    for (final utxo in outputs) {
       if (utxo.cashToken == null) continue;
       final token = utxo.cashToken!;
       if (!token.hasAmount) continue;
@@ -470,9 +470,11 @@ be retrieved by anyone who examines the blockchain's history.
         sumOutputAmounts: sumOutputAmounts);
 
     /// create new transaction with inputs and outputs and isSegwit transaction or not
+    // BtcTransaction transaction = BtcTransaction.fromRaw(
+    //     "0200000001b8249c5a6cf8f24815377222e4c2bab32154151c367111134ef7ce11c651e4c600000000fd5b0300483045022100b4e774511598efbdf256aaa127f2104c5f25e29311936a75034857901c72fa180220232410ec31b9809b0293a7a2c8c0ade53ca4bdde064ac1baaa27d545678891b84147304402203014d1beaa73fc289d0201bff61a40d1e853103d624fb8520cc6b4afea00d3c10220643eed02e2830b7f751b7355a889e4ab4c02d01df0ca71621d4f5affe5cb3a5d41483045022100bf73bd48dcef332924c7578ff7a5b9d3817ecdb2ad2a4148f56069705365427c022044ce67ca87c3e1309ba43fcb3c23a3618ba0dbd44a802c22efab78b42b9a8e3e41483045022100a3d90b8f959850f9e2655b38e61a8e5323a363803bd62ab0560509e9cd675dae022064ba98f689c21f66e0839660bf15c7a0c44e0e65384d82996a4f3b73a55daef141473044022033128a7572b0bc7d22c6cd2080a882b7e03b15167b1d88b6405fa0131ab6254602207d960421e8a1a2e85431b6398a9af742fb492c967c3acac9fd38d82d7c54756e41483045022100c00232655b098d529deea53dcfffa5b25dc4a2015a52b1b587ae73c813a8d4a502201d100762ddb4779d1c484790a1b38cf369f634ee33541d8ec0ec45c2470141ba4147304402201503e2e7bab40cd5a083c0e03506ad1c260d17b821a142be2591e05fa5bdc86d02201d0280a2fc78a2af4bf7f1245bd8bf3384ada22098ba84645958ff1715655630414730440220090757399dc9f989ff1a7d998af385cd9490fe07c2c216b54967d4138067312a02204c3bb010902d72e90a1133cc8ae34cb629e139863f62ab259f25e5cac2125779414d13015821030f0fb9a244ad31a369ee02b7abfbbb0bfa3812b9a39ed93346d03d67d412d17721022f1b310f4c065331bc0d79ba4661bb9822d67d7c4a1b0a1892e1fd0cd23aa68d210299c2aa85d2b21a62f396907a802a58e521dafd5bddaccbd72786eea189bc4dc921021a7a569e91dbf60581509c7fc946d1003b60c7dee85299538db6353538d595742103a92c9b7cac68758de5783ed8e5123598e4ad137091e42987d3bad8a08e35bf3d21034f355bdcb7cc0af728ef3cceb9615d90684bb5b2ca5f859ab0f0b704075871aa21036360e856310ce5d294e8be33fc807077dc56ac80d95d9cd4ddbd21325eff73f721031d16453b3ab3132acb0a5bc16cc49690d819a585267a15cd5a064e2a0ad4059958ae0000000001f0780f000000000017a914e5d65da9624e4754827edb627fe31d4c75954a388700000000");
+    // transaction = transaction.copyWith(inputs: inputs);
     final transaction =
         BtcTransaction(inputs: inputs, outputs: outputs, hasSegwit: false);
-
     const int sighash =
         BitcoinOpCodeConst.SIGHASH_ALL | BitcoinOpCodeConst.SIGHASH_FORKED;
 
@@ -484,8 +486,12 @@ be retrieved by anyone who examines the blockchain's history.
       final script = _buildInputScriptPubKeys(indexUtxo);
 
       /// We generate transaction digest for current input
-      final digest =
-          _generateTransactionDigest(script, i, indexUtxo, transaction);
+      final digest = _generateTransactionDigest(
+          scriptPubKeys: script,
+          input: i,
+          utox: indexUtxo,
+          transaction: transaction,
+          sighash: sighash);
 
       /// handle multisig address
       if (indexUtxo.isMultiSig()) {
@@ -575,8 +581,12 @@ be retrieved by anyone who examines the blockchain's history.
       final script = _buildInputScriptPubKeys(indexUtxo);
 
       /// We generate transaction digest for current input
-      final digest =
-          _generateTransactionDigest(script, i, indexUtxo, transaction);
+      final digest = _generateTransactionDigest(
+          scriptPubKeys: script,
+          input: i,
+          utox: indexUtxo,
+          transaction: transaction,
+          sighash: sighash);
 
       /// handle multisig address
       if (indexUtxo.isMultiSig()) {
diff --git a/lib/src/provider/transaction_builder/transaction_builder.dart b/lib/src/provider/transaction_builder/transaction_builder.dart
index 8003fd2..cdc8e0f 100644
--- a/lib/src/provider/transaction_builder/transaction_builder.dart
+++ b/lib/src/provider/transaction_builder/transaction_builder.dart
@@ -116,9 +116,9 @@ class BitcoinTransactionBuilder implements BasedBitcoinTransacationBuilder {
     const String fakeSchnorSignaturBytes =
         "01010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101";
 
-    /// 71 bytes (64 byte signature, 6-7 byte Der encoding length)
+    /// 72 bytes (64 byte signature, 6-7 byte Der encoding length)
     const String fakeECDSASignatureBytes =
-        "0101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101";
+        "010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101";
 
     final transaction = transactionBuilder
         .buildTransaction((trDigest, utxo, multiSigPublicKey, int sighash) {
@@ -406,7 +406,8 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
           },
         );
     }
-    List<TxInput> inputs = sortedUtxos.map((e) => e.utxo.toInput()).toList();
+    final List<TxInput> inputs =
+        sortedUtxos.map((e) => e.utxo.toInput()).toList();
     if (enableRBF && inputs.isNotEmpty) {
       inputs[0] = inputs[0]
           .copyWith(sequence: BitcoinOpCodeConst.REPLACE_BY_FEE_SEQUENCE);
diff --git a/pubspec.yaml b/pubspec.yaml
index 1c7a136..8e8dc90 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -12,7 +12,7 @@ topics:
   - dash
   
 environment:
-  sdk: '>=2.15.0 <4.0.0'
+  sdk: '>=3.3.0 <4.0.0'
 
 
 dependencies:
@@ -23,9 +23,9 @@ dependencies:
     
 
 dev_dependencies:
-  test: ^1.25.5
-  lints: ^4.0.0
-  flutter_lints: ^4.0.0
+  lints: ^5.0.0
+  test: ^1.25.9
+  flutter_lints: ^5.0.0
  
 
 # For information on the generic Dart part of this file, see the
diff --git a/test/bitcoin_cash_address_test.dart b/test/bitcoin_cash_address_test.dart
index e67fe55..11f310a 100644
--- a/test/bitcoin_cash_address_test.dart
+++ b/test/bitcoin_cash_address_test.dart
@@ -194,7 +194,7 @@ void main() {
   test("decode encode address", () {
     for (final i in bitcoinCashAddresses.keys.toList()) {
       final info = Map.from(bitcoinCashAddresses[i]!);
-      BitcoinCashNetwork network = BitcoinCashNetwork.mainnet;
+      const BitcoinCashNetwork network = BitcoinCashNetwork.mainnet;
       final address =
           BitcoinCashAddress(i, network: network, validateNetworkPrefix: false);
       expect(address.baseAddress.addressProgram, info["programBytes"]);
diff --git a/test/keys_test.dart b/test/keys_test.dart
index ac2d818..745ee82 100644
--- a/test/keys_test.dart
+++ b/test/keys_test.dart
@@ -177,7 +177,7 @@ void main() {
     final ECPrivate priv = ECPrivate.fromWif(
         'cTALNpTpRbbxTCJ2A5Vq88UxT44w1PE2cYqiB3n4hRvzyCev1Wwo',
         netVersion: BitcoinNetwork.testnet.wifNetVer);
-    ECPublic pub = priv.getPublic();
+    final ECPublic pub = priv.getPublic();
     const String p2shaddress = '2NDkr9uD2MSY5em3rsjkff8fLZcJzCfY3W1';
     test("test create", () {
       final script = Script(script: [pub.toHex(), 'OP_CHECKSIG']);
@@ -191,7 +191,7 @@ void main() {
     final ECPrivate priv = ECPrivate.fromWif(
         'cVdte9ei2xsVjmZSPtyucG43YZgNkmKTqhwiUA8M4Fc3LdPJxPmZ',
         netVersion: BitcoinNetwork.testnet.wifNetVer);
-    ECPublic pub = priv.getPublic();
+    final ECPublic pub = priv.getPublic();
     const String correctP2wpkhAddress =
         'tb1qxmt9xgewg6mxc4mvnzvrzu4f2v0gy782fydg0w';
     const String correctP2shP2wpkhAddress =
diff --git a/test/p2sh_test.dart b/test/p2sh_test.dart
index 5b515b4..b1d6b49 100644
--- a/test/p2sh_test.dart
+++ b/test/p2sh_test.dart
@@ -61,6 +61,7 @@ void main() {
       txin.scriptSig = Script(script: [sig, sk.getPublic().toHex()]);
       expect(tx.serialize(), createP2shAndSendResult);
     });
+
     test("test2", () {
       final tx = BtcTransaction(inputs: [txinSpend], outputs: [txout2]);
       final digit =
diff --git a/test/p2tr_test.dart b/test/p2tr_test.dart
index 5462c5f..dbf41ec 100644
--- a/test/p2tr_test.dart
+++ b/test/p2tr_test.dart
@@ -62,7 +62,7 @@ void main() {
 
     // 1-create address with single script spending path
     test('address_with_script_path', () {
-      var toAddress = toPub1.toTaprootAddress(scripts: [
+      final toAddress = toPub1.toTaprootAddress(scripts: [
         [trScriptP2pk1]
       ]);
 

From 1bc4604b674733ed2500a73757337f1c89102f3b Mon Sep 17 00:00:00 2001
From: Mohsen <mrhaydari.t@gmail.com>
Date: Mon, 2 Dec 2024 11:08:41 +0330
Subject: [PATCH 25/62] update networks

---
 analysis_options.yaml                         | 10 ++-
 example/pubspec.lock                          |  2 +-
 example/pubspec.yaml                          |  2 +-
 lib/bitcoin_base.dart                         |  2 +-
 lib/src/bitcoin/address/address.dart          |  2 +-
 lib/src/bitcoin/address/core.dart             | 28 ++++-----
 lib/src/bitcoin/address/legacy_address.dart   | 20 +++---
 lib/src/bitcoin/address/network_address.dart  |  2 +
 lib/src/bitcoin/address/segwit_address.dart   | 62 ++++++++++++-------
 .../bitcoin/address/utils/address_utils.dart  |  2 +-
 .../bitcoin/script/op_code/constant_lib.dart  |  2 +-
 lib/src/bitcoin_cash/bcmr_registery.dart      | 37 +++++++----
 lib/src/crypto/crypto.dart                    |  2 +-
 lib/src/exception/exception.dart              |  4 +-
 lib/src/models/network.dart                   | 10 +--
 lib/src/provider/models/multisig_script.dart  |  2 +-
 lib/src/provider/models/utxo_details.dart     |  4 +-
 .../transaction_builder.dart                  | 12 ++--
 pubspec.yaml                                  |  4 +-
 19 files changed, 120 insertions(+), 89 deletions(-)

diff --git a/analysis_options.yaml b/analysis_options.yaml
index cf19463..231b316 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -1,11 +1,9 @@
 # include: package:lints/recommended.yaml
 include: package:flutter_lints/flutter.yaml
-# Additional information about this file can be found at
-# https://dart.dev/guides/language/analysis-options
 # Uncomment the following section to specify additional rules.
 linter:
   rules:
-    - unnecessary_const
-    - prefer_const_declarations
-    - prefer_final_locals      # Warns when a local variable could be final
-    - prefer_final_in_for_each # Warns when a forEach variable could be final
+    prefer_final_locals: true        # Warns when a local variable could be final
+    prefer_final_in_for_each: true   # Warns when a forEach variable could be final
+    prefer_const_constructors: true  # Warns when a constructor could be const
+    prefer_const_declarations: true  # Warns when a declaration could be const
diff --git a/example/pubspec.lock b/example/pubspec.lock
index 7873d10..d4e9c83 100644
--- a/example/pubspec.lock
+++ b/example/pubspec.lock
@@ -22,7 +22,7 @@ packages:
       path: "../../blockchain_utils"
       relative: true
     source: path
-    version: "3.5.0"
+    version: "3.6.0"
   boolean_selector:
     dependency: transitive
     description:
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
index c2fdaea..790529b 100644
--- a/example/pubspec.yaml
+++ b/example/pubspec.yaml
@@ -38,7 +38,7 @@ dependencies:
   bitcoin_base: 
     path: ../
   blockchain_utils:
-    path: ../../../blockchain_utils
+    path: ../../blockchain_utils
   # blockchain_utils: ^3.5.0
   http: ^1.2.0
 
diff --git a/lib/bitcoin_base.dart b/lib/bitcoin_base.dart
index 9edd8ac..ef45ef4 100644
--- a/lib/bitcoin_base.dart
+++ b/lib/bitcoin_base.dart
@@ -4,7 +4,7 @@
 /// including spending transactions, Bitcoin address management,
 ///  Bitcoin Schnorr signatures, BIP-39 mnemonic phrase generation,
 /// hierarchical deterministic (HD) wallet derivation, and Web3 Secret Storage Definition.
-library;
+library bitcoin_base;
 
 export 'package:bitcoin_base/src/bitcoin/address/address.dart';
 
diff --git a/lib/src/bitcoin/address/address.dart b/lib/src/bitcoin/address/address.dart
index f878515..45ee9fe 100644
--- a/lib/src/bitcoin/address/address.dart
+++ b/lib/src/bitcoin/address/address.dart
@@ -6,7 +6,7 @@
 // - Utility functions for address manipulation.
 // - encode/decode Segregated Witness (SegWit) address implementation.
 // - Enhanced functionality for improved handling of addresses across diverse networks.
-library;
+library address;
 
 import 'package:bitcoin_base/bitcoin_base.dart';
 import 'package:bitcoin_base/src/exception/exception.dart';
diff --git a/lib/src/bitcoin/address/core.dart b/lib/src/bitcoin/address/core.dart
index a3fcb6d..1ec79cc 100644
--- a/lib/src/bitcoin/address/core.dart
+++ b/lib/src/bitcoin/address/core.dart
@@ -21,9 +21,9 @@ abstract class BitcoinAddressType implements Enumerate {
   // Enum values as a list for iteration
   static const List<BitcoinAddressType> values = [
     P2pkhAddressType.p2pkh,
-    SegwitAddresType.p2wpkh,
-    SegwitAddresType.p2tr,
-    SegwitAddresType.p2wsh,
+    SegwitAddressType.p2wpkh,
+    SegwitAddressType.p2tr,
+    SegwitAddressType.p2wsh,
     P2shAddressType.p2wshInP2sh,
     P2shAddressType.p2wpkhInP2sh,
     P2shAddressType.p2pkhInP2sh,
@@ -59,7 +59,7 @@ abstract class BitcoinBaseAddress {
 }
 
 class PubKeyAddressType extends BitcoinAddressType {
-  const PubKeyAddressType._(super.value) : super._();
+  const PubKeyAddressType._(String value) : super._(value);
   static const PubKeyAddressType p2pk = PubKeyAddressType._("P2PK");
   @override
   bool get isP2sh => false;
@@ -75,7 +75,7 @@ class PubKeyAddressType extends BitcoinAddressType {
 }
 
 class P2pkhAddressType extends BitcoinAddressType {
-  const P2pkhAddressType._(super.value) : super._();
+  const P2pkhAddressType._(String value) : super._(value);
   static const P2pkhAddressType p2pkh = P2pkhAddressType._("P2PKH");
   static const P2pkhAddressType p2pkhwt = P2pkhAddressType._("P2PKHWT");
 
@@ -93,8 +93,8 @@ class P2pkhAddressType extends BitcoinAddressType {
 }
 
 class P2shAddressType extends BitcoinAddressType {
-  const P2shAddressType._(super.value, this.hashLength, this.withToken)
-      : super._();
+  const P2shAddressType._(String value, this.hashLength, this.withToken)
+      : super._(value);
   static const P2shAddressType p2wshInP2sh = P2shAddressType._(
       "P2SH/P2WSH", _BitcoinAddressUtils.hash160DigestLength, false);
   static const P2shAddressType p2wpkhInP2sh = P2shAddressType._(
@@ -142,11 +142,11 @@ class P2shAddressType extends BitcoinAddressType {
   }
 }
 
-class SegwitAddresType extends BitcoinAddressType {
-  const SegwitAddresType._(super.value) : super._();
-  static const SegwitAddresType p2wpkh = SegwitAddresType._("P2WPKH");
-  static const SegwitAddresType p2tr = SegwitAddresType._("P2TR");
-  static const SegwitAddresType p2wsh = SegwitAddresType._("P2WSH");
+class SegwitAddressType extends BitcoinAddressType {
+  const SegwitAddressType._(String value) : super._(value);
+  static const SegwitAddressType p2wpkh = SegwitAddressType._("P2WPKH");
+  static const SegwitAddressType p2tr = SegwitAddressType._("P2TR");
+  static const SegwitAddressType p2wsh = SegwitAddressType._("P2WSH");
   @override
   bool get isP2sh => false;
   @override
@@ -155,7 +155,7 @@ class SegwitAddresType extends BitcoinAddressType {
   @override
   int get hashLength {
     switch (this) {
-      case SegwitAddresType.p2wpkh:
+      case SegwitAddressType.p2wpkh:
         return 20;
       default:
         return 32;
@@ -164,6 +164,6 @@ class SegwitAddresType extends BitcoinAddressType {
 
   @override
   String toString() {
-    return "SegwitAddresType.$value";
+    return "SegwitAddressType.$value";
   }
 }
diff --git a/lib/src/bitcoin/address/legacy_address.dart b/lib/src/bitcoin/address/legacy_address.dart
index e8b3d54..30b1445 100644
--- a/lib/src/bitcoin/address/legacy_address.dart
+++ b/lib/src/bitcoin/address/legacy_address.dart
@@ -45,14 +45,14 @@ abstract class LegacyAddress implements BitcoinBaseAddress {
 
 class P2shAddress extends LegacyAddress {
   P2shAddress.fromScript(
-      {required super.script, this.type = P2shAddressType.p2pkInP2sh})
-      : super.fromScript();
+      {required Script script, this.type = P2shAddressType.p2pkInP2sh})
+      : super.fromScript(script: script);
 
   P2shAddress.fromAddress(
-      {required super.address,
-      required super.network,
+      {required String address,
+      required BasedUtxoNetwork network,
       this.type = P2shAddressType.p2pkInP2sh})
-      : super.fromAddress();
+      : super.fromAddress(address: address, network: network);
   P2shAddress.fromHash160(
       {required String addrHash, this.type = P2shAddressType.p2pkInP2sh})
       : super.fromHash160(addrHash, type);
@@ -81,13 +81,13 @@ class P2shAddress extends LegacyAddress {
 
 class P2pkhAddress extends LegacyAddress {
   P2pkhAddress.fromScript(
-      {required super.script, this.type = P2pkhAddressType.p2pkh})
-      : super.fromScript();
+      {required Script script, this.type = P2pkhAddressType.p2pkh})
+      : super.fromScript(script: script);
   P2pkhAddress.fromAddress(
-      {required super.address,
-      required super.network,
+      {required String address,
+      required BasedUtxoNetwork network,
       this.type = P2pkhAddressType.p2pkh})
-      : super.fromAddress();
+      : super.fromAddress(address: address, network: network);
   P2pkhAddress.fromHash160(
       {required String addrHash, this.type = P2pkhAddressType.p2pkh})
       : super.fromHash160(addrHash, type);
diff --git a/lib/src/bitcoin/address/network_address.dart b/lib/src/bitcoin/address/network_address.dart
index b15aa3c..4f0242d 100644
--- a/lib/src/bitcoin/address/network_address.dart
+++ b/lib/src/bitcoin/address/network_address.dart
@@ -162,3 +162,5 @@ class BitcoinSVAddress extends BitcoinNetworkAddress<BitcoinSVNetwork> {
         baseAddress, baseAddress.toAddress(network), network);
   }
 }
+
+// 
diff --git a/lib/src/bitcoin/address/segwit_address.dart b/lib/src/bitcoin/address/segwit_address.dart
index 4731973..5ecaf2f 100644
--- a/lib/src/bitcoin/address/segwit_address.dart
+++ b/lib/src/bitcoin/address/segwit_address.dart
@@ -15,7 +15,7 @@ abstract class SegwitAddress implements BitcoinBaseAddress {
   SegwitAddress.fromProgram(
       {required String program,
       required this.segwitVersion,
-      required SegwitAddresType addresType})
+      required SegwitAddressType addresType})
       : addressProgram =
             _BitcoinAddressUtils.validateAddressProgram(program, addresType);
   SegwitAddress.fromScript(
@@ -46,15 +46,21 @@ abstract class SegwitAddress implements BitcoinBaseAddress {
 }
 
 class P2wpkhAddress extends SegwitAddress {
-  P2wpkhAddress.fromAddress({required super.address, required super.network})
-      : super.fromAddress(segwitVersion: _BitcoinAddressUtils.segwitV0);
+  P2wpkhAddress.fromAddress(
+      {required String address, required BasedUtxoNetwork network})
+      : super.fromAddress(
+            segwitVersion: _BitcoinAddressUtils.segwitV0,
+            address: address,
+            network: network);
 
-  P2wpkhAddress.fromProgram({required super.program})
+  P2wpkhAddress.fromProgram({required String program})
       : super.fromProgram(
             segwitVersion: _BitcoinAddressUtils.segwitV0,
-            addresType: SegwitAddresType.p2wpkh);
-  P2wpkhAddress.fromScript({required super.script})
-      : super.fromScript(segwitVersion: _BitcoinAddressUtils.segwitV0);
+            addresType: SegwitAddressType.p2wpkh,
+            program: program);
+  P2wpkhAddress.fromScript({required Script script})
+      : super.fromScript(
+            segwitVersion: _BitcoinAddressUtils.segwitV0, script: script);
 
   /// returns the scriptPubKey of a P2WPKH witness script
   @override
@@ -64,18 +70,24 @@ class P2wpkhAddress extends SegwitAddress {
 
   /// returns the type of address
   @override
-  SegwitAddresType get type => SegwitAddresType.p2wpkh;
+  SegwitAddressType get type => SegwitAddressType.p2wpkh;
 }
 
 class P2trAddress extends SegwitAddress {
-  P2trAddress.fromAddress({required super.address, required super.network})
-      : super.fromAddress(segwitVersion: _BitcoinAddressUtils.segwitV1);
-  P2trAddress.fromProgram({required super.program})
+  P2trAddress.fromAddress(
+      {required String address, required BasedUtxoNetwork network})
+      : super.fromAddress(
+            segwitVersion: _BitcoinAddressUtils.segwitV1,
+            address: address,
+            network: network);
+  P2trAddress.fromProgram({required String program})
       : super.fromProgram(
             segwitVersion: _BitcoinAddressUtils.segwitV1,
-            addresType: SegwitAddresType.p2tr);
-  P2trAddress.fromScript({required super.script})
-      : super.fromScript(segwitVersion: _BitcoinAddressUtils.segwitV1);
+            addresType: SegwitAddressType.p2tr,
+            program: program);
+  P2trAddress.fromScript({required Script script})
+      : super.fromScript(
+            segwitVersion: _BitcoinAddressUtils.segwitV1, script: script);
 
   /// returns the scriptPubKey of a P2TR witness script
   @override
@@ -85,18 +97,24 @@ class P2trAddress extends SegwitAddress {
 
   /// returns the type of address
   @override
-  SegwitAddresType get type => SegwitAddresType.p2tr;
+  SegwitAddressType get type => SegwitAddressType.p2tr;
 }
 
 class P2wshAddress extends SegwitAddress {
-  P2wshAddress.fromAddress({required super.address, required super.network})
-      : super.fromAddress(segwitVersion: _BitcoinAddressUtils.segwitV0);
-  P2wshAddress.fromProgram({required super.program})
+  P2wshAddress.fromAddress(
+      {required String address, required BasedUtxoNetwork network})
+      : super.fromAddress(
+            segwitVersion: _BitcoinAddressUtils.segwitV0,
+            address: address,
+            network: network);
+  P2wshAddress.fromProgram({required String program})
       : super.fromProgram(
             segwitVersion: _BitcoinAddressUtils.segwitV0,
-            addresType: SegwitAddresType.p2wsh);
-  P2wshAddress.fromScript({required super.script})
-      : super.fromScript(segwitVersion: _BitcoinAddressUtils.segwitV0);
+            addresType: SegwitAddressType.p2wsh,
+            program: program);
+  P2wshAddress.fromScript({required Script script})
+      : super.fromScript(
+            segwitVersion: _BitcoinAddressUtils.segwitV0, script: script);
 
   /// Returns the scriptPubKey of a P2WPKH witness script
   @override
@@ -106,5 +124,5 @@ class P2wshAddress extends SegwitAddress {
 
   /// Returns the type of address
   @override
-  SegwitAddresType get type => SegwitAddresType.p2wsh;
+  SegwitAddressType get type => SegwitAddressType.p2wsh;
 }
diff --git a/lib/src/bitcoin/address/utils/address_utils.dart b/lib/src/bitcoin/address/utils/address_utils.dart
index 5b1f431..9463f32 100644
--- a/lib/src/bitcoin/address/utils/address_utils.dart
+++ b/lib/src/bitcoin/address/utils/address_utils.dart
@@ -153,7 +153,7 @@ class _BitcoinAddressUtils {
   static BitcoinBaseAddress decodeAddress(
       String address, BasedUtxoNetwork network) {
     BitcoinBaseAddress? baseAddress;
-    if (network.supportedAddress.contains(SegwitAddresType.p2wpkh)) {
+    if (network.supportedAddress.contains(SegwitAddressType.p2wpkh)) {
       baseAddress = toSegwitAddress(address, network);
     }
     baseAddress ??= toLegacy(address, network);
diff --git a/lib/src/bitcoin/script/op_code/constant_lib.dart b/lib/src/bitcoin/script/op_code/constant_lib.dart
index e6c4f56..a304302 100644
--- a/lib/src/bitcoin/script/op_code/constant_lib.dart
+++ b/lib/src/bitcoin/script/op_code/constant_lib.dart
@@ -1,4 +1,4 @@
-library;
+library op_code;
 
 export 'constant.dart';
 export 'tools.dart';
diff --git a/lib/src/bitcoin_cash/bcmr_registery.dart b/lib/src/bitcoin_cash/bcmr_registery.dart
index 6975089..80b0e1a 100644
--- a/lib/src/bitcoin_cash/bcmr_registery.dart
+++ b/lib/src/bitcoin_cash/bcmr_registery.dart
@@ -699,17 +699,26 @@ class ChainSnapshot extends IdentitySnapshot {
           : null,
     );
   }
-  const ChainSnapshot({
-    required super.name,
-    required TokenCategory super.token,
-    super.description,
-    super.tags,
-    super.migrated,
-    super.status,
-    super.splitId,
-    super.uris,
-    super.extensions,
-  });
+  ChainSnapshot(
+      {required String name,
+      required String? description,
+      required List<String>? tags,
+      required String? migrated,
+      required TokenCategory token,
+      required String? status,
+      required String? splitId,
+      required URIs? uris,
+      required Extensions? extensions})
+      : super(
+            name: name,
+            description: description,
+            tags: tags,
+            migrated: migrated,
+            token: token,
+            status: status,
+            splitId: splitId,
+            uris: uris,
+            extensions: extensions);
 }
 
 class RegistryTimestampKeyedValues<T extends IdentitySnapshot> {
@@ -722,7 +731,8 @@ class RegistryTimestampKeyedValues<T extends IdentitySnapshot> {
 }
 
 class ChainHistory extends RegistryTimestampKeyedValues<ChainSnapshot> {
-  const ChainHistory({required super.timestampMap});
+  const ChainHistory({required Map<String, ChainSnapshot> timestampMap})
+      : super(timestampMap: timestampMap);
 
   factory ChainHistory.fromJson(Map<String, dynamic> json) {
     return ChainHistory(
@@ -734,7 +744,8 @@ class ChainHistory extends RegistryTimestampKeyedValues<ChainSnapshot> {
 }
 
 class IdentityHistory extends RegistryTimestampKeyedValues<IdentitySnapshot> {
-  const IdentityHistory({required super.timestampMap});
+  const IdentityHistory({required Map<String, IdentitySnapshot> timestampMap})
+      : super(timestampMap: timestampMap);
 
   factory IdentityHistory.fromJson(Map<String, dynamic> json) {
     return IdentityHistory(
diff --git a/lib/src/crypto/crypto.dart b/lib/src/crypto/crypto.dart
index 2d23b95..bf5c6cf 100644
--- a/lib/src/crypto/crypto.dart
+++ b/lib/src/crypto/crypto.dart
@@ -1,4 +1,4 @@
-library;
+library crypto;
 
 import 'package:bitcoin_base/src/bitcoin/script/op_code/constant_lib.dart';
 import 'package:blockchain_utils/crypto/quick_crypto.dart';
diff --git a/lib/src/exception/exception.dart b/lib/src/exception/exception.dart
index 0e031c3..09652ba 100644
--- a/lib/src/exception/exception.dart
+++ b/lib/src/exception/exception.dart
@@ -1,5 +1,7 @@
 import 'package:blockchain_utils/blockchain_utils.dart';
 
 class DartBitcoinPluginException extends BlockchainUtilsException {
-  const DartBitcoinPluginException(super.message, {super.details});
+  const DartBitcoinPluginException(String message,
+      {Map<String, dynamic>? details})
+      : super(message, details: details);
 }
diff --git a/lib/src/models/network.dart b/lib/src/models/network.dart
index 0000bed..cb17f2a 100644
--- a/lib/src/models/network.dart
+++ b/lib/src/models/network.dart
@@ -157,10 +157,10 @@ class BitcoinNetwork implements BasedUtxoNetwork {
   @override
   List<BitcoinAddressType> get supportedAddress => [
         P2pkhAddressType.p2pkh,
-        SegwitAddresType.p2wpkh,
+        SegwitAddressType.p2wpkh,
         PubKeyAddressType.p2pk,
-        SegwitAddresType.p2tr,
-        SegwitAddresType.p2wsh,
+        SegwitAddressType.p2tr,
+        SegwitAddressType.p2wsh,
         P2shAddressType.p2wshInP2sh,
         P2shAddressType.p2wpkhInP2sh,
         P2shAddressType.p2pkhInP2sh,
@@ -229,9 +229,9 @@ class LitecoinNetwork implements BasedUtxoNetwork {
   @override
   final List<BitcoinAddressType> supportedAddress = const [
     P2pkhAddressType.p2pkh,
-    SegwitAddresType.p2wpkh,
+    SegwitAddressType.p2wpkh,
     PubKeyAddressType.p2pk,
-    SegwitAddresType.p2wsh,
+    SegwitAddressType.p2wsh,
     P2shAddressType.p2wshInP2sh,
     P2shAddressType.p2wpkhInP2sh,
     P2shAddressType.p2pkhInP2sh,
diff --git a/lib/src/provider/models/multisig_script.dart b/lib/src/provider/models/multisig_script.dart
index 3ae38fb..c8b7d93 100644
--- a/lib/src/provider/models/multisig_script.dart
+++ b/lib/src/provider/models/multisig_script.dart
@@ -91,7 +91,7 @@ class MultiSignatureAddress {
       {required BasedUtxoNetwork network,
       required BitcoinAddressType addressType}) {
     switch (addressType) {
-      case SegwitAddresType.p2wsh:
+      case SegwitAddressType.p2wsh:
         return toP2wshAddress(network: network);
       case P2shAddressType.p2wshInP2sh:
         return toP2wshInP2shAddress(network: network);
diff --git a/lib/src/provider/models/utxo_details.dart b/lib/src/provider/models/utxo_details.dart
index 606171e..3d1bece 100644
--- a/lib/src/provider/models/utxo_details.dart
+++ b/lib/src/provider/models/utxo_details.dart
@@ -56,7 +56,7 @@ class UtxoWithAddress {
         utxo: utxo,
         ownerDetails: ownerDetails,
         isCompressed: ownerDetails._publicKey != null && !utxo.isSegwit
-            ? BtcUtils.isCompressedPubKey(ownerDetails._publicKey)
+            ? BtcUtils.isCompressedPubKey(ownerDetails._publicKey!)
             : true);
   }
 
@@ -225,7 +225,7 @@ class BitcoinUtxo {
         token: token,
         vout: vout,
         scriptType: scriptType,
-        isP2tr: scriptType == SegwitAddresType.p2tr,
+        isP2tr: scriptType == SegwitAddressType.p2tr,
         isP2shSegwit: isP2shSegwit,
         isSegwit: isP2shSegwit || scriptType.isSegwit);
   }
diff --git a/lib/src/provider/transaction_builder/transaction_builder.dart b/lib/src/provider/transaction_builder/transaction_builder.dart
index cdc8e0f..ba0afd6 100644
--- a/lib/src/provider/transaction_builder/transaction_builder.dart
+++ b/lib/src/provider/transaction_builder/transaction_builder.dart
@@ -180,7 +180,7 @@ class BitcoinTransactionBuilder implements BasedBitcoinTransacationBuilder {
                 .toScriptPubKey();
           }
           return script;
-        case SegwitAddresType.p2wsh:
+        case SegwitAddressType.p2wsh:
           if (isTaproot) {
             return multiSigAAddr
                 .toP2wshAddress(network: network)
@@ -202,7 +202,7 @@ class BitcoinTransactionBuilder implements BasedBitcoinTransacationBuilder {
     switch (utxo.utxo.scriptType) {
       case PubKeyAddressType.p2pk:
         return senderPub.toRedeemScript(compressed: utxo.isCompressed);
-      case SegwitAddresType.p2wsh:
+      case SegwitAddressType.p2wsh:
         if (isTaproot) {
           return senderPub.toP2wshAddress().toScriptPubKey();
         }
@@ -211,12 +211,12 @@ class BitcoinTransactionBuilder implements BasedBitcoinTransacationBuilder {
         return senderPub
             .toAddress(compressed: utxo.isCompressed)
             .toScriptPubKey();
-      case SegwitAddresType.p2wpkh:
+      case SegwitAddressType.p2wpkh:
         if (isTaproot) {
           return senderPub.toSegwitAddress().toScriptPubKey();
         }
         return senderPub.toAddress().toScriptPubKey();
-      case SegwitAddresType.p2tr:
+      case SegwitAddressType.p2tr:
         return senderPub.toTaprootAddress().toScriptPubKey();
       case P2shAddressType.p2pkhInP2sh:
         if (isTaproot) {
@@ -354,10 +354,10 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
       }
       switch (utx.utxo.scriptType) {
         case P2shAddressType.p2wshInP2sh:
-        case SegwitAddresType.p2wsh:
+        case SegwitAddressType.p2wsh:
           final script = senderPub.toP2wshScript();
           return ['', signedDigest, script.toHex()];
-        case SegwitAddresType.p2wpkh:
+        case SegwitAddressType.p2wpkh:
         case P2shAddressType.p2wpkhInP2sh:
           return [signedDigest, senderPub.toHex()];
         default:
diff --git a/pubspec.yaml b/pubspec.yaml
index 8e8dc90..bb28131 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -12,14 +12,14 @@ topics:
   - dash
   
 environment:
-  sdk: '>=3.3.0 <4.0.0'
+  sdk: '>=2.15.0 <4.0.0'
 
 
 dependencies:
   blockchain_utils: ^3.5.0
   
   # blockchain_utils:
-  #   path: ../../blockchain_utils
+  #   path: ../blockchain_utils
     
 
 dev_dependencies:

From 0cbdfa06a2945b87cc751246274a1a61cbdd730b Mon Sep 17 00:00:00 2001
From: Sandro Simas <sandro.csimas@gmail.com>
Date: Mon, 2 Dec 2024 19:54:04 -0300
Subject: [PATCH 26/62] Support electra protocol main and test net

---
 lib/src/models/network.dart | 37 +++++++++++++++++++++++++++----------
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/lib/src/models/network.dart b/lib/src/models/network.dart
index d8194c6..5ffbbb7 100644
--- a/lib/src/models/network.dart
+++ b/lib/src/models/network.dart
@@ -49,7 +49,8 @@ abstract class BasedUtxoNetwork implements Enumerate {
     BitcoinSVNetwork.mainnet,
     BitcoinSVNetwork.testnet,
     PepeNetwork.mainnet,
-    OmniXepNetwork.mainnet,
+    ElectraProtocolNetwork.mainnet,
+    ElectraProtocolNetwork.testnet,
   ];
 
   static BasedUtxoNetwork fromName(String name) {
@@ -380,6 +381,7 @@ class BitcoinCashNetwork implements BasedUtxoNetwork {
 
   /// Constructor for creating a Bitcoin Cash network with a specific configuration.
   const BitcoinCashNetwork._(this.value, this.conf);
+
   @override
   final String value;
 
@@ -495,18 +497,26 @@ class PepeNetwork implements BasedUtxoNetwork {
   }
 }
 
-/// Class representing a OmniXEP network, implementing the `BasedUtxoNetwork` abstract class.
-class OmniXepNetwork implements BasedUtxoNetwork {
+/// Class representing a Electra Protocol network, implementing the `BasedUtxoNetwork` abstract class.
+class ElectraProtocolNetwork implements BasedUtxoNetwork {
   /// Mainnet configuration with associated `CoinConf`.
-  static const OmniXepNetwork mainnet =
-      OmniXepNetwork._("omniXepMainnet", CoinsConf.omniXepMainNet);
+  static const ElectraProtocolNetwork mainnet = ElectraProtocolNetwork._(
+    "electraProtocolMainnet",
+    CoinsConf.electraProtocolMainNet,
+  );
+
+  /// Testnet configuration with associated `CoinConf`.
+  static const ElectraProtocolNetwork testnet = ElectraProtocolNetwork._(
+    "electraProtocolTestnet",
+    CoinsConf.electraProtocolTestNet,
+  );
 
   /// Overrides the `conf` property from `BasedUtxoNetwork` with the associated `CoinConf`.
   @override
   final CoinConf conf;
 
   /// Constructor for creating a OmniXEP network with a specific configuration.
-  const OmniXepNetwork._(this.value, this.conf);
+  const ElectraProtocolNetwork._(this.value, this.conf);
 
   @override
   final String value;
@@ -529,19 +539,26 @@ class OmniXepNetwork implements BasedUtxoNetwork {
 
   /// Checks if the current network is the mainnet.
   @override
-  bool get isMainnet => true;
+  bool get isMainnet => this == ElectraProtocolNetwork.mainnet;
 
   @override
   final List<BitcoinAddressType> supportedAddress = const [
-    SegwitAddresType.p2wpkh,
+    P2pkhAddressType.p2pkh,
     P2shAddressType.p2wpkhInP2sh,
+    SegwitAddresType.p2wpkh,
   ];
 
   @override
   List<BipCoins> get coins {
     if (isMainnet) {
-      return [Bip49Coins.omniXep];
+      return [
+        Bip44Coins.electraProtocol,
+        Bip49Coins.electraProtocol,
+      ];
     }
-    return [];
+    return [
+      Bip44Coins.electraProtocolTestnet,
+      Bip49Coins.electraProtocolTestnet,
+    ];
   }
 }

From 147ed34f4bba8e76b2e485aa7c121805955601a7 Mon Sep 17 00:00:00 2001
From: Sandro Simas <sandro.csimas@gmail.com>
Date: Tue, 3 Dec 2024 09:43:14 -0300
Subject: [PATCH 27/62] Adding more supported addresses to XEP network

---
 lib/src/models/network.dart | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/src/models/network.dart b/lib/src/models/network.dart
index 5ffbbb7..4250794 100644
--- a/lib/src/models/network.dart
+++ b/lib/src/models/network.dart
@@ -543,9 +543,14 @@ class ElectraProtocolNetwork implements BasedUtxoNetwork {
 
   @override
   final List<BitcoinAddressType> supportedAddress = const [
+    PubKeyAddressType.p2pk,
     P2pkhAddressType.p2pkh,
-    P2shAddressType.p2wpkhInP2sh,
     SegwitAddresType.p2wpkh,
+    SegwitAddresType.p2wsh,
+    P2shAddressType.p2pkInP2sh,
+    P2shAddressType.p2pkhInP2sh,
+    P2shAddressType.p2wpkhInP2sh,
+    P2shAddressType.p2wshInP2sh,
   ];
 
   @override
@@ -554,11 +559,13 @@ class ElectraProtocolNetwork implements BasedUtxoNetwork {
       return [
         Bip44Coins.electraProtocol,
         Bip49Coins.electraProtocol,
+        Bip84Coins.electraProtocol,
       ];
     }
     return [
       Bip44Coins.electraProtocolTestnet,
       Bip49Coins.electraProtocolTestnet,
+      Bip84Coins.electraProtocolTestnet,
     ];
   }
 }

From 1e0b51ddeef58dab5cad5eec7e20c1e4e11cae57 Mon Sep 17 00:00:00 2001
From: Mohsen <mrhaydari.t@gmail.com>
Date: Wed, 4 Dec 2024 20:11:46 +0330
Subject: [PATCH 28/62] 4.9.2

* Improved serialization process for large transaction scripts.
* Added support for the Electra network.
* Update dependencies
* Resolved issue with transaction deserialization (unsigned tx)
---
 CHANGELOG.md                                 |  3 +-
 example/pubspec.lock                         |  7 +-
 example/pubspec.yaml                         |  6 +-
 lib/src/bitcoin/address/network_address.dart | 19 +++++-
 lib/src/models/network.dart                  | 71 +++++++++++++++++++-
 lib/src/provider/models/multisig_script.dart |  2 +-
 lib/src/provider/models/utxo_details.dart    |  5 +-
 lib/src/utils/btc_utils.dart                 |  2 +-
 pubspec.yaml                                 |  2 +-
 test/xep_address_test.dart                   | 23 +++++++
 10 files changed, 126 insertions(+), 14 deletions(-)
 create mode 100644 test/xep_address_test.dart

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dc0f857..5eb128c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 ## 4.9.2
-
+* Improved serialization process for large transaction scripts.
+* Added support for the Electra network.
 * Update dependencies
 * Resolved issue with transaction deserialization (unsigned tx)
 
diff --git a/example/pubspec.lock b/example/pubspec.lock
index d4e9c83..e30afb5 100644
--- a/example/pubspec.lock
+++ b/example/pubspec.lock
@@ -19,9 +19,10 @@ packages:
   blockchain_utils:
     dependency: "direct main"
     description:
-      path: "../../blockchain_utils"
-      relative: true
-    source: path
+      name: blockchain_utils
+      sha256: "1e4f30b98d92f7ccf2eda009a23b53871a1c9b8b6dfa00bb1eb17ec00ae5eeeb"
+      url: "https://pub.dev"
+    source: hosted
     version: "3.6.0"
   boolean_selector:
     dependency: transitive
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
index 790529b..0997c19 100644
--- a/example/pubspec.yaml
+++ b/example/pubspec.yaml
@@ -37,9 +37,9 @@ dependencies:
   cupertino_icons: ^1.0.2
   bitcoin_base: 
     path: ../
-  blockchain_utils:
-    path: ../../blockchain_utils
-  # blockchain_utils: ^3.5.0
+  # blockchain_utils:
+  #   path: ../../blockchain_utils
+  blockchain_utils: ^3.6.0
   http: ^1.2.0
 
 dev_dependencies:
diff --git a/lib/src/bitcoin/address/network_address.dart b/lib/src/bitcoin/address/network_address.dart
index 4f0242d..56132e2 100644
--- a/lib/src/bitcoin/address/network_address.dart
+++ b/lib/src/bitcoin/address/network_address.dart
@@ -163,4 +163,21 @@ class BitcoinSVAddress extends BitcoinNetworkAddress<BitcoinSVNetwork> {
   }
 }
 
-// 
+/// A concrete implementation of [BitcoinNetworkAddress] for Electra protocol network.
+class ElectraProtocolAddress
+    extends BitcoinNetworkAddress<ElectraProtocolNetwork> {
+  const ElectraProtocolAddress._(BitcoinBaseAddress baseAddress, String address,
+      ElectraProtocolNetwork network)
+      : super._(address: address, baseAddress: baseAddress, network: network);
+  factory ElectraProtocolAddress(String address,
+      {ElectraProtocolNetwork network = ElectraProtocolNetwork.mainnet}) {
+    return ElectraProtocolAddress._(
+        _BitcoinAddressUtils.decodeAddress(address, network), address, network);
+  }
+  factory ElectraProtocolAddress.fromBaseAddress(BitcoinBaseAddress address,
+      {ElectraProtocolNetwork network = ElectraProtocolNetwork.mainnet}) {
+    final baseAddress = _BitcoinAddressUtils.validateAddress(address, network);
+    return ElectraProtocolAddress._(
+        baseAddress, baseAddress.toAddress(network), network);
+  }
+}
diff --git a/lib/src/models/network.dart b/lib/src/models/network.dart
index cb17f2a..9e20447 100644
--- a/lib/src/models/network.dart
+++ b/lib/src/models/network.dart
@@ -1,8 +1,6 @@
 import 'package:bitcoin_base/bitcoin_base.dart';
 import 'package:bitcoin_base/src/exception/exception.dart';
 import 'package:bitcoin_base/src/utils/enumerate.dart';
-import 'package:blockchain_utils/bip/coin_conf/coin_conf.dart';
-import 'package:blockchain_utils/bip/coin_conf/coins_conf.dart';
 import 'package:blockchain_utils/blockchain_utils.dart';
 
 /// Abstract class representing a base for UTXO-based cryptocurrency networks.
@@ -493,3 +491,72 @@ class PepeNetwork implements BasedUtxoNetwork {
     return [Bip44Coins.pepecoinTestnet, Bip49Coins.pepecoinTestnet];
   }
 }
+
+/// Class representing a Electra Protocol network, implementing the `BasedUtxoNetwork` abstract class.
+class ElectraProtocolNetwork implements BasedUtxoNetwork {
+  /// Mainnet configuration with associated `CoinConf`.
+  static const ElectraProtocolNetwork mainnet = ElectraProtocolNetwork._(
+      "electraProtocolMainnet", CoinsConf.electraProtocolMainNet);
+
+  /// Testnet configuration with associated `CoinConf`.
+  static const ElectraProtocolNetwork testnet = ElectraProtocolNetwork._(
+      "electraProtocolTestnet", CoinsConf.electraProtocolTestNet);
+
+  /// Overrides the `conf` property from `BasedUtxoNetwork` with the associated `CoinConf`.
+  @override
+  final CoinConf conf;
+  @override
+  final String value;
+
+  /// Constructor for creating a Litecoin network with a specific configuration.
+  const ElectraProtocolNetwork._(this.value, this.conf);
+
+  /// Retrieves the Wallet Import Format (WIF) version bytes from the associated `CoinConf`.
+  @override
+  List<int> get wifNetVer => conf.params.wifNetVer!;
+
+  /// Retrieves the Pay-to-Public-Key-Hash (P2PKH) version bytes from the associated `CoinConf`.
+  @override
+  List<int> get p2pkhNetVer => conf.params.p2pkhNetVer!;
+
+  /// Retrieves the Pay-to-Script-Hash (P2SH) version bytes from the associated `CoinConf`.
+  @override
+  List<int> get p2shNetVer => conf.params.p2shNetVer!;
+
+  /// Retrieves the Human-Readable Part (HRP) for Pay-to-Witness-Public-Key-Hash (P2WPKH) addresses
+  /// from the associated `CoinConf`.
+  @override
+  String get p2wpkhHrp => conf.params.p2wpkhHrp!;
+
+  /// Checks if the current network is the mainnet.
+  @override
+  bool get isMainnet => this == ElectraProtocolNetwork.mainnet;
+
+  @override
+  final List<BitcoinAddressType> supportedAddress = const [
+    P2pkhAddressType.p2pkh,
+    SegwitAddressType.p2wpkh,
+    PubKeyAddressType.p2pk,
+    SegwitAddressType.p2wsh,
+    P2shAddressType.p2wshInP2sh,
+    P2shAddressType.p2wpkhInP2sh,
+    P2shAddressType.p2pkhInP2sh,
+    P2shAddressType.p2pkInP2sh,
+  ];
+
+  @override
+  List<BipCoins> get coins {
+    if (isMainnet) {
+      return [
+        Bip44Coins.electraProtocol,
+        Bip49Coins.electraProtocol,
+        Bip84Coins.electraProtocol
+      ];
+    }
+    return [
+      Bip44Coins.electraProtocolTestnet,
+      Bip49Coins.electraProtocolTestnet,
+      Bip84Coins.electraProtocolTestnet
+    ];
+  }
+}
diff --git a/lib/src/provider/models/multisig_script.dart b/lib/src/provider/models/multisig_script.dart
index c8b7d93..28a05c3 100644
--- a/lib/src/provider/models/multisig_script.dart
+++ b/lib/src/provider/models/multisig_script.dart
@@ -23,7 +23,7 @@ class MultiSignatureSigner {
       {required String publicKey, required int weight}) {
     ECPublic.fromHex(publicKey);
     return MultiSignatureSigner._(
-        publicKey, weight, BtcUtils.isCompressedPubKey(publicKey));
+        publicKey, weight, BtcUtils.hasCompressedPubKeyLength(publicKey));
   }
 }
 
diff --git a/lib/src/provider/models/utxo_details.dart b/lib/src/provider/models/utxo_details.dart
index 3d1bece..ea987b6 100644
--- a/lib/src/provider/models/utxo_details.dart
+++ b/lib/src/provider/models/utxo_details.dart
@@ -21,6 +21,9 @@ class UtxoAddressDetails {
     required this.address,
   })  : _multiSigAddress = null,
         _publicKey = publicKey;
+
+  /// The public key format (compressed or uncompressed) is crucial for non-SegWit addresses.
+  /// If your address is non-SegWit, ensure you use the correct public key format.
   factory UtxoAddressDetails(
       {required String publicKey, required BitcoinBaseAddress address}) {
     ECPublic.fromHex(publicKey);
@@ -56,7 +59,7 @@ class UtxoWithAddress {
         utxo: utxo,
         ownerDetails: ownerDetails,
         isCompressed: ownerDetails._publicKey != null && !utxo.isSegwit
-            ? BtcUtils.isCompressedPubKey(ownerDetails._publicKey!)
+            ? BtcUtils.hasCompressedPubKeyLength(ownerDetails._publicKey!)
             : true);
   }
 
diff --git a/lib/src/utils/btc_utils.dart b/lib/src/utils/btc_utils.dart
index 39aa0b7..2d36107 100644
--- a/lib/src/utils/btc_utils.dart
+++ b/lib/src/utils/btc_utils.dart
@@ -2,7 +2,7 @@ import 'package:blockchain_utils/utils/numbers/rational/big_rational.dart';
 import 'package:blockchain_utils/utils/string/string.dart';
 
 class BtcUtils {
-  static bool isCompressedPubKey(String publicKey) {
+  static bool hasCompressedPubKeyLength(String publicKey) {
     return StringUtils.strip0x(publicKey.toLowerCase()).length == 66;
   }
 
diff --git a/pubspec.yaml b/pubspec.yaml
index bb28131..e254e79 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -16,7 +16,7 @@ environment:
 
 
 dependencies:
-  blockchain_utils: ^3.5.0
+  blockchain_utils: ^3.6.0
   
   # blockchain_utils:
   #   path: ../blockchain_utils
diff --git a/test/xep_address_test.dart b/test/xep_address_test.dart
new file mode 100644
index 0000000..f4628b3
--- /dev/null
+++ b/test/xep_address_test.dart
@@ -0,0 +1,23 @@
+import 'package:bitcoin_base/bitcoin_base.dart';
+import 'package:test/test.dart';
+
+void main() {
+  _test();
+}
+
+void _test() {
+  test("xep address parsing", () {
+    ElectraProtocolAddress address =
+        ElectraProtocolAddress("ep1qyv4uspwsphhvj5keth02dk37pd0gqzmt5tw973");
+    expect(address.type, SegwitAddressType.p2wpkh);
+    address =
+        ElectraProtocolAddress("ep1q2nxmsj9h9s6ps4tp5fce2vclm8uvkn00dtrnu7");
+    expect(address.type, SegwitAddressType.p2wpkh);
+    address = ElectraProtocolAddress("x8UFjR4n2h6hgFRJDdAna5nvN71qfsDmns");
+    expect(address.type, P2shAddressType.p2pkInP2sh);
+    address = ElectraProtocolAddress("xWzvSGpYUPucJaodadUh3yzEmLJGvHUYsP");
+    expect(address.type, P2shAddressType.p2pkInP2sh);
+    address = ElectraProtocolAddress("xWzvSGpYUPucJaodadUh3yzEmLJGvHUYsP");
+    expect(address.type, P2shAddressType.p2pkInP2sh);
+  });
+}

From 8f13729da247e9e0f80cad4cdc91b14713b2ec18 Mon Sep 17 00:00:00 2001
From: Mohsen <mrhaydari.t@gmail.com>
Date: Wed, 4 Dec 2024 20:14:05 +0330
Subject: [PATCH 29/62] Update network.dart

---
 lib/src/models/network.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/models/network.dart b/lib/src/models/network.dart
index 9e20447..8a1fda9 100644
--- a/lib/src/models/network.dart
+++ b/lib/src/models/network.dart
@@ -508,7 +508,7 @@ class ElectraProtocolNetwork implements BasedUtxoNetwork {
   @override
   final String value;
 
-  /// Constructor for creating a Litecoin network with a specific configuration.
+  /// Constructor for creating a Electra Protocol network with a specific configuration.
   const ElectraProtocolNetwork._(this.value, this.conf);
 
   /// Retrieves the Wallet Import Format (WIF) version bytes from the associated `CoinConf`.

From e8504066f4b8ec1c28e44cda7b5d66e1c00e910c Mon Sep 17 00:00:00 2001
From: Mohsen <mrhaydari.t@gmail.com>
Date: Wed, 4 Dec 2024 20:18:49 +0330
Subject: [PATCH 30/62] V4.9.3

* Improved serialization process for large transaction scripts.
* Added support for the Electra network.
---
 CHANGELOG.md         | 4 +++-
 example/pubspec.lock | 2 +-
 pubspec.yaml         | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5eb128c..588af03 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,8 @@
-## 4.9.2
+## 4.9.3
 * Improved serialization process for large transaction scripts.
 * Added support for the Electra network.
+
+## 4.9.2
 * Update dependencies
 * Resolved issue with transaction deserialization (unsigned tx)
 
diff --git a/example/pubspec.lock b/example/pubspec.lock
index e30afb5..6058c55 100644
--- a/example/pubspec.lock
+++ b/example/pubspec.lock
@@ -15,7 +15,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "4.9.2"
+    version: "4.9.3"
   blockchain_utils:
     dependency: "direct main"
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index e254e79..924ddc7 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: bitcoin_base
 description: A versatile library for Bitcoin, Dogecoin, Litecoin, Dash, BSV, and BCH. Supports P2PKH, P2SH, P2WPKH, P2WSH, P2TR, with advanced creation, signing, and spending capabilities.
-version: 4.9.2
+version: 4.9.3
 homepage: "https://github.com/mrtnetwork/bitcoin_base"
 repository: "https://github.com/mrtnetwork/bitcoin_base"
 Author: mrhaydari.t@gmail.com

From 76deefa8e996e0df54ff6ae55ab30ccedeb9ec57 Mon Sep 17 00:00:00 2001
From: Mohsen <mrhaydari.t@gmail.com>
Date: Wed, 4 Dec 2024 21:58:15 +0330
Subject: [PATCH 31/62] update CHANGELOG

---
 CHANGELOG.md         | 5 ++++-
 example/pubspec.lock | 2 +-
 pubspec.yaml         | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 588af03..abffeb3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,9 @@
-## 4.9.3
+## 4.9.4
 * Improved serialization process for large transaction scripts.
 * Added support for the Electra network.
+* Create and spent from uncomprossed public key format.
+* Important Notice: This is the final version supporting Dart v2. The next release will require Dart v3.3 or higher.
+
 
 ## 4.9.2
 * Update dependencies
diff --git a/example/pubspec.lock b/example/pubspec.lock
index 6058c55..1ebf47f 100644
--- a/example/pubspec.lock
+++ b/example/pubspec.lock
@@ -15,7 +15,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "4.9.3"
+    version: "4.9.4"
   blockchain_utils:
     dependency: "direct main"
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 924ddc7..723b8bc 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: bitcoin_base
 description: A versatile library for Bitcoin, Dogecoin, Litecoin, Dash, BSV, and BCH. Supports P2PKH, P2SH, P2WPKH, P2WSH, P2TR, with advanced creation, signing, and spending capabilities.
-version: 4.9.3
+version: 4.9.4
 homepage: "https://github.com/mrtnetwork/bitcoin_base"
 repository: "https://github.com/mrtnetwork/bitcoin_base"
 Author: mrhaydari.t@gmail.com

From 5282dee74545e39a04d87326a83073c2a0e0771f Mon Sep 17 00:00:00 2001
From: Rafael Saes <git@rafael.saes.dev>
Date: Fri, 20 Dec 2024 20:17:51 -0300
Subject: [PATCH 32/62] feat: api config, misc

---
 .../electrum/electrum_ssl_service.dart        | 136 ------------------
 .../electrum/electrum_tcp_service.dart        | 135 -----------------
 .../electrum/electrum_websocket_service.dart  |  86 -----------
 .../provider/api_provider/api_provider.dart   |   9 ++
 .../api_provider/electrum_api_provider.dart   |   1 +
 .../electrum_methods/methods/broad_cast.dart  |   4 +-
 lib/src/provider/models/config.dart           |  67 +++++----
 .../electrum/electrum_ssl_service.dart        |  43 +++---
 8 files changed, 76 insertions(+), 405 deletions(-)
 delete mode 100644 example/lib/services_examples/electrum/electrum_ssl_service.dart
 delete mode 100644 example/lib/services_examples/electrum/electrum_tcp_service.dart
 delete mode 100644 example/lib/services_examples/electrum/electrum_websocket_service.dart

diff --git a/example/lib/services_examples/electrum/electrum_ssl_service.dart b/example/lib/services_examples/electrum/electrum_ssl_service.dart
deleted file mode 100644
index 1313aa7..0000000
--- a/example/lib/services_examples/electrum/electrum_ssl_service.dart
+++ /dev/null
@@ -1,136 +0,0 @@
-/// Simple example how to send request to electurm  with tcp
-
-import 'dart:async';
-import 'dart:convert';
-import 'dart:io';
-import 'package:bitcoin_base/bitcoin_base.dart';
-import 'package:rxdart/rxdart.dart';
-
-class SocketTask {
-  SocketTask({required this.isSubscription, this.completer, this.subject});
-
-  final Completer<dynamic>? completer;
-  final BehaviorSubject<dynamic>? subject;
-  final bool isSubscription;
-}
-
-class ElectrumTCPService implements BitcoinBaseElectrumRPCService {
-  ElectrumTCPService._(
-    this.url,
-    SecureSocket channel, {
-    this.defaultRequestTimeOut = const Duration(seconds: 30),
-  }) : _socket = channel {
-    _subscription = _socket!.listen(_onMessage, onError: _onClose, onDone: _onDone);
-  }
-  SecureSocket? _socket;
-  StreamSubscription<List<int>>? _subscription;
-  final Duration defaultRequestTimeOut;
-
-  final Map<int, SocketTask> _tasks = {};
-
-  bool _isDisconnected = false;
-  @override
-  bool get isConnected => !_isDisconnected;
-
-  @override
-  final String url;
-
-  void add(List<int> params) {
-    if (_isDisconnected) {
-      throw StateError("socket has been disconnected");
-    }
-    _socket?.add(params);
-  }
-
-  void _onClose(Object? error) {
-    _isDisconnected = true;
-
-    _socket = null;
-    _subscription?.cancel().catchError((e) {});
-    _subscription = null;
-  }
-
-  void _onDone() {
-    _onClose(null);
-  }
-
-  @override
-  void disconnect() {
-    _onClose(null);
-  }
-
-  static Future<ElectrumTCPService> connect(
-    String url, {
-    Iterable<String>? protocols,
-    Duration defaultRequestTimeOut = const Duration(seconds: 30),
-    final Duration connectionTimeOut = const Duration(seconds: 30),
-  }) async {
-    final parts = url.split(":");
-    final channel =
-        await SecureSocket.connect(parts[0], int.parse(parts[1])).timeout(connectionTimeOut);
-
-    return ElectrumTCPService._(url, channel, defaultRequestTimeOut: defaultRequestTimeOut);
-  }
-
-  void _onMessage(List<int> event) {
-    final Map<String, dynamic> decode = json.decode(utf8.decode(event));
-    if (decode.containsKey("id")) {
-      _finish(decode["id"]!.toString(), decode);
-      final int id = int.parse(decode["id"]!.toString());
-      final request = _tasks.remove(id);
-      request?.completer?.complete(decode);
-    }
-  }
-
-  void _finish(String id, Map<String, dynamic> decode) {
-    final int id = int.parse(decode["id"]!.toString());
-    if (_tasks[id] == null) {
-      return;
-    }
-
-    if (!(_tasks[id]?.completer?.isCompleted ?? false)) {
-      _tasks[id]?.completer!.complete(decode);
-    }
-
-    final isSubscription = _tasks[id]?.isSubscription ?? false;
-    if (!isSubscription) {
-      _tasks.remove(id);
-    } else {
-      _tasks[id]?.subject?.add(decode);
-    }
-  }
-
-  void _registerSubscription(int id, BehaviorSubject<dynamic> subject) =>
-      _tasks[id] = SocketTask(subject: subject, isSubscription: true);
-
-  @override
-  AsyncBehaviorSubject<T>? subscribe<T>(ElectrumRequestDetails params) {
-    final subscription = AsyncBehaviorSubject<T>(params.params);
-
-    try {
-      _registerSubscription(params.id, subscription.subscription);
-      add(params.toTCPParams());
-
-      return subscription;
-    } catch (e) {
-      return null;
-    }
-  }
-
-  void _registerTask(int id, Completer<dynamic> completer) =>
-      _tasks[id] = SocketTask(completer: completer, isSubscription: false);
-
-  @override
-  Future<Map<String, dynamic>> call(ElectrumRequestDetails params, [Duration? timeout]) async {
-    final completer = AsyncRequestCompleter(params.params);
-
-    try {
-      _registerTask(params.id, completer.completer);
-      add(params.toTCPParams());
-      final result = await completer.completer.future.timeout(timeout ?? defaultRequestTimeOut);
-      return result;
-    } finally {
-      _tasks.remove(params.id);
-    }
-  }
-}
diff --git a/example/lib/services_examples/electrum/electrum_tcp_service.dart b/example/lib/services_examples/electrum/electrum_tcp_service.dart
deleted file mode 100644
index efc2506..0000000
--- a/example/lib/services_examples/electrum/electrum_tcp_service.dart
+++ /dev/null
@@ -1,135 +0,0 @@
-/// Simple example how to send request to electurm  with tcp
-
-import 'dart:async';
-import 'dart:convert';
-import 'dart:io';
-import 'package:bitcoin_base/bitcoin_base.dart';
-import 'package:rxdart/rxdart.dart';
-
-class SocketTask {
-  SocketTask({required this.isSubscription, this.completer, this.subject});
-
-  final Completer<dynamic>? completer;
-  final BehaviorSubject<dynamic>? subject;
-  final bool isSubscription;
-}
-
-class ElectrumTCPService implements BitcoinBaseElectrumRPCService {
-  ElectrumTCPService._(
-    this.url,
-    Socket channel, {
-    this.defaultRequestTimeOut = const Duration(seconds: 30),
-  }) : _socket = channel {
-    _subscription = _socket!.listen(_onMessage, onError: _onClose, onDone: _onDone);
-  }
-  Socket? _socket;
-  StreamSubscription<List<int>>? _subscription;
-  final Duration defaultRequestTimeOut;
-
-  final Map<int, SocketTask> _tasks = {};
-
-  bool _isDisconnected = false;
-  @override
-  bool get isConnected => !_isDisconnected;
-
-  @override
-  final String url;
-
-  void add(List<int> params) {
-    if (_isDisconnected) {
-      throw StateError("socket has been disconnected");
-    }
-    _socket?.add(params);
-  }
-
-  void _onClose(Object? error) {
-    _isDisconnected = true;
-
-    _socket = null;
-    _subscription?.cancel().catchError((e) {});
-    _subscription = null;
-  }
-
-  void _onDone() {
-    _onClose(null);
-  }
-
-  @override
-  void disconnect() {
-    _onClose(null);
-  }
-
-  static Future<ElectrumTCPService> connect(
-    String url, {
-    Iterable<String>? protocols,
-    Duration defaultRequestTimeOut = const Duration(seconds: 30),
-    final Duration connectionTimeOut = const Duration(seconds: 30),
-  }) async {
-    final parts = url.split(":");
-    final channel = await Socket.connect(parts[0], int.parse(parts[1])).timeout(connectionTimeOut);
-
-    return ElectrumTCPService._(url, channel, defaultRequestTimeOut: defaultRequestTimeOut);
-  }
-
-  void _onMessage(List<int> event) {
-    final Map<String, dynamic> decode = json.decode(utf8.decode(event));
-    if (decode.containsKey("id")) {
-      _finish(decode["id"]!.toString(), decode);
-      final int id = int.parse(decode["id"]!.toString());
-      final request = _tasks.remove(id);
-      request?.completer?.complete(decode);
-    }
-  }
-
-  void _finish(String id, Map<String, dynamic> decode) {
-    final int id = int.parse(decode["id"]!.toString());
-    if (_tasks[id] == null) {
-      return;
-    }
-
-    if (!(_tasks[id]?.completer?.isCompleted ?? false)) {
-      _tasks[id]?.completer!.complete(decode);
-    }
-
-    final isSubscription = _tasks[id]?.isSubscription ?? false;
-    if (!isSubscription) {
-      _tasks.remove(id);
-    } else {
-      _tasks[id]?.subject?.add(decode);
-    }
-  }
-
-  void _registerSubscription(int id, BehaviorSubject<dynamic> subject) =>
-      _tasks[id] = SocketTask(subject: subject, isSubscription: true);
-
-  @override
-  AsyncBehaviorSubject<T>? subscribe<T>(ElectrumRequestDetails params) {
-    final subscription = AsyncBehaviorSubject<T>(params.params);
-
-    try {
-      _registerSubscription(params.id, subscription.subscription);
-      add(params.toTCPParams());
-
-      return subscription;
-    } catch (e) {
-      return null;
-    }
-  }
-
-  void _registerTask(int id, Completer<dynamic> completer) =>
-      _tasks[id] = SocketTask(completer: completer, isSubscription: false);
-
-  @override
-  Future<Map<String, dynamic>> call(ElectrumRequestDetails params, [Duration? timeout]) async {
-    final completer = AsyncRequestCompleter(params.params);
-
-    try {
-      _registerTask(params.id, completer.completer);
-      add(params.toTCPParams());
-      final result = await completer.completer.future.timeout(timeout ?? defaultRequestTimeOut);
-      return result;
-    } finally {
-      _tasks.remove(params.id);
-    }
-  }
-}
diff --git a/example/lib/services_examples/electrum/electrum_websocket_service.dart b/example/lib/services_examples/electrum/electrum_websocket_service.dart
deleted file mode 100644
index 2ec9bb7..0000000
--- a/example/lib/services_examples/electrum/electrum_websocket_service.dart
+++ /dev/null
@@ -1,86 +0,0 @@
-/// Simple example how to send request to electurm  with websocket
-import 'dart:async';
-import 'dart:convert';
-import 'package:bitcoin_base/bitcoin_base.dart';
-import 'package:example/services_examples/cross_platform_websocket/core.dart';
-
-class ElectrumWebSocketService implements BitcoinBaseElectrumRPCService {
-  ElectrumWebSocketService._(
-    this.url,
-    WebSocketCore channel, {
-    this.defaultRequestTimeOut = const Duration(seconds: 30),
-  }) : _socket = channel {
-    _subscription =
-        channel.stream.cast<String>().listen(_onMessage, onError: _onClose, onDone: _onDone);
-  }
-  WebSocketCore? _socket;
-  StreamSubscription<String>? _subscription;
-  final Duration defaultRequestTimeOut;
-
-  Map<int, AsyncRequestCompleter> requests = {};
-  bool _isDisconnected = false;
-
-  bool get isConnected => !_isDisconnected;
-
-  @override
-  final String url;
-
-  void add(List<int> params) {
-    if (_isDisconnected) {
-      throw StateError("socket has been disconnected");
-    }
-    _socket?.sink(params);
-  }
-
-  void _onClose(Object? error) {
-    _isDisconnected = true;
-
-    _socket?.close();
-    _socket = null;
-    _subscription?.cancel().catchError((e) {});
-    _subscription = null;
-  }
-
-  void _onDone() {
-    _onClose(null);
-  }
-
-  @override
-  void disconnect() {
-    _onClose(null);
-  }
-
-  static Future<ElectrumWebSocketService> connect(
-    String url, {
-    Iterable<String>? protocols,
-    Duration defaultRequestTimeOut = const Duration(seconds: 30),
-    final Duration connectionTimeOut = const Duration(seconds: 30),
-  }) async {
-    final channel = await WebSocketCore.connect(url, protocols: protocols?.toList());
-
-    return ElectrumWebSocketService._(url, channel, defaultRequestTimeOut: defaultRequestTimeOut);
-  }
-
-  void _onMessage(String event) {
-    final Map<String, dynamic> decode = json.decode(event);
-    if (decode.containsKey("id")) {
-      final int id = int.parse(decode["id"]!.toString());
-      final request = requests.remove(id);
-      request?.completer.complete(decode);
-    }
-  }
-
-  @override
-  Future<Map<String, dynamic>> call(ElectrumRequestDetails params, [Duration? timeout]) async {
-    final AsyncRequestCompleter compeleter = AsyncRequestCompleter(params.params);
-
-    try {
-      requests[params.id] = compeleter;
-      add(params.toWebSocketParams());
-      final result = await compeleter.completer.future.timeout(timeout ?? defaultRequestTimeOut);
-      return result;
-    } finally {
-      requests.remove(params.id);
-    }
-  }
-}
diff --git a/lib/src/provider/api_provider/api_provider.dart b/lib/src/provider/api_provider/api_provider.dart
index 81a09ac..aeaed79 100644
--- a/lib/src/provider/api_provider/api_provider.dart
+++ b/lib/src/provider/api_provider/api_provider.dart
@@ -133,6 +133,15 @@ class ApiProvider {
     }
   }
 
+  Future<Map<String, dynamic>> getBlock(
+    String blockHash, {
+    String Function(String)? tokenize,
+  }) async {
+    final apiUrl = api.getBlockUrl(blockHash);
+    final url = tokenize?.call(apiUrl) ?? apiUrl;
+    return await _getRequest<Map<String, dynamic>>(url);
+  }
+
   Future<String> getBlockHeight(int height) async {
     final url = api.getBlockHeight(height);
     final response = await _getRequest<String>(url);
diff --git a/lib/src/provider/api_provider/electrum_api_provider.dart b/lib/src/provider/api_provider/electrum_api_provider.dart
index c9d59cf..f3ff49d 100644
--- a/lib/src/provider/api_provider/electrum_api_provider.dart
+++ b/lib/src/provider/api_provider/electrum_api_provider.dart
@@ -15,6 +15,7 @@ class ElectrumApiProvider {
   final BitcoinBaseElectrumRPCService rpc;
   ElectrumApiProvider._(this.rpc);
   int _id = 0;
+  int get id => _id;
   Timer? _aliveTimer;
 
   static Future<ElectrumApiProvider> connect(Future<BitcoinBaseElectrumRPCService> rpc) async {
diff --git a/lib/src/provider/electrum_methods/methods/broad_cast.dart b/lib/src/provider/electrum_methods/methods/broad_cast.dart
index 1dfdc1c..11ae936 100644
--- a/lib/src/provider/electrum_methods/methods/broad_cast.dart
+++ b/lib/src/provider/electrum_methods/methods/broad_cast.dart
@@ -3,7 +3,7 @@ import 'package:bitcoin_base/src/provider/service/electrum/params.dart';
 
 /// Broadcast a transaction to the network.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumBroadCastTransaction extends ElectrumRequest<String, String> {
+class ElectrumBroadCastTransaction extends ElectrumRequest<String?, String?> {
   ElectrumBroadCastTransaction({required this.transactionRaw});
 
   /// The raw transaction as a hexadecimal string.
@@ -20,7 +20,7 @@ class ElectrumBroadCastTransaction extends ElectrumRequest<String, String> {
 
   /// The transaction hash as a hexadecimal string.
   @override
-  String onResponse(result) {
+  String? onResponse(result) {
     return result;
   }
 }
diff --git a/lib/src/provider/models/config.dart b/lib/src/provider/models/config.dart
index 444098e..2920d06 100644
--- a/lib/src/provider/models/config.dart
+++ b/lib/src/provider/models/config.dart
@@ -5,6 +5,18 @@ import 'package:bitcoin_base/src/provider/constant/constant.dart';
 enum APIType { mempool, blockCypher }
 
 class APIConfig {
+  APIConfig({
+    required this.url,
+    required this.feeRate,
+    required this.transaction,
+    required this.transactions,
+    required this.sendTransaction,
+    required this.apiType,
+    required this.network,
+    required this.blockHeight,
+    this.block,
+  });
+
   final String url;
   final String feeRate;
   final String transaction;
@@ -13,6 +25,7 @@ class APIConfig {
   final String blockHeight;
   final APIType apiType;
   final BasedUtxoNetwork network;
+  final String? block;
 
   factory APIConfig.selectApi(APIType apiType, BasedUtxoNetwork network) {
     switch (apiType) {
@@ -37,6 +50,15 @@ class APIConfig {
     return baseUrl.replaceAll("###", transactionId);
   }
 
+  String getBlockUrl(String transactionId) {
+    if (block == null) {
+      throw const BitcoinBasePluginException("block url is not available");
+    }
+
+    String baseUrl = block!;
+    return baseUrl.replaceAll("###", transactionId);
+  }
+
   String getTransactionsUrl(String address) {
     String baseUrl = transactions;
     return baseUrl.replaceAll("###", address);
@@ -71,14 +93,15 @@ class APIConfig {
     }
 
     return APIConfig(
-        url: "$baseUrl/addrs/###/?unspentOnly=true&includeScript=true&limit=2000",
-        feeRate: baseUrl,
-        transaction: "$baseUrl/txs/###",
-        sendTransaction: "$baseUrl/txs/push",
-        apiType: APIType.blockCypher,
-        transactions: "$baseUrl/addrs/###/full?limit=200",
-        network: network,
-        blockHeight: "$baseUrl/blocks/###");
+      url: "$baseUrl/addrs/###/?unspentOnly=true&includeScript=true&limit=2000",
+      feeRate: baseUrl,
+      transaction: "$baseUrl/txs/###",
+      sendTransaction: "$baseUrl/txs/push",
+      apiType: APIType.blockCypher,
+      transactions: "$baseUrl/addrs/###/full?limit=200",
+      network: network,
+      blockHeight: "$baseUrl/blocks/###",
+    );
   }
 
   factory APIConfig.mempool(BasedUtxoNetwork network, [String? baseUrl]) {
@@ -97,23 +120,15 @@ class APIConfig {
     }
 
     return APIConfig(
-        url: "$baseUrl/address/###/utxo",
-        feeRate: "$baseUrl/v1/fees/recommended",
-        transaction: "$baseUrl/tx/###",
-        sendTransaction: "$baseUrl/tx",
-        apiType: APIType.mempool,
-        transactions: "$baseUrl/address/###/txs",
-        network: network,
-        blockHeight: "$baseUrl/block-height/###");
+      url: "$baseUrl/address/###/utxo",
+      feeRate: "$baseUrl/fees/recommended",
+      transaction: "$baseUrl/tx/###",
+      sendTransaction: "$baseUrl/tx",
+      apiType: APIType.mempool,
+      transactions: "$baseUrl/address/###/txs",
+      network: network,
+      blockHeight: "$baseUrl/block-height/###",
+      block: "$baseUrl/block/###",
+    );
   }
-
-  APIConfig(
-      {required this.url,
-      required this.feeRate,
-      required this.transaction,
-      required this.transactions,
-      required this.sendTransaction,
-      required this.apiType,
-      required this.network,
-      required this.blockHeight});
 }
diff --git a/lib/src/provider/service/electrum/electrum_ssl_service.dart b/lib/src/provider/service/electrum/electrum_ssl_service.dart
index 2e3c8ab..0d89497 100644
--- a/lib/src/provider/service/electrum/electrum_ssl_service.dart
+++ b/lib/src/provider/service/electrum/electrum_ssl_service.dart
@@ -145,10 +145,13 @@ class ElectrumSSLService implements BitcoinBaseElectrumRPCService {
 
       if (method == null) {
         final error = response["error"];
-        if (response["error"] != null) {
+
+        if (error != null) {
           final message = error["message"];
+
           if (message != null) {
             final isFulcrum = message.toLowerCase().contains("unsupported request");
+
             final match = (isFulcrum ? RegExp(r'request:\s*(\S+)') : RegExp(r'"([^"]*)"'))
                 .firstMatch(message);
             method = match?.group(1) ?? '';
@@ -156,17 +159,17 @@ class ElectrumSSLService implements BitcoinBaseElectrumRPCService {
         }
       }
 
-      _tasks.forEach((key, value) {
-        if (value.request.method == method) {
-          id = key;
-        }
-      });
+      if (id == null && method != null) {
+        _tasks.forEach((key, value) {
+          if (value.request.method == method) {
+            id = key;
+          }
+        });
+      }
     }
 
-    try {
-      final result = _findResult(response, _tasks[id]!.request);
-      _finish(id!, result);
-    } catch (_) {}
+    final result = _findResult(response, _tasks[id]!.request);
+    _finish(id!, result);
   }
 
   void _onMessage(List<int> event) {
@@ -182,21 +185,23 @@ class ElectrumSSLService implements BitcoinBaseElectrumRPCService {
   }
 
   dynamic _findResult(dynamic data, ElectrumRequestDetails request) {
-    if (data["error"] != null) {
-      if (data["error"] is String) {
+    final error = data["error"];
+
+    if (error != null) {
+      if (error is String) {
         _errors[request.id] = RPCError(
-          data: data["error"],
+          data: error,
           errorCode: 0,
-          message: data["error"],
+          message: error,
           request: request.params,
         );
       } else {
-        final code = int.tryParse(((data["error"]?['code']?.toString()) ?? "0")) ?? 0;
-        final message = data["error"]?['message'] ?? "";
+        final code = int.tryParse(((error['code']?.toString()) ?? "0")) ?? 0;
+        final message = error['message'] ?? "";
         _errors[request.id] = RPCError(
           errorCode: code,
           message: message,
-          data: data["error"]?["data"],
+          data: error["data"],
           request: data["request"] ?? request.params,
         );
 
@@ -205,8 +210,6 @@ class ElectrumSSLService implements BitcoinBaseElectrumRPCService {
           return <String, dynamic>{};
         }
       }
-
-      throw _errors[request.id]!;
     }
 
     return data["result"] ?? data["params"]?[0];
@@ -276,5 +279,5 @@ class ElectrumSSLService implements BitcoinBaseElectrumRPCService {
     }
   }
 
-  String getErrorMessage(int id) => _errors[id]?.data ?? '';
+  RPCError? getError(int id) => _errors[id];
 }

From 5edcb1d726ed3591c6050ce16c04ec02eb2f6125 Mon Sep 17 00:00:00 2001
From: Rafael Saes <git@rafael.saes.dev>
Date: Thu, 26 Dec 2024 18:52:37 -0300
Subject: [PATCH 33/62] feat: review comment, fee estimation

---
 lib/src/bitcoin/address/legacy_address.dart   |  2 +-
 lib/src/bitcoin/address/util.dart             | 37 ++++++++
 lib/src/bitcoin/script/transaction.dart       |  2 +-
 .../provider/api_provider/api_provider.dart   |  9 ++
 lib/src/provider/models/config.dart           | 16 +++-
 .../transaction_builder.dart                  | 92 ++++++++++++++++++-
 6 files changed, 152 insertions(+), 6 deletions(-)

diff --git a/lib/src/bitcoin/address/legacy_address.dart b/lib/src/bitcoin/address/legacy_address.dart
index f998c15..caa348d 100644
--- a/lib/src/bitcoin/address/legacy_address.dart
+++ b/lib/src/bitcoin/address/legacy_address.dart
@@ -120,7 +120,7 @@ class P2shAddress extends LegacyAddress {
     required BitcoinDerivationInfo derivationInfo,
     required bool isChange,
     required int index,
-    P2shAddressType type = P2shAddressType.p2pkInP2sh,
+    P2shAddressType type = P2shAddressType.p2wpkhInP2sh,
   }) {
     final fullPath = derivationInfo.derivationPath
         .addElem(Bip32KeyIndex(BitcoinAddressUtils.getAccountFromChange(isChange)))
diff --git a/lib/src/bitcoin/address/util.dart b/lib/src/bitcoin/address/util.dart
index b878886..b1b1ed0 100644
--- a/lib/src/bitcoin/address/util.dart
+++ b/lib/src/bitcoin/address/util.dart
@@ -1,4 +1,5 @@
 import 'package:bitcoin_base/src/bitcoin/script/scripts.dart';
+import 'package:bitcoin_base/src/bitcoin/silent_payments/silent_payments.dart';
 import 'package:bitcoin_base/src/utils/utils.dart';
 import 'package:blockchain_utils/blockchain_utils.dart';
 import 'package:bitcoin_base/src/bitcoin/address/address.dart';
@@ -49,6 +50,42 @@ class BitcoinAddressUtils {
     return '';
   }
 
+  static BitcoinAddressType addressTypeFromStr(String address, BasedUtxoNetwork network) {
+    try {
+      return P2pkhAddress.fromAddress(address: address, network: network).type;
+    } catch (_) {}
+
+    try {
+      return P2shAddress.fromAddress(address: address, network: network).type;
+    } catch (_) {}
+
+    try {
+      return P2wpkhAddress.fromAddress(address: address, network: network).type;
+    } catch (_) {}
+
+    try {
+      return P2shAddress.fromAddress(address: address, network: network).type;
+    } catch (_) {}
+
+    try {
+      return P2wshAddress.fromAddress(address: address, network: network).type;
+    } catch (_) {}
+
+    try {
+      return P2trAddress.fromAddress(address: address, network: network).type;
+    } catch (_) {}
+
+    try {
+      return MwebAddress.fromAddress(address: address, network: network).type;
+    } catch (_) {}
+
+    try {
+      return SilentPaymentAddress.fromAddress(address).type;
+    } catch (_) {}
+
+    throw Exception('Invalid address');
+  }
+
   static String scriptHash(String address, {required BasedUtxoNetwork network}) {
     final outputScript = addressToOutputScript(address: address, network: network);
     final parts = BytesUtils.toHexString(QuickCrypto.sha256Hash(outputScript)).split('');
diff --git a/lib/src/bitcoin/script/transaction.dart b/lib/src/bitcoin/script/transaction.dart
index cea48f3..0fa48d5 100644
--- a/lib/src/bitcoin/script/transaction.dart
+++ b/lib/src/bitcoin/script/transaction.dart
@@ -244,7 +244,7 @@ class BtcTransaction {
     if (mwebBytes != null) {
       data.add(mwebBytes!);
     }
-    data.add([0, 0, 0, 0]);
+    data.add(locktime);
     return data.toBytes();
   }
 
diff --git a/lib/src/provider/api_provider/api_provider.dart b/lib/src/provider/api_provider/api_provider.dart
index aeaed79..a31580b 100644
--- a/lib/src/provider/api_provider/api_provider.dart
+++ b/lib/src/provider/api_provider/api_provider.dart
@@ -142,6 +142,15 @@ class ApiProvider {
     return await _getRequest<Map<String, dynamic>>(url);
   }
 
+  Future<Map<String, dynamic>> getBlockTimestamp(
+    DateTime date, {
+    String Function(String)? tokenize,
+  }) async {
+    final apiUrl = api.getBlockTimestampUrl((date.millisecondsSinceEpoch / 1000).round());
+    final url = tokenize?.call(apiUrl) ?? apiUrl;
+    return await _getRequest<Map<String, dynamic>>(url);
+  }
+
   Future<String> getBlockHeight(int height) async {
     final url = api.getBlockHeight(height);
     final response = await _getRequest<String>(url);
diff --git a/lib/src/provider/models/config.dart b/lib/src/provider/models/config.dart
index 2920d06..3421194 100644
--- a/lib/src/provider/models/config.dart
+++ b/lib/src/provider/models/config.dart
@@ -15,6 +15,7 @@ class APIConfig {
     required this.network,
     required this.blockHeight,
     this.block,
+    this.blockTimestamp,
   });
 
   final String url;
@@ -26,6 +27,7 @@ class APIConfig {
   final APIType apiType;
   final BasedUtxoNetwork network;
   final String? block;
+  final String? blockTimestamp;
 
   factory APIConfig.selectApi(APIType apiType, BasedUtxoNetwork network) {
     switch (apiType) {
@@ -50,13 +52,22 @@ class APIConfig {
     return baseUrl.replaceAll("###", transactionId);
   }
 
-  String getBlockUrl(String transactionId) {
+  String getBlockUrl(String blockHash) {
     if (block == null) {
       throw const BitcoinBasePluginException("block url is not available");
     }
 
     String baseUrl = block!;
-    return baseUrl.replaceAll("###", transactionId);
+    return baseUrl.replaceAll("###", blockHash);
+  }
+
+  String getBlockTimestampUrl(int timestamp) {
+    if (blockTimestamp == null) {
+      throw const BitcoinBasePluginException("block timestamp url is not available");
+    }
+
+    String baseUrl = blockTimestamp!;
+    return baseUrl.replaceAll("###", timestamp.toString());
   }
 
   String getTransactionsUrl(String address) {
@@ -129,6 +140,7 @@ class APIConfig {
       network: network,
       blockHeight: "$baseUrl/block-height/###",
       block: "$baseUrl/block/###",
+      blockTimestamp: "$baseUrl/mining/blocks/timestamp/###",
     );
   }
 }
diff --git a/lib/src/provider/transaction_builder/transaction_builder.dart b/lib/src/provider/transaction_builder/transaction_builder.dart
index aace073..c6326fa 100644
--- a/lib/src/provider/transaction_builder/transaction_builder.dart
+++ b/lib/src/provider/transaction_builder/transaction_builder.dart
@@ -124,7 +124,7 @@ class BitcoinTransactionBuilder implements BasedBitcoinTransacationBuilder {
     );
 
     /// 64 byte schnorr signature length
-    const String fakeSchnorSignaturBytes =
+    const String fakeSchnorSignatureBytes =
         "01010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101";
 
     /// 71 bytes (64 byte signature, 6-7 byte Der encoding length)
@@ -134,7 +134,7 @@ class BitcoinTransactionBuilder implements BasedBitcoinTransacationBuilder {
     final transaction =
         transactionBuilder.buildTransaction((trDigest, utxo, multiSigPublicKey, int sighash) {
       if (utxo.utxo.isP2tr()) {
-        return fakeSchnorSignaturBytes;
+        return fakeSchnorSignatureBytes;
       } else {
         return fakeECDSASignatureBytes;
       }
@@ -147,6 +147,94 @@ class BitcoinTransactionBuilder implements BasedBitcoinTransacationBuilder {
     return size;
   }
 
+  static int estimateTransactionSizeFromTypes({
+    required List<BitcoinAddressType> inputTypes,
+    required List<BitcoinAddressType> outputTypes,
+    required BasedUtxoNetwork network,
+    String? memo,
+    bool enableRBF = false,
+  }) {
+    final fakePublicKey = ECPrivate.random().getPublic();
+    final fakeUtxos = <UtxoWithAddress>[];
+
+    for (final inputType in inputTypes) {
+      late BitcoinBaseAddress address;
+      switch (inputType) {
+        case P2pkhAddressType.p2pkh:
+          address = fakePublicKey.toP2pkhAddress();
+          break;
+        case P2shAddressType.p2pkInP2sh:
+          address = fakePublicKey.toP2wpkhInP2sh();
+          break;
+        case SegwitAddresType.p2wpkh:
+          address = fakePublicKey.toP2wpkhAddress();
+          break;
+        case P2shAddressType.p2pkhInP2sh:
+          address = fakePublicKey.toP2pkhInP2sh();
+          break;
+        case SegwitAddresType.p2wsh:
+          address = fakePublicKey.toP2wshAddress();
+          break;
+        case SegwitAddresType.p2tr:
+          address = fakePublicKey.toTaprootAddress();
+          break;
+        default:
+          throw const BitcoinBasePluginException("invalid bitcoin address type");
+      }
+
+      final utxo = UtxoWithAddress(
+        utxo: BitcoinUtxo(
+          txHash: "0" * 64,
+          vout: 0,
+          value: BigInt.from(0),
+          scriptType: inputType,
+        ),
+        ownerDetails: UtxoAddressDetails(publicKey: fakePublicKey.toHex(), address: address),
+      );
+
+      fakeUtxos.add(utxo);
+    }
+
+    final fakeOutputs = <BitcoinOutput>[];
+
+    for (final outputType in outputTypes) {
+      late BitcoinBaseAddress address;
+      switch (outputType) {
+        case P2pkhAddressType.p2pkh:
+          address = fakePublicKey.toP2pkhAddress();
+          break;
+        case P2shAddressType.p2pkInP2sh:
+          address = fakePublicKey.toP2pkhInP2sh();
+          break;
+        case SegwitAddresType.p2wpkh:
+          address = fakePublicKey.toP2wpkhAddress();
+          break;
+        case P2shAddressType.p2pkhInP2sh:
+          address = fakePublicKey.toP2pkhInP2sh();
+          break;
+        case SegwitAddresType.p2wsh:
+          address = fakePublicKey.toP2wshAddress();
+          break;
+        case SegwitAddresType.p2tr:
+        case SilentPaymentsAddresType.p2sp:
+          address = fakePublicKey.toTaprootAddress();
+          break;
+        default:
+          throw const BitcoinBasePluginException("invalid bitcoin address type");
+      }
+
+      fakeOutputs.add(BitcoinOutput(address: address, value: BigInt.from(0)));
+    }
+
+    return estimateTransactionSize(
+      utxos: fakeUtxos,
+      outputs: fakeOutputs,
+      network: network,
+      memo: memo,
+      enableRBF: enableRBF,
+    );
+  }
+
   /// HasSegwit checks whether any of the unspent transaction outputs (UTXOs) in the BitcoinTransactionBuilder's
   /// Utxos list are Segregated Witness (SegWit) UTXOs. It iterates through the Utxos list and returns true if it
   /// finds any UTXO with a SegWit script type; otherwise, it returns false.

From ebee34cd5b81e166ec4c3714dfd2ca39f8cf8bd1 Mon Sep 17 00:00:00 2001
From: Rafael Saes <git@rafael.saes.dev>
Date: Fri, 27 Dec 2024 10:17:53 -0300
Subject: [PATCH 34/62] refactor: reviews

---
 example/pubspec.yaml                          |   5 +-
 lib/src/bitcoin/address/util.dart             |   8 +-
 lib/src/bitcoin/script/transaction.dart       |   1 -
 .../transaction_builder.dart                  | 126 ++++++++----------
 test/encode_decode_transaction_test.dart      |  15 ++-
 5 files changed, 76 insertions(+), 79 deletions(-)

diff --git a/example/pubspec.yaml b/example/pubspec.yaml
index 11a339d..bb07685 100644
--- a/example/pubspec.yaml
+++ b/example/pubspec.yaml
@@ -38,7 +38,10 @@ dependencies:
   bitcoin_base: 
     path: ../
   blockchain_utils:
-    path: /home/rafael/Working/blockchain_utils/
+    git:		    
+      url: https://github.com/cake-tech/blockchain_utils		
+      ref: cake-update-v2
+
   http: ^1.2.0
 
 dev_dependencies:
diff --git a/lib/src/bitcoin/address/util.dart b/lib/src/bitcoin/address/util.dart
index b1b1ed0..bae1e78 100644
--- a/lib/src/bitcoin/address/util.dart
+++ b/lib/src/bitcoin/address/util.dart
@@ -34,11 +34,12 @@ class BitcoinAddressUtils {
         case P2pkhAddressType.p2pkh:
           return P2pkhAddress.fromScriptPubkey(script: script).toAddress(network);
         case P2shAddressType.p2pkInP2sh:
+        case P2shAddressType.p2pkhInP2sh:
+        case P2shAddressType.p2wpkhInP2sh:
+        case P2shAddressType.p2wshInP2sh:
           return P2shAddress.fromScriptPubkey(script: script).toAddress(network);
         case SegwitAddresType.p2wpkh:
           return P2wpkhAddress.fromScriptPubkey(script: script).toAddress(network);
-        case P2shAddressType.p2pkhInP2sh:
-          return P2shAddress.fromScriptPubkey(script: script).toAddress(network);
         case SegwitAddresType.p2wsh:
           return P2wshAddress.fromScriptPubkey(script: script).toAddress(network);
         case SegwitAddresType.p2tr:
@@ -131,7 +132,10 @@ class BitcoinAddressUtils {
     switch (scriptType) {
       case P2pkhAddressType.p2pkh:
         return BitcoinDerivationInfos.BIP44;
+      case P2shAddressType.p2pkInP2sh:
+      case P2shAddressType.p2pkhInP2sh:
       case P2shAddressType.p2wpkhInP2sh:
+      case P2shAddressType.p2wshInP2sh:
         return BitcoinDerivationInfos.BIP49;
       case SegwitAddresType.p2wpkh:
         if (isElectrum == true) {
diff --git a/lib/src/bitcoin/script/transaction.dart b/lib/src/bitcoin/script/transaction.dart
index 0fa48d5..4b96fdb 100644
--- a/lib/src/bitcoin/script/transaction.dart
+++ b/lib/src/bitcoin/script/transaction.dart
@@ -147,7 +147,6 @@ class BtcTransaction {
     if (hasMweb) {
       mwebBytes = rawtx.sublist(cursor, rawtx.length - 4);
     }
-
     cursor = rawtx.length - 4;
     List<int> lock = rawtx.sublist(cursor);
     return BtcTransaction(
diff --git a/lib/src/provider/transaction_builder/transaction_builder.dart b/lib/src/provider/transaction_builder/transaction_builder.dart
index c6326fa..8ec7400 100644
--- a/lib/src/provider/transaction_builder/transaction_builder.dart
+++ b/lib/src/provider/transaction_builder/transaction_builder.dart
@@ -155,76 +155,34 @@ class BitcoinTransactionBuilder implements BasedBitcoinTransacationBuilder {
     bool enableRBF = false,
   }) {
     final fakePublicKey = ECPrivate.random().getPublic();
-    final fakeUtxos = <UtxoWithAddress>[];
 
-    for (final inputType in inputTypes) {
-      late BitcoinBaseAddress address;
-      switch (inputType) {
-        case P2pkhAddressType.p2pkh:
-          address = fakePublicKey.toP2pkhAddress();
-          break;
-        case P2shAddressType.p2pkInP2sh:
-          address = fakePublicKey.toP2wpkhInP2sh();
-          break;
-        case SegwitAddresType.p2wpkh:
-          address = fakePublicKey.toP2wpkhAddress();
-          break;
-        case P2shAddressType.p2pkhInP2sh:
-          address = fakePublicKey.toP2pkhInP2sh();
-          break;
-        case SegwitAddresType.p2wsh:
-          address = fakePublicKey.toP2wshAddress();
-          break;
-        case SegwitAddresType.p2tr:
-          address = fakePublicKey.toTaprootAddress();
-          break;
-        default:
-          throw const BitcoinBasePluginException("invalid bitcoin address type");
-      }
-
-      final utxo = UtxoWithAddress(
-        utxo: BitcoinUtxo(
-          txHash: "0" * 64,
-          vout: 0,
-          value: BigInt.from(0),
-          scriptType: inputType,
-        ),
-        ownerDetails: UtxoAddressDetails(publicKey: fakePublicKey.toHex(), address: address),
-      );
-
-      fakeUtxos.add(utxo);
-    }
-
-    final fakeOutputs = <BitcoinOutput>[];
-
-    for (final outputType in outputTypes) {
-      late BitcoinBaseAddress address;
-      switch (outputType) {
-        case P2pkhAddressType.p2pkh:
-          address = fakePublicKey.toP2pkhAddress();
-          break;
-        case P2shAddressType.p2pkInP2sh:
-          address = fakePublicKey.toP2pkhInP2sh();
-          break;
-        case SegwitAddresType.p2wpkh:
-          address = fakePublicKey.toP2wpkhAddress();
-          break;
-        case P2shAddressType.p2pkhInP2sh:
-          address = fakePublicKey.toP2pkhInP2sh();
-          break;
-        case SegwitAddresType.p2wsh:
-          address = fakePublicKey.toP2wshAddress();
-          break;
-        case SegwitAddresType.p2tr:
-        case SilentPaymentsAddresType.p2sp:
-          address = fakePublicKey.toTaprootAddress();
-          break;
-        default:
-          throw const BitcoinBasePluginException("invalid bitcoin address type");
-      }
-
-      fakeOutputs.add(BitcoinOutput(address: address, value: BigInt.from(0)));
-    }
+    final fakeInputAddress = _fakeAddressesFromTypes(inputTypes);
+    final fakeUtxos = fakeInputAddress
+        .map(
+          (e) => UtxoWithAddress(
+            utxo: BitcoinUtxo(
+              txHash: "0" * 64,
+              vout: 0,
+              value: BigInt.from(0),
+              scriptType: e.type,
+            ),
+            ownerDetails: UtxoAddressDetails(
+              publicKey: fakePublicKey.toHex(),
+              address: e,
+            ),
+          ),
+        )
+        .toList();
+
+    final fakeOutputAddress = _fakeAddressesFromTypes(outputTypes);
+    final fakeOutputs = fakeOutputAddress
+        .map(
+          (e) => BitcoinOutput(
+            address: e,
+            value: BigInt.from(0),
+          ),
+        )
+        .toList();
 
     return estimateTransactionSize(
       utxos: fakeUtxos,
@@ -924,3 +882,33 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
     }
   }
 }
+
+List<BitcoinBaseAddress> _fakeAddressesFromTypes(List<BitcoinAddressType> types) {
+  final fakePub = ECPrivate.random().getPublic();
+
+  return types.map((e) {
+    switch (e) {
+      case PubKeyAddressType.p2pk:
+        return fakePub.toP2pkAddress();
+      case P2pkhAddressType.p2pkh:
+        return fakePub.toP2pkhAddress();
+      case P2shAddressType.p2pkInP2sh:
+        return fakePub.toP2pkInP2sh();
+      case P2shAddressType.p2pkhInP2sh:
+        return fakePub.toP2pkhInP2sh();
+      case P2shAddressType.p2wpkhInP2sh:
+        return fakePub.toP2wpkhInP2sh();
+      case P2shAddressType.p2wshInP2sh:
+        return fakePub.toP2wshInP2sh();
+      case SegwitAddresType.p2wpkh:
+        return fakePub.toP2wpkhAddress();
+      case SegwitAddresType.p2wsh:
+        return fakePub.toP2wshAddress();
+      case SegwitAddresType.p2tr:
+      case SilentPaymentsAddresType.p2sp:
+        return fakePub.toTaprootAddress();
+      default:
+        throw const BitcoinBasePluginException("invalid bitcoin address type");
+    }
+  }).toList();
+}
diff --git a/test/encode_decode_transaction_test.dart b/test/encode_decode_transaction_test.dart
index d3588a1..b77dfdb 100644
--- a/test/encode_decode_transaction_test.dart
+++ b/test/encode_decode_transaction_test.dart
@@ -5,7 +5,8 @@ void main() {
   test("test1", () {
     final tx = BtcTransaction(inputs: [
       TxInput(
-        txId: "daaa0beab7411cee74768b3f1d7da7ad55fcbc9d835fda0afbe1b9a41ae42f75",
+        txId:
+            "daaa0beab7411cee74768b3f1d7da7ad55fcbc9d835fda0afbe1b9a41ae42f75",
         txIndex: 0,
         scriptSig: Script(
           script: [
@@ -15,7 +16,8 @@ void main() {
         ),
       ),
       TxInput(
-          txId: "daaa0beab7411cee74768b3f1d7da7ad55fcbc9d835fda0afbe1b9a41ae42f75",
+          txId:
+              "daaa0beab7411cee74768b3f1d7da7ad55fcbc9d835fda0afbe1b9a41ae42f75",
           txIndex: 2,
           scriptSig: Script(script: [
             "3044022071b39d6aefdea7a7837310e5d78b1069ae82ed007991f8bca80bf3baf26340cc02200bc356be6e9f0019849b75b00322262a23ce179e7c0313207addfdbe596dabfd41",
@@ -36,7 +38,8 @@ void main() {
       TxOutput(
           amount: BigInt.from(1000),
           cashToken: CashToken(
-            category: "4e7873d4529edfd2c6459139257042950230baa9297f111b8675829443f70430",
+            category:
+                "4e7873d4529edfd2c6459139257042950230baa9297f111b8675829443f70430",
             bitfield: 16,
             amount: BigInt.from(2000),
           ),
@@ -50,7 +53,8 @@ void main() {
       TxOutput(
           amount: BigInt.from(1000),
           cashToken: CashToken(
-            category: "4e7873d4529edfd2c6459139257042950230baa9297f111b8675829443f70430",
+            category:
+                "4e7873d4529edfd2c6459139257042950230baa9297f111b8675829443f70430",
             bitfield: 16,
             amount: BigInt.parse("799999999999996000"),
           ),
@@ -65,9 +69,8 @@ void main() {
           )),
     ]);
     const String raw =
-        "010000000001072b50f5750fc84801618b558e79d8e3c37d2c513c59cdbb590d90d043d3a9aa83000000001716001496de4122da32c2d428e70b44f8d07f2b26334b6ff0ffffffbcf5ae0a0c5efd15b06b380d59e535cf4fec65150ad301906012ea796f3a4607000000001716001496de4122da32c2d428e70b44f8d07f2b26334b6ff0ffffff4be773c0882999ba5ae2ee574951f926a72037637aeda4344fa37655769ed78d000000001716001496de4122da32c2d428e70b44f8d07f2b26334b6ff0ffffff4b29cb407a116c0c26c73332a3a2dd5e878b3c66dd0bdc516c9b763344cb8119000000001716001496de4122da32c2d428e70b44f8d07f2b26334b6ff0ffffff0b76aceb79e3f2570b82fe4ec5709b5affd04ac9bf7898fdee4a5dac5a429c82000000001716001496de4122da32c2d428e70b44f8d07f2b26334b6ff0ffffff5469f86d1c2ceb0d7da957f6d82d98f3b0f3e4138800fb9f2fb23444476c4ed7000000001716001496de4122da32c2d428e70b44f8d07f2b26334b6ff0ffffffc1fb64b4a9153728ccdfb8f5a2f0d60d42644bb39f0be24408f181c369c9337f000000001716001496de4122da32c2d428e70b44f8d07f2b26334b6ff0ffffff028c43e32e00000000160014455980d0b130ff894536fa79a322db815ab9cde4d9efb0000000000017a914424f29a8a84fa867814ff9ded43379c9dc9a6814870248304502210096990ba2bb32d80dc35ee55548bb300237744e9fdf08fcaf918672c60698da7b02202fe20657730114cdcbe01eef860b537be0b34380505d3d891d741ef2344330ca012102550e8b9eaa471d31c4a544a6aad1d8a3b6e4c4b127ddfdd629e85a888d3f8dd602473044022010699f80eb6495d01ce1b00c70dacc76ed8ea5b1652f9cb04b91456d94cfafe30220111ca2bbb5192ec35247cb6250d1a68f84bf93fe0151f330f20077d3b9b4b5af012102550e8b9eaa471d31c4a544a6aad1d8a3b6e4c4b127ddfdd629e85a888d3f8dd6024730440220170abcd7371d5ac83afff93751e3ea028627d1b38f4bed7da2c897d73d61420402205af8871c7befa740f325deb83483c1450dbcf5388e2836582c8bdaab8bf6a35b012102550e8b9eaa471d31c4a544a6aad1d8a3b6e4c4b127ddfdd629e85a888d3f8dd602483045022100b0702718bc906cf8691b7cbc95baf64e0ab3312a2abfd139b1928715757c0dbc022054f45fbc4cd9517eca6da4771dd8c23e5b0d393e61f5b7dd488086fe24029f80012102550e8b9eaa471d31c4a544a6aad1d8a3b6e4c4b127ddfdd629e85a888d3f8dd602483045022100d8055802be7aabefc62c6f5da69ee556be064c9727c8eab4d6e26ced2f81472c0220294599ad7b030c908923cb3ae1227b2b3f91275e3c00bc4943cdfe1c5e0b6843012102550e8b9eaa471d31c4a544a6aad1d8a3b6e4c4b127ddfdd629e85a888d3f8dd602473044022011a60277e781e891fce3dc920d0f2a0785b0561eb033c54a15a5c06e7c8bfa5a02207bec23c576fcafc1da59936dd6d35e526d3631f20e089f199245a1c4dcf96bb6012102550e8b9eaa471d31c4a544a6aad1d8a3b6e4c4b127ddfdd629e85a888d3f8dd602483045022100c58ee4955ec0d8d84e1b89e4dd4435ab02776dcf5b3b7cb45b837483c157be1002201733ad33460d48e69558bfac47fe045194b3840046c80e4005daff272401d030012102550e8b9eaa471d31c4a544a6aad1d8a3b6e4c4b127ddfdd629e85a888d3f8dd600000000";
+        "0200000002752fe41aa4b9e1fb0ada5f839dbcfc55ada77d1d3f8b7674ee1c41b7ea0baada000000006a47304402203795e2aa978afbbd676b36c0edd1a39478744d320c5e02dd6a39d154755a5a3e02205545a7765bae3db9b820b1db9be2f8955a8998fa92ac08b0d7416aa30a3cee42412103ac064f4489ff812c643471ed25b990e6be7212566c932b8680b900c8e6db0fd9ffffffff752fe41aa4b9e1fb0ada5f839dbcfc55ada77d1d3f8b7674ee1c41b7ea0baada020000006a473044022071b39d6aefdea7a7837310e5d78b1069ae82ed007991f8bca80bf3baf26340cc02200bc356be6e9f0019849b75b00322262a23ce179e7c0313207addfdbe596dabfd412103ac064f4489ff812c643471ed25b990e6be7212566c932b8680b900c8e6db0fd9ffffffff03389c9900000000001976a914b8d913342894ec7b066420952a618ec2a8269bc288ace80300000000000048ef3004f743948275861b117f29a9ba300295427025399145c6d2df9e52d473784e10fdd007aa201d12ffe8e85fdab36794cb09418982efdbd5c8cee5fbeb216ac43887ea4817b887e80300000000000044ef3004f743948275861b117f29a9ba300295427025399145c6d2df9e52d473784e10ff60f04fecc22b1a0b76a914b8d913342894ec7b066420952a618ec2a8269bc288ac00000000";
     final tr = BtcTransaction.fromRaw(raw);
-    print(tr.txId());
     expect(tx.toHex(), raw);
     expect(tr.toHex(), raw);
 

From f7ba439a68991eed311f9eedb2d036b3d4981e4d Mon Sep 17 00:00:00 2001
From: Rafael Saes <git@rafael.saes.dev>
Date: Fri, 27 Dec 2024 19:10:30 -0300
Subject: [PATCH 35/62] chore: misc

---
 example/pubspec.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/example/pubspec.yaml b/example/pubspec.yaml
index bb07685..8f9a3cf 100644
--- a/example/pubspec.yaml
+++ b/example/pubspec.yaml
@@ -38,8 +38,8 @@ dependencies:
   bitcoin_base: 
     path: ../
   blockchain_utils:
-    git:		    
-      url: https://github.com/cake-tech/blockchain_utils		
+    git:
+      url: https://github.com/cake-tech/blockchain_utils
       ref: cake-update-v2
 
   http: ^1.2.0

From 78719a85acc6c36ac83db83f0b8cb14007877863 Mon Sep 17 00:00:00 2001
From: Mohsen <mrhaydari.t@gmail.com>
Date: Thu, 2 Jan 2025 15:45:07 +0330
Subject: [PATCH 36/62] V5.0.0

* Update dependencies
* Minimum required Dart SDK version updated to 3.3.
---
 CHANGELOG.md                                  |    7 +-
 README.md                                     |   18 +-
 analysis_options.yaml                         |   55 +-
 .../lib/bitcoin_cash/burn_token_example.dart  |    9 +-
 .../create_cash_token_example.dart            |    9 +-
 .../lib/bitcoin_cash/create_nft_example.dart  |    9 +-
 .../lib/bitcoin_cash/make_vout0_example.dart  |    9 +-
 .../lib/bitcoin_cash/minting_nft_example.dart |    9 +-
 .../bitcoin_cash/p2sh32_spend_example.dart    |   10 +-
 .../bitcoin_cash/send_ft_token_example.dart   |    9 +-
 .../bitcoin_cash/transfer_bch_example.dart    |    9 +-
 example/lib/global/bch_example.dart           |    9 +-
 ...amples_multisig_taproot_legacy_uncomp.dart |   47 +-
 ...er_from_7_account_to_6_accout_example.dart |   11 +-
 .../global/transfer_to_8_account_example.dart |   12 +-
 .../electrum/electrum_ssl_service.dart        |   15 +-
 .../electrum/electrum_tcp_service.dart        |   17 +-
 .../electrum/electrum_websocket_service.dart  |   15 +-
 example/pubspec.lock                          |   36 +-
 example/pubspec.yaml                          |    4 +-
 example/test/test_test.dart                   |    1 +
 lib/bitcoin_base.dart                         |   20 +-
 lib/src/bitcoin/address/address.dart          |    2 +-
 lib/src/bitcoin/address/core.dart             |   56 +-
 lib/src/bitcoin/address/legacy_address.dart   |   26 +-
 lib/src/bitcoin/address/network_address.dart  |    2 +-
 lib/src/bitcoin/address/segwit_address.dart   |   58 +-
 .../bitcoin/address/utils/address_utils.dart  |   36 +-
 lib/src/bitcoin/script/control_block.dart     |    6 +-
 lib/src/bitcoin/script/input.dart             |   19 +-
 lib/src/bitcoin/script/op_code/constant.dart  |   10 +-
 .../bitcoin/script/op_code/constant_lib.dart  |    2 +-
 lib/src/bitcoin/script/op_code/tools.dart     |   10 +-
 lib/src/bitcoin/script/output.dart            |   13 +-
 lib/src/bitcoin/script/script.dart            |   20 +-
 lib/src/bitcoin/script/sequence.dart          |   10 +-
 lib/src/bitcoin/script/transaction.dart       |  117 +-
 lib/src/bitcoin/script/witness.dart           |    7 +-
 lib/src/bitcoin_cash/bcmr.dart                |    8 +-
 lib/src/bitcoin_cash/bcmr_registery.dart      |   47 +-
 lib/src/cash_token/cash_token.dart            |   74 +-
 lib/src/crypto/crypto.dart                    |    4 +-
 lib/src/crypto/keypair/ec_private.dart        |   24 +-
 lib/src/crypto/keypair/ec_public.dart         |   42 +-
 lib/src/exception/exception.dart              |    4 +-
 lib/src/models/network.dart                   |   43 +-
 lib/src/provider/api_provider.dart            |    9 +-
 .../api_provider/electrum_api_provider.dart   |   37 -
 lib/src/provider/api_provider/providers.dart  |    2 -
 lib/src/provider/constant/constant.dart       |   18 +-
 .../{service/electrum => core}/methods.dart   |   58 +-
 lib/src/provider/core/params.dart             |   66 +
 .../electrum_methods/methods/add_peer.dart    |    7 +-
 .../methods/block_headers.dart                |    7 +-
 .../electrum_methods/methods/broad_cast.dart  |    9 +-
 .../methods/donate_address.dart               |    5 +-
 .../methods/electrum_version.dart             |    9 +-
 .../methods/estimate_fee.dart                 |    7 +-
 .../electrum_methods/methods/get_balance.dart |    8 +-
 .../methods/get_fee_histogram.dart            |   14 +-
 .../electrum_methods/methods/get_history.dart |    8 +-
 .../electrum_methods/methods/get_mempool.dart |    8 +-
 .../electrum_methods/methods/get_merkle.dart  |    9 +-
 .../methods/get_transaction.dart              |    9 +-
 .../electrum_methods/methods/get_unspet.dart  |   13 +-
 .../methods/get_value_proof.dart              |    8 +-
 .../electrum_methods/methods/header.dart      |    8 +-
 .../methods/headers_subscribe.dart            |    5 +-
 .../electrum_methods/methods/id_from_pos.dart |    8 +-
 .../masternode_announce_broadcast.dart        |    8 +-
 .../methods/masternode_list.dart              |    7 +-
 .../methods/masternode_subscribe.dart         |    8 +-
 .../electrum_methods/methods/ping.dart        |    5 +-
 .../electrum_methods/methods/protx_diff.dart  |    8 +-
 .../electrum_methods/methods/protx_info.dart  |    8 +-
 .../electrum_methods/methods/relay_fee.dart   |    5 +-
 .../methods/scripthash_unsubscribe.dart       |    7 +-
 .../methods/server_banner.dart                |    5 +-
 .../methods/server_features.dart              |    5 +-
 .../methods/server_peer_subscribe.dart        |    5 +-
 .../electrum_methods/methods/status.dart      |    7 +-
 .../block_cypher/block_cypher_models.dart     |    2 +-
 lib/src/provider/models/config.dart           |   42 +-
 .../models/electrum/electrum_utxo.dart        |   12 +-
 .../provider/models/fee_rate/fee_rate.dart    |    4 +-
 .../models/mempool/mempol_models.dart         |    2 +-
 lib/src/provider/models/multisig_script.dart  |   12 +-
 lib/src/provider/models/utxo_details.dart     |   44 +-
 lib/src/provider/providers/electrum.dart      |   57 +
 .../explorer.dart}                            |   36 +-
 .../provider/service/electrum/electrum.dart   |    3 -
 lib/src/provider/service/electrum/params.dart |   54 -
 .../provider/service/electrum/service.dart    |   13 -
 lib/src/provider/service/services.dart        |    2 -
 lib/src/provider/services/electrum.dart       |   10 +
 .../explorer.dart}                            |    2 +-
 .../transaction_builder/builder.dart          |    0
 .../transaction_builder/core.dart             |    0
 .../forked_transaction_builder.dart           |  111 +-
 .../transaction_builder.dart                  |  146 +--
 lib/src/utils/btc_utils.dart                  |   10 +-
 lib/src/utils/enumerate.dart                  |    2 +-
 pubspec.yaml                                  |    8 +-
 test/bcmr/art_collection.dart                 |  136 +-
 test/bcmr/bcmr_test.dart                      |    2 +-
 test/bcmr/decentralized_application.dart      |  116 +-
 test/bcmr/fungible_token.dart                 |   52 +-
 test/bcmr/payouts_or_dividends.dart           |  136 +-
 test/bitcoin_cash_address_test.dart           |  336 ++---
 test/bitcoin_cash_token_encoding_test.dart    | 1119 ++++++++---------
 test/deserialize_test.dart                    |    8 +-
 test/encode_decode_transaction_test.dart      |   56 +-
 test/keys_test.dart                           |  122 +-
 test/p2kh_tr_test.dart                        |   38 +-
 test/p2sh_test.dart                           |   10 +-
 test/p2tr_test.dart                           |   55 +-
 test/p2wpkh_test.dart                         |   84 +-
 test/p2wsh_test.dart                          |   32 +-
 test/xep_address_test.dart                    |   23 -
 119 files changed, 2159 insertions(+), 2128 deletions(-)
 create mode 100644 example/test/test_test.dart
 delete mode 100644 lib/src/provider/api_provider/electrum_api_provider.dart
 delete mode 100644 lib/src/provider/api_provider/providers.dart
 rename lib/src/provider/{service/electrum => core}/methods.dart (70%)
 create mode 100644 lib/src/provider/core/params.dart
 create mode 100644 lib/src/provider/providers/electrum.dart
 rename lib/src/provider/{api_provider/api_provider.dart => providers/explorer.dart} (82%)
 delete mode 100644 lib/src/provider/service/electrum/electrum.dart
 delete mode 100644 lib/src/provider/service/electrum/params.dart
 delete mode 100644 lib/src/provider/service/electrum/service.dart
 delete mode 100644 lib/src/provider/service/services.dart
 create mode 100644 lib/src/provider/services/electrum.dart
 rename lib/src/provider/{service/http/http_service.dart => services/explorer.dart} (88%)
 rename lib/src/{provider => }/transaction_builder/builder.dart (100%)
 rename lib/src/{provider => }/transaction_builder/core.dart (100%)
 rename lib/src/{provider => }/transaction_builder/forked_transaction_builder.dart (89%)
 rename lib/src/{provider => }/transaction_builder/transaction_builder.dart (87%)
 delete mode 100644 test/xep_address_test.dart

diff --git a/CHANGELOG.md b/CHANGELOG.md
index abffeb3..8c20001 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,16 @@
+## 5.0.0
+* Update dependencies
+* Minimum required Dart SDK version updated to 3.3.
+
 ## 4.9.4
+
 * Improved serialization process for large transaction scripts.
 * Added support for the Electra network.
 * Create and spent from uncomprossed public key format.
 * Important Notice: This is the final version supporting Dart v2. The next release will require Dart v3.3 or higher.
 
-
 ## 4.9.2
+
 * Update dependencies
 * Resolved issue with transaction deserialization (unsigned tx)
 
diff --git a/README.md b/README.md
index a02d9b5..abc55cb 100644
--- a/README.md
+++ b/README.md
@@ -280,7 +280,7 @@ In the [example](https://github.com/mrtnetwork/bitcoin_base/tree/main/example/li
       await ElectrumWebSocketService.connect("184....");
 
   /// create provider with service
-  final provider = ElectrumApiProvider(service);
+  final provider = ElectrumProvider(service);
 
   /// spender details
   final privateKey = ECPrivate.fromHex(
@@ -310,7 +310,7 @@ In the [example](https://github.com/mrtnetwork/bitcoin_base/tree/main/example/li
   for (final i in spenders) {
     /// Reads all UTXOs (Unspent Transaction Outputs) associated with the account
     final elctrumUtxos = await provider
-        .request(ElectrumScriptHashListUnspent(scriptHash: i.pubKeyHash()));
+        .request(ElectrumRequestScriptHashListUnspent(scriptHash: i.pubKeyHash()));
 
     /// Converts all UTXOs to a list of UtxoWithAddress, containing UTXO information along with address details.
     /// read spender utxos
@@ -427,7 +427,7 @@ In the [example](https://github.com/mrtnetwork/bitcoin_base/tree/main/example/li
   final raw = transaction.serialize();
 
   /// send to network
-  await provider.request(ElectrumBroadCastTransaction(transactionRaw: raw));
+  await provider.request(ElectrumRequestBroadCastTransaction(transactionRaw: raw));
 
   /// Once completed, we verify the status by checking the mempool or using another explorer to review the transaction details.
   /// https://mempool.space/testnet/tx/70cf664bba4b5ac9edc6133e9c6891ffaf8a55eaea9d2ac99aceead1c3db8899
@@ -446,7 +446,7 @@ In the [example](https://github.com/mrtnetwork/bitcoin_base/tree/main/example/li
       "wss://chipnet.imaginary.cash:50004");
 
   /// create provider with service
-  final provider = ElectrumApiProvider(service);
+  final provider = ElectrumProvider(service);
 
   /// initialize private key
   final privateKey = ECPrivate.fromBytes(BytesUtils.fromHexString(
@@ -470,7 +470,7 @@ In the [example](https://github.com/mrtnetwork/bitcoin_base/tree/main/example/li
 
   /// Reads all UTXOs (Unspent Transaction Outputs) associated with the account.
   /// We does not need tokens utxo and we set to false.
-  final elctrumUtxos = await provider.request(ElectrumScriptHashListUnspent(
+  final elctrumUtxos = await provider.request(ElectrumRequestScriptHashListUnspent(
     scriptHash: p2pkhAddress.baseAddress.pubKeyHash(),
     includeTokens: true,
   ));
@@ -566,7 +566,7 @@ In the [example](https://github.com/mrtnetwork/bitcoin_base/tree/main/example/li
 
   /// send transaction to network
   await provider
-      .request(ElectrumBroadCastTransaction(transactionRaw: transactionRaw));
+      .request(ElectrumRequestBroadCastTransaction(transactionRaw: transactionRaw));
 
   /// done! check the transaction in block explorer
   ///  https://chipnet.imaginary.cash/tx/97030c1236a024de7cad7ceadf8571833029c508e016bcc8173146317e367ae6
@@ -704,7 +704,7 @@ I haven't implemented any specific HTTP service or socket service within this pl
       await ElectrumSSLService.connect("testnet.aranguren.org:51002");
 
   /// create provider with service
-  final provider = ElectrumApiProvider(service);
+  final provider = ElectrumProvider(service);
 
   final address = P2trAddress.fromAddress(address: ".....", network: network);
 
@@ -714,7 +714,7 @@ I haven't implemented any specific HTTP service or socket service within this pl
 
   /// Return an ordered list of UTXOs sent to a script hash.
   final accountUnspend = await provider
-      .request(ElectrumScriptHashListUnspent(scriptHash: address.pubKeyHash()));
+      .request(ElectrumRequestScriptHashListUnspent(scriptHash: address.pubKeyHash()));
 
   /// Return the confirmed and unconfirmed history of a script hash.
   final accountHistory = await provider
@@ -722,7 +722,7 @@ I haven't implemented any specific HTTP service or socket service within this pl
 
   /// Broadcast a transaction to the network.
   final broadcastTransaction = await provider
-      .request(ElectrumBroadCastTransaction(transactionRaw: "txDigest"));
+      .request(ElectrumRequestBroadCastTransaction(transactionRaw: "txDigest"));
 
   /// ....
 ```
diff --git a/analysis_options.yaml b/analysis_options.yaml
index 231b316..32dccdb 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -1,9 +1,56 @@
 # include: package:lints/recommended.yaml
 include: package:flutter_lints/flutter.yaml
+# Additional information about this file can be found at
+# https://dart.dev/guides/language/analysis-options
 # Uncomment the following section to specify additional rules.
 linter:
   rules:
-    prefer_final_locals: true        # Warns when a local variable could be final
-    prefer_final_in_for_each: true   # Warns when a forEach variable could be final
-    prefer_const_constructors: true  # Warns when a constructor could be const
-    prefer_const_declarations: true  # Warns when a declaration could be const
+    - always_declare_return_types
+    - annotate_overrides
+    - avoid_init_to_null
+    - avoid_null_checks_in_equality_operators
+    - avoid_relative_lib_imports
+    - avoid_return_types_on_setters
+    - avoid_shadowing_type_parameters
+    - avoid_single_cascade_in_expression_statements
+    - avoid_types_as_parameter_names
+    - await_only_futures
+    - camel_case_extensions
+    - curly_braces_in_flow_control_structures
+    - empty_catches
+    - empty_constructor_bodies
+    - library_names
+    - library_prefixes
+    - no_duplicate_case_values
+    - null_closures
+    - omit_local_variable_types
+    - prefer_adjacent_string_concatenation
+    - prefer_collection_literals
+    - prefer_conditional_assignment
+    - prefer_contains
+    - prefer_equal_for_default_values
+    - prefer_final_fields
+    - prefer_for_elements_to_map_fromIterable
+    - prefer_generic_function_type_aliases
+    - prefer_if_null_operators
+    - prefer_inlined_adds
+    - prefer_is_empty
+    - prefer_is_not_empty
+    - prefer_iterable_whereType
+    - prefer_single_quotes
+    - prefer_spread_collections
+    - recursive_getters
+    - slash_for_doc_comments
+    - sort_child_properties_last
+    - type_init_formals
+    - unawaited_futures
+    - unnecessary_brace_in_string_interps
+    - unnecessary_const
+    - unnecessary_getters_setters
+    - unnecessary_new
+    - unnecessary_null_in_if_null_operators
+    - unnecessary_this
+    - unrelated_type_equality_checks
+    - use_function_type_syntax_for_parameters
+    - use_rethrow_when_possible
+    - valid_regexps
\ No newline at end of file
diff --git a/example/lib/bitcoin_cash/burn_token_example.dart b/example/lib/bitcoin_cash/burn_token_example.dart
index 9b25036..b0e8a36 100644
--- a/example/lib/bitcoin_cash/burn_token_example.dart
+++ b/example/lib/bitcoin_cash/burn_token_example.dart
@@ -10,7 +10,7 @@ void main() async {
       "wss://chipnet.imaginary.cash:50004");
 
   /// create provider with service
-  final provider = ElectrumApiProvider(service);
+  final provider = ElectrumProvider(service);
 
   /// initialize private key
   final privateKey = ECPrivate.fromBytes(BytesUtils.fromHexString(
@@ -34,7 +34,8 @@ void main() async {
 
   /// Reads all UTXOs (Unspent Transaction Outputs) associated with the account.
   /// We does not need tokens utxo and we set to false.
-  final elctrumUtxos = await provider.request(ElectrumScriptHashListUnspent(
+  final elctrumUtxos =
+      await provider.request(ElectrumRequestScriptHashListUnspent(
     scriptHash: p2pkhAddress.baseAddress.pubKeyHash(),
     includeTokens: true,
   ));
@@ -141,8 +142,8 @@ void main() async {
   final transactionRaw = transaaction.toHex();
 
   /// send transaction to network
-  await provider
-      .request(ElectrumBroadCastTransaction(transactionRaw: transactionRaw));
+  await provider.request(
+      ElectrumRequestBroadCastTransaction(transactionRaw: transactionRaw));
 
   /// done! check the transaction in block explorer
   ///  https://chipnet.imaginary.cash/tx/d85da44ba0c12ab8b0f4c636ca5451ae2c3a90b0f6d9e47fe381d0f5c6966ff3
diff --git a/example/lib/bitcoin_cash/create_cash_token_example.dart b/example/lib/bitcoin_cash/create_cash_token_example.dart
index bb93937..19af892 100644
--- a/example/lib/bitcoin_cash/create_cash_token_example.dart
+++ b/example/lib/bitcoin_cash/create_cash_token_example.dart
@@ -11,7 +11,7 @@ void main() async {
       "wss://chipnet.imaginary.cash:50004");
 
   /// create provider with service
-  final provider = ElectrumApiProvider(service);
+  final provider = ElectrumProvider(service);
 
   /// initialize private key
   final privateKey = ECPrivate.fromBytes(BytesUtils.fromHexString(
@@ -29,7 +29,8 @@ void main() async {
 
   /// Reads all UTXOs (Unspent Transaction Outputs) associated with the account.
   /// We does not need tokens utxo and we set to false.
-  final elctrumUtxos = await provider.request(ElectrumScriptHashListUnspent(
+  final elctrumUtxos =
+      await provider.request(ElectrumRequestScriptHashListUnspent(
     scriptHash: p2pkhAddress.pubKeyHash(),
     includeTokens: false,
   ));
@@ -135,8 +136,8 @@ void main() async {
   final transactionRaw = transaaction.toHex();
 
   /// send transaction to network
-  await provider
-      .request(ElectrumBroadCastTransaction(transactionRaw: transactionRaw));
+  await provider.request(
+      ElectrumRequestBroadCastTransaction(transactionRaw: transactionRaw));
 
   /// done! check the transaction in block explorer
   ///  https://chipnet.imaginary.cash/tx/fe0f9f84bd8782b8037160c09a515d39a9cc5bbeda6dcca6fb8a89e952bc9dea
diff --git a/example/lib/bitcoin_cash/create_nft_example.dart b/example/lib/bitcoin_cash/create_nft_example.dart
index 28404cd..e9af101 100644
--- a/example/lib/bitcoin_cash/create_nft_example.dart
+++ b/example/lib/bitcoin_cash/create_nft_example.dart
@@ -11,7 +11,7 @@ void main() async {
       "wss://chipnet.imaginary.cash:50004");
 
   /// create provider with service
-  final provider = ElectrumApiProvider(service);
+  final provider = ElectrumProvider(service);
 
   /// initialize private key
   final privateKey = ECPrivate.fromBytes(BytesUtils.fromHexString(
@@ -30,7 +30,8 @@ void main() async {
 
   /// Reads all UTXOs (Unspent Transaction Outputs) associated with the account.
   /// We does not need tokens utxo and we set to false.
-  final elctrumUtxos = await provider.request(ElectrumScriptHashListUnspent(
+  final elctrumUtxos =
+      await provider.request(ElectrumRequestScriptHashListUnspent(
     scriptHash: p2pkhAddress.baseAddress.pubKeyHash(),
     includeTokens: false,
   ));
@@ -121,8 +122,8 @@ void main() async {
   final transactionRaw = transaaction.toHex();
 
   /// send transaction to network
-  await provider
-      .request(ElectrumBroadCastTransaction(transactionRaw: transactionRaw));
+  await provider.request(
+      ElectrumRequestBroadCastTransaction(transactionRaw: transactionRaw));
 
   /// done! check the transaction in block explorer
   /// https://chipnet.imaginary.cash/tx/4e153029c75963f39920184233756f8f55d5a8f86e01cbdaf0340320c814e25e
diff --git a/example/lib/bitcoin_cash/make_vout0_example.dart b/example/lib/bitcoin_cash/make_vout0_example.dart
index aa71f8b..4f1730c 100644
--- a/example/lib/bitcoin_cash/make_vout0_example.dart
+++ b/example/lib/bitcoin_cash/make_vout0_example.dart
@@ -12,7 +12,7 @@ void main() async {
       await ElectrumSSLService.connect("chipnet.imaginary.cash:50002");
 
   /// create provider with service
-  final provider = ElectrumApiProvider(service);
+  final provider = ElectrumProvider(service);
 
   /// initialize private key
   final privateKey = ECPrivate.fromBytes(BytesUtils.fromHexString(
@@ -30,7 +30,8 @@ void main() async {
 
   /// Reads all UTXOs (Unspent Transaction Outputs) associated with the account.
   /// We does not need tokens utxo and we set to false.
-  final elctrumUtxos = await provider.request(ElectrumScriptHashListUnspent(
+  final elctrumUtxos =
+      await provider.request(ElectrumRequestScriptHashListUnspent(
     scriptHash: p2pkhAddress.pubKeyHash(),
     includeTokens: false,
   ));
@@ -77,8 +78,8 @@ void main() async {
   final transactionRaw = transaaction.toHex();
 
   /// send transaction to network
-  await provider
-      .request(ElectrumBroadCastTransaction(transactionRaw: transactionRaw));
+  await provider.request(
+      ElectrumRequestBroadCastTransaction(transactionRaw: transactionRaw));
 
   /// done! check the transaction in block explorer
   ///  https://chipnet.imaginary.cash/tx/b20d4c13fe67adc2f73aee0161eb51c7e813643ddc8eb655c6bd9ae72b7562cb
diff --git a/example/lib/bitcoin_cash/minting_nft_example.dart b/example/lib/bitcoin_cash/minting_nft_example.dart
index 092fb24..621c241 100644
--- a/example/lib/bitcoin_cash/minting_nft_example.dart
+++ b/example/lib/bitcoin_cash/minting_nft_example.dart
@@ -11,7 +11,7 @@ void main() async {
       await ElectrumWebSocketService.connect("wss://tbch4.loping.net:62004");
 
   /// create provider with service
-  final provider = ElectrumApiProvider(service);
+  final provider = ElectrumProvider(service);
 
   /// initialize private key
   final privateKey = ECPrivate.fromBytes(BytesUtils.fromHexString(
@@ -30,7 +30,8 @@ void main() async {
 
   /// Reads all UTXOs (Unspent Transaction Outputs) associated with the account.
   /// We does not need tokens utxo and we set to false.
-  final elctrumUtxos = await provider.request(ElectrumScriptHashListUnspent(
+  final elctrumUtxos =
+      await provider.request(ElectrumRequestScriptHashListUnspent(
     scriptHash: p2pkhAddress.baseAddress.pubKeyHash(),
     includeTokens: true,
   ));
@@ -177,8 +178,8 @@ void main() async {
   final transactionRaw = transaaction.toHex();
 
   /// send transaction to network
-  await provider
-      .request(ElectrumBroadCastTransaction(transactionRaw: transactionRaw));
+  await provider.request(
+      ElectrumRequestBroadCastTransaction(transactionRaw: transactionRaw));
 
   /// done! check the transaction in block explorer
   ///  https://tbch4.loping.net/tx/caa91b0fea2843a99c3cd7375ac4d3102b6b74a25e52cd866ad7ecc486204f0d
diff --git a/example/lib/bitcoin_cash/p2sh32_spend_example.dart b/example/lib/bitcoin_cash/p2sh32_spend_example.dart
index d46b23d..0081118 100644
--- a/example/lib/bitcoin_cash/p2sh32_spend_example.dart
+++ b/example/lib/bitcoin_cash/p2sh32_spend_example.dart
@@ -12,7 +12,7 @@ void main() async {
       "wss://chipnet.imaginary.cash:50004");
 
   /// create provider with service
-  final provider = ElectrumApiProvider(service);
+  final provider = ElectrumProvider(service);
 
   /// initialize private key
   final privateKey = ECPrivate.fromBytes(BytesUtils.fromHexString(
@@ -45,12 +45,12 @@ void main() async {
   /// Reads all UTXOs (Unspent Transaction Outputs) associated with the account.
   /// We does not need tokens utxo and we set to false.
   final example1ElectrumUtxos =
-      await provider.request(ElectrumScriptHashListUnspent(
+      await provider.request(ElectrumRequestScriptHashListUnspent(
     scriptHash: p2sh32Example1.baseAddress.pubKeyHash(),
     includeTokens: false,
   ));
   final example2ElectrumUtxos =
-      await provider.request(ElectrumScriptHashListUnspent(
+      await provider.request(ElectrumRequestScriptHashListUnspent(
     scriptHash: p2sh32Example2.baseAddress.pubKeyHash(),
     includeTokens: false,
   ));
@@ -111,8 +111,8 @@ void main() async {
   final transactionRaw = transaaction.toHex();
 
   /// send transaction to network
-  await provider
-      .request(ElectrumBroadCastTransaction(transactionRaw: transactionRaw));
+  await provider.request(
+      ElectrumRequestBroadCastTransaction(transactionRaw: transactionRaw));
 
   /// done! check the transaction in block explorer
   ///  https://chipnet.imaginary.cash/tx/b76b851ce0374504591db414d7469aadb68649079defb26e44c62e970afda729
diff --git a/example/lib/bitcoin_cash/send_ft_token_example.dart b/example/lib/bitcoin_cash/send_ft_token_example.dart
index d875661..cfbfc2b 100644
--- a/example/lib/bitcoin_cash/send_ft_token_example.dart
+++ b/example/lib/bitcoin_cash/send_ft_token_example.dart
@@ -11,7 +11,7 @@ void main() async {
       "wss://chipnet.imaginary.cash:50004");
 
   /// create provider with service
-  final provider = ElectrumApiProvider(service);
+  final provider = ElectrumProvider(service);
 
   /// initialize private key
   final privateKey = ECPrivate.fromBytes(BytesUtils.fromHexString(
@@ -35,7 +35,8 @@ void main() async {
 
   /// Reads all UTXOs (Unspent Transaction Outputs) associated with the account.
   /// We does not need tokens utxo and we set to false.
-  final elctrumUtxos = await provider.request(ElectrumScriptHashListUnspent(
+  final elctrumUtxos =
+      await provider.request(ElectrumRequestScriptHashListUnspent(
     scriptHash: p2pkhAddress.baseAddress.pubKeyHash(),
     includeTokens: true,
   ));
@@ -136,8 +137,8 @@ void main() async {
   final transactionRaw = transaaction.toHex();
 
   /// send transaction to network
-  await provider
-      .request(ElectrumBroadCastTransaction(transactionRaw: transactionRaw));
+  await provider.request(
+      ElectrumRequestBroadCastTransaction(transactionRaw: transactionRaw));
 
   /// done! check the transaction in block explorer
   ///  https://chipnet.imaginary.cash/tx/97030c1236a024de7cad7ceadf8571833029c508e016bcc8173146317e367ae6
diff --git a/example/lib/bitcoin_cash/transfer_bch_example.dart b/example/lib/bitcoin_cash/transfer_bch_example.dart
index f9631f9..a51ac29 100644
--- a/example/lib/bitcoin_cash/transfer_bch_example.dart
+++ b/example/lib/bitcoin_cash/transfer_bch_example.dart
@@ -12,7 +12,7 @@ void main() async {
       "wss://chipnet.imaginary.cash:50004");
 
   /// create provider with service
-  final provider = ElectrumApiProvider(service);
+  final provider = ElectrumProvider(service);
 
   /// initialize private key
   final privateKey = ECPrivate.fromBytes(BytesUtils.fromHexString(
@@ -39,7 +39,8 @@ void main() async {
 
   /// Reads all UTXOs (Unspent Transaction Outputs) associated with the account.
   /// We does not need tokens utxo and we set to false.
-  final elctrumUtxos = await provider.request(ElectrumScriptHashListUnspent(
+  final elctrumUtxos =
+      await provider.request(ElectrumRequestScriptHashListUnspent(
     scriptHash: p2pkhAddress.baseAddress.pubKeyHash(),
     includeTokens: false,
   ));
@@ -96,8 +97,8 @@ void main() async {
   final transactionRaw = transaaction.toHex();
 
   /// send transaction to network
-  await provider
-      .request(ElectrumBroadCastTransaction(transactionRaw: transactionRaw));
+  await provider.request(
+      ElectrumRequestBroadCastTransaction(transactionRaw: transactionRaw));
 
   /// done! check the transaction in block explorer
   ///  https://chipnet.imaginary.cash/tx/9e534f8a64f76b1af5ccf2522392697f2242fd215206a458cfe286bca4a3ec0a
diff --git a/example/lib/global/bch_example.dart b/example/lib/global/bch_example.dart
index 6b31303..73b5952 100644
--- a/example/lib/global/bch_example.dart
+++ b/example/lib/global/bch_example.dart
@@ -9,7 +9,7 @@ void main() async {
       "wss://chipnet.imaginary.cash:50004");
 
   /// create provider with service
-  final provider = ElectrumApiProvider(service);
+  final provider = ElectrumProvider(service);
 
   /// initialize private key
   final privateKey = ECPrivate.fromBytes(BytesUtils.fromHexString(
@@ -36,7 +36,8 @@ void main() async {
 
   /// Reads all UTXOs (Unspent Transaction Outputs) associated with the account.
   /// We does not need tokens utxo and we set to false.
-  final elctrumUtxos = await provider.request(ElectrumScriptHashListUnspent(
+  final elctrumUtxos =
+      await provider.request(ElectrumRequestScriptHashListUnspent(
     scriptHash: p2pkhAddress.baseAddress.pubKeyHash(),
     includeTokens: false,
   ));
@@ -93,8 +94,8 @@ void main() async {
   final transactionRaw = transaaction.toHex();
 
   /// send transaction to network
-  await provider
-      .request(ElectrumBroadCastTransaction(transactionRaw: transactionRaw));
+  await provider.request(
+      ElectrumRequestBroadCastTransaction(transactionRaw: transactionRaw));
 
   /// done! check the transaction in block explorer
   ///  https://chipnet.imaginary.cash/tx/9e534f8a64f76b1af5ccf2522392697f2242fd215206a458cfe286bca4a3ec0a
diff --git a/example/lib/global/btc_examples_multisig_taproot_legacy_uncomp.dart b/example/lib/global/btc_examples_multisig_taproot_legacy_uncomp.dart
index 1bd9fc1..617fa11 100644
--- a/example/lib/global/btc_examples_multisig_taproot_legacy_uncomp.dart
+++ b/example/lib/global/btc_examples_multisig_taproot_legacy_uncomp.dart
@@ -16,15 +16,18 @@ void main() async {
   };
   final account = MultiSignatureAddress(threshold: 8, signers: [
     MultiSignatureSigner(
-        publicKey: one.getPublic().toHex(compressed: false), weight: 1),
+        publicKey: one.getPublic().toHex(mode: PublicKeyType.uncompressed),
+        weight: 1),
     MultiSignatureSigner(publicKey: two.getPublic().toHex(), weight: 1),
     MultiSignatureSigner(publicKey: three.getPublic().toHex(), weight: 1),
     MultiSignatureSigner(
-        publicKey: four.getPublic().toHex(compressed: false), weight: 1),
+        publicKey: four.getPublic().toHex(mode: PublicKeyType.uncompressed),
+        weight: 1),
     MultiSignatureSigner(publicKey: five.getPublic().toHex(), weight: 1),
     MultiSignatureSigner(publicKey: six.getPublic().toHex(), weight: 1),
     MultiSignatureSigner(
-        publicKey: seven.getPublic().toHex(compressed: false), weight: 1),
+        publicKey: seven.getPublic().toHex(mode: PublicKeyType.uncompressed),
+        weight: 1),
     MultiSignatureSigner(publicKey: eight.getPublic().toHex(), weight: 1),
   ]);
 
@@ -34,24 +37,27 @@ void main() async {
       "testnet4-electrumx.wakiyamap.dev:51002");
 
   /// create provider with service
-  final provider = ElectrumApiProvider(service);
+  final provider = ElectrumProvider(service);
 
-  final addrOne = one.getPublic().toP2pkAddress(compressed: false);
+  final addrOne =
+      one.getPublic().toP2pkAddress(mode: PublicKeyType.uncompressed);
 
-  final addrTwo = two.getPublic().toAddress(compressed: false);
+  final addrTwo = two.getPublic().toAddress(mode: PublicKeyType.uncompressed);
 
-  final addrThree = three.getPublic().toP2pkInP2sh(compressed: false);
-  final addrFour = four.getPublic().toP2pkhInP2sh(compressed: false);
+  final addrThree =
+      three.getPublic().toP2pkInP2sh(mode: PublicKeyType.uncompressed);
+  final addrFour =
+      four.getPublic().toP2pkhInP2sh(mode: PublicKeyType.uncompressed);
   final addrFive = four.getPublic().toSegwitAddress();
   final addrSix = account.toP2shAddress();
   final addr7 = eight.getPublic().toTaprootAddress();
   final addr8 = eight.getPublic().toP2wshAddress();
   final addr9 = eight.getPublic().toP2wshInP2sh();
   final List<String> pubkys = [
-    one.getPublic().toHex(compressed: false),
-    two.getPublic().toHex(compressed: false),
-    three.getPublic().toHex(compressed: false),
-    four.getPublic().toHex(compressed: false),
+    one.getPublic().toHex(mode: PublicKeyType.uncompressed),
+    two.getPublic().toHex(mode: PublicKeyType.uncompressed),
+    three.getPublic().toHex(mode: PublicKeyType.uncompressed),
+    four.getPublic().toHex(mode: PublicKeyType.uncompressed),
     four.getPublic().toHex(),
     four.getPublic().toHex(),
     eight.getPublic().toHex(),
@@ -60,10 +66,10 @@ void main() async {
     eight.getPublic().toHex(),
   ];
   final addresses = [
-    one.getPublic().toP2pkAddress(compressed: false),
-    two.getPublic().toAddress(compressed: false),
-    three.getPublic().toP2pkInP2sh(compressed: false),
-    four.getPublic().toP2pkhInP2sh(compressed: false),
+    one.getPublic().toP2pkAddress(mode: PublicKeyType.uncompressed),
+    two.getPublic().toAddress(mode: PublicKeyType.uncompressed),
+    three.getPublic().toP2pkInP2sh(mode: PublicKeyType.uncompressed),
+    four.getPublic().toP2pkhInP2sh(mode: PublicKeyType.uncompressed),
     four.getPublic().toSegwitAddress(),
     four.getPublic().toP2wshInP2sh(),
     addrSix,
@@ -74,8 +80,9 @@ void main() async {
   List<UtxoWithAddress> utxos = [];
   for (int i = 0; i < addresses.length; i++) {
     final address = addresses[i];
-    final elctrumUtxos = await provider.request(ElectrumScriptHashListUnspent(
-        scriptHash: address.pubKeyHash(), includeTokens: false));
+    final elctrumUtxos = await provider.request(
+        ElectrumRequestScriptHashListUnspent(
+            scriptHash: address.pubKeyHash(), includeTokens: false));
     if (elctrumUtxos.isEmpty) continue;
     if (i == 6) {
       utxos.addAll(elctrumUtxos.map((e) => UtxoWithAddress(
@@ -124,8 +131,8 @@ void main() async {
   });
 
   final transactionRaw = transaaction.toHex();
-  await provider
-      .request(ElectrumBroadCastTransaction(transactionRaw: transactionRaw));
+  await provider.request(
+      ElectrumRequestBroadCastTransaction(transactionRaw: transactionRaw));
 }
 
 /// https://mempool.space/testnet4/tx/a7f08f07739de45a6a4f8871f8e6ad79e0aefbc940086df76571354ba22263fa
diff --git a/example/lib/global/transfer_from_7_account_to_6_accout_example.dart b/example/lib/global/transfer_from_7_account_to_6_accout_example.dart
index 61d02cc..bdfcaee 100644
--- a/example/lib/global/transfer_from_7_account_to_6_accout_example.dart
+++ b/example/lib/global/transfer_from_7_account_to_6_accout_example.dart
@@ -19,7 +19,7 @@ void main() async {
       await ElectrumSSLService.connect("testnet.aranguren.org:51002");
 
   /// create provider with service
-  final provider = ElectrumApiProvider(service);
+  final provider = ElectrumProvider(service);
 
   /// spender details
   final privateKey = ECPrivate.fromHex(
@@ -48,8 +48,8 @@ void main() async {
   /// loop each spenders address and get utxos and add to accountsUtxos
   for (final i in spenders) {
     /// Reads all UTXOs (Unspent Transaction Outputs) associated with the account
-    final elctrumUtxos = await provider
-        .request(ElectrumScriptHashListUnspent(scriptHash: i.pubKeyHash()));
+    final elctrumUtxos = await provider.request(
+        ElectrumRequestScriptHashListUnspent(scriptHash: i.pubKeyHash()));
 
     /// Converts all UTXOs to a list of UtxoWithAddress, containing UTXO information along with address details.
     /// read spender utxos
@@ -121,7 +121,7 @@ void main() async {
       enableRBF: true);
 
   /// get network fee esmtimate (fee per kilobyte)
-  final networkEstimate = await provider.request(ElectrumEstimateFee());
+  final networkEstimate = await provider.request(ElectrumRequestEstimateFee());
 
   /// the daemon does not have enough information to make an estimate
   if (networkEstimate == null) {
@@ -171,7 +171,8 @@ void main() async {
   final raw = transaction.serialize();
 
   /// send to network
-  await provider.request(ElectrumBroadCastTransaction(transactionRaw: raw));
+  await provider
+      .request(ElectrumRequestBroadCastTransaction(transactionRaw: raw));
 
   /// Once completed, we verify the status by checking the mempool or using another explorer to review the transaction details.
   /// https://mempool.space/testnet/tx/70cf664bba4b5ac9edc6133e9c6891ffaf8a55eaea9d2ac99aceead1c3db8899
diff --git a/example/lib/global/transfer_to_8_account_example.dart b/example/lib/global/transfer_to_8_account_example.dart
index 235c673..3469d37 100644
--- a/example/lib/global/transfer_to_8_account_example.dart
+++ b/example/lib/global/transfer_to_8_account_example.dart
@@ -9,7 +9,7 @@ void main() async {
       await ElectrumSSLService.connect("testnet.aranguren.org:51002");
 
   /// create provider with service
-  final provider = ElectrumApiProvider(service);
+  final provider = ElectrumProvider(service);
 
   /// spender details
   /// Define another private key from wif
@@ -26,8 +26,9 @@ void main() async {
   const network = BitcoinNetwork.testnet;
 
   /// Reads all UTXOs (Unspent Transaction Outputs) associated with the account
-  final elctrumUtxos = await provider.request(ElectrumScriptHashListUnspent(
-      scriptHash: examplePublicKey2.toAddress().pubKeyHash()));
+  final elctrumUtxos = await provider.request(
+      ElectrumRequestScriptHashListUnspent(
+          scriptHash: examplePublicKey2.toAddress().pubKeyHash()));
 
   /// Converts all UTXOs to a list of UtxoWithAddress, containing UTXO information along with address details.
   /// read spender utxos
@@ -100,7 +101,7 @@ void main() async {
       enableRBF: true);
 
   /// get network fee esmtimate (kb/s)
-  final networkEstimate = await provider.request(ElectrumEstimateFee());
+  final networkEstimate = await provider.request(ElectrumRequestEstimateFee());
 
   /// the daemon does not have enough information to make an estimate
   if (networkEstimate == null) {
@@ -149,7 +150,8 @@ void main() async {
   final raw = transaction.serialize();
 
   /// send to network
-  await provider.request(ElectrumBroadCastTransaction(transactionRaw: raw));
+  await provider
+      .request(ElectrumRequestBroadCastTransaction(transactionRaw: raw));
 
   /// Once completed, we verify the status by checking the mempool or using another explorer to review the transaction details.
   /// https://mempool.space/testnet/tx/abab018f3d2b92bf30c63b4aca419cf6d6571692b3620f06311c7e5a21a88b56
diff --git a/example/lib/services_examples/electrum/electrum_ssl_service.dart b/example/lib/services_examples/electrum/electrum_ssl_service.dart
index 362c306..048d825 100644
--- a/example/lib/services_examples/electrum/electrum_ssl_service.dart
+++ b/example/lib/services_examples/electrum/electrum_ssl_service.dart
@@ -4,9 +4,10 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 import 'package:bitcoin_base/bitcoin_base.dart';
+import 'package:blockchain_utils/service/models/params.dart';
 import 'package:example/services_examples/electrum/request_completer.dart';
 
-class ElectrumSSLService with BitcoinBaseElectrumRPCService {
+class ElectrumSSLService with ElectrumServiceProvider {
   ElectrumSSLService._(
     this.url,
     SecureSocket channel, {
@@ -24,7 +25,6 @@ class ElectrumSSLService with BitcoinBaseElectrumRPCService {
 
   bool get isConnected => _isDiscounnect;
 
-  @override
   final String url;
 
   void add(List<int> params) {
@@ -77,19 +77,18 @@ class ElectrumSSLService with BitcoinBaseElectrumRPCService {
   }
 
   @override
-  Future<Map<String, dynamic>> call(ElectrumRequestDetails params,
-      [Duration? timeout]) async {
+  Future<BaseServiceResponse<T>> doRequest<T>(ElectrumRequestDetails params,
+      {Duration? timeout}) async {
     final AsyncRequestCompleter compeleter =
         AsyncRequestCompleter(params.params);
-
     try {
-      requests[params.id] = compeleter;
+      requests[params.requestID] = compeleter;
       add(params.toTCPParams());
       final result = await compeleter.completer.future
           .timeout(timeout ?? defaultRequestTimeOut);
-      return result;
+      return params.toResponse(result);
     } finally {
-      requests.remove(params.id);
+      requests.remove(params.requestID);
     }
   }
 }
diff --git a/example/lib/services_examples/electrum/electrum_tcp_service.dart b/example/lib/services_examples/electrum/electrum_tcp_service.dart
index 750aad0..570665a 100644
--- a/example/lib/services_examples/electrum/electrum_tcp_service.dart
+++ b/example/lib/services_examples/electrum/electrum_tcp_service.dart
@@ -4,9 +4,10 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 import 'package:bitcoin_base/bitcoin_base.dart';
+import 'package:blockchain_utils/service/models/params.dart';
 import 'package:example/services_examples/electrum/request_completer.dart';
 
-class ElectrumTCPService with BitcoinBaseElectrumRPCService {
+class ElectrumTCPService with ElectrumServiceProvider {
   ElectrumTCPService._(
     this.url,
     Socket channel, {
@@ -24,7 +25,6 @@ class ElectrumTCPService with BitcoinBaseElectrumRPCService {
 
   bool get isConnected => _isDiscounnect;
 
-  @override
   final String url;
 
   void add(List<int> params) {
@@ -74,19 +74,18 @@ class ElectrumTCPService with BitcoinBaseElectrumRPCService {
   }
 
   @override
-  Future<Map<String, dynamic>> call(ElectrumRequestDetails params,
-      [Duration? timeout]) async {
+  Future<BaseServiceResponse<T>> doRequest<T>(ElectrumRequestDetails params,
+      {Duration? timeout}) async {
     final AsyncRequestCompleter compeleter =
         AsyncRequestCompleter(params.params);
-
     try {
-      requests[params.id] = compeleter;
-      add(params.toWebSocketParams());
+      requests[params.requestID] = compeleter;
+      add(params.toTCPParams());
       final result = await compeleter.completer.future
           .timeout(timeout ?? defaultRequestTimeOut);
-      return result;
+      return params.toResponse(result);
     } finally {
-      requests.remove(params.id);
+      requests.remove(params.requestID);
     }
   }
 }
diff --git a/example/lib/services_examples/electrum/electrum_websocket_service.dart b/example/lib/services_examples/electrum/electrum_websocket_service.dart
index 6ca10a2..341f1a6 100644
--- a/example/lib/services_examples/electrum/electrum_websocket_service.dart
+++ b/example/lib/services_examples/electrum/electrum_websocket_service.dart
@@ -2,10 +2,11 @@
 import 'dart:async';
 import 'dart:convert';
 import 'package:bitcoin_base/bitcoin_base.dart';
+import 'package:blockchain_utils/service/models/params.dart';
 import 'package:example/services_examples/cross_platform_websocket/core.dart';
 import 'package:example/services_examples/electrum/request_completer.dart';
 
-class ElectrumWebSocketService with BitcoinBaseElectrumRPCService {
+class ElectrumWebSocketService with ElectrumServiceProvider {
   ElectrumWebSocketService._(
     this.url,
     WebSocketCore channel, {
@@ -24,7 +25,6 @@ class ElectrumWebSocketService with BitcoinBaseElectrumRPCService {
 
   bool get isConnected => _isDiscounnect;
 
-  @override
   final String url;
 
   void add(List<int> params) {
@@ -73,19 +73,18 @@ class ElectrumWebSocketService with BitcoinBaseElectrumRPCService {
   }
 
   @override
-  Future<Map<String, dynamic>> call(ElectrumRequestDetails params,
-      [Duration? timeout]) async {
+  Future<BaseServiceResponse<T>> doRequest<T>(ElectrumRequestDetails params,
+      {Duration? timeout}) async {
     final AsyncRequestCompleter compeleter =
         AsyncRequestCompleter(params.params);
-
     try {
-      requests[params.id] = compeleter;
+      requests[params.requestID] = compeleter;
       add(params.toWebSocketParams());
       final result = await compeleter.completer.future
           .timeout(timeout ?? defaultRequestTimeOut);
-      return result;
+      return params.toResponse(result);
     } finally {
-      requests.remove(params.id);
+      requests.remove(params.requestID);
     }
   }
 }
diff --git a/example/pubspec.lock b/example/pubspec.lock
index 1ebf47f..e317342 100644
--- a/example/pubspec.lock
+++ b/example/pubspec.lock
@@ -15,15 +15,15 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "4.9.4"
+    version: "5.0.0"
   blockchain_utils:
     dependency: "direct main"
     description:
       name: blockchain_utils
-      sha256: "1e4f30b98d92f7ccf2eda009a23b53871a1c9b8b6dfa00bb1eb17ec00ae5eeeb"
+      sha256: d25cf2ebfa340c5261e77bc0b960f97529c283160d1b9b4f63f3015816369d9f
       url: "https://pub.dev"
     source: hosted
-    version: "3.6.0"
+    version: "4.0.0"
   boolean_selector:
     dependency: transitive
     description:
@@ -52,10 +52,10 @@ packages:
     dependency: transitive
     description:
       name: collection
-      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
+      sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf
       url: "https://pub.dev"
     source: hosted
-    version: "1.18.0"
+    version: "1.19.0"
   cupertino_icons:
     dependency: "direct main"
     description:
@@ -110,18 +110,18 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
+      sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.5"
+    version: "10.0.7"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
+      sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.5"
+    version: "3.0.8"
   leak_tracker_testing:
     dependency: transitive
     description:
@@ -174,7 +174,7 @@ packages:
     dependency: transitive
     description: flutter
     source: sdk
-    version: "0.0.99"
+    version: "0.0.0"
   source_span:
     dependency: transitive
     description:
@@ -187,10 +187,10 @@ packages:
     dependency: transitive
     description:
       name: stack_trace
-      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
+      sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377"
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.1"
+    version: "1.12.0"
   stream_channel:
     dependency: transitive
     description:
@@ -203,10 +203,10 @@ packages:
     dependency: transitive
     description:
       name: string_scanner
-      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
+      sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.0"
   term_glyph:
     dependency: transitive
     description:
@@ -219,10 +219,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
+      sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.2"
+    version: "0.7.3"
   typed_data:
     dependency: transitive
     description:
@@ -243,10 +243,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
+      sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b
       url: "https://pub.dev"
     source: hosted
-    version: "14.2.5"
+    version: "14.3.0"
   web:
     dependency: transitive
     description:
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
index 0997c19..c07a9b7 100644
--- a/example/pubspec.yaml
+++ b/example/pubspec.yaml
@@ -38,8 +38,8 @@ dependencies:
   bitcoin_base: 
     path: ../
   # blockchain_utils:
-  #   path: ../../blockchain_utils
-  blockchain_utils: ^3.6.0
+  #   path: ../../../blockchain_utils
+  blockchain_utils: ^4.0.0
   http: ^1.2.0
 
 dev_dependencies:
diff --git a/example/test/test_test.dart b/example/test/test_test.dart
new file mode 100644
index 0000000..ab73b3a
--- /dev/null
+++ b/example/test/test_test.dart
@@ -0,0 +1 @@
+void main() {}
diff --git a/lib/bitcoin_base.dart b/lib/bitcoin_base.dart
index ef45ef4..e908780 100644
--- a/lib/bitcoin_base.dart
+++ b/lib/bitcoin_base.dart
@@ -4,20 +4,22 @@
 /// including spending transactions, Bitcoin address management,
 ///  Bitcoin Schnorr signatures, BIP-39 mnemonic phrase generation,
 /// hierarchical deterministic (HD) wallet derivation, and Web3 Secret Storage Definition.
-library bitcoin_base;
+library;
 
-export 'package:bitcoin_base/src/bitcoin/address/address.dart';
+export 'src/bitcoin/address/address.dart';
 
-export 'package:bitcoin_base/src/bitcoin/script/scripts.dart';
+export 'src/bitcoin/script/scripts.dart';
 
-export 'package:bitcoin_base/src/crypto/crypto.dart';
+export 'src/crypto/crypto.dart';
 
-export 'package:bitcoin_base/src/models/network.dart';
+export 'src/models/network.dart';
 
-export 'package:bitcoin_base/src/provider/api_provider.dart';
+export 'src/provider/api_provider.dart';
 
-export 'package:bitcoin_base/src/utils/btc_utils.dart';
+export 'src/utils/btc_utils.dart';
 
-export 'package:bitcoin_base/src/cash_token/cash_token.dart';
+export 'src/cash_token/cash_token.dart';
 
-export 'package:bitcoin_base/src/bitcoin_cash/bitcoin_cash.dart';
+export 'src/bitcoin_cash/bitcoin_cash.dart';
+
+export 'src/transaction_builder/builder.dart';
diff --git a/lib/src/bitcoin/address/address.dart b/lib/src/bitcoin/address/address.dart
index 45ee9fe..f878515 100644
--- a/lib/src/bitcoin/address/address.dart
+++ b/lib/src/bitcoin/address/address.dart
@@ -6,7 +6,7 @@
 // - Utility functions for address manipulation.
 // - encode/decode Segregated Witness (SegWit) address implementation.
 // - Enhanced functionality for improved handling of addresses across diverse networks.
-library address;
+library;
 
 import 'package:bitcoin_base/bitcoin_base.dart';
 import 'package:bitcoin_base/src/exception/exception.dart';
diff --git a/lib/src/bitcoin/address/core.dart b/lib/src/bitcoin/address/core.dart
index 1ec79cc..00517f4 100644
--- a/lib/src/bitcoin/address/core.dart
+++ b/lib/src/bitcoin/address/core.dart
@@ -38,15 +38,15 @@ abstract class BitcoinAddressType implements Enumerate {
   ];
   T cast<T extends BitcoinAddressType>() {
     if (this is! T) {
-      throw DartBitcoinPluginException("BitcoinAddressType casting failed.",
-          details: {"excepted": "$T", "type": value});
+      throw DartBitcoinPluginException('BitcoinAddressType casting failed.',
+          details: {'excepted': '$T', 'type': value});
     }
     return this as T;
   }
 
   @override
   String toString() {
-    return "BitcoinAddressType.$value";
+    return 'BitcoinAddressType.$value';
   }
 }
 
@@ -59,8 +59,8 @@ abstract class BitcoinBaseAddress {
 }
 
 class PubKeyAddressType extends BitcoinAddressType {
-  const PubKeyAddressType._(String value) : super._(value);
-  static const PubKeyAddressType p2pk = PubKeyAddressType._("P2PK");
+  const PubKeyAddressType._(super.value) : super._();
+  static const PubKeyAddressType p2pk = PubKeyAddressType._('P2PK');
   @override
   bool get isP2sh => false;
   @override
@@ -70,14 +70,14 @@ class PubKeyAddressType extends BitcoinAddressType {
   int get hashLength => 20;
   @override
   String toString() {
-    return "PubKeyAddressType.$value";
+    return 'PubKeyAddressType.$value';
   }
 }
 
 class P2pkhAddressType extends BitcoinAddressType {
-  const P2pkhAddressType._(String value) : super._(value);
-  static const P2pkhAddressType p2pkh = P2pkhAddressType._("P2PKH");
-  static const P2pkhAddressType p2pkhwt = P2pkhAddressType._("P2PKHWT");
+  const P2pkhAddressType._(super.value) : super._();
+  static const P2pkhAddressType p2pkh = P2pkhAddressType._('P2PKH');
+  static const P2pkhAddressType p2pkhwt = P2pkhAddressType._('P2PKHWT');
 
   @override
   bool get isP2sh => false;
@@ -88,21 +88,21 @@ class P2pkhAddressType extends BitcoinAddressType {
   int get hashLength => 20;
   @override
   String toString() {
-    return "P2pkhAddressType.$value";
+    return 'P2pkhAddressType.$value';
   }
 }
 
 class P2shAddressType extends BitcoinAddressType {
-  const P2shAddressType._(String value, this.hashLength, this.withToken)
-      : super._(value);
+  const P2shAddressType._(super.value, this.hashLength, this.withToken)
+      : super._();
   static const P2shAddressType p2wshInP2sh = P2shAddressType._(
-      "P2SH/P2WSH", _BitcoinAddressUtils.hash160DigestLength, false);
+      'P2SH/P2WSH', _BitcoinAddressUtils.hash160DigestLength, false);
   static const P2shAddressType p2wpkhInP2sh = P2shAddressType._(
-      "P2SH/P2WPKH", _BitcoinAddressUtils.hash160DigestLength, false);
+      'P2SH/P2WPKH', _BitcoinAddressUtils.hash160DigestLength, false);
   static const P2shAddressType p2pkhInP2sh = P2shAddressType._(
-      "P2SH/P2PKH", _BitcoinAddressUtils.hash160DigestLength, false);
+      'P2SH/P2PKH', _BitcoinAddressUtils.hash160DigestLength, false);
   static const P2shAddressType p2pkInP2sh = P2shAddressType._(
-      "P2SH/P2PK", _BitcoinAddressUtils.hash160DigestLength, false);
+      'P2SH/P2PK', _BitcoinAddressUtils.hash160DigestLength, false);
   @override
   bool get isP2sh => true;
   @override
@@ -115,38 +115,38 @@ class P2shAddressType extends BitcoinAddressType {
   /// specify BCH NETWORK for now!
   /// Pay-to-Script-Hash-32
   static const P2shAddressType p2pkhInP2sh32 = P2shAddressType._(
-      "P2SH32/P2PKH", _BitcoinAddressUtils.scriptHashLenght, false);
+      'P2SH32/P2PKH', _BitcoinAddressUtils.scriptHashLenght, false);
   //// Pay-to-Script-Hash-32
   static const P2shAddressType p2pkInP2sh32 = P2shAddressType._(
-      "P2SH32/P2PK", _BitcoinAddressUtils.scriptHashLenght, false);
+      'P2SH32/P2PK', _BitcoinAddressUtils.scriptHashLenght, false);
 
   /// Pay-to-Script-Hash-32-with-token
   static const P2shAddressType p2pkhInP2sh32wt = P2shAddressType._(
-      "P2SH32WT/P2PKH", _BitcoinAddressUtils.scriptHashLenght, true);
+      'P2SH32WT/P2PKH', _BitcoinAddressUtils.scriptHashLenght, true);
 
   /// Pay-to-Script-Hash-32-with-token
   static const P2shAddressType p2pkInP2sh32wt = P2shAddressType._(
-      "P2SH32WT/P2PK", _BitcoinAddressUtils.scriptHashLenght, true);
+      'P2SH32WT/P2PK', _BitcoinAddressUtils.scriptHashLenght, true);
 
   /// Pay-to-Script-Hash-with-token
   static const P2shAddressType p2pkhInP2shwt = P2shAddressType._(
-      "P2SHWT/P2PKH", _BitcoinAddressUtils.hash160DigestLength, true);
+      'P2SHWT/P2PKH', _BitcoinAddressUtils.hash160DigestLength, true);
 
   /// Pay-to-Script-Hash-with-token
   static const P2shAddressType p2pkInP2shwt = P2shAddressType._(
-      "P2SHWT/P2PK", _BitcoinAddressUtils.hash160DigestLength, true);
+      'P2SHWT/P2PK', _BitcoinAddressUtils.hash160DigestLength, true);
 
   @override
   String toString() {
-    return "P2shAddressType.$value";
+    return 'P2shAddressType.$value';
   }
 }
 
 class SegwitAddressType extends BitcoinAddressType {
-  const SegwitAddressType._(String value) : super._(value);
-  static const SegwitAddressType p2wpkh = SegwitAddressType._("P2WPKH");
-  static const SegwitAddressType p2tr = SegwitAddressType._("P2TR");
-  static const SegwitAddressType p2wsh = SegwitAddressType._("P2WSH");
+  const SegwitAddressType._(super.value) : super._();
+  static const SegwitAddressType p2wpkh = SegwitAddressType._('P2WPKH');
+  static const SegwitAddressType p2tr = SegwitAddressType._('P2TR');
+  static const SegwitAddressType p2wsh = SegwitAddressType._('P2WSH');
   @override
   bool get isP2sh => false;
   @override
@@ -164,6 +164,6 @@ class SegwitAddressType extends BitcoinAddressType {
 
   @override
   String toString() {
-    return "SegwitAddressType.$value";
+    return 'SegwitAddressType.$value';
   }
 }
diff --git a/lib/src/bitcoin/address/legacy_address.dart b/lib/src/bitcoin/address/legacy_address.dart
index 30b1445..0b0202e 100644
--- a/lib/src/bitcoin/address/legacy_address.dart
+++ b/lib/src/bitcoin/address/legacy_address.dart
@@ -15,7 +15,7 @@ abstract class LegacyAddress implements BitcoinBaseAddress {
         address: address, type: type, network: network);
     if (decode == null) {
       throw DartBitcoinPluginException(
-          "Invalid ${network.conf.coinName} address");
+          'Invalid ${network.conf.coinName} address');
     }
     _addressProgram = decode;
   }
@@ -45,14 +45,14 @@ abstract class LegacyAddress implements BitcoinBaseAddress {
 
 class P2shAddress extends LegacyAddress {
   P2shAddress.fromScript(
-      {required Script script, this.type = P2shAddressType.p2pkInP2sh})
-      : super.fromScript(script: script);
+      {required super.script, this.type = P2shAddressType.p2pkInP2sh})
+      : super.fromScript();
 
   P2shAddress.fromAddress(
-      {required String address,
-      required BasedUtxoNetwork network,
+      {required super.address,
+      required super.network,
       this.type = P2shAddressType.p2pkInP2sh})
-      : super.fromAddress(address: address, network: network);
+      : super.fromAddress();
   P2shAddress.fromHash160(
       {required String addrHash, this.type = P2shAddressType.p2pkInP2sh})
       : super.fromHash160(addrHash, type);
@@ -64,7 +64,7 @@ class P2shAddress extends LegacyAddress {
   String toAddress(BasedUtxoNetwork network) {
     if (!network.supportedAddress.contains(type)) {
       throw DartBitcoinPluginException(
-          "network does not support ${type.value} address");
+          'network does not support ${type.value} address');
     }
     return super.toAddress(network);
   }
@@ -81,13 +81,13 @@ class P2shAddress extends LegacyAddress {
 
 class P2pkhAddress extends LegacyAddress {
   P2pkhAddress.fromScript(
-      {required Script script, this.type = P2pkhAddressType.p2pkh})
-      : super.fromScript(script: script);
+      {required super.script, this.type = P2pkhAddressType.p2pkh})
+      : super.fromScript();
   P2pkhAddress.fromAddress(
-      {required String address,
-      required BasedUtxoNetwork network,
+      {required super.address,
+      required super.network,
       this.type = P2pkhAddressType.p2pkh})
-      : super.fromAddress(address: address, network: network);
+      : super.fromAddress();
   P2pkhAddress.fromHash160(
       {required String addrHash, this.type = P2pkhAddressType.p2pkh})
       : super.fromHash160(addrHash, type);
@@ -111,7 +111,7 @@ class P2pkAddress extends LegacyAddress {
   P2pkAddress({required String publicKey}) : super._() {
     final toBytes = BytesUtils.fromHexString(publicKey);
     if (!Secp256k1PublicKeyEcdsa.isValidBytes(toBytes)) {
-      throw const DartBitcoinPluginException("Invalid secp256k1 public key");
+      throw const DartBitcoinPluginException('Invalid secp256k1 public key');
     }
     publicHex = publicKey;
   }
diff --git a/lib/src/bitcoin/address/network_address.dart b/lib/src/bitcoin/address/network_address.dart
index 56132e2..62770b4 100644
--- a/lib/src/bitcoin/address/network_address.dart
+++ b/lib/src/bitcoin/address/network_address.dart
@@ -108,7 +108,7 @@ class BitcoinCashAddress extends BitcoinNetworkAddress<BitcoinCashNetwork> {
         address, network,
         validateNetworkHRP: validateNetworkPrefix);
     if (decodeAddress == null) {
-      throw DartBitcoinPluginException("Invalid ${network.value} address.");
+      throw DartBitcoinPluginException('Invalid ${network.value} address.');
     }
     return BitcoinCashAddress._(decodeAddress, address, network);
   }
diff --git a/lib/src/bitcoin/address/segwit_address.dart b/lib/src/bitcoin/address/segwit_address.dart
index 5ecaf2f..2e3e8c1 100644
--- a/lib/src/bitcoin/address/segwit_address.dart
+++ b/lib/src/bitcoin/address/segwit_address.dart
@@ -7,7 +7,7 @@ abstract class SegwitAddress implements BitcoinBaseAddress {
       required this.segwitVersion}) {
     if (!network.supportedAddress.contains(type)) {
       throw DartBitcoinPluginException(
-          "network does not support ${type.value} address");
+          'network does not support ${type.value} address');
     }
     addressProgram = _BitcoinAddressUtils.toSegwitProgramWithVersionAndNetwork(
         address: address, version: segwitVersion, network: network);
@@ -31,7 +31,7 @@ abstract class SegwitAddress implements BitcoinBaseAddress {
   String toAddress(BasedUtxoNetwork network) {
     if (!network.supportedAddress.contains(type)) {
       throw DartBitcoinPluginException(
-          "network does not support ${type.value} address");
+          'network does not support ${type.value} address');
     }
     return _BitcoinAddressUtils.segwitToAddress(
         addressProgram: addressProgram,
@@ -46,21 +46,15 @@ abstract class SegwitAddress implements BitcoinBaseAddress {
 }
 
 class P2wpkhAddress extends SegwitAddress {
-  P2wpkhAddress.fromAddress(
-      {required String address, required BasedUtxoNetwork network})
-      : super.fromAddress(
-            segwitVersion: _BitcoinAddressUtils.segwitV0,
-            address: address,
-            network: network);
+  P2wpkhAddress.fromAddress({required super.address, required super.network})
+      : super.fromAddress(segwitVersion: _BitcoinAddressUtils.segwitV0);
 
-  P2wpkhAddress.fromProgram({required String program})
+  P2wpkhAddress.fromProgram({required super.program})
       : super.fromProgram(
             segwitVersion: _BitcoinAddressUtils.segwitV0,
-            addresType: SegwitAddressType.p2wpkh,
-            program: program);
-  P2wpkhAddress.fromScript({required Script script})
-      : super.fromScript(
-            segwitVersion: _BitcoinAddressUtils.segwitV0, script: script);
+            addresType: SegwitAddressType.p2wpkh);
+  P2wpkhAddress.fromScript({required super.script})
+      : super.fromScript(segwitVersion: _BitcoinAddressUtils.segwitV0);
 
   /// returns the scriptPubKey of a P2WPKH witness script
   @override
@@ -74,20 +68,14 @@ class P2wpkhAddress extends SegwitAddress {
 }
 
 class P2trAddress extends SegwitAddress {
-  P2trAddress.fromAddress(
-      {required String address, required BasedUtxoNetwork network})
-      : super.fromAddress(
-            segwitVersion: _BitcoinAddressUtils.segwitV1,
-            address: address,
-            network: network);
-  P2trAddress.fromProgram({required String program})
+  P2trAddress.fromAddress({required super.address, required super.network})
+      : super.fromAddress(segwitVersion: _BitcoinAddressUtils.segwitV1);
+  P2trAddress.fromProgram({required super.program})
       : super.fromProgram(
             segwitVersion: _BitcoinAddressUtils.segwitV1,
-            addresType: SegwitAddressType.p2tr,
-            program: program);
-  P2trAddress.fromScript({required Script script})
-      : super.fromScript(
-            segwitVersion: _BitcoinAddressUtils.segwitV1, script: script);
+            addresType: SegwitAddressType.p2tr);
+  P2trAddress.fromScript({required super.script})
+      : super.fromScript(segwitVersion: _BitcoinAddressUtils.segwitV1);
 
   /// returns the scriptPubKey of a P2TR witness script
   @override
@@ -101,20 +89,14 @@ class P2trAddress extends SegwitAddress {
 }
 
 class P2wshAddress extends SegwitAddress {
-  P2wshAddress.fromAddress(
-      {required String address, required BasedUtxoNetwork network})
-      : super.fromAddress(
-            segwitVersion: _BitcoinAddressUtils.segwitV0,
-            address: address,
-            network: network);
-  P2wshAddress.fromProgram({required String program})
+  P2wshAddress.fromAddress({required super.address, required super.network})
+      : super.fromAddress(segwitVersion: _BitcoinAddressUtils.segwitV0);
+  P2wshAddress.fromProgram({required super.program})
       : super.fromProgram(
             segwitVersion: _BitcoinAddressUtils.segwitV0,
-            addresType: SegwitAddressType.p2wsh,
-            program: program);
-  P2wshAddress.fromScript({required Script script})
-      : super.fromScript(
-            segwitVersion: _BitcoinAddressUtils.segwitV0, script: script);
+            addresType: SegwitAddressType.p2wsh);
+  P2wshAddress.fromScript({required super.script})
+      : super.fromScript(segwitVersion: _BitcoinAddressUtils.segwitV0);
 
   /// Returns the scriptPubKey of a P2WPKH witness script
   @override
diff --git a/lib/src/bitcoin/address/utils/address_utils.dart b/lib/src/bitcoin/address/utils/address_utils.dart
index 9463f32..22538bf 100644
--- a/lib/src/bitcoin/address/utils/address_utils.dart
+++ b/lib/src/bitcoin/address/utils/address_utils.dart
@@ -25,7 +25,7 @@ class _BitcoinAddressUtils {
       final decode = List<int>.unmodifiable(Base58Decoder.decode(address));
 
       /// Extract script bytes excluding version and checksum.
-      final List<int> scriptBytes =
+      final scriptBytes =
           decode.sublist(1, decode.length - Base58Const.checksumByteLen);
 
       /// Ensure the script bytes have the expected length.
@@ -34,14 +34,14 @@ class _BitcoinAddressUtils {
       }
 
       /// Extract version, data, and checksum.
-      final List<int> version = [decode[0]];
-      final List<int> data =
+      final version = <int>[decode[0]];
+      final data =
           decode.sublist(0, decode.length - Base58Const.checksumByteLen);
-      final List<int> checksum =
+      final checksum =
           decode.sublist(decode.length - Base58Const.checksumByteLen);
 
       /// Verify the checksum.
-      final List<int> hash = QuickCrypto.sha256DoubleHash(data)
+      final hash = QuickCrypto.sha256DoubleHash(data)
           .sublist(0, Base58Const.checksumByteLen);
       if (!BytesUtils.bytesEqual(checksum, hash)) {
         return null;
@@ -89,7 +89,7 @@ class _BitcoinAddressUtils {
     final convert = SegwitBech32Decoder.decode(network.p2wpkhHrp, address);
     final witnessVersion = convert.item1;
     if (witnessVersion != version) {
-      throw const DartBitcoinPluginException("Invalid segwit version");
+      throw const DartBitcoinPluginException('Invalid segwit version');
     }
     return BytesUtils.toHexString(convert.item2);
   }
@@ -138,7 +138,7 @@ class _BitcoinAddressUtils {
       return address;
     }
     throw DartBitcoinPluginException(
-        "${network.value} does not support ${address.type.value} address");
+        '${network.value} does not support ${address.type.value} address');
   }
 
   /// Decodes a Bitcoin address and returns a corresponding BitcoinBaseAddress instance
@@ -158,7 +158,7 @@ class _BitcoinAddressUtils {
     }
     baseAddress ??= toLegacy(address, network);
     if (baseAddress == null) {
-      throw const DartBitcoinPluginException("Invalid Bitcoin address");
+      throw const DartBitcoinPluginException('Invalid Bitcoin address');
     }
     return validateAddress(baseAddress, network);
   }
@@ -181,7 +181,7 @@ class _BitcoinAddressUtils {
       // ignore: empty_catches
     } catch (e) {}
     throw const DartBitcoinPluginException(
-        "Invalid Bitcoin address program length (program length should be 32 or 20 bytes)");
+        'Invalid Bitcoin address program length (program length should be 32 or 20 bytes)');
   }
 
   /// Decodes a Bitcoin Cash (BCH) address and returns a corresponding LegacyAddress instance
@@ -197,9 +197,9 @@ class _BitcoinAddressUtils {
       String address, BitcoinCashNetwork network,
       {bool validateNetworkHRP = false}) {
     try {
-      final String hrp = validateNetworkHRP
+      final hrp = validateNetworkHRP
           ? network.networkHRP
-          : address.substring(0, address.indexOf(":"));
+          : address.substring(0, address.indexOf(':'));
       final decode = BchBech32Decoder.decode(hrp, address);
       final scriptBytes = decode.item2;
       final version = decode.item1;
@@ -277,7 +277,7 @@ class _BitcoinAddressUtils {
       required BasedUtxoNetwork network}) {
     if (!network.supportedAddress.contains(type)) {
       throw DartBitcoinPluginException(
-          "${network.value} does not support ${type.value} address type");
+          '${network.value} does not support ${type.value} address type');
     }
     if (network is BitcoinCashNetwork) {
       final decode = _BitcoinAddressUtils.decodeBchAddress(address, network);
@@ -292,7 +292,7 @@ class _BitcoinAddressUtils {
     if (decode == null) return null;
     final version = decode.item2;
     final addrBytes = decode.item1;
-    final String scriptHex = BytesUtils.toHexString(addrBytes);
+    final scriptHex = BytesUtils.toHexString(addrBytes);
 
     switch (type) {
       case P2pkhAddressType.p2pkh:
@@ -351,8 +351,8 @@ class _BitcoinAddressUtils {
       {required BitcoinCashNetwork network,
       required String addressProgram,
       required BitcoinAddressType type}) {
-    final List<int> programBytes = BytesUtils.fromHexString(addressProgram);
-    final List<int> netVersion = _getBchNetVersion(
+    final programBytes = BytesUtils.fromHexString(addressProgram);
+    final netVersion = _getBchNetVersion(
         network: network, type: type, secriptLength: programBytes.length);
 
     return BchBech32Encoder.encode(
@@ -370,7 +370,7 @@ class _BitcoinAddressUtils {
       {required BitcoinCashNetwork network,
       required BitcoinAddressType type,
       int secriptLength = hash160DigestLength}) {
-    final bool isToken = type.value.contains("WT");
+    final isToken = type.value.contains('WT');
     if (!type.isP2sh) {
       if (!isToken) return network.p2pkhNetVer;
       return network.p2pkhWtNetVer;
@@ -406,7 +406,7 @@ class _BitcoinAddressUtils {
       return legacyToBchAddress(
           addressProgram: addressProgram, network: network, type: type);
     }
-    List<int> programBytes = BytesUtils.fromHexString(addressProgram);
+    var programBytes = BytesUtils.fromHexString(addressProgram);
     switch (type) {
       case P2shAddressType.p2wpkhInP2sh:
       case P2shAddressType.p2wshInP2sh:
@@ -431,7 +431,7 @@ class _BitcoinAddressUtils {
   /// Returns the RIPEMD-160 hash of the public key as a hexadecimal string.
   static String pubkeyToHash160(String publicKey) {
     final bytes = BytesUtils.fromHexString(publicKey);
-    final List<int> ripemd160Hash = QuickCrypto.hash160(bytes);
+    final ripemd160Hash = QuickCrypto.hash160(bytes);
     return BytesUtils.toHexString(ripemd160Hash);
   }
 
diff --git a/lib/src/bitcoin/script/control_block.dart b/lib/src/bitcoin/script/control_block.dart
index d6a07b2..209e4eb 100644
--- a/lib/src/bitcoin/script/control_block.dart
+++ b/lib/src/bitcoin/script/control_block.dart
@@ -12,10 +12,10 @@ class ControlBlock {
   final List<int>? scripts;
 
   List<int> toBytes() {
-    final List<int> version = [BitcoinOpCodeConst.LEAF_VERSION_TAPSCRIPT];
+    final version = <int>[BitcoinOpCodeConst.LEAF_VERSION_TAPSCRIPT];
 
-    final List<int> pubKey = BytesUtils.fromHexString(public.toXOnlyHex());
-    final List<int> marklePath = scripts ?? [];
+    final pubKey = BytesUtils.fromHexString(public.toXOnlyHex());
+    final marklePath = scripts ?? [];
     return [...version, ...pubKey, ...marklePath];
   }
 
diff --git a/lib/src/bitcoin/script/input.dart b/lib/src/bitcoin/script/input.dart
index f1b56da..c5f841b 100644
--- a/lib/src/bitcoin/script/input.dart
+++ b/lib/src/bitcoin/script/input.dart
@@ -60,17 +60,16 @@ class TxInput {
 
   static Tuple<TxInput, int> deserialize(
       {required List<int> bytes, int cursor = 0, bool hasSegwit = false}) {
-    final List<int> inpHash =
-        bytes.sublist(cursor, cursor + 32).reversed.toList();
+    final inpHash = bytes.sublist(cursor, cursor + 32).reversed.toList();
     cursor += 32;
-    final int outputN = IntUtils.fromBytes(bytes.sublist(cursor, cursor + 4),
+    final outputN = IntUtils.fromBytes(bytes.sublist(cursor, cursor + 4),
         byteOrder: Endian.little);
     cursor += 4;
     final vi = IntUtils.decodeVarint(bytes.sublist(cursor));
     cursor += vi.item2;
-    final List<int> unlockingScript = bytes.sublist(cursor, cursor + vi.item1);
+    final unlockingScript = bytes.sublist(cursor, cursor + vi.item1);
     cursor += vi.item1;
-    final List<int> sequenceNumberData = bytes.sublist(cursor, cursor + 4);
+    final sequenceNumberData = bytes.sublist(cursor, cursor + 4);
     cursor += 4;
     return Tuple(
         TxInput(
@@ -84,15 +83,15 @@ class TxInput {
 
   Map<String, dynamic> toJson() {
     return {
-      "txid": txId,
-      "txIndex": txIndex,
-      "scriptSig": scriptSig.script,
-      "sequance": BytesUtils.toHexString(sequence),
+      'txid': txId,
+      'txIndex': txIndex,
+      'scriptSig': scriptSig.script,
+      'sequance': BytesUtils.toHexString(sequence),
     };
   }
 
   @override
   String toString() {
-    return "TxInput{txId: $txId, txIndex: $txIndex, scriptSig: $scriptSig, sequence: ${BytesUtils.toHexString(sequence)}}";
+    return 'TxInput{txId: $txId, txIndex: $txIndex, scriptSig: $scriptSig, sequence: ${BytesUtils.toHexString(sequence)}}';
   }
 }
diff --git a/lib/src/bitcoin/script/op_code/constant.dart b/lib/src/bitcoin/script/op_code/constant.dart
index 4825e66..7091ec1 100644
--- a/lib/src/bitcoin/script/op_code/constant.dart
+++ b/lib/src/bitcoin/script/op_code/constant.dart
@@ -261,9 +261,9 @@ class BitcoinOpCodeConst {
   static const int NEGATIVE_SATOSHI = -1;
 
   /// Bitcoin address types
-  static const String P2PKH_ADDRESS = "p2pkh";
-  static const String P2SH_ADDRESS = "p2sh";
-  static const String P2WPKH_ADDRESS_V0 = "p2wpkhv0";
-  static const String P2WSH_ADDRESS_V0 = "p2wshv0";
-  static const String P2TR_ADDRESS_V1 = "p2trv1";
+  static const String P2PKH_ADDRESS = 'p2pkh';
+  static const String P2SH_ADDRESS = 'p2sh';
+  static const String P2WPKH_ADDRESS_V0 = 'p2wpkhv0';
+  static const String P2WSH_ADDRESS_V0 = 'p2wshv0';
+  static const String P2TR_ADDRESS_V1 = 'p2trv1';
 }
diff --git a/lib/src/bitcoin/script/op_code/constant_lib.dart b/lib/src/bitcoin/script/op_code/constant_lib.dart
index a304302..e6c4f56 100644
--- a/lib/src/bitcoin/script/op_code/constant_lib.dart
+++ b/lib/src/bitcoin/script/op_code/constant_lib.dart
@@ -1,4 +1,4 @@
-library op_code;
+library;
 
 export 'constant.dart';
 export 'tools.dart';
diff --git a/lib/src/bitcoin/script/op_code/tools.dart b/lib/src/bitcoin/script/op_code/tools.dart
index a68492a..1dafe7b 100644
--- a/lib/src/bitcoin/script/op_code/tools.dart
+++ b/lib/src/bitcoin/script/op_code/tools.dart
@@ -5,7 +5,7 @@ import 'package:bitcoin_base/src/exception/exception.dart';
 import 'package:blockchain_utils/utils/utils.dart';
 
 List<int> opPushData(String hexData) {
-  final List<int> dataBytes = BytesUtils.fromHexString(hexData);
+  final dataBytes = BytesUtils.fromHexString(hexData);
   if (dataBytes.length < BitcoinOpCodeConst.opPushData1) {
     return [dataBytes.length, ...dataBytes];
   } else if (dataBytes.length < mask8) {
@@ -20,7 +20,7 @@ List<int> opPushData(String hexData) {
     return [BitcoinOpCodeConst.opPushData4, ...lengthBytes, ...dataBytes];
   } else {
     throw const DartBitcoinPluginException(
-        "Data too large. Cannot push into script");
+        'Data too large. Cannot push into script');
   }
 }
 
@@ -31,11 +31,11 @@ List<int> pushInteger(int integer) {
   }
 
   /// Calculate the number of bytes required to represent the integer
-  final int numberOfBytes = (integer.bitLength + 7) ~/ 8;
+  final numberOfBytes = (integer.bitLength + 7) ~/ 8;
 
   /// Convert to little-endian bytes
-  List<int> integerBytes = List<int>.filled(numberOfBytes, 0);
-  for (int i = 0; i < numberOfBytes; i++) {
+  var integerBytes = List<int>.filled(numberOfBytes, 0);
+  for (var i = 0; i < numberOfBytes; i++) {
     integerBytes[i] = (integer >> (i * 8)) & mask8;
   }
 
diff --git a/lib/src/bitcoin/script/output.dart b/lib/src/bitcoin/script/output.dart
index 61bca22..555d062 100644
--- a/lib/src/bitcoin/script/output.dart
+++ b/lib/src/bitcoin/script/output.dart
@@ -16,9 +16,9 @@ class TxOutput {
 
   Map<String, dynamic> toJson() {
     return {
-      "cashToken": cashToken?.toJson(),
-      "amount": amount.toString(),
-      "scriptPubKey": scriptPubKey.script
+      'cashToken': cashToken?.toJson(),
+      'amount': amount.toString(),
+      'scriptPubKey': scriptPubKey.script
     };
   }
 
@@ -33,7 +33,7 @@ class TxOutput {
   List<int> toBytes() {
     final amountBytes =
         BigintUtils.toBytes(amount, length: 8, order: Endian.little);
-    final List<int> scriptBytes = [
+    final scriptBytes = <int>[
       ...cashToken?.toBytes() ?? <int>[],
       ...scriptPubKey.toBytes()
     ];
@@ -56,8 +56,7 @@ class TxOutput {
     cursor += vi.item2;
     final token = CashToken.fromRaw(bytes.sublist(cursor));
 
-    final List<int> lockScript =
-        bytes.sublist(cursor + token.item2, cursor + vi.item1);
+    final lockScript = bytes.sublist(cursor + token.item2, cursor + vi.item1);
     cursor += vi.item1;
     return Tuple(
         TxOutput(
@@ -70,6 +69,6 @@ class TxOutput {
 
   @override
   String toString() {
-    return "TxOutput{cashToken: ${cashToken?.toString()}}, amount: $amount, script: ${scriptPubKey.toString()}}";
+    return 'TxOutput{cashToken: ${cashToken?.toString()}}, amount: $amount, script: ${scriptPubKey.toString()}}';
   }
 }
diff --git a/lib/src/bitcoin/script/script.dart b/lib/src/bitcoin/script/script.dart
index 96c57c7..04d08d5 100644
--- a/lib/src/bitcoin/script/script.dart
+++ b/lib/src/bitcoin/script/script.dart
@@ -12,17 +12,17 @@ class Script {
           }
           return true;
         }(),
-            "A valid script is a composition of opcodes, hexadecimal strings, and integers arranged in a structured list."),
+            'A valid script is a composition of opcodes, hexadecimal strings, and integers arranged in a structured list.'),
         script = List.unmodifiable(script);
   final List<dynamic> script;
 
   static Script deserialize(
       {required List<int> bytes, bool hasSegwit = false}) {
-    final List<String> commands = [];
-    int index = 0;
+    final commands = <String>[];
+    var index = 0;
     // final scriptBytes = BytesUtils.fromHexString(hexData);
     while (index < bytes.length) {
-      final int byte = bytes[index];
+      final byte = bytes[index];
       if (BitcoinOpCodeConst.CODE_OPS.containsKey(byte)) {
         if (!BitcoinOpCodeConst.isOpPushData(byte)) {
           commands.add(BitcoinOpCodeConst.CODE_OPS[byte]!);
@@ -32,7 +32,7 @@ class Script {
         index = index + 1;
         if (byte == BitcoinOpCodeConst.opPushData1) {
           // get len
-          final int bytesToRead = bytes[index];
+          final bytesToRead = bytes[index];
           // skip len
           index = index + 1;
           commands.add(BytesUtils.toHexString(
@@ -42,13 +42,13 @@ class Script {
           index = index + bytesToRead;
         } else if (byte == BitcoinOpCodeConst.opPushData2) {
           /// get len
-          final int bytesToRead = readUint16LE(bytes, index);
+          final bytesToRead = readUint16LE(bytes, index);
           index = index + 2;
           commands.add(BytesUtils.toHexString(
               bytes.sublist(index, index + bytesToRead)));
           index = index + bytesToRead;
         } else if (byte == BitcoinOpCodeConst.opPushData4) {
-          final int bytesToRead = readUint32LE(bytes, index);
+          final bytesToRead = readUint32LE(bytes, index);
 
           index = index + 4;
           commands.add(BytesUtils.toHexString(
@@ -57,8 +57,8 @@ class Script {
         }
       } else {
         final viAndSize = IntUtils.decodeVarint(bytes.sublist(index));
-        final int dataSize = viAndSize.item1;
-        final int size = viAndSize.item2;
+        final dataSize = viAndSize.item1;
+        final size = viAndSize.item2;
         final lastIndex = (index + size + dataSize) > bytes.length
             ? bytes.length
             : (index + size + dataSize);
@@ -72,7 +72,7 @@ class Script {
 
   List<int> toBytes() {
     if (script.isEmpty) return <int>[];
-    final DynamicByteTracker scriptBytes = DynamicByteTracker();
+    final scriptBytes = DynamicByteTracker();
     for (final token in script) {
       if (BitcoinOpCodeConst.OP_CODES.containsKey(token)) {
         scriptBytes.add(BitcoinOpCodeConst.OP_CODES[token]!);
diff --git a/lib/src/bitcoin/script/sequence.dart b/lib/src/bitcoin/script/sequence.dart
index 920212f..e4cfd0f 100644
--- a/lib/src/bitcoin/script/sequence.dart
+++ b/lib/src/bitcoin/script/sequence.dart
@@ -31,7 +31,7 @@ class Sequence {
       return List<int>.from(BitcoinOpCodeConst.REPLACE_BY_FEE_SEQUENCE);
     }
     if (seqType == BitcoinOpCodeConst.TYPE_RELATIVE_TIMELOCK) {
-      int seq = 0;
+      var seq = 0;
       if (!isTypeBlock) {
         seq |= 1 << 22;
       }
@@ -39,16 +39,16 @@ class Sequence {
       return IntUtils.toBytes(seq, length: 4, byteOrder: Endian.little);
     }
 
-    throw const DartBitcoinPluginException("Invalid seqType");
+    throw const DartBitcoinPluginException('Invalid seqType');
   }
 
   /// Returns the appropriate integer for a script; e.g. for relative timelocks
   int forScript() {
     if (seqType == BitcoinOpCodeConst.TYPE_REPLACE_BY_FEE) {
       throw const DartBitcoinPluginException(
-          "RBF is not to be included in a script.");
+          'RBF is not to be included in a script.');
     }
-    int scriptIntiger = value;
+    var scriptIntiger = value;
     if (seqType == BitcoinOpCodeConst.TYPE_RELATIVE_TIMELOCK && !isTypeBlock) {
       scriptIntiger |= 1 << 22;
     }
@@ -57,6 +57,6 @@ class Sequence {
 
   @override
   String toString() {
-    return "Sequence{seqType: $seqType, value: $value, isTypeBlock: $isTypeBlock}";
+    return 'Sequence{seqType: $seqType, value: $value, isTypeBlock: $isTypeBlock}';
   }
 }
diff --git a/lib/src/bitcoin/script/transaction.dart b/lib/src/bitcoin/script/transaction.dart
index a7f06a2..c0273a0 100644
--- a/lib/src/bitcoin/script/transaction.dart
+++ b/lib/src/bitcoin/script/transaction.dart
@@ -70,10 +70,10 @@ class BtcTransaction {
   /// Instantiates a Transaction from serialized raw hexadacimal data (classmethod)
   static BtcTransaction fromRaw(String raw) {
     final rawtx = BytesUtils.fromHexString(raw);
-    final List<int> version = rawtx.sublist(0, 4);
-    int cursor = 4;
+    final version = rawtx.sublist(0, 4);
+    var cursor = 4;
     List<int>? flag;
-    bool hasSegwit = false;
+    var hasSegwit = false;
     if (rawtx[4] == 0) {
       flag = List<int>.from(rawtx.sublist(5, 6));
       if (flag[0] == 1) {
@@ -83,32 +83,32 @@ class BtcTransaction {
     }
     final vi = IntUtils.decodeVarint(rawtx.sublist(cursor));
     cursor += vi.item2;
-    final List<TxInput> inputs = [];
-    for (int index = 0; index < vi.item1; index++) {
+    final inputs = <TxInput>[];
+    for (var index = 0; index < vi.item1; index++) {
       final inp = TxInput.deserialize(
           bytes: rawtx, hasSegwit: hasSegwit, cursor: cursor);
       inputs.add(inp.item1);
       cursor = inp.item2;
     }
-    final List<TxOutput> outputs = [];
+    final outputs = <TxOutput>[];
     final viOut = IntUtils.decodeVarint(rawtx.sublist(cursor));
     cursor += viOut.item2;
-    for (int index = 0; index < viOut.item1; index++) {
+    for (var index = 0; index < viOut.item1; index++) {
       final inp = TxOutput.deserialize(
           bytes: rawtx, hasSegwit: hasSegwit, cursor: cursor);
       outputs.add(inp.item1);
       cursor = inp.item2;
     }
-    final List<TxWitnessInput> witnesses = [];
+    final witnesses = <TxWitnessInput>[];
     if (hasSegwit) {
       if (cursor + 4 < rawtx.length) {
         // in this case the tx contains wintness data.
-        for (int n = 0; n < inputs.length; n++) {
+        for (var n = 0; n < inputs.length; n++) {
           final wVi = IntUtils.decodeVarint(rawtx.sublist(cursor));
           cursor += wVi.item2;
-          final List<String> witnessesTmp = [];
-          for (int n = 0; n < wVi.item1; n++) {
-            List<int> witness = <int>[];
+          final witnessesTmp = <String>[];
+          for (var n = 0; n < wVi.item1; n++) {
+            var witness = <int>[];
             final wtVi = IntUtils.decodeVarint(rawtx.sublist(cursor));
             if (wtVi.item1 != 0) {
               witness = rawtx.sublist(
@@ -144,14 +144,14 @@ class BtcTransaction {
       {required int txInIndex,
       required Script script,
       int sighash = BitcoinOpCodeConst.SIGHASH_ALL}) {
-    BtcTransaction tx = copy(this);
+    var tx = copy(this);
     for (final i in tx.inputs) {
       i.scriptSig = Script(script: []);
     }
     tx.inputs[txInIndex].scriptSig = script;
     if ((sighash & 0x1f) == BitcoinOpCodeConst.SIGHASH_NONE) {
       tx = tx.copyWith(outputs: []);
-      for (int i = 0; i < tx.inputs.length; i++) {
+      for (var i = 0; i < tx.inputs.length; i++) {
         if (i != txInIndex) {
           tx.inputs[i].sequence = BitcoinOpCodeConst.EMPTY_TX_SEQUENCE;
         }
@@ -159,17 +159,17 @@ class BtcTransaction {
     } else if ((sighash & 0x1f) == BitcoinOpCodeConst.SIGHASH_SINGLE) {
       if (txInIndex >= tx.outputs.length) {
         throw const DartBitcoinPluginException(
-            "Transaction index is greater than the available outputs");
+            'Transaction index is greater than the available outputs');
       }
 
-      final List<TxOutput> outputs = [];
-      for (int i = 0; i < txInIndex; i++) {
+      final outputs = <TxOutput>[];
+      for (var i = 0; i < txInIndex; i++) {
         outputs.add(TxOutput(
             amount: BigInt.from(BitcoinOpCodeConst.NEGATIVE_SATOSHI),
             scriptPubKey: Script(script: [])));
       }
       tx = tx.copyWith(outputs: [...outputs, tx.outputs[txInIndex]]);
-      for (int i = 0; i < tx.inputs.length; i++) {
+      for (var i = 0; i < tx.inputs.length; i++) {
         if (i != txInIndex) {
           tx.inputs[i].sequence = BitcoinOpCodeConst.EMPTY_TX_SEQUENCE;
         }
@@ -178,7 +178,7 @@ class BtcTransaction {
     if ((sighash & BitcoinOpCodeConst.SIGHASH_ANYONECANPAY) != 0) {
       tx = tx.copyWith(inputs: [tx.inputs[txInIndex]]);
     }
-    List<int> txForSign = tx.toBytes(segwit: false);
+    var txForSign = tx.toBytes(segwit: false);
 
     txForSign = [
       ...txForSign,
@@ -189,7 +189,7 @@ class BtcTransaction {
 
   /// Serializes Transaction to bytes
   List<int> toBytes({bool segwit = false}) {
-    final DynamicByteTracker data = DynamicByteTracker();
+    final data = DynamicByteTracker();
     data.add(version);
     if (segwit) {
       data.add([0x00, 0x01]);
@@ -229,19 +229,18 @@ class BtcTransaction {
       required BigInt amount,
       CashToken? token}) {
     final tx = copy(this);
-    List<int> hashPrevouts = List<int>.filled(32, 0);
-    List<int> hashSequence = List<int>.filled(32, 0);
-    List<int> hashOutputs = List<int>.filled(32, 0);
-    final int basicSigHashType = sighash & 0x1F;
-    final bool anyoneCanPay =
+    var hashPrevouts = List<int>.filled(32, 0);
+    var hashSequence = List<int>.filled(32, 0);
+    var hashOutputs = List<int>.filled(32, 0);
+    final basicSigHashType = sighash & 0x1F;
+    final anyoneCanPay =
         (sighash & 0xF0) == BitcoinOpCodeConst.SIGHASH_ANYONECANPAY;
-    final bool signAll =
-        (basicSigHashType != BitcoinOpCodeConst.SIGHASH_SINGLE) &&
-            (basicSigHashType != BitcoinOpCodeConst.SIGHASH_NONE);
+    final signAll = (basicSigHashType != BitcoinOpCodeConst.SIGHASH_SINGLE) &&
+        (basicSigHashType != BitcoinOpCodeConst.SIGHASH_NONE);
     if (!anyoneCanPay) {
       hashPrevouts = <int>[];
       for (final txin in tx.inputs) {
-        final List<int> txidBytes = List<int>.from(
+        final txidBytes = List<int>.from(
             BytesUtils.fromHexString(txin.txId).reversed.toList());
         hashPrevouts = [
           ...hashPrevouts,
@@ -268,21 +267,20 @@ class BtcTransaction {
     } else if (basicSigHashType == BitcoinOpCodeConst.SIGHASH_SINGLE &&
         txInIndex < tx.outputs.length) {
       final out = tx.outputs[txInIndex];
-      final List<int> packedAmount =
+      final packedAmount =
           BigintUtils.toBytes(out.amount, length: 8, order: Endian.little);
       final scriptBytes = IntUtils.prependVarint(out.scriptPubKey.toBytes());
       hashOutputs = [...packedAmount, ...scriptBytes];
       hashOutputs = QuickCrypto.sha256DoubleHash(hashOutputs);
     }
 
-    final DynamicByteTracker txForSigning = DynamicByteTracker();
+    final txForSigning = DynamicByteTracker();
     txForSigning.add(version);
     txForSigning.add(hashPrevouts);
     txForSigning.add(hashSequence);
     final txIn = inputs[txInIndex];
 
-    final List<int> txidBytes =
-        BytesUtils.fromHexString(txIn.txId).reversed.toList();
+    final txidBytes = BytesUtils.fromHexString(txIn.txId).reversed.toList();
     txForSigning.add([
       ...txidBytes,
       ...IntUtils.toBytes(txIn.txIndex, length: 4, byteOrder: Endian.little)
@@ -293,7 +291,7 @@ class BtcTransaction {
     final varintBytes = IntUtils.prependVarint(script.toBytes());
 
     txForSigning.add(varintBytes);
-    final List<int> packedAmount =
+    final packedAmount =
         BigintUtils.toBytes(amount, length: 8, order: Endian.little);
     txForSigning.add(packedAmount);
     txForSigning.add(txIn.sequence);
@@ -322,26 +320,23 @@ class BtcTransaction {
       int leafVar = BitcoinOpCodeConst.LEAF_VERSION_TAPSCRIPT,
       int sighash = BitcoinOpCodeConst.TAPROOT_SIGHASH_ALL}) {
     final newTx = copy(this);
-    final bool sighashNone =
-        (sighash & 0x03) == BitcoinOpCodeConst.SIGHASH_NONE;
-    final bool sighashSingle =
-        (sighash & 0x03) == BitcoinOpCodeConst.SIGHASH_SINGLE;
-    final bool anyoneCanPay =
+    final sighashNone = (sighash & 0x03) == BitcoinOpCodeConst.SIGHASH_NONE;
+    final sighashSingle = (sighash & 0x03) == BitcoinOpCodeConst.SIGHASH_SINGLE;
+    final anyoneCanPay =
         (sighash & 0x80) == BitcoinOpCodeConst.SIGHASH_ANYONECANPAY;
-    final DynamicByteTracker txForSign = DynamicByteTracker();
+    final txForSign = DynamicByteTracker();
     txForSign.add([0]);
     txForSign.add([sighash]);
     txForSign.add(version);
     txForSign.add(locktime);
-    List<int> hashPrevouts = <int>[];
-    List<int> hashAmounts = <int>[];
-    List<int> hashScriptPubkeys = <int>[];
-    List<int> hashSequences = <int>[];
-    List<int> hashOutputs = <int>[];
+    var hashPrevouts = <int>[];
+    var hashAmounts = <int>[];
+    var hashScriptPubkeys = <int>[];
+    var hashSequences = <int>[];
+    var hashOutputs = <int>[];
     if (!anyoneCanPay) {
       for (final txin in newTx.inputs) {
-        final List<int> txidBytes =
-            BytesUtils.fromHexString(txin.txId).reversed.toList();
+        final txidBytes = BytesUtils.fromHexString(txin.txId).reversed.toList();
         hashPrevouts = [
           ...hashPrevouts,
           ...txidBytes,
@@ -373,7 +368,7 @@ class BtcTransaction {
     }
     if (!(sighashNone || sighashSingle)) {
       for (final txOut in newTx.outputs) {
-        final List<int> packedAmount =
+        final packedAmount =
             BigintUtils.toBytes(txOut.amount, length: 8, order: Endian.little);
         final scriptBytes =
             IntUtils.prependVarint(txOut.scriptPubKey.toBytes());
@@ -383,7 +378,7 @@ class BtcTransaction {
       txForSign.add(hashOutputs);
     }
 
-    final int spendType = extFlags * 2 + 0;
+    final spendType = extFlags * 2 + 0;
     txForSign.add([spendType]);
 
     if (anyoneCanPay) {
@@ -418,12 +413,12 @@ class BtcTransaction {
         leafVar,
         ...IntUtils.prependVarint(script?.toBytes() ?? <int>[])
       ];
-      txForSign.add(taggedHash(leafVarBytes, "TapLeaf"));
+      txForSign.add(taggedHash(leafVarBytes, 'TapLeaf'));
       txForSign.add([0]);
       txForSign.add(List<int>.filled(4, mask8));
     }
     final bytes = txForSign.toBytes();
-    return taggedHash(bytes, "TapSighash");
+    return taggedHash(bytes, 'TapSighash');
   }
 
   /// converts result of to_bytes to hexadecimal string
@@ -445,16 +440,16 @@ class BtcTransaction {
   /// Calculates the tx segwit size
   int getVSize() {
     if (!hasSegwit) return getSize();
-    const int markerSize = 2;
-    int witSize = 0;
-    List<int> data = <int>[];
+    const markerSize = 2;
+    var witSize = 0;
+    var data = <int>[];
     for (final w in witnesses) {
       final countBytes = List<int>.from([w.stack.length]);
       data = List<int>.from([...data, ...countBytes, ...w.toBytes()]);
     }
     witSize = data.length;
-    final int size = getSize() - (markerSize + witSize);
-    final double vSize = size + (markerSize + witSize) / 4;
+    final size = getSize() - (markerSize + witSize);
+    final vSize = size + (markerSize + witSize) / 4;
     return vSize.ceil();
   }
 
@@ -467,11 +462,11 @@ class BtcTransaction {
 
   Map<String, dynamic> toJson() {
     return {
-      "inputs": inputs.map((e) => e.toJson()).toList(),
-      "outputs": outputs.map((e) => e.toJson()).toList(),
-      "locktime": BytesUtils.toHexString(locktime),
-      "version": BytesUtils.toHexString(version),
-      "witnesses": witnesses.map((e) => e.toJson()).toList()
+      'inputs': inputs.map((e) => e.toJson()).toList(),
+      'outputs': outputs.map((e) => e.toJson()).toList(),
+      'locktime': BytesUtils.toHexString(locktime),
+      'version': BytesUtils.toHexString(version),
+      'witnesses': witnesses.map((e) => e.toJson()).toList()
     };
   }
 
diff --git a/lib/src/bitcoin/script/witness.dart b/lib/src/bitcoin/script/witness.dart
index 075726f..47c29c0 100644
--- a/lib/src/bitcoin/script/witness.dart
+++ b/lib/src/bitcoin/script/witness.dart
@@ -15,11 +15,10 @@ class TxWitnessInput {
 
   /// returns a serialized byte version of the witness items list
   List<int> toBytes() {
-    List<int> stackBytes = [];
+    var stackBytes = <int>[];
 
     for (final item in stack) {
-      final List<int> itemBytes =
-          IntUtils.prependVarint(BytesUtils.fromHexString(item));
+      final itemBytes = IntUtils.prependVarint(BytesUtils.fromHexString(item));
       stackBytes = [...stackBytes, ...itemBytes];
     }
 
@@ -27,7 +26,7 @@ class TxWitnessInput {
   }
 
   Map<String, dynamic> toJson() {
-    return {"stack": stack};
+    return {'stack': stack};
   }
 
   @override
diff --git a/lib/src/bitcoin_cash/bcmr.dart b/lib/src/bitcoin_cash/bcmr.dart
index 58ccc41..9d97032 100644
--- a/lib/src/bitcoin_cash/bcmr.dart
+++ b/lib/src/bitcoin_cash/bcmr.dart
@@ -4,7 +4,7 @@ import 'package:blockchain_utils/blockchain_utils.dart';
 /// Bitcoin Cash Metadata Registries Script to convert uris and content hash to bitcoin output script
 class BCMR implements BitcoinScriptOutput {
   /// Bitcoin Cash Metadata Registries PREFIX
-  static const String _pcmrInHex = "42434d52";
+  static const String _pcmrInHex = '42434d52';
   BCMR({required this.uris, required this.hash})
       : assert(
           () {
@@ -16,8 +16,8 @@ class BCMR implements BitcoinScriptOutput {
             return true;
           }(),
           uris.isEmpty
-              ? "URIs must not be empty."
-              : "The BCMR hash should be the SHA-256 hash of the URI contents",
+              ? 'URIs must not be empty.'
+              : 'The BCMR hash should be the SHA-256 hash of the URI contents',
         );
 
   /// list of uris
@@ -29,7 +29,7 @@ class BCMR implements BitcoinScriptOutput {
   ///  'script' property from the interface to define the specific script for Bitcoin Cash Metadata Registries OP_RETURN script.
   @override
   Script get script => Script(script: [
-        "OP_RETURN",
+        'OP_RETURN',
         _pcmrInHex,
         hash,
         ...uris.map((e) => BytesUtils.toHexString(StringUtils.encode(e)))
diff --git a/lib/src/bitcoin_cash/bcmr_registery.dart b/lib/src/bitcoin_cash/bcmr_registery.dart
index 80b0e1a..3df2009 100644
--- a/lib/src/bitcoin_cash/bcmr_registery.dart
+++ b/lib/src/bitcoin_cash/bcmr_registery.dart
@@ -314,7 +314,7 @@ class NftCategoryField {
   const NftCategoryField({required this.identifier});
   final Map<String, NftCategoryFieldType> identifier;
   factory NftCategoryField.fromJson(Map<String, dynamic> json) {
-    final Map<String, NftCategoryFieldType> parsedIdentifier = {};
+    final parsedIdentifier = <String, NftCategoryFieldType>{};
     json.forEach((key, value) {
       parsedIdentifier[key] = NftCategoryFieldType.fromJson(value);
     });
@@ -699,26 +699,17 @@ class ChainSnapshot extends IdentitySnapshot {
           : null,
     );
   }
-  ChainSnapshot(
-      {required String name,
-      required String? description,
-      required List<String>? tags,
-      required String? migrated,
-      required TokenCategory token,
-      required String? status,
-      required String? splitId,
-      required URIs? uris,
-      required Extensions? extensions})
-      : super(
-            name: name,
-            description: description,
-            tags: tags,
-            migrated: migrated,
-            token: token,
-            status: status,
-            splitId: splitId,
-            uris: uris,
-            extensions: extensions);
+  const ChainSnapshot({
+    required super.name,
+    required TokenCategory super.token,
+    super.description,
+    super.tags,
+    super.migrated,
+    super.status,
+    super.splitId,
+    super.uris,
+    super.extensions,
+  });
 }
 
 class RegistryTimestampKeyedValues<T extends IdentitySnapshot> {
@@ -731,8 +722,7 @@ class RegistryTimestampKeyedValues<T extends IdentitySnapshot> {
 }
 
 class ChainHistory extends RegistryTimestampKeyedValues<ChainSnapshot> {
-  const ChainHistory({required Map<String, ChainSnapshot> timestampMap})
-      : super(timestampMap: timestampMap);
+  const ChainHistory({required super.timestampMap});
 
   factory ChainHistory.fromJson(Map<String, dynamic> json) {
     return ChainHistory(
@@ -744,8 +734,7 @@ class ChainHistory extends RegistryTimestampKeyedValues<ChainSnapshot> {
 }
 
 class IdentityHistory extends RegistryTimestampKeyedValues<IdentitySnapshot> {
-  const IdentityHistory({required Map<String, IdentitySnapshot> timestampMap})
-      : super(timestampMap: timestampMap);
+  const IdentityHistory({required super.timestampMap});
 
   factory IdentityHistory.fromJson(Map<String, dynamic> json) {
     return IdentityHistory(
@@ -988,7 +977,7 @@ class Registry {
   });
 
   Map<String, dynamic> toJson() {
-    final Map<String, dynamic> js = {
+    final js = <String, dynamic>{
       r'$schema': schema,
       'version': version.toJson(),
       'latestRevision': latestRevision,
@@ -1005,21 +994,21 @@ class Registry {
       for (final i in identities!.entries) {
         jsIdentities[i.key] = i.value.toJson();
       }
-      js["identities"] = jsIdentities;
+      js['identities'] = jsIdentities;
     }
     if (chains != null) {
       final jsChains = {};
       for (final i in chains!.entries) {
         jsChains[i.key] = i.value.toJson();
       }
-      js["chains"] = jsChains;
+      js['chains'] = jsChains;
     }
     if (tags != null) {
       final jsTags = {};
       for (final i in tags!.entries) {
         jsTags[i.key] = i.value.toJson();
       }
-      js["tags"] = jsTags;
+      js['tags'] = jsTags;
     }
     return js..removeWhere((key, value) => value == null);
   }
diff --git a/lib/src/cash_token/cash_token.dart b/lib/src/cash_token/cash_token.dart
index a28eaaf..7a86d9b 100644
--- a/lib/src/cash_token/cash_token.dart
+++ b/lib/src/cash_token/cash_token.dart
@@ -34,17 +34,17 @@ class CashTokenCapability {
 
   /// (NFTs without a capability) cannot have their commitment modified when spent.
   static const CashTokenCapability noCapability =
-      CashTokenCapability._(0x00, "none");
+      CashTokenCapability._(0x00, 'none');
 
   /// Each Mutable token (NFTs with the mutable capability) allows the spending transaction
   /// to create one NFT of the same category, with any commitment and (optionally) the mutable capability.
   static const CashTokenCapability mutable =
-      CashTokenCapability._(0x01, "mutable");
+      CashTokenCapability._(0x01, 'mutable');
 
   /// Minting tokens (NFTs with the minting capability) allow the spending transaction to create any number of new NFTs of the same category,
   /// each with any commitment and (optionally) the minting or mutable capability.
   static const CashTokenCapability minting =
-      CashTokenCapability._(0x02, "minting");
+      CashTokenCapability._(0x02, 'minting');
 
   ///
   static int _getCapability(int bitfield) {
@@ -60,11 +60,11 @@ class CashTokenCapability {
   /// correct capality from bitfield
   static CashTokenCapability fromBitfield(int bitfield) {
     try {
-      final int intCapability = _getCapability(bitfield);
+      final intCapability = _getCapability(bitfield);
       return values.firstWhere((element) => element.value == intCapability);
     } on StateError {
       throw const DartBitcoinPluginException(
-          "Invalid CashToken NFT Capability");
+          'Invalid CashToken NFT Capability');
     }
   }
 
@@ -74,7 +74,7 @@ class CashTokenCapability {
       return values.firstWhere((element) => element.name == name);
     } on StateError {
       throw const DartBitcoinPluginException(
-          "Invalid CashToken NFT Capability Name");
+          'Invalid CashToken NFT Capability Name');
     }
   }
 
@@ -111,20 +111,20 @@ class CashTokenUtils {
       bool hasAmount = false,
       bool hasCommitmentLength = false,
       CashTokenCapability? capability}) {
-    int capabilityInt = 0;
+    var capabilityInt = 0;
     if (hasNFT) {
       if (capability != null) {
         // throw const MessageException("Capability is necessary for NFTs.");
         capabilityInt = capability.value;
       }
     }
-    final int nft = hasNFT ? _hasNFT : 0;
-    int commitmentLength = 0;
+    final nft = hasNFT ? _hasNFT : 0;
+    var commitmentLength = 0;
     if (hasNFT && hasCommitmentLength) {
       commitmentLength = hasCommitmentLength ? _hasCommitmentLength : 0;
     }
 
-    final int amount = hasAmount ? _hasAmount : 0;
+    final amount = hasAmount ? _hasAmount : 0;
     return nft | commitmentLength | amount | capabilityInt;
   }
 
@@ -160,8 +160,8 @@ class CashTokenUtils {
   }
 
   static Tuple<BigInt, int> _decodeVarintBigInt(List<int> byteint) {
-    final int ni = byteint[0];
-    int size = 0;
+    final ni = byteint[0];
+    var size = 0;
 
     if (ni < 253) {
       return Tuple(BigInt.from(ni), 1);
@@ -208,7 +208,7 @@ class CashTokenUtils {
   /// [bitfield]: The bitfield to be validated.
   /// Returns true if the bitfield is valid, otherwise false.
   static bool isValidBitfield(int bitfield) {
-    final int highNibble = bitfield & 0xF0;
+    final highNibble = bitfield & 0xF0;
     if (highNibble >= 0x80 || highNibble == 0x00) {
       return false;
     }
@@ -230,17 +230,17 @@ class CashTokenUtils {
 
 class CashToken {
   factory CashToken.fromJson(Map<String, dynamic> json) {
-    final String category = json["category"];
-    final BigInt amount = BigintUtils.tryParse(json["amount"]) ?? BigInt.zero;
+    final String category = json['category'];
+    final amount = BigintUtils.tryParse(json['amount']) ?? BigInt.zero;
     CashTokenCapability? capability;
     List<int>? commitment;
-    if (json.containsKey("nft")) {
-      capability = CashTokenCapability.fromName(json["nft"]["capability"]);
-      commitment = ((json["nft"]["commitment"] ?? "") as String).isEmpty
+    if (json.containsKey('nft')) {
+      capability = CashTokenCapability.fromName(json['nft']['capability']);
+      commitment = ((json['nft']['commitment'] ?? '') as String).isEmpty
           ? null
-          : BytesUtils.fromHexString(json["nft"]["commitment"]);
+          : BytesUtils.fromHexString(json['nft']['commitment']);
     }
-    final int bitfield = CashTokenUtils.buildBitfield(
+    final bitfield = CashTokenUtils.buildBitfield(
         hasNFT: capability != null,
         capability: capability ?? CashTokenCapability.noCapability,
         hasAmount: amount > BigInt.zero,
@@ -274,31 +274,31 @@ class CashToken {
       List<int>? commitment,
       required int bitfield}) {
     if (!CashTokenUtils.isValidBitfield(bitfield)) {
-      throw const DartBitcoinPluginException("Invalid bitfield");
+      throw const DartBitcoinPluginException('Invalid bitfield');
     }
     if (CashTokenUtils.hasAmount(bitfield) && amount == null) {
       throw const DartBitcoinPluginException(
-          "Invalid cash token: the bitfield indicates an amount, but the amount is null.");
+          'Invalid cash token: the bitfield indicates an amount, but the amount is null.');
     }
     if (amount != null) {
       if (amount < BigInt.zero || amount > CashTokenUtils.maxTokenAmount) {
         throw const DartBitcoinPluginException(
-            "Invalid amount. Amount must be between zero and 99.");
+            'Invalid amount. Amount must be between zero and 99.');
       }
     }
     if (!StringUtils.isHexBytes(category)) {
       throw const DartBitcoinPluginException(
-          "Invalid category hexadecimal bytes.");
+          'Invalid category hexadecimal bytes.');
     }
     final toBytes = BytesUtils.fromHexString(category);
     if (toBytes.length != CashTokenUtils.idBytesLength) {
       throw const DartBitcoinPluginException(
-          "Invalid category. The category should consist of 32 bytes.");
+          'Invalid category. The category should consist of 32 bytes.');
     }
     if (CashTokenUtils.hasCommitmentLength(bitfield) &&
         (commitment == null || commitment.isEmpty)) {
       throw const DartBitcoinPluginException(
-          "Invalid cash token: the bitfield indicates an commitment, but the commitment is null or empty.");
+          'Invalid cash token: the bitfield indicates an commitment, but the commitment is null or empty.');
     }
     return CashToken.noValidate(
         category: category,
@@ -311,14 +311,14 @@ class CashToken {
         scriptBytes[0] != CashTokenUtils.cashTokenPrefix) {
       return const Tuple(null, 0);
     }
-    int cursor = 1;
-    final List<int> id =
+    var cursor = 1;
+    final id =
         scriptBytes.sublist(cursor, cursor + CashTokenUtils.idBytesLength);
 
     cursor += CashTokenUtils.idBytesLength;
-    final int bitfield = scriptBytes[cursor];
+    final bitfield = scriptBytes[cursor];
     cursor += 1;
-    List<int> commitment = [];
+    var commitment = <int>[];
     if (CashTokenUtils.hasCommitmentLength(bitfield)) {
       final vi = IntUtils.decodeVarint(
           scriptBytes.sublist(cursor, scriptBytes.length));
@@ -326,7 +326,7 @@ class CashToken {
       commitment = scriptBytes.sublist(cursor, cursor + vi.item1);
       cursor += vi.item1;
     }
-    BigInt amount = BigInt.zero;
+    var amount = BigInt.zero;
     if (CashTokenUtils.hasAmount(bitfield)) {
       final vi = CashTokenUtils._decodeVarintBigInt(
           scriptBytes.sublist(cursor, scriptBytes.length));
@@ -352,7 +352,7 @@ class CashToken {
   ///
   /// Returns a list of integers representing the serialized byte representation of the [CashToken].
   List<int> toBytes() {
-    final DynamicByteTracker bytes = DynamicByteTracker();
+    final bytes = DynamicByteTracker();
     bytes.add([CashTokenUtils.cashTokenPrefix]);
     bytes.add(BytesUtils.fromHexString(category).reversed.toList());
     bytes.add([bitfield]);
@@ -415,15 +415,15 @@ class CashToken {
       hasCommitment ? BytesUtils.toHexString(commitment) : null;
   Map<String, dynamic> toJson() {
     return {
-      "category": category,
-      "amount": amount.toString(),
-      "bitfield": bitfield,
-      "commitment": BytesUtils.toHexString(commitment),
+      'category': category,
+      'amount': amount.toString(),
+      'bitfield': bitfield,
+      'commitment': BytesUtils.toHexString(commitment),
     };
   }
 
   @override
   String toString() {
-    return "CashToken{bitfield: $bitfield, commitment: $commitmentInHex, amount: $amount, category: $category}";
+    return 'CashToken{bitfield: $bitfield, commitment: $commitmentInHex, amount: $amount, category: $category}';
   }
 }
diff --git a/lib/src/crypto/crypto.dart b/lib/src/crypto/crypto.dart
index bf5c6cf..79079aa 100644
--- a/lib/src/crypto/crypto.dart
+++ b/lib/src/crypto/crypto.dart
@@ -1,4 +1,4 @@
-library crypto;
+library;
 
 import 'package:bitcoin_base/src/bitcoin/script/op_code/constant_lib.dart';
 import 'package:blockchain_utils/crypto/quick_crypto.dart';
@@ -30,5 +30,5 @@ List<int> toTapleafTaggedHash(List<int> scriptBytes) {
     BitcoinOpCodeConst.LEAF_VERSION_TAPSCRIPT,
     ...IntUtils.prependVarint(scriptBytes)
   ];
-  return taggedHash(leafVarBytes, "TapLeaf");
+  return taggedHash(leafVarBytes, 'TapLeaf');
 }
diff --git a/lib/src/crypto/keypair/ec_private.dart b/lib/src/crypto/keypair/ec_private.dart
index d5c5735..af1a731 100644
--- a/lib/src/crypto/keypair/ec_private.dart
+++ b/lib/src/crypto/keypair/ec_private.dart
@@ -4,7 +4,7 @@ import 'package:blockchain_utils/blockchain_utils.dart';
 /// Represents an ECDSA private key.
 class ECPrivate {
   final Bip32PrivateKey prive;
-  ECPrivate(this.prive);
+  const ECPrivate(this.prive);
 
   /// creates an object from hex
   factory ECPrivate.fromHex(String keyHex) {
@@ -30,15 +30,11 @@ class ECPrivate {
   }
 
   /// returns as WIFC (compressed) or WIF format (string)
-  String toWif({bool compressed = true, BitcoinNetwork? network}) {
-    List<int> bytes = <int>[
-      ...(network ?? BitcoinNetwork.mainnet).wifNetVer,
-      ...toBytes()
-    ];
-    if (compressed) {
-      bytes = <int>[...bytes, 0x01];
-    }
-    return Base58Encoder.checkEncode(bytes);
+  String toWif(
+      {PubKeyModes pubKeyMode = PubKeyModes.compressed,
+      BitcoinNetwork network = BitcoinNetwork.mainnet}) {
+    return WifEncoder.encode(toBytes(),
+        netVer: network.wifNetVer, pubKeyMode: pubKeyMode);
   }
 
   /// returns the key's raw bytes
@@ -62,7 +58,7 @@ class ECPrivate {
   String signInput(List<int> txDigest,
       {int sigHash = BitcoinOpCodeConst.SIGHASH_ALL}) {
     final btcSigner = BitcoinSigner.fromKeyBytes(toBytes());
-    List<int> signature = btcSigner.signTransaction(txDigest);
+    var signature = btcSigner.signTransaction(txDigest);
     signature = <int>[...signature, sigHash];
     return BytesUtils.toHexString(signature);
   }
@@ -70,7 +66,7 @@ class ECPrivate {
   String signSchnorr(List<int> txDigest,
       {int sighash = BitcoinOpCodeConst.TAPROOT_SIGHASH_ALL}) {
     final btcSigner = BitcoinSigner.fromKeyBytes(toBytes());
-    List<int> signatur = btcSigner.signSchnorrTransaction(txDigest,
+    var signatur = btcSigner.signSchnorrTransaction(txDigest,
         tapScripts: [], tweak: false);
     if (sighash != BitcoinOpCodeConst.TAPROOT_SIGHASH_ALL) {
       signatur = <int>[...signatur, sighash];
@@ -89,12 +85,12 @@ class ECPrivate {
       }
       return true;
     }(),
-        "When the tweak is false, the `tapScripts` are ignored, to use the tap script path, you need to consider the tweak value to be true.");
+        'When the tweak is false, the `tapScripts` are ignored, to use the tap script path, you need to consider the tweak value to be true.');
     final tapScriptBytes = !tweak
         ? []
         : tapScripts.map((e) => e.map((e) => e.toBytes()).toList()).toList();
     final btcSigner = BitcoinSigner.fromKeyBytes(toBytes());
-    List<int> signatur = btcSigner.signSchnorrTransaction(txDigest,
+    var signatur = btcSigner.signSchnorrTransaction(txDigest,
         tapScripts: tapScriptBytes, tweak: tweak);
     if (sighash != BitcoinOpCodeConst.TAPROOT_SIGHASH_ALL) {
       signatur = <int>[...signatur, sighash];
diff --git a/lib/src/crypto/keypair/ec_public.dart b/lib/src/crypto/keypair/ec_public.dart
index 26eaed4..4be69d3 100644
--- a/lib/src/crypto/keypair/ec_public.dart
+++ b/lib/src/crypto/keypair/ec_public.dart
@@ -3,6 +3,8 @@ import 'package:bitcoin_base/src/bitcoin/script/script.dart';
 import 'package:bitcoin_base/src/exception/exception.dart';
 import 'package:blockchain_utils/blockchain_utils.dart';
 
+typedef PublicKeyType = PubKeyModes;
+
 class ECPublic {
   final Bip32PublicKey publicKey;
   const ECPublic._(this.publicKey);
@@ -10,7 +12,7 @@ class ECPublic {
   factory ECPublic.fromBip32(Bip32PublicKey publicKey) {
     if (publicKey.curveType != EllipticCurveTypes.secp256k1) {
       throw const DartBitcoinPluginException(
-          "invalid public key curve for bitcoin");
+          'invalid public key curve for bitcoin');
     }
     return ECPublic._(publicKey);
   }
@@ -29,8 +31,8 @@ class ECPublic {
 
   /// toHex converts the ECPublic key to a hex-encoded string.
   /// If 'compressed' is true, the key is in compressed format.
-  String toHex({bool compressed = true}) {
-    if (compressed) {
+  String toHex({PublicKeyType mode = PublicKeyType.compressed}) {
+    if (mode.isCompressed) {
       return BytesUtils.toHexString(publicKey.compressed);
     }
     return BytesUtils.toHexString(publicKey.uncompressed);
@@ -38,22 +40,22 @@ class ECPublic {
 
   /// _toHash160 computes the RIPEMD160 hash of the ECPublic key.
   /// If 'compressed' is true, the key is in compressed format.
-  List<int> _toHash160({bool compressed = true}) {
-    final bytes = BytesUtils.fromHexString(toHex(compressed: compressed));
+  List<int> _toHash160({PublicKeyType mode = PublicKeyType.compressed}) {
+    final bytes = BytesUtils.fromHexString(toHex(mode: mode));
     return QuickCrypto.hash160(bytes);
   }
 
   /// toHash160 computes the RIPEMD160 hash of the ECPublic key.
   /// If 'compressed' is true, the key is in compressed format.
-  String toHash160({bool compressed = true}) {
-    final bytes = BytesUtils.fromHexString(toHex(compressed: compressed));
+  String toHash160({PublicKeyType mode = PublicKeyType.compressed}) {
+    final bytes = BytesUtils.fromHexString(toHex(mode: mode));
     return BytesUtils.toHexString(QuickCrypto.hash160(bytes));
   }
 
   /// toAddress generates a P2PKH (Pay-to-Public-Key-Hash) address from the ECPublic key.
   /// If 'compressed' is true, the key is in compressed format.
-  P2pkhAddress toAddress({bool compressed = true}) {
-    final h16 = _toHash160(compressed: compressed);
+  P2pkhAddress toAddress({PublicKeyType mode = PublicKeyType.compressed}) {
+    final h16 = _toHash160(mode: mode);
     final toHex = BytesUtils.toHexString(h16);
     return P2pkhAddress.fromHash160(addrHash: toHex);
   }
@@ -69,23 +71,24 @@ class ECPublic {
 
   /// toP2pkAddress generates a P2PK (Pay-to-Public-Key) address from the ECPublic key.
   /// If 'compressed' is true, the key is in compressed format.
-  P2pkAddress toP2pkAddress({bool compressed = true}) {
-    final h = toHex(compressed: compressed);
+  P2pkAddress toP2pkAddress({PublicKeyType mode = PublicKeyType.compressed}) {
+    final h = toHex(mode: mode);
     return P2pkAddress(publicKey: h);
   }
 
   /// toRedeemScript generates a redeem script from the ECPublic key.
   /// If 'compressed' is true, the key is in compressed format.
-  Script toRedeemScript({bool compressed = true}) {
-    final redeem = toHex(compressed: compressed);
-    return Script(script: [redeem, "OP_CHECKSIG"]);
+  Script toRedeemScript({PublicKeyType mode = PublicKeyType.compressed}) {
+    final redeem = toHex(mode: mode);
+    return Script(script: [redeem, 'OP_CHECKSIG']);
   }
 
   /// toP2pkhInP2sh generates a P2SH (Pay-to-Script-Hash) address
   /// wrapping a P2PK (Pay-to-Public-Key) script derived from the ECPublic key.
   /// If 'compressed' is true, the key is in compressed format.
-  P2shAddress toP2pkhInP2sh({bool compressed = true, useBCHP2sh32 = false}) {
-    final addr = toAddress(compressed: compressed);
+  P2shAddress toP2pkhInP2sh(
+      {PublicKeyType mode = PublicKeyType.compressed, useBCHP2sh32 = false}) {
+    final addr = toAddress(mode: mode);
     final script = addr.toScriptPubKey();
     if (useBCHP2sh32) {
       return P2shAddress.fromHash160(
@@ -101,8 +104,9 @@ class ECPublic {
   /// wrapping a P2PK (Pay-to-Public-Key) script derived from the ECPublic key.
   /// If 'compressed' is true, the key is in compressed format.
   P2shAddress toP2pkInP2sh(
-      {bool compressed = true, bool useBCHP2sh32 = false}) {
-    final script = toRedeemScript(compressed: compressed);
+      {PublicKeyType mode = PublicKeyType.compressed,
+      bool useBCHP2sh32 = false}) {
+    final script = toRedeemScript(mode: mode);
     if (useBCHP2sh32) {
       return P2shAddress.fromHash160(
           addrHash: BytesUtils.toHexString(
@@ -133,7 +137,7 @@ class ECPublic {
   /// toP2wshScript generates a P2WSH (Pay-to-Witness-Script-Hash) script
   /// derived from the ECPublic key. If 'compressed' is true, the key is in compressed format.
   Script toP2wshScript() {
-    return Script(script: ['OP_1', toHex(), "OP_1", "OP_CHECKMULTISIG"]);
+    return Script(script: ['OP_1', toHex(), 'OP_1', 'OP_CHECKMULTISIG']);
   }
 
   /// toP2wshAddress generates a P2WSH (Pay-to-Witness-Script-Hash) address
diff --git a/lib/src/exception/exception.dart b/lib/src/exception/exception.dart
index 09652ba..0e031c3 100644
--- a/lib/src/exception/exception.dart
+++ b/lib/src/exception/exception.dart
@@ -1,7 +1,5 @@
 import 'package:blockchain_utils/blockchain_utils.dart';
 
 class DartBitcoinPluginException extends BlockchainUtilsException {
-  const DartBitcoinPluginException(String message,
-      {Map<String, dynamic>? details})
-      : super(message, details: details);
+  const DartBitcoinPluginException(super.message, {super.details});
 }
diff --git a/lib/src/models/network.dart b/lib/src/models/network.dart
index d3372de..89b24b6 100644
--- a/lib/src/models/network.dart
+++ b/lib/src/models/network.dart
@@ -23,7 +23,7 @@ abstract class BasedUtxoNetwork implements Enumerate {
   abstract final List<BitcoinAddressType> supportedAddress;
 
   @override
-  operator ==(other) {
+  bool operator ==(other) {
     if (identical(other, this)) return true;
     return other is BasedUtxoNetwork &&
         other.runtimeType == runtimeType &&
@@ -48,7 +48,7 @@ abstract class BasedUtxoNetwork implements Enumerate {
     BitcoinSVNetwork.testnet,
     PepeNetwork.mainnet,
     ElectraProtocolNetwork.mainnet,
-    ElectraProtocolNetwork.testnet,
+    ElectraProtocolNetwork.testnet
   ];
 
   static BasedUtxoNetwork fromName(String name) {
@@ -65,11 +65,11 @@ abstract class BasedUtxoNetwork implements Enumerate {
 class BitcoinSVNetwork implements BasedUtxoNetwork {
   /// Mainnet configuration with associated `CoinConf`.
   static const BitcoinSVNetwork mainnet =
-      BitcoinSVNetwork._("BitcoinSVMainnet", CoinsConf.bitcoinSvMainNet);
+      BitcoinSVNetwork._('BitcoinSVMainnet', CoinsConf.bitcoinSvMainNet);
 
   /// Testnet configuration with associated `CoinConf`.
   static const BitcoinSVNetwork testnet =
-      BitcoinSVNetwork._("BitcoinSVTestnet", CoinsConf.bitcoinSvTestNet);
+      BitcoinSVNetwork._('BitcoinSVTestnet', CoinsConf.bitcoinSvTestNet);
 
   /// Overrides the `conf` property from `BasedUtxoNetwork` with the associated `CoinConf`.
   @override
@@ -117,11 +117,11 @@ class BitcoinSVNetwork implements BasedUtxoNetwork {
 class BitcoinNetwork implements BasedUtxoNetwork {
   /// Mainnet configuration with associated `CoinConf`.
   static const BitcoinNetwork mainnet =
-      BitcoinNetwork._("bitcoinMainnet", CoinsConf.bitcoinMainNet);
+      BitcoinNetwork._('bitcoinMainnet', CoinsConf.bitcoinMainNet);
 
   /// Testnet configuration with associated `CoinConf`.
   static const BitcoinNetwork testnet =
-      BitcoinNetwork._("bitcoinTestnet", CoinsConf.bitcoinTestNet);
+      BitcoinNetwork._('bitcoinTestnet', CoinsConf.bitcoinTestNet);
 
   /// Overrides the `conf` property from `BasedUtxoNetwork` with the associated `CoinConf`.
   @override
@@ -190,11 +190,11 @@ class BitcoinNetwork implements BasedUtxoNetwork {
 class LitecoinNetwork implements BasedUtxoNetwork {
   /// Mainnet configuration with associated `CoinConf`.
   static const LitecoinNetwork mainnet =
-      LitecoinNetwork._("litecoinMainnet", CoinsConf.litecoinMainNet);
+      LitecoinNetwork._('litecoinMainnet', CoinsConf.litecoinMainNet);
 
   /// Testnet configuration with associated `CoinConf`.
   static const LitecoinNetwork testnet =
-      LitecoinNetwork._("litecoinTestnet", CoinsConf.litecoinTestNet);
+      LitecoinNetwork._('litecoinTestnet', CoinsConf.litecoinTestNet);
 
   /// Overrides the `conf` property from `BasedUtxoNetwork` with the associated `CoinConf`.
   @override
@@ -255,11 +255,11 @@ class LitecoinNetwork implements BasedUtxoNetwork {
 class DashNetwork implements BasedUtxoNetwork {
   /// Mainnet configuration with associated `CoinConf`.
   static const DashNetwork mainnet =
-      DashNetwork._("dashMainnet", CoinsConf.dashMainNet);
+      DashNetwork._('dashMainnet', CoinsConf.dashMainNet);
 
   /// Testnet configuration with associated `CoinConf`.
   static const DashNetwork testnet =
-      DashNetwork._("dashTestnet", CoinsConf.dashTestNet);
+      DashNetwork._('dashTestnet', CoinsConf.dashTestNet);
 
   /// Overrides the `conf` property from `BasedUtxoNetwork` with the associated `CoinConf`.
   @override
@@ -283,7 +283,7 @@ class DashNetwork implements BasedUtxoNetwork {
   /// Retrieves the Human-Readable Part (HRP) for Pay-to-Witness-Public-Key-Hash (P2WPKH) addresses.
   @override
   String get p2wpkhHrp => throw const DartBitcoinPluginException(
-      "DashNetwork network does not support P2WPKH/P2WSH");
+      'DashNetwork network does not support P2WPKH/P2WSH');
 
   /// Checks if the current network is the mainnet.
   @override
@@ -311,11 +311,11 @@ class DashNetwork implements BasedUtxoNetwork {
 class DogecoinNetwork implements BasedUtxoNetwork {
   /// Mainnet configuration with associated `CoinConf`.
   static const DogecoinNetwork mainnet =
-      DogecoinNetwork._("dogeMainnet", CoinsConf.dogecoinMainNet);
+      DogecoinNetwork._('dogeMainnet', CoinsConf.dogecoinMainNet);
 
   /// Testnet configuration with associated `CoinConf`.
   static const DogecoinNetwork testnet =
-      DogecoinNetwork._("dogeTestnet", CoinsConf.dogecoinTestNet);
+      DogecoinNetwork._('dogeTestnet', CoinsConf.dogecoinTestNet);
 
   /// Overrides the `conf` property from `BasedUtxoNetwork` with the associated `CoinConf`.
   @override
@@ -342,7 +342,7 @@ class DogecoinNetwork implements BasedUtxoNetwork {
   /// Retrieves the Human-Readable Part (HRP) for Pay-to-Witness-Public-Key-Hash (P2WPKH) addresses.
   @override
   String get p2wpkhHrp => throw const DartBitcoinPluginException(
-      "DogecoinNetwork network does not support P2WPKH/P2WSH");
+      'DogecoinNetwork network does not support P2WPKH/P2WSH');
 
   /// Checks if the current network is the mainnet.
   @override
@@ -367,11 +367,11 @@ class DogecoinNetwork implements BasedUtxoNetwork {
 class BitcoinCashNetwork implements BasedUtxoNetwork {
   /// Mainnet configuration with associated `CoinConf`.
   static const BitcoinCashNetwork mainnet =
-      BitcoinCashNetwork._("bitcoinCashMainnet", CoinsConf.bitcoinCashMainNet);
+      BitcoinCashNetwork._('bitcoinCashMainnet', CoinsConf.bitcoinCashMainNet);
 
   /// Testnet configuration with associated `CoinConf`.
   static const BitcoinCashNetwork testnet =
-      BitcoinCashNetwork._("bitcoinCashTestnet", CoinsConf.bitcoinCashTestNet);
+      BitcoinCashNetwork._('bitcoinCashTestnet', CoinsConf.bitcoinCashTestNet);
 
   /// Overrides the `conf` property from `BasedUtxoNetwork` with the associated `CoinConf`.
   @override
@@ -379,7 +379,6 @@ class BitcoinCashNetwork implements BasedUtxoNetwork {
 
   /// Constructor for creating a Bitcoin Cash network with a specific configuration.
   const BitcoinCashNetwork._(this.value, this.conf);
-
   @override
   final String value;
 
@@ -411,7 +410,7 @@ class BitcoinCashNetwork implements BasedUtxoNetwork {
   /// from the associated `CoinConf`.
   @override
   String get p2wpkhHrp => throw const DartBitcoinPluginException(
-      "network does not support p2wpkh HRP");
+      'network does not support p2wpkh HRP');
 
   String get networkHRP => conf.params.p2pkhStdHrp!;
 
@@ -445,7 +444,7 @@ class BitcoinCashNetwork implements BasedUtxoNetwork {
 class PepeNetwork implements BasedUtxoNetwork {
   /// Mainnet configuration with associated `CoinConf`.
   static const PepeNetwork mainnet =
-      PepeNetwork._("pepecoinMainnet", CoinsConf.pepeMainnet);
+      PepeNetwork._('pepecoinMainnet', CoinsConf.pepeMainnet);
 
   /// Overrides the `conf` property from `BasedUtxoNetwork` with the associated `CoinConf`.
   @override
@@ -472,7 +471,7 @@ class PepeNetwork implements BasedUtxoNetwork {
   /// Retrieves the Human-Readable Part (HRP) for Pay-to-Witness-Public-Key-Hash (P2WPKH) addresses.
   @override
   String get p2wpkhHrp => throw const DartBitcoinPluginException(
-      "DogecoinNetwork network does not support P2WPKH/P2WSH");
+      'DogecoinNetwork network does not support P2WPKH/P2WSH');
 
   /// Checks if the current network is the mainnet.
   @override
@@ -499,11 +498,11 @@ class PepeNetwork implements BasedUtxoNetwork {
 class ElectraProtocolNetwork implements BasedUtxoNetwork {
   /// Mainnet configuration with associated `CoinConf`.
   static const ElectraProtocolNetwork mainnet = ElectraProtocolNetwork._(
-      "electraProtocolMainnet", CoinsConf.electraProtocolMainNet);
+      'electraProtocolMainnet', CoinsConf.electraProtocolMainNet);
 
   /// Testnet configuration with associated `CoinConf`.
   static const ElectraProtocolNetwork testnet = ElectraProtocolNetwork._(
-      "electraProtocolTestnet", CoinsConf.electraProtocolTestNet);
+      'electraProtocolTestnet', CoinsConf.electraProtocolTestNet);
 
   /// Overrides the `conf` property from `BasedUtxoNetwork` with the associated `CoinConf`.
   @override
diff --git a/lib/src/provider/api_provider.dart b/lib/src/provider/api_provider.dart
index c043b56..c63f462 100644
--- a/lib/src/provider/api_provider.dart
+++ b/lib/src/provider/api_provider.dart
@@ -1,5 +1,8 @@
 export 'models/models.dart';
-export 'transaction_builder/builder.dart';
-export 'service/services.dart';
-export 'api_provider/providers.dart';
+export 'providers/explorer.dart';
+export 'providers/electrum.dart';
 export 'electrum_methods/methods.dart';
+export 'services/electrum.dart';
+export 'services/explorer.dart';
+export 'core/methods.dart';
+export 'core/params.dart';
diff --git a/lib/src/provider/api_provider/electrum_api_provider.dart b/lib/src/provider/api_provider/electrum_api_provider.dart
deleted file mode 100644
index 835cc2d..0000000
--- a/lib/src/provider/api_provider/electrum_api_provider.dart
+++ /dev/null
@@ -1,37 +0,0 @@
-import 'package:bitcoin_base/src/provider/api_provider.dart';
-import 'dart:async';
-
-import 'package:blockchain_utils/exception/exceptions.dart';
-
-class ElectrumApiProvider {
-  final BitcoinBaseElectrumRPCService rpc;
-  ElectrumApiProvider(this.rpc);
-  int _id = 0;
-
-  /// Sends a request to the Electrum server using the specified [request] parameter.
-  ///
-  /// The [timeout] parameter, if provided, sets the maximum duration for the request.
-  Future<T> request<T>(ElectrumRequest<T, dynamic> request,
-      [Duration? timeout]) async {
-    final id = ++_id;
-    final params = request.toRequest(id);
-    final data = await rpc.call(params, timeout);
-    return request.onResonse(_findResult(data, params));
-  }
-
-  dynamic _findResult(
-      Map<String, dynamic> data, ElectrumRequestDetails request) {
-    final error = data["error"];
-    if (error != null) {
-      final code = int.tryParse(error["code"]?.toString() ?? "");
-      final message = error['message'] ?? "";
-      throw RPCError(
-          errorCode: code,
-          message: message,
-          request: data["request"] ?? request.params,
-          details: error);
-    }
-
-    return data["result"];
-  }
-}
diff --git a/lib/src/provider/api_provider/providers.dart b/lib/src/provider/api_provider/providers.dart
deleted file mode 100644
index df92a29..0000000
--- a/lib/src/provider/api_provider/providers.dart
+++ /dev/null
@@ -1,2 +0,0 @@
-export 'api_provider.dart';
-export 'electrum_api_provider.dart';
diff --git a/lib/src/provider/constant/constant.dart b/lib/src/provider/constant/constant.dart
index 172fdee..f10a9e0 100644
--- a/lib/src/provider/constant/constant.dart
+++ b/lib/src/provider/constant/constant.dart
@@ -1,18 +1,18 @@
 class BtcApiConst {
   static const String blockCypherBaseURL =
-      "https://api.blockcypher.com/v1/btc/test3";
-  static const String mempoolBaseURL = "https://mempool.space/testnet/api";
+      'https://api.blockcypher.com/v1/btc/test3';
+  static const String mempoolBaseURL = 'https://mempool.space/testnet/api';
   static const String blockstreamBaseURL =
-      "https://blockstream.info/testnet/api";
+      'https://blockstream.info/testnet/api';
   static const String blockCypherMainBaseURL =
-      "https://api.blockcypher.com/v1/btc/main";
-  static const String mempoolMainBaseURL = "https://mempool.space/api";
-  static const String blockstreamMainBaseURL = "https://blockstream.info/api";
+      'https://api.blockcypher.com/v1/btc/main';
+  static const String mempoolMainBaseURL = 'https://mempool.space/api';
+  static const String blockstreamMainBaseURL = 'https://blockstream.info/api';
   //
   static const String blockCypherDashBaseUri =
-      "https://api.blockcypher.com/v1/dash/main";
+      'https://api.blockcypher.com/v1/dash/main';
   static const String blockCypherDogeBaseUri =
-      "https://api.blockcypher.com/v1/doge/main";
+      'https://api.blockcypher.com/v1/doge/main';
   static const String blockCypherLitecoinBaseUri =
-      "https://api.blockcypher.com/v1/ltc/main";
+      'https://api.blockcypher.com/v1/ltc/main';
 }
diff --git a/lib/src/provider/service/electrum/methods.dart b/lib/src/provider/core/methods.dart
similarity index 70%
rename from lib/src/provider/service/electrum/methods.dart
rename to lib/src/provider/core/methods.dart
index 027fd44..fb9790c 100644
--- a/lib/src/provider/service/electrum/methods.dart
+++ b/lib/src/provider/core/methods.dart
@@ -5,119 +5,119 @@ class ElectrumRequestMethods {
 
   /// Return a list of peer servers. Despite the name this is not a subscription and the server must send no notifications.
   static const ElectrumRequestMethods serverPeersSubscribe =
-      ElectrumRequestMethods._("server.peers.subscribe");
+      ElectrumRequestMethods._('server.peers.subscribe');
 
   /// Return a server donation address.
   static const ElectrumRequestMethods serverDontionAddress =
-      ElectrumRequestMethods._("server.donation_address");
+      ElectrumRequestMethods._('server.donation_address');
 
   /// A newly-started server uses this call to get itself into other servers’ peers lists. It should not be used by wallet clients.
   static const ElectrumRequestMethods serverAddPeer =
-      ElectrumRequestMethods._("server.add_peer");
+      ElectrumRequestMethods._('server.add_peer');
 
   /// Subscribe to a script hash.
   static const ElectrumRequestMethods scriptHashSubscribe =
-      ElectrumRequestMethods._("blockchain.scripthash.subscribe");
+      ElectrumRequestMethods._('blockchain.scripthash.subscribe');
 
   /// Unsubscribe from a script hash, preventing future notifications if its status changes.
   static const ElectrumRequestMethods scriptHashUnSubscribe =
-      ElectrumRequestMethods._("blockchain.scripthash.unsubscribe");
+      ElectrumRequestMethods._('blockchain.scripthash.unsubscribe');
 
   /// Return an ordered list of UTXOs sent to a script hash.
   static const ElectrumRequestMethods listunspent =
-      ElectrumRequestMethods._("blockchain.scripthash.listunspent");
+      ElectrumRequestMethods._('blockchain.scripthash.listunspent');
 
   /// Return the confirmed and unconfirmed balances of a script hash.
   static const ElectrumRequestMethods getBalance =
-      ElectrumRequestMethods._("blockchain.scripthash.get_balance");
+      ElectrumRequestMethods._('blockchain.scripthash.get_balance');
 
   /// Return a raw transaction.
   static const ElectrumRequestMethods getTransaction =
-      ElectrumRequestMethods._("blockchain.transaction.get");
+      ElectrumRequestMethods._('blockchain.transaction.get');
 
   /// Return the merkle branch to a confirmed transaction given its hash and height.
   static const ElectrumRequestMethods getMerkle =
-      ElectrumRequestMethods._("blockchain.transaction.get_merkle");
+      ElectrumRequestMethods._('blockchain.transaction.get_merkle');
 
   /// Return a transaction hash and optionally a merkle proof, given a block height and a position in the block.
   static const ElectrumRequestMethods idFromPos =
-      ElectrumRequestMethods._("blockchain.transaction.id_from_pos");
+      ElectrumRequestMethods._('blockchain.transaction.id_from_pos');
 
   /// Return a histogram of the fee rates paid by transactions in the memory pool, weighted by transaction size.
   static const ElectrumRequestMethods getFeeHistogram =
-      ElectrumRequestMethods._("mempool.get_fee_histogram");
+      ElectrumRequestMethods._('mempool.get_fee_histogram');
 
   /// Return the block header at the given height.
   static const ElectrumRequestMethods blockHeader =
-      ElectrumRequestMethods._("blockchain.block.header");
+      ElectrumRequestMethods._('blockchain.block.header');
 
   /// Return a concatenated chunk of block headers from the main chain.
   static const ElectrumRequestMethods blockHeaders =
-      ElectrumRequestMethods._("blockchain.block.headers");
+      ElectrumRequestMethods._('blockchain.block.headers');
 
   /// Return the estimated transaction fee per kilobyte for a transaction to be confirmed within a certain number of blocks.
   static const ElectrumRequestMethods estimateFee =
-      ElectrumRequestMethods._("blockchain.estimatefee");
+      ElectrumRequestMethods._('blockchain.estimatefee');
 
   /// Return the confirmed and unconfirmed history of a script hash.
   static const ElectrumRequestMethods getHistory =
-      ElectrumRequestMethods._("blockchain.scripthash.get_history");
+      ElectrumRequestMethods._('blockchain.scripthash.get_history');
 
   /// Return the unconfirmed transactions of a script hash.
   static const ElectrumRequestMethods getMempool =
-      ElectrumRequestMethods._("blockchain.scripthash.get_mempool");
+      ElectrumRequestMethods._('blockchain.scripthash.get_mempool');
 
   /// Broadcast a transaction to the network.
   static const ElectrumRequestMethods broadCast =
-      ElectrumRequestMethods._("blockchain.transaction.broadcast");
+      ElectrumRequestMethods._('blockchain.transaction.broadcast');
 
   /// Return a banner to be shown in the Electrum console.
   static const ElectrumRequestMethods serverBanner =
-      ElectrumRequestMethods._("server.banner");
+      ElectrumRequestMethods._('server.banner');
 
   /// Return a list of features and services supported by the server.
   static const ElectrumRequestMethods serverFeatures =
-      ElectrumRequestMethods._("server.features");
+      ElectrumRequestMethods._('server.features');
 
   /// Ping the server to ensure it is responding, and to keep the session alive. The server may disconnect clients that have sent no requests for roughly 10 minutes.
   static const ElectrumRequestMethods ping =
-      ElectrumRequestMethods._("server.ping");
+      ElectrumRequestMethods._('server.ping');
 
   /// Identify the client to the server and negotiate the protocol version. Only the first server.version() message is accepted.
   static const ElectrumRequestMethods version =
-      ElectrumRequestMethods._("server.version");
+      ElectrumRequestMethods._('server.version');
 
   /// Subscribe to receive block headers when a new block is found.
   static const ElectrumRequestMethods headersSubscribe =
-      ElectrumRequestMethods._("blockchain.headers.subscribe");
+      ElectrumRequestMethods._('blockchain.headers.subscribe');
 
   /// Return the minimum fee a low-priority transaction must pay in order to be accepted to the daemon’s memory pool.
   static const ElectrumRequestMethods relayFee =
-      ElectrumRequestMethods._("blockchain.relayfee");
+      ElectrumRequestMethods._('blockchain.relayfee');
 
   /// Pass through the masternode announce message to be broadcast by the daemon.
   static const ElectrumRequestMethods masternodeAnnounceBroadcast =
-      ElectrumRequestMethods._("masternode.announce.broadcast");
+      ElectrumRequestMethods._('masternode.announce.broadcast');
 
   /// Returns the status of masternode.
   static const ElectrumRequestMethods masternodeSubscribe =
-      ElectrumRequestMethods._("masternode.subscribe");
+      ElectrumRequestMethods._('masternode.subscribe');
 
   /// Returns the list of masternodes.
   static const ElectrumRequestMethods masternodeList =
-      ElectrumRequestMethods._("masternode.list");
+      ElectrumRequestMethods._('masternode.list');
 
   /// Returns a diff between two deterministic masternode lists. The result also contains proof data.
   static const ElectrumRequestMethods protxDiff =
-      ElectrumRequestMethods._("protx.diff");
+      ElectrumRequestMethods._('protx.diff');
 
   /// Returns detailed information about a deterministic masternode.
   static const ElectrumRequestMethods protxInfo =
-      ElectrumRequestMethods._("protx.info");
+      ElectrumRequestMethods._('protx.info');
 
   /// Returns a name resolution proof, suitable for low-latency (single round-trip) resolution.
   static const ElectrumRequestMethods getValueProof =
-      ElectrumRequestMethods._("blockchain.name.get_value_proof");
+      ElectrumRequestMethods._('blockchain.name.get_value_proof');
   @override
   String toString() {
     return method;
diff --git a/lib/src/provider/core/params.dart b/lib/src/provider/core/params.dart
new file mode 100644
index 0000000..36612cf
--- /dev/null
+++ b/lib/src/provider/core/params.dart
@@ -0,0 +1,66 @@
+import 'package:blockchain_utils/blockchain_utils.dart';
+
+/// Represents details of an Electrum request, including id, method, and parameters.
+class ElectrumRequestDetails extends BaseServiceRequestParams {
+  const ElectrumRequestDetails(
+      {required super.requestID,
+      this.path,
+      required this.method,
+      required this.params,
+      required super.type,
+      super.headers = ServiceConst.defaultPostHeaders});
+
+  final String? path;
+  final String method;
+  final Map<String, dynamic> params;
+
+  List<int> toTCPParams() {
+    final param = '${StringUtils.fromJson(params)}\n';
+    return StringUtils.encode(param);
+  }
+
+  List<int> toWebSocketParams() {
+    return StringUtils.encode(StringUtils.fromJson(params));
+  }
+
+  @override
+  List<int>? body() {
+    return toWebSocketParams();
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    return {
+      'method': method,
+      'body': params,
+    };
+  }
+
+  @override
+  Uri toUri(String uri) {
+    return Uri.parse(uri);
+  }
+}
+
+/// Abstract class representing an Electrum request with generic result and response types.
+abstract class ElectrumRequest<RESULT, RESPONSE>
+    extends BaseServiceRequest<RESULT, RESPONSE, ElectrumRequestDetails> {
+  abstract final String method;
+  List<dynamic> toJson();
+
+  @override
+  ElectrumRequestDetails buildRequest(int requestID) {
+    final inJson = toJson();
+    inJson.removeWhere((v) => v == null);
+    final params = ServiceProviderUtils.buildJsonRPCParams(
+        requestId: requestID, method: method, params: inJson);
+    return ElectrumRequestDetails(
+        requestID: requestID,
+        params: params,
+        method: method,
+        type: RequestServiceType.post);
+  }
+
+  @override
+  RequestServiceType get requestType => RequestServiceType.post;
+}
diff --git a/lib/src/provider/electrum_methods/methods/add_peer.dart b/lib/src/provider/electrum_methods/methods/add_peer.dart
index fb23bba..33d2103 100644
--- a/lib/src/provider/electrum_methods/methods/add_peer.dart
+++ b/lib/src/provider/electrum_methods/methods/add_peer.dart
@@ -1,10 +1,11 @@
-import 'package:bitcoin_base/src/provider/api_provider.dart';
+import 'package:bitcoin_base/src/provider/core/methods.dart';
+import 'package:bitcoin_base/src/provider/core/params.dart';
 
 /// A newly-started server uses this call to get itself into other servers’ peers lists.
 /// It should not be used by wallet clients.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumAddPeer extends ElectrumRequest<bool, bool> {
-  ElectrumAddPeer({required this.features});
+class ElectrumRequestAddPeer extends ElectrumRequest<bool, bool> {
+  ElectrumRequestAddPeer({required this.features});
 
   /// The same information that a call to the sender’s server.features() RPC call would return.
   final Map<String, dynamic> features;
diff --git a/lib/src/provider/electrum_methods/methods/block_headers.dart b/lib/src/provider/electrum_methods/methods/block_headers.dart
index ef75150..dddf3f9 100644
--- a/lib/src/provider/electrum_methods/methods/block_headers.dart
+++ b/lib/src/provider/electrum_methods/methods/block_headers.dart
@@ -1,10 +1,11 @@
-import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
+import 'package:bitcoin_base/src/provider/core/methods.dart';
+import 'package:bitcoin_base/src/provider/core/params.dart';
 
 /// Return a concatenated chunk of block headers from the main chain.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumBlockHeaders
+class ElectrumRequestBlockHeaders
     extends ElectrumRequest<Map<String, dynamic>, Map<String, dynamic>> {
-  ElectrumBlockHeaders(
+  ElectrumRequestBlockHeaders(
       {required this.startHeight, required this.count, required this.cpHeight});
 
   /// The height of the first header requested, a non-negative integer.
diff --git a/lib/src/provider/electrum_methods/methods/broad_cast.dart b/lib/src/provider/electrum_methods/methods/broad_cast.dart
index fef43d0..b8125e9 100644
--- a/lib/src/provider/electrum_methods/methods/broad_cast.dart
+++ b/lib/src/provider/electrum_methods/methods/broad_cast.dart
@@ -1,10 +1,11 @@
-import 'package:bitcoin_base/src/provider/service/electrum/methods.dart';
-import 'package:bitcoin_base/src/provider/service/electrum/params.dart';
+import 'package:bitcoin_base/src/provider/core/methods.dart';
+import 'package:bitcoin_base/src/provider/core/params.dart';
 
 /// Broadcast a transaction to the network.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumBroadCastTransaction extends ElectrumRequest<String, String> {
-  ElectrumBroadCastTransaction({required this.transactionRaw});
+class ElectrumRequestBroadCastTransaction
+    extends ElectrumRequest<String, String> {
+  ElectrumRequestBroadCastTransaction({required this.transactionRaw});
 
   /// The raw transaction as a hexadecimal string.
   final String transactionRaw;
diff --git a/lib/src/provider/electrum_methods/methods/donate_address.dart b/lib/src/provider/electrum_methods/methods/donate_address.dart
index 4f59989..c5dfa80 100644
--- a/lib/src/provider/electrum_methods/methods/donate_address.dart
+++ b/lib/src/provider/electrum_methods/methods/donate_address.dart
@@ -1,8 +1,9 @@
-import 'package:bitcoin_base/src/provider/api_provider.dart';
+import 'package:bitcoin_base/src/provider/core/methods.dart';
+import 'package:bitcoin_base/src/provider/core/params.dart';
 
 /// Return a server donation address.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumDonationAddress extends ElectrumRequest<String, String> {
+class ElectrumRequestDonationAddress extends ElectrumRequest<String, String> {
   /// server.donation_address
   @override
   String get method => ElectrumRequestMethods.serverDontionAddress.method;
diff --git a/lib/src/provider/electrum_methods/methods/electrum_version.dart b/lib/src/provider/electrum_methods/methods/electrum_version.dart
index 1a1f858..f6ebce4 100644
--- a/lib/src/provider/electrum_methods/methods/electrum_version.dart
+++ b/lib/src/provider/electrum_methods/methods/electrum_version.dart
@@ -1,9 +1,12 @@
-import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
+import 'package:bitcoin_base/src/provider/core/methods.dart';
+import 'package:bitcoin_base/src/provider/core/params.dart';
 
 /// Identify the client to the server and negotiate the protocol version. Only the first server.version() message is accepted.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumVersion extends ElectrumRequest<List<String>, List<dynamic>> {
-  ElectrumVersion({required this.clientName, required this.protocolVersion});
+class ElectrumRequestVersion
+    extends ElectrumRequest<List<String>, List<dynamic>> {
+  ElectrumRequestVersion(
+      {required this.clientName, required this.protocolVersion});
 
   /// A string identifying the connecting client software.
   final String clientName;
diff --git a/lib/src/provider/electrum_methods/methods/estimate_fee.dart b/lib/src/provider/electrum_methods/methods/estimate_fee.dart
index 859dfd8..67c9c56 100644
--- a/lib/src/provider/electrum_methods/methods/estimate_fee.dart
+++ b/lib/src/provider/electrum_methods/methods/estimate_fee.dart
@@ -1,10 +1,11 @@
-import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
+import 'package:bitcoin_base/src/provider/core/methods.dart';
+import 'package:bitcoin_base/src/provider/core/params.dart';
 import 'package:bitcoin_base/src/utils/btc_utils.dart';
 
 /// Return the estimated transaction fee per kilobyte for a transaction to be confirmed within a certain number of blocks.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumEstimateFee extends ElectrumRequest<BigInt?, dynamic> {
-  ElectrumEstimateFee({this.numberOfBlock = 2});
+class ElectrumRequestEstimateFee extends ElectrumRequest<BigInt?, dynamic> {
+  ElectrumRequestEstimateFee({this.numberOfBlock = 2});
 
   /// The number of blocks to target for confirmation.
   final int numberOfBlock;
diff --git a/lib/src/provider/electrum_methods/methods/get_balance.dart b/lib/src/provider/electrum_methods/methods/get_balance.dart
index c9a49e0..cce82bb 100644
--- a/lib/src/provider/electrum_methods/methods/get_balance.dart
+++ b/lib/src/provider/electrum_methods/methods/get_balance.dart
@@ -1,11 +1,11 @@
-import 'package:bitcoin_base/src/provider/service/electrum/methods.dart';
-import 'package:bitcoin_base/src/provider/service/electrum/params.dart';
+import 'package:bitcoin_base/src/provider/core/methods.dart';
+import 'package:bitcoin_base/src/provider/core/params.dart';
 
 /// Return the confirmed and unconfirmed balances of a script hash.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumGetScriptHashBalance
+class ElectrumRequestGetScriptHashBalance
     extends ElectrumRequest<Map<String, dynamic>, Map<String, dynamic>> {
-  ElectrumGetScriptHashBalance({required this.scriptHash});
+  ElectrumRequestGetScriptHashBalance({required this.scriptHash});
 
   /// The script hash as a hexadecimal string (BitcoinBaseAddress.pubKeyHash())
   final String scriptHash;
diff --git a/lib/src/provider/electrum_methods/methods/get_fee_histogram.dart b/lib/src/provider/electrum_methods/methods/get_fee_histogram.dart
index 8c89c23..5394221 100644
--- a/lib/src/provider/electrum_methods/methods/get_fee_histogram.dart
+++ b/lib/src/provider/electrum_methods/methods/get_fee_histogram.dart
@@ -1,10 +1,10 @@
-import 'package:bitcoin_base/src/provider/service/electrum/methods.dart';
-import 'package:bitcoin_base/src/provider/service/electrum/params.dart';
+import 'package:bitcoin_base/src/provider/core/methods.dart';
+import 'package:bitcoin_base/src/provider/core/params.dart';
 
 /// Return a histogram of the fee rates paid by transactions in the memory pool, weighted by transaction size.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumGetFeeHistogram
-    extends ElectrumRequest<List<List<int>>, List<dynamic>> {
+class ElectrumRequestGetFeeHistogram
+    extends ElectrumRequest<List<List<double>>, List<dynamic>> {
   /// mempool.get_fee_histogram
   @override
   String get method => ElectrumRequestMethods.getFeeHistogram.method;
@@ -19,7 +19,9 @@ class ElectrumGetFeeHistogram
   /// fee uses sat/vbyte as unit, and must be a non-negative integer or float.
   /// vsize uses vbyte as unit, and must be a non-negative integer.
   @override
-  List<List<int>> onResonse(result) {
-    return result.map((e) => List<int>.from(e)).toList();
+  List<List<double>> onResonse(result) {
+    return result
+        .map((e) => (e as List).map((e) => (e as num).toDouble()).toList())
+        .toList();
   }
 }
diff --git a/lib/src/provider/electrum_methods/methods/get_history.dart b/lib/src/provider/electrum_methods/methods/get_history.dart
index 9f8efa2..ed3a117 100644
--- a/lib/src/provider/electrum_methods/methods/get_history.dart
+++ b/lib/src/provider/electrum_methods/methods/get_history.dart
@@ -1,11 +1,11 @@
-import 'package:bitcoin_base/src/provider/service/electrum/methods.dart';
-import 'package:bitcoin_base/src/provider/service/electrum/params.dart';
+import 'package:bitcoin_base/src/provider/core/methods.dart';
+import 'package:bitcoin_base/src/provider/core/params.dart';
 
 /// Return the confirmed and unconfirmed history of a script hash.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumScriptHashGetHistory
+class ElectrumRequestScriptHashGetHistory
     extends ElectrumRequest<List<Map<String, dynamic>>, List<dynamic>> {
-  ElectrumScriptHashGetHistory({required this.scriptHash});
+  ElectrumRequestScriptHashGetHistory({required this.scriptHash});
 
   /// The script hash as a hexadecimal string (BitcoinBaseAddress.pubKeyHash())
   final String scriptHash;
diff --git a/lib/src/provider/electrum_methods/methods/get_mempool.dart b/lib/src/provider/electrum_methods/methods/get_mempool.dart
index fcd33a2..abd6fef 100644
--- a/lib/src/provider/electrum_methods/methods/get_mempool.dart
+++ b/lib/src/provider/electrum_methods/methods/get_mempool.dart
@@ -1,11 +1,11 @@
-import 'package:bitcoin_base/src/provider/service/electrum/methods.dart';
-import 'package:bitcoin_base/src/provider/service/electrum/params.dart';
+import 'package:bitcoin_base/src/provider/core/methods.dart';
+import 'package:bitcoin_base/src/provider/core/params.dart';
 
 /// Return the unconfirmed transactions of a script hash.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumScriptHashGetMempool
+class ElectrumRequestScriptHashGetMempool
     extends ElectrumRequest<List<Map<String, dynamic>>, List<dynamic>> {
-  ElectrumScriptHashGetMempool({required this.scriptHash});
+  ElectrumRequestScriptHashGetMempool({required this.scriptHash});
 
   /// The script hash as a hexadecimal string (BitcoinBaseAddress.pubKeyHash())
   final String scriptHash;
diff --git a/lib/src/provider/electrum_methods/methods/get_merkle.dart b/lib/src/provider/electrum_methods/methods/get_merkle.dart
index a39cd8a..7620749 100644
--- a/lib/src/provider/electrum_methods/methods/get_merkle.dart
+++ b/lib/src/provider/electrum_methods/methods/get_merkle.dart
@@ -1,11 +1,12 @@
-import 'package:bitcoin_base/src/provider/service/electrum/methods.dart';
-import 'package:bitcoin_base/src/provider/service/electrum/params.dart';
+import 'package:bitcoin_base/src/provider/core/methods.dart';
+import 'package:bitcoin_base/src/provider/core/params.dart';
 
 /// Return the merkle branch to a confirmed transaction given its hash and height.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumGetMerkle
+class ElectrumRequestGetMerkle
     extends ElectrumRequest<Map<String, dynamic>, Map<String, dynamic>> {
-  ElectrumGetMerkle({required this.transactionHash, required this.height});
+  ElectrumRequestGetMerkle(
+      {required this.transactionHash, required this.height});
 
   /// The transaction hash as a hexadecimal string.
   final String transactionHash;
diff --git a/lib/src/provider/electrum_methods/methods/get_transaction.dart b/lib/src/provider/electrum_methods/methods/get_transaction.dart
index f18dd84..3f99f37 100644
--- a/lib/src/provider/electrum_methods/methods/get_transaction.dart
+++ b/lib/src/provider/electrum_methods/methods/get_transaction.dart
@@ -1,10 +1,11 @@
-import 'package:bitcoin_base/src/provider/service/electrum/methods.dart';
-import 'package:bitcoin_base/src/provider/service/electrum/params.dart';
+import 'package:bitcoin_base/src/provider/core/methods.dart';
+import 'package:bitcoin_base/src/provider/core/params.dart';
 
 /// Return a raw transaction.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumGetTransaction extends ElectrumRequest<dynamic, dynamic> {
-  ElectrumGetTransaction({required this.transactionHash, this.verbose = false});
+class ElectrumRequestGetTransaction extends ElectrumRequest<dynamic, dynamic> {
+  ElectrumRequestGetTransaction(
+      {required this.transactionHash, this.verbose = false});
 
   /// The transaction hash as a hexadecimal string.
   final String transactionHash;
diff --git a/lib/src/provider/electrum_methods/methods/get_unspet.dart b/lib/src/provider/electrum_methods/methods/get_unspet.dart
index 2a957d1..0e36cc2 100644
--- a/lib/src/provider/electrum_methods/methods/get_unspet.dart
+++ b/lib/src/provider/electrum_methods/methods/get_unspet.dart
@@ -1,12 +1,12 @@
 import 'package:bitcoin_base/src/provider/models/electrum/electrum_utxo.dart';
-import 'package:bitcoin_base/src/provider/service/electrum/methods.dart';
-import 'package:bitcoin_base/src/provider/service/electrum/params.dart';
+import 'package:bitcoin_base/src/provider/core/methods.dart';
+import 'package:bitcoin_base/src/provider/core/params.dart';
 
 /// Return an ordered list of UTXOs sent to a script hash.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumScriptHashListUnspent
+class ElectrumRequestScriptHashListUnspent
     extends ElectrumRequest<List<ElectrumUtxo>, List<dynamic>> {
-  ElectrumScriptHashListUnspent(
+  ElectrumRequestScriptHashListUnspent(
       {required this.scriptHash, this.includeTokens = false});
 
   /// The script hash as a hexadecimal string (BitcoinBaseAddress.pubKeyHash())
@@ -21,7 +21,7 @@ class ElectrumScriptHashListUnspent
 
   @override
   List toJson() {
-    return [scriptHash, if (includeTokens) "include_tokens"];
+    return [scriptHash, if (includeTokens) 'include_tokens'];
   }
 
   /// A list of unspent outputs in blockchain order.
@@ -30,8 +30,7 @@ class ElectrumScriptHashListUnspent
   /// Any output that is spent in the mempool does not appear.
   @override
   List<ElectrumUtxo> onResonse(result) {
-    final List<ElectrumUtxo> utxos =
-        result.map((e) => ElectrumUtxo.fromJson(e)).toList();
+    final utxos = result.map((e) => ElectrumUtxo.fromJson(e)).toList();
     return utxos;
   }
 }
diff --git a/lib/src/provider/electrum_methods/methods/get_value_proof.dart b/lib/src/provider/electrum_methods/methods/get_value_proof.dart
index bebe814..9eddd0c 100644
--- a/lib/src/provider/electrum_methods/methods/get_value_proof.dart
+++ b/lib/src/provider/electrum_methods/methods/get_value_proof.dart
@@ -1,10 +1,12 @@
-import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
+import 'package:bitcoin_base/src/provider/core/methods.dart';
+import 'package:bitcoin_base/src/provider/core/params.dart';
 
 /// Returns a name resolution proof, suitable for low-latency (single round-trip) resolution.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumGetValueProof
+class ElectrumRequestGetValueProof
     extends ElectrumRequest<Map<String, dynamic>, dynamic> {
-  ElectrumGetValueProof({required this.scriptHash, required this.cpHeight});
+  ElectrumRequestGetValueProof(
+      {required this.scriptHash, required this.cpHeight});
 
   /// Script hash of the name being resolved.
   final String scriptHash;
diff --git a/lib/src/provider/electrum_methods/methods/header.dart b/lib/src/provider/electrum_methods/methods/header.dart
index 97120b5..1c83926 100644
--- a/lib/src/provider/electrum_methods/methods/header.dart
+++ b/lib/src/provider/electrum_methods/methods/header.dart
@@ -1,9 +1,11 @@
-import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
+import 'package:bitcoin_base/src/provider/core/methods.dart';
+import 'package:bitcoin_base/src/provider/core/params.dart';
 
 /// Return the block header at the given height.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumBlockHeader extends ElectrumRequest<dynamic, dynamic> {
-  ElectrumBlockHeader({required this.startHeight, required this.cpHeight});
+class ElectrumRequestBlockHeader extends ElectrumRequest<dynamic, dynamic> {
+  ElectrumRequestBlockHeader(
+      {required this.startHeight, required this.cpHeight});
   final int startHeight;
   final int cpHeight;
 
diff --git a/lib/src/provider/electrum_methods/methods/headers_subscribe.dart b/lib/src/provider/electrum_methods/methods/headers_subscribe.dart
index 651c695..9dc0f18 100644
--- a/lib/src/provider/electrum_methods/methods/headers_subscribe.dart
+++ b/lib/src/provider/electrum_methods/methods/headers_subscribe.dart
@@ -1,8 +1,9 @@
-import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
+import 'package:bitcoin_base/src/provider/core/methods.dart';
+import 'package:bitcoin_base/src/provider/core/params.dart';
 
 /// Subscribe to receive block headers when a new block is found.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumHeaderSubscribe
+class ElectrumRequestHeaderSubscribe
     extends ElectrumRequest<Map<String, dynamic>, Map<String, dynamic>> {
   /// blockchain.headers.subscribe
   @override
diff --git a/lib/src/provider/electrum_methods/methods/id_from_pos.dart b/lib/src/provider/electrum_methods/methods/id_from_pos.dart
index 865f0b2..5f73d57 100644
--- a/lib/src/provider/electrum_methods/methods/id_from_pos.dart
+++ b/lib/src/provider/electrum_methods/methods/id_from_pos.dart
@@ -1,10 +1,10 @@
-import 'package:bitcoin_base/src/provider/service/electrum/methods.dart';
-import 'package:bitcoin_base/src/provider/service/electrum/params.dart';
+import 'package:bitcoin_base/src/provider/core/methods.dart';
+import 'package:bitcoin_base/src/provider/core/params.dart';
 
 /// Return a transaction hash and optionally a merkle proof, given a block height and a position in the block.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumIdFromPos extends ElectrumRequest<dynamic, dynamic> {
-  ElectrumIdFromPos(
+class ElectrumRequestIdFromPos extends ElectrumRequest<dynamic, dynamic> {
+  ElectrumRequestIdFromPos(
       {required this.height, required this.txPos, this.merkle = false});
 
   /// The main chain block height, a non-negative integer.
diff --git a/lib/src/provider/electrum_methods/methods/masternode_announce_broadcast.dart b/lib/src/provider/electrum_methods/methods/masternode_announce_broadcast.dart
index f3169d3..767bd33 100644
--- a/lib/src/provider/electrum_methods/methods/masternode_announce_broadcast.dart
+++ b/lib/src/provider/electrum_methods/methods/masternode_announce_broadcast.dart
@@ -1,11 +1,13 @@
-import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
+import 'package:bitcoin_base/src/provider/core/methods.dart';
+import 'package:bitcoin_base/src/provider/core/params.dart';
 
 /// Pass through the masternode announce message to be broadcast by the daemon.
 /// Whenever a masternode comes online or a client is syncing,
 /// they will send this message which describes the masternode entry and how to validate messages from it.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumMasternodeAnnounceBroadcast extends ElectrumRequest<bool, bool> {
-  ElectrumMasternodeAnnounceBroadcast({required this.signmnb});
+class ElectrumRequestMasternodeAnnounceBroadcast
+    extends ElectrumRequest<bool, bool> {
+  ElectrumRequestMasternodeAnnounceBroadcast({required this.signmnb});
   final String signmnb;
 
   /// masternode.announce.broadcast
diff --git a/lib/src/provider/electrum_methods/methods/masternode_list.dart b/lib/src/provider/electrum_methods/methods/masternode_list.dart
index 437dc3b..d2b3195 100644
--- a/lib/src/provider/electrum_methods/methods/masternode_list.dart
+++ b/lib/src/provider/electrum_methods/methods/masternode_list.dart
@@ -1,10 +1,11 @@
-import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
+import 'package:bitcoin_base/src/provider/core/methods.dart';
+import 'package:bitcoin_base/src/provider/core/params.dart';
 
 /// Returns the list of masternodes.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumMasternodeList
+class ElectrumRequestMasternodeList
     extends ElectrumRequest<List<String>, List<dynamic>> {
-  ElectrumMasternodeList({required this.payees});
+  ElectrumRequestMasternodeList({required this.payees});
 
   /// An array of masternode payee addresses.
   final List<String> payees;
diff --git a/lib/src/provider/electrum_methods/methods/masternode_subscribe.dart b/lib/src/provider/electrum_methods/methods/masternode_subscribe.dart
index 2734415..c96846a 100644
--- a/lib/src/provider/electrum_methods/methods/masternode_subscribe.dart
+++ b/lib/src/provider/electrum_methods/methods/masternode_subscribe.dart
@@ -1,9 +1,11 @@
-import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
+import 'package:bitcoin_base/src/provider/core/methods.dart';
+import 'package:bitcoin_base/src/provider/core/params.dart';
 
 /// Returns the status of masternode.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumMasternodeSubscribe extends ElectrumRequest<String, String> {
-  ElectrumMasternodeSubscribe({required this.collateral});
+class ElectrumRequestMasternodeSubscribe
+    extends ElectrumRequest<String, String> {
+  ElectrumRequestMasternodeSubscribe({required this.collateral});
 
   /// The txId and the index of the collateral. Example ("8c59133e714797650cf69043d05e409bbf45670eed7c4e4a386e52c46f1b5e24-0")
   final String collateral;
diff --git a/lib/src/provider/electrum_methods/methods/ping.dart b/lib/src/provider/electrum_methods/methods/ping.dart
index 4d41704..70ebb73 100644
--- a/lib/src/provider/electrum_methods/methods/ping.dart
+++ b/lib/src/provider/electrum_methods/methods/ping.dart
@@ -1,8 +1,9 @@
-import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
+import 'package:bitcoin_base/src/provider/core/methods.dart';
+import 'package:bitcoin_base/src/provider/core/params.dart';
 
 /// Ping the server to ensure it is responding, and to keep the session alive. The server may disconnect clients that have sent no requests for roughly 10 minutes.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumPing extends ElectrumRequest<dynamic, dynamic> {
+class ElectrumRequestPing extends ElectrumRequest<dynamic, dynamic> {
   @override
   String get method => ElectrumRequestMethods.ping.method;
 
diff --git a/lib/src/provider/electrum_methods/methods/protx_diff.dart b/lib/src/provider/electrum_methods/methods/protx_diff.dart
index cca5d7d..0872cf9 100644
--- a/lib/src/provider/electrum_methods/methods/protx_diff.dart
+++ b/lib/src/provider/electrum_methods/methods/protx_diff.dart
@@ -1,9 +1,11 @@
-import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
+import 'package:bitcoin_base/src/provider/core/methods.dart';
+import 'package:bitcoin_base/src/provider/core/params.dart';
 
 /// Returns a diff between two deterministic masternode lists. The result also contains proof data..
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumProtXDiff extends ElectrumRequest<Map<String, dynamic>, dynamic> {
-  ElectrumProtXDiff({required this.baseHeight, required this.height});
+class ElectrumRequestProtXDiff
+    extends ElectrumRequest<Map<String, dynamic>, dynamic> {
+  ElectrumRequestProtXDiff({required this.baseHeight, required this.height});
 
   /// The starting block height
   final int baseHeight;
diff --git a/lib/src/provider/electrum_methods/methods/protx_info.dart b/lib/src/provider/electrum_methods/methods/protx_info.dart
index 7685699..ee4f083 100644
--- a/lib/src/provider/electrum_methods/methods/protx_info.dart
+++ b/lib/src/provider/electrum_methods/methods/protx_info.dart
@@ -1,9 +1,11 @@
-import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
+import 'package:bitcoin_base/src/provider/core/methods.dart';
+import 'package:bitcoin_base/src/provider/core/params.dart';
 
 /// Returns detailed information about a deterministic masternode.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumProtXInfo extends ElectrumRequest<Map<String, dynamic>, dynamic> {
-  ElectrumProtXInfo({required this.protxHash});
+class ElectrumRequestProtXInfo
+    extends ElectrumRequest<Map<String, dynamic>, dynamic> {
+  ElectrumRequestProtXInfo({required this.protxHash});
 
   /// The hash of the initial ProRegTx
   final String protxHash;
diff --git a/lib/src/provider/electrum_methods/methods/relay_fee.dart b/lib/src/provider/electrum_methods/methods/relay_fee.dart
index 267dccf..c19502c 100644
--- a/lib/src/provider/electrum_methods/methods/relay_fee.dart
+++ b/lib/src/provider/electrum_methods/methods/relay_fee.dart
@@ -1,9 +1,10 @@
-import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
+import 'package:bitcoin_base/src/provider/core/methods.dart';
+import 'package:bitcoin_base/src/provider/core/params.dart';
 import 'package:bitcoin_base/src/utils/btc_utils.dart';
 
 /// Return the minimum fee a low-priority transaction must pay in order to be accepted to the daemon’s memory pool.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumRelayFee extends ElectrumRequest<BigInt, dynamic> {
+class ElectrumRequestRelayFee extends ElectrumRequest<BigInt, dynamic> {
   /// blockchain.relayfee
   @override
   String get method => ElectrumRequestMethods.relayFee.method;
diff --git a/lib/src/provider/electrum_methods/methods/scripthash_unsubscribe.dart b/lib/src/provider/electrum_methods/methods/scripthash_unsubscribe.dart
index 4990b6d..f5d4ea9 100644
--- a/lib/src/provider/electrum_methods/methods/scripthash_unsubscribe.dart
+++ b/lib/src/provider/electrum_methods/methods/scripthash_unsubscribe.dart
@@ -1,9 +1,10 @@
-import 'package:bitcoin_base/src/provider/api_provider.dart';
+import 'package:bitcoin_base/src/provider/core/methods.dart';
+import 'package:bitcoin_base/src/provider/core/params.dart';
 
 /// Unsubscribe from a script hash, preventing future notifications if its status changes.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumScriptHashUnSubscribe extends ElectrumRequest<bool, bool> {
-  ElectrumScriptHashUnSubscribe({required this.scriptHash});
+class ElectrumRequestScriptHashUnSubscribe extends ElectrumRequest<bool, bool> {
+  ElectrumRequestScriptHashUnSubscribe({required this.scriptHash});
 
   /// The script hash as a hexadecimal string (BitcoinBaseAddress.pubKeyHash())
   final String scriptHash;
diff --git a/lib/src/provider/electrum_methods/methods/server_banner.dart b/lib/src/provider/electrum_methods/methods/server_banner.dart
index 92e3ab4..5ef4fad 100644
--- a/lib/src/provider/electrum_methods/methods/server_banner.dart
+++ b/lib/src/provider/electrum_methods/methods/server_banner.dart
@@ -1,8 +1,9 @@
-import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
+import 'package:bitcoin_base/src/provider/core/methods.dart';
+import 'package:bitcoin_base/src/provider/core/params.dart';
 
 /// Return a banner to be shown in the Electrum console.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumServerBanner extends ElectrumRequest<String, dynamic> {
+class ElectrumRequestServerBanner extends ElectrumRequest<String, dynamic> {
   @override
   String get method => ElectrumRequestMethods.serverBanner.method;
 
diff --git a/lib/src/provider/electrum_methods/methods/server_features.dart b/lib/src/provider/electrum_methods/methods/server_features.dart
index 7e9c939..ccc88c0 100644
--- a/lib/src/provider/electrum_methods/methods/server_features.dart
+++ b/lib/src/provider/electrum_methods/methods/server_features.dart
@@ -1,8 +1,9 @@
-import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
+import 'package:bitcoin_base/src/provider/core/methods.dart';
+import 'package:bitcoin_base/src/provider/core/params.dart';
 
 /// Return a list of features and services supported by the server.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumServerFeatures extends ElectrumRequest<dynamic, dynamic> {
+class ElectrumRequestServerFeatures extends ElectrumRequest<dynamic, dynamic> {
   /// server.features
   @override
   String get method => ElectrumRequestMethods.serverFeatures.method;
diff --git a/lib/src/provider/electrum_methods/methods/server_peer_subscribe.dart b/lib/src/provider/electrum_methods/methods/server_peer_subscribe.dart
index d1a3db5..1034eb1 100644
--- a/lib/src/provider/electrum_methods/methods/server_peer_subscribe.dart
+++ b/lib/src/provider/electrum_methods/methods/server_peer_subscribe.dart
@@ -1,8 +1,9 @@
-import 'package:bitcoin_base/src/provider/api_provider.dart';
+import 'package:bitcoin_base/src/provider/core/methods.dart';
+import 'package:bitcoin_base/src/provider/core/params.dart';
 
 /// Return a list of peer servers. Despite the name this is not a subscription and the server must send no notifications..
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumServerPeersSubscribe
+class ElectrumRequestServerPeersSubscribe
     extends ElectrumRequest<List<dynamic>, List<dynamic>> {
   /// server.peers.subscribe
   @override
diff --git a/lib/src/provider/electrum_methods/methods/status.dart b/lib/src/provider/electrum_methods/methods/status.dart
index f12a0fa..0a3b978 100644
--- a/lib/src/provider/electrum_methods/methods/status.dart
+++ b/lib/src/provider/electrum_methods/methods/status.dart
@@ -1,10 +1,11 @@
-import 'package:bitcoin_base/src/provider/api_provider.dart';
+import 'package:bitcoin_base/src/provider/core/methods.dart';
+import 'package:bitcoin_base/src/provider/core/params.dart';
 
 /// Subscribe to a script hash.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumScriptHashSubscribe
+class ElectrumRequestScriptHashSubscribe
     extends ElectrumRequest<Map<String, dynamic>, dynamic> {
-  ElectrumScriptHashSubscribe({required this.scriptHash});
+  ElectrumRequestScriptHashSubscribe({required this.scriptHash});
 
   /// /// The script hash as a hexadecimal string (BitcoinBaseAddress.pubKeyHash())
   final String scriptHash;
diff --git a/lib/src/provider/models/block_cypher/block_cypher_models.dart b/lib/src/provider/models/block_cypher/block_cypher_models.dart
index 9d49f11..759c8f3 100644
--- a/lib/src/provider/models/block_cypher/block_cypher_models.dart
+++ b/lib/src/provider/models/block_cypher/block_cypher_models.dart
@@ -99,7 +99,7 @@ class BlockCypherUtxo {
   }
 
   List<UtxoWithAddress> toUtxoWithOwner(UtxoAddressDetails owner) {
-    final List<UtxoWithAddress> utxos = txRefs.map((ref) {
+    final utxos = txRefs.map((ref) {
       return UtxoWithAddress(
         utxo: ref.toUtxo(owner.address.type),
         ownerDetails: owner,
diff --git a/lib/src/provider/models/config.dart b/lib/src/provider/models/config.dart
index fbbda69..6e9b89e 100644
--- a/lib/src/provider/models/config.dart
+++ b/lib/src/provider/models/config.dart
@@ -24,8 +24,8 @@ class APIConfig {
   }
 
   String getUtxoUrl(String address) {
-    final String baseUrl = url;
-    return baseUrl.replaceAll("###", address);
+    final baseUrl = url;
+    return baseUrl.replaceAll('###', address);
   }
 
   String getFeeApiUrl() {
@@ -33,18 +33,18 @@ class APIConfig {
   }
 
   String getTransactionUrl(String transactionId) {
-    final String baseUrl = transaction;
-    return baseUrl.replaceAll("###", transactionId);
+    final baseUrl = transaction;
+    return baseUrl.replaceAll('###', transactionId);
   }
 
   String getTransactionsUrl(String address) {
-    final String baseUrl = transactions;
-    return baseUrl.replaceAll("###", address);
+    final baseUrl = transactions;
+    return baseUrl.replaceAll('###', address);
   }
 
   String getBlockHeight(int blockHaight) {
-    final String baseUrl = blockHeight;
-    return baseUrl.replaceAll("###", "$blockHaight");
+    final baseUrl = blockHeight;
+    return baseUrl.replaceAll('###', '$blockHaight');
   }
 
   factory APIConfig.fromBlockCypher(BasedUtxoNetwork network) {
@@ -67,19 +67,19 @@ class APIConfig {
         break;
       default:
         throw DartBitcoinPluginException(
-            "blockcypher does not support ${network.conf.coinName.name}, u must use your own provider");
+            'blockcypher does not support ${network.conf.coinName.name}, u must use your own provider');
     }
 
     return APIConfig(
         url:
-            "$baseUrl/addrs/###/?unspentOnly=true&includeScript=true&limit=2000",
+            '$baseUrl/addrs/###/?unspentOnly=true&includeScript=true&limit=2000',
         feeRate: baseUrl,
-        transaction: "$baseUrl/txs/###",
-        sendTransaction: "$baseUrl/txs/push",
+        transaction: '$baseUrl/txs/###',
+        sendTransaction: '$baseUrl/txs/push',
         apiType: APIType.blockCypher,
-        transactions: "$baseUrl/addrs/###/full?limit=200",
+        transactions: '$baseUrl/addrs/###/full?limit=200',
         network: network,
-        blockHeight: "$baseUrl/blocks/###");
+        blockHeight: '$baseUrl/blocks/###');
   }
 
   factory APIConfig.mempool(BasedUtxoNetwork network) {
@@ -93,18 +93,18 @@ class APIConfig {
         break;
       default:
         throw DartBitcoinPluginException(
-            "mempool does not support ${network.conf.coinName.name}");
+            'mempool does not support ${network.conf.coinName.name}');
     }
 
     return APIConfig(
-        url: "$baseUrl/address/###/utxo",
-        feeRate: "$baseUrl/v1/fees/recommended",
-        transaction: "$baseUrl/tx/###",
-        sendTransaction: "$baseUrl/tx",
+        url: '$baseUrl/address/###/utxo',
+        feeRate: '$baseUrl/v1/fees/recommended',
+        transaction: '$baseUrl/tx/###',
+        sendTransaction: '$baseUrl/tx',
         apiType: APIType.mempool,
-        transactions: "$baseUrl/address/###/txs",
+        transactions: '$baseUrl/address/###/txs',
         network: network,
-        blockHeight: "$baseUrl/block-height/###");
+        blockHeight: '$baseUrl/block-height/###');
   }
 
   APIConfig(
diff --git a/lib/src/provider/models/electrum/electrum_utxo.dart b/lib/src/provider/models/electrum/electrum_utxo.dart
index 9fd9abc..0c168e2 100644
--- a/lib/src/provider/models/electrum/electrum_utxo.dart
+++ b/lib/src/provider/models/electrum/electrum_utxo.dart
@@ -5,14 +5,14 @@ import 'package:bitcoin_base/src/provider/api_provider.dart';
 class ElectrumUtxo implements UTXO {
   factory ElectrumUtxo.fromJson(Map<String, dynamic> json) {
     CashToken? token;
-    if (json.containsKey("token_data")) {
-      token = CashToken.fromJson(json["token_data"]);
+    if (json.containsKey('token_data')) {
+      token = CashToken.fromJson(json['token_data']);
     }
     return ElectrumUtxo._(
-        height: json["height"],
-        txId: json["tx_hash"],
-        vout: json["tx_pos"],
-        value: BigInt.parse((json["value"].toString())),
+        height: json['height'],
+        txId: json['tx_hash'],
+        vout: json['tx_pos'],
+        value: BigInt.parse((json['value'].toString())),
         token: token);
   }
   const ElectrumUtxo._(
diff --git a/lib/src/provider/models/fee_rate/fee_rate.dart b/lib/src/provider/models/fee_rate/fee_rate.dart
index e3885e5..ec94008 100644
--- a/lib/src/provider/models/fee_rate/fee_rate.dart
+++ b/lib/src/provider/models/fee_rate/fee_rate.dart
@@ -50,7 +50,7 @@ class BitcoinFeeRate {
   BigInt getEstimate(int trSize,
       {BigInt? customFeeRatePerKb,
       BitcoinFeeRateType feeRateType = BitcoinFeeRateType.medium}) {
-    final BigInt feeRate = customFeeRatePerKb ?? _feeRatrete(feeRateType);
+    final feeRate = customFeeRatePerKb ?? _feeRatrete(feeRateType);
     final trSizeBigInt = BigInt.from(trSize);
     return (trSizeBigInt * feeRate) ~/ BigInt.from(1000);
   }
@@ -100,6 +100,6 @@ BigInt _parseMempoolFees(dynamic data) {
     return BigInt.from((data * kb));
   } else {
     throw DartBitcoinPluginException(
-        "cannot parse mempool fees excepted double, string got ${data.runtimeType}");
+        'cannot parse mempool fees excepted double, string got ${data.runtimeType}');
   }
 }
diff --git a/lib/src/provider/models/mempool/mempol_models.dart b/lib/src/provider/models/mempool/mempol_models.dart
index d194d57..46cd8c8 100644
--- a/lib/src/provider/models/mempool/mempol_models.dart
+++ b/lib/src/provider/models/mempool/mempol_models.dart
@@ -186,7 +186,7 @@ class MempolUtxo implements UTXO {
 
 extension MempoolUtxoExtentions on List<MempolUtxo> {
   List<UtxoWithAddress> toUtxoWithOwnerList(UtxoAddressDetails owner) {
-    final List<UtxoWithAddress> utxos = map((e) => UtxoWithAddress(
+    final utxos = map((e) => UtxoWithAddress(
           utxo: BitcoinUtxo(
             txHash: e.txid,
             value: e.value,
diff --git a/lib/src/provider/models/multisig_script.dart b/lib/src/provider/models/multisig_script.dart
index 28a05c3..15603d1 100644
--- a/lib/src/provider/models/multisig_script.dart
+++ b/lib/src/provider/models/multisig_script.dart
@@ -6,7 +6,7 @@ import 'package:blockchain_utils/blockchain_utils.dart';
 /// signers in a multi-signature scheme. A multi-signature signer typically includes
 /// information about their public key and weight within the scheme.
 class MultiSignatureSigner {
-  MultiSignatureSigner._(this.publicKey, this.weight, this.isCompressed);
+  MultiSignatureSigner._(this.publicKey, this.weight, this.keyType);
 
   /// PublicKey returns the public key associated with the signer.
   final String publicKey;
@@ -15,7 +15,7 @@ class MultiSignatureSigner {
   /// The weight is used to determine the number of signatures required for a valid transaction.
   final int weight;
 
-  final bool isCompressed;
+  final PublicKeyType keyType;
 
   /// creates a new instance of a multi-signature signer with the
   /// specified public key and weight.
@@ -23,7 +23,7 @@ class MultiSignatureSigner {
       {required String publicKey, required int weight}) {
     ECPublic.fromHex(publicKey);
     return MultiSignatureSigner._(
-        publicKey, weight, BtcUtils.hasCompressedPubKeyLength(publicKey));
+        publicKey, weight, BtcUtils.isCompressedPubKey(publicKey));
   }
 }
 
@@ -56,7 +56,7 @@ class MultiSignatureAddress {
   BitcoinBaseAddress toP2wshAddress({required BasedUtxoNetwork network}) {
     if (network is! LitecoinNetwork && network is! BitcoinNetwork) {
       throw DartBitcoinPluginException(
-          "${network.conf.coinName.name} Bitcoin forks that do not support Segwit. use toP2shAddress");
+          '${network.conf.coinName.name} Bitcoin forks that do not support Segwit. use toP2shAddress');
     }
     if (!canSelectSegwit) {
       throw const DartBitcoinPluginException(
@@ -102,7 +102,7 @@ class MultiSignatureAddress {
         return toP2shAddress(addressType as P2shAddressType);
       default:
         throw const DartBitcoinPluginException(
-            "invalid multisig address type. use of of them [BitcoinAddressType.p2wsh, BitcoinAddressType.p2wshInP2sh, BitcoinAddressType.p2pkhInP2sh]");
+            'invalid multisig address type. use of of them [BitcoinAddressType.p2wsh, BitcoinAddressType.p2wshInP2sh, BitcoinAddressType.p2pkhInP2sh]');
     }
   }
 
@@ -144,6 +144,6 @@ class MultiSignatureAddress {
         signers: signers,
         threshold: threshold,
         multiSigScript: script,
-        canSelectSegwit: signers.every((e) => e.isCompressed));
+        canSelectSegwit: signers.every((e) => e.keyType.isCompressed));
   }
 }
diff --git a/lib/src/provider/models/utxo_details.dart b/lib/src/provider/models/utxo_details.dart
index ea987b6..abb5a1c 100644
--- a/lib/src/provider/models/utxo_details.dart
+++ b/lib/src/provider/models/utxo_details.dart
@@ -7,7 +7,7 @@ abstract class UTXO {
 
 class UtxoAddressDetails {
   /// PublicKey is the public key associated with the UTXO owner.
-  final String? _publicKey;
+  final String? publicKey;
 
   /// Address is the Bitcoin address associated with the UTXO owner.
   final BitcoinBaseAddress address;
@@ -17,13 +17,9 @@ class UtxoAddressDetails {
   final MultiSignatureAddress? _multiSigAddress;
 
   UtxoAddressDetails._({
-    required String publicKey,
+    required String this.publicKey,
     required this.address,
-  })  : _multiSigAddress = null,
-        _publicKey = publicKey;
-
-  /// The public key format (compressed or uncompressed) is crucial for non-SegWit addresses.
-  /// If your address is non-SegWit, ensure you use the correct public key format.
+  }) : _multiSigAddress = null;
   factory UtxoAddressDetails(
       {required String publicKey, required BitcoinBaseAddress address}) {
     ECPublic.fromHex(publicKey);
@@ -32,11 +28,11 @@ class UtxoAddressDetails {
 
   UtxoAddressDetails.multiSigAddress(
       {required MultiSignatureAddress multiSigAddress, required this.address})
-      : _publicKey = null,
+      : publicKey = null,
         _multiSigAddress = multiSigAddress;
 
   UtxoAddressDetails.watchOnly(this.address)
-      : _publicKey = null,
+      : publicKey = null,
         _multiSigAddress = null;
 }
 
@@ -50,32 +46,30 @@ class UtxoWithAddress {
   final UtxoAddressDetails ownerDetails;
 
   const UtxoWithAddress._(
-      {required this.utxo,
-      required this.ownerDetails,
-      required this.isCompressed});
+      {required this.utxo, required this.ownerDetails, required this.keyType});
   factory UtxoWithAddress(
       {required BitcoinUtxo utxo, required UtxoAddressDetails ownerDetails}) {
     return UtxoWithAddress._(
         utxo: utxo,
         ownerDetails: ownerDetails,
-        isCompressed: ownerDetails._publicKey != null && !utxo.isSegwit
-            ? BtcUtils.hasCompressedPubKeyLength(ownerDetails._publicKey!)
-            : true);
+        keyType: ownerDetails.publicKey != null && !utxo.isSegwit
+            ? BtcUtils.isCompressedPubKey(ownerDetails.publicKey!)
+            : PublicKeyType.compressed);
   }
 
   ECPublic public() {
     if (isMultiSig()) {
       throw const DartBitcoinPluginException(
-          "Cannot access public key in multi-signature address");
+          'Cannot access public key in multi-signature address');
     }
-    if (ownerDetails._publicKey == null) {
+    if (ownerDetails.publicKey == null) {
       throw const DartBitcoinPluginException(
-          "Cannot access public key in watch only address; use UtxoAddressDetails constractor instead `UtxoAddressDetails.watchOnly`");
+          'Cannot access public key in watch only address; use UtxoAddressDetails constractor instead `UtxoAddressDetails.watchOnly`');
     }
-    return ECPublic.fromHex(ownerDetails._publicKey!);
+    return ECPublic.fromHex(ownerDetails.publicKey!);
   }
 
-  final bool isCompressed;
+  final PublicKeyType keyType;
 
   bool isMultiSig() {
     return ownerDetails._multiSigAddress != null;
@@ -84,7 +78,7 @@ class UtxoWithAddress {
   MultiSignatureAddress get multiSigAddress => isMultiSig()
       ? ownerDetails._multiSigAddress!
       : throw const DartBitcoinPluginException(
-          "The address is not associated with a multi-signature setup");
+          'The address is not associated with a multi-signature setup');
 }
 
 /// Abstract base class representing a generic Bitcoin output.
@@ -219,7 +213,7 @@ class BitcoinUtxo {
       required BitcoinAddressType scriptType,
       int? blockHeight,
       CashToken? token}) {
-    final bool isP2shSegwit = scriptType == P2shAddressType.p2wpkhInP2sh ||
+    final isP2shSegwit = scriptType == P2shAddressType.p2wpkhInP2sh ||
         scriptType == P2shAddressType.p2wshInP2sh;
     return BitcoinUtxo._(
         txHash: txHash,
@@ -249,7 +243,7 @@ class BitcoinUtxo {
 
   @override
   String toString() {
-    return "txid: $txHash vout: $vout script: ${scriptType.value} value: $value blockHeight: $blockHeight";
+    return 'txid: $txHash vout: $vout script: ${scriptType.value} value: $value blockHeight: $blockHeight';
   }
 }
 
@@ -257,7 +251,7 @@ class BitcoinUtxo {
 extension Calculate on List<UtxoWithAddress> {
   /// sum of utxos network values
   BigInt sumOfUtxosValue() {
-    BigInt sum = BigInt.zero;
+    var sum = BigInt.zero;
     for (final utxo in this) {
       sum += utxo.utxo.value;
     }
@@ -266,7 +260,7 @@ extension Calculate on List<UtxoWithAddress> {
 
   /// sum of utxos cash token (FToken) amounts
   Map<String, BigInt> sumOfTokenUtxos() {
-    final Map<String, BigInt> tokens = {};
+    final tokens = <String, BigInt>{};
     for (final utxo in this) {
       if (utxo.utxo.token == null) continue;
       final token = utxo.utxo.token!;
diff --git a/lib/src/provider/providers/electrum.dart b/lib/src/provider/providers/electrum.dart
new file mode 100644
index 0000000..b98116e
--- /dev/null
+++ b/lib/src/provider/providers/electrum.dart
@@ -0,0 +1,57 @@
+import 'package:bitcoin_base/src/provider/core/params.dart';
+import 'package:bitcoin_base/src/provider/services/electrum.dart';
+import 'package:blockchain_utils/blockchain_utils.dart';
+import 'dart:async';
+
+class ElectrumProvider extends BaseProvider<ElectrumRequestDetails> {
+  final ElectrumServiceProvider rpc;
+  ElectrumProvider(this.rpc);
+
+  /// The unique identifier for each JSON-RPC request.
+  int _id = 0;
+
+  /// Sends a request to the Electrum server using the specified [request] parameter.
+  ///
+  /// The [timeout] parameter, if provided, sets the maximum duration for the request.
+  @override
+  Future<RESULT> request<RESULT, SERVICERESPONSE>(
+      BaseServiceRequest<RESULT, SERVICERESPONSE, ElectrumRequestDetails>
+          request,
+      {Duration? timeout}) async {
+    final r = await requestDynamic(request, timeout: timeout);
+    return request.onResonse(r);
+  }
+
+  /// Sends a request to the Electrum server using the specified [request] parameter.
+  ///
+  /// The [timeout] parameter, if provided, sets the maximum duration for the request.
+  @override
+  Future<SERVICERESPONSE> requestDynamic<RESULT, SERVICERESPONSE>(
+      BaseServiceRequest<RESULT, SERVICERESPONSE, ElectrumRequestDetails>
+          request,
+      {Duration? timeout}) async {
+    final params = request.buildRequest(_id++);
+    final response =
+        await rpc.doRequest<Map<String, dynamic>>(params, timeout: timeout);
+    return _findResult(params: params, response: response);
+  }
+
+  SERVICERESPONSE _findResult<SERVICERESPONSE>(
+      {required BaseServiceResponse<Map<String, dynamic>> response,
+      required ElectrumRequestDetails params}) {
+    final data = response.getResult(params);
+    final error = data['error'];
+    if (error != null) {
+      final errorJson = StringUtils.tryToJson<Map<String, dynamic>>(error);
+      final code = IntUtils.tryParse(errorJson?['code']);
+      final message = errorJson?['message']?.toString();
+      throw RPCError(
+          errorCode: code,
+          message: message ?? error.toString(),
+          request: params.toJson(),
+          details: errorJson);
+    }
+    return ServiceProviderUtils.parseResponse(
+        object: data['result'], params: params);
+  }
+}
diff --git a/lib/src/provider/api_provider/api_provider.dart b/lib/src/provider/providers/explorer.dart
similarity index 82%
rename from lib/src/provider/api_provider/api_provider.dart
rename to lib/src/provider/providers/explorer.dart
index 1dc5c81..c0cc0e6 100644
--- a/lib/src/provider/api_provider/api_provider.dart
+++ b/lib/src/provider/providers/explorer.dart
@@ -1,13 +1,13 @@
 import 'dart:convert';
 import 'package:bitcoin_base/src/provider/models/models.dart';
-import 'package:bitcoin_base/src/provider/service/http/http_service.dart';
+import 'package:bitcoin_base/src/provider/services/explorer.dart';
 import 'package:bitcoin_base/src/models/network.dart';
 import 'package:blockchain_utils/utils/string/string.dart';
 
 class ApiProvider {
   ApiProvider(
       {required this.api, Map<String, String>? header, required this.service})
-      : _header = header ?? {"Content-Type": "application/json"};
+      : _header = header ?? {'Content-Type': 'application/json'};
   factory ApiProvider.fromMempool(BasedUtxoNetwork network, ApiService service,
       {Map<String, String>? header}) {
     final api = APIConfig.mempool(network);
@@ -29,20 +29,20 @@ class ApiProvider {
     return response;
   }
 
-  Future<T> _postReqiest<T>(String url, Object? data) async {
+  Future<T> _postRequest<T>(String url, Object? data) async {
     final response = await service.post<T>(url, body: data, headers: _header);
     return response;
   }
 
   Future<Map<String, dynamic>> testmempool(List<dynamic> params) async {
-    final Map<String, dynamic> data = {
-      "jsonrpc": "2.0",
-      "method": "testmempoolaccept",
-      "id": DateTime.now().millisecondsSinceEpoch.toString(),
-      "params": params
+    final data = <String, dynamic>{
+      'jsonrpc': '2.0',
+      'method': 'testmempoolaccept',
+      'id': DateTime.now().millisecondsSinceEpoch.toString(),
+      'params': params
     };
-    final response = await _postReqiest<Map<String, dynamic>>(
-        "https://btc.getblock.io/786c97b8-f53f-427b-80f7-9af7bd5bdb84/testnet/",
+    final response = await _postRequest<Map<String, dynamic>>(
+        'https://btc.getblock.io/786c97b8-f53f-427b-80f7-9af7bd5bdb84/testnet/',
         json.encode(data));
     return response;
   }
@@ -70,15 +70,15 @@ class ApiProvider {
 
     switch (api.apiType) {
       case APIType.mempool:
-        final response = await _postReqiest<String>(url, txDigest);
+        final response = await _postRequest<String>(url, txDigest);
         return response;
       default:
-        final Map<String, dynamic> digestData = {"tx": txDigest};
-        final response = await _postReqiest<Map<String, dynamic>>(
+        final digestData = <String, dynamic>{'tx': txDigest};
+        final response = await _postRequest<Map<String, dynamic>>(
             url, json.encode(digestData));
         BlockCypherTransaction? tr;
-        if (response["tx"] != null) {
-          tr = BlockCypherTransaction.fromJson(response["tx"]);
+        if (response['tx'] != null) {
+          tr = BlockCypherTransaction.fromJson(response['tx']);
         }
 
         tr ??= BlockCypherTransaction.fromJson(response);
@@ -125,8 +125,8 @@ class ApiProvider {
         return transactions;
       default:
         if (response is Map) {
-          if (response.containsKey("txs")) {
-            final transactions = (response["txs"] as List)
+          if (response.containsKey('txs')) {
+            final transactions = (response['txs'] as List)
                 .map((e) => BlockCypherTransaction.fromJson(e) as T)
                 .toList();
             return transactions;
@@ -148,7 +148,7 @@ class ApiProvider {
         return response;
       default:
         final toJson = StringUtils.toJson<Map<String, dynamic>>(response);
-        return toJson["hash"];
+        return toJson['hash'];
     }
   }
 
diff --git a/lib/src/provider/service/electrum/electrum.dart b/lib/src/provider/service/electrum/electrum.dart
deleted file mode 100644
index c8b56be..0000000
--- a/lib/src/provider/service/electrum/electrum.dart
+++ /dev/null
@@ -1,3 +0,0 @@
-export 'methods.dart';
-export 'params.dart';
-export 'service.dart';
diff --git a/lib/src/provider/service/electrum/params.dart b/lib/src/provider/service/electrum/params.dart
deleted file mode 100644
index da5a07a..0000000
--- a/lib/src/provider/service/electrum/params.dart
+++ /dev/null
@@ -1,54 +0,0 @@
-import 'package:blockchain_utils/blockchain_utils.dart';
-
-/// Abstract class representing parameters for Electrum requests.
-abstract class ElectrumRequestParams {
-  abstract final String method;
-  List<dynamic> toJson();
-}
-
-/// Represents details of an Electrum request, including id, method, and parameters.
-class ElectrumRequestDetails {
-  const ElectrumRequestDetails({
-    required this.id,
-    required this.method,
-    required this.params,
-  });
-
-  final int id;
-
-  final String method;
-
-  final Map<String, dynamic> params;
-
-  List<int> toTCPParams() {
-    final param = "${StringUtils.fromJson(params)}\n";
-    return StringUtils.encode(param);
-  }
-
-  List<int> toWebSocketParams() {
-    return StringUtils.encode(StringUtils.fromJson(params));
-  }
-}
-
-/// Abstract class representing an Electrum request with generic result and response types.
-abstract class ElectrumRequest<RESULT, RESPONSE>
-    implements ElectrumRequestParams {
-  String? get validate => null;
-
-  RESULT onResonse(RESPONSE result) {
-    return result as RESULT;
-  }
-
-  ElectrumRequestDetails toRequest(int requestId) {
-    final List<dynamic> inJson = toJson();
-    inJson.removeWhere((v) => v == null);
-    final params = {
-      "jsonrpc": "2.0",
-      "method": method,
-      "params": inJson,
-      "id": requestId,
-    };
-    return ElectrumRequestDetails(
-        id: requestId, params: params, method: method);
-  }
-}
diff --git a/lib/src/provider/service/electrum/service.dart b/lib/src/provider/service/electrum/service.dart
deleted file mode 100644
index 889b194..0000000
--- a/lib/src/provider/service/electrum/service.dart
+++ /dev/null
@@ -1,13 +0,0 @@
-import 'package:bitcoin_base/src/provider/service/electrum/params.dart';
-
-/// A mixin for providing JSON-RPC service functionality.
-mixin BitcoinBaseElectrumRPCService {
-  /// Represents the URL endpoint for JSON-RPC calls.
-  String get url;
-
-  /// Makes an HTTP GET request to the Tron network with the specified [params].
-  ///
-  /// The optional [timeout] parameter sets the maximum duration for the request.
-  Future<Map<String, dynamic>> call(ElectrumRequestDetails params,
-      [Duration? timeout]);
-}
diff --git a/lib/src/provider/service/services.dart b/lib/src/provider/service/services.dart
deleted file mode 100644
index 69edf79..0000000
--- a/lib/src/provider/service/services.dart
+++ /dev/null
@@ -1,2 +0,0 @@
-export 'http/http_service.dart';
-export 'electrum/electrum.dart';
diff --git a/lib/src/provider/services/electrum.dart b/lib/src/provider/services/electrum.dart
new file mode 100644
index 0000000..37a1ea0
--- /dev/null
+++ b/lib/src/provider/services/electrum.dart
@@ -0,0 +1,10 @@
+import 'package:bitcoin_base/src/provider/core/params.dart';
+import 'package:blockchain_utils/service/models/params.dart';
+
+/// A mixin defining the service provider contract for interacting with the bitcoin (elctrum) network.
+mixin ElectrumServiceProvider
+    implements BaseServiceProvider<ElectrumRequestDetails> {
+  @override
+  Future<BaseServiceResponse<T>> doRequest<T>(ElectrumRequestDetails params,
+      {Duration? timeout});
+}
diff --git a/lib/src/provider/service/http/http_service.dart b/lib/src/provider/services/explorer.dart
similarity index 88%
rename from lib/src/provider/service/http/http_service.dart
rename to lib/src/provider/services/explorer.dart
index 99631b8..8ab80bd 100644
--- a/lib/src/provider/service/http/http_service.dart
+++ b/lib/src/provider/services/explorer.dart
@@ -13,6 +13,6 @@ abstract class ApiService {
   /// - [headers]: A map of headers to be included in the request.
   /// - [body]: The request body, typically in JSON format.
   Future<T> post<T>(String url,
-      {Map<String, String> headers = const {"Content-Type": "application/json"},
+      {Map<String, String> headers = const {'Content-Type': 'application/json'},
       Object? body});
 }
diff --git a/lib/src/provider/transaction_builder/builder.dart b/lib/src/transaction_builder/builder.dart
similarity index 100%
rename from lib/src/provider/transaction_builder/builder.dart
rename to lib/src/transaction_builder/builder.dart
diff --git a/lib/src/provider/transaction_builder/core.dart b/lib/src/transaction_builder/core.dart
similarity index 100%
rename from lib/src/provider/transaction_builder/core.dart
rename to lib/src/transaction_builder/core.dart
diff --git a/lib/src/provider/transaction_builder/forked_transaction_builder.dart b/lib/src/transaction_builder/forked_transaction_builder.dart
similarity index 89%
rename from lib/src/provider/transaction_builder/forked_transaction_builder.dart
rename to lib/src/transaction_builder/forked_transaction_builder.dart
index 1c7c55a..0980e9b 100644
--- a/lib/src/provider/transaction_builder/forked_transaction_builder.dart
+++ b/lib/src/transaction_builder/forked_transaction_builder.dart
@@ -47,7 +47,7 @@ class ForkedTransactionBuilder implements BasedBitcoinTransacationBuilder {
   void _validateBuilder() {
     if (network is! BitcoinCashNetwork && network is! BitcoinSVNetwork) {
       throw const DartBitcoinPluginException(
-          "invalid network. use ForkedTransactionBuilder for BitcoinCashNetwork and BSVNetwork otherwise use BitcoinTransactionBuilder");
+          'invalid network. use ForkedTransactionBuilder for BitcoinCashNetwork and BSVNetwork otherwise use BitcoinTransactionBuilder');
     }
 
     /// validate every address is related to network
@@ -103,8 +103,8 @@ class ForkedTransactionBuilder implements BasedBitcoinTransacationBuilder {
         isFakeTransaction: true);
 
     /// 72 bytes (64 byte signature, 6-7 byte Der encoding length + sighash)
-    const String fakeECDSASignatureBytes =
-        "010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101";
+    const fakeECDSASignatureBytes =
+        '010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101';
 
     final transaction = transactionBuilder
         .buildTransaction((trDigest, utxo, multiSigPublicKey, int sighash) {
@@ -129,29 +129,28 @@ class ForkedTransactionBuilder implements BasedBitcoinTransacationBuilder {
           return script;
         default:
           throw DartBitcoinPluginException(
-              "unsuported multi-sig type ${utxo.utxo.scriptType} for ${network.conf.coinName.name}");
+              'unsuported multi-sig type ${utxo.utxo.scriptType} for ${network.conf.coinName.name}');
       }
     }
 
     final senderPub = utxo.public();
-    final bool isCompressed = utxo.isCompressed;
     switch (utxo.utxo.scriptType) {
       case PubKeyAddressType.p2pk:
       case P2shAddressType.p2pkInP2sh:
       case P2shAddressType.p2pkInP2shwt:
       case P2shAddressType.p2pkInP2sh32:
       case P2shAddressType.p2pkInP2sh32wt:
-        return senderPub.toRedeemScript(compressed: isCompressed);
+        return senderPub.toRedeemScript(mode: utxo.keyType);
       case P2pkhAddressType.p2pkh:
       case P2shAddressType.p2pkhInP2sh:
       case P2shAddressType.p2pkhInP2sh32:
       case P2pkhAddressType.p2pkhwt:
       case P2shAddressType.p2pkhInP2shwt:
       case P2shAddressType.p2pkhInP2sh32wt:
-        return senderPub.toAddress(compressed: isCompressed).toScriptPubKey();
+        return senderPub.toAddress(mode: utxo.keyType).toScriptPubKey();
       default:
         throw DartBitcoinPluginException(
-            "${utxo.utxo.scriptType} does not sudpport on ${network.conf.coinName.name}");
+            '${utxo.utxo.scriptType} does not sudpport on ${network.conf.coinName.name}');
     }
   }
 
@@ -210,29 +209,27 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
 */
   List<String> _buildUnlockingScript(String signedDigest, UtxoWithAddress utx) {
     final senderPub = utx.public();
-    final bool isCompressed = utx.isCompressed;
     switch (utx.utxo.scriptType) {
       case PubKeyAddressType.p2pk:
         return [signedDigest];
       case P2pkhAddressType.p2pkh:
       case P2pkhAddressType.p2pkhwt:
-        return [signedDigest, senderPub.toHex(compressed: isCompressed)];
+        return [signedDigest, senderPub.toHex(mode: utx.keyType)];
       case P2shAddressType.p2pkhInP2sh:
       case P2shAddressType.p2pkhInP2shwt:
       case P2shAddressType.p2pkhInP2sh32:
       case P2shAddressType.p2pkhInP2sh32wt:
-        final script =
-            senderPub.toAddress(compressed: isCompressed).toScriptPubKey();
+        final script = senderPub.toAddress(mode: utx.keyType).toScriptPubKey();
         return [
           signedDigest,
-          senderPub.toHex(compressed: isCompressed),
+          senderPub.toHex(mode: utx.keyType),
           script.toHex()
         ];
       case P2shAddressType.p2pkInP2sh:
       case P2shAddressType.p2pkInP2shwt:
       case P2shAddressType.p2pkInP2sh32:
       case P2shAddressType.p2pkInP2sh32wt:
-        final script = senderPub.toRedeemScript(compressed: isCompressed);
+        final script = senderPub.toRedeemScript(mode: utx.keyType);
         return [signedDigest, script.toHex()];
       default:
         throw DartBitcoinPluginException(
@@ -241,7 +238,7 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
   }
 
   Tuple<List<TxInput>, List<UtxoWithAddress>> _buildInputs() {
-    List<UtxoWithAddress> sortedUtxos = List.from(utxosInfo);
+    var sortedUtxos = List<UtxoWithAddress>.from(utxosInfo);
 
     if (inputOrdering == BitcoinOrdering.shuffle) {
       sortedUtxos = sortedUtxos..shuffle();
@@ -257,8 +254,7 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
           },
         );
     }
-    final List<TxInput> inputs =
-        sortedUtxos.map((e) => e.utxo.toInput()).toList();
+    final inputs = sortedUtxos.map((e) => e.utxo.toInput()).toList();
     if (enableRBF && inputs.isNotEmpty) {
       inputs[0] = inputs[0]
           .copyWith(sequence: BitcoinOpCodeConst.REPLACE_BY_FEE_SEQUENCE);
@@ -268,7 +264,7 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
   }
 
   List<TxOutput> _buildOutputs() {
-    List<TxOutput> outputs = outPuts
+    var outputs = outPuts
         .where((element) => element is! BitcoinBurnableOutput)
         .map((e) => e.toOutput)
         .toList();
@@ -304,12 +300,12 @@ be retrieved by anyone who examines the blockchain's history.
 */
   Script _opReturn(String message) {
     final toHex = BytesUtils.toHexString(StringUtils.toBytes(message));
-    return Script(script: ["OP_RETURN", toHex]);
+    return Script(script: ['OP_RETURN', toHex]);
   }
 
   /// Total amount to spend excluding fees
   BigInt _sumOutputAmounts(List<TxOutput> outputs) {
-    BigInt sum = BigInt.zero;
+    var sum = BigInt.zero;
     for (final e in outputs) {
       sum += e.amount;
     }
@@ -318,7 +314,7 @@ be retrieved by anyone who examines the blockchain's history.
 
   /// Total token amount to spend.
   Map<String, BigInt> _sumTokenOutputAmounts(List<TxOutput> outputs) {
-    final Map<String, BigInt> tokens = {};
+    final tokens = <String, BigInt>{};
     for (final utxo in outputs) {
       if (utxo.cashToken == null) continue;
       final token = utxo.cashToken!;
@@ -342,9 +338,9 @@ be retrieved by anyone who examines the blockchain's history.
     if (sumAmountsWithFee != sumUtxoAmount) {
       throw DartBitcoinPluginException('Sum value of utxo not spending',
           details: {
-            "inputAmount": sumUtxoAmount,
-            "fee": fee,
-            "outputAmount": sumOutputAmounts
+            'inputAmount': sumUtxoAmount,
+            'fee': fee,
+            'outputAmount': sumOutputAmounts
           });
     }
 
@@ -355,7 +351,7 @@ be retrieved by anyone who examines the blockchain's history.
     final sumTokenOutputAmouts = _sumTokenOutputAmounts(outputs);
     for (final i in sumOfTokenUtxos.entries) {
       if (sumTokenOutputAmouts[i.key] != i.value) {
-        BigInt amount = sumTokenOutputAmouts[i.key] ?? BigInt.zero;
+        var amount = sumTokenOutputAmouts[i.key] ?? BigInt.zero;
         amount += outPuts
             .whereType<BitcoinBurnableOutput>()
             .where((element) => element.categoryID == i.key)
@@ -368,9 +364,9 @@ be retrieved by anyone who examines the blockchain's history.
           throw DartBitcoinPluginException(
               'Sum token value of UTXOs not spending. use BitcoinBurnableOutput if you want to burn tokens.',
               details: {
-                "token": i.key,
-                "inputValue": i.value,
-                "outputValue": amount
+                'token': i.key,
+                'inputValue': i.value,
+                'outputValue': amount
               });
         }
       }
@@ -392,7 +388,7 @@ be retrieved by anyone who examines the blockchain's history.
         if (hasBurnableOutput) continue;
         throw DartBitcoinPluginException(
             'Some NFTs in the inputs lack the corresponding spending in the outputs. If you intend to burn tokens, consider utilizing the BitcoinBurnableOutput.',
-            details: {"category id": token.category});
+            details: {'category id': token.category});
       }
     }
   }
@@ -400,27 +396,27 @@ be retrieved by anyone who examines the blockchain's history.
   @override
   Map<String, int> getSignatureCount() {
     final sortedInputs = _buildInputs();
-    final List<TxInput> inputs = sortedInputs.item1;
-    final List<UtxoWithAddress> utxos = sortedInputs.item2;
-    final Map<String, int> count = {};
+    final inputs = sortedInputs.item1;
+    final utxos = sortedInputs.item2;
+    final count = <String, int>{};
 
-    for (int i = 0; i < inputs.length; i++) {
+    for (var i = 0; i < inputs.length; i++) {
       final indexUtxo = utxos[i];
 
       if (indexUtxo.isMultiSig()) {
         final multiSigAddress = indexUtxo.multiSigAddress;
-        int sumMultiSigWeight = 0;
+        var sumMultiSigWeight = 0;
         final mutlsiSigSignatures = <String>[];
-        for (int ownerIndex = 0;
+        for (var ownerIndex = 0;
             ownerIndex < multiSigAddress.signers.length;
             ownerIndex++) {
-          for (int weight = 0;
+          for (var weight = 0;
               weight < multiSigAddress.signers[ownerIndex].weight;
               weight++) {
             if (mutlsiSigSignatures.length >= multiSigAddress.threshold) {
               break;
             }
-            mutlsiSigSignatures.add("");
+            mutlsiSigSignatures.add('');
             count[multiSigAddress.signers[ownerIndex].publicKey] =
                 (count[multiSigAddress.signers[ownerIndex].publicKey] ?? 0) + 1;
           }
@@ -431,7 +427,7 @@ be retrieved by anyone who examines the blockchain's history.
         }
         if (sumMultiSigWeight < multiSigAddress.threshold) {
           throw const DartBitcoinPluginException(
-              "some multisig signature does not exist");
+              'some multisig signature does not exist');
         }
         continue;
       }
@@ -446,9 +442,9 @@ be retrieved by anyone who examines the blockchain's history.
     /// build inputs
     final sortedInputs = _buildInputs();
 
-    final List<TxInput> inputs = sortedInputs.item1;
+    final inputs = sortedInputs.item1;
 
-    final List<UtxoWithAddress> utxos = sortedInputs.item2;
+    final utxos = sortedInputs.item2;
 
     /// build outout
     final outputs = _buildOutputs();
@@ -475,11 +471,11 @@ be retrieved by anyone who examines the blockchain's history.
     // transaction = transaction.copyWith(inputs: inputs);
     final transaction =
         BtcTransaction(inputs: inputs, outputs: outputs, hasSegwit: false);
-    const int sighash =
+    const sighash =
         BitcoinOpCodeConst.SIGHASH_ALL | BitcoinOpCodeConst.SIGHASH_FORKED;
 
     /// Well, now let's do what we want for each input
-    for (int i = 0; i < inputs.length; i++) {
+    for (var i = 0; i < inputs.length; i++) {
       final indexUtxo = utxos[i];
 
       /// We receive the owner's ScriptPubKey
@@ -496,16 +492,16 @@ be retrieved by anyone who examines the blockchain's history.
       /// handle multisig address
       if (indexUtxo.isMultiSig()) {
         final multiSigAddress = indexUtxo.multiSigAddress;
-        int sumMultiSigWeight = 0;
+        var sumMultiSigWeight = 0;
         final mutlsiSigSignatures = <String>[];
-        for (int ownerIndex = 0;
+        for (var ownerIndex = 0;
             ownerIndex < multiSigAddress.signers.length;
             ownerIndex++) {
           /// now we need sign the transaction digest
           final sig = sign(digest, indexUtxo,
               multiSigAddress.signers[ownerIndex].publicKey, sighash);
           if (sig.isEmpty) continue;
-          for (int weight = 0;
+          for (var weight = 0;
               weight < multiSigAddress.signers[ownerIndex].weight;
               weight++) {
             if (mutlsiSigSignatures.length >= multiSigAddress.threshold) {
@@ -520,7 +516,7 @@ be retrieved by anyone who examines the blockchain's history.
         }
         if (sumMultiSigWeight < multiSigAddress.threshold) {
           throw const DartBitcoinPluginException(
-              "some multisig signature does not exist");
+              'some multisig signature does not exist');
         }
 
         _addScripts(
@@ -529,7 +525,8 @@ be retrieved by anyone who examines the blockchain's history.
       }
 
       /// now we need sign the transaction digest
-      final sig = sign(digest, indexUtxo, indexUtxo.public().toHex(), sighash);
+      final sig =
+          sign(digest, indexUtxo, indexUtxo.ownerDetails.publicKey!, sighash);
       _addScripts(input: inputs[i], signatures: [sig], utxo: indexUtxo);
     }
     final ea = BtcTransaction.fromRaw(transaction.serialize());
@@ -543,9 +540,9 @@ be retrieved by anyone who examines the blockchain's history.
     /// build inputs
     final sortedInputs = _buildInputs();
 
-    final List<TxInput> inputs = sortedInputs.item1;
+    final inputs = sortedInputs.item1;
 
-    final List<UtxoWithAddress> utxos = sortedInputs.item2;
+    final utxos = sortedInputs.item2;
 
     /// build outout
     final outputs = _buildOutputs();
@@ -570,11 +567,11 @@ be retrieved by anyone who examines the blockchain's history.
     final transaction =
         BtcTransaction(inputs: inputs, outputs: outputs, hasSegwit: false);
 
-    const int sighash =
+    const sighash =
         BitcoinOpCodeConst.SIGHASH_ALL | BitcoinOpCodeConst.SIGHASH_FORKED;
 
     /// Well, now let's do what we want for each input
-    for (int i = 0; i < inputs.length; i++) {
+    for (var i = 0; i < inputs.length; i++) {
       final indexUtxo = utxos[i];
 
       /// We receive the owner's ScriptPubKey
@@ -591,9 +588,9 @@ be retrieved by anyone who examines the blockchain's history.
       /// handle multisig address
       if (indexUtxo.isMultiSig()) {
         final multiSigAddress = indexUtxo.multiSigAddress;
-        int sumMultiSigWeight = 0;
+        var sumMultiSigWeight = 0;
         final mutlsiSigSignatures = <String>[];
-        for (int ownerIndex = 0;
+        for (var ownerIndex = 0;
             ownerIndex < multiSigAddress.signers.length;
             ownerIndex++) {
           /// now we need sign the transaction digest
@@ -601,7 +598,7 @@ be retrieved by anyone who examines the blockchain's history.
               multiSigAddress.signers[ownerIndex].publicKey, sighash);
 
           if (sig.isEmpty) continue;
-          for (int weight = 0;
+          for (var weight = 0;
               weight < multiSigAddress.signers[ownerIndex].weight;
               weight++) {
             if (mutlsiSigSignatures.length >= multiSigAddress.threshold) {
@@ -617,7 +614,7 @@ be retrieved by anyone who examines the blockchain's history.
         }
         if (sumMultiSigWeight < multiSigAddress.threshold) {
           throw const DartBitcoinPluginException(
-              "some multisig signature does not exist");
+              'some multisig signature does not exist');
         }
 
         _addScripts(
@@ -626,8 +623,8 @@ be retrieved by anyone who examines the blockchain's history.
       }
 
       /// now we need sign the transaction digest
-      final sig =
-          await sign(digest, indexUtxo, indexUtxo.public().toHex(), sighash);
+      final sig = await sign(
+          digest, indexUtxo, indexUtxo.ownerDetails.publicKey!, sighash);
       _addScripts(input: inputs[i], signatures: [sig], utxo: indexUtxo);
     }
     return transaction;
diff --git a/lib/src/provider/transaction_builder/transaction_builder.dart b/lib/src/transaction_builder/transaction_builder.dart
similarity index 87%
rename from lib/src/provider/transaction_builder/transaction_builder.dart
rename to lib/src/transaction_builder/transaction_builder.dart
index ba0afd6..57aafa8 100644
--- a/lib/src/provider/transaction_builder/transaction_builder.dart
+++ b/lib/src/transaction_builder/transaction_builder.dart
@@ -49,14 +49,14 @@ class BitcoinTransactionBuilder implements BasedBitcoinTransacationBuilder {
   void _validateBuilder() {
     if (network is BitcoinCashNetwork || network is BitcoinSVNetwork) {
       throw const DartBitcoinPluginException(
-          "invalid network for BitcoinCashNetwork and BSVNetwork use ForkedTransactionBuilder");
+          'invalid network for BitcoinCashNetwork and BSVNetwork use ForkedTransactionBuilder');
     }
     final token = utxosInfo.any((element) => element.utxo.token != null);
     final tokenInput = outPuts.whereType<BitcoinTokenOutput>();
     final burn = outPuts.whereType<BitcoinBurnableOutput>();
     if (token || tokenInput.isNotEmpty || burn.isNotEmpty) {
       throw const DartBitcoinPluginException(
-          "Cash Token only work on Bitcoin cash network");
+          'Cash Token only work on Bitcoin cash network');
     }
     for (final i in utxosInfo) {
       /// Verify each input for its association with this network's address. Raise an exception if the address is incorrect.
@@ -113,16 +113,19 @@ class BitcoinTransactionBuilder implements BasedBitcoinTransacationBuilder {
     );
 
     /// 64 byte schnorr signature length
-    const String fakeSchnorSignaturBytes =
-        "01010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101";
+    const fakeSchnorSignaturBytes =
+        '01010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101';
 
     /// 72 bytes (64 byte signature, 6-7 byte Der encoding length)
-    const String fakeECDSASignatureBytes =
-        "010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101";
+    const fakeECDSASignatureBytes =
+        '010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101';
 
     final transaction = transactionBuilder
         .buildTransaction((trDigest, utxo, multiSigPublicKey, int sighash) {
       if (utxo.utxo.isP2tr) {
+        if (sighash != BitcoinOpCodeConst.TAPROOT_SIGHASH_ALL) {
+          return '${fakeSchnorSignaturBytes}01';
+        }
         return fakeSchnorSignaturBytes;
       } else {
         return fakeECDSASignatureBytes;
@@ -194,23 +197,21 @@ class BitcoinTransactionBuilder implements BasedBitcoinTransacationBuilder {
           return script;
         default:
           throw DartBitcoinPluginException(
-              "unsuported multi-sig type ${utxo.utxo.scriptType}");
+              'unsuported multi-sig type ${utxo.utxo.scriptType}');
       }
     }
 
     final senderPub = utxo.public();
     switch (utxo.utxo.scriptType) {
       case PubKeyAddressType.p2pk:
-        return senderPub.toRedeemScript(compressed: utxo.isCompressed);
+        return senderPub.toRedeemScript(mode: utxo.keyType);
       case SegwitAddressType.p2wsh:
         if (isTaproot) {
           return senderPub.toP2wshAddress().toScriptPubKey();
         }
         return senderPub.toP2wshScript();
       case P2pkhAddressType.p2pkh:
-        return senderPub
-            .toAddress(compressed: utxo.isCompressed)
-            .toScriptPubKey();
+        return senderPub.toAddress(mode: utxo.keyType).toScriptPubKey();
       case SegwitAddressType.p2wpkh:
         if (isTaproot) {
           return senderPub.toSegwitAddress().toScriptPubKey();
@@ -220,13 +221,9 @@ class BitcoinTransactionBuilder implements BasedBitcoinTransacationBuilder {
         return senderPub.toTaprootAddress().toScriptPubKey();
       case P2shAddressType.p2pkhInP2sh:
         if (isTaproot) {
-          return senderPub
-              .toP2pkhInP2sh(compressed: utxo.isCompressed)
-              .toScriptPubKey();
+          return senderPub.toP2pkhInP2sh(mode: utxo.keyType).toScriptPubKey();
         }
-        return senderPub
-            .toAddress(compressed: utxo.isCompressed)
-            .toScriptPubKey();
+        return senderPub.toAddress(mode: utxo.keyType).toScriptPubKey();
       case P2shAddressType.p2wpkhInP2sh:
         if (isTaproot) {
           return senderPub.toP2wpkhInP2sh().toScriptPubKey();
@@ -239,13 +236,11 @@ class BitcoinTransactionBuilder implements BasedBitcoinTransacationBuilder {
         return senderPub.toP2wshScript();
       case P2shAddressType.p2pkInP2sh:
         if (isTaproot) {
-          return senderPub
-              .toP2pkInP2sh(compressed: utxo.isCompressed)
-              .toScriptPubKey();
+          return senderPub.toP2pkInP2sh(mode: utxo.keyType).toScriptPubKey();
         }
-        return senderPub.toRedeemScript(compressed: utxo.isCompressed);
+        return senderPub.toRedeemScript(mode: utxo.keyType);
     }
-    throw const DartBitcoinPluginException("invalid bitcoin address type");
+    throw const DartBitcoinPluginException('invalid bitcoin address type');
   }
 
   /// generateTransactionDigest generates and returns a transaction digest for a given input in the context of a Bitcoin
@@ -323,7 +318,7 @@ class BitcoinTransactionBuilder implements BasedBitcoinTransacationBuilder {
           return [p2wsh.toScriptPubKey().toHex()];
         default:
           throw DartBitcoinPluginException(
-              "Invalid p2sh nested segwit type ${utxo.utxo.scriptType.value}");
+              'Invalid p2sh nested segwit type ${utxo.utxo.scriptType.value}');
       }
     }
     final senderPub = utxo.public();
@@ -336,7 +331,7 @@ class BitcoinTransactionBuilder implements BasedBitcoinTransacationBuilder {
         return [script.toHex()];
       default:
         throw DartBitcoinPluginException(
-            "Invalid p2sh nested segwit type ${utxo.utxo.scriptType.value}");
+            'Invalid p2sh nested segwit type ${utxo.utxo.scriptType.value}');
     }
   }
 
@@ -362,35 +357,30 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
           return [signedDigest, senderPub.toHex()];
         default:
           throw DartBitcoinPluginException(
-              "invalid segwit address type ${utx.utxo.scriptType.value}");
+              'invalid segwit address type ${utx.utxo.scriptType.value}');
       }
     } else {
-      final bool isCompressed = utx.isCompressed;
+      final mode = utx.keyType;
       switch (utx.utxo.scriptType) {
         case PubKeyAddressType.p2pk:
           return [signedDigest];
         case P2pkhAddressType.p2pkh:
-          return [signedDigest, senderPub.toHex(compressed: isCompressed)];
+          return [signedDigest, senderPub.toHex(mode: mode)];
         case P2shAddressType.p2pkhInP2sh:
-          final script =
-              senderPub.toAddress(compressed: isCompressed).toScriptPubKey();
-          return [
-            signedDigest,
-            senderPub.toHex(compressed: isCompressed),
-            script.toHex()
-          ];
+          final script = senderPub.toAddress(mode: mode).toScriptPubKey();
+          return [signedDigest, senderPub.toHex(mode: mode), script.toHex()];
         case P2shAddressType.p2pkInP2sh:
-          final script = senderPub.toRedeemScript(compressed: isCompressed);
+          final script = senderPub.toRedeemScript(mode: mode);
           return [signedDigest, script.toHex()];
         default:
           throw DartBitcoinPluginException(
-              "invalid address type ${utx.utxo.scriptType.value}");
+              'invalid address type ${utx.utxo.scriptType.value}');
       }
     }
   }
 
   Tuple<List<TxInput>, List<UtxoWithAddress>> _buildInputs() {
-    List<UtxoWithAddress> sortedUtxos = List.from(utxosInfo);
+    var sortedUtxos = List<UtxoWithAddress>.from(utxosInfo);
 
     if (inputOrdering == BitcoinOrdering.shuffle) {
       sortedUtxos = sortedUtxos..shuffle();
@@ -406,8 +396,7 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
           },
         );
     }
-    final List<TxInput> inputs =
-        sortedUtxos.map((e) => e.utxo.toInput()).toList();
+    final inputs = sortedUtxos.map((e) => e.utxo.toInput()).toList();
     if (enableRBF && inputs.isNotEmpty) {
       inputs[0] = inputs[0]
           .copyWith(sequence: BitcoinOpCodeConst.REPLACE_BY_FEE_SEQUENCE);
@@ -417,7 +406,7 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
   }
 
   List<TxOutput> _buildOutputs() {
-    List<TxOutput> outputs = outPuts.map((e) => e.toOutput).toList();
+    var outputs = outPuts.map((e) => e.toOutput).toList();
     if (memo != null) {
       outputs
           .add(TxOutput(amount: BigInt.zero, scriptPubKey: _opReturn(memo!)));
@@ -439,8 +428,8 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
     }
     for (final i in outputs) {
       if (i.amount.isNegative) {
-        throw DartBitcoinPluginException("Some output has negative amount.",
-            details: {"output": i.amount});
+        throw DartBitcoinPluginException('Some output has negative amount.',
+            details: {'output': i.amount});
       }
     }
     return List<TxOutput>.unmodifiable(outputs);
@@ -452,12 +441,12 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
   /// be retrieved by anyone who examines the blockchain's history.
   Script _opReturn(String message) {
     final toHex = BytesUtils.toHexString(StringUtils.toBytes(message));
-    return Script(script: ["OP_RETURN", toHex]);
+    return Script(script: ['OP_RETURN', toHex]);
   }
 
   /// Total amount to spend excluding fees
   BigInt _sumOutputAmounts(List<TxOutput> outputs) {
-    BigInt sum = BigInt.zero;
+    var sum = BigInt.zero;
     for (final e in outputs) {
       sum += e.amount;
     }
@@ -469,9 +458,9 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
     /// build inputs
     final sortedInputs = _buildInputs();
 
-    final List<TxInput> inputs = sortedInputs.item1;
+    final inputs = sortedInputs.item1;
 
-    final List<UtxoWithAddress> utxos = sortedInputs.item2;
+    final utxos = sortedInputs.item2;
 
     /// build outout
     final outputs = _buildOutputs();
@@ -497,7 +486,7 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
     }
 
     /// create new transaction with inputs and outputs and isSegwit transaction or not
-    BtcTransaction transaction =
+    var transaction =
         BtcTransaction(inputs: inputs, outputs: outputs, hasSegwit: hasSegwit);
 
     /// we define empty witnesses. maybe the transaction is segwit and We need this
@@ -505,8 +494,8 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
 
     /// when the transaction is taproot and we must use getTaproot tansaction digest
     /// we need all of inputs amounts and owner script pub keys
-    List<BigInt> taprootAmounts = [];
-    List<Script> taprootScripts = [];
+    var taprootAmounts = <BigInt>[];
+    var taprootScripts = <Script>[];
 
     if (hasTaproot) {
       taprootAmounts = utxos.map((e) => e.utxo.value).toList();
@@ -514,30 +503,30 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
     }
 
     /// Well, now let's do what we want for each input
-    for (int i = 0; i < inputs.length; i++) {
+    for (var i = 0; i < inputs.length; i++) {
       /// We receive the owner's ScriptPubKey
       final script = _findLockingScript(utxos[i], false);
 
       /// We generate transaction digest for current input
       final digest = _generateTransactionDigest(
           script, i, utxos[i], transaction, taprootAmounts, taprootScripts);
-      final int sighash = utxos[i].utxo.isP2tr
+      final sighash = utxos[i].utxo.isP2tr
           ? BitcoinOpCodeConst.TAPROOT_SIGHASH_ALL
           : BitcoinOpCodeConst.SIGHASH_ALL;
 
       /// handle multisig address
       if (utxos[i].isMultiSig()) {
         final multiSigAddress = utxos[i].multiSigAddress;
-        int sumMultiSigWeight = 0;
+        var sumMultiSigWeight = 0;
         final mutlsiSigSignatures = <String>[];
-        for (int ownerIndex = 0;
+        for (var ownerIndex = 0;
             ownerIndex < multiSigAddress.signers.length;
             ownerIndex++) {
           /// now we need sign the transaction digest
           final sig = sign(digest, utxos[i],
               multiSigAddress.signers[ownerIndex].publicKey, sighash);
           if (sig.isEmpty) continue;
-          for (int weight = 0;
+          for (var weight = 0;
               weight < multiSigAddress.signers[ownerIndex].weight;
               weight++) {
             if (mutlsiSigSignatures.length >= multiSigAddress.threshold) {
@@ -552,7 +541,7 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
         }
         if (sumMultiSigWeight < multiSigAddress.threshold) {
           throw const DartBitcoinPluginException(
-              "some multisig signature does not exist");
+              'some multisig signature does not exist');
         }
         _addUnlockScriptScript(
             hasSegwit: hasSegwit,
@@ -564,7 +553,8 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
       }
 
       /// now we need sign the transaction digest
-      final sig = sign(digest, utxos[i], utxos[i].public().toHex(), sighash);
+      final sig =
+          sign(digest, utxos[i], utxos[i].ownerDetails.publicKey!, sighash);
       _addUnlockScriptScript(
           hasSegwit: hasSegwit,
           input: inputs[i],
@@ -585,26 +575,26 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
   @override
   Map<String, int> getSignatureCount() {
     final sortedInputs = _buildInputs();
-    final List<TxInput> inputs = sortedInputs.item1;
-    final List<UtxoWithAddress> utxos = sortedInputs.item2;
-    final Map<String, int> count = {};
+    final inputs = sortedInputs.item1;
+    final utxos = sortedInputs.item2;
+    final count = <String, int>{};
 
-    for (int i = 0; i < inputs.length; i++) {
+    for (var i = 0; i < inputs.length; i++) {
       final indexUtxo = utxos[i];
       if (indexUtxo.isMultiSig()) {
         final multiSigAddress = indexUtxo.multiSigAddress;
-        int sumMultiSigWeight = 0;
+        var sumMultiSigWeight = 0;
         final mutlsiSigSignatures = <String>[];
-        for (int ownerIndex = 0;
+        for (var ownerIndex = 0;
             ownerIndex < multiSigAddress.signers.length;
             ownerIndex++) {
-          for (int weight = 0;
+          for (var weight = 0;
               weight < multiSigAddress.signers[ownerIndex].weight;
               weight++) {
             if (mutlsiSigSignatures.length >= multiSigAddress.threshold) {
               break;
             }
-            mutlsiSigSignatures.add("");
+            mutlsiSigSignatures.add('');
             count[multiSigAddress.signers[ownerIndex].publicKey] =
                 (count[multiSigAddress.signers[ownerIndex].publicKey] ?? 0) + 1;
           }
@@ -615,7 +605,7 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
         }
         if (sumMultiSigWeight < multiSigAddress.threshold) {
           throw const DartBitcoinPluginException(
-              "some multisig signature does not exist");
+              'some multisig signature does not exist');
         }
         continue;
       }
@@ -631,9 +621,9 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
     /// build inputs
     final sortedInputs = _buildInputs();
 
-    final List<TxInput> inputs = sortedInputs.item1;
+    final inputs = sortedInputs.item1;
 
-    final List<UtxoWithAddress> utxos = sortedInputs.item2;
+    final utxos = sortedInputs.item2;
 
     /// build outout
     final outputs = _buildOutputs();
@@ -659,7 +649,7 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
     }
 
     /// create new transaction with inputs and outputs and isSegwit transaction or not
-    BtcTransaction transaction =
+    var transaction =
         BtcTransaction(inputs: inputs, outputs: outputs, hasSegwit: hasSegwit);
 
     /// we define empty witnesses. maybe the transaction is segwit and We need this
@@ -667,8 +657,8 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
 
     /// when the transaction is taproot and we must use getTaproot tansaction digest
     /// we need all of inputs amounts and owner script pub keys
-    List<BigInt> taprootAmounts = [];
-    List<Script> taprootScripts = [];
+    var taprootAmounts = <BigInt>[];
+    var taprootScripts = <Script>[];
 
     if (hasTaproot) {
       taprootAmounts = utxos.map((e) => e.utxo.value).toList();
@@ -676,30 +666,30 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
     }
 
     /// Well, now let's do what we want for each input
-    for (int i = 0; i < inputs.length; i++) {
+    for (var i = 0; i < inputs.length; i++) {
       /// We receive the owner's ScriptPubKey
       final script = _findLockingScript(utxos[i], false);
 
       /// We generate transaction digest for current input
       final digest = _generateTransactionDigest(
           script, i, utxos[i], transaction, taprootAmounts, taprootScripts);
-      final int sighash = utxos[i].utxo.isP2tr
+      final sighash = utxos[i].utxo.isP2tr
           ? BitcoinOpCodeConst.TAPROOT_SIGHASH_ALL
           : BitcoinOpCodeConst.SIGHASH_ALL;
 
       /// handle multisig address
       if (utxos[i].isMultiSig()) {
         final multiSigAddress = utxos[i].multiSigAddress;
-        int sumMultiSigWeight = 0;
+        var sumMultiSigWeight = 0;
         final mutlsiSigSignatures = <String>[];
-        for (int ownerIndex = 0;
+        for (var ownerIndex = 0;
             ownerIndex < multiSigAddress.signers.length;
             ownerIndex++) {
           /// now we need sign the transaction digest
           final sig = await sign(digest, utxos[i],
               multiSigAddress.signers[ownerIndex].publicKey, sighash);
           if (sig.isEmpty) continue;
-          for (int weight = 0;
+          for (var weight = 0;
               weight < multiSigAddress.signers[ownerIndex].weight;
               weight++) {
             if (mutlsiSigSignatures.length >= multiSigAddress.threshold) {
@@ -714,7 +704,7 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
         }
         if (sumMultiSigWeight != multiSigAddress.threshold) {
           throw const DartBitcoinPluginException(
-              "some multisig signature does not exist");
+              'some multisig signature does not exist');
         }
         _addUnlockScriptScript(
             hasSegwit: hasSegwit,
@@ -726,8 +716,8 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
       }
 
       /// now we need sign the transaction digest
-      final sig =
-          await sign(digest, utxos[i], utxos[i].public().toHex(), sighash);
+      final sig = await sign(
+          digest, utxos[i], utxos[i].ownerDetails.publicKey!, sighash);
       _addUnlockScriptScript(
           hasSegwit: hasSegwit,
           input: inputs[i],
diff --git a/lib/src/utils/btc_utils.dart b/lib/src/utils/btc_utils.dart
index 2d36107..8ca2909 100644
--- a/lib/src/utils/btc_utils.dart
+++ b/lib/src/utils/btc_utils.dart
@@ -1,13 +1,17 @@
+import 'package:bitcoin_base/src/crypto/keypair/ec_public.dart';
 import 'package:blockchain_utils/utils/numbers/rational/big_rational.dart';
 import 'package:blockchain_utils/utils/string/string.dart';
 
 class BtcUtils {
-  static bool hasCompressedPubKeyLength(String publicKey) {
-    return StringUtils.strip0x(publicKey.toLowerCase()).length == 66;
+  static PublicKeyType isCompressedPubKey(String publicKey) {
+    final isCompressed =
+        StringUtils.strip0x(publicKey.toLowerCase()).length == 66;
+    if (isCompressed) return PublicKeyType.compressed;
+    return PublicKeyType.uncompressed;
   }
 
   static BigInt toSatoshi(String decimal) {
-    BigRational dec = BigRational.parseDecimal(decimal);
+    var dec = BigRational.parseDecimal(decimal);
     dec = dec * BigRational(BigInt.from(10).pow(8));
     return dec.toBigInt();
   }
diff --git a/lib/src/utils/enumerate.dart b/lib/src/utils/enumerate.dart
index d92347e..70fc2e7 100644
--- a/lib/src/utils/enumerate.dart
+++ b/lib/src/utils/enumerate.dart
@@ -2,7 +2,7 @@ abstract class Enumerate {
   String get value;
 
   @override
-  operator ==(other) {
+  bool operator ==(other) {
     if (identical(other, this)) return true;
     if (other is! Enumerate) return false;
     return other.runtimeType == runtimeType && value == other.value;
diff --git a/pubspec.yaml b/pubspec.yaml
index 723b8bc..bf68a62 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: bitcoin_base
 description: A versatile library for Bitcoin, Dogecoin, Litecoin, Dash, BSV, and BCH. Supports P2PKH, P2SH, P2WPKH, P2WSH, P2TR, with advanced creation, signing, and spending capabilities.
-version: 4.9.4
+version: 5.0.0
 homepage: "https://github.com/mrtnetwork/bitcoin_base"
 repository: "https://github.com/mrtnetwork/bitcoin_base"
 Author: mrhaydari.t@gmail.com
@@ -12,14 +12,14 @@ topics:
   - dash
   
 environment:
-  sdk: '>=2.15.0 <4.0.0'
+  sdk: '>=3.3.0 <4.0.0'
 
 
 dependencies:
-  blockchain_utils: ^3.6.0
+  blockchain_utils: ^4.0.0
   
   # blockchain_utils:
-  #   path: ../blockchain_utils
+  #   path: ../../blockchain_utils
     
 
 dev_dependencies:
diff --git a/test/bcmr/art_collection.dart b/test/bcmr/art_collection.dart
index d3140bb..327b87e 100644
--- a/test/bcmr/art_collection.dart
+++ b/test/bcmr/art_collection.dart
@@ -1,88 +1,88 @@
 const artCollection = {
-  r"$schema": "https://cashtokens.org/bcmr-v2.schema.json",
-  "version": {"major": 1, "minor": 1, "patch": 0},
-  "latestRevision": "2023-04-14T00:00:17.720Z",
-  "registryIdentity": {
-    "name": "Example.com Token Registry",
-    "description":
-        "An example registry demonstrating how the issuer of a non-fungible token (NFT) art collection might publish information about the collection.",
-    "uris": {
-      "icon": "https://example.com/registry-icon.svg",
-      "web": "https://example.com/",
-      "registry":
-          "https://example.com/.well-known/bitcoin-cash-metadata-registry.json"
+  r'$schema': 'https://cashtokens.org/bcmr-v2.schema.json',
+  'version': {'major': 1, 'minor': 1, 'patch': 0},
+  'latestRevision': '2023-04-14T00:00:17.720Z',
+  'registryIdentity': {
+    'name': 'Example.com Token Registry',
+    'description':
+        'An example registry demonstrating how the issuer of a non-fungible token (NFT) art collection might publish information about the collection.',
+    'uris': {
+      'icon': 'https://example.com/registry-icon.svg',
+      'web': 'https://example.com/',
+      'registry':
+          'https://example.com/.well-known/bitcoin-cash-metadata-registry.json'
     }
   },
-  "identities": {
-    "89cad9e3e34280eb1e8bc420542c00a7fcc01002b663dbf7f38bceddf80e680c": {
-      "2023-01-13T00:00:00.000Z": {
-        "name": "Example NFT Collection",
-        "description":
+  'identities': {
+    '89cad9e3e34280eb1e8bc420542c00a7fcc01002b663dbf7f38bceddf80e680c': {
+      '2023-01-13T00:00:00.000Z': {
+        'name': 'Example NFT Collection',
+        'description':
             "This is a short description of the collection; in most interfaces, it will be hidden beyond 140 characters or the first newline character.\n\nThis sentence should be hidden in user interfaces with limited space.\n\nThis collection defines metadata for 3 sequential NFTs, Example #0 (XAMPLZ-0), Example #1 (XAMPLZ-1), and Example #2 (XAMPLZ-2). Note that the 'icon' for each NFT is published via IPFS, so clients may download each icon by querying IPFS or by using an IPFS HTTP Gateway.",
-        "token": {
-          "category":
-              "89cad9e3e34280eb1e8bc420542c00a7fcc01002b663dbf7f38bceddf80e680c",
-          "symbol": "XAMPLZ",
-          "nfts": {
-            "parse": {
-              "types": {
-                "": {
-                  "name": "Example #0",
-                  "description":
+        'token': {
+          'category':
+              '89cad9e3e34280eb1e8bc420542c00a7fcc01002b663dbf7f38bceddf80e680c',
+          'symbol': 'XAMPLZ',
+          'nfts': {
+            'parse': {
+              'types': {
+                '': {
+                  'name': 'Example #0',
+                  'description':
                       "An NFT of this category with a zero-length on-chain commitment (VM number 0). Where appropriate, user interfaces may display the ticker symbol of NFTs matching this type as XAMPLZ-0.\n\nIn this example, the art represented by this NFT has a square aspect ratio and uses the SVG format, so the same URI can be used for both the 'icon' and 'image' URIs. For NFTs that represent art in raster formats other aspect ratios, the 'icon' URI should point to a 400px by 400px or SVG icon representing the NFT.",
-                  "uris": {
-                    "icon":
-                        "ipfs://bafybeihnmh5bkbaspp3xfdanje74pekhsklhobzzraeyywq6gcpb3iuvey/0.svg",
-                    "image":
-                        "ipfs://bafybeihnmh5bkbaspp3xfdanje74pekhsklhobzzraeyywq6gcpb3iuvey/0.svg",
-                    "web": "https://example.com/xamplz/0/details"
+                  'uris': {
+                    'icon':
+                        'ipfs://bafybeihnmh5bkbaspp3xfdanje74pekhsklhobzzraeyywq6gcpb3iuvey/0.svg',
+                    'image':
+                        'ipfs://bafybeihnmh5bkbaspp3xfdanje74pekhsklhobzzraeyywq6gcpb3iuvey/0.svg',
+                    'web': 'https://example.com/xamplz/0/details'
                   }
                 },
-                "01": {
-                  "name": "Example #1",
-                  "description":
-                      "An NFT of this category with an on-chain commitment of 0x01 (VM number 1). Where appropriate, user interfaces may display the ticker symbol of NFTs matching this type as XAMPLZ-1.",
-                  "uris": {
-                    "icon":
-                        "ipfs://bafybeihnmh5bkbaspp3xfdanje74pekhsklhobzzraeyywq6gcpb3iuvey/1.svg",
-                    "image":
-                        "ipfs://bafybeihnmh5bkbaspp3xfdanje74pekhsklhobzzraeyywq6gcpb3iuvey/1.svg",
-                    "web": "https://example.com/xamplz/1/details",
-                    "custom-uri-identifier": "protocol://data-for-some-protocol"
+                '01': {
+                  'name': 'Example #1',
+                  'description':
+                      'An NFT of this category with an on-chain commitment of 0x01 (VM number 1). Where appropriate, user interfaces may display the ticker symbol of NFTs matching this type as XAMPLZ-1.',
+                  'uris': {
+                    'icon':
+                        'ipfs://bafybeihnmh5bkbaspp3xfdanje74pekhsklhobzzraeyywq6gcpb3iuvey/1.svg',
+                    'image':
+                        'ipfs://bafybeihnmh5bkbaspp3xfdanje74pekhsklhobzzraeyywq6gcpb3iuvey/1.svg',
+                    'web': 'https://example.com/xamplz/1/details',
+                    'custom-uri-identifier': 'protocol://data-for-some-protocol'
                   }
                 },
-                "02": {
-                  "name": "Example #2",
-                  "description":
-                      "An NFT of this category with an on-chain commitment of 0x02 (VM number 2). Where appropriate, user interfaces may display the ticker symbol of NFTs matching this type as XAMPLZ-2.",
-                  "uris": {
-                    "icon":
-                        "ipfs://bafybeihnmh5bkbaspp3xfdanje74pekhsklhobzzraeyywq6gcpb3iuvey/2.svg",
-                    "image":
-                        "ipfs://bafybeihnmh5bkbaspp3xfdanje74pekhsklhobzzraeyywq6gcpb3iuvey/2.svg",
-                    "web": "https://example.com/another/path",
-                    "another-uri-identifier":
-                        "protocol://data-for-that-protocol"
+                '02': {
+                  'name': 'Example #2',
+                  'description':
+                      'An NFT of this category with an on-chain commitment of 0x02 (VM number 2). Where appropriate, user interfaces may display the ticker symbol of NFTs matching this type as XAMPLZ-2.',
+                  'uris': {
+                    'icon':
+                        'ipfs://bafybeihnmh5bkbaspp3xfdanje74pekhsklhobzzraeyywq6gcpb3iuvey/2.svg',
+                    'image':
+                        'ipfs://bafybeihnmh5bkbaspp3xfdanje74pekhsklhobzzraeyywq6gcpb3iuvey/2.svg',
+                    'web': 'https://example.com/another/path',
+                    'another-uri-identifier':
+                        'protocol://data-for-that-protocol'
                   }
                 }
               }
             }
           }
         },
-        "uris": {
-          "icon": "https://example.com/xamplz-icon.svg",
-          "web": "https://example.com/about-xamplz-nfts",
-          "blog": "https://blog.example.com/",
-          "chat": "https://chat.example.com/",
-          "forum": "https://forum.example.com/",
-          "registry":
-              "https://example.com/.well-known/bitcoin-cash-metadata-registry.json",
-          "support": "https://support.example.com/",
-          "custom-uri-identifier":
-              "protocol://connection-info-for-some-protocol"
+        'uris': {
+          'icon': 'https://example.com/xamplz-icon.svg',
+          'web': 'https://example.com/about-xamplz-nfts',
+          'blog': 'https://blog.example.com/',
+          'chat': 'https://chat.example.com/',
+          'forum': 'https://forum.example.com/',
+          'registry':
+              'https://example.com/.well-known/bitcoin-cash-metadata-registry.json',
+          'support': 'https://support.example.com/',
+          'custom-uri-identifier':
+              'protocol://connection-info-for-some-protocol'
         }
       }
     }
   },
-  "license": "CC0-1.0"
+  'license': 'CC0-1.0'
 };
diff --git a/test/bcmr/bcmr_test.dart b/test/bcmr/bcmr_test.dart
index 88d7d4a..a85df22 100644
--- a/test/bcmr/bcmr_test.dart
+++ b/test/bcmr/bcmr_test.dart
@@ -8,7 +8,7 @@ import 'payouts_or_dividends.dart';
 
 /// https://github.com/bitjson/chip-bcmr/tree/master/examples
 void main() {
-  test("pcmr test", () {
+  test('pcmr test', () {
     final registry = Registry.fromJson(payoutsOrDividends);
     expect(json.encode(registry.toJson()), json.encode(payoutsOrDividends));
     final registry2 = Registry.fromJson(artCollection);
diff --git a/test/bcmr/decentralized_application.dart b/test/bcmr/decentralized_application.dart
index eab21f6..b732560 100644
--- a/test/bcmr/decentralized_application.dart
+++ b/test/bcmr/decentralized_application.dart
@@ -1,77 +1,77 @@
 const decentralizedApplication = {
-  r"$schema": "https://cashtokens.org/bcmr-v2.schema.json",
-  "version": {"major": 1, "minor": 1, "patch": 0},
-  "latestRevision": "2023-04-14T00:00:17.720Z",
-  "registryIdentity": {
-    "name": "Example.com Token Registry",
-    "description":
-        "An example demonstrating how a metadata registry might publish information about a decentralized application.",
-    "uris": {
-      "icon": "https://example.com/registry-icon.svg",
-      "web": "https://example.com/",
-      "registry":
-          "https://example.com/.well-known/bitcoin-cash-metadata-registry.json"
+  r'$schema': 'https://cashtokens.org/bcmr-v2.schema.json',
+  'version': {'major': 1, 'minor': 1, 'patch': 0},
+  'latestRevision': '2023-04-14T00:00:17.720Z',
+  'registryIdentity': {
+    'name': 'Example.com Token Registry',
+    'description':
+        'An example demonstrating how a metadata registry might publish information about a decentralized application.',
+    'uris': {
+      'icon': 'https://example.com/registry-icon.svg',
+      'web': 'https://example.com/',
+      'registry':
+          'https://example.com/.well-known/bitcoin-cash-metadata-registry.json'
     }
   },
-  "identities": {
-    "89cad9e3e34280eb1e8bc420542c00a7fcc01002b663dbf7f38bceddf80e680c": {
-      "2023-01-13T00:00:00.000Z": {
-        "name": "Crowdfunding Campaign: Example",
-        "description":
+  'identities': {
+    '89cad9e3e34280eb1e8bc420542c00a7fcc01002b663dbf7f38bceddf80e680c': {
+      '2023-01-13T00:00:00.000Z': {
+        'name': 'Crowdfunding Campaign: Example',
+        'description':
             "This is a short description of the decentralized application; in most interfaces, it will be hidden beyond 140 characters or the first newline character.\n\nThis sentence should be hidden in user interfaces with limited space.\n\nThis crowdfunding campaign instance has a distinct name and symbol (CFC2023XAMPL) to make it easily distinguishable from other crowdfunding campaigns published using the same contracts.\n\nThis application uses only one type of parsable NFT, 'Pledge Receipt's, so the 'parse.bytecode' (OP_0 OP_TOALTSTACK OP_0 OP_UTXOTOKENCOMMITMENT OP_TOALTSTACK) doesn't require any OP_IF/ENDIF branches; an empty altstack item is pushed to indicate the NFT type (''), and the remaining portion of the commitment is pushed as the only field (Pledge Value).",
-        "token": {
-          "category":
-              "89cad9e3e34280eb1e8bc420542c00a7fcc01002b663dbf7f38bceddf80e680c",
-          "symbol": "CFC2023XAMPL",
-          "nfts": {
-            "description":
-                "Example Crowdfunding Campaign issues your wallet a receipt (NFT) when you make a pledge. Should you decide to cancel your pledge before the campaign completes, this receipt can be redeemed with the on-chain contract to receive a refund.",
-            "fields": {
-              "pledgeValue": {
-                "name": "Pledge Value",
-                "description":
+        'token': {
+          'category':
+              '89cad9e3e34280eb1e8bc420542c00a7fcc01002b663dbf7f38bceddf80e680c',
+          'symbol': 'CFC2023XAMPL',
+          'nfts': {
+            'description':
+                'Example Crowdfunding Campaign issues your wallet a receipt (NFT) when you make a pledge. Should you decide to cancel your pledge before the campaign completes, this receipt can be redeemed with the on-chain contract to receive a refund.',
+            'fields': {
+              'pledgeValue': {
+                'name': 'Pledge Value',
+                'description':
                     "The value pledged to the campaign in Bitcoin Cash.\n\nThis example demonstrates the additional capabilities of the 'number' encoding; clients are informed that pledge value can be aggregated (by addition) in views containing multiple NFTs to provide useful information to the user. For example, if the wallet holds two NFTs with Pledge Values of 123456 and 654321, the wallet can display a total of the user's pledges to this campaign: 0.00777777 BCH.",
-                "encoding": {
-                  "type": "number",
-                  "aggregate": "add",
-                  "decimals": 8,
-                  "unit": "BCH"
+                'encoding': {
+                  'type': 'number',
+                  'aggregate': 'add',
+                  'decimals': 8,
+                  'unit': 'BCH'
                 }
               }
             },
-            "parse": {
-              "bytecode": "006b00cf6b",
-              "types": {
-                "": {
-                  "name": "Pledge Receipt",
-                  "description":
-                      "An NFT of this category with a zero-length on-chain commitment (VM number 0). Where appropriate, user interfaces may display the ticker symbol of NFTs matching this type as CFC2023XAMPL-0.\n\nPledge Receipts are the only type of NFT demonstrated in this example, and they contain only one field: pledgeValue.",
-                  "fields": ["pledgeValue"],
-                  "uris": {
-                    "icon":
-                        "ipfs://bafybeihnmh5bkbaspp3xfdanje74pekhsklhobzzraeyywq6gcpb3iuvey/0.svg",
-                    "web": "https://example.com/campaign",
-                    "custom-uri-identifier": "protocol://data-for-some-protocol"
+            'parse': {
+              'bytecode': '006b00cf6b',
+              'types': {
+                '': {
+                  'name': 'Pledge Receipt',
+                  'description':
+                      'An NFT of this category with a zero-length on-chain commitment (VM number 0). Where appropriate, user interfaces may display the ticker symbol of NFTs matching this type as CFC2023XAMPL-0.\n\nPledge Receipts are the only type of NFT demonstrated in this example, and they contain only one field: pledgeValue.',
+                  'fields': ['pledgeValue'],
+                  'uris': {
+                    'icon':
+                        'ipfs://bafybeihnmh5bkbaspp3xfdanje74pekhsklhobzzraeyywq6gcpb3iuvey/0.svg',
+                    'web': 'https://example.com/campaign',
+                    'custom-uri-identifier': 'protocol://data-for-some-protocol'
                   }
                 }
               }
             }
           }
         },
-        "uris": {
-          "icon": "https://example.com/campaign-icon.svg",
-          "web": "https://example.com/about-campaign",
-          "blog": "https://blog.example.com/",
-          "chat": "https://chat.example.com/",
-          "forum": "https://forum.example.com/",
-          "registry":
-              "https://example.com/.well-known/bitcoin-cash-metadata-registry.json",
-          "support": "https://support.example.com/",
-          "custom-uri-identifier":
-              "protocol://connection-info-for-some-protocol"
+        'uris': {
+          'icon': 'https://example.com/campaign-icon.svg',
+          'web': 'https://example.com/about-campaign',
+          'blog': 'https://blog.example.com/',
+          'chat': 'https://chat.example.com/',
+          'forum': 'https://forum.example.com/',
+          'registry':
+              'https://example.com/.well-known/bitcoin-cash-metadata-registry.json',
+          'support': 'https://support.example.com/',
+          'custom-uri-identifier':
+              'protocol://connection-info-for-some-protocol'
         }
       }
     }
   },
-  "license": "CC0-1.0"
+  'license': 'CC0-1.0'
 };
diff --git a/test/bcmr/fungible_token.dart b/test/bcmr/fungible_token.dart
index 8bac512..e3a1f40 100644
--- a/test/bcmr/fungible_token.dart
+++ b/test/bcmr/fungible_token.dart
@@ -1,36 +1,36 @@
 const fungibleToken = {
-  r"$schema": "https://cashtokens.org/bcmr-v2.schema.json",
-  "version": {"major": 1, "minor": 1, "patch": 0},
-  "latestRevision": "2023-04-14T00:00:17.720Z",
-  "registryIdentity": {
-    "name": "Example.com Token Registry",
-    "description":
-        "An example registry demonstrating how the issuer of a single kind of fungible token might publish information about the token.",
-    "uris": {
-      "icon": "https://example.com/registry-icon.svg",
-      "web": "https://example.com/",
-      "registry":
-          "https://example.com/.well-known/bitcoin-cash-metadata-registry.json"
+  r'$schema': 'https://cashtokens.org/bcmr-v2.schema.json',
+  'version': {'major': 1, 'minor': 1, 'patch': 0},
+  'latestRevision': '2023-04-14T00:00:17.720Z',
+  'registryIdentity': {
+    'name': 'Example.com Token Registry',
+    'description':
+        'An example registry demonstrating how the issuer of a single kind of fungible token might publish information about the token.',
+    'uris': {
+      'icon': 'https://example.com/registry-icon.svg',
+      'web': 'https://example.com/',
+      'registry':
+          'https://example.com/.well-known/bitcoin-cash-metadata-registry.json'
     }
   },
-  "identities": {
-    "89cad9e3e34280eb1e8bc420542c00a7fcc01002b663dbf7f38bceddf80e680c": {
-      "2023-01-03T00:00:00.000Z": {
-        "name": "Example Asset",
-        "description":
+  'identities': {
+    '89cad9e3e34280eb1e8bc420542c00a7fcc01002b663dbf7f38bceddf80e680c': {
+      '2023-01-03T00:00:00.000Z': {
+        'name': 'Example Asset',
+        'description':
             "This is a record of an older entry for the token identity. The token was rebranded (from EXAMPLE to XAMPL) and redenominated (from 8 to 6 decimals), but the existing token category was not modified: users were not required to trade their original EXAMPLE tokens for the redenominated XAMPL tokens, their wallets simply updated the way tokens are displayed using the new metadata. Note, this entry has likely been updated by the issuer to provide useful historical information rather than attempting to preserve the precise contents of the old snapshot; the 'web' URI links to a blog post about XAMPL's re-denomination/re-brand, and outdated URI information is excluded. There may have been metadata updates published between this snapshot and the latest snapshot, but they've been excluded because registries should strive to present a useful history of only meaningful changes to identities. This information can be used in user interfaces to improve continuity following metadata updates or to offer historical context.",
-        "token": {
-          "category":
-              "89cad9e3e34280eb1e8bc420542c00a7fcc01002b663dbf7f38bceddf80e680c",
-          "decimals": 8,
-          "symbol": "EXAMPLE"
+        'token': {
+          'category':
+              '89cad9e3e34280eb1e8bc420542c00a7fcc01002b663dbf7f38bceddf80e680c',
+          'decimals': 8,
+          'symbol': 'EXAMPLE'
         },
-        "uris": {
-          "icon": "https://example.com/old-example-asset-icon.png",
-          "web": "https://blog.example.com/example-asset-is-now-XAMPL"
+        'uris': {
+          'icon': 'https://example.com/old-example-asset-icon.png',
+          'web': 'https://blog.example.com/example-asset-is-now-XAMPL'
         }
       }
     }
   },
-  "license": "CC0-1.0"
+  'license': 'CC0-1.0'
 };
diff --git a/test/bcmr/payouts_or_dividends.dart b/test/bcmr/payouts_or_dividends.dart
index b4c262f..1bf745d 100644
--- a/test/bcmr/payouts_or_dividends.dart
+++ b/test/bcmr/payouts_or_dividends.dart
@@ -1,87 +1,87 @@
 const payoutsOrDividends = {
-  r"$schema": "https://cashtokens.org/bcmr-v2.schema.json",
-  "version": {"major": 1, "minor": 1, "patch": 0},
-  "latestRevision": "2023-04-14T00:00:17.720Z",
-  "registryIdentity": {
-    "name": "Example.com Token Registry",
-    "description":
+  r'$schema': 'https://cashtokens.org/bcmr-v2.schema.json',
+  'version': {'major': 1, 'minor': 1, 'patch': 0},
+  'latestRevision': '2023-04-14T00:00:17.720Z',
+  'registryIdentity': {
+    'name': 'Example.com Token Registry',
+    'description':
         "An example demonstrating how a registry might publish information about fungible tokens that receive on-chain payouts or dividends, either from off-chain activities (e.g. equity or debt instruments) or as part of an on-chain mechanism (e.g. payouts from a decentralized application or sidechain).\n\nDescriptions below are written from the perspective of a client reading this registry shortly after its 'lastRevision' timestamp on 2023-04-14.",
-    "uris": {
-      "icon": "https://example.com/registry-icon.svg",
-      "web": "https://example.com/",
-      "registry":
-          "https://example.com/.well-known/bitcoin-cash-metadata-registry.json"
+    'uris': {
+      'icon': 'https://example.com/registry-icon.svg',
+      'web': 'https://example.com/',
+      'registry':
+          'https://example.com/.well-known/bitcoin-cash-metadata-registry.json'
     }
   },
-  "identities": {
-    "978306aa4e02fd06e251b38d2e961f78f4af2ea6524a3e4531126776276a6af1": {
-      "2023-06-30T00:00:00.000Z": {
-        "name": "Example Payout Shares",
-        "description":
+  'identities': {
+    '978306aa4e02fd06e251b38d2e961f78f4af2ea6524a3e4531126776276a6af1': {
+      '2023-06-30T00:00:00.000Z': {
+        'name': 'Example Payout Shares',
+        'description':
             "This is a description of Example Payout Shares. In most interfaces, it will be hidden beyond 140 characters or the first newline character.\n\nThis sentence should be hidden in user interfaces with limited space.\n\nThis asset entitles holders to on-chain payouts of some kind. For example, they may be shares of a company, interest-paying debt, or utility tokens of a decentralized application where holders have performed some service to the protocol (e.g. sidechain validation, liquidity provision, etc.).\n\nNote that this particular identity snapshot has not yet come into effect (assuming the client is reading the registry shortly after its 'lastRevision' timestamp on 2023-04-14); the next identity snapshot contains the current information for the identity. Instead, this snapshot indicates an update to the identity expected to happen in the future: a payout for 2023Q2, where token holders will trade in fungible tokens of the 2023Q2 category for a quarterly payout and receive an equivalent number of fungible tokens of the new, 2023Q3 category listed in this snapshot.",
-        "migrated": "2023-07-01T00:00:00.000Z",
-        "token": {
-          "category":
-              "89cad9e3e34280eb1e8bc420542c00a7fcc01002b663dbf7f38bceddf80e680c",
-          "decimals": 6,
-          "symbol": "XAMPL-23Q3"
+        'migrated': '2023-07-01T00:00:00.000Z',
+        'token': {
+          'category':
+              '89cad9e3e34280eb1e8bc420542c00a7fcc01002b663dbf7f38bceddf80e680c',
+          'decimals': 6,
+          'symbol': 'XAMPL-23Q3'
         },
-        "uris": {
-          "icon": "https://example.com/asset-icon.svg",
-          "web": "https://example.com/",
-          "migrate": "https://app.example.com/payouts/2023Q2",
-          "blog": "https://blog.example.com/",
-          "chat": "https://chat.example.com/",
-          "forum": "https://forum.example.com/",
-          "registry":
-              "https://example.com/.well-known/bitcoin-cash-metadata-registry.json",
-          "support": "https://support.example.com/",
-          "custom-uri-identifier":
-              "protocol://connection-info-for-some-protocol"
+        'uris': {
+          'icon': 'https://example.com/asset-icon.svg',
+          'web': 'https://example.com/',
+          'migrate': 'https://app.example.com/payouts/2023Q2',
+          'blog': 'https://blog.example.com/',
+          'chat': 'https://chat.example.com/',
+          'forum': 'https://forum.example.com/',
+          'registry':
+              'https://example.com/.well-known/bitcoin-cash-metadata-registry.json',
+          'support': 'https://support.example.com/',
+          'custom-uri-identifier':
+              'protocol://connection-info-for-some-protocol'
         }
       },
-      "2023-03-31T00:00:00.000Z": {
-        "name": "Example Payout Shares",
-        "description":
+      '2023-03-31T00:00:00.000Z': {
+        'name': 'Example Payout Shares',
+        'description':
             "The current identity snapshot for this token identity (assuming the client is reading the registry shortly after its 'lastRevision' timestamp on 2023-04-14). Note that as of now, tokens of this category (b1a35ca...) should be listed by the client simply by base symbol: XAMPL. When the next snapshot's initial timestamp is reached (2023-06-30) their full symbol should be displayed, XAMPL-23Q2, as the latest category for this token identity will become XAMPL-23Q3 (89cad9...), and only tokens of that category should be referred to using the base symbol. Holders of XAMPL-23Q2 can refer to the 'migrate' URI in the next snapshot for information about acquiring the new XAMPL tokens (XAMPL-23Q3) and their 2nd quarterly payout by trading in their XAMPL-23Q2 fungible tokens.",
-        "migrated": "2023-04-01T00:00:00.000Z",
-        "token": {
-          "category":
-              "b1a35cadd5ddb1bd18787eeb99ee061f34b946f0db375d84caadd8ab621c10f5",
-          "decimals": 6,
-          "symbol": "XAMPL-23Q2"
+        'migrated': '2023-04-01T00:00:00.000Z',
+        'token': {
+          'category':
+              'b1a35cadd5ddb1bd18787eeb99ee061f34b946f0db375d84caadd8ab621c10f5',
+          'decimals': 6,
+          'symbol': 'XAMPL-23Q2'
         },
-        "uris": {
-          "icon": "https://example.com/asset-icon.svg",
-          "web": "https://example.com/",
-          "migrate": "https://app.example.com/payouts/2023Q1",
-          "blog": "https://blog.example.com/",
-          "chat": "https://chat.example.com/",
-          "forum": "https://forum.example.com/",
-          "registry":
-              "https://example.com/.well-known/bitcoin-cash-metadata-registry.json",
-          "support": "https://support.example.com/",
-          "custom-uri-identifier":
-              "protocol://connection-info-for-some-protocol"
+        'uris': {
+          'icon': 'https://example.com/asset-icon.svg',
+          'web': 'https://example.com/',
+          'migrate': 'https://app.example.com/payouts/2023Q1',
+          'blog': 'https://blog.example.com/',
+          'chat': 'https://chat.example.com/',
+          'forum': 'https://forum.example.com/',
+          'registry':
+              'https://example.com/.well-known/bitcoin-cash-metadata-registry.json',
+          'support': 'https://support.example.com/',
+          'custom-uri-identifier':
+              'protocol://connection-info-for-some-protocol'
         }
       },
-      "2022-12-31T00:00:00.000Z": {
-        "name": "Example Payout Shares (2023Q1)",
-        "description":
+      '2022-12-31T00:00:00.000Z': {
+        'name': 'Example Payout Shares (2023Q1)',
+        'description':
             "Payout shares for Example Protocol for the first quarter of 2023. These shares can be redeemed with the on-chain payout system to receive the payout and the new tokens for 2023Q2. See the linked website for details.\n\nExample note: this asset (XAMPL-23Q1, 978306...) will still be held in wallets that have not yet redeemed the 2023Q1 payout. Because the payout is held by an on-chain covenant, it's safe to delay redemption indefinitely, as funds (and the new, XAMPL-23Q2 tokens) will remain in the covenant until fully claimed by existing XAMPL-23Q1 holders. Some holders may leave XAMPL-23Q1 tokens in long-term vaults for many quarters before withdrawing, redeeming all payouts, and depositing the latest XAMPL tokens back in such vaults.",
-        "migrated": "2023-01-01T00:00:00.000Z",
-        "token": {
-          "category":
-              "978306aa4e02fd06e251b38d2e961f78f4af2ea6524a3e4531126776276a6af1",
-          "decimals": 6,
-          "symbol": "XAMPL-23Q1"
+        'migrated': '2023-01-01T00:00:00.000Z',
+        'token': {
+          'category':
+              '978306aa4e02fd06e251b38d2e961f78f4af2ea6524a3e4531126776276a6af1',
+          'decimals': 6,
+          'symbol': 'XAMPL-23Q1'
         },
-        "uris": {
-          "icon": "https://example.com/asset-icon-pending-payout.svg",
-          "web": "https://blog.example.com/payout-2023Q1"
+        'uris': {
+          'icon': 'https://example.com/asset-icon-pending-payout.svg',
+          'web': 'https://blog.example.com/payout-2023Q1'
         }
       }
     }
   },
-  "license": "CC0-1.0"
+  'license': 'CC0-1.0'
 };
diff --git a/test/bitcoin_cash_address_test.dart b/test/bitcoin_cash_address_test.dart
index 11f310a..9a38eec 100644
--- a/test/bitcoin_cash_address_test.dart
+++ b/test/bitcoin_cash_address_test.dart
@@ -23,182 +23,182 @@ import 'package:test/test.dart';
 // # THE SOFTWARE.
 
 final Map<String, Map<String, dynamic>> bitcoinCashAddresses = {
-  "bitcoincash:qr7fzmep8g7h7ymfxy74lgc0v950j3r2959lhtxxsl": {
-    "type": 0,
-    "addressType": "P2PKH",
-    "programLength": 20,
-    "programBytes": "fc916f213a3d7f1369313d5fa30f6168f9446a2d",
-  },
-  "bitcoincash:zr7fzmep8g7h7ymfxy74lgc0v950j3r295z4y4gq0v": {
-    "type": 2,
-    "addressType": "Token-Aware P2PKH",
-    "programLength": 20,
-    "programBytes": "fc916f213a3d7f1369313d5fa30f6168f9446a2d",
-  },
-  "bchtest:qr7fzmep8g7h7ymfxy74lgc0v950j3r295pdnvy3hr": {
-    "type": 0,
-    "addressType": "P2PKH",
-    "programLength": 20,
-    "programBytes": "fc916f213a3d7f1369313d5fa30f6168f9446a2d",
-  },
-  "bchtest:zr7fzmep8g7h7ymfxy74lgc0v950j3r295x8qj2hgs": {
-    "type": 2,
-    "addressType": "Token-Aware P2PKH",
-    "programLength": 20,
-    "programBytes": "fc916f213a3d7f1369313d5fa30f6168f9446a2d",
-  },
-  "bchreg:qr7fzmep8g7h7ymfxy74lgc0v950j3r295m39d8z59": {
-    "type": 0,
-    "addressType": "P2PKH",
-    "programLength": 20,
-    "programBytes": "fc916f213a3d7f1369313d5fa30f6168f9446a2d",
-  },
-  "bchreg:zr7fzmep8g7h7ymfxy74lgc0v950j3r295umknfytk": {
-    "type": 2,
-    "addressType": "Token-Aware P2PKH",
-    "programLength": 20,
-    "programBytes": "fc916f213a3d7f1369313d5fa30f6168f9446a2d",
-  },
-  "prefix:qr7fzmep8g7h7ymfxy74lgc0v950j3r295fu6e430r": {
-    "type": 0,
-    "addressType": "P2PKH",
-    "programLength": 20,
-    "programBytes": "fc916f213a3d7f1369313d5fa30f6168f9446a2d",
-  },
-  "prefix:zr7fzmep8g7h7ymfxy74lgc0v950j3r295wkf8mhss": {
-    "type": 2,
-    "addressType": "Token-Aware P2PKH",
-    "programLength": 20,
-    "programBytes": "fc916f213a3d7f1369313d5fa30f6168f9446a2d",
-  },
-  "bitcoincash:qpagr634w55t4wp56ftxx53xukhqgl24yse53qxdge": {
-    "type": 0,
-    "addressType": "P2PKH",
-    "programLength": 20,
-    "programBytes": "7a81ea357528bab834d256635226e5ae047d5524",
-  },
-  "bitcoincash:zpagr634w55t4wp56ftxx53xukhqgl24ys77z7gth2": {
-    "type": 2,
-    "addressType": "Token-Aware P2PKH",
-    "programLength": 20,
-    "programBytes": "7a81ea357528bab834d256635226e5ae047d5524",
-  },
-  "bitcoincash:qq9l9e2dgkx0hp43qm3c3h252e9euugrfc6vlt3r9e": {
-    "type": 0,
-    "addressType": "P2PKH",
-    "programLength": 20,
-    "programBytes": "0bf2e54d458cfb86b106e388dd54564b9e71034e",
-  },
-  "bitcoincash:zq9l9e2dgkx0hp43qm3c3h252e9euugrfcaxv4l962": {
-    "type": 2,
-    "addressType": "Token-Aware P2PKH",
-    "programLength": 20,
-    "programBytes": "0bf2e54d458cfb86b106e388dd54564b9e71034e",
-  },
-  "bitcoincash:qre24q38ghy6k3pegpyvtxahu8q8hqmxmqqn28z85p": {
-    "type": 0,
-    "addressType": "P2PKH",
-    "programLength": 20,
-    "programBytes": "f2aa822745c9ab44394048c59bb7e1c07b8366d8",
-  },
-  "bitcoincash:zre24q38ghy6k3pegpyvtxahu8q8hqmxmq8eeevptj": {
-    "type": 2,
-    "addressType": "Token-Aware P2PKH",
-    "programLength": 20,
-    "programBytes": "f2aa822745c9ab44394048c59bb7e1c07b8366d8",
-  },
-  "bitcoincash:qz7xc0vl85nck65ffrsx5wvewjznp9lflgktxc5878": {
-    "type": 0,
-    "addressType": "P2PKH",
-    "programLength": 20,
-    "programBytes": "bc6c3d9f3d278b6a8948e06a399974853097e9fa",
-  },
-  "bitcoincash:zz7xc0vl85nck65ffrsx5wvewjznp9lflg3p4x6pp5": {
-    "type": 2,
-    "addressType": "Token-Aware P2PKH",
-    "programLength": 20,
-    "programBytes": "bc6c3d9f3d278b6a8948e06a399974853097e9fa",
-  },
-  "bitcoincash:ppawqn2h74a4t50phuza84kdp3794pq3ccvm92p8sh": {
-    "type": 1,
-    "addressType": "P2SH",
-    "programLength": 20,
-    "programBytes": "7ae04d57f57b55d1e1bf05d3d6cd0c7c5a8411c6",
-  },
-  "bitcoincash:rpawqn2h74a4t50phuza84kdp3794pq3cct3k50p0y": {
-    "type": 3,
-    "addressType": "Token-Aware P2SH",
-    "programLength": 20,
-    "programBytes": "7ae04d57f57b55d1e1bf05d3d6cd0c7c5a8411c6",
-  },
-  "bitcoincash:pqv53dwyatxse2xh7nnlqhyr6ryjgfdtagkd4vc388": {
-    "type": 1,
-    "addressType": "P2SH",
-    "programLength": 20,
-    "programBytes": "1948b5c4eacd0ca8d7f4e7f05c83d0c92425abea",
-  },
-  "bitcoincash:rqv53dwyatxse2xh7nnlqhyr6ryjgfdtag38xjkhc5": {
-    "type": 3,
-    "addressType": "Token-Aware P2SH",
-    "programLength": 20,
-    "programBytes": "1948b5c4eacd0ca8d7f4e7f05c83d0c92425abea",
-  },
-  "bitcoincash:prseh0a4aejjcewhc665wjqhppgwrz2lw5txgn666a": {
-    "type": 1,
-    "addressType": "P2SH",
-    "programLength": 20,
-    "programBytes": "e19bbfb5ee652c65d7c6b54748170850e1895f75",
-  },
-  "bitcoincash:rrseh0a4aejjcewhc665wjqhppgwrz2lw5vvmd5u9w": {
-    "type": 3,
-    "addressType": "Token-Aware P2SH",
-    "programLength": 20,
-    "programBytes": "e19bbfb5ee652c65d7c6b54748170850e1895f75",
-  },
-  "bitcoincash:pzltaslh7xnrsxeqm7qtvh0v53n3gfk0v5wwf6d7j4": {
-    "type": 1,
-    "addressType": "P2SH",
-    "programLength": 20,
-    "programBytes": "bebec3f7f1a6381b20df80b65deca4671426cf65",
-  },
-  "bitcoincash:rzltaslh7xnrsxeqm7qtvh0v53n3gfk0v5fy6yrcdx": {
-    "type": 3,
-    "addressType": "Token-Aware P2SH",
-    "programLength": 20,
-    "programBytes": "bebec3f7f1a6381b20df80b65deca4671426cf65",
-  },
-  "bitcoincash:pvqqqqqqqqqqqqqqqqqqqqqqzg69v7ysqqqqqqqqqqqqqqqqqqqqqpkp7fqn0": {
-    "type": 1,
-    "addressType": "P2SH",
-    "programLength": 32,
-    "programBytes":
-        "0000000000000000000000000000123456789000000000000000000000000000",
-  },
-  "bitcoincash:rvqqqqqqqqqqqqqqqqqqqqqqzg69v7ysqqqqqqqqqqqqqqqqqqqqqn9alsp2y": {
-    "type": 3,
-    "addressType": "Token-Aware P2SH",
-    "programLength": 32,
-    "programBytes":
-        "0000000000000000000000000000123456789000000000000000000000000000",
-  },
-  "bitcoincash:pdzyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3jh2p5nn": {
-    "type": 1,
-    "addressType": "P2SH",
-    "programLength": 32,
-    "programBytes":
-        "4444444444444444444444444444444444444444444444444444444444444444",
+  'bitcoincash:qr7fzmep8g7h7ymfxy74lgc0v950j3r2959lhtxxsl': {
+    'type': 0,
+    'addressType': 'P2PKH',
+    'programLength': 20,
+    'programBytes': 'fc916f213a3d7f1369313d5fa30f6168f9446a2d',
+  },
+  'bitcoincash:zr7fzmep8g7h7ymfxy74lgc0v950j3r295z4y4gq0v': {
+    'type': 2,
+    'addressType': 'Token-Aware P2PKH',
+    'programLength': 20,
+    'programBytes': 'fc916f213a3d7f1369313d5fa30f6168f9446a2d',
+  },
+  'bchtest:qr7fzmep8g7h7ymfxy74lgc0v950j3r295pdnvy3hr': {
+    'type': 0,
+    'addressType': 'P2PKH',
+    'programLength': 20,
+    'programBytes': 'fc916f213a3d7f1369313d5fa30f6168f9446a2d',
+  },
+  'bchtest:zr7fzmep8g7h7ymfxy74lgc0v950j3r295x8qj2hgs': {
+    'type': 2,
+    'addressType': 'Token-Aware P2PKH',
+    'programLength': 20,
+    'programBytes': 'fc916f213a3d7f1369313d5fa30f6168f9446a2d',
+  },
+  'bchreg:qr7fzmep8g7h7ymfxy74lgc0v950j3r295m39d8z59': {
+    'type': 0,
+    'addressType': 'P2PKH',
+    'programLength': 20,
+    'programBytes': 'fc916f213a3d7f1369313d5fa30f6168f9446a2d',
+  },
+  'bchreg:zr7fzmep8g7h7ymfxy74lgc0v950j3r295umknfytk': {
+    'type': 2,
+    'addressType': 'Token-Aware P2PKH',
+    'programLength': 20,
+    'programBytes': 'fc916f213a3d7f1369313d5fa30f6168f9446a2d',
+  },
+  'prefix:qr7fzmep8g7h7ymfxy74lgc0v950j3r295fu6e430r': {
+    'type': 0,
+    'addressType': 'P2PKH',
+    'programLength': 20,
+    'programBytes': 'fc916f213a3d7f1369313d5fa30f6168f9446a2d',
+  },
+  'prefix:zr7fzmep8g7h7ymfxy74lgc0v950j3r295wkf8mhss': {
+    'type': 2,
+    'addressType': 'Token-Aware P2PKH',
+    'programLength': 20,
+    'programBytes': 'fc916f213a3d7f1369313d5fa30f6168f9446a2d',
+  },
+  'bitcoincash:qpagr634w55t4wp56ftxx53xukhqgl24yse53qxdge': {
+    'type': 0,
+    'addressType': 'P2PKH',
+    'programLength': 20,
+    'programBytes': '7a81ea357528bab834d256635226e5ae047d5524',
+  },
+  'bitcoincash:zpagr634w55t4wp56ftxx53xukhqgl24ys77z7gth2': {
+    'type': 2,
+    'addressType': 'Token-Aware P2PKH',
+    'programLength': 20,
+    'programBytes': '7a81ea357528bab834d256635226e5ae047d5524',
+  },
+  'bitcoincash:qq9l9e2dgkx0hp43qm3c3h252e9euugrfc6vlt3r9e': {
+    'type': 0,
+    'addressType': 'P2PKH',
+    'programLength': 20,
+    'programBytes': '0bf2e54d458cfb86b106e388dd54564b9e71034e',
+  },
+  'bitcoincash:zq9l9e2dgkx0hp43qm3c3h252e9euugrfcaxv4l962': {
+    'type': 2,
+    'addressType': 'Token-Aware P2PKH',
+    'programLength': 20,
+    'programBytes': '0bf2e54d458cfb86b106e388dd54564b9e71034e',
+  },
+  'bitcoincash:qre24q38ghy6k3pegpyvtxahu8q8hqmxmqqn28z85p': {
+    'type': 0,
+    'addressType': 'P2PKH',
+    'programLength': 20,
+    'programBytes': 'f2aa822745c9ab44394048c59bb7e1c07b8366d8',
+  },
+  'bitcoincash:zre24q38ghy6k3pegpyvtxahu8q8hqmxmq8eeevptj': {
+    'type': 2,
+    'addressType': 'Token-Aware P2PKH',
+    'programLength': 20,
+    'programBytes': 'f2aa822745c9ab44394048c59bb7e1c07b8366d8',
+  },
+  'bitcoincash:qz7xc0vl85nck65ffrsx5wvewjznp9lflgktxc5878': {
+    'type': 0,
+    'addressType': 'P2PKH',
+    'programLength': 20,
+    'programBytes': 'bc6c3d9f3d278b6a8948e06a399974853097e9fa',
+  },
+  'bitcoincash:zz7xc0vl85nck65ffrsx5wvewjznp9lflg3p4x6pp5': {
+    'type': 2,
+    'addressType': 'Token-Aware P2PKH',
+    'programLength': 20,
+    'programBytes': 'bc6c3d9f3d278b6a8948e06a399974853097e9fa',
+  },
+  'bitcoincash:ppawqn2h74a4t50phuza84kdp3794pq3ccvm92p8sh': {
+    'type': 1,
+    'addressType': 'P2SH',
+    'programLength': 20,
+    'programBytes': '7ae04d57f57b55d1e1bf05d3d6cd0c7c5a8411c6',
+  },
+  'bitcoincash:rpawqn2h74a4t50phuza84kdp3794pq3cct3k50p0y': {
+    'type': 3,
+    'addressType': 'Token-Aware P2SH',
+    'programLength': 20,
+    'programBytes': '7ae04d57f57b55d1e1bf05d3d6cd0c7c5a8411c6',
+  },
+  'bitcoincash:pqv53dwyatxse2xh7nnlqhyr6ryjgfdtagkd4vc388': {
+    'type': 1,
+    'addressType': 'P2SH',
+    'programLength': 20,
+    'programBytes': '1948b5c4eacd0ca8d7f4e7f05c83d0c92425abea',
+  },
+  'bitcoincash:rqv53dwyatxse2xh7nnlqhyr6ryjgfdtag38xjkhc5': {
+    'type': 3,
+    'addressType': 'Token-Aware P2SH',
+    'programLength': 20,
+    'programBytes': '1948b5c4eacd0ca8d7f4e7f05c83d0c92425abea',
+  },
+  'bitcoincash:prseh0a4aejjcewhc665wjqhppgwrz2lw5txgn666a': {
+    'type': 1,
+    'addressType': 'P2SH',
+    'programLength': 20,
+    'programBytes': 'e19bbfb5ee652c65d7c6b54748170850e1895f75',
+  },
+  'bitcoincash:rrseh0a4aejjcewhc665wjqhppgwrz2lw5vvmd5u9w': {
+    'type': 3,
+    'addressType': 'Token-Aware P2SH',
+    'programLength': 20,
+    'programBytes': 'e19bbfb5ee652c65d7c6b54748170850e1895f75',
+  },
+  'bitcoincash:pzltaslh7xnrsxeqm7qtvh0v53n3gfk0v5wwf6d7j4': {
+    'type': 1,
+    'addressType': 'P2SH',
+    'programLength': 20,
+    'programBytes': 'bebec3f7f1a6381b20df80b65deca4671426cf65',
+  },
+  'bitcoincash:rzltaslh7xnrsxeqm7qtvh0v53n3gfk0v5fy6yrcdx': {
+    'type': 3,
+    'addressType': 'Token-Aware P2SH',
+    'programLength': 20,
+    'programBytes': 'bebec3f7f1a6381b20df80b65deca4671426cf65',
+  },
+  'bitcoincash:pvqqqqqqqqqqqqqqqqqqqqqqzg69v7ysqqqqqqqqqqqqqqqqqqqqqpkp7fqn0': {
+    'type': 1,
+    'addressType': 'P2SH',
+    'programLength': 32,
+    'programBytes':
+        '0000000000000000000000000000123456789000000000000000000000000000',
+  },
+  'bitcoincash:rvqqqqqqqqqqqqqqqqqqqqqqzg69v7ysqqqqqqqqqqqqqqqqqqqqqn9alsp2y': {
+    'type': 3,
+    'addressType': 'Token-Aware P2SH',
+    'programLength': 32,
+    'programBytes':
+        '0000000000000000000000000000123456789000000000000000000000000000',
+  },
+  'bitcoincash:pdzyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3jh2p5nn': {
+    'type': 1,
+    'addressType': 'P2SH',
+    'programLength': 32,
+    'programBytes':
+        '4444444444444444444444444444444444444444444444444444444444444444',
   },
 };
 
 void main() {
-  test("decode encode address", () {
+  test('decode encode address', () {
     for (final i in bitcoinCashAddresses.keys.toList()) {
       final info = Map.from(bitcoinCashAddresses[i]!);
-      const BitcoinCashNetwork network = BitcoinCashNetwork.mainnet;
+      const network = BitcoinCashNetwork.mainnet;
       final address =
           BitcoinCashAddress(i, network: network, validateNetworkPrefix: false);
-      expect(address.baseAddress.addressProgram, info["programBytes"]);
-      final hrp = i.substring(0, i.indexOf(":"));
+      expect(address.baseAddress.addressProgram, info['programBytes']);
+      final hrp = i.substring(0, i.indexOf(':'));
       expect(i, address.toAddress(network, hrp));
     }
   });
diff --git a/test/bitcoin_cash_token_encoding_test.dart b/test/bitcoin_cash_token_encoding_test.dart
index 0e15346..cf8ca80 100644
--- a/test/bitcoin_cash_token_encoding_test.dart
+++ b/test/bitcoin_cash_token_encoding_test.dart
@@ -4,772 +4,771 @@ import 'package:test/test.dart';
 
 final List<Map<String, dynamic>> _validTestVector = [
   {
-    "prefix":
-        "efaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1001",
-    "data": {
-      "amount": "1",
-      "category":
-          "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+    'prefix':
+        'efaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1001',
+    'data': {
+      'amount': '1',
+      'category':
+          'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
     }
   },
   {
-    "prefix":
-        "ef21430000000000000000000000000000000000000000000000000000000034121001",
-    "data": {
-      "amount": "1",
-      "category":
-          "1234000000000000000000000000000000000000000000000000000000004321"
+    'prefix':
+        'ef21430000000000000000000000000000000000000000000000000000000034121001',
+    'data': {
+      'amount': '1',
+      'category':
+          '1234000000000000000000000000000000000000000000000000000000004321'
     }
   },
   {
-    "prefix":
-        "ef21436587090000000000000000000000000000000000000000000090785634121001",
-    "data": {
-      "amount": "1",
-      "category":
-          "1234567890000000000000000000000000000000000000000000000987654321"
+    'prefix':
+        'ef21436587090000000000000000000000000000000000000000000090785634121001',
+    'data': {
+      'amount': '1',
+      'category':
+          '1234567890000000000000000000000000000000000000000000000987654321'
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb1001",
-    "data": {
-      "amount": "1",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb1001',
+    'data': {
+      'amount': '1',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb10fc",
-    "data": {
-      "amount": "252",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb10fc',
+    'data': {
+      'amount': '252',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb10fdfd00",
-    "data": {
-      "amount": "253",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb10fdfd00',
+    'data': {
+      'amount': '253',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb10fdffff",
-    "data": {
-      "amount": "65535",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb10fdffff',
+    'data': {
+      'amount': '65535',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb10fe00000100",
-    "data": {
-      "amount": "65536",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb10fe00000100',
+    'data': {
+      'amount': '65536',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb10fe01000100",
-    "data": {
-      "amount": "65537",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb10fe01000100',
+    'data': {
+      'amount': '65537',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb10feffffffff",
-    "data": {
-      "amount": "4294967295",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb10feffffffff',
+    'data': {
+      'amount': '4294967295',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb10ff0000000001000000",
-    "data": {
-      "amount": "4294967296",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb10ff0000000001000000',
+    'data': {
+      'amount': '4294967296',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb10ff0100000001000000",
-    "data": {
-      "amount": "4294967297",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb10ff0100000001000000',
+    'data': {
+      'amount': '4294967297',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb10ffffffffffffffff7f",
-    "data": {
-      "amount": "9223372036854775807",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb10ffffffffffffffff7f',
+    'data': {
+      'amount': '9223372036854775807',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb20",
-    "data": {
-      "amount": "0",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "", "capability": "none"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb20',
+    'data': {
+      'amount': '0',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': '', 'capability': 'none'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb3001",
-    "data": {
-      "amount": "1",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "", "capability": "none"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb3001',
+    'data': {
+      'amount': '1',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': '', 'capability': 'none'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb30fc",
-    "data": {
-      "amount": "252",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "", "capability": "none"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb30fc',
+    'data': {
+      'amount': '252',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': '', 'capability': 'none'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb30fdfd00",
-    "data": {
-      "amount": "253",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "", "capability": "none"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb30fdfd00',
+    'data': {
+      'amount': '253',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': '', 'capability': 'none'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb30fdffff",
-    "data": {
-      "amount": "65535",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "", "capability": "none"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb30fdffff',
+    'data': {
+      'amount': '65535',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': '', 'capability': 'none'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb30fe00000100",
-    "data": {
-      "amount": "65536",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "", "capability": "none"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb30fe00000100',
+    'data': {
+      'amount': '65536',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': '', 'capability': 'none'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb30feffffffff",
-    "data": {
-      "amount": "4294967295",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "", "capability": "none"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb30feffffffff',
+    'data': {
+      'amount': '4294967295',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': '', 'capability': 'none'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb30ff0000000001000000",
-    "data": {
-      "amount": "4294967296",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "", "capability": "none"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb30ff0000000001000000',
+    'data': {
+      'amount': '4294967296',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': '', 'capability': 'none'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb30ffffffffffffffff7f",
-    "data": {
-      "amount": "9223372036854775807",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "", "capability": "none"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb30ffffffffffffffff7f',
+    'data': {
+      'amount': '9223372036854775807',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': '', 'capability': 'none'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb6001cc",
-    "data": {
-      "amount": "0",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "cc", "capability": "none"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb6001cc',
+    'data': {
+      'amount': '0',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': 'cc', 'capability': 'none'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb60051234567890",
-    "data": {
-      "amount": "0",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "1234567890", "capability": "none"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb60051234567890',
+    'data': {
+      'amount': '0',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': '1234567890', 'capability': 'none'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7001cc01",
-    "data": {
-      "amount": "1",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "cc", "capability": "none"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7001cc01',
+    'data': {
+      'amount': '1',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': 'cc', 'capability': 'none'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7001ccfc",
-    "data": {
-      "amount": "252",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "cc", "capability": "none"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7001ccfc',
+    'data': {
+      'amount': '252',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': 'cc', 'capability': 'none'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7001ccfdfd00",
-    "data": {
-      "amount": "253",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "cc", "capability": "none"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7001ccfdfd00',
+    'data': {
+      'amount': '253',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': 'cc', 'capability': 'none'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7001ccfdffff",
-    "data": {
-      "amount": "65535",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "cc", "capability": "none"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7001ccfdffff',
+    'data': {
+      'amount': '65535',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': 'cc', 'capability': 'none'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7001ccfe00000100",
-    "data": {
-      "amount": "65536",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "cc", "capability": "none"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7001ccfe00000100',
+    'data': {
+      'amount': '65536',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': 'cc', 'capability': 'none'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7001ccfeffffffff",
-    "data": {
-      "amount": "4294967295",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "cc", "capability": "none"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7001ccfeffffffff',
+    'data': {
+      'amount': '4294967295',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': 'cc', 'capability': 'none'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7001ccff0000000001000000",
-    "data": {
-      "amount": "4294967296",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "cc", "capability": "none"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7001ccff0000000001000000',
+    'data': {
+      'amount': '4294967296',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': 'cc', 'capability': 'none'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7001ccffffffffffffffff7f",
-    "data": {
-      "amount": "9223372036854775807",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "cc", "capability": "none"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7001ccffffffffffffffff7f',
+    'data': {
+      'amount': '9223372036854775807',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': 'cc', 'capability': 'none'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb700accccccccccccccccccccfdffff",
-    "data": {
-      "amount": "65535",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "cccccccccccccccccccc", "capability": "none"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb700accccccccccccccccccccfdffff',
+    'data': {
+      'amount': '65535',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': 'cccccccccccccccccccc', 'capability': 'none'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7028cccccccccccccccccccccccccccccc"
-            "ccccccccccccccccccccccccccccccccccccccccccccccccccfe00000100",
-    "data": {
-      "amount": "65536",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {
-        "commitment":
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc",
-        "capability": "none"
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7028cccccccccccccccccccccccccccccc'
+            'ccccccccccccccccccccccccccccccccccccccccccccccccccfe00000100',
+    'data': {
+      'amount': '65536',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {
+        'commitment':
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc',
+        'capability': 'none'
       }
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7029cccccccccccccccccccccccccccccc"
-            "ccccccccccccccccccccccccccccccccccccccccccccccccccccfe00000100",
-    "data": {
-      "amount": "65536",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {
-        "commitment":
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc",
-        "capability": "none"
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7029cccccccccccccccccccccccccccccc'
+            'ccccccccccccccccccccccccccccccccccccccccccccccccccccfe00000100',
+    'data': {
+      'amount': '65536',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {
+        'commitment':
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc',
+        'capability': 'none'
       }
     }
   },
   {
-    "prefix": "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb60fdfd00cccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc",
-    "data": {
-      "amount": "0",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {
-        "commitment": "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc",
-        "capability": "none"
+    'prefix': 'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb60fdfd00cccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc',
+    'data': {
+      'amount': '0',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {
+        'commitment': 'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc',
+        'capability': 'none'
       }
     }
   },
   {
-    "prefix": "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb70fdfd00cccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccfe00000100",
-    "data": {
-      "amount": "65536",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {
-        "commitment": "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc",
-        "capability": "none"
+    'prefix': 'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb70fdfd00cccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccfe00000100',
+    'data': {
+      'amount': '65536',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {
+        'commitment': 'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc',
+        'capability': 'none'
       }
     }
   },
   {
-    "prefix": "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb70fde903cccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccfe00000100",
-    "data": {
-      "amount": "65536",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {
-        "commitment": "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc",
-        "capability": "none"
+    'prefix': 'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb70fde903cccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccfe00000100',
+    'data': {
+      'amount': '65536',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {
+        'commitment': 'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc',
+        'capability': 'none'
       }
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb21",
-    "data": {
-      "amount": "0",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "", "capability": "mutable"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb21',
+    'data': {
+      'amount': '0',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': '', 'capability': 'mutable'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb31feffffffff",
-    "data": {
-      "amount": "4294967295",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "", "capability": "mutable"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb31feffffffff',
+    'data': {
+      'amount': '4294967295',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': '', 'capability': 'mutable'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb6101cc",
-    "data": {
-      "amount": "0",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "cc", "capability": "mutable"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb6101cc',
+    'data': {
+      'amount': '0',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': 'cc', 'capability': 'mutable'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7101ccff0000000001000000",
-    "data": {
-      "amount": "4294967296",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "cc", "capability": "mutable"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7101ccff0000000001000000',
+    'data': {
+      'amount': '4294967296',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': 'cc', 'capability': 'mutable'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7102ccccffffffffffffffff7f",
-    "data": {
-      "amount": "9223372036854775807",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "cccc", "capability": "mutable"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7102ccccffffffffffffffff7f',
+    'data': {
+      'amount': '9223372036854775807',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': 'cccc', 'capability': 'mutable'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb710acccccccccccccccccccc01",
-    "data": {
-      "amount": "1",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "cccccccccccccccccccc", "capability": "mutable"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb710acccccccccccccccccccc01',
+    'data': {
+      'amount': '1',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': 'cccccccccccccccccccc', 'capability': 'mutable'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7128cccccccccccccccccccccccccccccc"
-            "ccccccccccccccccccccccccccccccccccccccccccccccccccfc",
-    "data": {
-      "amount": "252",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {
-        "commitment":
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc",
-        "capability": "mutable"
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7128cccccccccccccccccccccccccccccc'
+            'ccccccccccccccccccccccccccccccccccccccccccccccccccfc',
+    'data': {
+      'amount': '252',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {
+        'commitment':
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc',
+        'capability': 'mutable'
       }
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7129cccccccccccccccccccccccccccccc"
-            "ccccccccccccccccccccccccccccccccccccccccccccccccccccfc",
-    "data": {
-      "amount": "252",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {
-        "commitment":
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc",
-        "capability": "mutable"
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7129cccccccccccccccccccccccccccccc'
+            'ccccccccccccccccccccccccccccccccccccccccccccccccccccfc',
+    'data': {
+      'amount': '252',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {
+        'commitment':
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc',
+        'capability': 'mutable'
       }
     }
   },
   {
-    "prefix": "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb71fdfd00cccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc01",
-    "data": {
-      "amount": "1",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {
-        "commitment": "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc",
-        "capability": "mutable"
+    'prefix': 'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb71fdfd00cccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc01',
+    'data': {
+      'amount': '1',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {
+        'commitment': 'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc',
+        'capability': 'mutable'
       }
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb22",
-    "data": {
-      "amount": "0",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "", "capability": "minting"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb22',
+    'data': {
+      'amount': '0',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': '', 'capability': 'minting'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb3201",
-    "data": {
-      "amount": "1",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "", "capability": "minting"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb3201',
+    'data': {
+      'amount': '1',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': '', 'capability': 'minting'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb32fdfd00",
-    "data": {
-      "amount": "253",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "", "capability": "minting"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb32fdfd00',
+    'data': {
+      'amount': '253',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': '', 'capability': 'minting'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb32fe00000100",
-    "data": {
-      "amount": "65536",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "", "capability": "minting"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb32fe00000100',
+    'data': {
+      'amount': '65536',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': '', 'capability': 'minting'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb32ff0000000001000000",
-    "data": {
-      "amount": "4294967296",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "", "capability": "minting"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb32ff0000000001000000',
+    'data': {
+      'amount': '4294967296',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': '', 'capability': 'minting'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb32ffffffffffffffff7f",
-    "data": {
-      "amount": "9223372036854775807",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "", "capability": "minting"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb32ffffffffffffffff7f',
+    'data': {
+      'amount': '9223372036854775807',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': '', 'capability': 'minting'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb6201cc",
-    "data": {
-      "amount": "0",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "cc", "capability": "minting"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb6201cc',
+    'data': {
+      'amount': '0',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': 'cc', 'capability': 'minting'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb6229cccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccc",
-    "data": {
-      "amount": "0",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {
-        "commitment":
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc",
-        "capability": "minting"
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb6229cccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccc',
+    'data': {
+      'amount': '0',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {
+        'commitment':
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc',
+        'capability': 'minting'
       }
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7201ccfdffff",
-    "data": {
-      "amount": "65535",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "cc", "capability": "minting"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7201ccfdffff',
+    'data': {
+      'amount': '65535',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': 'cc', 'capability': 'minting'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7202ccccfe00000100",
-    "data": {
-      "amount": "65536",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "cccc", "capability": "minting"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7202ccccfe00000100',
+    'data': {
+      'amount': '65536',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': 'cccc', 'capability': 'minting'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb720accccccccccccccccccccff01000000"
-            "01000000",
-    "data": {
-      "amount": "4294967297",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "cccccccccccccccccccc", "capability": "minting"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb720accccccccccccccccccccff01000000'
+            '01000000',
+    'data': {
+      'amount': '4294967297',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': 'cccccccccccccccccccc', 'capability': 'minting'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7228cccccccccccccccccccccccccccccc"
-            "ccccccccccccccccccccccccccccccccccccccccccccccccccffffffffffffffff7f",
-    "data": {
-      "amount": "9223372036854775807",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {
-        "commitment":
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc",
-        "capability": "minting"
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7228cccccccccccccccccccccccccccccc'
+            'ccccccccccccccccccccccccccccccccccccccccccccccccccffffffffffffffff7f',
+    'data': {
+      'amount': '9223372036854775807',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {
+        'commitment':
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc',
+        'capability': 'minting'
       }
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7229cccccccccccccccccccccccccccccc"
-            "ccccccccccccccccccccccccccccccccccccccccccccccccccccffffffffffffffff7f",
-    "data": {
-      "amount": "9223372036854775807",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {
-        "commitment":
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc",
-        "capability": "minting"
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7229cccccccccccccccccccccccccccccc'
+            'ccccccccccccccccccccccccccccccccccccccccccccccccccccffffffffffffffff7f',
+    'data': {
+      'amount': '9223372036854775807',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {
+        'commitment':
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc',
+        'capability': 'minting'
       }
     }
   },
   {
-    "prefix": "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb62fdfd00cccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc",
-    "data": {
-      "amount": "0",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {
-        "commitment": "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc",
-        "capability": "minting"
+    'prefix': 'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb62fdfd00cccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc',
+    'data': {
+      'amount': '0',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {
+        'commitment': 'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc',
+        'capability': 'minting'
       }
     }
   },
   {
-    "prefix": "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb72fdfd00cccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccfe00000100",
-    "data": {
-      "amount": "65536",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {
-        "commitment": "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc",
-        "capability": "minting"
+    'prefix': 'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb72fdfd00cccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccfe00000100',
+    'data': {
+      'amount': '65536',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {
+        'commitment': 'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc',
+        'capability': 'minting'
       }
     }
   }
 ];
 void main() {
-  test("cash token encoding", () {
-    for (int c = 0; c < _validTestVector.length; c++) {
+  test('cash token encoding', () {
+    for (var c = 0; c < _validTestVector.length; c++) {
       final i = _validTestVector[c];
       final appendBytes = QuickCrypto.generateRandom(c * 2);
-      final tokenBytes = BytesUtils.fromHexString(i["prefix"]!);
-      final List<int> combine = [...tokenBytes, ...appendBytes];
+      final tokenBytes = BytesUtils.fromHexString(i['prefix']!);
+      final combine = <int>[...tokenBytes, ...appendBytes];
       final decode = CashToken.fromRaw(combine);
-      final data = Map<String, dynamic>.from(i["data"]);
-      final amount = BigInt.parse(data["amount"]);
+      final data = Map<String, dynamic>.from(i['data']);
+      final amount = BigInt.parse(data['amount']);
       final nft =
-          data["nft"] == null ? null : Map<String, dynamic>.from(data["nft"]);
+          data['nft'] == null ? null : Map<String, dynamic>.from(data['nft']);
       final capability =
-          nft == null ? null : CashTokenCapability.fromName(nft["capability"]);
-      final String commitment =
-          BytesUtils.toHexString(decode.item1!.commitment);
+          nft == null ? null : CashTokenCapability.fromName(nft['capability']);
+      final commitment = BytesUtils.toHexString(decode.item1!.commitment);
       expect(capability, decode.item1!.capability);
-      expect(decode.item1?.toHex(), i["prefix"]!);
-      expect(commitment, (nft?["commitment"] ?? ""));
+      expect(decode.item1?.toHex(), i['prefix']!);
+      expect(commitment, (nft?['commitment'] ?? ''));
       expect(amount, decode.item1!.amount);
       expect(combine.sublist(decode.item2), appendBytes);
     }
diff --git a/test/deserialize_test.dart b/test/deserialize_test.dart
index 0d8d4bb..e14d009 100644
--- a/test/deserialize_test.dart
+++ b/test/deserialize_test.dart
@@ -6,15 +6,15 @@ void main() {
 }
 
 void _decodeTx() {
-  test("decode transaction", () {
+  test('decode transaction', () {
     const data =
-        "020000000186389e3142effb82e00d38abc93ef856e543221ca6dd7d916760e0cda49f059300000000fd57030047304402204335c0185a9277c531315d0cd6c83bbe8d60d39f1b93864d9a4e67c8cccb400802207813732324a0cccf3989b4c56554bf06eaeea9175557525532926de939cfac3c414730440220515367fed3284a5469489c27fc7ea1915e7a07a939fb56d2188e5a27813b87690220578a491532d4bc84756fb489c2a5093b9f6884cfe852f2b469a89c7e35482ac0414730440220594f4cf6da2c88e430d1cc00d3b9b47b2936a9c4121be1c0e2e3b634e060c58202202c340707cc66aa27bd8fe40d9993751a0efa805b021f861fad460343b2826d4841473044022001c8e211117d20ecd3b3d7359e96485015303b4f55ba3039e40f1e035d867c2f02203c43c3e3f48a8215cb99a22b95d4d99defed9e385dbbacc4501c9c6fbc7db50141473044022000e95343e11b6765aa823c58c4fd1b78495b0a29f3fb428886ce858850827e6d02206bb967529a3289397e7c0482c063d872bc839306940b9e36e35457d840f2bfef4147304402200475c3a062644cf26269c91524cece25ff95cde8cbf52c7f180c1f7e45092fcf02207c4f4449aa69de7e8ae5825375825f5175462766e17bd1d7f96b5096f2d6ae004147304402201339113915d56209270d3be2c91ca0c04392db726a4909026924cce6236444310220476c5c6a8cdb6f973b62dad12b95a651269ad74cf767d5100d88ea98309ff9c4414730440220628dcdc3b1ed6e85d6df25c976fa09488b73e1d81f4ef80d02fcbfd852fd88a00220264ba1fc4fc6d92246f3a3511f76871954aee360c7e2e407dc317736fe910df6414d1301582102b509e03e5773ad6864d037eb1c8f9e9c39698bc5b59272d7f2156da2070d810f210369cc1b70ded5caf25b42b59ae13bdbee386e5dcaa0612a2a258dec02364040682103d850292f0e06a8e64c569a23cb310d192d4ad1b145c7050c6cb23bd9e8a4310421024fa5bd6af09db2740c39ec3e795eab200f091029b65d9013f7d3b52eb1cbc6e0210205a9f0be6d7f598c9a3b06cca6223705b49a43f5de5401eef93ee8c48ddf34b42103aaf256cb145aef9bea0bad969ca498108da7a3ad6da7cdeadcbcade2aa64fcea2103cb2ce8e4c87f7a6184abb30bf21cfb987634959f67bf20336d4208f4d7d62ac52103515a9b03688488850dd184e9229cb43634c1a39e2ccc5b8f2cf2c0a8cebb92e858aeffffffff0284030000000000001976a914e54b088d7f501604b1d85ed9d30f46b5db721ac288acc71c00000000000017a91492b98234f58410b0cea227d6e7e60ec08aa8547e8700000000";
+        '020000000186389e3142effb82e00d38abc93ef856e543221ca6dd7d916760e0cda49f059300000000fd57030047304402204335c0185a9277c531315d0cd6c83bbe8d60d39f1b93864d9a4e67c8cccb400802207813732324a0cccf3989b4c56554bf06eaeea9175557525532926de939cfac3c414730440220515367fed3284a5469489c27fc7ea1915e7a07a939fb56d2188e5a27813b87690220578a491532d4bc84756fb489c2a5093b9f6884cfe852f2b469a89c7e35482ac0414730440220594f4cf6da2c88e430d1cc00d3b9b47b2936a9c4121be1c0e2e3b634e060c58202202c340707cc66aa27bd8fe40d9993751a0efa805b021f861fad460343b2826d4841473044022001c8e211117d20ecd3b3d7359e96485015303b4f55ba3039e40f1e035d867c2f02203c43c3e3f48a8215cb99a22b95d4d99defed9e385dbbacc4501c9c6fbc7db50141473044022000e95343e11b6765aa823c58c4fd1b78495b0a29f3fb428886ce858850827e6d02206bb967529a3289397e7c0482c063d872bc839306940b9e36e35457d840f2bfef4147304402200475c3a062644cf26269c91524cece25ff95cde8cbf52c7f180c1f7e45092fcf02207c4f4449aa69de7e8ae5825375825f5175462766e17bd1d7f96b5096f2d6ae004147304402201339113915d56209270d3be2c91ca0c04392db726a4909026924cce6236444310220476c5c6a8cdb6f973b62dad12b95a651269ad74cf767d5100d88ea98309ff9c4414730440220628dcdc3b1ed6e85d6df25c976fa09488b73e1d81f4ef80d02fcbfd852fd88a00220264ba1fc4fc6d92246f3a3511f76871954aee360c7e2e407dc317736fe910df6414d1301582102b509e03e5773ad6864d037eb1c8f9e9c39698bc5b59272d7f2156da2070d810f210369cc1b70ded5caf25b42b59ae13bdbee386e5dcaa0612a2a258dec02364040682103d850292f0e06a8e64c569a23cb310d192d4ad1b145c7050c6cb23bd9e8a4310421024fa5bd6af09db2740c39ec3e795eab200f091029b65d9013f7d3b52eb1cbc6e0210205a9f0be6d7f598c9a3b06cca6223705b49a43f5de5401eef93ee8c48ddf34b42103aaf256cb145aef9bea0bad969ca498108da7a3ad6da7cdeadcbcade2aa64fcea2103cb2ce8e4c87f7a6184abb30bf21cfb987634959f67bf20336d4208f4d7d62ac52103515a9b03688488850dd184e9229cb43634c1a39e2ccc5b8f2cf2c0a8cebb92e858aeffffffff0284030000000000001976a914e54b088d7f501604b1d85ed9d30f46b5db721ac288acc71c00000000000017a91492b98234f58410b0cea227d6e7e60ec08aa8547e8700000000';
     final tx = BtcTransaction.fromRaw(data);
     expect(tx.serialize(), data);
   });
-  test("decode transaction 2", () {
+  test('decode transaction 2', () {
     const data =
-        "0200000000010b78c2ebf52b849090b70ba2bb3ec4a4447037ab41e56781f44f7cae3d82d356470000000000ffffffff78c2ebf52b849090b70ba2bb3ec4a4447037ab41e56781f44f7cae3d82d356470100000000ffffffff78c2ebf52b849090b70ba2bb3ec4a4447037ab41e56781f44f7cae3d82d3564702000000484730440220759a2beb31cbc0bfb30ad3cff3f3c84869b6549984ac8f5413bae19b0fed3aed022036718ddc6bbd7c7921d922fe90e7786ef67818208e268507dea99c782a578e1301ffffffff78c2ebf52b849090b70ba2bb3ec4a4447037ab41e56781f44f7cae3d82d356470300000000ffffffff78c2ebf52b849090b70ba2bb3ec4a4447037ab41e56781f44f7cae3d82d35647040000008a47304402202846a5ca5766a4ef0246e59cf11bfd0a182b5ce4fe366e43480df48efe92465f022005a47fdbefa0aa971d8804606362866bcf6d0c2bf8e4ecd0c31d04e7e28d4b7e0141042f1b310f4c065331bc0d79ba4661bb9822d67d7c4a1b0a1892e1fd0cd23aa68d2518d05511d46fc76b5bd2f94625b811df220f825786208cc5b5cca23de230ccffffffff78c2ebf52b849090b70ba2bb3ec4a4447037ab41e56781f44f7cae3d82d3564705000000a447304402203cdbff5392666f0d5bd364c9b83053e3b7508727102cba2f2110136359fd717402205069298f860fbd84f9b60466535c9ca226d92eaf9bf298c97df7f20b758248590141041a7a569e91dbf60581509c7fc946d1003b60c7dee85299538db6353538d59574b4e89d60c7d584d084632d296f125f165b4df8e061a49daeba51d36133d03e1a1976a914c880e94561d70cb61f2108deff2f1a6c10fff6a488acffffffff78c2ebf52b849090b70ba2bb3ec4a4447037ab41e56781f44f7cae3d82d3564706000000a447304402202e5f50e724c564dd1dde5cbad5ed87a803beb1b3f0a1401f3d5ee4a7e1ec9ed2022005efbc073f4862625923c68ac15a830b00f01a7e40fdebe7979528782a8c64180141041a7a569e91dbf60581509c7fc946d1003b60c7dee85299538db6353538d59574b4e89d60c7d584d084632d296f125f165b4df8e061a49daeba51d36133d03e1a1976a914c880e94561d70cb61f2108deff2f1a6c10fff6a488acffffffff78c2ebf52b849090b70ba2bb3ec4a4447037ab41e56781f44f7cae3d82d3564707000000232200209e7470b3013d2e9585f2009241f223beaefc8067f82a2a6f2dd87d74cb5969dbffffffff78c2ebf52b849090b70ba2bb3ec4a4447037ab41e56781f44f7cae3d82d35647080000008c473044022013608955698454f9eff9708cb98f2ff97d3a4d4ab9f8a80996d57a861ae712970220347ad5bca2e6773fb1fc817cd12bac451cfedae8f024e67e8fac905eaa2601370143410499c2aa85d2b21a62f396907a802a58e521dafd5bddaccbd72786eea189bc4dc9c40c3728b587c47395ce41a2afe84ee70016fafa39d3b54e66fc1f11aefda704acffffffff78c2ebf52b849090b70ba2bb3ec4a4447037ab41e56781f44f7cae3d82d3564709000000fd410400473044022062c412f612e08ed3cf5ce5aba3c8e556849a2ffdded9814525393bd4b61c76890220638557c4426a83012b0cf31fccd395c9a063f01942dcdadf5c86b174fceaffbe0147304402206bec40f5bb548e6f0e2c8b6ffe24d1173f60b1ebb0a870cef941e8499d34c9ae02204206d61ecdfd2aa0a300f91dafd9e7399f22bee9298d56d972e0d58e366977fe01473044022050f449a88e32850924a1d19ab9b82f676d2859ec38765d13b0a08902eb8bb95b02203c1bbc81ad3af940470cd100e4bf59bd92570d0dc8b76bf6196a90c8a528520a0147304402205e8e6937d25e139762ca57d4e4777e28bbd730cde2cd72d16b7f73eca04df84d022011141ef7b64b3b10ae9fc1c78c73453c1855ff997c05b2aed56ee24ee53a789f01473044022046c8000f5c97f5e8b388e6294db4ebd8cb45f4c58f844003ed571ee8b5965a6e02202f2880e91746bcf240a6cf1945de81016f6c46cb95265e67289611e1eaaffbd00147304402204610acecbda4763c3d7bcf3e656a1cdb1f0e6286dff755b36640c52d5153011b0220785bb66ff9e36d9de663379d520858d340c66845c3f9c7b4bfd4843bf6c2fc0f01473044022007c91bb30021f4b2d84ca5cc18458aeb6ee96d9d5881d09a37af845524d3ff10022068ffdca9828bc4648cdb954bd76436b373a3da07c376452325e52a01075e7b2201473044022007c91bb30021f4b2d84ca5cc18458aeb6ee96d9d5881d09a37af845524d3ff10022068ffdca9828bc4648cdb954bd76436b373a3da07c376452325e52a01075e7b2201473044022007c91bb30021f4b2d84ca5cc18458aeb6ee96d9d5881d09a37af845524d3ff10022068ffdca9828bc4648cdb954bd76436b373a3da07c376452325e52a01075e7b22014db5015941040f0fb9a244ad31a369ee02b7abfbbb0bfa3812b9a39ed93346d03d67d412d1777965c382f55222a9aed59cb8affc64bb5381f065eab9ef3baa57f2f0ac6bfae921022f1b310f4c065331bc0d79ba4661bb9822d67d7c4a1b0a1892e1fd0cd23aa68d210299c2aa85d2b21a62f396907a802a58e521dafd5bddaccbd72786eea189bc4dc921021a7a569e91dbf60581509c7fc946d1003b60c7dee85299538db6353538d595742103a92c9b7cac68758de5783ed8e5123598e4ad137091e42987d3bad8a08e35bf3d21034f355bdcb7cc0af728ef3cceb9615d90684bb5b2ca5f859ab0f0b704075871aa41046360e856310ce5d294e8be33fc807077dc56ac80d95d9cd4ddbd21325eff73f7eb1c2784a65901538479361e94c0a2597973adef0836a6a7eddf50b7997c88a341046360e856310ce5d294e8be33fc807077dc56ac80d95d9cd4ddbd21325eff73f7eb1c2784a65901538479361e94c0a2597973adef0836a6a7eddf50b7997c88a341046360e856310ce5d294e8be33fc807077dc56ac80d95d9cd4ddbd21325eff73f7eb1c2784a65901538479361e94c0a2597973adef0836a6a7eddf50b7997c88a359aeffffffff78c2ebf52b849090b70ba2bb3ec4a4447037ab41e56781f44f7cae3d82d356470a000000484730440220028b766844f8d4e5c28b2464605dfa79435c9203481976db468517ca96674b320220761f5687ce7d6067ba3cbe652e11b8495ac274b5ce0e7f1b8f59b2c34f007bf701ffffffff0be803000000000000160014b4bd9b543a615fe9b73ced34a9a38572ae18a395e8030000000000002200209e7470b3013d2e9585f2009241f223beaefc8067f82a2a6f2dd87d74cb5969dbe8030000000000004341040f0fb9a244ad31a369ee02b7abfbbb0bfa3812b9a39ed93346d03d67d412d1777965c382f55222a9aed59cb8affc64bb5381f065eab9ef3baa57f2f0ac6bfae9ace80300000000000022512039d1075e641ac7deda75bfbfa28aa5c65d7f39b1315e024f62e1064b1ec71d3ee8030000000000001976a914f9c4fccde68b163563e0d60842d1accd19c1207b88ace80300000000000017a91454db4f9a5c6f2de3110925e1f8cf42aeab807e6687e80300000000000017a91454db4f9a5c6f2de3110925e1f8cf42aeab807e6687e80300000000000017a914baf6af81b991265c3e3223f4649cf1b21afa73b987e80300000000000017a914c95d7440311017931c7adb20ab103e116e17ccbb87e80300000000000017a914d6215d5c57d6d65ae73eb0d8fe2ad7cfa07d441f879ba80000000000004341040f0fb9a244ad31a369ee02b7abfbbb0bfa3812b9a39ed93346d03d67d412d1777965c382f55222a9aed59cb8affc64bb5381f065eab9ef3baa57f2f0ac6bfae9ac02473044022044cd5a0eca8585d1dfb183dc12b37bfb41308244540d6a6ba449b6663f85f5e402206221b9980ecc54538e249a1c01972c6198c150945d12b6d124ebe523bd7bd2c30121021a7a569e91dbf60581509c7fc946d1003b60c7dee85299538db6353538d595740300473044022010b9f2310bc25214db7508df0107c8683c7c2f3eabb60aad2c35bed84d516159022059a643ad81a966716db06a2d707fefb234bffcac975ece1bc4b900239b50b7e501255121031d16453b3ab3132acb0a5bc16cc49690d819a585267a15cd5a064e2a0ad4059951ae000140daf8270bffc7a39c45114f5b180f5f82bc920803f3a612a4b517ce609e7e4ef30d8939102af08c9407f0cc4f9c63ffdda9914634dc59b1786d6d6b9d1b8a31960000000300473044022058f436dd9dc7d2966cd44a52989c972fb67e017d02e08723293fcfc4a3da3bff02200f8ff1bb6a95709ed5cfc47e9f567cba1fca8c9c10cd2db4f348152b3420361001255121031d16453b3ab3132acb0a5bc16cc49690d819a585267a15cd5a064e2a0ad4059951ae00000000000000";
+        '0200000000010b78c2ebf52b849090b70ba2bb3ec4a4447037ab41e56781f44f7cae3d82d356470000000000ffffffff78c2ebf52b849090b70ba2bb3ec4a4447037ab41e56781f44f7cae3d82d356470100000000ffffffff78c2ebf52b849090b70ba2bb3ec4a4447037ab41e56781f44f7cae3d82d3564702000000484730440220759a2beb31cbc0bfb30ad3cff3f3c84869b6549984ac8f5413bae19b0fed3aed022036718ddc6bbd7c7921d922fe90e7786ef67818208e268507dea99c782a578e1301ffffffff78c2ebf52b849090b70ba2bb3ec4a4447037ab41e56781f44f7cae3d82d356470300000000ffffffff78c2ebf52b849090b70ba2bb3ec4a4447037ab41e56781f44f7cae3d82d35647040000008a47304402202846a5ca5766a4ef0246e59cf11bfd0a182b5ce4fe366e43480df48efe92465f022005a47fdbefa0aa971d8804606362866bcf6d0c2bf8e4ecd0c31d04e7e28d4b7e0141042f1b310f4c065331bc0d79ba4661bb9822d67d7c4a1b0a1892e1fd0cd23aa68d2518d05511d46fc76b5bd2f94625b811df220f825786208cc5b5cca23de230ccffffffff78c2ebf52b849090b70ba2bb3ec4a4447037ab41e56781f44f7cae3d82d3564705000000a447304402203cdbff5392666f0d5bd364c9b83053e3b7508727102cba2f2110136359fd717402205069298f860fbd84f9b60466535c9ca226d92eaf9bf298c97df7f20b758248590141041a7a569e91dbf60581509c7fc946d1003b60c7dee85299538db6353538d59574b4e89d60c7d584d084632d296f125f165b4df8e061a49daeba51d36133d03e1a1976a914c880e94561d70cb61f2108deff2f1a6c10fff6a488acffffffff78c2ebf52b849090b70ba2bb3ec4a4447037ab41e56781f44f7cae3d82d3564706000000a447304402202e5f50e724c564dd1dde5cbad5ed87a803beb1b3f0a1401f3d5ee4a7e1ec9ed2022005efbc073f4862625923c68ac15a830b00f01a7e40fdebe7979528782a8c64180141041a7a569e91dbf60581509c7fc946d1003b60c7dee85299538db6353538d59574b4e89d60c7d584d084632d296f125f165b4df8e061a49daeba51d36133d03e1a1976a914c880e94561d70cb61f2108deff2f1a6c10fff6a488acffffffff78c2ebf52b849090b70ba2bb3ec4a4447037ab41e56781f44f7cae3d82d3564707000000232200209e7470b3013d2e9585f2009241f223beaefc8067f82a2a6f2dd87d74cb5969dbffffffff78c2ebf52b849090b70ba2bb3ec4a4447037ab41e56781f44f7cae3d82d35647080000008c473044022013608955698454f9eff9708cb98f2ff97d3a4d4ab9f8a80996d57a861ae712970220347ad5bca2e6773fb1fc817cd12bac451cfedae8f024e67e8fac905eaa2601370143410499c2aa85d2b21a62f396907a802a58e521dafd5bddaccbd72786eea189bc4dc9c40c3728b587c47395ce41a2afe84ee70016fafa39d3b54e66fc1f11aefda704acffffffff78c2ebf52b849090b70ba2bb3ec4a4447037ab41e56781f44f7cae3d82d3564709000000fd410400473044022062c412f612e08ed3cf5ce5aba3c8e556849a2ffdded9814525393bd4b61c76890220638557c4426a83012b0cf31fccd395c9a063f01942dcdadf5c86b174fceaffbe0147304402206bec40f5bb548e6f0e2c8b6ffe24d1173f60b1ebb0a870cef941e8499d34c9ae02204206d61ecdfd2aa0a300f91dafd9e7399f22bee9298d56d972e0d58e366977fe01473044022050f449a88e32850924a1d19ab9b82f676d2859ec38765d13b0a08902eb8bb95b02203c1bbc81ad3af940470cd100e4bf59bd92570d0dc8b76bf6196a90c8a528520a0147304402205e8e6937d25e139762ca57d4e4777e28bbd730cde2cd72d16b7f73eca04df84d022011141ef7b64b3b10ae9fc1c78c73453c1855ff997c05b2aed56ee24ee53a789f01473044022046c8000f5c97f5e8b388e6294db4ebd8cb45f4c58f844003ed571ee8b5965a6e02202f2880e91746bcf240a6cf1945de81016f6c46cb95265e67289611e1eaaffbd00147304402204610acecbda4763c3d7bcf3e656a1cdb1f0e6286dff755b36640c52d5153011b0220785bb66ff9e36d9de663379d520858d340c66845c3f9c7b4bfd4843bf6c2fc0f01473044022007c91bb30021f4b2d84ca5cc18458aeb6ee96d9d5881d09a37af845524d3ff10022068ffdca9828bc4648cdb954bd76436b373a3da07c376452325e52a01075e7b2201473044022007c91bb30021f4b2d84ca5cc18458aeb6ee96d9d5881d09a37af845524d3ff10022068ffdca9828bc4648cdb954bd76436b373a3da07c376452325e52a01075e7b2201473044022007c91bb30021f4b2d84ca5cc18458aeb6ee96d9d5881d09a37af845524d3ff10022068ffdca9828bc4648cdb954bd76436b373a3da07c376452325e52a01075e7b22014db5015941040f0fb9a244ad31a369ee02b7abfbbb0bfa3812b9a39ed93346d03d67d412d1777965c382f55222a9aed59cb8affc64bb5381f065eab9ef3baa57f2f0ac6bfae921022f1b310f4c065331bc0d79ba4661bb9822d67d7c4a1b0a1892e1fd0cd23aa68d210299c2aa85d2b21a62f396907a802a58e521dafd5bddaccbd72786eea189bc4dc921021a7a569e91dbf60581509c7fc946d1003b60c7dee85299538db6353538d595742103a92c9b7cac68758de5783ed8e5123598e4ad137091e42987d3bad8a08e35bf3d21034f355bdcb7cc0af728ef3cceb9615d90684bb5b2ca5f859ab0f0b704075871aa41046360e856310ce5d294e8be33fc807077dc56ac80d95d9cd4ddbd21325eff73f7eb1c2784a65901538479361e94c0a2597973adef0836a6a7eddf50b7997c88a341046360e856310ce5d294e8be33fc807077dc56ac80d95d9cd4ddbd21325eff73f7eb1c2784a65901538479361e94c0a2597973adef0836a6a7eddf50b7997c88a341046360e856310ce5d294e8be33fc807077dc56ac80d95d9cd4ddbd21325eff73f7eb1c2784a65901538479361e94c0a2597973adef0836a6a7eddf50b7997c88a359aeffffffff78c2ebf52b849090b70ba2bb3ec4a4447037ab41e56781f44f7cae3d82d356470a000000484730440220028b766844f8d4e5c28b2464605dfa79435c9203481976db468517ca96674b320220761f5687ce7d6067ba3cbe652e11b8495ac274b5ce0e7f1b8f59b2c34f007bf701ffffffff0be803000000000000160014b4bd9b543a615fe9b73ced34a9a38572ae18a395e8030000000000002200209e7470b3013d2e9585f2009241f223beaefc8067f82a2a6f2dd87d74cb5969dbe8030000000000004341040f0fb9a244ad31a369ee02b7abfbbb0bfa3812b9a39ed93346d03d67d412d1777965c382f55222a9aed59cb8affc64bb5381f065eab9ef3baa57f2f0ac6bfae9ace80300000000000022512039d1075e641ac7deda75bfbfa28aa5c65d7f39b1315e024f62e1064b1ec71d3ee8030000000000001976a914f9c4fccde68b163563e0d60842d1accd19c1207b88ace80300000000000017a91454db4f9a5c6f2de3110925e1f8cf42aeab807e6687e80300000000000017a91454db4f9a5c6f2de3110925e1f8cf42aeab807e6687e80300000000000017a914baf6af81b991265c3e3223f4649cf1b21afa73b987e80300000000000017a914c95d7440311017931c7adb20ab103e116e17ccbb87e80300000000000017a914d6215d5c57d6d65ae73eb0d8fe2ad7cfa07d441f879ba80000000000004341040f0fb9a244ad31a369ee02b7abfbbb0bfa3812b9a39ed93346d03d67d412d1777965c382f55222a9aed59cb8affc64bb5381f065eab9ef3baa57f2f0ac6bfae9ac02473044022044cd5a0eca8585d1dfb183dc12b37bfb41308244540d6a6ba449b6663f85f5e402206221b9980ecc54538e249a1c01972c6198c150945d12b6d124ebe523bd7bd2c30121021a7a569e91dbf60581509c7fc946d1003b60c7dee85299538db6353538d595740300473044022010b9f2310bc25214db7508df0107c8683c7c2f3eabb60aad2c35bed84d516159022059a643ad81a966716db06a2d707fefb234bffcac975ece1bc4b900239b50b7e501255121031d16453b3ab3132acb0a5bc16cc49690d819a585267a15cd5a064e2a0ad4059951ae000140daf8270bffc7a39c45114f5b180f5f82bc920803f3a612a4b517ce609e7e4ef30d8939102af08c9407f0cc4f9c63ffdda9914634dc59b1786d6d6b9d1b8a31960000000300473044022058f436dd9dc7d2966cd44a52989c972fb67e017d02e08723293fcfc4a3da3bff02200f8ff1bb6a95709ed5cfc47e9f567cba1fca8c9c10cd2db4f348152b3420361001255121031d16453b3ab3132acb0a5bc16cc49690d819a585267a15cd5a064e2a0ad4059951ae00000000000000';
     final tx = BtcTransaction.fromRaw(data);
     expect(tx.serialize(), data);
   });
diff --git a/test/encode_decode_transaction_test.dart b/test/encode_decode_transaction_test.dart
index b77dfdb..70b8b52 100644
--- a/test/encode_decode_transaction_test.dart
+++ b/test/encode_decode_transaction_test.dart
@@ -2,74 +2,74 @@ import 'package:bitcoin_base/bitcoin_base.dart';
 import 'package:test/test.dart';
 
 void main() {
-  test("test1", () {
+  test('test1', () {
     final tx = BtcTransaction(inputs: [
       TxInput(
         txId:
-            "daaa0beab7411cee74768b3f1d7da7ad55fcbc9d835fda0afbe1b9a41ae42f75",
+            'daaa0beab7411cee74768b3f1d7da7ad55fcbc9d835fda0afbe1b9a41ae42f75',
         txIndex: 0,
         scriptSig: Script(
           script: [
-            "304402203795e2aa978afbbd676b36c0edd1a39478744d320c5e02dd6a39d154755a5a3e02205545a7765bae3db9b820b1db9be2f8955a8998fa92ac08b0d7416aa30a3cee4241",
-            "03ac064f4489ff812c643471ed25b990e6be7212566c932b8680b900c8e6db0fd9"
+            '304402203795e2aa978afbbd676b36c0edd1a39478744d320c5e02dd6a39d154755a5a3e02205545a7765bae3db9b820b1db9be2f8955a8998fa92ac08b0d7416aa30a3cee4241',
+            '03ac064f4489ff812c643471ed25b990e6be7212566c932b8680b900c8e6db0fd9'
           ],
         ),
       ),
       TxInput(
           txId:
-              "daaa0beab7411cee74768b3f1d7da7ad55fcbc9d835fda0afbe1b9a41ae42f75",
+              'daaa0beab7411cee74768b3f1d7da7ad55fcbc9d835fda0afbe1b9a41ae42f75',
           txIndex: 2,
           scriptSig: Script(script: [
-            "3044022071b39d6aefdea7a7837310e5d78b1069ae82ed007991f8bca80bf3baf26340cc02200bc356be6e9f0019849b75b00322262a23ce179e7c0313207addfdbe596dabfd41",
-            "03ac064f4489ff812c643471ed25b990e6be7212566c932b8680b900c8e6db0fd9"
+            '3044022071b39d6aefdea7a7837310e5d78b1069ae82ed007991f8bca80bf3baf26340cc02200bc356be6e9f0019849b75b00322262a23ce179e7c0313207addfdbe596dabfd41',
+            '03ac064f4489ff812c643471ed25b990e6be7212566c932b8680b900c8e6db0fd9'
           ]))
     ], outputs: [
       TxOutput(
           amount: BigInt.from(10067000),
           scriptPubKey: Script(
             script: [
-              "OP_DUP",
-              "OP_HASH160",
-              "b8d913342894ec7b066420952a618ec2a8269bc2",
-              "OP_EQUALVERIFY",
-              "OP_CHECKSIG"
+              'OP_DUP',
+              'OP_HASH160',
+              'b8d913342894ec7b066420952a618ec2a8269bc2',
+              'OP_EQUALVERIFY',
+              'OP_CHECKSIG'
             ],
           )),
       TxOutput(
           amount: BigInt.from(1000),
           cashToken: CashToken(
             category:
-                "4e7873d4529edfd2c6459139257042950230baa9297f111b8675829443f70430",
+                '4e7873d4529edfd2c6459139257042950230baa9297f111b8675829443f70430',
             bitfield: 16,
             amount: BigInt.from(2000),
           ),
           scriptPubKey: Script(
             script: [
-              "OP_HASH256",
-              "1d12ffe8e85fdab36794cb09418982efdbd5c8cee5fbeb216ac43887ea4817b8",
-              "OP_EQUAL"
+              'OP_HASH256',
+              '1d12ffe8e85fdab36794cb09418982efdbd5c8cee5fbeb216ac43887ea4817b8',
+              'OP_EQUAL'
             ],
           )),
       TxOutput(
           amount: BigInt.from(1000),
           cashToken: CashToken(
             category:
-                "4e7873d4529edfd2c6459139257042950230baa9297f111b8675829443f70430",
+                '4e7873d4529edfd2c6459139257042950230baa9297f111b8675829443f70430',
             bitfield: 16,
-            amount: BigInt.parse("799999999999996000"),
+            amount: BigInt.parse('799999999999996000'),
           ),
           scriptPubKey: Script(
             script: [
-              "OP_DUP",
-              "OP_HASH160",
-              "b8d913342894ec7b066420952a618ec2a8269bc2",
-              "OP_EQUALVERIFY",
-              "OP_CHECKSIG"
+              'OP_DUP',
+              'OP_HASH160',
+              'b8d913342894ec7b066420952a618ec2a8269bc2',
+              'OP_EQUALVERIFY',
+              'OP_CHECKSIG'
             ],
           )),
     ]);
-    const String raw =
-        "0200000002752fe41aa4b9e1fb0ada5f839dbcfc55ada77d1d3f8b7674ee1c41b7ea0baada000000006a47304402203795e2aa978afbbd676b36c0edd1a39478744d320c5e02dd6a39d154755a5a3e02205545a7765bae3db9b820b1db9be2f8955a8998fa92ac08b0d7416aa30a3cee42412103ac064f4489ff812c643471ed25b990e6be7212566c932b8680b900c8e6db0fd9ffffffff752fe41aa4b9e1fb0ada5f839dbcfc55ada77d1d3f8b7674ee1c41b7ea0baada020000006a473044022071b39d6aefdea7a7837310e5d78b1069ae82ed007991f8bca80bf3baf26340cc02200bc356be6e9f0019849b75b00322262a23ce179e7c0313207addfdbe596dabfd412103ac064f4489ff812c643471ed25b990e6be7212566c932b8680b900c8e6db0fd9ffffffff03389c9900000000001976a914b8d913342894ec7b066420952a618ec2a8269bc288ace80300000000000048ef3004f743948275861b117f29a9ba300295427025399145c6d2df9e52d473784e10fdd007aa201d12ffe8e85fdab36794cb09418982efdbd5c8cee5fbeb216ac43887ea4817b887e80300000000000044ef3004f743948275861b117f29a9ba300295427025399145c6d2df9e52d473784e10ff60f04fecc22b1a0b76a914b8d913342894ec7b066420952a618ec2a8269bc288ac00000000";
+    const raw =
+        '0200000002752fe41aa4b9e1fb0ada5f839dbcfc55ada77d1d3f8b7674ee1c41b7ea0baada000000006a47304402203795e2aa978afbbd676b36c0edd1a39478744d320c5e02dd6a39d154755a5a3e02205545a7765bae3db9b820b1db9be2f8955a8998fa92ac08b0d7416aa30a3cee42412103ac064f4489ff812c643471ed25b990e6be7212566c932b8680b900c8e6db0fd9ffffffff752fe41aa4b9e1fb0ada5f839dbcfc55ada77d1d3f8b7674ee1c41b7ea0baada020000006a473044022071b39d6aefdea7a7837310e5d78b1069ae82ed007991f8bca80bf3baf26340cc02200bc356be6e9f0019849b75b00322262a23ce179e7c0313207addfdbe596dabfd412103ac064f4489ff812c643471ed25b990e6be7212566c932b8680b900c8e6db0fd9ffffffff03389c9900000000001976a914b8d913342894ec7b066420952a618ec2a8269bc288ace80300000000000048ef3004f743948275861b117f29a9ba300295427025399145c6d2df9e52d473784e10fdd007aa201d12ffe8e85fdab36794cb09418982efdbd5c8cee5fbeb216ac43887ea4817b887e80300000000000044ef3004f743948275861b117f29a9ba300295427025399145c6d2df9e52d473784e10ff60f04fecc22b1a0b76a914b8d913342894ec7b066420952a618ec2a8269bc288ac00000000';
     final tr = BtcTransaction.fromRaw(raw);
     expect(tx.toHex(), raw);
     expect(tr.toHex(), raw);
@@ -77,10 +77,10 @@ void main() {
     /// https://chipnet.imaginary.cash/tx/4ab0ce5507e228ca07a0fc5a75b91714e9855f4e859435dd26a09366ce31e575
   });
 
-  test("test 2", () {
+  test('test 2', () {
     /// https://tbch4.loping.net/tx/caa91b0fea2843a99c3cd7375ac4d3102b6b74a25e52cd866ad7ecc486204f0d
-    const String encodedTr =
-        "020000000252b6818f78bff46cbfdf3384875d3471f063f7c49f62658ffa22973c87649b5e000000006c473044022029198caf8776bcf9a8c3fcc79dbd4d3498cd938ba95962e5473fb77ad8d8a6510220265e7a0a14dca7bc1edb0a7bda4cd987f7893377b9cd9cfc9dbef97f85660bed41232103ac064f4489ff812c643471ed25b990e6be7212566c932b8680b900c8e6db0fd9acffffffff52b6818f78bff46cbfdf3384875d3471f063f7c49f62658ffa22973c87649b5e010000006c4730440220639b44bece1b3c2ed597c25497ee6f843ec2de033cb83292e0576b3f84cfc995022032713a60006d76c15bd0a6ddef758c06d61baa5f278bc993d98f03f69165d74741232103ac064f4489ff812c643471ed25b990e6be7212566c932b8680b900c8e6db0fd9acffffffff0510f699000000000023aa209f4ab972963cf18d86aa57fa875147f996916f06c28179f449cd14188818ba3187e80300000000000060efc4bf086c2c7bbb0405343873cf81b8b5d81d65126ce1bcddaa96591e79870d3f72156769746875622e636f6d2f6d72746e6574776f726bfe005a6202aa209f4ab972963cf18d86aa57fa875147f996916f06c28179f449cd14188818ba3187e80300000000000060efc4bf086c2c7bbb0405343873cf81b8b5d81d65126ce1bcddaa96591e79870d3f71156769746875622e636f6d2f6d72746e6574776f726bfe005a6202aa209f4ab972963cf18d86aa57fa875147f996916f06c28179f449cd14188818ba3187e80300000000000060efc4bf086c2c7bbb0405343873cf81b8b5d81d65126ce1bcddaa96591e79870d3f71156769746875622e636f6d2f6d72746e6574776f726bfe005a6202aa209f4ab972963cf18d86aa57fa875147f996916f06c28179f449cd14188818ba3187e80300000000000060efc4bf086c2c7bbb0405343873cf81b8b5d81d65126ce1bcddaa96591e79870d3f71156769746875622e636f6d2f6d72746e6574776f726bfe005a6202aa209f4ab972963cf18d86aa57fa875147f996916f06c28179f449cd14188818ba318700000000";
+    const encodedTr =
+        '020000000252b6818f78bff46cbfdf3384875d3471f063f7c49f62658ffa22973c87649b5e000000006c473044022029198caf8776bcf9a8c3fcc79dbd4d3498cd938ba95962e5473fb77ad8d8a6510220265e7a0a14dca7bc1edb0a7bda4cd987f7893377b9cd9cfc9dbef97f85660bed41232103ac064f4489ff812c643471ed25b990e6be7212566c932b8680b900c8e6db0fd9acffffffff52b6818f78bff46cbfdf3384875d3471f063f7c49f62658ffa22973c87649b5e010000006c4730440220639b44bece1b3c2ed597c25497ee6f843ec2de033cb83292e0576b3f84cfc995022032713a60006d76c15bd0a6ddef758c06d61baa5f278bc993d98f03f69165d74741232103ac064f4489ff812c643471ed25b990e6be7212566c932b8680b900c8e6db0fd9acffffffff0510f699000000000023aa209f4ab972963cf18d86aa57fa875147f996916f06c28179f449cd14188818ba3187e80300000000000060efc4bf086c2c7bbb0405343873cf81b8b5d81d65126ce1bcddaa96591e79870d3f72156769746875622e636f6d2f6d72746e6574776f726bfe005a6202aa209f4ab972963cf18d86aa57fa875147f996916f06c28179f449cd14188818ba3187e80300000000000060efc4bf086c2c7bbb0405343873cf81b8b5d81d65126ce1bcddaa96591e79870d3f71156769746875622e636f6d2f6d72746e6574776f726bfe005a6202aa209f4ab972963cf18d86aa57fa875147f996916f06c28179f449cd14188818ba3187e80300000000000060efc4bf086c2c7bbb0405343873cf81b8b5d81d65126ce1bcddaa96591e79870d3f71156769746875622e636f6d2f6d72746e6574776f726bfe005a6202aa209f4ab972963cf18d86aa57fa875147f996916f06c28179f449cd14188818ba3187e80300000000000060efc4bf086c2c7bbb0405343873cf81b8b5d81d65126ce1bcddaa96591e79870d3f71156769746875622e636f6d2f6d72746e6574776f726bfe005a6202aa209f4ab972963cf18d86aa57fa875147f996916f06c28179f449cd14188818ba318700000000';
     final decode = BtcTransaction.fromRaw(encodedTr);
     expect(decode.toHex(), encodedTr);
   });
diff --git a/test/keys_test.dart b/test/keys_test.dart
index 745ee82..d25b067 100644
--- a/test/keys_test.dart
+++ b/test/keys_test.dart
@@ -3,9 +3,9 @@ import 'package:blockchain_utils/blockchain_utils.dart';
 import 'package:test/test.dart';
 
 void main() {
-  group("TestPrivateKeys", () {
-    const keyWifc = "KwDiBf89QgGbjEhKnhXJuH7LrciVrZi3qYjgd9M7rFU73sVHnoWn";
-    const keyWif = "5HpHagT65TZzG1PH3CSu63k8DbpvD8s5ip4nEB3kEsreAnchuDf";
+  group('TestPrivateKeys', () {
+    const keyWifc = 'KwDiBf89QgGbjEhKnhXJuH7LrciVrZi3qYjgd9M7rFU73sVHnoWn';
+    const keyWif = '5HpHagT65TZzG1PH3CSu63k8DbpvD8s5ip4nEB3kEsreAnchuDf';
     final keyBytes = [
       0x00,
       0x00,
@@ -41,19 +41,19 @@ void main() {
       0x01,
     ];
 
-    test("test1", () {
+    test('test1', () {
       final p = ECPrivate.fromWif(keyWifc,
           netVersion: BitcoinNetwork.mainnet.wifNetVer);
 
       expect(p.toBytes(), keyBytes);
-      expect(p.toWif(compressed: false), keyWif);
+      expect(p.toWif(pubKeyMode: PubKeyModes.uncompressed), keyWif);
     });
   });
 
-  group("TestPublicKeys", () {
-    const String publicKeyHex =
+  group('TestPublicKeys', () {
+    const publicKeyHex =
         '0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8';
-    final List<int> publicKeyBytes = List<int>.from([
+    final publicKeyBytes = List<int>.from([
       121,
       190,
       102,
@@ -119,30 +119,32 @@ void main() {
       212,
       184
     ]);
-    const String unCompressedAddress = '1EHNa6Q4Jz2uvNExL497mE43ikXhwF6kZm';
+    const unCompressedAddress = '1EHNa6Q4Jz2uvNExL497mE43ikXhwF6kZm';
 
-    test("testPubkeyCreation", () {
+    test('testPubkeyCreation', () {
       final pub1 = ECPublic.fromHex(publicKeyHex);
       expect(
-          pub1.toAddress(compressed: false).toAddress(BitcoinNetwork.mainnet),
+          pub1
+              .toAddress(mode: PublicKeyType.uncompressed)
+              .toAddress(BitcoinNetwork.mainnet),
           unCompressedAddress);
       expect(pub1.toBytes(whitPrefix: false), publicKeyBytes);
-      expect(pub1.toHash160(), pub1.toAddress(compressed: true).addressProgram);
+      expect(pub1.toHash160(), pub1.toAddress().addressProgram);
     });
   });
 
-  group("TestP2pkhAddresses", () {
-    const String hash160 = '91b24bf9f5288532960ac687abb035127b1d28a5';
-    const String hash160c = '751e76e8199196d454941c45d1b3a323f1433bd6';
-    const String address = '1EHNa6Q4Jz2uvNExL497mE43ikXhwF6kZm';
-    const String addressc = '1BgGZ9tcN4rm9KBzDn7KprQz87SZ26SAMH';
-    test("test1", () {
+  group('TestP2pkhAddresses', () {
+    const hash160 = '91b24bf9f5288532960ac687abb035127b1d28a5';
+    const hash160c = '751e76e8199196d454941c45d1b3a323f1433bd6';
+    const address = '1EHNa6Q4Jz2uvNExL497mE43ikXhwF6kZm';
+    const addressc = '1BgGZ9tcN4rm9KBzDn7KprQz87SZ26SAMH';
+    test('test1', () {
       final p1 = P2pkhAddress.fromHash160(addrHash: hash160);
       final p2 = P2pkhAddress.fromHash160(addrHash: hash160c);
       expect(p1.toAddress(BitcoinNetwork.mainnet), address);
       expect(p2.toAddress(BitcoinNetwork.mainnet), addressc);
     });
-    test("test2", () {
+    test('test2', () {
       final p1 = P2pkhAddress.fromAddress(
           address: address, network: BitcoinNetwork.mainnet);
       final p2 = P2pkhAddress.fromAddress(
@@ -152,15 +154,14 @@ void main() {
     });
   });
 
-  group("TestSignAndVerify", () {
-    const String message = "The test!";
-    const String keyWifc =
-        "KwDiBf89QgGbjEhKnhXJuH7LrciVrZi3qYjgd9M7rFU73sVHnoWn";
-    final ECPrivate priv = ECPrivate.fromWif(keyWifc,
+  group('TestSignAndVerify', () {
+    const message = 'The test!';
+    const keyWifc = 'KwDiBf89QgGbjEhKnhXJuH7LrciVrZi3qYjgd9M7rFU73sVHnoWn';
+    final priv = ECPrivate.fromWif(keyWifc,
         netVersion: BitcoinNetwork.mainnet.wifNetVer);
-    final ECPublic pub = priv.getPublic();
+    final pub = priv.getPublic();
 
-    test("test1", () {
+    test('test1', () {
       final sign = priv.signMessage(StringUtils.encode(message));
       pub.verify(StringUtils.encode(message), BytesUtils.fromHexString(sign));
 
@@ -170,16 +171,16 @@ void main() {
           true);
     });
 
-    test("test2", () {});
+    test('test2', () {});
   });
 
-  group("TestP2pkhAddresses", () {
-    final ECPrivate priv = ECPrivate.fromWif(
+  group('TestP2pkhAddresses', () {
+    final priv = ECPrivate.fromWif(
         'cTALNpTpRbbxTCJ2A5Vq88UxT44w1PE2cYqiB3n4hRvzyCev1Wwo',
         netVersion: BitcoinNetwork.testnet.wifNetVer);
-    final ECPublic pub = priv.getPublic();
-    const String p2shaddress = '2NDkr9uD2MSY5em3rsjkff8fLZcJzCfY3W1';
-    test("test create", () {
+    final pub = priv.getPublic();
+    const p2shaddress = '2NDkr9uD2MSY5em3rsjkff8fLZcJzCfY3W1';
+    test('test create', () {
       final script = Script(script: [pub.toHex(), 'OP_CHECKSIG']);
       final addr = P2shAddress.fromScript(
           script: script, type: P2shAddressType.p2pkInP2sh);
@@ -187,27 +188,24 @@ void main() {
     });
   });
 
-  group("TestP2pkhAddresses", () {
-    final ECPrivate priv = ECPrivate.fromWif(
+  group('TestP2pkhAddresses', () {
+    final priv = ECPrivate.fromWif(
         'cVdte9ei2xsVjmZSPtyucG43YZgNkmKTqhwiUA8M4Fc3LdPJxPmZ',
         netVersion: BitcoinNetwork.testnet.wifNetVer);
-    final ECPublic pub = priv.getPublic();
-    const String correctP2wpkhAddress =
-        'tb1qxmt9xgewg6mxc4mvnzvrzu4f2v0gy782fydg0w';
-    const String correctP2shP2wpkhAddress =
-        '2N8Z5t3GyPW1hSAEJZqQ1GUkZ9ofoGhgKPf';
-    const String correctP2wshAddress =
+    final pub = priv.getPublic();
+    const correctP2wpkhAddress = 'tb1qxmt9xgewg6mxc4mvnzvrzu4f2v0gy782fydg0w';
+    const correctP2shP2wpkhAddress = '2N8Z5t3GyPW1hSAEJZqQ1GUkZ9ofoGhgKPf';
+    const correctP2wshAddress =
         'tb1qy4kdfavhluvnhpwcqmqrd8x0ge2ynnsl7mv2mdmdskx4g3fc6ckq8f44jg';
-    const String correctP2shP2wshAddress =
-        '2NC2DBZd3WfEF9cZcpBRDYxCTGCVCfPUf7Q';
-    test("test1", () {
+    const correctP2shP2wshAddress = '2NC2DBZd3WfEF9cZcpBRDYxCTGCVCfPUf7Q';
+    test('test1', () {
       final address = P2wpkhAddress.fromProgram(
           program: pub.toSegwitAddress().addressProgram);
       expect(correctP2wpkhAddress, address.toAddress(BitcoinNetwork.testnet));
     });
-    test("test2", () {
+    test('test2', () {
       final addr = ECPrivate.fromWif(
-              "cTmyBsxMQ3vyh4J3jCKYn2Au7AhTKvqeYuxxkinsg6Rz3BBPrYKK",
+              'cTmyBsxMQ3vyh4J3jCKYn2Au7AhTKvqeYuxxkinsg6Rz3BBPrYKK',
               netVersion: BitcoinNetwork.testnet.wifNetVer)
           .getPublic()
           .toSegwitAddress();
@@ -215,9 +213,9 @@ void main() {
           script: addr.toScriptPubKey(), type: P2shAddressType.p2pkInP2sh);
       expect(correctP2shP2wpkhAddress, p2sh.toAddress(BitcoinNetwork.testnet));
     });
-    test("test3", () {
+    test('test3', () {
       final prive = ECPrivate.fromWif(
-          "cNn8itYxAng4xR4eMtrPsrPpDpTdVNuw7Jb6kfhFYZ8DLSZBCg37",
+          'cNn8itYxAng4xR4eMtrPsrPpDpTdVNuw7Jb6kfhFYZ8DLSZBCg37',
           netVersion: BitcoinNetwork.testnet.wifNetVer);
       final script = Script(script: [
         'OP_1',
@@ -228,9 +226,9 @@ void main() {
       final pw = P2wshAddress.fromScript(script: script);
       expect(pw.toAddress(BitcoinNetwork.testnet), correctP2wshAddress);
     });
-    test("test4", () {
+    test('test4', () {
       final prive = ECPrivate.fromWif(
-          "cNn8itYxAng4xR4eMtrPsrPpDpTdVNuw7Jb6kfhFYZ8DLSZBCg37",
+          'cNn8itYxAng4xR4eMtrPsrPpDpTdVNuw7Jb6kfhFYZ8DLSZBCg37',
           netVersion: BitcoinNetwork.testnet.wifNetVer);
       final script = Script(script: [
         'OP_1',
@@ -245,50 +243,50 @@ void main() {
     });
   });
 
-  group("TestP2trAddresses", () {
+  group('TestP2trAddresses', () {
     final privEven = ECPrivate.fromWif(
         'cTLeemg1bCXXuRctid7PygEn7Svxj4zehjTcoayrbEYPsHQo248w',
         netVersion: BitcoinNetwork.testnet.wifNetVer);
-    const String correctEvenPk =
+    const correctEvenPk =
         '0271fe85f75e97d22e74c2dd6425e843def8b662b928f24f724ae6a2fd0c4e0419';
-    const String correctEvenTrAddr =
+    const correctEvenTrAddr =
         'tb1pk426x6qvmncj5vzhtp5f2pzhdu4qxsshszswga8ea6sycj9nulmsu7syz0';
-    const String correctEvenTweakedPk =
+    const correctEvenTweakedPk =
         'b555a3680cdcf12a305758689504576f2a03421780a0e474f9eea04c48b3e7f7';
 
     final privOdd = ECPrivate.fromWif(
         'cRPxBiKrJsH94FLugmiL4xnezMyoFqGcf4kdgNXGuypNERhMK6AT',
         netVersion: BitcoinNetwork.testnet.wifNetVer);
-    const String correctOddPk =
+    const correctOddPk =
         '03a957ff7ead882e4c95be2afa684ab0e84447149883aba60c067adc054472785b';
-    const String correctOddTrAddr =
+    const correctOddTrAddr =
         'tb1pdr8q4tuqqeglxxhkxl3trxt0dy5jrnaqvg0ddwu7plraxvntp8dqv8kvyq';
-    const String correctOddTweakedPk =
+    const correctOddTweakedPk =
         '68ce0aaf800651f31af637e2b1996f692921cfa0621ed6bb9e0fc7d3326b09da';
-    test("test1", () {
+    test('test1', () {
       final pub = privEven.getPublic();
       expect(pub.toHex(), correctEvenPk);
     });
-    test("test2", () {
+    test('test2', () {
       final pub = privEven.getPublic();
       final addr = pub.toTaprootAddress().toAddress(BitcoinNetwork.testnet);
       expect(addr, correctEvenTrAddr);
     });
-    test("test3", () {
+    test('test3', () {
       final pub = privEven.getPublic();
       final addr = pub.toTaprootAddress();
       expect(addr.addressProgram, correctEvenTweakedPk);
     });
-    test("test4", () {
+    test('test4', () {
       final pub = privOdd.getPublic();
       expect(pub.toHex(), correctOddPk);
     });
-    test("test5", () {
+    test('test5', () {
       final pub = privOdd.getPublic();
       final addr = pub.toTaprootAddress().toAddress(BitcoinNetwork.testnet);
       expect(addr, correctOddTrAddr);
     });
-    test("test6", () {
+    test('test6', () {
       final pub = privOdd.getPublic();
       final addr = pub.toTaprootAddress();
       expect(addr.addressProgram, correctOddTweakedPk);
diff --git a/test/p2kh_tr_test.dart b/test/p2kh_tr_test.dart
index e77a9a0..208d4d1 100644
--- a/test/p2kh_tr_test.dart
+++ b/test/p2kh_tr_test.dart
@@ -2,7 +2,7 @@ import 'package:bitcoin_base/bitcoin_base.dart';
 import 'package:test/test.dart';
 
 void main() {
-  group("P2KH", () {
+  group('P2KH', () {
     final txin = TxInput(
         txId:
             'fb48f4e23bf6ddf606714141ac78c3e921c8c0bebeb7c8abb2c799e9ff96ce6c',
@@ -38,20 +38,20 @@ void main() {
         address: 'myPAE9HwPeKHh8FjKwBNBaHnemApo3dw6e',
         network: BitcoinNetwork.testnet);
 
-    const String coreTxResult =
+    const coreTxResult =
         '02000000016cce96ffe999c7b2abc8b7bebec0c821e9c378ac41417106f6ddf63be2f448fb0000000000ffffffff0280969800000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88ac4081ba01000000001976a914c992931350c9ba48538003706953831402ea34ea88ac00000000';
-    const String coreTxSignedResult =
+    const coreTxSignedResult =
         '02000000016cce96ffe999c7b2abc8b7bebec0c821e9c378ac41417106f6ddf63be2f448fb000000006a473044022079dad1afef077fa36dcd3488708dd05ef37888ef550b45eb00cdb04ba3fc980e02207a19f6261e69b604a92e2bffdf6ddbed0c64f55d5003e9dfb58b874b07aef3d7012103a2fef1829e0742b89c218c51898d9e7cb9d51201ba2bf9d9e9214ebb6af32708ffffffff0280969800000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88ac4081ba01000000001976a914c992931350c9ba48538003706953831402ea34ea88ac00000000';
-    const String coreTxSignedLowSSigallResult =
+    const coreTxSignedLowSSigallResult =
         '02000000016cce96ffe999c7b2abc8b7bebec0c821e9c378ac41417106f6ddf63be2f448fb000000006a473044022044ef433a24c6010a90af14f7739e7c60ce2c5bc3eab96eaee9fbccfdbb3e272202205372a617cb235d0a0ec2889dbfcadf15e10890500d184c8dda90794ecdf79492012103a2fef1829e0742b89c218c51898d9e7cb9d51201ba2bf9d9e9214ebb6af32708ffffffff0280969800000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88ac4081ba01000000001976a91442151d0c21442c2b038af0ad5ee64b9d6f4f4e4988ac00000000';
-    const String coreTxSignedLowSSignoneResult =
+    const coreTxSignedLowSSignoneResult =
         '02000000016cce96ffe999c7b2abc8b7bebec0c821e9c378ac41417106f6ddf63be2f448fb000000006a47304402201e4b7a2ed516485fdde697ba63f6670d43aa6f18d82f18bae12d5fd228363ac10220670602bec9df95d7ec4a619a2f44e0b8dcf522fdbe39530dd78d738c0ed0c430022103a2fef1829e0742b89c218c51898d9e7cb9d51201ba2bf9d9e9214ebb6af32708ffffffff0280969800000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88ac4081ba01000000001976a91442151d0c21442c2b038af0ad5ee64b9d6f4f4e4988ac00000000';
-    const String coreTxSignedLowSSignoneTxid =
+    const coreTxSignedLowSSignoneTxid =
         '105933681b0ca37ae0c0af43ae6f111803c899232b7fd586584b532dbe21ae6f';
 
     final sigTxin1 = TxInput(
         txId:
-            "76464c2b9e2af4d63ef38a77964b3b77e629dddefc5cb9eb1a3645b1608b790f",
+            '76464c2b9e2af4d63ef38a77964b3b77e629dddefc5cb9eb1a3645b1608b790f',
         txIndex: 0);
     final sigTxin2 = TxInput(
         txId:
@@ -93,21 +93,21 @@ void main() {
           'OP_EQUALVERIFY',
           'OP_CHECKSIG'
         ]));
-    const String sigSighashSingleResult =
+    const sigSighashSingleResult =
         '02000000010f798b60b145361aebb95cfcdedd29e6773b4b96778af33ed6f42a9e2b4c4676000000006a47304402202cfd7077fe8adfc5a65fb3953fa3482cad1413c28b53f12941c1082898d4935102201d393772c47f0699592268febb5b4f64dabe260f440d5d0f96dae5bc2b53e11e032102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a546ffffffff0240548900000000001976a914c3f8e5b0f8455a2b02c29c4488a550278209b66988aca0bb0d00000000001976a91442151d0c21442c2b038af0ad5ee64b9d6f4f4e4988ac00000000';
-    const String signSighashAll2in2outResult =
+    const signSighashAll2in2outResult =
         '02000000020f798b60b145361aebb95cfcdedd29e6773b4b96778af33ed6f42a9e2b4c4676000000006a4730440220355c3cf50b1d320d4ddfbe1b407ddbe508f8e31a38cc5531dec3534e8cb2e565022037d4e8d7ba9dd1c788c0d8b5b99270d4c1d4087cdee7f139a71fea23dceeca33012102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a546ffffffff0f798b60b145361aebb95cfcdedd29e6773b4b96778af33ed6f42a9e2b4c4676010000006a47304402206b728374b8879fd7a10cbd4f347934d583f4301aa5d592211487732c235b85b6022030acdc07761f227c27010bd022df4b22eb9875c65a59e8e8a5722229bc7362f4012102364d6f04487a71b5966eae3e14a4dc6f00dbe8e55e61bedd0b880766bfe72b5dffffffff0240548900000000001976a914c3f8e5b0f8455a2b02c29c4488a550278209b66988aca0bb0d00000000001976a91442151d0c21442c2b038af0ad5ee64b9d6f4f4e4988ac00000000';
-    const String signSighashNone2in2outResult =
+    const signSighashNone2in2outResult =
         '02000000020f798b60b145361aebb95cfcdedd29e6773b4b96778af33ed6f42a9e2b4c4676000000006a47304402202a2804048b7f84f2dd7641ec05bbaf3da9ae0d2a9f9ad476d376adfd8bf5033302205170fee2ab7b955d72ae2beac3bae15679d75584c37d78d82b07df5402605bab022102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a546ffffffff0f798b60b145361aebb95cfcdedd29e6773b4b96778af33ed6f42a9e2b4c4676010000006a473044022021a82914b002bd02090fbdb37e2e739e9ba97367e74db5e1de834bbab9431a2f02203a11f49a3f6ac03b1550ee04f9d84deee2045bc038cb8c3e70869470126a064d022102364d6f04487a71b5966eae3e14a4dc6f00dbe8e55e61bedd0b880766bfe72b5dffffffff0240548900000000001976a914c3f8e5b0f8455a2b02c29c4488a550278209b66988aca0bb0d00000000001976a91442151d0c21442c2b038af0ad5ee64b9d6f4f4e4988ac00000000';
 
-    const String signSighashAllSingleAnyone2in2outResult =
+    const signSighashAllSingleAnyone2in2outResult =
         '02000000020f798b60b145361aebb95cfcdedd29e6773b4b96778af33ed6f42a9e2b4c4676000000006a47304402205360315c439214dd1da10ea00a7531c0a211a865387531c358e586000bfb41b3022064a729e666b4d8ac7a09cb7205c8914c2eb634080597277baf946903d5438f49812102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a546ffffffff0f798b60b145361aebb95cfcdedd29e6773b4b96778af33ed6f42a9e2b4c4676010000006a473044022067943abe9fa7584ba9816fc9bf002b043f7f97e11de59155d66e0411a679ba2c02200a13462236fa520b80b4ed85c7ded363b4c9264eb7b2d9746200be48f2b6f4cb832102364d6f04487a71b5966eae3e14a4dc6f00dbe8e55e61bedd0b880766bfe72b5dffffffff0240548900000000001976a914c3f8e5b0f8455a2b02c29c4488a550278209b66988aca0bb0d00000000001976a91442151d0c21442c2b038af0ad5ee64b9d6f4f4e4988ac00000000';
 
-    test("test1", () {
+    test('test1', () {
       final tx = BtcTransaction(inputs: [txin], outputs: [txout, changeTxout]);
       expect(tx.serialize(), coreTxResult);
     });
-    test("test2", () {
+    test('test2', () {
       final tx = BtcTransaction(inputs: [txin], outputs: [txout, changeTxout]);
       final digit = tx.getTransactionDigest(
           txInIndex: 0,
@@ -122,7 +122,7 @@ void main() {
       txin.scriptSig = Script(script: [sig, sk.getPublic().toHex()]);
       expect(tx.serialize(), coreTxSignedResult);
     });
-    test("test3", () {
+    test('test3', () {
       final tx =
           BtcTransaction(inputs: [txin], outputs: [txout, changeLowSTxout]);
       final digit = tx.getTransactionDigest(
@@ -131,7 +131,7 @@ void main() {
       txin.scriptSig = Script(script: [sig, sk.getPublic().toHex()]);
       expect(tx.serialize(), coreTxSignedLowSSigallResult);
     });
-    test("test4", () {
+    test('test4', () {
       final tx =
           BtcTransaction(inputs: [txin], outputs: [txout, changeLowSTxout]);
       final digit = tx.getTransactionDigest(
@@ -143,7 +143,7 @@ void main() {
       expect(tx.serialize(), coreTxSignedLowSSignoneResult);
       expect(tx.txId(), coreTxSignedLowSSignoneTxid);
     });
-    test("test5", () {
+    test('test5', () {
       final tx =
           BtcTransaction(inputs: [sigTxin1], outputs: [sigTxout1, sigTxout2]);
       final digit = tx.getTransactionDigest(
@@ -155,7 +155,7 @@ void main() {
       sigTxin1.scriptSig = Script(script: [sig, sigSk1.getPublic().toHex()]);
       expect(tx.serialize(), sigSighashSingleResult);
     });
-    test("test6", () {
+    test('test6', () {
       final tx = BtcTransaction(
           inputs: [sigTxin1, sigTxin2], outputs: [sigTxout1, sigTxout2]);
       final digit = tx.getTransactionDigest(
@@ -174,7 +174,7 @@ void main() {
       sigTxin2.scriptSig = Script(script: [sig2, sigSk2.getPublic().toHex()]);
       expect(tx.serialize(), signSighashAll2in2outResult);
     });
-    test("test7", () {
+    test('test7', () {
       final tx = BtcTransaction(
           inputs: [sigTxin1, sigTxin2], outputs: [sigTxout1, sigTxout2]);
       final digit = tx.getTransactionDigest(
@@ -193,7 +193,7 @@ void main() {
       sigTxin2.scriptSig = Script(script: [sig2, sigSk2.getPublic().toHex()]);
       expect(tx.serialize(), signSighashNone2in2outResult);
     });
-    test("test8", () {
+    test('test8', () {
       final tx = BtcTransaction(
           inputs: [sigTxin1, sigTxin2], outputs: [sigTxout1, sigTxout2]);
       final digit = tx.getTransactionDigest(
diff --git a/test/p2sh_test.dart b/test/p2sh_test.dart
index b1d6b49..973ee67 100644
--- a/test/p2sh_test.dart
+++ b/test/p2sh_test.dart
@@ -2,7 +2,7 @@ import 'package:bitcoin_base/bitcoin_base.dart';
 import 'package:test/test.dart';
 
 void main() {
-  group("P2Sh", () {
+  group('P2Sh', () {
     final fromAddr = P2pkhAddress.fromAddress(
         address: 'n4bkvTyU1dVdzsrhWBqBw8fEMbHjJvtmJR',
         network: BitcoinNetwork.testnet);
@@ -49,10 +49,10 @@ void main() {
     const spendP2shCsvP2pkhResult =
         '0200000001951bc57b24230947ede095c3aac44223df70076342b796c6ff0a5fe523c657f5000000008947304402205c2e23d8ad7825cf44b998045cb19b49cf6447cbc1cb76a254cda43f7939982002202d8f88ab6afd2e8e1d03f70e5edc2a277c713018225d5b18889c5ad8fd6677b4012103a2fef1829e0742b89c218c51898d9e7cb9d51201ba2bf9d9e9214ebb6af327081e02c800b27576a914c3f8e5b0f8455a2b02c29c4488a550278209b66988acc80000000100ab9041000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88ac00000000';
 
-    test("test1", () {
+    test('test1', () {
       final txin = TxInput(
           txId:
-              "76464c2b9e2af4d63ef38a77964b3b77e629dddefc5cb9eb1a3645b1608b790f",
+              '76464c2b9e2af4d63ef38a77964b3b77e629dddefc5cb9eb1a3645b1608b790f',
           txIndex: 0);
       final tx = BtcTransaction(inputs: [txin], outputs: [txout]);
       final digit = tx.getTransactionDigest(
@@ -62,7 +62,7 @@ void main() {
       expect(tx.serialize(), createP2shAndSendResult);
     });
 
-    test("test2", () {
+    test('test2', () {
       final tx = BtcTransaction(inputs: [txinSpend], outputs: [txout2]);
       final digit =
           tx.getTransactionDigest(txInIndex: 0, script: p2pkRedeemScript);
@@ -70,7 +70,7 @@ void main() {
       txinSpend.scriptSig = Script(script: [sig, p2pkRedeemScript.toHex()]);
       expect(tx.serialize(), spendP2shResult);
     });
-    test("test3", () {
+    test('test3', () {
       final redeemScript = Script(script: [
         seq.forScript(),
         'OP_CHECKSEQUENCEVERIFY',
diff --git a/test/p2tr_test.dart b/test/p2tr_test.dart
index dbf41ec..844168c 100644
--- a/test/p2tr_test.dart
+++ b/test/p2tr_test.dart
@@ -23,24 +23,24 @@ void main() {
 
     setUp(() {
       toPriv1 = ECPrivate.fromWif(
-          "cT33CWKwcV8afBs5NYzeSzeSoGETtAB8izjDjMEuGqyqPoF7fbQR",
+          'cT33CWKwcV8afBs5NYzeSzeSoGETtAB8izjDjMEuGqyqPoF7fbQR',
           netVersion: BitcoinNetwork.testnet.wifNetVer);
       toPub1 = toPriv1.getPublic();
       toPriv2 = ECPrivate.fromWif(
-          "cNxX8M7XU8VNa5ofd8yk1eiZxaxNrQQyb7xNpwAmsrzEhcVwtCjs",
+          'cNxX8M7XU8VNa5ofd8yk1eiZxaxNrQQyb7xNpwAmsrzEhcVwtCjs',
           netVersion: BitcoinNetwork.testnet.wifNetVer);
       toPub2 = toPriv2.getPublic();
       toAddress2 = toPub2.toTaprootAddress();
       privkeyTrScript1 = ECPrivate.fromWif(
-          "cSW2kQbqC9zkqagw8oTYKFTozKuZ214zd6CMTDs4V32cMfH3dgKa",
+          'cSW2kQbqC9zkqagw8oTYKFTozKuZ214zd6CMTDs4V32cMfH3dgKa',
           netVersion: BitcoinNetwork.testnet.wifNetVer);
       pubkeyTrScript1 = privkeyTrScript1.getPublic();
       trScriptP2pk1 =
           Script(script: [pubkeyTrScript1.toXOnlyHex(), 'OP_CHECKSIG']);
       toTaprootScriptAddress1 =
-          "tb1p0fcjs5l5xqdyvde5u7ut7sr0gzaxp4yya8mv06d2ygkeu82l65xs6k4uqr";
+          'tb1p0fcjs5l5xqdyvde5u7ut7sr0gzaxp4yya8mv06d2ygkeu82l65xs6k4uqr';
       fromPriv2 = ECPrivate.fromWif(
-          "cT33CWKwcV8afBs5NYzeSzeSoGETtAB8izjDjMEuGqyqPoF7fbQR",
+          'cT33CWKwcV8afBs5NYzeSzeSoGETtAB8izjDjMEuGqyqPoF7fbQR',
           netVersion: BitcoinNetwork.testnet.wifNetVer);
       fromPub2 = fromPriv2.getPublic();
       fromAddress2 = fromPub2.toTaprootAddress(scripts: [
@@ -48,15 +48,15 @@ void main() {
       ]);
       txIn2 = TxInput(
           txId:
-              "3d4c9d73c4c65772e645ff26493590ae4913d9c37125b72398222a553b73fa66",
+              '3d4c9d73c4c65772e645ff26493590ae4913d9c37125b72398222a553b73fa66',
           txIndex: 0);
       txOut2 = TxOutput(
           amount: BigInt.from(3000), scriptPubKey: toAddress2.toScriptPubKey());
       scriptPubKey2 = fromAddress2.toScriptPubKey();
       signedTx2 =
-          "0200000000010166fa733b552a229823b72571c3d91349ae90354926ff45e67257c6c4739d4c3d0000000000ffffffff01b80b000000000000225120d4213cd57207f22a9e905302007b99b84491534729bd5f4065bdcb42ed10fcd50140f1776ddef90a87b646a45ad4821b8dd33e01c5036cbe071a2e1e609ae0c0963685cb8749001944dbe686662dd7c95178c85c4f59c685b646ab27e34df766b7b100000000";
+          '0200000000010166fa733b552a229823b72571c3d91349ae90354926ff45e67257c6c4739d4c3d0000000000ffffffff01b80b000000000000225120d4213cd57207f22a9e905302007b99b84491534729bd5f4065bdcb42ed10fcd50140f1776ddef90a87b646a45ad4821b8dd33e01c5036cbe071a2e1e609ae0c0963685cb8749001944dbe686662dd7c95178c85c4f59c685b646ab27e34df766b7b100000000';
       signedTx3 =
-          "0200000000010166fa733b552a229823b72571c3d91349ae90354926ff45e67257c6c4739d4c3d0000000000ffffffff01b80b000000000000225120d4213cd57207f22a9e905302007b99b84491534729bd5f4065bdcb42ed10fcd50340bf0a391574b56651923abdb256731059008a08b5a3406cd81ce10ef5e7f936c6b9f7915ec1054e2a480e4552fa177aed868dc8b28c6263476871b21584690ef8222013f523102815e9fbbe132ffb8329b0fef5a9e4836d216dce1824633287b0abc6ac21c01036a7ed8d24eac9057e114f22342ebf20c16d37f0d25cfd2c900bf401ec09c900000000";
+          '0200000000010166fa733b552a229823b72571c3d91349ae90354926ff45e67257c6c4739d4c3d0000000000ffffffff01b80b000000000000225120d4213cd57207f22a9e905302007b99b84491534729bd5f4065bdcb42ed10fcd50340bf0a391574b56651923abdb256731059008a08b5a3406cd81ce10ef5e7f936c6b9f7915ec1054e2a480e4552fa177aed868dc8b28c6263476871b21584690ef8222013f523102815e9fbbe132ffb8329b0fef5a9e4836d216dce1824633287b0abc6ac21c01036a7ed8d24eac9057e114f22342ebf20c16d37f0d25cfd2c900bf401ec09c900000000';
       // Initialize your variables here if needed
     });
 
@@ -75,7 +75,7 @@ void main() {
       var tx =
           BtcTransaction(inputs: [txIn2], outputs: [txOut2], hasSegwit: true);
 
-      const int signHash = BitcoinOpCodeConst.TAPROOT_SIGHASH_ALL;
+      const signHash = BitcoinOpCodeConst.TAPROOT_SIGHASH_ALL;
       final txDigit = tx.getTransactionTaprootDigset(
           txIndex: 0,
           scriptPubKeys: [scriptPubKey2],
@@ -123,23 +123,23 @@ void main() {
   });
 
   group('TestCreateP2trWithTwoTapScripts', () {
-    late final ECPrivate privkeyTrScriptA = ECPrivate.fromWif(
+    late final privkeyTrScriptA = ECPrivate.fromWif(
         'cSW2kQbqC9zkqagw8oTYKFTozKuZ214zd6CMTDs4V32cMfH3dgKa',
         netVersion: BitcoinNetwork.testnet.wifNetVer);
-    late final ECPublic pubkeyTrScriptA = privkeyTrScriptA.getPublic();
+    late final pubkeyTrScriptA = privkeyTrScriptA.getPublic();
     late final trScriptP2pkA =
         Script(script: [pubkeyTrScriptA.toXOnlyHex(), 'OP_CHECKSIG']);
 
-    late final ECPrivate privkeyTrScriptB = ECPrivate.fromWif(
+    late final privkeyTrScriptB = ECPrivate.fromWif(
         'cSv48xapaqy7fPs8VvoSnxNBNA2jpjcuURRqUENu3WVq6Eh4U3JU',
         netVersion: BitcoinNetwork.testnet.wifNetVer);
-    late final ECPublic pubkeyTrScriptB = privkeyTrScriptB.getPublic();
+    late final pubkeyTrScriptB = privkeyTrScriptB.getPublic();
 
     late final trScriptP2pkB =
         Script(script: [pubkeyTrScriptB.toXOnlyHex(), 'OP_CHECKSIG']);
 
-    late final ECPrivate fromPriv = ECPrivate.fromWif(
-        "cT33CWKwcV8afBs5NYzeSzeSoGETtAB8izjDjMEuGqyqPoF7fbQR",
+    late final fromPriv = ECPrivate.fromWif(
+        'cT33CWKwcV8afBs5NYzeSzeSoGETtAB8izjDjMEuGqyqPoF7fbQR',
         netVersion: BitcoinNetwork.testnet.wifNetVer);
     late final fromPub = fromPriv.getPublic();
     late final fromAddress = fromPub.toTaprootAddress(scripts: [
@@ -151,8 +151,8 @@ void main() {
             '808ec85db7b005f1292cea744b24e9d72ba4695e065e2d968ca17744b5c5c14d',
         txIndex: 0);
 
-    late final ECPrivate toPriv = ECPrivate.fromWif(
-        "cNxX8M7XU8VNa5ofd8yk1eiZxaxNrQQyb7xNpwAmsrzEhcVwtCjs",
+    late final toPriv = ECPrivate.fromWif(
+        'cNxX8M7XU8VNa5ofd8yk1eiZxaxNrQQyb7xNpwAmsrzEhcVwtCjs',
         netVersion: BitcoinNetwork.testnet.wifNetVer);
     late final toPub = toPriv.getPublic();
     late final toAddress = toPub.toTaprootAddress();
@@ -161,12 +161,12 @@ void main() {
 
     late final scriptPubkey = fromAddress.toScriptPubKey();
     late final allUtxosScriptpubkeys = [scriptPubkey];
-    const String signedTx3 =
-        "020000000001014dc1c5b54477a18c962d5e065e69a42bd7e9244b74ea2c29f105b0b75dc88e800000000000ffffffff01b80b000000000000225120d4213cd57207f22a9e905302007b99b84491534729bd5f4065bdcb42ed10fcd50340ab89d20fee5557e57b7cf85840721ef28d68e91fd162b2d520e553b71d604388ea7c4b2fcc4d946d5d3be3c12ef2d129ffb92594bc1f42cdaec8280d0c83ecc2222013f523102815e9fbbe132ffb8329b0fef5a9e4836d216dce1824633287b0abc6ac41c01036a7ed8d24eac9057e114f22342ebf20c16d37f0d25cfd2c900bf401ec09c9682f0e85d59cb20fd0e4503c035d609f127c786136f276d475e8321ec9e77e6c00000000";
+    const signedTx3 =
+        '020000000001014dc1c5b54477a18c962d5e065e69a42bd7e9244b74ea2c29f105b0b75dc88e800000000000ffffffff01b80b000000000000225120d4213cd57207f22a9e905302007b99b84491534729bd5f4065bdcb42ed10fcd50340ab89d20fee5557e57b7cf85840721ef28d68e91fd162b2d520e553b71d604388ea7c4b2fcc4d946d5d3be3c12ef2d129ffb92594bc1f42cdaec8280d0c83ecc2222013f523102815e9fbbe132ffb8329b0fef5a9e4836d216dce1824633287b0abc6ac41c01036a7ed8d24eac9057e114f22342ebf20c16d37f0d25cfd2c900bf401ec09c9682f0e85d59cb20fd0e4503c035d609f127c786136f276d475e8321ec9e77e6c00000000';
 
     // 1-spend taproot from first script path (A) of two (A,B)
-    test("test_spend_script_path_A_from_AB", () {
-      BtcTransaction tx =
+    test('test_spend_script_path_A_from_AB', () {
+      var tx =
           BtcTransaction(inputs: [txIn], outputs: [txOut], hasSegwit: true);
 
       final txDigit = tx.getTransactionTaprootDigset(
@@ -194,7 +194,7 @@ void main() {
     });
   });
 
-  group("TestCreateP2trWithThreeTapScripts", () {
+  group('TestCreateP2trWithThreeTapScripts', () {
     // 1-spend taproot from key path (has three tapleaf script for spending)
     final privkeyTrScriptA = ECPrivate.fromWif(
         'cSW2kQbqC9zkqagw8oTYKFTozKuZ214zd6CMTDs4V32cMfH3dgKa',
@@ -245,11 +245,11 @@ void main() {
     final scriptPubkey = fromAddress.toScriptPubKey();
     final allUtxosScriptPubkeys = [scriptPubkey];
 
-    const String signedTx =
+    const signedTx =
         '02000000000101d387dafa20087c38044f3cbc2e93e1e0141e64265d304d0d44b233f3d0018a9b0000000000ffffffff01b80b000000000000225120d4213cd57207f22a9e905302007b99b84491534729bd5f4065bdcb42ed10fcd50340644e392f5fd88d812bad30e73ff9900cdcf7f260ecbc862819542fd4683fa9879546613be4e2fc762203e45715df1a42c65497a63edce5f1dfe5caea5170273f2220e808f1396f12a253cf00efdf841e01c8376b616fb785c39595285c30f2817e71ac61c01036a7ed8d24eac9057e114f22342ebf20c16d37f0d25cfd2c900bf401ec09c9ed9f1b2b0090138e31e11a31c1aea790928b7ce89112a706e5caa703ff7e0ab928109f92c2781611bb5de791137cbd40a5482a4a23fd0ffe50ee4de9d5790dd100000000';
 
-    test("test_spend_script_path_A_from_AB", () {
-      BtcTransaction tx =
+    test('test_spend_script_path_A_from_AB', () {
+      var tx =
           BtcTransaction(inputs: [txIn], outputs: [txOut], hasSegwit: true);
       final digit = tx.getTransactionTaprootDigset(
           txIndex: 0,
@@ -257,10 +257,7 @@ void main() {
           scriptPubKeys: allUtxosScriptPubkeys.map((e) => e).toList(),
           script: trScriptP2pkB,
           amounts: allAmounts.map((e) => e).toList());
-      final sig = privkeyTrScriptB.signTapRoot(
-        digit,
-        tweak: false,
-      );
+      final sig = privkeyTrScriptB.signTapRoot(digit, tweak: false);
 
       final leafA = toTapleafTaggedHash(trScriptP2pkA.toBytes());
       final leafC = toTapleafTaggedHash(trScriptP2pkC.toBytes());
diff --git a/test/p2wpkh_test.dart b/test/p2wpkh_test.dart
index badf9b8..df0fe36 100644
--- a/test/p2wpkh_test.dart
+++ b/test/p2wpkh_test.dart
@@ -2,9 +2,9 @@ import 'package:bitcoin_base/bitcoin_base.dart';
 import 'package:test/test.dart';
 
 void main() {
-  group("P2WPKH", () {
+  group('P2WPKH', () {
     final sk = ECPrivate.fromWif(
-        "cTALNpTpRbbxTCJ2A5Vq88UxT44w1PE2cYqiB3n4hRvzyCev1Wwo",
+        'cTALNpTpRbbxTCJ2A5Vq88UxT44w1PE2cYqiB3n4hRvzyCev1Wwo',
         netVersion: BitcoinNetwork.testnet.wifNetVer);
 
     final p2pkhAddr = sk.getPublic().toAddress();
@@ -13,7 +13,7 @@ void main() {
 
     final txin1 = TxInput(
         txId:
-            "5a7b3aaa66d6b7b7abcdc9f1d05db4eee94a700297a319e19454e143875e1078",
+            '5a7b3aaa66d6b7b7abcdc9f1d05db4eee94a700297a319e19454e143875e1078',
         txIndex: 0);
 
     final txout1 = TxOutput(
@@ -21,7 +21,7 @@ void main() {
 
     final txinSpend = TxInput(
         txId:
-            "b3ca1c4cc778380d1e5376a5517445104e46e97176e40741508a3b07a6483ad3",
+            'b3ca1c4cc778380d1e5376a5517445104e46e97176e40741508a3b07a6483ad3',
         txIndex: 0);
     final txinSpendAmount = BigInt.from(990000);
     final txout2 = TxOutput(
@@ -36,12 +36,12 @@ void main() {
 
     final txinSpendP2pkh = TxInput(
         txId:
-            "1e2a5279c868d61fb2ff0b1c2b04aa3eff02cd74952a8b4e799532635a9132cc",
+            '1e2a5279c868d61fb2ff0b1c2b04aa3eff02cd74952a8b4e799532635a9132cc',
         txIndex: 0);
 
     final txinSpendP2wpkh = TxInput(
         txId:
-            "fff39047310fbf04bdd0e0bc75dde4267ae4d25219d8ad95e0ca1cee907a60da",
+            'fff39047310fbf04bdd0e0bc75dde4267ae4d25219d8ad95e0ca1cee907a60da',
         txIndex: 0);
     final txinSpendP2wpkhAmount = BigInt.from(950000);
 
@@ -50,7 +50,7 @@ void main() {
 
     final txin1Signone = TxInput(
         txId:
-            "fb4c338a00a75d73f9a6bd203ed4bd8884edeb111fac25a7946d5df6562f1942",
+            'fb4c338a00a75d73f9a6bd203ed4bd8884edeb111fac25a7946d5df6562f1942',
         txIndex: 0);
     final txin1SignoneAmount = BigInt.from(1000000);
 
@@ -61,7 +61,7 @@ void main() {
 
     final txin1Sigsingle = TxInput(
         txId:
-            "b04909d4b5239a56d676c1d9d722f325a86878c9aa535915aa0df97df47cedeb",
+            'b04909d4b5239a56d676c1d9d722f325a86878c9aa535915aa0df97df47cedeb',
         txIndex: 0);
     final txin1SigsingleAmount = BigInt.from(1930000);
 
@@ -72,13 +72,13 @@ void main() {
 
     final txin1SiganyonecanpayAll = TxInput(
         txId:
-            "f67e97a2564dceed405e214843e3c954b47dd4f8b26ea48f82382f51f7626036",
+            'f67e97a2564dceed405e214843e3c954b47dd4f8b26ea48f82382f51f7626036',
         txIndex: 0);
     final txin1SiganyonecanpayAllAmount = BigInt.from(180000);
 
     final txin2SiganyonecanpayAll = TxInput(
         txId:
-            "f4afddb77cd11a79bed059463085382c50d60c7f9e4075d8469cfe60040f68eb",
+            'f4afddb77cd11a79bed059463085382c50d60c7f9e4075d8469cfe60040f68eb',
         txIndex: 0);
     final txin2SiganyonecanpayAllAmount = BigInt.from(180000);
 
@@ -89,13 +89,13 @@ void main() {
 
     final txin1SiganyonecanpayNone = TxInput(
         txId:
-            "d2ae5d4a3f390f108769139c9b5757846be6693b785c4e21eab777eec7289095",
+            'd2ae5d4a3f390f108769139c9b5757846be6693b785c4e21eab777eec7289095',
         txIndex: 0);
     final txin1SiganyonecanpayNoneAmount = BigInt.from(900000);
 
     final txin2SiganyonecanpayNone = TxInput(
         txId:
-            "ee5062d426677372e6de96e2eb47d572af5deaaef3ef225f3179dfa1ece3f4f5",
+            'ee5062d426677372e6de96e2eb47d572af5deaaef3ef225f3179dfa1ece3f4f5',
         txIndex: 0);
     final txin2SiganyonecanpayNoneAmount = BigInt.from(700000);
 
@@ -106,7 +106,7 @@ void main() {
 
     final txin1SiganyonecanpaySingle = TxInput(
         txId:
-            "c7bb5672266c8a5b64fe91e953a9e23e3206e3b1a2ddc8e5999b607b82485042",
+            'c7bb5672266c8a5b64fe91e953a9e23e3206e3b1a2ddc8e5999b607b82485042',
         txIndex: 0);
     final txin1SiganyonecanpaySingleAmount = BigInt.from(1000000);
 
@@ -116,22 +116,22 @@ void main() {
         amount: BigInt.from(490000), scriptPubKey: p2pkhAddr.toScriptPubKey());
 
     const createSendToP2wpkhResult =
-        "020000000178105e8743e15494e119a39702704ae9eeb45dd0f1c9cdabb7b7d666aa3a7b5a000000006a4730440220415155963673e5582aadfdb8d53874c9764cfd56c28be8d5f2838fdab6365f9902207bf28f875e15ff53e81f3245feb07c6120df4a653feabba3b7bf274790ea1fd1012102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a546ffffffff01301b0f0000000000160014fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a00000000";
+        '020000000178105e8743e15494e119a39702704ae9eeb45dd0f1c9cdabb7b7d666aa3a7b5a000000006a4730440220415155963673e5582aadfdb8d53874c9764cfd56c28be8d5f2838fdab6365f9902207bf28f875e15ff53e81f3245feb07c6120df4a653feabba3b7bf274790ea1fd1012102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a546ffffffff01301b0f0000000000160014fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a00000000';
     const spendP2pkhResult =
-        "02000000000101d33a48a6073b8a504107e47671e9464e10457451a576531e0d3878c74c1ccab30000000000ffffffff0120f40e00000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88ac0247304402201c7ec9b049daa99c78675810b5e36b0b61add3f84180eaeaa613f8525904bdc302204854830d463a4699b6d69e37c08b8d3c6158185d46499170cfcc24d4a9e9a37f012102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a54600000000";
+        '02000000000101d33a48a6073b8a504107e47671e9464e10457451a576531e0d3878c74c1ccab30000000000ffffffff0120f40e00000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88ac0247304402201c7ec9b049daa99c78675810b5e36b0b61add3f84180eaeaa613f8525904bdc302204854830d463a4699b6d69e37c08b8d3c6158185d46499170cfcc24d4a9e9a37f012102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a54600000000';
     const p2pkhAndP2wpkhToP2pkhResult =
-        "02000000000102cc32915a633295794e8b2a9574cd02ff3eaa042b1c0bffb21fd668c879522a1e000000006a47304402200fe842622e656a6780093f60b0597a36a57481611543a2e9576f9e8f1b34edb8022008ba063961c600834760037be20f45bbe077541c533b3fd257eae8e08d0de3b3012102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a546ffffffffda607a90ee1ccae095add81952d2e47a26e4dd75bce0d0bd04bf0f314790f3ff0000000000ffffffff01209a1d00000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88ac00024730440220274bb5445294033a36c360c48cc5e441ba8cc2bc1554dcb7d367088ec40a0d0302202a36f6e03f969e1b0c582f006257eec8fa2ada8cd34fe41ae2aa90d6728999d1012102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a54600000000";
+        '02000000000102cc32915a633295794e8b2a9574cd02ff3eaa042b1c0bffb21fd668c879522a1e000000006a47304402200fe842622e656a6780093f60b0597a36a57481611543a2e9576f9e8f1b34edb8022008ba063961c600834760037be20f45bbe077541c533b3fd257eae8e08d0de3b3012102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a546ffffffffda607a90ee1ccae095add81952d2e47a26e4dd75bce0d0bd04bf0f314790f3ff0000000000ffffffff01209a1d00000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88ac00024730440220274bb5445294033a36c360c48cc5e441ba8cc2bc1554dcb7d367088ec40a0d0302202a36f6e03f969e1b0c582f006257eec8fa2ada8cd34fe41ae2aa90d6728999d1012102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a54600000000';
     const testSignoneSendResult =
-        "0200000000010142192f56f65d6d94a725ac1f11ebed8488bdd43e20bda6f9735da7008a334cfb0000000000ffffffff0200350c00000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88ac30e60200000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88ac0247304402202c47de56a42143ea94c15bdeee237104524a009e50d5359596f7c6f2208a280b022076d6be5dcab09f7645d1ee001c1af14f44420c0d0b16724d741d2a5c19816902022102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a54600000000";
+        '0200000000010142192f56f65d6d94a725ac1f11ebed8488bdd43e20bda6f9735da7008a334cfb0000000000ffffffff0200350c00000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88ac30e60200000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88ac0247304402202c47de56a42143ea94c15bdeee237104524a009e50d5359596f7c6f2208a280b022076d6be5dcab09f7645d1ee001c1af14f44420c0d0b16724d741d2a5c19816902022102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a54600000000';
     const testSigsingleSendResult =
-        "02000000000101ebed7cf47df90daa155953aac97868a825f322d7d9c176d6569a23b5d40949b00000000000ffffffff0240420f00000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88acc0090e00000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88ac0247304402205189808e5cd0d49a8211202ea1afd7d01c180892ddf054508c349c2aa5630ee202202cbe5efa11fdde964603f4b9112d5e9ac452fba2e8ad5b6cddffbc8f0043b59e032102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a54600000000";
+        '02000000000101ebed7cf47df90daa155953aac97868a825f322d7d9c176d6569a23b5d40949b00000000000ffffffff0240420f00000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88acc0090e00000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88ac0247304402205189808e5cd0d49a8211202ea1afd7d01c180892ddf054508c349c2aa5630ee202202cbe5efa11fdde964603f4b9112d5e9ac452fba2e8ad5b6cddffbc8f0043b59e032102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a54600000000';
     const testSiganyonecanpayAllSendResult =
-        "02000000000102366062f7512f38828fa46eb2f8d47db454c9e34348215e40edce4d56a2977ef60000000000ffffffffeb680f0460fe9c46d875409e7f0cd6502c3885304659d0be791ad17cb7ddaff40000000000ffffffff0220bf0200000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88ac10980200000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88ac024730440220046813b802c046c9cfa309e85d1f36b17f1eb1dfb3e8d3c4ae2f74915a3b1c1f02200c5631038bb8b6c7b5283892bb1279a40e7ac13d2392df0c7b36bde7444ec54c812102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a5460247304402206fb60dc79b5ca6c699d04ec96c4f196938332c2909fd17c04023ebcc7408f36e02202b071771a58c84e20b7bf1fcec05c0ef55c1100436a055bfcb2bf7ed1c0683a9012102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a54600000000";
+        '02000000000102366062f7512f38828fa46eb2f8d47db454c9e34348215e40edce4d56a2977ef60000000000ffffffffeb680f0460fe9c46d875409e7f0cd6502c3885304659d0be791ad17cb7ddaff40000000000ffffffff0220bf0200000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88ac10980200000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88ac024730440220046813b802c046c9cfa309e85d1f36b17f1eb1dfb3e8d3c4ae2f74915a3b1c1f02200c5631038bb8b6c7b5283892bb1279a40e7ac13d2392df0c7b36bde7444ec54c812102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a5460247304402206fb60dc79b5ca6c699d04ec96c4f196938332c2909fd17c04023ebcc7408f36e02202b071771a58c84e20b7bf1fcec05c0ef55c1100436a055bfcb2bf7ed1c0683a9012102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a54600000000';
     const testSiganyonecanpayNoneSendResult =
-        "02000000000102959028c7ee77b7ea214e5c783b69e66b8457579b9c136987100f393f4a5daed20000000000fffffffff5f4e3eca1df79315f22eff3aeea5daf72d547ebe296dee672736726d46250ee0000000000ffffffff0200350c00000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88ac60ae0a00000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88ac0247304402203bbcbd2003244e9ccde7f705d3017f3baa2cb2d47efb63ede7e39704eff3987702206932aa4b402de898ff2fd3b2182f344dc9051b4c326dacc07b1e59059042f3ad822102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a54602473044022052dd29ab8bb0814b13633691148feceded29466ff8a1812d6d51c6fa53c55b5402205f25b3ae0da860da29a6745b0b587aa3fc3e05bef3121d3693ca2e3f4c2c3195012102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a54600000000";
+        '02000000000102959028c7ee77b7ea214e5c783b69e66b8457579b9c136987100f393f4a5daed20000000000fffffffff5f4e3eca1df79315f22eff3aeea5daf72d547ebe296dee672736726d46250ee0000000000ffffffff0200350c00000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88ac60ae0a00000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88ac0247304402203bbcbd2003244e9ccde7f705d3017f3baa2cb2d47efb63ede7e39704eff3987702206932aa4b402de898ff2fd3b2182f344dc9051b4c326dacc07b1e59059042f3ad822102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a54602473044022052dd29ab8bb0814b13633691148feceded29466ff8a1812d6d51c6fa53c55b5402205f25b3ae0da860da29a6745b0b587aa3fc3e05bef3121d3693ca2e3f4c2c3195012102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a54600000000';
     const testSiganyonecanpaySingleSendResult =
-        "02000000000101425048827b609b99e5c8dda2b1e306323ee2a953e991fe645b8a6c267256bbc70000000000ffffffff0220a10700000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88ac107a0700000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88ac02473044022064b63a1da4181764a1e8246d353b72c420999c575807ec80329c64264fd5b19e022076ec4ba6c02eae7dc9340f8c76956d5efb7d0fbad03b1234297ebed8c38e43d8832102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a54600000000";
-    test("test_signed_send_to_p2wpkh", () {
+        '02000000000101425048827b609b99e5c8dda2b1e306323ee2a953e991fe645b8a6c267256bbc70000000000ffffffff0220a10700000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88ac107a0700000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88ac02473044022064b63a1da4181764a1e8246d353b72c420999c575807ec80329c64264fd5b19e022076ec4ba6c02eae7dc9340f8c76956d5efb7d0fbad03b1234297ebed8c38e43d8832102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a54600000000';
+    test('test_signed_send_to_p2wpkh', () {
       final tx = BtcTransaction(inputs: [txin1], outputs: [txout1]);
       final digit = tx.getTransactionDigest(
           txInIndex: 0, script: p2pkhAddr.toScriptPubKey());
@@ -139,21 +139,19 @@ void main() {
       txin1.scriptSig = Script(script: [sig, sk.getPublic().toHex()]);
       expect(tx.serialize(), createSendToP2wpkhResult);
     });
-    test("test_spend_p2wpkh", () {
-      BtcTransaction tx = BtcTransaction(
+    test('test_spend_p2wpkh', () {
+      var tx = BtcTransaction(
           inputs: [txinSpend], outputs: [txout2], hasSegwit: true);
       final digit = tx.getTransactionSegwitDigit(
           txInIndex: 0, script: p2pkhRedeemScript, amount: txinSpendAmount);
       final sig = sk.signInput(digit);
-      // tx.addWitnesses();
       tx = tx.copyWith(witnesses: [
         TxWitnessInput(stack: [sig, sk.getPublic().toHex()])
       ]);
-      // txin1.scriptSig = Script(script: [sig, sk.getPublic().toHex()]);
       expect(tx.serialize(), spendP2pkhResult);
     });
-    test("test_p2pkh_and_p2wpkh_to_p2pkh", () {
-      BtcTransaction tx = BtcTransaction(
+    test('test_p2pkh_and_p2wpkh_to_p2pkh', () {
+      var tx = BtcTransaction(
           inputs: [txinSpendP2pkh, txinSpendP2wpkh],
           outputs: [txout3],
           hasSegwit: true);
@@ -161,21 +159,19 @@ void main() {
           txInIndex: 0, script: p2pkhAddr.toScriptPubKey());
       final sig = sk.signInput(digit);
       txinSpendP2pkh.scriptSig = Script(script: [sig, sk.getPublic().toHex()]);
-      // tx.addWitnesses(TxWitnessInput(stack: []));
       final segwitDigit = tx.getTransactionSegwitDigit(
           amount: txinSpendP2wpkhAmount,
           script: p2pkhRedeemScript,
           txInIndex: 1);
       final sig2 = sk.signInput(segwitDigit);
-      // tx.addWitnesses(TxWitnessInput(stack: [sig2, sk.getPublic().toHex()]));
       tx = tx.copyWith(witnesses: [
         TxWitnessInput(stack: []),
         TxWitnessInput(stack: [sig2, sk.getPublic().toHex()])
       ]);
       expect(tx.serialize(), p2pkhAndP2wpkhToP2pkhResult);
     });
-    test("test_signone_send", () {
-      BtcTransaction tx = BtcTransaction(
+    test('test_signone_send', () {
+      var tx = BtcTransaction(
           inputs: [txin1Signone], outputs: [txout1Signone], hasSegwit: true);
       final digit = tx.getTransactionSegwitDigit(
           txInIndex: 0,
@@ -183,7 +179,6 @@ void main() {
           amount: txin1SignoneAmount,
           sighash: BitcoinOpCodeConst.SIGHASH_NONE);
       final sig = sk.signInput(digit, sigHash: BitcoinOpCodeConst.SIGHASH_NONE);
-      // tx.addWitnesses();
       tx = tx.copyWith(witnesses: [
         TxWitnessInput(stack: [sig, sk.getPublic().toHex()])
       ]);
@@ -191,8 +186,8 @@ void main() {
 
       expect(tx.serialize(), testSignoneSendResult);
     });
-    test("test_sigsingle_send", () {
-      BtcTransaction tx = BtcTransaction(
+    test('test_sigsingle_send', () {
+      var tx = BtcTransaction(
           inputs: [txin1Sigsingle],
           outputs: [txout1Sigsingle],
           hasSegwit: true);
@@ -210,8 +205,8 @@ void main() {
 
       expect(tx.serialize(), testSigsingleSendResult);
     });
-    test("test_siganyonecanpay_all_send", () {
-      BtcTransaction tx = BtcTransaction(
+    test('test_siganyonecanpay_all_send', () {
+      var tx = BtcTransaction(
           inputs: [txin1SiganyonecanpayAll],
           outputs: [txout1SiganyonecanpayAll, txout2SiganyonecanpayAll],
           hasSegwit: true);
@@ -225,9 +220,7 @@ void main() {
           sigHash: BitcoinOpCodeConst.SIGHASH_ALL |
               BitcoinOpCodeConst.SIGHASH_ANYONECANPAY);
 
-      // tx.addWitnesses(TxWitnessInput(stack: [sig, sk.getPublic().toHex()]));
       tx = tx.copyWith(inputs: [...tx.inputs, txin2SiganyonecanpayAll]);
-      // tx.inputs.add(txin2SiganyonecanpayAll);
       final digit2 = tx.getTransactionSegwitDigit(
           txInIndex: 1,
           script: p2pkhRedeemScript,
@@ -235,7 +228,6 @@ void main() {
           sighash: BitcoinOpCodeConst.SIGHASH_ALL);
       final sig2 =
           sk.signInput(digit2, sigHash: BitcoinOpCodeConst.SIGHASH_ALL);
-      // tx.addWitnesses();
       tx = tx.copyWith(witnesses: [
         TxWitnessInput(stack: [sig, sk.getPublic().toHex()]),
         TxWitnessInput(stack: [sig2, sk.getPublic().toHex()])
@@ -244,8 +236,8 @@ void main() {
       expect(tx.serialize(), testSiganyonecanpayAllSendResult);
     });
 
-    test("test_siganyonecanpay_none_send", () {
-      BtcTransaction tx = BtcTransaction(
+    test('test_siganyonecanpay_none_send', () {
+      var tx = BtcTransaction(
           inputs: [txin1SiganyonecanpayNone],
           outputs: [txout1SiganyonecanpayNone],
           hasSegwit: true);
@@ -258,9 +250,7 @@ void main() {
       final sig = sk.signInput(digit,
           sigHash: BitcoinOpCodeConst.SIGHASH_NONE |
               BitcoinOpCodeConst.SIGHASH_ANYONECANPAY);
-      // tx.addWitnesses();
       tx = tx.copyWith(inputs: [...tx.inputs, txin2SiganyonecanpayNone]);
-      // tx.inputs.add(txin2SiganyonecanpayNone);
       tx = tx.copyWith(outputs: [...tx.outputs, txout2SiganyonecanpayNone]);
       final digit2 = tx.getTransactionSegwitDigit(
           txInIndex: 1,
@@ -269,7 +259,6 @@ void main() {
           sighash: BitcoinOpCodeConst.SIGHASH_ALL);
       final sig2 =
           sk.signInput(digit2, sigHash: BitcoinOpCodeConst.SIGHASH_ALL);
-      // tx.addWitnesses();
       tx = tx.copyWith(witnesses: [
         TxWitnessInput(stack: [sig, sk.getPublic().toHex()]),
         TxWitnessInput(stack: [sig2, sk.getPublic().toHex()])
@@ -278,8 +267,8 @@ void main() {
       final fromRaw = BtcTransaction.fromRaw(tx.serialize());
       expect(fromRaw.serialize(), tx.serialize());
     });
-    test("test_siganyonecanpay_single_send", () {
-      BtcTransaction tx = BtcTransaction(
+    test('test_siganyonecanpay_single_send', () {
+      var tx = BtcTransaction(
           inputs: [txin1SiganyonecanpaySingle],
           outputs: [txout1SiganyonecanpaySingle],
           hasSegwit: true);
@@ -292,7 +281,6 @@ void main() {
       final sig = sk.signInput(digit,
           sigHash: BitcoinOpCodeConst.SIGHASH_SINGLE |
               BitcoinOpCodeConst.SIGHASH_ANYONECANPAY);
-      // tx.addWitnesses();
       tx = tx.copyWith(witnesses: [
         TxWitnessInput(stack: [sig, sk.getPublic().toHex()])
       ]);
diff --git a/test/p2wsh_test.dart b/test/p2wsh_test.dart
index 1b78659..d13b753 100644
--- a/test/p2wsh_test.dart
+++ b/test/p2wsh_test.dart
@@ -2,12 +2,12 @@ import 'package:bitcoin_base/bitcoin_base.dart';
 import 'package:test/test.dart';
 
 void main() {
-  group("P2WSH", () {
+  group('P2WSH', () {
     final sk1 = ECPrivate.fromWif(
-        "cTALNpTpRbbxTCJ2A5Vq88UxT44w1PE2cYqiB3n4hRvzyCev1Wwo",
+        'cTALNpTpRbbxTCJ2A5Vq88UxT44w1PE2cYqiB3n4hRvzyCev1Wwo',
         netVersion: BitcoinNetwork.testnet.wifNetVer);
     final sk2 = ECPrivate.fromWif(
-        "cRvyLwCPLU88jsyj94L7iJjQX5C2f8koG4G2gevN4BeSGcEvfKe9",
+        'cRvyLwCPLU88jsyj94L7iJjQX5C2f8koG4G2gevN4BeSGcEvfKe9',
         netVersion: BitcoinNetwork.testnet.wifNetVer);
 
     final p2wshScript = Script(script: [
@@ -24,14 +24,14 @@ void main() {
 
     final txin1 = TxInput(
         txId:
-            "6e9a0692ed4b3328909d66d41531854988dc39edba5df186affaefda91824e69",
+            '6e9a0692ed4b3328909d66d41531854988dc39edba5df186affaefda91824e69',
         txIndex: 0);
     final txout1 = TxOutput(
         amount: BigInt.from(970000), scriptPubKey: p2wshAddr.toScriptPubKey());
 
     final txinSpend = TxInput(
         txId:
-            "6233aca9f2d6165da2d7b4e35d73b039a22b53f58ce5af87dddee7682be937ea",
+            '6233aca9f2d6165da2d7b4e35d73b039a22b53f58ce5af87dddee7682be937ea',
         txIndex: 0);
     final txinSpendAmount = BigInt.from(970000);
     final txout2 = TxOutput(
@@ -40,18 +40,18 @@ void main() {
 
     final txin1Multiple = TxInput(
         txId:
-            "24d949f8c77d7fc0cd09c8d5fccf7a0249178c16170c738da19f6c4b176c9f4b",
+            '24d949f8c77d7fc0cd09c8d5fccf7a0249178c16170c738da19f6c4b176c9f4b',
         txIndex: 0);
 
     final txin2Multiple = TxInput(
         txId:
-            "65f4d69c91a8de54dc11096eaa315e84ef91a389d1d1c17a691b72095100a3a4",
+            '65f4d69c91a8de54dc11096eaa315e84ef91a389d1d1c17a691b72095100a3a4',
         txIndex: 0);
     final txin2MultipleAmount = BigInt.from(690000);
 
     final txin3Multiple = TxInput(
         txId:
-            "6c8fc6453a2a3039c2b5b55dcc59587e8b0afa52f92607385b5f4c7e84f38aa2",
+            '6c8fc6453a2a3039c2b5b55dcc59587e8b0afa52f92607385b5f4c7e84f38aa2',
         txIndex: 0);
     final txin3MultipleAmount = BigInt.from(790000);
 
@@ -64,12 +64,12 @@ void main() {
         amount: BigInt.from(1770000), scriptPubKey: p2pkhAddr.toScriptPubKey());
 
     const createSendToP2pkhResult =
-        "0200000001694e8291daeffaaf86f15dbaed39dc8849853115d4669d9028334bed92069a6e000000006a473044022038516db4e67c9217b871c690c09f60a57235084f888e23b8ac77ba01d0cba7ae022027a811be50cf54718fc6b88ea900bfa9c8d3e218208fef0e185163e3a47d9a08012102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a546ffffffff0110cd0e00000000002200203956f9730cf7275000f4e3faf5db0505b216222c1f7ca1bdfb81a877003fcb9300000000";
+        '0200000001694e8291daeffaaf86f15dbaed39dc8849853115d4669d9028334bed92069a6e000000006a473044022038516db4e67c9217b871c690c09f60a57235084f888e23b8ac77ba01d0cba7ae022027a811be50cf54718fc6b88ea900bfa9c8d3e218208fef0e185163e3a47d9a08012102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a546ffffffff0110cd0e00000000002200203956f9730cf7275000f4e3faf5db0505b216222c1f7ca1bdfb81a877003fcb9300000000';
     const spendP2pkhResult =
-        "02000000000101ea37e92b68e7dedd87afe58cf5532ba239b0735de3b4d7a25d16d6f2a9ac33620000000000ffffffff0100a60e00000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88ac040047304402205c88b6c247c6b59e1cc48493b66629b6c011d97b99ecf991b595e891542cf1a802204fa0e3c238818a65adc87a0b2511ba780e4b57ff6c1ba6b27815b1dca7b72c1c01473044022012840e38d61972f32208c23a05c73952cc36503112b0c2250fc8428b1e9c5fe4022051758dc7ce32567e2b71efb9df6dc161c9ec4bc0c2e8116c4228d27810cdb4d70147522102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a5462103a2fef1829e0742b89c218c51898d9e7cb9d51201ba2bf9d9e9214ebb6af3270852ae00000000";
+        '02000000000101ea37e92b68e7dedd87afe58cf5532ba239b0735de3b4d7a25d16d6f2a9ac33620000000000ffffffff0100a60e00000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88ac040047304402205c88b6c247c6b59e1cc48493b66629b6c011d97b99ecf991b595e891542cf1a802204fa0e3c238818a65adc87a0b2511ba780e4b57ff6c1ba6b27815b1dca7b72c1c01473044022012840e38d61972f32208c23a05c73952cc36503112b0c2250fc8428b1e9c5fe4022051758dc7ce32567e2b71efb9df6dc161c9ec4bc0c2e8116c4228d27810cdb4d70147522102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a5462103a2fef1829e0742b89c218c51898d9e7cb9d51201ba2bf9d9e9214ebb6af3270852ae00000000';
     const multipleInputMultipleOuputResult =
-        "020000000001034b9f6c174b6c9fa18d730c17168c1749027acffcd5c809cdc07f7dc7f849d924000000006a47304402206932c93458a6ebb85f9fd6f69666cd383a3b8c8d517a096501438840d90493070220544d996a737ca9affda3573635b09e215be1ffddbee9b1260fc3d85d61d90ae5012102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a546ffffffffa4a3005109721b697ac1d1d189a391ef845e31aa6e0911dc54dea8919cd6f4650000000000ffffffffa28af3847e4c5f5b380726f952fa0a8b7e5859cc5db5b5c239302a3a45c68f6c0000000000ffffffff03a0860100000000002200203956f9730cf7275000f4e3faf5db0505b216222c1f7ca1bdfb81a877003fcb93a086010000000000160014fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a10021b00000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88ac00040047304402206503d3610d916835412449f262c8623146503d6f58c9b0343e8d1670b906c4da02200b2b8db13ddc9f157bb95e74c28d273adce49944307aa6a041dba1ed7c528d610147304402207ea74eff48e56f2c0d9afb70b2a90ebf6fcd3ce1e084350f3c061f88dde5eff402203c841f7bf969d04b383ebb1dee4118724bfc9da0260b10f64a0ba7ef3a8d43f00147522102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a5462103a2fef1829e0742b89c218c51898d9e7cb9d51201ba2bf9d9e9214ebb6af3270852ae024730440220733fcbd21517a1559e9561668e480ffd0a24b62520cfa16ca7689b20f7f82be402204f053a27f19e0bd1346676c74c65e9e452515bc6510ab307ac3a3fb6d3c89ca7012102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a54600000000";
-    test("test1", () {
+        '020000000001034b9f6c174b6c9fa18d730c17168c1749027acffcd5c809cdc07f7dc7f849d924000000006a47304402206932c93458a6ebb85f9fd6f69666cd383a3b8c8d517a096501438840d90493070220544d996a737ca9affda3573635b09e215be1ffddbee9b1260fc3d85d61d90ae5012102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a546ffffffffa4a3005109721b697ac1d1d189a391ef845e31aa6e0911dc54dea8919cd6f4650000000000ffffffffa28af3847e4c5f5b380726f952fa0a8b7e5859cc5db5b5c239302a3a45c68f6c0000000000ffffffff03a0860100000000002200203956f9730cf7275000f4e3faf5db0505b216222c1f7ca1bdfb81a877003fcb93a086010000000000160014fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a10021b00000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88ac00040047304402206503d3610d916835412449f262c8623146503d6f58c9b0343e8d1670b906c4da02200b2b8db13ddc9f157bb95e74c28d273adce49944307aa6a041dba1ed7c528d610147304402207ea74eff48e56f2c0d9afb70b2a90ebf6fcd3ce1e084350f3c061f88dde5eff402203c841f7bf969d04b383ebb1dee4118724bfc9da0260b10f64a0ba7ef3a8d43f00147522102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a5462103a2fef1829e0742b89c218c51898d9e7cb9d51201ba2bf9d9e9214ebb6af3270852ae024730440220733fcbd21517a1559e9561668e480ffd0a24b62520cfa16ca7689b20f7f82be402204f053a27f19e0bd1346676c74c65e9e452515bc6510ab307ac3a3fb6d3c89ca7012102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a54600000000';
+    test('test1', () {
       final tx = BtcTransaction(inputs: [txin1], outputs: [txout1]);
       final digit = tx.getTransactionDigest(
           txInIndex: 0, script: p2pkhAddr.toScriptPubKey());
@@ -77,8 +77,8 @@ void main() {
       txin1.scriptSig = Script(script: [sig, sk1.getPublic().toHex()]);
       expect(tx.serialize(), createSendToP2pkhResult);
     });
-    test("test2", () {
-      BtcTransaction tx = BtcTransaction(
+    test('test2', () {
+      var tx = BtcTransaction(
           inputs: [txinSpend], outputs: [txout2], hasSegwit: true);
       final digit1 = tx.getTransactionSegwitDigit(
           txInIndex: 0, script: p2wshRedeemScript, amount: txinSpendAmount);
@@ -91,8 +91,8 @@ void main() {
       ]);
       expect(tx.serialize(), spendP2pkhResult);
     });
-    test("test3", () {
-      BtcTransaction tx = BtcTransaction(
+    test('test3', () {
+      var tx = BtcTransaction(
           inputs: [txin1Multiple, txin2Multiple, txin3Multiple],
           outputs: [output1Multiple, output2Multiple, output3Multiple],
           hasSegwit: true);
diff --git a/test/xep_address_test.dart b/test/xep_address_test.dart
deleted file mode 100644
index f4628b3..0000000
--- a/test/xep_address_test.dart
+++ /dev/null
@@ -1,23 +0,0 @@
-import 'package:bitcoin_base/bitcoin_base.dart';
-import 'package:test/test.dart';
-
-void main() {
-  _test();
-}
-
-void _test() {
-  test("xep address parsing", () {
-    ElectraProtocolAddress address =
-        ElectraProtocolAddress("ep1qyv4uspwsphhvj5keth02dk37pd0gqzmt5tw973");
-    expect(address.type, SegwitAddressType.p2wpkh);
-    address =
-        ElectraProtocolAddress("ep1q2nxmsj9h9s6ps4tp5fce2vclm8uvkn00dtrnu7");
-    expect(address.type, SegwitAddressType.p2wpkh);
-    address = ElectraProtocolAddress("x8UFjR4n2h6hgFRJDdAna5nvN71qfsDmns");
-    expect(address.type, P2shAddressType.p2pkInP2sh);
-    address = ElectraProtocolAddress("xWzvSGpYUPucJaodadUh3yzEmLJGvHUYsP");
-    expect(address.type, P2shAddressType.p2pkInP2sh);
-    address = ElectraProtocolAddress("xWzvSGpYUPucJaodadUh3yzEmLJGvHUYsP");
-    expect(address.type, P2shAddressType.p2pkInP2sh);
-  });
-}

From b61964060abf768b656038d725a669c52cc87489 Mon Sep 17 00:00:00 2001
From: Mohsen <mrhaydari.t@gmail.com>
Date: Thu, 2 Jan 2025 15:54:07 +0330
Subject: [PATCH 37/62] V5.0.0

---
 analysis_options.yaml                         | 98 +++++++++----------
 lib/src/crypto/crypto.dart                    |  4 +-
 .../forked_transaction_builder.dart           |  4 +-
 .../transaction_builder.dart                  |  6 +-
 4 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/analysis_options.yaml b/analysis_options.yaml
index 32dccdb..c20153f 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -5,52 +5,52 @@ include: package:flutter_lints/flutter.yaml
 # Uncomment the following section to specify additional rules.
 linter:
   rules:
-    - always_declare_return_types
-    - annotate_overrides
-    - avoid_init_to_null
-    - avoid_null_checks_in_equality_operators
-    - avoid_relative_lib_imports
-    - avoid_return_types_on_setters
-    - avoid_shadowing_type_parameters
-    - avoid_single_cascade_in_expression_statements
-    - avoid_types_as_parameter_names
-    - await_only_futures
-    - camel_case_extensions
-    - curly_braces_in_flow_control_structures
-    - empty_catches
-    - empty_constructor_bodies
-    - library_names
-    - library_prefixes
-    - no_duplicate_case_values
-    - null_closures
-    - omit_local_variable_types
-    - prefer_adjacent_string_concatenation
-    - prefer_collection_literals
-    - prefer_conditional_assignment
-    - prefer_contains
-    - prefer_equal_for_default_values
-    - prefer_final_fields
-    - prefer_for_elements_to_map_fromIterable
-    - prefer_generic_function_type_aliases
-    - prefer_if_null_operators
-    - prefer_inlined_adds
-    - prefer_is_empty
-    - prefer_is_not_empty
-    - prefer_iterable_whereType
-    - prefer_single_quotes
-    - prefer_spread_collections
-    - recursive_getters
-    - slash_for_doc_comments
-    - sort_child_properties_last
-    - type_init_formals
-    - unawaited_futures
-    - unnecessary_brace_in_string_interps
-    - unnecessary_const
-    - unnecessary_getters_setters
-    - unnecessary_new
-    - unnecessary_null_in_if_null_operators
-    - unnecessary_this
-    - unrelated_type_equality_checks
-    - use_function_type_syntax_for_parameters
-    - use_rethrow_when_possible
-    - valid_regexps
\ No newline at end of file
+    # - always_declare_return_types
+    # - annotate_overrides
+    # - avoid_init_to_null
+    # - avoid_null_checks_in_equality_operators
+    # - avoid_relative_lib_imports
+    # - avoid_return_types_on_setters
+    # - avoid_shadowing_type_parameters
+    # - avoid_single_cascade_in_expression_statements
+    # - avoid_types_as_parameter_names
+    # - await_only_futures
+    # - camel_case_extensions
+    # - curly_braces_in_flow_control_structures
+    # - empty_catches
+    # - empty_constructor_bodies
+    # - library_names
+    # - library_prefixes
+    # - no_duplicate_case_values
+    # - null_closures
+    # - omit_local_variable_types
+    # - prefer_adjacent_string_concatenation
+    # - prefer_collection_literals
+    # - prefer_conditional_assignment
+    # - prefer_contains
+    # - prefer_equal_for_default_values
+    # - prefer_final_fields
+    # - prefer_for_elements_to_map_fromIterable
+    # - prefer_generic_function_type_aliases
+    # - prefer_if_null_operators
+    # - prefer_inlined_adds
+    # - prefer_is_empty
+    # - prefer_is_not_empty
+    # - prefer_iterable_whereType
+    # - prefer_single_quotes
+    # - prefer_spread_collections
+    # - recursive_getters
+    # - slash_for_doc_comments
+    # - sort_child_properties_last
+    # - type_init_formals
+    # - unawaited_futures
+    # - unnecessary_brace_in_string_interps
+    # - unnecessary_const
+    # - unnecessary_getters_setters
+    # - unnecessary_new
+    # - unnecessary_null_in_if_null_operators
+    # - unnecessary_this
+    # - unrelated_type_equality_checks
+    # - use_function_type_syntax_for_parameters
+    # - use_rethrow_when_possible
+    # - valid_regexps
\ No newline at end of file
diff --git a/lib/src/crypto/crypto.dart b/lib/src/crypto/crypto.dart
index 79079aa..c7fd1bc 100644
--- a/lib/src/crypto/crypto.dart
+++ b/lib/src/crypto/crypto.dart
@@ -9,9 +9,9 @@ export 'keypair/ec_public.dart';
 /// Function: taggedHash
 /// Description: Computes a tagged hash of the input data with a provided tag.
 /// Input:
-///   - List<int> data - The data to be hashed.
+///   - `List<int>` data - The data to be hashed.
 ///   - String tag - A unique tag to differentiate the hash.
-/// Output: List<int> - The resulting tagged hash.
+/// Output: `List<int>` - The resulting tagged hash.
 /// Note: This function combines the provided tag with the input data to create a unique
 /// hash by applying a double SHA-256 hash.
 List<int> taggedHash(List<int> data, String tag) {
diff --git a/lib/src/transaction_builder/forked_transaction_builder.dart b/lib/src/transaction_builder/forked_transaction_builder.dart
index 0980e9b..50fb343 100644
--- a/lib/src/transaction_builder/forked_transaction_builder.dart
+++ b/lib/src/transaction_builder/forked_transaction_builder.dart
@@ -168,7 +168,7 @@ class ForkedTransactionBuilder implements BasedBitcoinTransacationBuilder {
   /// - tapRootPubKeys: A List of of Script representing taproot public keys for P2TR inputs (ignored for non-P2TR inputs).
 //
   /// Returns:
-  /// - List<int>: representing the transaction digest to be used for signing the input.
+  /// - `List<int>`: representing the transaction digest to be used for signing the input.
   List<int> _generateTransactionDigest(
       {required Script scriptPubKeys,
       required int input,
@@ -193,7 +193,7 @@ class ForkedTransactionBuilder implements BasedBitcoinTransacationBuilder {
   /// - utx: A UtxoWithAddress instance representing the unspent transaction output (UTXO) and its owner details.
   //
   /// Returns:
-  /// - List<String>: A List of strings representing the script signature for the P2WSH or P2SH input.
+  /// - `List<String>`: A List of strings representing the script signature for the P2WSH or P2SH input.
   List<String> _buildMiltisigUnlockingScript(
       List<String> signedDigest, UtxoWithAddress utx) {
     /// The constructed script signature consists of the signed digest elements followed by
diff --git a/lib/src/transaction_builder/transaction_builder.dart b/lib/src/transaction_builder/transaction_builder.dart
index 57aafa8..eef8846 100644
--- a/lib/src/transaction_builder/transaction_builder.dart
+++ b/lib/src/transaction_builder/transaction_builder.dart
@@ -257,7 +257,7 @@ class BitcoinTransactionBuilder implements BasedBitcoinTransacationBuilder {
   /// - tapRootPubKeys: A List of of Script representing taproot public keys for P2TR inputs (ignored for non-P2TR inputs).
 //
   /// Returns:
-  /// - List<int>: representing the transaction digest to be used for signing the input.
+  /// - `List<int>`: representing the transaction digest to be used for signing the input.
   List<int> _generateTransactionDigest(
       Script scriptPubKeys,
       int input,
@@ -289,7 +289,7 @@ class BitcoinTransactionBuilder implements BasedBitcoinTransacationBuilder {
   /// - utx: A UtxoWithAddress instance representing the unspent transaction output (UTXO) and its owner details.
   //
   /// Returns:
-  /// - List<String>: A List of strings representing the script signature for the P2WSH or P2SH input.
+  /// - `List<String>`: A List of strings representing the script signature for the P2WSH or P2SH input.
   List<String> _buildMiltisigUnlockingScript(
       List<String> signedDigest, UtxoWithAddress utx) {
     /// The constructed script signature consists of the signed digest elements followed by
@@ -306,7 +306,7 @@ class BitcoinTransactionBuilder implements BasedBitcoinTransacationBuilder {
   /// - utxo: A UtxoWithAddress instance representing the unspent transaction output (UTXO) and its owner details.
   //
   /// Returns:
-  /// - List<string>: A List of strings representing the script signature for the P2SH SegWit input.
+  /// - `List<string>`: A List of strings representing the script signature for the P2SH SegWit input.
   List<String> _buildNestedSegwitReedemScript(UtxoWithAddress utxo) {
     if (utxo.isMultiSig()) {
       switch (utxo.utxo.scriptType) {

From 98825f14f2f13e225292dd874bb92eddd6c42cba Mon Sep 17 00:00:00 2001
From: Rafael Saes <git@rafael.saes.dev>
Date: Wed, 8 Jan 2025 17:21:37 -0300
Subject: [PATCH 38/62] refactor: misc, typos, and fix electrum getFees

---
 lib/src/bitcoin/address/segwit_address.dart   |   2 +-
 lib/src/bitcoin/address/util.dart             |   4 +-
 .../api_provider/electrum_api_provider.dart   |  14 +-
 .../provider/models/fee_rate/fee_rate.dart    |   4 +-
 .../forked_transaction_builder.dart           | 201 ++++++++++--------
 lib/src/utils/regex.dart                      |   2 +-
 6 files changed, 126 insertions(+), 101 deletions(-)

diff --git a/lib/src/bitcoin/address/segwit_address.dart b/lib/src/bitcoin/address/segwit_address.dart
index b45f4b0..994381b 100644
--- a/lib/src/bitcoin/address/segwit_address.dart
+++ b/lib/src/bitcoin/address/segwit_address.dart
@@ -201,7 +201,7 @@ class P2wshAddress extends SegwitAddress {
 class MwebAddress extends SegwitAddress {
   static RegExp get regex => RegExp(r'(ltc|t)mweb1q[ac-hj-np-z02-9]{90,120}');
 
-  factory MwebAddress.fromAddress({required String address, required BasedUtxoNetwork network}) {
+  factory MwebAddress.fromAddress({required String address}) {
     final decoded = Bech32DecoderBase.decodeBech32(
         address,
         Bech32Const.separator,
diff --git a/lib/src/bitcoin/address/util.dart b/lib/src/bitcoin/address/util.dart
index bae1e78..88746ab 100644
--- a/lib/src/bitcoin/address/util.dart
+++ b/lib/src/bitcoin/address/util.dart
@@ -21,7 +21,7 @@ class BitcoinAddressUtils {
 
     if (addressType.type == SegwitAddresType.mweb) {
       return BytesUtils.fromHexString(
-        MwebAddress.fromAddress(address: address, network: network).addressProgram,
+        MwebAddress.fromAddress(address: address).addressProgram,
       );
     }
 
@@ -77,7 +77,7 @@ class BitcoinAddressUtils {
     } catch (_) {}
 
     try {
-      return MwebAddress.fromAddress(address: address, network: network).type;
+      return MwebAddress.fromAddress(address: address).type;
     } catch (_) {}
 
     try {
diff --git a/lib/src/provider/api_provider/electrum_api_provider.dart b/lib/src/provider/api_provider/electrum_api_provider.dart
index f3ff49d..2df2205 100644
--- a/lib/src/provider/api_provider/electrum_api_provider.dart
+++ b/lib/src/provider/api_provider/electrum_api_provider.dart
@@ -1,4 +1,3 @@
-import 'package:bitcoin_base/src/bitcoin/amount/amount.dart';
 import 'package:bitcoin_base/src/provider/api_provider.dart';
 import 'dart:async';
 
@@ -50,15 +49,10 @@ class ElectrumApiProvider {
       final topDoubleString = await request(ElectrumEstimateFee(numberOfBlock: 1));
       final middleDoubleString = await request(ElectrumEstimateFee(numberOfBlock: 5));
       final bottomDoubleString = await request(ElectrumEstimateFee(numberOfBlock: 10));
-      final top =
-          (BitcoinAmountUtils.stringDoubleToBitcoinAmount(topDoubleString.toString()) / 1000)
-              .round();
-      final middle =
-          (BitcoinAmountUtils.stringDoubleToBitcoinAmount(middleDoubleString.toString()) / 1000)
-              .round();
-      final bottom =
-          (BitcoinAmountUtils.stringDoubleToBitcoinAmount(bottomDoubleString.toString()) / 1000)
-              .round();
+
+      final top = (topDoubleString.toInt() / 1000).round();
+      final middle = (middleDoubleString.toInt() / 1000).round();
+      final bottom = (bottomDoubleString.toInt() / 1000).round();
 
       return [bottom, middle, top];
     } catch (_) {
diff --git a/lib/src/provider/models/fee_rate/fee_rate.dart b/lib/src/provider/models/fee_rate/fee_rate.dart
index 37aa345..910a825 100644
--- a/lib/src/provider/models/fee_rate/fee_rate.dart
+++ b/lib/src/provider/models/fee_rate/fee_rate.dart
@@ -34,10 +34,10 @@ class BitcoinFeeRate {
   /// low fee rate in satoshis per kilobyte
   final BitcoinFee low;
 
-  /// only mnenpool api
+  /// only mempool api
   final BitcoinFee? economyFee;
 
-  /// only mnenpool api
+  /// only mempool api
   final BitcoinFee? minimumFee;
 
   BitcoinFee _feeRate(BitcoinFeeRateType feeRateType) {
diff --git a/lib/src/provider/transaction_builder/forked_transaction_builder.dart b/lib/src/provider/transaction_builder/forked_transaction_builder.dart
index 3403ffb..7436315 100644
--- a/lib/src/provider/transaction_builder/forked_transaction_builder.dart
+++ b/lib/src/provider/transaction_builder/forked_transaction_builder.dart
@@ -103,8 +103,8 @@ class ForkedTransactionBuilder implements BasedBitcoinTransacationBuilder {
     const String fakeECDSASignatureBytes =
         "0101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101";
 
-    final transaction = transactionBuilder
-        .buildTransaction((trDigest, utxo, multiSigPublicKey, int sighash) {
+    final transaction =
+        transactionBuilder.buildTransaction((trDigest, utxo, multiSigPublicKey, int sighash) {
       return fakeECDSASignatureBytes;
     });
 
@@ -114,6 +114,52 @@ class ForkedTransactionBuilder implements BasedBitcoinTransacationBuilder {
     return size;
   }
 
+  static int estimateTransactionSizeFromTypes({
+    required List<BitcoinAddressType> inputTypes,
+    required List<BitcoinAddressType> outputTypes,
+    required BitcoinCashNetwork network,
+    String? memo,
+    bool enableRBF = false,
+  }) {
+    final fakePublicKey = ECPrivate.random().getPublic();
+
+    final fakeInputAddress = _fakeAddressesFromTypes(inputTypes);
+    final fakeUtxos = fakeInputAddress
+        .map(
+          (e) => UtxoWithAddress(
+            utxo: BitcoinUtxo(
+              txHash: "0" * 64,
+              vout: 0,
+              value: BigInt.from(0),
+              scriptType: e.type,
+            ),
+            ownerDetails: UtxoAddressDetails(
+              publicKey: fakePublicKey.toHex(),
+              address: e,
+            ),
+          ),
+        )
+        .toList();
+
+    final fakeOutputAddress = _fakeAddressesFromTypes(outputTypes);
+    final fakeOutputs = fakeOutputAddress
+        .map(
+          (e) => BitcoinOutput(
+            address: e,
+            value: BigInt.from(0),
+          ),
+        )
+        .toList();
+
+    return estimateTransactionSize(
+      utxos: fakeUtxos,
+      outputs: fakeOutputs,
+      network: network,
+      memo: memo,
+      enableRBF: enableRBF,
+    );
+  }
+
   /// It is used to make the appropriate scriptSig
   Script _buildInputScriptPubKeys(UtxoWithAddress utxo) {
     if (utxo.isMultiSig()) {
@@ -177,8 +223,7 @@ class ForkedTransactionBuilder implements BasedBitcoinTransacationBuilder {
         script: scriptPubKeys,
         amount: utox.utxo.value,
         token: utox.utxo.token,
-        sighash:
-            BitcoinOpCodeConst.SIGHASH_ALL | BitcoinOpCodeConst.SIGHASH_FORKED);
+        sighash: BitcoinOpCodeConst.SIGHASH_ALL | BitcoinOpCodeConst.SIGHASH_FORKED);
   }
 
   /// buildP2wshOrP2shScriptSig constructs and returns a script signature (represented as a List of strings)
@@ -191,8 +236,7 @@ class ForkedTransactionBuilder implements BasedBitcoinTransacationBuilder {
   //
   /// Returns:
   /// - List<String>: A List of strings representing the script signature for the P2WSH or P2SH input.
-  List<String> _buildMiltisigUnlockingScript(
-      List<String> signedDigest, UtxoWithAddress utx) {
+  List<String> _buildMiltisigUnlockingScript(List<String> signedDigest, UtxoWithAddress utx) {
     /// The constructed script signature consists of the signed digest elements followed by
     /// the script details of the multi-signature address.
     return ['', ...signedDigest, utx.multiSigAddress.multiSigScript.toHex()];
@@ -249,11 +293,10 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
     }
     List<TxInput> inputs = sortedUtxos.map((e) => e.utxo.toInput()).toList();
     if (enableRBF && inputs.isNotEmpty) {
-      inputs[0] = inputs[0]
-          .copyWith(sequence: BitcoinOpCodeConst.REPLACE_BY_FEE_SEQUENCE);
+      inputs[0] = inputs[0].copyWith(sequence: BitcoinOpCodeConst.REPLACE_BY_FEE_SEQUENCE);
     }
-    return Tuple(List<TxInput>.unmodifiable(inputs),
-        List<UtxoWithAddress>.unmodifiable(sortedUtxos));
+    return Tuple(
+        List<TxInput>.unmodifiable(inputs), List<UtxoWithAddress>.unmodifiable(sortedUtxos));
   }
 
   List<TxOutput> _buildOutputs() {
@@ -263,8 +306,7 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
         .toList();
 
     if (memo != null) {
-      builtOutputs
-          .add(TxOutput(amount: BigInt.zero, scriptPubKey: _opReturn(memo!)));
+      builtOutputs.add(TxOutput(amount: BigInt.zero, scriptPubKey: _opReturn(memo!)));
     }
 
     if (outputOrdering == BitcoinOrdering.shuffle) {
@@ -275,8 +317,7 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
           (a, b) {
             final valueComparison = a.amount.compareTo(b.amount);
             if (valueComparison == 0) {
-              return BytesUtils.compareBytes(
-                  a.scriptPubKey.toBytes(), b.scriptPubKey.toBytes());
+              return BytesUtils.compareBytes(a.scriptPubKey.toBytes(), b.scriptPubKey.toBytes());
             }
             return valueComparison;
           },
@@ -329,11 +370,7 @@ be retrieved by anyone who examines the blockchain's history.
       required BigInt sumOutputAmounts}) {
     if (!isFakeTransaction && sumAmountsWithFee != sumUtxoAmount) {
       throw BitcoinBasePluginException('Sum value of utxo not spending',
-          details: {
-            "inputAmount": sumUtxoAmount,
-            "fee": fee,
-            "outputAmount": sumOutputAmounts
-          });
+          details: {"inputAmount": sumUtxoAmount, "fee": fee, "outputAmount": sumOutputAmounts});
     }
     if (!isFakeTransaction) {
       /// sum of token amounts
@@ -347,19 +384,13 @@ be retrieved by anyone who examines the blockchain's history.
           amount += outputs
               .whereType<BitcoinBurnableOutput>()
               .where((element) => element.categoryID == i.key)
-              .fold(
-                  BigInt.zero,
-                  (previousValue, element) =>
-                      previousValue + (element.value ?? BigInt.zero));
+              .fold(BigInt.zero,
+                  (previousValue, element) => previousValue + (element.value ?? BigInt.zero));
 
           if (amount != i.value) {
             throw BitcoinBasePluginException(
                 'Sum token value of UTXOs not spending. use BitcoinBurnableOutput if you want to burn tokens.',
-                details: {
-                  "token": i.key,
-                  "inputValue": i.value,
-                  "outputValue": amount
-                });
+                details: {"token": i.key, "inputValue": i.value, "outputValue": amount});
           }
         }
       }
@@ -368,16 +399,11 @@ be retrieved by anyone who examines the blockchain's history.
           final token = i.utxo.token!;
           if (token.hasAmount) continue;
           if (!token.hasNFT) continue;
-          final hasOneoutput = outputs.whereType<BitcoinTokenOutput>().any(
-              (element) =>
-                  element.utxoHash == i.utxo.txHash &&
-                  element.token.category == token.category);
+          final hasOneoutput = outputs.whereType<BitcoinTokenOutput>().any((element) =>
+              element.utxoHash == i.utxo.txHash && element.token.category == token.category);
           if (hasOneoutput) continue;
-          final hasBurnableOutput = outputs
-              .whereType<BitcoinBurnableOutput>()
-              .any((element) =>
-                  element.utxoHash == i.utxo.txHash &&
-                  element.categoryID == token.category);
+          final hasBurnableOutput = outputs.whereType<BitcoinBurnableOutput>().any((element) =>
+              element.utxoHash == i.utxo.txHash && element.categoryID == token.category);
           if (hasBurnableOutput) continue;
           throw BitcoinBasePluginException(
               'Some NFTs in the inputs lack the corresponding spending in the outputs. If you intend to burn tokens, consider utilizing the BitcoinBurnableOutput.',
@@ -401,12 +427,8 @@ be retrieved by anyone who examines the blockchain's history.
         final multiSigAddress = indexUtxo.multiSigAddress;
         int sumMultiSigWeight = 0;
         final mutlsiSigSignatures = <String>[];
-        for (int ownerIndex = 0;
-            ownerIndex < multiSigAddress.signers.length;
-            ownerIndex++) {
-          for (int weight = 0;
-              weight < multiSigAddress.signers[ownerIndex].weight;
-              weight++) {
+        for (int ownerIndex = 0; ownerIndex < multiSigAddress.signers.length; ownerIndex++) {
+          for (int weight = 0; weight < multiSigAddress.signers[ownerIndex].weight; weight++) {
             if (mutlsiSigSignatures.length >= multiSigAddress.threshold) {
               break;
             }
@@ -420,8 +442,7 @@ be retrieved by anyone who examines the blockchain's history.
           }
         }
         if (sumMultiSigWeight != multiSigAddress.threshold) {
-          throw const BitcoinBasePluginException(
-              "some multisig signature does not exist");
+          throw const BitcoinBasePluginException("some multisig signature does not exist");
         }
         continue;
       }
@@ -460,11 +481,9 @@ be retrieved by anyone who examines the blockchain's history.
         sumOutputAmounts: sumOutputAmounts);
 
     /// create new transaction with inputs and outputs and isSegwit transaction or not
-    final transaction =
-        BtcTransaction(inputs: inputs, outputs: outputs, hasSegwit: false);
+    final transaction = BtcTransaction(inputs: inputs, outputs: outputs, hasSegwit: false);
 
-    const int sighash =
-        BitcoinOpCodeConst.SIGHASH_ALL | BitcoinOpCodeConst.SIGHASH_FORKED;
+    const int sighash = BitcoinOpCodeConst.SIGHASH_ALL | BitcoinOpCodeConst.SIGHASH_FORKED;
 
     /// Well, now let's do what we want for each input
     for (int i = 0; i < inputs.length; i++) {
@@ -474,24 +493,19 @@ be retrieved by anyone who examines the blockchain's history.
       final script = _buildInputScriptPubKeys(indexUtxo);
 
       /// We generate transaction digest for current input
-      final digest =
-          _generateTransactionDigest(script, i, indexUtxo, transaction);
+      final digest = _generateTransactionDigest(script, i, indexUtxo, transaction);
 
       /// handle multisig address
       if (indexUtxo.isMultiSig()) {
         final multiSigAddress = indexUtxo.multiSigAddress;
         int sumMultiSigWeight = 0;
         final mutlsiSigSignatures = <String>[];
-        for (int ownerIndex = 0;
-            ownerIndex < multiSigAddress.signers.length;
-            ownerIndex++) {
+        for (int ownerIndex = 0; ownerIndex < multiSigAddress.signers.length; ownerIndex++) {
           /// now we need sign the transaction digest
-          final sig = sign(digest, indexUtxo,
-              multiSigAddress.signers[ownerIndex].publicKey, sighash);
+          final sig =
+              sign(digest, indexUtxo, multiSigAddress.signers[ownerIndex].publicKey, sighash);
           if (sig.isEmpty) continue;
-          for (int weight = 0;
-              weight < multiSigAddress.signers[ownerIndex].weight;
-              weight++) {
+          for (int weight = 0; weight < multiSigAddress.signers[ownerIndex].weight; weight++) {
             if (mutlsiSigSignatures.length >= multiSigAddress.threshold) {
               break;
             }
@@ -503,12 +517,10 @@ be retrieved by anyone who examines the blockchain's history.
           }
         }
         if (sumMultiSigWeight != multiSigAddress.threshold) {
-          throw const BitcoinBasePluginException(
-              "some multisig signature does not exist");
+          throw const BitcoinBasePluginException("some multisig signature does not exist");
         }
 
-        _addScripts(
-            input: inputs[i], signatures: mutlsiSigSignatures, utxo: indexUtxo);
+        _addScripts(input: inputs[i], signatures: mutlsiSigSignatures, utxo: indexUtxo);
         continue;
       }
 
@@ -521,8 +533,7 @@ be retrieved by anyone who examines the blockchain's history.
   }
 
   @override
-  Future<BtcTransaction> buildTransactionAsync(
-      BitcoinSignerCallBackAsync sign) async {
+  Future<BtcTransaction> buildTransactionAsync(BitcoinSignerCallBackAsync sign) async {
     /// build inputs
     final sortedInputs = _buildInputs();
 
@@ -550,11 +561,9 @@ be retrieved by anyone who examines the blockchain's history.
         sumOutputAmounts: sumOutputAmounts);
 
     /// create new transaction with inputs and outputs and isSegwit transaction or not
-    final transaction =
-        BtcTransaction(inputs: inputs, outputs: outputs, hasSegwit: false);
+    final transaction = BtcTransaction(inputs: inputs, outputs: outputs, hasSegwit: false);
 
-    const int sighash =
-        BitcoinOpCodeConst.SIGHASH_ALL | BitcoinOpCodeConst.SIGHASH_FORKED;
+    const int sighash = BitcoinOpCodeConst.SIGHASH_ALL | BitcoinOpCodeConst.SIGHASH_FORKED;
 
     /// Well, now let's do what we want for each input
     for (int i = 0; i < inputs.length; i++) {
@@ -564,24 +573,19 @@ be retrieved by anyone who examines the blockchain's history.
       final script = _buildInputScriptPubKeys(indexUtxo);
 
       /// We generate transaction digest for current input
-      final digest =
-          _generateTransactionDigest(script, i, indexUtxo, transaction);
+      final digest = _generateTransactionDigest(script, i, indexUtxo, transaction);
 
       /// handle multisig address
       if (indexUtxo.isMultiSig()) {
         final multiSigAddress = indexUtxo.multiSigAddress;
         int sumMultiSigWeight = 0;
         final mutlsiSigSignatures = <String>[];
-        for (int ownerIndex = 0;
-            ownerIndex < multiSigAddress.signers.length;
-            ownerIndex++) {
+        for (int ownerIndex = 0; ownerIndex < multiSigAddress.signers.length; ownerIndex++) {
           /// now we need sign the transaction digest
-          final sig = await sign(digest, indexUtxo,
-              multiSigAddress.signers[ownerIndex].publicKey, sighash);
+          final sig =
+              await sign(digest, indexUtxo, multiSigAddress.signers[ownerIndex].publicKey, sighash);
           if (sig.isEmpty) continue;
-          for (int weight = 0;
-              weight < multiSigAddress.signers[ownerIndex].weight;
-              weight++) {
+          for (int weight = 0; weight < multiSigAddress.signers[ownerIndex].weight; weight++) {
             if (mutlsiSigSignatures.length >= multiSigAddress.threshold) {
               break;
             }
@@ -593,18 +597,15 @@ be retrieved by anyone who examines the blockchain's history.
           }
         }
         if (sumMultiSigWeight != multiSigAddress.threshold) {
-          throw const BitcoinBasePluginException(
-              "some multisig signature does not exist");
+          throw const BitcoinBasePluginException("some multisig signature does not exist");
         }
 
-        _addScripts(
-            input: inputs[i], signatures: mutlsiSigSignatures, utxo: indexUtxo);
+        _addScripts(input: inputs[i], signatures: mutlsiSigSignatures, utxo: indexUtxo);
         continue;
       }
 
       /// now we need sign the transaction digest
-      final sig =
-          await sign(digest, indexUtxo, indexUtxo.public().toHex(), sighash);
+      final sig = await sign(digest, indexUtxo, indexUtxo.public().toHex(), sighash);
       _addScripts(input: inputs[i], signatures: [sig], utxo: indexUtxo);
     }
 
@@ -624,3 +625,33 @@ be retrieved by anyone who examines the blockchain's history.
     input.scriptSig = Script(script: scriptSig);
   }
 }
+
+List<BitcoinBaseAddress> _fakeAddressesFromTypes(List<BitcoinAddressType> types) {
+  final fakePub = ECPrivate.random().getPublic();
+
+  return types.map((e) {
+    switch (e) {
+      case PubKeyAddressType.p2pk:
+        return fakePub.toP2pkAddress();
+      case P2pkhAddressType.p2pkh:
+        return fakePub.toP2pkhAddress();
+      case P2shAddressType.p2pkInP2sh:
+        return fakePub.toP2pkInP2sh();
+      case P2shAddressType.p2pkhInP2sh:
+        return fakePub.toP2pkhInP2sh();
+      case P2shAddressType.p2wpkhInP2sh:
+        return fakePub.toP2wpkhInP2sh();
+      case P2shAddressType.p2wshInP2sh:
+        return fakePub.toP2wshInP2sh();
+      case SegwitAddresType.p2wpkh:
+        return fakePub.toP2wpkhAddress();
+      case SegwitAddresType.p2wsh:
+        return fakePub.toP2wshAddress();
+      case SegwitAddresType.p2tr:
+      case SilentPaymentsAddresType.p2sp:
+        return fakePub.toTaprootAddress();
+      default:
+        throw const BitcoinBasePluginException("invalid bitcoin address type");
+    }
+  }).toList();
+}
diff --git a/lib/src/utils/regex.dart b/lib/src/utils/regex.dart
index 9508d66..b58ed71 100644
--- a/lib/src/utils/regex.dart
+++ b/lib/src/utils/regex.dart
@@ -32,7 +32,7 @@ class RegexUtils {
     } else if (stringIsAddress(address, SilentPaymentAddress.regex)) {
       return SilentPaymentAddress.fromAddress(address);
     } else if (stringIsAddress(address, MwebAddress.regex)) {
-      return MwebAddress.fromAddress(address: address, network: network);
+      return MwebAddress.fromAddress(address: address);
     } else {
       return P2wpkhAddress.fromAddress(address: address, network: network);
     }

From 7bd166a16860b82385129d4ed847455c826e4b6e Mon Sep 17 00:00:00 2001
From: Rafael Saes <git@rafael.saes.dev>
Date: Thu, 9 Jan 2025 18:38:59 -0300
Subject: [PATCH 39/62] merge from mrtnetwork/bitcoin_base

---
 CHANGELOG.md                                  |   30 +
 README.md                                     |   18 +-
 analysis_options.yaml                         |   52 +
 .../lib/bitcoin_cash/burn_token_example.dart  |    9 +-
 .../create_cash_token_example.dart            |    9 +-
 .../lib/bitcoin_cash/create_nft_example.dart  |    9 +-
 .../lib/bitcoin_cash/make_vout0_example.dart  |    9 +-
 .../lib/bitcoin_cash/minting_nft_example.dart |    9 +-
 .../bitcoin_cash/p2sh32_spend_example.dart    |   10 +-
 .../bitcoin_cash/send_ft_token_example.dart   |    9 +-
 .../bitcoin_cash/transfer_bch_example.dart    |    9 +-
 example/lib/global/bch_example.dart           |    9 +-
 ...amples_multisig_taproot_legacy_uncomp.dart |  138 ++
 .../global/old_examples/bitcoin_example.dart  |    8 +-
 .../multi_sig_transactions.dart               |    2 +-
 .../transaction_builder_example.dart          |    2 +-
 ...er_from_7_account_to_6_accout_example.dart |   68 +-
 .../global/transfer_to_8_account_example.dart |   75 +-
 example/pubspec.lock                          |   67 +-
 example/pubspec.yaml                          |    2 +-
 example/test/test_test.dart                   |    1 +
 example/test/widget_test.dart                 |    1 -
 lib/bitcoin_base.dart                         |   36 +-
 lib/src/bitcoin/address/address.dart          |    2 +-
 lib/src/bitcoin/address/core.dart             |   81 +-
 lib/src/bitcoin/address/derivations.dart      |   26 +-
 lib/src/bitcoin/address/legacy_address.dart   |   14 +-
 lib/src/bitcoin/address/network_address.dart  |  122 +-
 lib/src/bitcoin/address/segwit_address.dart   |   45 +-
 lib/src/bitcoin/address/util.dart             |   24 +-
 .../bitcoin/address/utils/address_utils.dart  |   55 +-
 lib/src/bitcoin/script/control_block.dart     |    6 +-
 lib/src/bitcoin/script/input.dart             |  107 +-
 lib/src/bitcoin/script/op_code/constant.dart  |   19 +-
 .../bitcoin/script/op_code/constant_lib.dart  |    2 +-
 lib/src/bitcoin/script/op_code/tools.dart     |   38 +-
 lib/src/bitcoin/script/output.dart            |   62 +-
 lib/src/bitcoin/script/script.dart            |  101 +-
 lib/src/bitcoin/script/sequence.dart          |   14 +-
 lib/src/bitcoin/script/transaction.dart       |  246 ++--
 lib/src/bitcoin/script/witness.dart           |   13 +-
 lib/src/bitcoin/silent_payments/address.dart  |    1 -
 lib/src/bitcoin/silent_payments/utils.dart    |    6 +-
 lib/src/bitcoin_cash/bcmr.dart                |    8 +-
 lib/src/bitcoin_cash/bcmr_registery.dart      |   46 +-
 lib/src/cash_token/cash_token.dart            |   93 +-
 lib/src/crypto/crypto.dart                    |    8 +-
 lib/src/crypto/keypair/ec_private.dart        |   31 +-
 lib/src/crypto/keypair/ec_public.dart         |   78 +-
 lib/src/exception/exception.dart              |    8 +-
 lib/src/models/network.dart                   |  125 +-
 lib/src/provider/api_provider.dart            |    5 +-
 .../api_provider/electrum_api_provider.dart   |   17 +-
 lib/src/provider/api_provider/providers.dart  |    2 -
 lib/src/provider/constant/constant.dart       |   18 +-
 .../electrum_methods/methods/add_peer.dart    |    6 +-
 .../methods/block_headers.dart                |    7 +-
 .../electrum_methods/methods/broad_cast.dart  |    7 +-
 .../methods/donate_address.dart               |    5 +-
 .../methods/electrum_version.dart             |    7 +-
 .../methods/estimate_fee.dart                 |   10 +-
 .../electrum_methods/methods/get_balance.dart |    8 +-
 .../methods/get_fee_histogram.dart            |   10 +-
 .../electrum_methods/methods/get_history.dart |    8 +-
 .../electrum_methods/methods/get_mempool.dart |    8 +-
 .../electrum_methods/methods/get_merkle.dart  |    8 +-
 .../methods/get_transaction.dart              |    7 +-
 .../electrum_methods/methods/get_unspet.dart  |   13 +-
 .../methods/get_value_proof.dart              |    6 +-
 .../electrum_methods/methods/header.dart      |    6 +-
 .../methods/headers_subscribe.dart            |    2 +-
 .../electrum_methods/methods/id_from_pos.dart |    8 +-
 .../masternode_announce_broadcast.dart        |    6 +-
 .../methods/masternode_list.dart              |    5 +-
 .../methods/masternode_subscribe.dart         |    6 +-
 .../electrum_methods/methods/ping.dart        |    3 +-
 .../electrum_methods/methods/protx_diff.dart  |    6 +-
 .../electrum_methods/methods/protx_info.dart  |    6 +-
 .../electrum_methods/methods/relay_fee.dart   |    3 +-
 .../methods/scripthash_unsubscribe.dart       |    7 +-
 .../methods/server_banner.dart                |    3 +-
 .../methods/server_features.dart              |    3 +-
 .../methods/server_peer_subscribe.dart        |    5 +-
 .../electrum_methods/methods/status.dart      |    8 +-
 .../block_cypher/block_cypher_models.dart     |    2 +-
 lib/src/provider/models/config.dart           |   52 +-
 .../models/electrum/electrum_utxo.dart        |   12 +-
 .../provider/models/fee_rate/fee_rate.dart    |    4 +-
 .../models/mempool/mempol_models.dart         |    2 +-
 lib/src/provider/models/multisig_script.dart  |   52 +-
 lib/src/provider/models/utxo_details.dart     |  114 +-
 .../explorer.dart}                            |   41 +-
 .../electrum/electrum_ssl_service.dart        |    2 +-
 .../electrum/electrum_tcp_service.dart        |    4 +-
 lib/src/provider/service/services.dart        |    1 -
 .../explorer.dart}                            |    2 +-
 .../transaction_builder/builder.dart          |    0
 .../transaction_builder/core.dart             |    0
 .../forked_transaction_builder.dart           |  241 ++--
 .../transaction_builder.dart                  |  240 ++--
 lib/src/utils/btc_utils.dart                  |   11 +-
 lib/src/utils/enumerate.dart                  |    2 +-
 pubspec.yaml                                  |   10 +-
 test/bcmr/art_collection.dart                 |  136 +-
 test/bcmr/bcmr_test.dart                      |    2 +-
 test/bcmr/decentralized_application.dart      |  116 +-
 test/bcmr/fungible_token.dart                 |   52 +-
 test/bcmr/payouts_or_dividends.dart           |  136 +-
 test/bitcoin_cash_address_test.dart           |  336 ++---
 test/bitcoin_cash_token_encoding_test.dart    | 1119 ++++++++---------
 test/deserialize_test.dart                    |   21 +
 test/encode_decode_transaction_test.dart      |   56 +-
 test/keys_test.dart                           |  176 ++-
 test/p2kh_tr_test.dart                        |   38 +-
 test/p2sh_test.dart                           |   11 +-
 test/p2tr_test.dart                           |  136 +-
 test/p2wpkh_test.dart                         |   84 +-
 test/p2wsh_test.dart                          |   32 +-
 test/silent_payments.dart                     |   15 +-
 119 files changed, 2925 insertions(+), 2525 deletions(-)
 create mode 100644 example/lib/global/btc_examples_multisig_taproot_legacy_uncomp.dart
 create mode 100644 example/test/test_test.dart
 delete mode 100644 example/test/widget_test.dart
 delete mode 100644 lib/src/provider/api_provider/providers.dart
 rename lib/src/provider/{api_provider/api_provider.dart => providers/explorer.dart} (81%)
 rename lib/src/provider/{service/http/http_service.dart => services/explorer.dart} (96%)
 rename lib/src/{provider => }/transaction_builder/builder.dart (100%)
 rename lib/src/{provider => }/transaction_builder/core.dart (100%)
 rename lib/src/{provider => }/transaction_builder/forked_transaction_builder.dart (69%)
 rename lib/src/{provider => }/transaction_builder/transaction_builder.dart (81%)
 create mode 100644 test/deserialize_test.dart

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6c89343..20e636c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,33 @@
+## 5.0.0
+* Update dependencies
+* Minimum required Dart SDK version updated to 3.3.
+
+## 4.9.4
+
+* Improved serialization process for large transaction scripts.
+* Added support for the Electra network.
+* Create and spent from uncompressed public key format.
+* Important Notice: This is the final version supporting Dart v2. The next release will require Dart v3.3 or higher.
+
+## 4.9.2
+
+* Update dependencies
+* Resolved issue with transaction deserialization (unsigned tx)
+
+## 4.9.1
+
+* Resolved issue with transaction deserialization (Issue #9)
+
+## 4.9.0
+
+* Correct Bitcoin address network configuration.
+* Resolve issue with Electrum fee estimation results.
+
+
+## 4.8.0
+
+* Update dependencies
+
 ## 4.7.0
 
 * Update dependencies
diff --git a/README.md b/README.md
index 16ba6b9..6b82768 100644
--- a/README.md
+++ b/README.md
@@ -280,7 +280,7 @@ In the [example](https://github.com/mrtnetwork/bitcoin_base/tree/main/example/li
       await ElectrumWebSocketService.connect("184....");
 
   /// create provider with service
-  final provider = ElectrumApiProvider(service);
+  final provider = ElectrumProvider(service);
 
   /// spender details
   final privateKey = ECPrivate.fromHex(
@@ -310,7 +310,7 @@ In the [example](https://github.com/mrtnetwork/bitcoin_base/tree/main/example/li
   for (final i in spenders) {
     /// Reads all UTXOs (Unspent Transaction Outputs) associated with the account
     final elctrumUtxos = await provider
-        .request(ElectrumScriptHashListUnspent(scriptHash: i.pubKeyHash()));
+        .request(ElectrumRequestScriptHashListUnspent(scriptHash: i.pubKeyHash()));
 
     /// Converts all UTXOs to a list of UtxoWithAddress, containing UTXO information along with address details.
     /// read spender utxos
@@ -427,7 +427,7 @@ In the [example](https://github.com/mrtnetwork/bitcoin_base/tree/main/example/li
   final raw = transaction.serialize();
 
   /// send to network
-  await provider.request(ElectrumBroadCastTransaction(transactionRaw: raw));
+  await provider.request(ElectrumRequestBroadCastTransaction(transactionRaw: raw));
 
   /// Once completed, we verify the status by checking the mempool or using another explorer to review the transaction details.
   /// https://mempool.space/testnet/tx/70cf664bba4b5ac9edc6133e9c6891ffaf8a55eaea9d2ac99aceead1c3db8899
@@ -446,7 +446,7 @@ In the [example](https://github.com/mrtnetwork/bitcoin_base/tree/main/example/li
       "wss://chipnet.imaginary.cash:50004");
 
   /// create provider with service
-  final provider = ElectrumApiProvider(service);
+  final provider = ElectrumProvider(service);
 
   /// initialize private key
   final privateKey = ECPrivate.fromBytes(BytesUtils.fromHexString(
@@ -470,7 +470,7 @@ In the [example](https://github.com/mrtnetwork/bitcoin_base/tree/main/example/li
 
   /// Reads all UTXOs (Unspent Transaction Outputs) associated with the account.
   /// We does not need tokens utxo and we set to false.
-  final elctrumUtxos = await provider.request(ElectrumScriptHashListUnspent(
+  final elctrumUtxos = await provider.request(ElectrumRequestScriptHashListUnspent(
     scriptHash: p2pkhAddress.baseAddress.pubKeyHash(),
     includeTokens: true,
   ));
@@ -566,7 +566,7 @@ In the [example](https://github.com/mrtnetwork/bitcoin_base/tree/main/example/li
 
   /// send transaction to network
   await provider
-      .request(ElectrumBroadCastTransaction(transactionRaw: transactionRaw));
+      .request(ElectrumRequestBroadCastTransaction(transactionRaw: transactionRaw));
 
   /// done! check the transaction in block explorer
   ///  https://chipnet.imaginary.cash/tx/97030c1236a024de7cad7ceadf8571833029c508e016bcc8173146317e367ae6
@@ -704,7 +704,7 @@ I haven't implemented any specific HTTP service or socket service within this pl
       await ElectrumSSLService.connect("testnet.aranguren.org:51002");
 
   /// create provider with service
-  final provider = ElectrumApiProvider(service);
+  final provider = ElectrumProvider(service);
 
   final address = P2trAddress.fromAddress(address: ".....", network: network);
 
@@ -714,7 +714,7 @@ I haven't implemented any specific HTTP service or socket service within this pl
 
   /// Return an ordered list of UTXOs sent to a script hash.
   final accountUnspend = await provider
-      .request(ElectrumScriptHashListUnspent(scriptHash: address.pubKeyHash()));
+      .request(ElectrumRequestScriptHashListUnspent(scriptHash: address.pubKeyHash()));
 
   /// Return the confirmed and unconfirmed history of a script hash.
   final accountHistory = await provider
@@ -722,7 +722,7 @@ I haven't implemented any specific HTTP service or socket service within this pl
 
   /// Broadcast a transaction to the network.
   final broadcastTransaction = await provider
-      .request(ElectrumBroadCastTransaction(transactionRaw: "txDigest"));
+      .request(ElectrumRequestBroadCastTransaction(transactionRaw: "txDigest"));
 
   /// ....
 ```
diff --git a/analysis_options.yaml b/analysis_options.yaml
index d429a46..c20153f 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -2,3 +2,55 @@
 include: package:flutter_lints/flutter.yaml
 # Additional information about this file can be found at
 # https://dart.dev/guides/language/analysis-options
+# Uncomment the following section to specify additional rules.
+linter:
+  rules:
+    # - always_declare_return_types
+    # - annotate_overrides
+    # - avoid_init_to_null
+    # - avoid_null_checks_in_equality_operators
+    # - avoid_relative_lib_imports
+    # - avoid_return_types_on_setters
+    # - avoid_shadowing_type_parameters
+    # - avoid_single_cascade_in_expression_statements
+    # - avoid_types_as_parameter_names
+    # - await_only_futures
+    # - camel_case_extensions
+    # - curly_braces_in_flow_control_structures
+    # - empty_catches
+    # - empty_constructor_bodies
+    # - library_names
+    # - library_prefixes
+    # - no_duplicate_case_values
+    # - null_closures
+    # - omit_local_variable_types
+    # - prefer_adjacent_string_concatenation
+    # - prefer_collection_literals
+    # - prefer_conditional_assignment
+    # - prefer_contains
+    # - prefer_equal_for_default_values
+    # - prefer_final_fields
+    # - prefer_for_elements_to_map_fromIterable
+    # - prefer_generic_function_type_aliases
+    # - prefer_if_null_operators
+    # - prefer_inlined_adds
+    # - prefer_is_empty
+    # - prefer_is_not_empty
+    # - prefer_iterable_whereType
+    # - prefer_single_quotes
+    # - prefer_spread_collections
+    # - recursive_getters
+    # - slash_for_doc_comments
+    # - sort_child_properties_last
+    # - type_init_formals
+    # - unawaited_futures
+    # - unnecessary_brace_in_string_interps
+    # - unnecessary_const
+    # - unnecessary_getters_setters
+    # - unnecessary_new
+    # - unnecessary_null_in_if_null_operators
+    # - unnecessary_this
+    # - unrelated_type_equality_checks
+    # - use_function_type_syntax_for_parameters
+    # - use_rethrow_when_possible
+    # - valid_regexps
\ No newline at end of file
diff --git a/example/lib/bitcoin_cash/burn_token_example.dart b/example/lib/bitcoin_cash/burn_token_example.dart
index 4acdb9b..a6e854b 100644
--- a/example/lib/bitcoin_cash/burn_token_example.dart
+++ b/example/lib/bitcoin_cash/burn_token_example.dart
@@ -10,7 +10,7 @@ void main() async {
       "wss://chipnet.imaginary.cash:50004");
 
   /// create provider with service
-  final provider = ElectrumApiProvider(service);
+  final provider = ElectrumProvider(service);
 
   /// initialize private key
   final privateKey = ECPrivate.fromBytes(BytesUtils.fromHexString(
@@ -34,7 +34,8 @@ void main() async {
 
   /// Reads all UTXOs (Unspent Transaction outputs) associated with the account.
   /// We does not need tokens utxo and we set to false.
-  final elctrumUtxos = await provider.request(ElectrumScriptHashListUnspent(
+  final elctrumUtxos =
+      await provider.request(ElectrumRequestScriptHashListUnspent(
     scriptHash: p2pkhAddress.baseAddress.pubKeyHash(),
     includeTokens: true,
   ));
@@ -141,8 +142,8 @@ void main() async {
   final transactionRaw = transaaction.toHex();
 
   /// send transaction to network
-  await provider
-      .request(ElectrumBroadCastTransaction(transactionRaw: transactionRaw));
+  await provider.request(
+      ElectrumRequestBroadCastTransaction(transactionRaw: transactionRaw));
 
   /// done! check the transaction in block explorer
   ///  https://chipnet.imaginary.cash/tx/d85da44ba0c12ab8b0f4c636ca5451ae2c3a90b0f6d9e47fe381d0f5c6966ff3
diff --git a/example/lib/bitcoin_cash/create_cash_token_example.dart b/example/lib/bitcoin_cash/create_cash_token_example.dart
index c0b8754..b709d66 100644
--- a/example/lib/bitcoin_cash/create_cash_token_example.dart
+++ b/example/lib/bitcoin_cash/create_cash_token_example.dart
@@ -11,7 +11,7 @@ void main() async {
       "wss://chipnet.imaginary.cash:50004");
 
   /// create provider with service
-  final provider = ElectrumApiProvider(service);
+  final provider = ElectrumProvider(service);
 
   /// initialize private key
   final privateKey = ECPrivate.fromBytes(BytesUtils.fromHexString(
@@ -29,7 +29,8 @@ void main() async {
 
   /// Reads all UTXOs (Unspent Transaction outputs) associated with the account.
   /// We does not need tokens utxo and we set to false.
-  final elctrumUtxos = await provider.request(ElectrumScriptHashListUnspent(
+  final elctrumUtxos =
+      await provider.request(ElectrumRequestScriptHashListUnspent(
     scriptHash: p2pkhAddress.pubKeyHash(),
     includeTokens: false,
   ));
@@ -135,8 +136,8 @@ void main() async {
   final transactionRaw = transaaction.toHex();
 
   /// send transaction to network
-  await provider
-      .request(ElectrumBroadCastTransaction(transactionRaw: transactionRaw));
+  await provider.request(
+      ElectrumRequestBroadCastTransaction(transactionRaw: transactionRaw));
 
   /// done! check the transaction in block explorer
   ///  https://chipnet.imaginary.cash/tx/fe0f9f84bd8782b8037160c09a515d39a9cc5bbeda6dcca6fb8a89e952bc9dea
diff --git a/example/lib/bitcoin_cash/create_nft_example.dart b/example/lib/bitcoin_cash/create_nft_example.dart
index 4db99f2..a1607cc 100644
--- a/example/lib/bitcoin_cash/create_nft_example.dart
+++ b/example/lib/bitcoin_cash/create_nft_example.dart
@@ -11,7 +11,7 @@ void main() async {
       "wss://chipnet.imaginary.cash:50004");
 
   /// create provider with service
-  final provider = ElectrumApiProvider(service);
+  final provider = ElectrumProvider(service);
 
   /// initialize private key
   final privateKey = ECPrivate.fromBytes(BytesUtils.fromHexString(
@@ -30,7 +30,8 @@ void main() async {
 
   /// Reads all UTXOs (Unspent Transaction outputs) associated with the account.
   /// We does not need tokens utxo and we set to false.
-  final elctrumUtxos = await provider.request(ElectrumScriptHashListUnspent(
+  final elctrumUtxos =
+      await provider.request(ElectrumRequestScriptHashListUnspent(
     scriptHash: p2pkhAddress.baseAddress.pubKeyHash(),
     includeTokens: false,
   ));
@@ -121,8 +122,8 @@ void main() async {
   final transactionRaw = transaaction.toHex();
 
   /// send transaction to network
-  await provider
-      .request(ElectrumBroadCastTransaction(transactionRaw: transactionRaw));
+  await provider.request(
+      ElectrumRequestBroadCastTransaction(transactionRaw: transactionRaw));
 
   /// done! check the transaction in block explorer
   /// https://chipnet.imaginary.cash/tx/4e153029c75963f39920184233756f8f55d5a8f86e01cbdaf0340320c814e25e
diff --git a/example/lib/bitcoin_cash/make_vout0_example.dart b/example/lib/bitcoin_cash/make_vout0_example.dart
index 6415852..8f8ce76 100644
--- a/example/lib/bitcoin_cash/make_vout0_example.dart
+++ b/example/lib/bitcoin_cash/make_vout0_example.dart
@@ -12,7 +12,7 @@ void main() async {
       await ElectrumSSLService.connect("chipnet.imaginary.cash:50002");
 
   /// create provider with service
-  final provider = ElectrumApiProvider(service);
+  final provider = ElectrumProvider(service);
 
   /// initialize private key
   final privateKey = ECPrivate.fromBytes(BytesUtils.fromHexString(
@@ -30,7 +30,8 @@ void main() async {
 
   /// Reads all UTXOs (Unspent Transaction outputs) associated with the account.
   /// We does not need tokens utxo and we set to false.
-  final elctrumUtxos = await provider.request(ElectrumScriptHashListUnspent(
+  final elctrumUtxos =
+      await provider.request(ElectrumRequestScriptHashListUnspent(
     scriptHash: p2pkhAddress.pubKeyHash(),
     includeTokens: false,
   ));
@@ -77,8 +78,8 @@ void main() async {
   final transactionRaw = transaaction.toHex();
 
   /// send transaction to network
-  await provider
-      .request(ElectrumBroadCastTransaction(transactionRaw: transactionRaw));
+  await provider.request(
+      ElectrumRequestBroadCastTransaction(transactionRaw: transactionRaw));
 
   /// done! check the transaction in block explorer
   ///  https://chipnet.imaginary.cash/tx/b20d4c13fe67adc2f73aee0161eb51c7e813643ddc8eb655c6bd9ae72b7562cb
diff --git a/example/lib/bitcoin_cash/minting_nft_example.dart b/example/lib/bitcoin_cash/minting_nft_example.dart
index 6c2e1fa..f42865c 100644
--- a/example/lib/bitcoin_cash/minting_nft_example.dart
+++ b/example/lib/bitcoin_cash/minting_nft_example.dart
@@ -11,7 +11,7 @@ void main() async {
       await ElectrumWebSocketService.connect("wss://tbch4.loping.net:62004");
 
   /// create provider with service
-  final provider = ElectrumApiProvider(service);
+  final provider = ElectrumProvider(service);
 
   /// initialize private key
   final privateKey = ECPrivate.fromBytes(BytesUtils.fromHexString(
@@ -30,7 +30,8 @@ void main() async {
 
   /// Reads all UTXOs (Unspent Transaction outputs) associated with the account.
   /// We does not need tokens utxo and we set to false.
-  final elctrumUtxos = await provider.request(ElectrumScriptHashListUnspent(
+  final elctrumUtxos =
+      await provider.request(ElectrumRequestScriptHashListUnspent(
     scriptHash: p2pkhAddress.baseAddress.pubKeyHash(),
     includeTokens: true,
   ));
@@ -177,8 +178,8 @@ void main() async {
   final transactionRaw = transaaction.toHex();
 
   /// send transaction to network
-  await provider
-      .request(ElectrumBroadCastTransaction(transactionRaw: transactionRaw));
+  await provider.request(
+      ElectrumRequestBroadCastTransaction(transactionRaw: transactionRaw));
 
   /// done! check the transaction in block explorer
   ///  https://tbch4.loping.net/tx/caa91b0fea2843a99c3cd7375ac4d3102b6b74a25e52cd866ad7ecc486204f0d
diff --git a/example/lib/bitcoin_cash/p2sh32_spend_example.dart b/example/lib/bitcoin_cash/p2sh32_spend_example.dart
index c7af331..09b0000 100644
--- a/example/lib/bitcoin_cash/p2sh32_spend_example.dart
+++ b/example/lib/bitcoin_cash/p2sh32_spend_example.dart
@@ -12,7 +12,7 @@ void main() async {
       "wss://chipnet.imaginary.cash:50004");
 
   /// create provider with service
-  final provider = ElectrumApiProvider(service);
+  final provider = ElectrumProvider(service);
 
   /// initialize private key
   final privateKey = ECPrivate.fromBytes(BytesUtils.fromHexString(
@@ -45,12 +45,12 @@ void main() async {
   /// Reads all UTXOs (Unspent Transaction outputs) associated with the account.
   /// We does not need tokens utxo and we set to false.
   final example1ElectrumUtxos =
-      await provider.request(ElectrumScriptHashListUnspent(
+      await provider.request(ElectrumRequestScriptHashListUnspent(
     scriptHash: p2sh32Example1.baseAddress.pubKeyHash(),
     includeTokens: false,
   ));
   final example2ElectrumUtxos =
-      await provider.request(ElectrumScriptHashListUnspent(
+      await provider.request(ElectrumRequestScriptHashListUnspent(
     scriptHash: p2sh32Example2.baseAddress.pubKeyHash(),
     includeTokens: false,
   ));
@@ -111,8 +111,8 @@ void main() async {
   final transactionRaw = transaaction.toHex();
 
   /// send transaction to network
-  await provider
-      .request(ElectrumBroadCastTransaction(transactionRaw: transactionRaw));
+  await provider.request(
+      ElectrumRequestBroadCastTransaction(transactionRaw: transactionRaw));
 
   /// done! check the transaction in block explorer
   ///  https://chipnet.imaginary.cash/tx/b76b851ce0374504591db414d7469aadb68649079defb26e44c62e970afda729
diff --git a/example/lib/bitcoin_cash/send_ft_token_example.dart b/example/lib/bitcoin_cash/send_ft_token_example.dart
index 2e9b82d..c220983 100644
--- a/example/lib/bitcoin_cash/send_ft_token_example.dart
+++ b/example/lib/bitcoin_cash/send_ft_token_example.dart
@@ -11,7 +11,7 @@ void main() async {
       "wss://chipnet.imaginary.cash:50004");
 
   /// create provider with service
-  final provider = ElectrumApiProvider(service);
+  final provider = ElectrumProvider(service);
 
   /// initialize private key
   final privateKey = ECPrivate.fromBytes(BytesUtils.fromHexString(
@@ -35,7 +35,8 @@ void main() async {
 
   /// Reads all UTXOs (Unspent Transaction outputs) associated with the account.
   /// We does not need tokens utxo and we set to false.
-  final elctrumUtxos = await provider.request(ElectrumScriptHashListUnspent(
+  final elctrumUtxos =
+      await provider.request(ElectrumRequestScriptHashListUnspent(
     scriptHash: p2pkhAddress.baseAddress.pubKeyHash(),
     includeTokens: true,
   ));
@@ -136,8 +137,8 @@ void main() async {
   final transactionRaw = transaaction.toHex();
 
   /// send transaction to network
-  await provider
-      .request(ElectrumBroadCastTransaction(transactionRaw: transactionRaw));
+  await provider.request(
+      ElectrumRequestBroadCastTransaction(transactionRaw: transactionRaw));
 
   /// done! check the transaction in block explorer
   ///  https://chipnet.imaginary.cash/tx/97030c1236a024de7cad7ceadf8571833029c508e016bcc8173146317e367ae6
diff --git a/example/lib/bitcoin_cash/transfer_bch_example.dart b/example/lib/bitcoin_cash/transfer_bch_example.dart
index 12fdbd2..d91aff3 100644
--- a/example/lib/bitcoin_cash/transfer_bch_example.dart
+++ b/example/lib/bitcoin_cash/transfer_bch_example.dart
@@ -12,7 +12,7 @@ void main() async {
       "wss://chipnet.imaginary.cash:50004");
 
   /// create provider with service
-  final provider = ElectrumApiProvider(service);
+  final provider = ElectrumProvider(service);
 
   /// initialize private key
   final privateKey = ECPrivate.fromBytes(BytesUtils.fromHexString(
@@ -39,7 +39,8 @@ void main() async {
 
   /// Reads all UTXOs (Unspent Transaction outputs) associated with the account.
   /// We does not need tokens utxo and we set to false.
-  final elctrumUtxos = await provider.request(ElectrumScriptHashListUnspent(
+  final elctrumUtxos =
+      await provider.request(ElectrumRequestScriptHashListUnspent(
     scriptHash: p2pkhAddress.baseAddress.pubKeyHash(),
     includeTokens: false,
   ));
@@ -96,8 +97,8 @@ void main() async {
   final transactionRaw = transaaction.toHex();
 
   /// send transaction to network
-  await provider
-      .request(ElectrumBroadCastTransaction(transactionRaw: transactionRaw));
+  await provider.request(
+      ElectrumRequestBroadCastTransaction(transactionRaw: transactionRaw));
 
   /// done! check the transaction in block explorer
   ///  https://chipnet.imaginary.cash/tx/9e534f8a64f76b1af5ccf2522392697f2242fd215206a458cfe286bca4a3ec0a
diff --git a/example/lib/global/bch_example.dart b/example/lib/global/bch_example.dart
index 3f5bdd4..6f0a6d0 100644
--- a/example/lib/global/bch_example.dart
+++ b/example/lib/global/bch_example.dart
@@ -9,7 +9,7 @@ void main() async {
       "wss://chipnet.imaginary.cash:50004");
 
   /// create provider with service
-  final provider = ElectrumApiProvider(service);
+  final provider = ElectrumProvider(service);
 
   /// initialize private key
   final privateKey = ECPrivate.fromBytes(BytesUtils.fromHexString(
@@ -36,7 +36,8 @@ void main() async {
 
   /// Reads all UTXOs (Unspent Transaction outputs) associated with the account.
   /// We does not need tokens utxo and we set to false.
-  final elctrumUtxos = await provider.request(ElectrumScriptHashListUnspent(
+  final elctrumUtxos =
+      await provider.request(ElectrumRequestScriptHashListUnspent(
     scriptHash: p2pkhAddress.baseAddress.pubKeyHash(),
     includeTokens: false,
   ));
@@ -93,8 +94,8 @@ void main() async {
   final transactionRaw = transaaction.toHex();
 
   /// send transaction to network
-  await provider
-      .request(ElectrumBroadCastTransaction(transactionRaw: transactionRaw));
+  await provider.request(
+      ElectrumRequestBroadCastTransaction(transactionRaw: transactionRaw));
 
   /// done! check the transaction in block explorer
   ///  https://chipnet.imaginary.cash/tx/9e534f8a64f76b1af5ccf2522392697f2242fd215206a458cfe286bca4a3ec0a
diff --git a/example/lib/global/btc_examples_multisig_taproot_legacy_uncomp.dart b/example/lib/global/btc_examples_multisig_taproot_legacy_uncomp.dart
new file mode 100644
index 0000000..617fa11
--- /dev/null
+++ b/example/lib/global/btc_examples_multisig_taproot_legacy_uncomp.dart
@@ -0,0 +1,138 @@
+import 'package:bitcoin_base/bitcoin_base.dart';
+import 'package:example/services_examples/electrum/electrum_ssl_service.dart';
+
+void main() async {
+  final one = ECPrivate.fromBytes(List<int>.filled(32, 12));
+  final two = ECPrivate.fromBytes(List<int>.filled(32, 13));
+  final three = ECPrivate.fromBytes(List<int>.filled(32, 14));
+  final four = ECPrivate.fromBytes(List<int>.filled(32, 15));
+  final five = ECPrivate.fromBytes(List<int>.filled(32, 16));
+  final six = ECPrivate.fromBytes(List<int>.filled(32, 17));
+  final seven = ECPrivate.fromBytes(List<int>.filled(32, 18));
+  final eight = ECPrivate.fromBytes(List<int>.filled(32, 19));
+  final Map<String, ECPrivate> keys = {
+    for (final i in [one, two, three, four, five, six, seven, eight])
+      i.getPublic().toHex(): i
+  };
+  final account = MultiSignatureAddress(threshold: 8, signers: [
+    MultiSignatureSigner(
+        publicKey: one.getPublic().toHex(mode: PublicKeyType.uncompressed),
+        weight: 1),
+    MultiSignatureSigner(publicKey: two.getPublic().toHex(), weight: 1),
+    MultiSignatureSigner(publicKey: three.getPublic().toHex(), weight: 1),
+    MultiSignatureSigner(
+        publicKey: four.getPublic().toHex(mode: PublicKeyType.uncompressed),
+        weight: 1),
+    MultiSignatureSigner(publicKey: five.getPublic().toHex(), weight: 1),
+    MultiSignatureSigner(publicKey: six.getPublic().toHex(), weight: 1),
+    MultiSignatureSigner(
+        publicKey: seven.getPublic().toHex(mode: PublicKeyType.uncompressed),
+        weight: 1),
+    MultiSignatureSigner(publicKey: eight.getPublic().toHex(), weight: 1),
+  ]);
+
+  /// connect to electrum service with websocket
+  /// please see `services_examples` folder for how to create electrum websocket service
+  final service = await ElectrumSSLService.connect(
+      "testnet4-electrumx.wakiyamap.dev:51002");
+
+  /// create provider with service
+  final provider = ElectrumProvider(service);
+
+  final addrOne =
+      one.getPublic().toP2pkAddress(mode: PublicKeyType.uncompressed);
+
+  final addrTwo = two.getPublic().toAddress(mode: PublicKeyType.uncompressed);
+
+  final addrThree =
+      three.getPublic().toP2pkInP2sh(mode: PublicKeyType.uncompressed);
+  final addrFour =
+      four.getPublic().toP2pkhInP2sh(mode: PublicKeyType.uncompressed);
+  final addrFive = four.getPublic().toSegwitAddress();
+  final addrSix = account.toP2shAddress();
+  final addr7 = eight.getPublic().toTaprootAddress();
+  final addr8 = eight.getPublic().toP2wshAddress();
+  final addr9 = eight.getPublic().toP2wshInP2sh();
+  final List<String> pubkys = [
+    one.getPublic().toHex(mode: PublicKeyType.uncompressed),
+    two.getPublic().toHex(mode: PublicKeyType.uncompressed),
+    three.getPublic().toHex(mode: PublicKeyType.uncompressed),
+    four.getPublic().toHex(mode: PublicKeyType.uncompressed),
+    four.getPublic().toHex(),
+    four.getPublic().toHex(),
+    eight.getPublic().toHex(),
+    eight.getPublic().toHex(),
+    eight.getPublic().toHex(),
+    eight.getPublic().toHex(),
+  ];
+  final addresses = [
+    one.getPublic().toP2pkAddress(mode: PublicKeyType.uncompressed),
+    two.getPublic().toAddress(mode: PublicKeyType.uncompressed),
+    three.getPublic().toP2pkInP2sh(mode: PublicKeyType.uncompressed),
+    four.getPublic().toP2pkhInP2sh(mode: PublicKeyType.uncompressed),
+    four.getPublic().toSegwitAddress(),
+    four.getPublic().toP2wshInP2sh(),
+    addrSix,
+    addr7,
+    addr8,
+    addr9
+  ];
+  List<UtxoWithAddress> utxos = [];
+  for (int i = 0; i < addresses.length; i++) {
+    final address = addresses[i];
+    final elctrumUtxos = await provider.request(
+        ElectrumRequestScriptHashListUnspent(
+            scriptHash: address.pubKeyHash(), includeTokens: false));
+    if (elctrumUtxos.isEmpty) continue;
+    if (i == 6) {
+      utxos.addAll(elctrumUtxos.map((e) => UtxoWithAddress(
+          utxo: e.toUtxo(address.type),
+          ownerDetails: UtxoAddressDetails.multiSigAddress(
+              multiSigAddress: account, address: address))));
+      continue;
+    }
+    utxos.addAll(elctrumUtxos
+        .map((e) => UtxoWithAddress(
+            utxo: e.toUtxo(address.type),
+            ownerDetails:
+                UtxoAddressDetails(publicKey: pubkys[i], address: address)))
+        .toList());
+  }
+
+  final sumOfUtxo = utxos.sumOfUtxosValue();
+
+  if (sumOfUtxo == BigInt.zero) {
+    return;
+  }
+  final change =
+      sumOfUtxo - (BigInt.from(1000) * BigInt.from(11) + BigInt.from(4295));
+  final bchTransaction = BitcoinTransactionBuilder(outPuts: [
+    /// change input (sumofutxos - spend)
+    BitcoinOutput(address: addrOne, value: change),
+    BitcoinOutput(address: addrOne, value: BigInt.from(1000)),
+    BitcoinOutput(address: addrTwo, value: BigInt.from(1000)),
+    BitcoinOutput(address: addrThree, value: BigInt.from(1000)),
+    BitcoinOutput(address: addrFour, value: BigInt.from(1000)),
+    BitcoinOutput(address: addrFour, value: BigInt.from(1000)),
+    BitcoinOutput(address: addrFive, value: BigInt.from(1000)),
+    BitcoinOutput(address: addrSix, value: BigInt.from(1000)),
+    BitcoinOutput(address: addrSix, value: BigInt.from(1000)),
+    BitcoinOutput(address: addr7, value: BigInt.from(1000)),
+    BitcoinOutput(address: addr8, value: BigInt.from(1000)),
+    BitcoinOutput(address: addr9, value: BigInt.from(1000)),
+  ], fee: BigInt.from(4295), network: BitcoinNetwork.testnet, utxos: utxos);
+  final transaaction =
+      bchTransaction.buildTransaction((trDigest, utxo, publicKey, sighash) {
+    final pk = ECPublic.fromHex(publicKey);
+    if (utxo.utxo.isP2tr) {
+      return keys[pk.toHex()]!.signTapRoot(trDigest, sighash: sighash);
+    }
+    return keys[pk.toHex()]!.signInput(trDigest, sigHash: sighash);
+  });
+
+  final transactionRaw = transaaction.toHex();
+  await provider.request(
+      ElectrumRequestBroadCastTransaction(transactionRaw: transactionRaw));
+}
+
+/// https://mempool.space/testnet4/tx/a7f08f07739de45a6a4f8871f8e6ad79e0aefbc940086df76571354ba22263fa
diff --git a/example/lib/global/old_examples/bitcoin_example.dart b/example/lib/global/old_examples/bitcoin_example.dart
index a24aaf2..d684cd2 100644
--- a/example/lib/global/old_examples/bitcoin_example.dart
+++ b/example/lib/global/old_examples/bitcoin_example.dart
@@ -158,7 +158,7 @@ void _spendFromP2pkhTo10DifferentType() async {
     /// and sign the transaction digest to construct the unlocking script.
 
     if (publicKey == examplePublicKey2.toHex()) {
-      if (utxo.utxo.isP2tr()) {
+      if (utxo.utxo.isP2tr) {
         return examplePrivateKey.signTapRoot(trDigest);
       }
       return examplePrivateKey.signInput(trDigest, sigHash: sighash);
@@ -376,19 +376,19 @@ void _spendFrom10DifferentTypeToP2pkh() async {
     /// For each input in the transaction, locate the corresponding private key
     /// and sign the transaction digest to construct the unlocking script.
     if (publicKey == childKey1PublicKey.toHex()) {
-      if (utxo.utxo.isP2tr()) {
+      if (utxo.utxo.isP2tr) {
         return childKey1PrivateKey.signTapRoot(trDigest, sighash: sighash);
       }
       return childKey1PrivateKey.signInput(trDigest, sigHash: sighash);
     }
     if (publicKey == examplePublicKey.toHex()) {
-      if (utxo.utxo.isP2tr()) {
+      if (utxo.utxo.isP2tr) {
         return childKey2PrivateKey.signTapRoot(trDigest, sighash: sighash);
       }
       return childKey2PrivateKey.signInput(trDigest, sigHash: sighash);
     }
     if (publicKey == examplePublicKey2.toHex()) {
-      if (utxo.utxo.isP2tr()) {
+      if (utxo.utxo.isP2tr) {
         return examplePrivateKey.signTapRoot(trDigest, sighash: sighash);
       }
       return examplePrivateKey.signInput(trDigest, sigHash: sighash);
diff --git a/example/lib/global/old_examples/spending_with_transaction_builder/multi_sig_transactions.dart b/example/lib/global/old_examples/spending_with_transaction_builder/multi_sig_transactions.dart
index 98d0e9c..cdc9d6c 100644
--- a/example/lib/global/old_examples/spending_with_transaction_builder/multi_sig_transactions.dart
+++ b/example/lib/global/old_examples/spending_with_transaction_builder/multi_sig_transactions.dart
@@ -252,7 +252,7 @@ void main() async {
 
     // Ok, now we have the private key, we need to check which method to use for signing
     // We check whether the UTX corresponds to the P2TR address or not.
-    if (utxo.utxo.isP2tr()) {
+    if (utxo.utxo.isP2tr) {
       // yes is p2tr utxo and now we use SignTaprootTransaction(Schnorr sign)
       // for now this transaction builder support only tweak transaction
       // If you want to spend a Taproot script-path spending, you must create your own transaction builder.
diff --git a/example/lib/global/old_examples/spending_with_transaction_builder/transaction_builder_example.dart b/example/lib/global/old_examples/spending_with_transaction_builder/transaction_builder_example.dart
index 701f72b..20afaed 100644
--- a/example/lib/global/old_examples/spending_with_transaction_builder/transaction_builder_example.dart
+++ b/example/lib/global/old_examples/spending_with_transaction_builder/transaction_builder_example.dart
@@ -200,7 +200,7 @@ void main() async {
 
     // Ok, now we have the private key, we need to check which method to use for signing
     // We check whether the UTX corresponds to the P2TR address or not.
-    if (utxo.utxo.isP2tr()) {
+    if (utxo.utxo.isP2tr) {
       // yes is p2tr utxo and now we use SignTaprootTransaction(Schnorr sign)
       // for now this transaction builder support only tweak transaction
       // If you want to spend a Taproot script-path spending, you must create your own transaction builder.
diff --git a/example/lib/global/transfer_from_7_account_to_6_accout_example.dart b/example/lib/global/transfer_from_7_account_to_6_accout_example.dart
index 37c6e1d..a57a270 100644
--- a/example/lib/global/transfer_from_7_account_to_6_accout_example.dart
+++ b/example/lib/global/transfer_from_7_account_to_6_accout_example.dart
@@ -15,15 +15,14 @@ import 'package:example/services_examples/electrum/electrum_ssl_service.dart';
 void main() async {
   /// connect to electrum service with websocket
   /// please see `services_examples` folder for how to create electrum websocket service
-  final service =
-      await ElectrumSSLService.connect("testnet.aranguren.org:51002");
+  final service = await ElectrumSSLService.connect("testnet.aranguren.org:51002");
 
   /// create provider with service
-  final provider = ElectrumApiProvider(service);
+  final provider = ElectrumProvider(service);
 
   /// spender details
-  final privateKey = ECPrivate.fromHex(
-      "76257aafc9b954351c7f6445b2d07277f681a5e83d515a1f32ebf54989c2af4f");
+  final privateKey =
+      ECPrivate.fromHex("76257aafc9b954351c7f6445b2d07277f681a5e83d515a1f32ebf54989c2af4f");
   final examplePublicKey = privateKey.getPublic();
   final spender1 = examplePublicKey.toP2pkhAddress();
   final spender2 = examplePublicKey.toP2wpkhAddress();
@@ -47,17 +46,16 @@ void main() async {
 
   /// loop each spenders address and get utxos and add to accountsUtxos
   for (final i in spenders) {
-    /// Reads all UTXOs (Unspent Transaction outputs) associated with the account
-    final elctrumUtxos = await provider
-        .request(ElectrumScriptHashListUnspent(scriptHash: i.pubKeyHash()));
+    /// Reads all UTXOs (Unspent Transaction Outputs) associated with the account
+    final electrumUtxos =
+        await provider.request(ElectrumRequestScriptHashListUnspent(scriptHash: i.pubKeyHash()));
 
     /// Converts all UTXOs to a list of UtxoWithAddress, containing UTXO information along with address details.
     /// read spender utxos
-    final List<UtxoWithAddress> utxos = elctrumUtxos
+    final List<UtxoWithAddress> utxos = electrumUtxos
         .map((e) => UtxoWithAddress(
             utxo: e.toUtxo(i.type),
-            ownerDetails: UtxoAddressDetails(
-                publicKey: examplePublicKey.toHex(), address: i)))
+            ownerDetails: UtxoAddressDetails(publicKey: examplePublicKey.toHex(), address: i)))
         .toList();
     accountsUtxos.addAll(utxos);
   }
@@ -68,8 +66,8 @@ void main() async {
     return;
   }
 
-  final examplePublicKey2 = ECPublic.fromHex(
-      "02d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a546");
+  final examplePublicKey2 =
+      ECPublic.fromHex("02d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a546");
 
   /// When creating outputs with an address, I utilize the public key. Alternatively, an address class, such as
   /// P2pkhAddress.fromAddress(address: ".....", network: network);
@@ -77,28 +75,21 @@ void main() async {
   /// ....
   final List<BitcoinOutput> outputs = [
     BitcoinOutput(
-        address: examplePublicKey2.toP2wpkhAddress(),
-        value: BtcUtils.toSatoshi("0.00001")),
+        address: examplePublicKey2.toP2wpkhAddress(), value: BtcUtils.toSatoshi("0.00001")),
     BitcoinOutput(
-        address: examplePublicKey2.toTaprootAddress(),
-        value: BtcUtils.toSatoshi("0.00001")),
+        address: examplePublicKey2.toTaprootAddress(), value: BtcUtils.toSatoshi("0.00001")),
+    BitcoinOutput(address: examplePublicKey2.toP2pkhInP2sh(), value: BtcUtils.toSatoshi("0.00001")),
+    BitcoinOutput(address: examplePublicKey2.toP2pkInP2sh(), value: BtcUtils.toSatoshi("0.00001")),
     BitcoinOutput(
-        address: examplePublicKey2.toP2pkhInP2sh(),
-        value: BtcUtils.toSatoshi("0.00001")),
-    BitcoinOutput(
-        address: examplePublicKey2.toP2pkInP2sh(),
-        value: BtcUtils.toSatoshi("0.00001")),
-    BitcoinOutput(
-        address: examplePublicKey2.toP2wshAddress(),
-        value: BtcUtils.toSatoshi("0.00001")),
+        address: examplePublicKey2.toP2wshAddress(), value: BtcUtils.toSatoshi("0.00001")),
   ];
 
   /// OP_RETURN
   const String memo = "https://github.com/mrtnetwork";
 
   /// SUM OF OUTOUT AMOUNTS
-  final sumOfOutputs = outputs.fold(
-      BigInt.zero, (previousValue, element) => previousValue + element.value);
+  final sumOfOutputs =
+      outputs.fold(BigInt.zero, (previousValue, element) => previousValue + element.value);
 
   /// Estimate transaction size
   int transactionSize = BitcoinTransactionBuilder.estimateTransactionSize(
@@ -107,8 +98,7 @@ void main() async {
         ...outputs,
 
         /// I add more output for change value to get correct transaction size
-        BitcoinOutput(
-            address: examplePublicKey2.toP2pkhAddress(), value: BigInt.zero)
+        BitcoinOutput(address: examplePublicKey2.toP2pkhAddress(), value: BigInt.zero)
       ],
 
       /// network
@@ -121,11 +111,15 @@ void main() async {
       enableRBF: true);
 
   /// get network fee esmtimate (fee per kilobyte)
-  final networkEstimate = await provider.request(ElectrumEstimateFee());
+  final networkEstimate = await provider.request(ElectrumRequestEstimateFee());
+
+  /// the daemon does not have enough information to make an estimate
+  if (networkEstimate == null) {
+    return;
+  }
 
   /// Convert kilobytes to bytes, multiply by the transaction size, and the result yields the transaction fees.
-  final fee =
-      BigInt.from(transactionSize) * (networkEstimate ~/ BigInt.from(1000));
+  final fee = BigInt.from(transactionSize) * (networkEstimate ~/ BigInt.from(1000));
 
   /// change value
   final changeValue = sumOfUtxo - (sumOfOutputs + fee);
@@ -135,8 +129,7 @@ void main() async {
   }
   //// if we have change value we back amount to account
   if (changeValue > BigInt.zero) {
-    outputs.add(BitcoinOutput(
-        address: examplePublicKey2.toP2pkhAddress(), value: changeValue));
+    outputs.add(BitcoinOutput(address: examplePublicKey2.toP2pkhAddress(), value: changeValue));
   }
 
   /// create transaction builder
@@ -151,9 +144,8 @@ void main() async {
       enableRBF: true);
 
   /// create transaction and sign it
-  final transaction =
-      builder.buildTransaction((trDigest, utxo, publicKey, sighash) {
-    if (utxo.utxo.isP2tr()) {
+  final transaction = builder.buildTransaction((trDigest, utxo, publicKey, sighash) {
+    if (utxo.utxo.isP2tr) {
       return privateKey.signTapRoot(trDigest, sighash: sighash);
     }
     return privateKey.signInput(trDigest, sigHash: sighash);
@@ -166,7 +158,7 @@ void main() async {
   final raw = transaction.serialize();
 
   /// send to network
-  await provider.request(ElectrumBroadCastTransaction(transactionRaw: raw));
+  await provider.request(ElectrumRequestBroadCastTransaction(transactionRaw: raw));
 
   /// Once completed, we verify the status by checking the mempool or using another explorer to review the transaction details.
   /// https://mempool.space/testnet/tx/70cf664bba4b5ac9edc6133e9c6891ffaf8a55eaea9d2ac99aceead1c3db8899
diff --git a/example/lib/global/transfer_to_8_account_example.dart b/example/lib/global/transfer_to_8_account_example.dart
index a8f6f6b..822dcb1 100644
--- a/example/lib/global/transfer_to_8_account_example.dart
+++ b/example/lib/global/transfer_to_8_account_example.dart
@@ -5,11 +5,10 @@ import 'package:example/services_examples/electrum/electrum_ssl_service.dart';
 void main() async {
   /// connect to electrum service with websocket
   /// please see `services_examples` folder for how to create electrum websocket service
-  final service =
-      await ElectrumSSLService.connect("testnet.aranguren.org:51002");
+  final service = await ElectrumSSLService.connect("testnet.aranguren.org:51002");
 
   /// create provider with service
-  final provider = ElectrumApiProvider(service);
+  final provider = ElectrumProvider(service);
 
   /// spender details
   /// Define another private key from wif
@@ -20,22 +19,22 @@ void main() async {
   final p2pkhAddress = examplePublicKey2.toP2pkhAddress();
 
   /// receiver addresses i use public key for generate address
-  final examplePublicKey = ECPublic.fromHex(
-      "032a4f8be9ebffb46e2c6a1c240702553b9c9c8ad9638650833d07d5d22f618621");
+  final examplePublicKey =
+      ECPublic.fromHex("032a4f8be9ebffb46e2c6a1c240702553b9c9c8ad9638650833d07d5d22f618621");
 
   const network = BitcoinNetwork.testnet;
 
-  /// Reads all UTXOs (Unspent Transaction outputs) associated with the account
-  final elctrumUtxos = await provider.request(ElectrumScriptHashListUnspent(
-      scriptHash: examplePublicKey2.toP2pkhAddress().pubKeyHash()));
+  /// Reads all UTXOs (Unspent Transaction Outputs) associated with the account
+  final electrumUtxos = await provider.request(
+      ElectrumRequestScriptHashListUnspent(scriptHash: examplePublicKey2.toAddress().pubKeyHash()));
 
   /// Converts all UTXOs to a list of UtxoWithAddress, containing UTXO information along with address details.
   /// read spender utxos
-  final List<UtxoWithAddress> utxos = elctrumUtxos
+  final List<UtxoWithAddress> utxos = electrumUtxos
       .map((e) => UtxoWithAddress(
           utxo: e.toUtxo(p2pkhAddress.type),
-          ownerDetails: UtxoAddressDetails(
-              publicKey: examplePublicKey2.toHex(), address: p2pkhAddress)))
+          ownerDetails:
+              UtxoAddressDetails(publicKey: examplePublicKey2.toHex(), address: p2pkhAddress)))
       .toList();
 
   /// get sum of values
@@ -49,35 +48,23 @@ void main() async {
   /// P2trAddress.fromAddress(address: "....", network: network)
   /// ....
   final List<BitcoinOutput> outputs = [
+    BitcoinOutput(address: examplePublicKey.toP2pkhAddress(), value: BtcUtils.toSatoshi("0.00001")),
     BitcoinOutput(
-        address: examplePublicKey.toP2pkhAddress(),
-        value: BtcUtils.toSatoshi("0.00001")),
+        address: examplePublicKey.toP2wpkhAddress(), value: BtcUtils.toSatoshi("0.00001")),
     BitcoinOutput(
-        address: examplePublicKey.toP2wpkhAddress(),
-        value: BtcUtils.toSatoshi("0.00001")),
-    BitcoinOutput(
-        address: examplePublicKey.toTaprootAddress(),
-        value: BtcUtils.toSatoshi("0.00001")),
-    BitcoinOutput(
-        address: examplePublicKey.toP2pkhInP2sh(),
-        value: BtcUtils.toSatoshi("0.00001")),
-    BitcoinOutput(
-        address: examplePublicKey.toP2pkInP2sh(),
-        value: BtcUtils.toSatoshi("0.00001")),
-    BitcoinOutput(
-        address: examplePublicKey.toP2wshAddress(),
-        value: BtcUtils.toSatoshi("0.00001")),
-    BitcoinOutput(
-        address: examplePublicKey.toP2wpkhInP2sh(),
-        value: BtcUtils.toSatoshi("0.00001")),
+        address: examplePublicKey.toTaprootAddress(), value: BtcUtils.toSatoshi("0.00001")),
+    BitcoinOutput(address: examplePublicKey.toP2pkhInP2sh(), value: BtcUtils.toSatoshi("0.00001")),
+    BitcoinOutput(address: examplePublicKey.toP2pkInP2sh(), value: BtcUtils.toSatoshi("0.00001")),
+    BitcoinOutput(address: examplePublicKey.toP2wshAddress(), value: BtcUtils.toSatoshi("0.00001")),
+    BitcoinOutput(address: examplePublicKey.toP2wpkhInP2sh(), value: BtcUtils.toSatoshi("0.00001")),
   ];
 
   /// OP_RETURN
   const String memo = "https://github.com/mrtnetwork";
 
   /// SUM OF OUTOUT AMOUNTS
-  final sumOfOutputs = outputs.fold(
-      BigInt.zero, (previousValue, element) => previousValue + element.value);
+  final sumOfOutputs =
+      outputs.fold(BigInt.zero, (previousValue, element) => previousValue + element.value);
 
   /// ESTIMATE TRANSACTION SIZE
   int estimateSize = BitcoinTransactionBuilder.estimateTransactionSize(
@@ -86,8 +73,7 @@ void main() async {
         ...outputs,
 
         /// I add more output for change value to get correct transaction size
-        BitcoinOutput(
-            address: examplePublicKey2.toP2pkhAddress(), value: BigInt.zero)
+        BitcoinOutput(address: examplePublicKey2.toP2pkhAddress(), value: BigInt.zero)
       ],
 
       /// network
@@ -100,11 +86,15 @@ void main() async {
       enableRBF: true);
 
   /// get network fee esmtimate (kb/s)
-  final networkEstimate = await provider.request(ElectrumEstimateFee());
+  final networkEstimate = await provider.request(ElectrumRequestEstimateFee());
+
+  /// the daemon does not have enough information to make an estimate
+  if (networkEstimate == null) {
+    return;
+  }
 
   /// kb to bytes and mul with transaction size and now we have fee
-  final fee =
-      BigInt.from(estimateSize) * (networkEstimate ~/ BigInt.from(1000));
+  final fee = BigInt.from(estimateSize) * (networkEstimate ~/ BigInt.from(1000));
 
   /// change value
   final changeValue = sumOfUtxo - (sumOfOutputs + fee);
@@ -112,8 +102,8 @@ void main() async {
   if (changeValue.isNegative) return;
   //// if we have change value we back amount to account
   if (changeValue > BigInt.zero) {
-    final changeOutput = BitcoinOutput(
-        address: examplePublicKey2.toP2pkhAddress(), value: changeValue);
+    final changeOutput =
+        BitcoinOutput(address: examplePublicKey2.toP2pkhAddress(), value: changeValue);
     outputs.add(changeOutput);
   }
 
@@ -129,9 +119,8 @@ void main() async {
       enableRBF: true);
 
   /// create transaction and sign it
-  final transaction =
-      builder.buildTransaction((trDigest, utxo, publicKey, sighash) {
-    if (utxo.utxo.isP2tr()) {
+  final transaction = builder.buildTransaction((trDigest, utxo, publicKey, sighash) {
+    if (utxo.utxo.isP2tr) {
       return examplePrivateKey2.signTapRoot(trDigest, sighash: sighash);
     }
     return examplePrivateKey2.signInput(trDigest, sigHash: sighash);
@@ -144,7 +133,7 @@ void main() async {
   final raw = transaction.serialize();
 
   /// send to network
-  await provider.request(ElectrumBroadCastTransaction(transactionRaw: raw));
+  await provider.request(ElectrumRequestBroadCastTransaction(transactionRaw: raw));
 
   /// Once completed, we verify the status by checking the mempool or using another explorer to review the transaction details.
   /// https://mempool.space/testnet/tx/abab018f3d2b92bf30c63b4aca419cf6d6571692b3620f06311c7e5a21a88b56
diff --git a/example/pubspec.lock b/example/pubspec.lock
index 0aa5320..2ade285 100644
--- a/example/pubspec.lock
+++ b/example/pubspec.lock
@@ -23,14 +23,16 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "4.7.0"
+    version: "5.0.0"
   blockchain_utils:
     dependency: "direct main"
     description:
-      path: "/home/rafael/Working/blockchain_utils/"
-      relative: false
-    source: path
-    version: "3.3.0"
+      path: "."
+      ref: cake-update-v4
+      resolved-ref: "8a39e4342c15a4476c6ee57b5efba46452130868"
+      url: "https://github.com/cake-tech/blockchain_utils"
+    source: git
+    version: "4.0.0"
   boolean_selector:
     dependency: transitive
     description:
@@ -75,26 +77,26 @@ packages:
     dependency: transitive
     description:
       name: convert
-      sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592"
+      sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.1"
+    version: "3.1.2"
   crypto:
     dependency: transitive
     description:
       name: crypto
-      sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab
+      sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.3"
+    version: "3.0.6"
   cupertino_icons:
     dependency: "direct main"
     description:
       name: cupertino_icons
-      sha256: d57953e10f9f8327ce64a508a355f0b1ec902193f66288e8cb5070e7c47eeb2d
+      sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.6"
+    version: "1.0.8"
   fake_async:
     dependency: transitive
     description:
@@ -133,10 +135,10 @@ packages:
     dependency: "direct main"
     description:
       name: http
-      sha256: a2bbf9d017fcced29139daa8ed2bba4ece450ab222871df93ca9eec6f80c34ba
+      sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.2.2"
   http_parser:
     dependency: transitive
     description:
@@ -149,10 +151,10 @@ packages:
     dependency: transitive
     description:
       name: intl
-      sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"
+      sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
       url: "https://pub.dev"
     source: hosted
-    version: "0.18.1"
+    version: "0.19.0"
   js:
     dependency: transitive
     description:
@@ -165,26 +167,26 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
+      sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.0"
+    version: "10.0.5"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
+      sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "3.0.5"
   leak_tracker_testing:
     dependency: transitive
     description:
       name: leak_tracker_testing
-      sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
+      sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "3.0.1"
   lints:
     dependency: transitive
     description:
@@ -205,18 +207,18 @@ packages:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
+      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.0"
+    version: "0.11.1"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
+      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.0"
+    version: "1.15.0"
   path:
     dependency: transitive
     description:
@@ -290,10 +292,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
+      sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.1"
+    version: "0.7.2"
   typed_data:
     dependency: transitive
     description:
@@ -314,17 +316,18 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
+      sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
       url: "https://pub.dev"
     source: hosted
-    version: "13.0.0"
+    version: "14.2.5"
   web:
     dependency: transitive
     description:
       name: web
-      sha256: "4188706108906f002b3a293509234588823c8c979dc83304e229ff400c996b05"
+      sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb
       url: "https://pub.dev"
     source: hosted
-    version: "0.4.2"
+    version: "1.1.0"
 sdks:
-  dart: ">=3.2.0 <4.0.0"
+  dart: ">=3.4.0 <4.0.0"
+  flutter: ">=3.18.0-18.0.pre.54"
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
index 8f9a3cf..a192cc3 100644
--- a/example/pubspec.yaml
+++ b/example/pubspec.yaml
@@ -40,7 +40,7 @@ dependencies:
   blockchain_utils:
     git:
       url: https://github.com/cake-tech/blockchain_utils
-      ref: cake-update-v2
+      ref: cake-update-v4
 
   http: ^1.2.0
 
diff --git a/example/test/test_test.dart b/example/test/test_test.dart
new file mode 100644
index 0000000..ab73b3a
--- /dev/null
+++ b/example/test/test_test.dart
@@ -0,0 +1 @@
+void main() {}
diff --git a/example/test/widget_test.dart b/example/test/widget_test.dart
deleted file mode 100644
index f76cc54..0000000
--- a/example/test/widget_test.dart
+++ /dev/null
@@ -1 +0,0 @@
-void main() async {}
diff --git a/lib/bitcoin_base.dart b/lib/bitcoin_base.dart
index a2c93a8..4a5869b 100644
--- a/lib/bitcoin_base.dart
+++ b/lib/bitcoin_base.dart
@@ -4,30 +4,38 @@
 /// including spending transactions, Bitcoin address management,
 ///  Bitcoin Schnorr signatures, BIP-39 mnemonic phrase generation,
 /// hierarchical deterministic (HD) wallet derivation, and Web3 Secret Storage Definition.
-library bitcoin_base;
+library;
 
-export 'package:bitcoin_base/src/bitcoin/address/address.dart';
+export 'src/bitcoin/address/address.dart';
 
-export 'package:bitcoin_base/src/bitcoin/address/util.dart';
+export 'src/bitcoin/address/util.dart';
 
-export 'package:bitcoin_base/src/bitcoin/script/scripts.dart';
+export 'src/bitcoin/script/scripts.dart';
 
-export 'package:bitcoin_base/src/bitcoin/amount/amount.dart';
+export 'src/bitcoin/amount/amount.dart';
 
-export 'package:bitcoin_base/src/crypto/crypto.dart';
+export 'src/crypto/crypto.dart';
 
-export 'package:bitcoin_base/src/models/network.dart';
+export 'src/bitcoin/script/scripts.dart';
 
-export 'package:bitcoin_base/src/provider/api_provider.dart';
+export 'src/crypto/crypto.dart';
 
-export 'package:bitcoin_base/src/provider/models/electrum/electrum_utxo.dart';
+export 'src/models/network.dart';
 
-export 'package:bitcoin_base/src/utils/utils.dart';
+export 'src/provider/api_provider.dart';
 
-export 'package:bitcoin_base/src/cash_token/cash_token.dart';
+export 'src/provider/models/electrum/electrum_utxo.dart';
 
-export 'package:bitcoin_base/src/bitcoin_cash/bitcoin_cash.dart';
+export 'src/utils/utils.dart';
 
-export 'package:bitcoin_base/src/bitcoin/silent_payments/silent_payments.dart';
+export 'src/utils/btc_utils.dart';
 
-export 'package:bitcoin_base/src/bitcoin/script/op_code/constant.dart';
+export 'src/cash_token/cash_token.dart';
+
+export 'src/bitcoin_cash/bitcoin_cash.dart';
+
+export 'src/transaction_builder/builder.dart';
+
+export 'src/bitcoin/silent_payments/silent_payments.dart';
+
+export 'src/bitcoin/script/op_code/constant.dart';
diff --git a/lib/src/bitcoin/address/address.dart b/lib/src/bitcoin/address/address.dart
index c644cf8..cc4760e 100644
--- a/lib/src/bitcoin/address/address.dart
+++ b/lib/src/bitcoin/address/address.dart
@@ -6,7 +6,7 @@
 // - Utility functions for address manipulation.
 // - encode/decode Segregated Witness (SegWit) address implementation.
 // - Enhanced functionality for improved handling of addresses across diverse networks.
-library bitcoin_base.address;
+library;
 
 import 'package:bitcoin_base/bitcoin_base.dart';
 import 'package:bitcoin_base/src/exception/exception.dart';
diff --git a/lib/src/bitcoin/address/core.dart b/lib/src/bitcoin/address/core.dart
index 28bfdb6..8756f86 100644
--- a/lib/src/bitcoin/address/core.dart
+++ b/lib/src/bitcoin/address/core.dart
@@ -9,7 +9,7 @@ abstract class BitcoinAddressType implements Enumerate {
   /// Factory method to create a BitcoinAddressType enum value from a name or value.
   static BitcoinAddressType fromValue(String value) {
     return values.firstWhere((element) => element.value == value,
-        orElse: () => throw BitcoinBasePluginException('Invalid BitcoinAddressType: $value'));
+        orElse: () => throw DartBitcoinPluginException('Invalid BitcoinAddressType: $value'));
   }
 
   static BitcoinAddressType fromAddress(BitcoinBaseAddress address) {
@@ -18,16 +18,16 @@ abstract class BitcoinAddressType implements Enumerate {
     } else if (address is P2shAddress) {
       return P2shAddressType.p2wpkhInP2sh;
     } else if (address is P2wshAddress) {
-      return SegwitAddresType.p2wsh;
+      return SegwitAddressType.p2wsh;
     } else if (address is P2trAddress) {
-      return SegwitAddresType.p2tr;
+      return SegwitAddressType.p2tr;
     } else if (address is SilentPaymentsAddresType) {
       return SilentPaymentsAddresType.p2sp;
     } else if (address is P2wpkhAddress) {
-      return SegwitAddresType.p2wpkh;
+      return SegwitAddressType.p2wpkh;
     }
 
-    throw BitcoinBasePluginException('Invalid BitcoinAddressType: $address');
+    throw DartBitcoinPluginException('Invalid BitcoinAddressType: $address');
   }
 
   /// Check if the address type is Pay-to-Script-Hash (P2SH).
@@ -38,10 +38,10 @@ abstract class BitcoinAddressType implements Enumerate {
   // Enum values as a list for iteration
   static const List<BitcoinAddressType> values = [
     P2pkhAddressType.p2pkh,
-    SegwitAddresType.p2wpkh,
-    SegwitAddresType.p2tr,
-    SegwitAddresType.p2wsh,
-    SegwitAddresType.mweb,
+    SegwitAddressType.p2wpkh,
+    SegwitAddressType.p2tr,
+    SegwitAddressType.p2wsh,
+    SegwitAddressType.mweb,
     P2shAddressType.p2wshInP2sh,
     P2shAddressType.p2wpkhInP2sh,
     P2shAddressType.p2pkhInP2sh,
@@ -55,6 +55,14 @@ abstract class BitcoinAddressType implements Enumerate {
     P2pkhAddressType.p2pkhwt,
     SilentPaymentsAddresType.p2sp
   ];
+  T cast<T extends BitcoinAddressType>() {
+    if (this is! T) {
+      throw DartBitcoinPluginException('BitcoinAddressType casting failed.',
+          details: {'excepted': '$T', 'type': value});
+    }
+    return this as T;
+  }
+
   @override
   String toString() => value;
 }
@@ -95,46 +103,42 @@ abstract class BitcoinBaseAddress {
       return P2wpkhAddress.fromAddress(address: address, network: network);
     }
 
-    throw BitcoinBasePluginException('Invalid BitcoinBaseAddress: $address');
+    throw DartBitcoinPluginException('Invalid BitcoinBaseAddress: $address');
   }
 }
 
-class PubKeyAddressType implements BitcoinAddressType {
-  const PubKeyAddressType._(this.value);
-  static const PubKeyAddressType p2pk = PubKeyAddressType._("P2PK");
+class PubKeyAddressType extends BitcoinAddressType {
+  const PubKeyAddressType._(super.value) : super._();
+  static const PubKeyAddressType p2pk = PubKeyAddressType._('P2PK');
   @override
   bool get isP2sh => false;
   @override
   bool get isSegwit => false;
-  @override
-  final String value;
+
   @override
   int get hashLength => 20;
   @override
   String toString() => value;
 }
 
-class P2pkhAddressType implements BitcoinAddressType {
-  const P2pkhAddressType._(this.value);
-  static const P2pkhAddressType p2pkh = P2pkhAddressType._("P2PKH");
-  static const P2pkhAddressType p2pkhwt = P2pkhAddressType._("P2PKHWT");
+class P2pkhAddressType extends BitcoinAddressType {
+  const P2pkhAddressType._(super.value) : super._();
+  static const P2pkhAddressType p2pkh = P2pkhAddressType._('P2PKH');
+  static const P2pkhAddressType p2pkhwt = P2pkhAddressType._('P2PKHWT');
 
   @override
   bool get isP2sh => false;
   @override
   bool get isSegwit => false;
 
-  @override
-  final String value;
-
   @override
   int get hashLength => 20;
   @override
   String toString() => value;
 }
 
-class P2shAddressType implements BitcoinAddressType {
-  const P2shAddressType._(this.value, this.hashLength, this.withToken);
+class P2shAddressType extends BitcoinAddressType {
+  const P2shAddressType._(super.value, this.hashLength, this.withToken) : super._();
   static const P2shAddressType p2wshInP2sh =
       P2shAddressType._("P2SH/P2WSH", _BitcoinAddressUtils.hash160DigestLength, false);
   static const P2shAddressType p2wpkhInP2sh =
@@ -176,33 +180,27 @@ class P2shAddressType implements BitcoinAddressType {
   static const P2shAddressType p2pkInP2shwt =
       P2shAddressType._("P2SHWT/P2PK", _BitcoinAddressUtils.hash160DigestLength, true);
 
-  @override
-  final String value;
-
   @override
   String toString() => value;
 }
 
-class SegwitAddresType implements BitcoinAddressType {
-  const SegwitAddresType._(this.value);
-  static const SegwitAddresType p2wpkh = SegwitAddresType._("P2WPKH");
-  static const SegwitAddresType p2tr = SegwitAddresType._("P2TR");
-  static const SegwitAddresType p2wsh = SegwitAddresType._("P2WSH");
-  static const SegwitAddresType mweb = SegwitAddresType._("MWEB");
+class SegwitAddressType extends BitcoinAddressType {
+  const SegwitAddressType._(super.value) : super._();
+  static const SegwitAddressType p2wpkh = SegwitAddressType._("P2WPKH");
+  static const SegwitAddressType p2tr = SegwitAddressType._("P2TR");
+  static const SegwitAddressType p2wsh = SegwitAddressType._("P2WSH");
+  static const SegwitAddressType mweb = SegwitAddressType._("MWEB");
   @override
   bool get isP2sh => false;
   @override
   bool get isSegwit => true;
 
-  @override
-  final String value;
-
   @override
   int get hashLength {
     switch (this) {
-      case SegwitAddresType.p2wpkh:
+      case SegwitAddressType.p2wpkh:
         return 20;
-      case SegwitAddresType.mweb:
+      case SegwitAddressType.mweb:
         return 66;
       default:
         return 32;
@@ -213,17 +211,14 @@ class SegwitAddresType implements BitcoinAddressType {
   String toString() => value;
 }
 
-class SilentPaymentsAddresType implements BitcoinAddressType {
-  const SilentPaymentsAddresType._(this.value);
+class SilentPaymentsAddresType extends BitcoinAddressType {
+  const SilentPaymentsAddresType._(super.value) : super._();
   static const SilentPaymentsAddresType p2sp = SilentPaymentsAddresType._("P2SP");
   @override
   bool get isP2sh => false;
   @override
   bool get isSegwit => true;
 
-  @override
-  final String value;
-
   @override
   int get hashLength {
     return 32;
diff --git a/lib/src/bitcoin/address/derivations.dart b/lib/src/bitcoin/address/derivations.dart
index 303a889..3b3510f 100644
--- a/lib/src/bitcoin/address/derivations.dart
+++ b/lib/src/bitcoin/address/derivations.dart
@@ -64,7 +64,7 @@ abstract class BitcoinDerivationInfos {
     derivationType: BitcoinDerivationType.electrum,
     derivationPath: BitcoinDerivationPaths.ELECTRUM,
     description: "Electrum",
-    scriptType: SegwitAddresType.p2wpkh,
+    scriptType: SegwitAddressType.p2wpkh,
   );
 
   static final BitcoinDerivationInfo BIP44 = BitcoinDerivationInfo(
@@ -83,20 +83,20 @@ abstract class BitcoinDerivationInfos {
     derivationType: BitcoinDerivationType.bip39,
     derivationPath: BitcoinDerivationPaths.BIP84,
     description: "Standard BIP84 native segwit",
-    scriptType: SegwitAddresType.p2wpkh,
+    scriptType: SegwitAddressType.p2wpkh,
   );
   static final BitcoinDerivationInfo BIP86 = BitcoinDerivationInfo(
     derivationType: BitcoinDerivationType.bip39,
     derivationPath: BitcoinDerivationPaths.BIP86,
     description: "Standard BIP86 Taproot",
-    scriptType: SegwitAddresType.p2tr,
+    scriptType: SegwitAddressType.p2tr,
   );
 
   static final BitcoinDerivationInfo LITECOIN = BitcoinDerivationInfo(
     derivationType: BitcoinDerivationType.bip39,
     derivationPath: BitcoinDerivationPaths.LITECOIN,
     description: "Default Litecoin",
-    scriptType: SegwitAddresType.p2wpkh,
+    scriptType: SegwitAddressType.p2wpkh,
   );
 
   static final BitcoinDerivationInfo SILENT_PAYMENTS_SCAN = BitcoinDerivationInfo(
@@ -133,13 +133,13 @@ final Map<BitcoinDerivationType, List<BitcoinDerivationInfo>> BITCOIN_DERIVATION
       derivationType: BitcoinDerivationType.bip39,
       derivationPath: BitcoinDerivationPaths.BIP84,
       description: "Standard BIP84 native segwit",
-      scriptType: SegwitAddresType.p2wpkh,
+      scriptType: SegwitAddressType.p2wpkh,
     ),
     BitcoinDerivationInfo(
       derivationType: BitcoinDerivationType.bip39,
       derivationPath: BitcoinDerivationPaths.BIP86,
       description: "Standard BIP86 Taproot",
-      scriptType: SegwitAddresType.p2tr,
+      scriptType: SegwitAddressType.p2tr,
     ),
     BitcoinDerivationInfo(
       derivationType: BitcoinDerivationType.bip39,
@@ -157,37 +157,37 @@ final Map<BitcoinDerivationType, List<BitcoinDerivationInfo>> BITCOIN_DERIVATION
       derivationType: BitcoinDerivationType.bip39,
       derivationPath: BitcoinDerivationPaths.NON_STANDARD,
       description: "Non-standard native segwit",
-      scriptType: SegwitAddresType.p2wpkh,
+      scriptType: SegwitAddressType.p2wpkh,
     ),
     BitcoinDerivationInfo(
       derivationType: BitcoinDerivationType.bip39,
       derivationPath: BitcoinDerivationPaths.BIP44,
       description: "Samourai Deposit",
-      scriptType: SegwitAddresType.p2wpkh,
+      scriptType: SegwitAddressType.p2wpkh,
     ),
     BitcoinDerivationInfo(
       derivationType: BitcoinDerivationType.bip39,
       derivationPath: BitcoinDerivationPaths.BIP49,
       description: "Samourai Deposit",
-      scriptType: SegwitAddresType.p2wpkh,
+      scriptType: SegwitAddressType.p2wpkh,
     ),
     BitcoinDerivationInfo(
       derivationType: BitcoinDerivationType.bip39,
       derivationPath: BitcoinDerivationPaths.SAMOURAI_BAD_BANK,
       description: "Samourai Bad Bank (toxic change)",
-      scriptType: SegwitAddresType.p2wpkh,
+      scriptType: SegwitAddressType.p2wpkh,
     ),
     BitcoinDerivationInfo(
       derivationType: BitcoinDerivationType.bip39,
       derivationPath: BitcoinDerivationPaths.SAMOURAI_WHIRLPOOL_PREMIX,
       description: "Samourai Whirlpool Pre Mix",
-      scriptType: SegwitAddresType.p2wpkh,
+      scriptType: SegwitAddressType.p2wpkh,
     ),
     BitcoinDerivationInfo(
       derivationType: BitcoinDerivationType.bip39,
       derivationPath: BitcoinDerivationPaths.SAMOURAI_WHIRLPOOL_POSTMIX,
       description: "Samourai Whirlpool Post Mix",
-      scriptType: SegwitAddresType.p2wpkh,
+      scriptType: SegwitAddressType.p2wpkh,
     ),
     BitcoinDerivationInfo(
       derivationType: BitcoinDerivationType.bip39,
@@ -205,7 +205,7 @@ final Map<BitcoinDerivationType, List<BitcoinDerivationInfo>> BITCOIN_DERIVATION
       derivationType: BitcoinDerivationType.bip39,
       derivationPath: BitcoinDerivationPaths.SAMOURAI_RICOCHET_NATIVE_SEGWIT,
       description: "Samourai Ricochet native segwit",
-      scriptType: SegwitAddresType.p2wpkh,
+      scriptType: SegwitAddressType.p2wpkh,
     ),
     BitcoinDerivationInfos.LITECOIN,
     BitcoinDerivationInfos.SILENT_PAYMENTS_SCAN,
diff --git a/lib/src/bitcoin/address/legacy_address.dart b/lib/src/bitcoin/address/legacy_address.dart
index caa348d..4e68cbe 100644
--- a/lib/src/bitcoin/address/legacy_address.dart
+++ b/lib/src/bitcoin/address/legacy_address.dart
@@ -21,7 +21,7 @@ abstract class LegacyAddress extends BitcoinBaseAddress {
     );
 
     if (decode == null) {
-      throw BitcoinBasePluginException("Invalid ${network.conf.coinName} address");
+      throw DartBitcoinPluginException('Invalid ${network.conf.coinName} address');
     }
 
     _addressProgram = decode;
@@ -40,12 +40,12 @@ abstract class LegacyAddress extends BitcoinBaseAddress {
         _signature = script.findScriptParam(0);
         break;
       case P2pkhAddressType.p2pkh:
-        if (script.script.length != 2) throw ArgumentError('Input is invalid');
+        if (script.script.length != 2) throw DartBitcoinPluginException('Input is invalid');
 
         _signature = script.findScriptParam(0);
 
         if (!isCanonicalScriptSignature(BytesUtils.fromHexString(_signature!))) {
-          throw ArgumentError('Input has invalid signature');
+          throw DartBitcoinPluginException('Input has invalid signature');
         }
 
         _pubkey = ECPublic.fromHex(script.findScriptParam(1));
@@ -80,7 +80,7 @@ abstract class LegacyAddress extends BitcoinBaseAddress {
   @override
   String toAddress(BasedUtxoNetwork network) {
     if (!network.supportedAddress.contains(type)) {
-      throw BitcoinBasePluginException("network does not support ${type.value} address");
+      throw DartBitcoinPluginException("network does not support ${type.value} address");
     }
 
     return _BitcoinAddressUtils.legacyToAddress(
@@ -150,7 +150,7 @@ class P2shAddress extends LegacyAddress {
     type = P2shAddressType.p2pkInP2sh,
   }) {
     if (script.getAddressType() is! P2shAddressType) {
-      throw ArgumentError("Invalid scriptPubKey");
+      throw DartBitcoinPluginException("Invalid scriptPubKey");
     }
 
     return P2shAddress.fromHash160(h160: script.findScriptParam(1), type: type);
@@ -182,7 +182,7 @@ class P2pkhAddress extends LegacyAddress {
     P2pkhAddressType type = P2pkhAddressType.p2pkh,
   }) {
     if (script.getAddressType() != P2pkhAddressType.p2pkh) {
-      throw ArgumentError("Invalid scriptPubKey");
+      throw DartBitcoinPluginException("Invalid scriptPubKey");
     }
 
     return P2pkhAddress.fromHash160(h160: script.findScriptParam(2), type: type);
@@ -248,7 +248,7 @@ class P2pkAddress extends LegacyAddress {
 
   factory P2pkAddress.fromScriptPubkey({required Script script}) {
     if (script.getAddressType() is! PubKeyAddressType) {
-      throw ArgumentError("Invalid scriptPubKey");
+      throw DartBitcoinPluginException("Invalid scriptPubKey");
     }
 
     return P2pkAddress.fromPubkey(pubkey: ECPublic.fromHex(script.script[0]));
diff --git a/lib/src/bitcoin/address/network_address.dart b/lib/src/bitcoin/address/network_address.dart
index bed4732..2a8e1bb 100644
--- a/lib/src/bitcoin/address/network_address.dart
+++ b/lib/src/bitcoin/address/network_address.dart
@@ -2,96 +2,88 @@ part of 'package:bitcoin_base/src/bitcoin/address/address.dart';
 
 /// An abstract class representing a forked address for a specific network.
 abstract class BitcoinNetworkAddress<T extends BasedUtxoNetwork> {
-  const BitcoinNetworkAddress();
+  const BitcoinNetworkAddress._(
+      {required this.address, required this.network, required this.baseAddress});
 
   /// The underlying Bitcoin base address.
-  abstract final BitcoinBaseAddress baseAddress;
+  final BitcoinBaseAddress baseAddress;
 
   /// Converts the address to a string representation for the specified network [T].
-  String toAddress([T? network]) {
-    return network == null ? address : baseAddress.toAddress(network);
+  String toAddress([T? updateNetwork]) {
+    return updateNetwork == null ? address : baseAddress.toAddress(updateNetwork);
   }
 
   /// The type of the Bitcoin address.
   BitcoinAddressType get type => baseAddress.type;
 
   /// The string representation of the address.
-  abstract final String address;
+  final String address;
+
+  final T network;
 }
 
 /// A concrete implementation of [BitcoinNetworkAddress] for Bitcoin network.
 class BitcoinAddress extends BitcoinNetworkAddress<BitcoinNetwork> {
-  const BitcoinAddress._(this.baseAddress, this.address);
+  const BitcoinAddress._(BitcoinBaseAddress baseAddress, String address, BitcoinNetwork network)
+      : super._(address: address, baseAddress: baseAddress, network: network);
   factory BitcoinAddress(String address, {BitcoinNetwork network = BitcoinNetwork.mainnet}) {
-    return BitcoinAddress._(_BitcoinAddressUtils.decodeAddress(address, network), address);
+    return BitcoinAddress._(_BitcoinAddressUtils.decodeAddress(address, network), address, network);
   }
   factory BitcoinAddress.fromBaseAddress(BitcoinBaseAddress address,
-      {DashNetwork network = DashNetwork.mainnet}) {
+      {BitcoinNetwork network = BitcoinNetwork.mainnet}) {
     final baseAddress = _BitcoinAddressUtils.validateAddress(address, network);
-    return BitcoinAddress._(baseAddress, baseAddress.toAddress(network));
+    return BitcoinAddress._(baseAddress, baseAddress.toAddress(network), network);
   }
-  @override
-  final BitcoinBaseAddress baseAddress;
-  @override
-  final String address;
 }
 
 /// A concrete implementation of [BitcoinNetworkAddress] for Doge network.
 class DogeAddress extends BitcoinNetworkAddress<DogecoinNetwork> {
-  const DogeAddress._(this.baseAddress, this.address);
+  const DogeAddress._(BitcoinBaseAddress baseAddress, String address, DogecoinNetwork network)
+      : super._(address: address, baseAddress: baseAddress, network: network);
   factory DogeAddress(String address, {DogecoinNetwork network = DogecoinNetwork.mainnet}) {
-    return DogeAddress._(_BitcoinAddressUtils.decodeAddress(address, network), address);
+    return DogeAddress._(_BitcoinAddressUtils.decodeAddress(address, network), address, network);
   }
   factory DogeAddress.fromBaseAddress(BitcoinBaseAddress address,
       {DogecoinNetwork network = DogecoinNetwork.mainnet}) {
     final baseAddress = _BitcoinAddressUtils.validateAddress(address, network);
-    return DogeAddress._(baseAddress, baseAddress.toAddress(network));
+    return DogeAddress._(baseAddress, baseAddress.toAddress(network), network);
   }
-  @override
-  final BitcoinBaseAddress baseAddress;
-
-  @override
-  final String address;
 }
 
 /// A concrete implementation of [BitcoinNetworkAddress] for Pepecoin network.
 class PepeAddress extends BitcoinNetworkAddress<PepeNetwork> {
-  const PepeAddress._(this.baseAddress, this.address);
+  const PepeAddress._(BitcoinBaseAddress baseAddress, String address, PepeNetwork network)
+      : super._(address: address, network: network, baseAddress: baseAddress);
   factory PepeAddress(String address, {PepeNetwork network = PepeNetwork.mainnet}) {
-    return PepeAddress._(_BitcoinAddressUtils.decodeAddress(address, network), address);
+    return PepeAddress._(_BitcoinAddressUtils.decodeAddress(address, network), address, network);
   }
   factory PepeAddress.fromBaseAddress(BitcoinBaseAddress address,
       {PepeNetwork network = PepeNetwork.mainnet}) {
     final baseAddress = _BitcoinAddressUtils.validateAddress(address, network);
-    return PepeAddress._(baseAddress, baseAddress.toAddress(network));
+    return PepeAddress._(baseAddress, baseAddress.toAddress(network), network);
   }
-  @override
-  final BitcoinBaseAddress baseAddress;
-
-  @override
-  final String address;
 }
 
 /// A concrete implementation of [BitcoinNetworkAddress] for Litecoin network.
 class LitecoinAddress extends BitcoinNetworkAddress<LitecoinNetwork> {
-  LitecoinAddress._(this.baseAddress, this.address);
+  const LitecoinAddress._(BitcoinBaseAddress baseAddress, String address, LitecoinNetwork network)
+      : super._(address: address, baseAddress: baseAddress, network: network);
   factory LitecoinAddress(String address, {LitecoinNetwork network = LitecoinNetwork.mainnet}) {
-    return LitecoinAddress._(_BitcoinAddressUtils.decodeAddress(address, network), address);
+    return LitecoinAddress._(
+        _BitcoinAddressUtils.decodeAddress(address, network), address, network);
   }
   factory LitecoinAddress.fromBaseAddress(BitcoinBaseAddress address,
       {LitecoinNetwork network = LitecoinNetwork.mainnet}) {
     final baseAddress = _BitcoinAddressUtils.validateAddress(address, network);
-    return LitecoinAddress._(baseAddress, baseAddress.toAddress(network));
+    return LitecoinAddress._(baseAddress, baseAddress.toAddress(network), network);
   }
-  @override
-  final BitcoinBaseAddress baseAddress;
-  @override
-  final String address;
 }
 
 /// A concrete implementation of [BitcoinNetworkAddress] for Bitcoin cash network.
 class BitcoinCashAddress extends BitcoinNetworkAddress<BitcoinCashNetwork> {
-  const BitcoinCashAddress._(this.baseAddress, this.address);
+  const BitcoinCashAddress._(
+      BitcoinBaseAddress baseAddress, String address, BitcoinCashNetwork network)
+      : super._(address: address, baseAddress: baseAddress, network: network);
   factory BitcoinCashAddress(String address,
       {BitcoinCashNetwork network = BitcoinCashNetwork.mainnet,
       bool validateNetworkPrefix = false}) {
@@ -101,59 +93,67 @@ class BitcoinCashAddress extends BitcoinNetworkAddress<BitcoinCashNetwork> {
       validateNetworkHRP: validateNetworkPrefix,
     );
     if (decodeAddress == null) {
-      throw BitcoinBasePluginException("Invalid ${network.value} address.");
+      throw DartBitcoinPluginException('Invalid ${network.value} address.');
     }
-    return BitcoinCashAddress._(decodeAddress, address);
+    return BitcoinCashAddress._(decodeAddress, address, network);
   }
   factory BitcoinCashAddress.fromBaseAddress(BitcoinBaseAddress address,
       {BitcoinCashNetwork network = BitcoinCashNetwork.mainnet}) {
     final baseAddress = _BitcoinAddressUtils.validateAddress(address, network);
-    return BitcoinCashAddress._(baseAddress, baseAddress.toAddress(network));
+    return BitcoinCashAddress._(baseAddress, baseAddress.toAddress(network), network);
   }
-  @override
-  final BitcoinBaseAddress baseAddress;
-  @override
-  final String address;
 
   @override
-  String toAddress([BitcoinCashNetwork? network, String? prefix]) {
+  String toAddress([BitcoinCashNetwork? updateNetwork, String? prefix]) {
     if (prefix != null) {
       return BchAddrConverter.convert(address, prefix, null);
     }
-    return super.toAddress(network);
+    return super.toAddress(updateNetwork);
   }
 }
 
 /// A concrete implementation of [BitcoinNetworkAddress] for Dash network.
 class DashAddress extends BitcoinNetworkAddress<DashNetwork> {
-  const DashAddress._(this.baseAddress, this.address);
+  const DashAddress._(BitcoinBaseAddress baseAddress, String address, DashNetwork network)
+      : super._(address: address, baseAddress: baseAddress, network: network);
   factory DashAddress(String address, {DashNetwork network = DashNetwork.mainnet}) {
-    return DashAddress._(_BitcoinAddressUtils.decodeAddress(address, network), address);
+    return DashAddress._(_BitcoinAddressUtils.decodeAddress(address, network), address, network);
   }
   factory DashAddress.fromBaseAddress(BitcoinBaseAddress address,
       {DashNetwork network = DashNetwork.mainnet}) {
     final baseAddress = _BitcoinAddressUtils.validateAddress(address, network);
-    return DashAddress._(baseAddress, baseAddress.toAddress(network));
+    return DashAddress._(baseAddress, baseAddress.toAddress(network), network);
   }
-  @override
-  final BitcoinBaseAddress baseAddress;
-  @override
-  final String address;
 }
 
 /// A concrete implementation of [BitcoinNetworkAddress] for bitcoinSV network.
-class BitcoinSVAddress extends BitcoinNetworkAddress<DashNetwork> {
-  const BitcoinSVAddress._(this.baseAddress, this.address);
+class BitcoinSVAddress extends BitcoinNetworkAddress<BitcoinSVNetwork> {
+  const BitcoinSVAddress._(BitcoinBaseAddress baseAddress, String address, BitcoinSVNetwork network)
+      : super._(address: address, baseAddress: baseAddress, network: network);
   factory BitcoinSVAddress(String address, {BitcoinSVNetwork network = BitcoinSVNetwork.mainnet}) {
-    return BitcoinSVAddress._(_BitcoinAddressUtils.decodeAddress(address, network), address);
+    return BitcoinSVAddress._(
+        _BitcoinAddressUtils.decodeAddress(address, network), address, network);
   }
   factory BitcoinSVAddress.fromBaseAddress(BitcoinBaseAddress address,
       {BitcoinSVNetwork network = BitcoinSVNetwork.mainnet}) {
     final baseAddress = _BitcoinAddressUtils.validateAddress(address, network);
-    return BitcoinSVAddress._(baseAddress, baseAddress.toAddress(network));
+    return BitcoinSVAddress._(baseAddress, baseAddress.toAddress(network), network);
+  }
+}
+
+/// A concrete implementation of [BitcoinNetworkAddress] for Electra protocol network.
+class ElectraProtocolAddress extends BitcoinNetworkAddress<ElectraProtocolNetwork> {
+  const ElectraProtocolAddress._(
+      BitcoinBaseAddress baseAddress, String address, ElectraProtocolNetwork network)
+      : super._(address: address, baseAddress: baseAddress, network: network);
+  factory ElectraProtocolAddress(String address,
+      {ElectraProtocolNetwork network = ElectraProtocolNetwork.mainnet}) {
+    return ElectraProtocolAddress._(
+        _BitcoinAddressUtils.decodeAddress(address, network), address, network);
+  }
+  factory ElectraProtocolAddress.fromBaseAddress(BitcoinBaseAddress address,
+      {ElectraProtocolNetwork network = ElectraProtocolNetwork.mainnet}) {
+    final baseAddress = _BitcoinAddressUtils.validateAddress(address, network);
+    return ElectraProtocolAddress._(baseAddress, baseAddress.toAddress(network), network);
   }
-  @override
-  final BitcoinBaseAddress baseAddress;
-  @override
-  final String address;
 }
diff --git a/lib/src/bitcoin/address/segwit_address.dart b/lib/src/bitcoin/address/segwit_address.dart
index 994381b..f07590e 100644
--- a/lib/src/bitcoin/address/segwit_address.dart
+++ b/lib/src/bitcoin/address/segwit_address.dart
@@ -15,7 +15,7 @@ abstract class SegwitAddress extends BitcoinBaseAddress {
 
   SegwitAddress.fromProgram({
     required String program,
-    required SegwitAddresType addressType,
+    required SegwitAddressType addressType,
     required this.segwitVersion,
     this.pubkey,
   })  : addressProgram = _BitcoinAddressUtils.validateAddressProgram(program, addressType),
@@ -34,7 +34,7 @@ abstract class SegwitAddress extends BitcoinBaseAddress {
   @override
   String toAddress(BasedUtxoNetwork network) {
     if (!network.supportedAddress.contains(type)) {
-      throw BitcoinBasePluginException("network does not support ${type.value} address");
+      throw DartBitcoinPluginException("network does not support ${type.value} address");
     }
 
     return _BitcoinAddressUtils.segwitToAddress(
@@ -59,7 +59,7 @@ class P2wpkhAddress extends SegwitAddress {
   P2wpkhAddress.fromProgram({required super.program})
       : super.fromProgram(
           segwitVersion: _BitcoinAddressUtils.segwitV0,
-          addressType: SegwitAddresType.p2wpkh,
+          addressType: SegwitAddressType.p2wpkh,
         );
 
   P2wpkhAddress.fromRedeemScript({required super.script})
@@ -83,8 +83,8 @@ class P2wpkhAddress extends SegwitAddress {
   }
 
   factory P2wpkhAddress.fromScriptPubkey({required Script script}) {
-    if (script.getAddressType() != SegwitAddresType.p2wpkh) {
-      throw ArgumentError("Invalid scriptPubKey");
+    if (script.getAddressType() != SegwitAddressType.p2wpkh) {
+      throw DartBitcoinPluginException("Invalid scriptPubKey");
     }
 
     return P2wpkhAddress.fromProgram(program: script.findScriptParam(1));
@@ -98,7 +98,7 @@ class P2wpkhAddress extends SegwitAddress {
 
   /// returns the type of address
   @override
-  SegwitAddresType get type => SegwitAddresType.p2wpkh;
+  SegwitAddressType get type => SegwitAddressType.p2wpkh;
 }
 
 class P2trAddress extends SegwitAddress {
@@ -111,7 +111,7 @@ class P2trAddress extends SegwitAddress {
   P2trAddress.fromProgram({required super.program, super.pubkey})
       : super.fromProgram(
           segwitVersion: _BitcoinAddressUtils.segwitV1,
-          addressType: SegwitAddresType.p2tr,
+          addressType: SegwitAddressType.p2tr,
         );
 
   P2trAddress.fromRedeemScript({required super.script})
@@ -134,8 +134,8 @@ class P2trAddress extends SegwitAddress {
   }
 
   factory P2trAddress.fromScriptPubkey({required Script script}) {
-    if (script.getAddressType() != SegwitAddresType.p2tr) {
-      throw ArgumentError("Invalid scriptPubKey");
+    if (script.getAddressType() != SegwitAddressType.p2tr) {
+      throw DartBitcoinPluginException("Invalid scriptPubKey");
     }
 
     return P2trAddress.fromProgram(program: script.findScriptParam(1));
@@ -149,7 +149,7 @@ class P2trAddress extends SegwitAddress {
 
   /// returns the type of address
   @override
-  SegwitAddresType get type => SegwitAddresType.p2tr;
+  SegwitAddressType get type => SegwitAddressType.p2tr;
 }
 
 class P2wshAddress extends SegwitAddress {
@@ -161,7 +161,7 @@ class P2wshAddress extends SegwitAddress {
   P2wshAddress.fromProgram({required super.program})
       : super.fromProgram(
           segwitVersion: _BitcoinAddressUtils.segwitV0,
-          addressType: SegwitAddresType.p2wsh,
+          addressType: SegwitAddressType.p2wsh,
         );
 
   P2wshAddress.fromRedeemScript({required super.script})
@@ -180,8 +180,8 @@ class P2wshAddress extends SegwitAddress {
   }
 
   factory P2wshAddress.fromScriptPubkey({required Script script}) {
-    if (script.getAddressType() != SegwitAddresType.p2wsh) {
-      throw ArgumentError("Invalid scriptPubKey");
+    if (script.getAddressType() != SegwitAddressType.p2wsh) {
+      throw DartBitcoinPluginException("Invalid scriptPubKey");
     }
 
     return P2wshAddress.fromProgram(program: script.findScriptParam(1));
@@ -195,7 +195,7 @@ class P2wshAddress extends SegwitAddress {
 
   /// Returns the type of address
   @override
-  SegwitAddresType get type => SegwitAddresType.p2wsh;
+  SegwitAddressType get type => SegwitAddressType.p2wsh;
 }
 
 class MwebAddress extends SegwitAddress {
@@ -210,14 +210,15 @@ class MwebAddress extends SegwitAddress {
     final hrp = decoded.item1;
     final data = decoded.item2;
     if (hrp != 'ltcmweb') {
-      throw ArgumentException('Invalid format (HRP not valid, expected ltcmweb, got $hrp)');
+      throw DartBitcoinPluginException(
+          'Invalid format (HRP not valid, expected ltcmweb, got $hrp)');
     }
     if (data[0] != _BitcoinAddressUtils.segwitV0) {
-      throw const ArgumentException("Invalid segwit version");
+      throw DartBitcoinPluginException("Invalid segwit version");
     }
     final convData = Bech32BaseUtils.convertFromBase32(data.sublist(1));
     if (convData.length != 66) {
-      throw ArgumentException(
+      throw DartBitcoinPluginException(
           'Invalid format (witness program length not valid: ${convData.length})');
     }
 
@@ -227,14 +228,14 @@ class MwebAddress extends SegwitAddress {
   MwebAddress.fromProgram({required super.program})
       : super.fromProgram(
           segwitVersion: _BitcoinAddressUtils.segwitV0,
-          addressType: SegwitAddresType.mweb,
+          addressType: SegwitAddressType.mweb,
         );
   MwebAddress.fromRedeemScript({required super.script})
       : super.fromRedeemScript(segwitVersion: _BitcoinAddressUtils.segwitV0);
 
-  factory MwebAddress.fromScriptPubkey({required Script script, type = SegwitAddresType.mweb}) {
-    if (script.getAddressType() != SegwitAddresType.mweb) {
-      throw ArgumentError("Invalid scriptPubKey");
+  factory MwebAddress.fromScriptPubkey({required Script script, type = SegwitAddressType.mweb}) {
+    if (script.getAddressType() != SegwitAddressType.mweb) {
+      throw DartBitcoinPluginException("Invalid scriptPubKey");
     }
     return MwebAddress.fromProgram(program: BytesUtils.toHexString(script.script as List<int>));
   }
@@ -247,5 +248,5 @@ class MwebAddress extends SegwitAddress {
 
   /// returns the type of address
   @override
-  SegwitAddresType get type => SegwitAddresType.mweb;
+  SegwitAddressType get type => SegwitAddressType.mweb;
 }
diff --git a/lib/src/bitcoin/address/util.dart b/lib/src/bitcoin/address/util.dart
index 88746ab..1208b82 100644
--- a/lib/src/bitcoin/address/util.dart
+++ b/lib/src/bitcoin/address/util.dart
@@ -19,7 +19,7 @@ class BitcoinAddressUtils {
       {required String address, required BasedUtxoNetwork network}) {
     final addressType = RegexUtils.addressTypeFromStr(address, network);
 
-    if (addressType.type == SegwitAddresType.mweb) {
+    if (addressType.type == SegwitAddressType.mweb) {
       return BytesUtils.fromHexString(
         MwebAddress.fromAddress(address: address).addressProgram,
       );
@@ -38,11 +38,11 @@ class BitcoinAddressUtils {
         case P2shAddressType.p2wpkhInP2sh:
         case P2shAddressType.p2wshInP2sh:
           return P2shAddress.fromScriptPubkey(script: script).toAddress(network);
-        case SegwitAddresType.p2wpkh:
+        case SegwitAddressType.p2wpkh:
           return P2wpkhAddress.fromScriptPubkey(script: script).toAddress(network);
-        case SegwitAddresType.p2wsh:
+        case SegwitAddressType.p2wsh:
           return P2wshAddress.fromScriptPubkey(script: script).toAddress(network);
-        case SegwitAddresType.p2tr:
+        case SegwitAddressType.p2tr:
           return P2trAddress.fromScriptPubkey(script: script).toAddress(network);
         default:
       }
@@ -109,15 +109,15 @@ class BitcoinAddressUtils {
     } else if (type is P2shAddress) {
       return P2shAddressType.p2wpkhInP2sh;
     } else if (type is P2wshAddress) {
-      return SegwitAddresType.p2wsh;
+      return SegwitAddressType.p2wsh;
     } else if (type is P2trAddress) {
-      return SegwitAddresType.p2tr;
+      return SegwitAddressType.p2tr;
     } else if (type is MwebAddress) {
-      return SegwitAddresType.mweb;
+      return SegwitAddressType.mweb;
     } else if (type is SilentPaymentsAddresType) {
       return SilentPaymentsAddresType.p2sp;
     } else {
-      return SegwitAddresType.p2wpkh;
+      return SegwitAddressType.p2wpkh;
     }
   }
 
@@ -137,17 +137,17 @@ class BitcoinAddressUtils {
       case P2shAddressType.p2wpkhInP2sh:
       case P2shAddressType.p2wshInP2sh:
         return BitcoinDerivationInfos.BIP49;
-      case SegwitAddresType.p2wpkh:
+      case SegwitAddressType.p2wpkh:
         if (isElectrum == true) {
           return BitcoinDerivationInfos.ELECTRUM;
         } else {
           return BitcoinDerivationInfos.BIP84;
         }
-      case SegwitAddresType.p2tr:
+      case SegwitAddressType.p2tr:
         return BitcoinDerivationInfos.BIP86;
-      case SegwitAddresType.mweb:
+      case SegwitAddressType.mweb:
         return BitcoinDerivationInfos.BIP86;
-      case SegwitAddresType.p2wsh:
+      case SegwitAddressType.p2wsh:
         return BitcoinDerivationInfos.BIP84;
       default:
         throw Exception("Derivation not available for $scriptType");
diff --git a/lib/src/bitcoin/address/utils/address_utils.dart b/lib/src/bitcoin/address/utils/address_utils.dart
index 9a27306..cfac5fd 100644
--- a/lib/src/bitcoin/address/utils/address_utils.dart
+++ b/lib/src/bitcoin/address/utils/address_utils.dart
@@ -24,7 +24,7 @@ class _BitcoinAddressUtils {
       final decode = List<int>.unmodifiable(Base58Decoder.decode(address));
 
       /// Extract script bytes excluding version and checksum.
-      final List<int> scriptBytes = decode.sublist(1, decode.length - Base58Const.checksumByteLen);
+      final scriptBytes = decode.sublist(1, decode.length - Base58Const.checksumByteLen);
 
       /// Ensure the script bytes have the expected length.
       if (scriptBytes.length != hash160DigestLength) {
@@ -32,12 +32,12 @@ class _BitcoinAddressUtils {
       }
 
       /// Extract version, data, and checksum.
-      final List<int> version = [decode[0]];
-      List<int> data = decode.sublist(0, decode.length - Base58Const.checksumByteLen);
-      List<int> checksum = decode.sublist(decode.length - Base58Const.checksumByteLen);
+      final version = <int>[decode[0]];
+      final data = decode.sublist(0, decode.length - Base58Const.checksumByteLen);
+      final checksum = decode.sublist(decode.length - Base58Const.checksumByteLen);
 
       /// Verify the checksum.
-      List<int> hash = QuickCrypto.sha256DoubleHash(data).sublist(0, Base58Const.checksumByteLen);
+      final hash = QuickCrypto.sha256DoubleHash(data).sublist(0, Base58Const.checksumByteLen);
       if (!BytesUtils.bytesEqual(checksum, hash)) {
         return null;
       }
@@ -82,7 +82,7 @@ class _BitcoinAddressUtils {
     final convert = SegwitBech32Decoder.decode(network.p2wpkhHrp, address);
     final witnessVersion = convert.item1;
     if (witnessVersion != version) {
-      throw const BitcoinBasePluginException("Invalid segwit version");
+      throw const DartBitcoinPluginException('Invalid segwit version');
     }
     return BytesUtils.toHexString(convert.item2);
   }
@@ -95,6 +95,10 @@ class _BitcoinAddressUtils {
   ///
   /// Returns a SegwitAddress instance representing the converted SegWit address,
   /// or null if the conversion is not successful.
+  static SegwitAddress? toSegwitAddress(String address, BasedUtxoNetwork network) {
+    return toP2wpkhAddress(address, network);
+  }
+
   static SegwitAddress? toP2wpkhAddress(String address, BasedUtxoNetwork network) {
     try {
       final convert = SegwitBech32Decoder.decode(network.p2wpkhHrp, address);
@@ -128,8 +132,8 @@ class _BitcoinAddressUtils {
     if (network.supportedAddress.contains(address.type)) {
       return address;
     }
-    throw BitcoinBasePluginException(
-        "${network.value} does not support ${address.type.value} address");
+    throw DartBitcoinPluginException(
+        '${network.value} does not support ${address.type.value} address');
   }
 
   /// Decodes a Bitcoin address and returns a corresponding BitcoinBaseAddress instance
@@ -143,17 +147,12 @@ class _BitcoinAddressUtils {
   /// Throws a [MessageException] if the address is invalid or not supported by the network.
   static BitcoinBaseAddress decodeAddress(String address, BasedUtxoNetwork network) {
     BitcoinBaseAddress? baseAddress;
-    if (network.supportedAddress.contains(SegwitAddresType.p2wpkh)) {
-      baseAddress = toP2wpkhAddress(address, network);
+    if (network.supportedAddress.contains(SegwitAddressType.p2wpkh)) {
+      baseAddress = toSegwitAddress(address, network);
     }
     baseAddress ??= toLegacy(address, network);
     if (baseAddress == null) {
-      try {
-        throw const BitcoinBasePluginException("test2 Bitcoin address");
-      } catch (e, s) {
-        print(s);
-      }
-      throw const BitcoinBasePluginException("test Bitcoin address");
+      throw const DartBitcoinPluginException('Invalid Bitcoin address');
     }
     return validateAddress(baseAddress, network);
   }
@@ -174,8 +173,8 @@ class _BitcoinAddressUtils {
       }
       // ignore: empty_catches
     } catch (e) {}
-    throw const BitcoinBasePluginException(
-        "Invalid Bitcoin address program length (program length should be 32 or 20 bytes)");
+    throw const DartBitcoinPluginException(
+        'Invalid Bitcoin address program length (program length should be 32 or 20 bytes)');
   }
 
   /// Decodes a Bitcoin Cash (BCH) address and returns a corresponding LegacyAddress instance
@@ -190,8 +189,8 @@ class _BitcoinAddressUtils {
   static LegacyAddress? decodeBchAddress(String address, BitcoinCashNetwork network,
       {bool validateNetworkHRP = false}) {
     try {
-      final String hrp =
-          validateNetworkHRP ? network.networkHRP : address.substring(0, address.indexOf(":"));
+      final hrp =
+          validateNetworkHRP ? network.networkHRP : address.substring(0, address.indexOf(':'));
       final decode = BchBech32Decoder.decode(hrp, address);
       final scriptBytes = decode.item2;
       final version = decode.item1;
@@ -260,8 +259,8 @@ class _BitcoinAddressUtils {
       required BitcoinAddressType type,
       required BasedUtxoNetwork network}) {
     if (!network.supportedAddress.contains(type)) {
-      throw BitcoinBasePluginException(
-          "${network.value} does not support ${type.value} address type");
+      throw DartBitcoinPluginException(
+          '${network.value} does not support ${type.value} address type');
     }
     if (network is BitcoinCashNetwork) {
       final decode = _BitcoinAddressUtils.decodeBchAddress(address, network);
@@ -276,7 +275,7 @@ class _BitcoinAddressUtils {
     if (decode == null) return null;
     final version = decode.item2;
     final addrBytes = decode.item1;
-    final String scriptHex = BytesUtils.toHexString(addrBytes);
+    final scriptHex = BytesUtils.toHexString(addrBytes);
 
     switch (type) {
       case P2pkhAddressType.p2pkh:
@@ -334,8 +333,8 @@ class _BitcoinAddressUtils {
       {required BitcoinCashNetwork network,
       required String addressProgram,
       required BitcoinAddressType type}) {
-    List<int> programBytes = BytesUtils.fromHexString(addressProgram);
-    final List<int> netVersion =
+    final programBytes = BytesUtils.fromHexString(addressProgram);
+    final netVersion =
         _getBchNetVersion(network: network, type: type, secriptLength: programBytes.length);
 
     return BchBech32Encoder.encode(network.networkHRP, netVersion, programBytes);
@@ -352,7 +351,7 @@ class _BitcoinAddressUtils {
       {required BitcoinCashNetwork network,
       required BitcoinAddressType type,
       int secriptLength = hash160DigestLength}) {
-    bool isToken = type.value.contains("WT");
+    final isToken = type.value.contains('WT');
     if (!type.isP2sh) {
       if (!isToken) return network.p2pkhNetVer;
       return network.p2pkhWtNetVer;
@@ -387,7 +386,7 @@ class _BitcoinAddressUtils {
     if (network is BitcoinCashNetwork) {
       return legacyToBchAddress(addressProgram: addressProgram, network: network, type: type);
     }
-    List<int> programBytes = BytesUtils.fromHexString(addressProgram);
+    var programBytes = BytesUtils.fromHexString(addressProgram);
     switch (type) {
       case P2shAddressType.p2wpkhInP2sh:
       case P2shAddressType.p2wshInP2sh:
@@ -412,7 +411,7 @@ class _BitcoinAddressUtils {
   /// Returns the RIPEMD-160 hash of the public key as a hexadecimal string.
   static String pubkeyToHash160(String publicKey) {
     final bytes = BytesUtils.fromHexString(publicKey);
-    List<int> ripemd160Hash = QuickCrypto.hash160(bytes);
+    final ripemd160Hash = QuickCrypto.hash160(bytes);
     return BytesUtils.toHexString(ripemd160Hash);
   }
 
diff --git a/lib/src/bitcoin/script/control_block.dart b/lib/src/bitcoin/script/control_block.dart
index d6a07b2..209e4eb 100644
--- a/lib/src/bitcoin/script/control_block.dart
+++ b/lib/src/bitcoin/script/control_block.dart
@@ -12,10 +12,10 @@ class ControlBlock {
   final List<int>? scripts;
 
   List<int> toBytes() {
-    final List<int> version = [BitcoinOpCodeConst.LEAF_VERSION_TAPSCRIPT];
+    final version = <int>[BitcoinOpCodeConst.LEAF_VERSION_TAPSCRIPT];
 
-    final List<int> pubKey = BytesUtils.fromHexString(public.toXOnlyHex());
-    final List<int> marklePath = scripts ?? [];
+    final pubKey = BytesUtils.fromHexString(public.toXOnlyHex());
+    final marklePath = scripts ?? [];
     return [...version, ...pubKey, ...marklePath];
   }
 
diff --git a/lib/src/bitcoin/script/input.dart b/lib/src/bitcoin/script/input.dart
index 149d545..be7c0af 100644
--- a/lib/src/bitcoin/script/input.dart
+++ b/lib/src/bitcoin/script/input.dart
@@ -1,5 +1,6 @@
+import 'dart:typed_data';
+
 import 'package:bitcoin_base/src/bitcoin/script/op_code/constant.dart';
-import 'package:bitcoin_base/src/exception/exception.dart';
 import 'package:blockchain_utils/utils/utils.dart';
 import 'script.dart';
 
@@ -10,16 +11,21 @@ import 'script.dart';
 /// [scriptSig] the script that satisfies the locking conditions
 /// [sequence] the input sequence (for timelocks, RBF, etc.)
 class TxInput {
-  TxInput(
-      {required this.txId,
-      required this.txIndex,
-      Script? scriptSig,
-      List<int>? sequence})
-      : sequence = List.unmodifiable(
-            sequence ?? BitcoinOpCodeConst.DEFAULT_TX_SEQUENCE),
+  TxInput({
+    required this.txId,
+    required this.txIndex,
+    Script? scriptSig,
+    List<int>? sequence,
+  })  : sequence = List.unmodifiable(
+          sequence ?? BitcoinOpCodeConst.DEFAULT_TX_SEQUENCE,
+        ),
         scriptSig = scriptSig ?? Script(script: []);
-  TxInput copyWith(
-      {String? txId, int? txIndex, Script? scriptSig, List<int>? sequence}) {
+  TxInput copyWith({
+    String? txId,
+    int? txIndex,
+    Script? scriptSig,
+    List<int>? sequence,
+  }) {
     return TxInput(
         txId: txId ?? this.txId,
         txIndex: txIndex ?? this.txIndex,
@@ -34,60 +40,73 @@ class TxInput {
 
   /// creates a copy of the object
   TxInput copy() {
-    return TxInput(
-        txId: txId, txIndex: txIndex, scriptSig: scriptSig, sequence: sequence);
+    return TxInput(txId: txId, txIndex: txIndex, scriptSig: scriptSig, sequence: sequence);
   }
 
   /// serializes TxInput to bytes
   List<int> toBytes() {
     final txidBytes = BytesUtils.fromHexString(txId).reversed.toList();
 
-    final txoutBytes = List<int>.filled(4, 0);
-    writeUint32LE(txIndex, txoutBytes);
+    final txoutBytes = IntUtils.toBytes(txIndex, length: 4, byteOrder: Endian.little);
+    // writeUint32LE(txIndex, txoutBytes);
     final scriptSigBytes = scriptSig.toBytes();
-
     final scriptSigLengthVarint = IntUtils.encodeVarint(scriptSigBytes.length);
-    final data = List<int>.from([
-      ...txidBytes,
-      ...txoutBytes,
-      ...scriptSigLengthVarint,
-      ...scriptSigBytes,
-      ...sequence,
-    ]);
+    final data = List<int>.from(
+        [...txidBytes, ...txoutBytes, ...scriptSigLengthVarint, ...scriptSigBytes, ...sequence]);
     return data;
   }
 
-  static Tuple<TxInput, int> fromRaw(
-      {required String raw, int cursor = 0, bool hasSegwit = false}) {
-    final txInputRaw = BytesUtils.fromHexString(raw);
-    List<int> inpHash =
-        txInputRaw.sublist(cursor, cursor + 32).reversed.toList();
-    if (inpHash.isEmpty) {
-      throw const BitcoinBasePluginException(
-          "Input transaction hash not found. Probably malformed raw transaction");
-    }
-    List<int> outputN =
-        txInputRaw.sublist(cursor + 32, cursor + 36).reversed.toList();
-    cursor += 36;
-    final vi = IntUtils.decodeVarint(txInputRaw.sublist(cursor, cursor + 9));
+  static Tuple<TxInput, int> deserialize({
+    required List<int> bytes,
+    String? raw,
+    int cursor = 0,
+    bool hasSegwit = false,
+  }) {
+    return fromRaw(bytes: bytes, cursor: cursor, hasSegwit: hasSegwit);
+  }
+
+  static Tuple<TxInput, int> fromRaw({
+    List<int>? bytes,
+    String? raw,
+    int cursor = 0,
+    bool hasSegwit = false,
+  }) {
+    final txInputRaw = bytes ?? BytesUtils.fromHexString(raw!);
+    final inpHash = txInputRaw.sublist(cursor, cursor + 32).reversed.toList();
+    cursor += 32;
+    final outputN =
+        IntUtils.fromBytes(txInputRaw.sublist(cursor, cursor + 4), byteOrder: Endian.little);
+    cursor += 4;
+    final vi = IntUtils.decodeVarint(txInputRaw.sublist(cursor));
     cursor += vi.item2;
-    List<int> unlockingScript = txInputRaw.sublist(cursor, cursor + vi.item1);
+    final unlockingScript = txInputRaw.sublist(cursor, cursor + vi.item1);
     cursor += vi.item1;
-    List<int> sequenceNumberData = txInputRaw.sublist(cursor, cursor + 4);
+    final sequenceNumberData = txInputRaw.sublist(cursor, cursor + 4);
     cursor += 4;
     return Tuple(
         TxInput(
-            txId: BytesUtils.toHexString(inpHash),
-            txIndex: int.parse(BytesUtils.toHexString(outputN), radix: 16),
-            scriptSig: Script.fromRaw(
-                hexData: BytesUtils.toHexString(unlockingScript),
-                hasSegwit: hasSegwit),
-            sequence: sequenceNumberData),
+          txId: BytesUtils.toHexString(inpHash),
+          txIndex: outputN,
+          scriptSig: Script.deserialize(
+            bytes: unlockingScript,
+            hasSegwit: hasSegwit,
+          ),
+          sequence: sequenceNumberData,
+        ),
         cursor);
   }
 
+  Map<String, dynamic> toJson() {
+    return {
+      'txid': txId,
+      'txIndex': txIndex,
+      'scriptSig': scriptSig.script,
+      'sequance': BytesUtils.toHexString(sequence),
+    };
+  }
+
   @override
   String toString() {
-    return "TxInput{txId: $txId, txIndex: $txIndex, scriptSig: $scriptSig, sequence: ${BytesUtils.toHexString(sequence)}}";
+    return 'TxInput{txId: $txId, txIndex: $txIndex, scriptSig: $scriptSig, sequence: ${BytesUtils.toHexString(sequence)}}';
   }
 }
diff --git a/lib/src/bitcoin/script/op_code/constant.dart b/lib/src/bitcoin/script/op_code/constant.dart
index bd62271..a677331 100644
--- a/lib/src/bitcoin/script/op_code/constant.dart
+++ b/lib/src/bitcoin/script/op_code/constant.dart
@@ -3,6 +3,15 @@
 // ignore_for_file: constant_identifier_names, non_constant_identifier_names, equal_keys_in_map, camel_case_types
 
 class BitcoinOpCodeConst {
+  static const int opPushData1 = 0x4c;
+  static const int opPushData2 = 0x4d;
+  static const int opPushData4 = 0x4e;
+  static bool isOpPushData(int byte) {
+    return byte == BitcoinOpCodeConst.opPushData1 ||
+        byte == BitcoinOpCodeConst.opPushData2 ||
+        byte == BitcoinOpCodeConst.opPushData4;
+  }
+
   static const OP_0 = "OP_0";
   static const OP_FALSE = "OP_FALSE";
   static const OP_PUSHDATA1 = "OP_PUSHDATA1";
@@ -371,9 +380,9 @@ class BitcoinOpCodeConst {
   static const int NEGATIVE_SATOSHI = -1;
 
   /// Bitcoin address types
-  static const String P2PKH_ADDRESS = "p2pkh";
-  static const String P2SH_ADDRESS = "p2sh";
-  static const String P2WPKH_ADDRESS_V0 = "p2wpkhv0";
-  static const String P2WSH_ADDRESS_V0 = "p2wshv0";
-  static const String P2TR_ADDRESS_V1 = "p2trv1";
+  static const String P2PKH_ADDRESS = 'p2pkh';
+  static const String P2SH_ADDRESS = 'p2sh';
+  static const String P2WPKH_ADDRESS_V0 = 'p2wpkhv0';
+  static const String P2WSH_ADDRESS_V0 = 'p2wshv0';
+  static const String P2TR_ADDRESS_V1 = 'p2trv1';
 }
diff --git a/lib/src/bitcoin/script/op_code/constant_lib.dart b/lib/src/bitcoin/script/op_code/constant_lib.dart
index 4a7c224..e6c4f56 100644
--- a/lib/src/bitcoin/script/op_code/constant_lib.dart
+++ b/lib/src/bitcoin/script/op_code/constant_lib.dart
@@ -1,4 +1,4 @@
-library bitcoin_constants;
+library;
 
 export 'constant.dart';
 export 'tools.dart';
diff --git a/lib/src/bitcoin/script/op_code/tools.dart b/lib/src/bitcoin/script/op_code/tools.dart
index 9bb44e5..1dafe7b 100644
--- a/lib/src/bitcoin/script/op_code/tools.dart
+++ b/lib/src/bitcoin/script/op_code/tools.dart
@@ -1,41 +1,41 @@
+import 'dart:typed_data';
+
+import 'package:bitcoin_base/src/bitcoin/script/op_code/constant.dart';
 import 'package:bitcoin_base/src/exception/exception.dart';
 import 'package:blockchain_utils/utils/utils.dart';
 
 List<int> opPushData(String hexData) {
-  final List<int> dataBytes = BytesUtils.fromHexString(hexData);
-  if (dataBytes.length < 0x4c) {
-    return List<int>.from([dataBytes.length]) + dataBytes;
+  final dataBytes = BytesUtils.fromHexString(hexData);
+  if (dataBytes.length < BitcoinOpCodeConst.opPushData1) {
+    return [dataBytes.length, ...dataBytes];
   } else if (dataBytes.length < mask8) {
-    return List<int>.from([0x4c]) +
-        List<int>.from([dataBytes.length]) +
-        dataBytes;
+    return [BitcoinOpCodeConst.opPushData1, dataBytes.length, ...dataBytes];
   } else if (dataBytes.length < mask16) {
-    var lengthBytes = List<int>.filled(2, 0);
-
-    writeUint16LE(dataBytes.length, lengthBytes);
-    return List<int>.from([0x4d, ...lengthBytes, ...dataBytes]);
+    final lengthBytes =
+        IntUtils.toBytes(dataBytes.length, length: 2, byteOrder: Endian.little);
+    return [BitcoinOpCodeConst.opPushData2, ...lengthBytes, ...dataBytes];
   } else if (dataBytes.length < mask32) {
-    var lengthBytes = List<int>.filled(4, 0);
-    writeUint32LE(lengthBytes.length, lengthBytes);
-    return List<int>.from([0x4e, ...lengthBytes, ...dataBytes]);
+    final lengthBytes =
+        IntUtils.toBytes(dataBytes.length, length: 4, byteOrder: Endian.little);
+    return [BitcoinOpCodeConst.opPushData4, ...lengthBytes, ...dataBytes];
   } else {
-    throw const BitcoinBasePluginException(
-        "Data too large. Cannot push into script");
+    throw const DartBitcoinPluginException(
+        'Data too large. Cannot push into script');
   }
 }
 
 List<int> pushInteger(int integer) {
   if (integer < 0) {
-    throw const BitcoinBasePluginException(
+    throw const DartBitcoinPluginException(
         'Integer is currently required to be positive.');
   }
 
   /// Calculate the number of bytes required to represent the integer
-  int numberOfBytes = (integer.bitLength + 7) ~/ 8;
+  final numberOfBytes = (integer.bitLength + 7) ~/ 8;
 
   /// Convert to little-endian bytes
-  List<int> integerBytes = List<int>.filled(numberOfBytes, 0);
-  for (int i = 0; i < numberOfBytes; i++) {
+  var integerBytes = List<int>.filled(numberOfBytes, 0);
+  for (var i = 0; i < numberOfBytes; i++) {
     integerBytes[i] = (integer >> (i * 8)) & mask8;
   }
 
diff --git a/lib/src/bitcoin/script/output.dart b/lib/src/bitcoin/script/output.dart
index 09b11e2..45750f4 100644
--- a/lib/src/bitcoin/script/output.dart
+++ b/lib/src/bitcoin/script/output.dart
@@ -21,6 +21,14 @@ class TxOutput {
   final bool isSilentPayment;
   final bool isChange;
 
+  Map<String, dynamic> toJson() {
+    return {
+      'cashToken': cashToken?.toJson(),
+      'amount': amount.toString(),
+      'scriptPubKey': scriptPubKey.script
+    };
+  }
+
   ///  creates a copy of the object
   TxOutput copy() {
     return TxOutput(
@@ -33,31 +41,57 @@ class TxOutput {
   }
 
   List<int> toBytes() {
-    final amountBytes = BigintUtils.toBytes(amount, length: 8, order: Endian.little);
-    List<int> scriptBytes = [...cashToken?.toBytes() ?? <int>[], ...scriptPubKey.toBytes()];
-    final data = [...amountBytes, ...IntUtils.encodeVarint(scriptBytes.length), ...scriptBytes];
+    final amountBytes = BigintUtils.toBytes(
+      amount,
+      length: 8,
+      order: Endian.little,
+    );
+    final scriptBytes = <int>[
+      ...cashToken?.toBytes() ?? <int>[],
+      ...scriptPubKey.toBytes(),
+    ];
+    final data = [
+      ...amountBytes,
+      ...IntUtils.encodeVarint(scriptBytes.length),
+      ...scriptBytes,
+    ];
     return data;
   }
 
-  static Tuple<TxOutput, int> fromRaw(
-      {required String raw, required int cursor, bool hasSegwit = false}) {
-    final txBytes = BytesUtils.fromHexString(raw);
-    final value =
-        BigintUtils.fromBytes(txBytes.sublist(cursor, cursor + 8), byteOrder: Endian.little)
-            .toSigned(64);
+  static Tuple<TxOutput, int> deserialize({
+    required int cursor,
+    List<int>? bytes,
+    String? raw,
+    bool hasSegwit = false,
+  }) {
+    return fromRaw(bytes: bytes, cursor: cursor, hasSegwit: hasSegwit);
+  }
+
+  static Tuple<TxOutput, int> fromRaw({
+    required int cursor,
+    List<int>? bytes,
+    String? raw,
+    bool hasSegwit = false,
+  }) {
+    final txBytes = bytes ?? BytesUtils.fromHexString(raw!);
+    final value = BigintUtils.fromBytes(
+      txBytes.sublist(cursor, cursor + 8),
+      byteOrder: Endian.little,
+    ).toSigned(64);
     cursor += 8;
 
-    final vi = IntUtils.decodeVarint(txBytes.sublist(cursor, cursor + 9));
+    final vi = IntUtils.decodeVarint(txBytes.sublist(cursor));
     cursor += vi.item2;
     final token = CashToken.fromRaw(txBytes.sublist(cursor));
-    List<int> lockScript = txBytes.sublist(cursor + token.item2, cursor + vi.item1);
+
+    final lockScript = txBytes.sublist(cursor + token.item2, cursor + vi.item1);
     cursor += vi.item1;
     return Tuple(
         TxOutput(
             amount: value,
             cashToken: token.item1,
-            scriptPubKey: Script.fromRaw(
-              hexData: BytesUtils.toHexString(lockScript),
+            scriptPubKey: Script.deserialize(
+              bytes: lockScript,
               hasSegwit: hasSegwit,
             )),
         cursor);
@@ -65,6 +99,6 @@ class TxOutput {
 
   @override
   String toString() {
-    return "TxOutput{cashToken: ${cashToken?.toString()}}, amount: $amount, script: ${scriptPubKey.toString()}}";
+    return 'TxOutput{cashToken: ${cashToken?.toString()}}, amount: $amount, script: ${scriptPubKey.toString()}}';
   }
 }
diff --git a/lib/src/bitcoin/script/script.dart b/lib/src/bitcoin/script/script.dart
index 47dc269..58af80b 100644
--- a/lib/src/bitcoin/script/script.dart
+++ b/lib/src/bitcoin/script/script.dart
@@ -1,5 +1,6 @@
 import 'package:bitcoin_base/src/bitcoin/address/address.dart';
 import 'package:bitcoin_base/src/bitcoin/script/scripts.dart';
+import 'package:bitcoin_base/src/exception/exception.dart';
 import 'package:bitcoin_base/src/models/network.dart';
 import 'package:blockchain_utils/blockchain_utils.dart';
 
@@ -14,43 +15,64 @@ class Script {
           }
           return true;
         }(),
-            "A valid script is a composition of opcodes, hexadecimal strings, and integers arranged in a structured list."),
+            'A valid script is a composition of opcodes, hexadecimal strings, and integers arranged in a structured list.'),
         script = List.unmodifiable(script);
   final List<dynamic> script;
 
-  static Script fromRaw({List<int>? byteData, String? hexData, bool hasSegwit = false}) {
-    List<String> commands = [];
-    int index = 0;
-    final scriptBytes = byteData ?? (hexData != null ? BytesUtils.fromHexString(hexData) : null);
+  static Script deserialize({
+    List<int>? bytes,
+    String? hexData,
+    bool hasSegwit = false,
+  }) {
+    return fromRaw(bytes: bytes, hexData: hexData, hasSegwit: hasSegwit);
+  }
+
+  static Script fromRaw({
+    List<int>? bytes,
+    String? hexData,
+    bool hasSegwit = false,
+  }) {
+    final commands = <String>[];
+    var index = 0;
+    final scriptBytes = bytes ?? (hexData != null ? BytesUtils.fromHexString(hexData) : null);
     if (scriptBytes == null) {
-      throw ArgumentError("Invalid script");
+      throw DartBitcoinPluginException("Invalid script");
     }
     while (index < scriptBytes.length) {
-      int byte = scriptBytes[index];
+      final byte = scriptBytes[index];
       if (BitcoinOpCodeConst.CODE_OPS.containsKey(byte)) {
-        commands.add(BitcoinOpCodeConst.CODE_OPS[byte]!);
-        index = index + 1;
-      } else if (!hasSegwit && byte == 0x4c) {
-        int bytesToRead = scriptBytes[index + 1];
+        if (!BitcoinOpCodeConst.isOpPushData(byte)) {
+          commands.add(BitcoinOpCodeConst.CODE_OPS[byte]!);
+        }
+
+        /// skip op
         index = index + 1;
-        commands.add(BytesUtils.toHexString(scriptBytes.sublist(index, index + bytesToRead)));
-        index = index + bytesToRead;
-      } else if (!hasSegwit && byte == 0x4d) {
-        int bytesToRead = readUint16LE(scriptBytes, index + 1);
-
-        index = index + 3;
-        commands.add(BytesUtils.toHexString(scriptBytes.sublist(index, index + bytesToRead)));
-        index = index + bytesToRead;
-      } else if (!hasSegwit && byte == 0x4e) {
-        int bytesToRead = readUint32LE(scriptBytes, index + 1);
-
-        index = index + 5;
-        commands.add(BytesUtils.toHexString(scriptBytes.sublist(index, index + bytesToRead)));
-        index = index + bytesToRead;
+        if (byte == BitcoinOpCodeConst.opPushData1) {
+          // get len
+          final bytesToRead = scriptBytes[index];
+          // skip len
+          index = index + 1;
+          commands.add(BytesUtils.toHexString(scriptBytes.sublist(index, index + bytesToRead)));
+
+          /// add length
+          index = index + bytesToRead;
+        } else if (byte == BitcoinOpCodeConst.opPushData2) {
+          /// get len
+          final bytesToRead = readUint16LE(scriptBytes, index);
+          index = index + 2;
+          commands.add(BytesUtils.toHexString(scriptBytes.sublist(index, index + bytesToRead)));
+          index = index + bytesToRead;
+        } else if (byte == BitcoinOpCodeConst.opPushData4) {
+          final bytesToRead = readUint32LE(scriptBytes, index);
+
+          index = index + 4;
+          commands.add(BytesUtils.toHexString(scriptBytes.sublist(index, index + bytesToRead)));
+          index = index + bytesToRead;
+        }
       } else {
-        final viAndSize = IntUtils.decodeVarint(scriptBytes.sublist(index, index + 9));
-        int dataSize = viAndSize.item1;
-        int size = viAndSize.item2;
+        final viAndSize = IntUtils.decodeVarint(scriptBytes.sublist(index));
+        final dataSize = viAndSize.item1;
+        final size = viAndSize.item2;
         final lastIndex = (index + size + dataSize) > scriptBytes.length
             ? scriptBytes.length
             : (index + size + dataSize);
@@ -75,7 +97,7 @@ class Script {
         script.length == 66 &&
         (script[0] == 2 || script[0] == 3) &&
         (script[33] == 2 || script[33] == 3)) {
-      return SegwitAddresType.mweb;
+      return SegwitAddressType.mweb;
     }
 
     final first = findScriptParam(0);
@@ -88,15 +110,15 @@ class Script {
       final lockingScriptBytes = opPushData(sec);
 
       if (lockingScriptBytes.length == 21) {
-        return SegwitAddresType.p2wpkh;
+        return SegwitAddressType.p2wpkh;
       } else if (lockingScriptBytes.length == 33) {
-        return SegwitAddresType.p2wsh;
+        return SegwitAddressType.p2wsh;
       }
     } else if (first == "OP_1") {
       final lockingScriptBytes = opPushData(sec);
 
       if (lockingScriptBytes.length == 33) {
-        return SegwitAddresType.p2tr;
+        return SegwitAddressType.p2tr;
       }
     }
 
@@ -124,7 +146,7 @@ class Script {
   String toAddress() {
     final addressType = getAddressType();
     if (addressType == null) {
-      throw ArgumentError("Invalid script");
+      throw DartBitcoinPluginException("Invalid script");
     }
 
     switch (addressType) {
@@ -132,23 +154,22 @@ class Script {
         return P2pkhAddress.fromScriptPubkey(script: this).toAddress(BitcoinNetwork.mainnet);
       case P2shAddressType.p2pkhInP2sh:
         return P2shAddress.fromScriptPubkey(script: this).toAddress(BitcoinNetwork.mainnet);
-      case SegwitAddresType.p2wpkh:
+      case SegwitAddressType.p2wpkh:
         return P2wpkhAddress.fromScriptPubkey(script: this).toAddress(BitcoinNetwork.mainnet);
-      case SegwitAddresType.p2wsh:
+      case SegwitAddressType.p2wsh:
         return P2wshAddress.fromScriptPubkey(script: this).toAddress(BitcoinNetwork.mainnet);
-      case SegwitAddresType.p2tr:
+      case SegwitAddressType.p2tr:
         return P2trAddress.fromScriptPubkey(script: this).toAddress(BitcoinNetwork.mainnet);
     }
 
-    throw ArgumentError("Invalid script");
+    throw DartBitcoinPluginException("Invalid script");
   }
 
   /// returns a serialized byte version of the script
   List<int> toBytes() {
     if (script.isEmpty) return <int>[];
-    if (script.every((x) => x is int)) return script.cast();
-    DynamicByteTracker scriptBytes = DynamicByteTracker();
-    for (var token in script) {
+    final scriptBytes = DynamicByteTracker();
+    for (final token in script) {
       if (BitcoinOpCodeConst.OP_CODES.containsKey(token)) {
         scriptBytes.add(BitcoinOpCodeConst.OP_CODES[token]!);
       } else if (token is int && token >= 0 && token <= 16) {
diff --git a/lib/src/bitcoin/script/sequence.dart b/lib/src/bitcoin/script/sequence.dart
index f202eff..e4cfd0f 100644
--- a/lib/src/bitcoin/script/sequence.dart
+++ b/lib/src/bitcoin/script/sequence.dart
@@ -13,7 +13,7 @@ class Sequence {
       {required this.seqType, required this.value, this.isTypeBlock = true}) {
     if (seqType == BitcoinOpCodeConst.TYPE_RELATIVE_TIMELOCK &&
         (value < 1 || value > mask16)) {
-      throw const BitcoinBasePluginException(
+      throw const DartBitcoinPluginException(
           'Sequence should be between 1 and 65535');
     }
   }
@@ -31,7 +31,7 @@ class Sequence {
       return List<int>.from(BitcoinOpCodeConst.REPLACE_BY_FEE_SEQUENCE);
     }
     if (seqType == BitcoinOpCodeConst.TYPE_RELATIVE_TIMELOCK) {
-      int seq = 0;
+      var seq = 0;
       if (!isTypeBlock) {
         seq |= 1 << 22;
       }
@@ -39,16 +39,16 @@ class Sequence {
       return IntUtils.toBytes(seq, length: 4, byteOrder: Endian.little);
     }
 
-    throw const BitcoinBasePluginException("Invalid seqType");
+    throw const DartBitcoinPluginException('Invalid seqType');
   }
 
   /// Returns the appropriate integer for a script; e.g. for relative timelocks
   int forScript() {
     if (seqType == BitcoinOpCodeConst.TYPE_REPLACE_BY_FEE) {
-      throw const BitcoinBasePluginException(
-          "RBF is not to be included in a script.");
+      throw const DartBitcoinPluginException(
+          'RBF is not to be included in a script.');
     }
-    int scriptIntiger = value;
+    var scriptIntiger = value;
     if (seqType == BitcoinOpCodeConst.TYPE_RELATIVE_TIMELOCK && !isTypeBlock) {
       scriptIntiger |= 1 << 22;
     }
@@ -57,6 +57,6 @@ class Sequence {
 
   @override
   String toString() {
-    return "Sequence{seqType: $seqType, value: $value, isTypeBlock: $isTypeBlock}";
+    return 'Sequence{seqType: $seqType, value: $value, isTypeBlock: $isTypeBlock}';
   }
 }
diff --git a/lib/src/bitcoin/script/transaction.dart b/lib/src/bitcoin/script/transaction.dart
index 4b96fdb..b31e55a 100644
--- a/lib/src/bitcoin/script/transaction.dart
+++ b/lib/src/bitcoin/script/transaction.dart
@@ -3,6 +3,7 @@ import 'package:bitcoin_base/src/cash_token/cash_token.dart';
 import 'package:bitcoin_base/src/bitcoin/script/op_code/constant.dart';
 import 'package:bitcoin_base/src/crypto/crypto.dart';
 import 'package:bitcoin_base/src/exception/exception.dart';
+import 'package:blockchain_utils/helper/helper.dart';
 import 'package:blockchain_utils/utils/utils.dart';
 import 'package:blockchain_utils/crypto/quick_crypto.dart';
 import 'package:collection/collection.dart';
@@ -30,11 +31,11 @@ class BtcTransaction {
     List<int>? lock,
     List<int>? version,
     this.hasSilentPayment = false,
-  })  : locktime = List<int>.unmodifiable(lock ?? BitcoinOpCodeConst.DEFAULT_TX_LOCKTIME),
-        version = List<int>.unmodifiable(version ?? BitcoinOpCodeConst.DEFAULT_TX_VERSION),
-        inputs = List<TxInput>.unmodifiable(inputs),
-        outputs = List<TxOutput>.unmodifiable(outputs),
-        witnesses = List.unmodifiable(witnesses);
+  })  : locktime = lock?.immutable ?? BitcoinOpCodeConst.DEFAULT_TX_LOCKTIME,
+        version = version?.immutable ?? BitcoinOpCodeConst.DEFAULT_TX_VERSION,
+        inputs = inputs.immutable,
+        outputs = outputs.immutable,
+        witnesses = witnesses.immutable;
   final List<TxInput> inputs;
   final List<TxOutput> outputs;
   final List<int> locktime;
@@ -59,8 +60,8 @@ class BtcTransaction {
       witnesses: witnesses ?? this.witnesses,
       hasSegwit: hasSegwit ?? this.hasSegwit,
       mwebBytes: mwebBytes,
-      lock: lock ?? List<int>.from(locktime),
-      version: version ?? List<int>.from(this.version),
+      lock: lock ?? locktime,
+      version: version ?? this.version,
       hasSilentPayment: hasSilentPayment,
     );
   }
@@ -80,8 +81,8 @@ class BtcTransaction {
   /// Instantiates a Transaction from serialized raw hexadacimal data (classmethod)
   static BtcTransaction fromRaw(String raw) {
     final rawtx = BytesUtils.fromHexString(raw);
-    final List<int> version = rawtx.sublist(0, 4);
-    int cursor = 4;
+    final version = rawtx.sublist(0, 4);
+    var cursor = 4;
     List<int>? flag;
     bool hasSegwit = false;
     bool hasMweb = false;
@@ -95,12 +96,12 @@ class BtcTransaction {
       }
       cursor += 2;
     }
-    final vi = IntUtils.decodeVarint(rawtx.sublist(cursor, cursor + 9));
+    final vi = IntUtils.decodeVarint(rawtx.sublist(cursor));
     cursor += vi.item2;
 
     bool canReplaceByFee = false;
-    List<TxInput> inputs = [];
-    for (int index = 0; index < vi.item1; index++) {
+    final inputs = <TxInput>[];
+    for (var index = 0; index < vi.item1; index++) {
       final inp = TxInput.fromRaw(raw: raw, hasSegwit: hasSegwit, cursor: cursor);
 
       final input = inp.item1;
@@ -112,35 +113,34 @@ class BtcTransaction {
             const ListEquality().equals(input.sequence, BitcoinOpCodeConst.REPLACE_BY_FEE_SEQUENCE);
       }
     }
-
-    List<TxOutput> outputs = [];
-    final viOut = IntUtils.decodeVarint(rawtx.sublist(cursor, cursor + 9));
+    final outputs = <TxOutput>[];
+    final viOut = IntUtils.decodeVarint(rawtx.sublist(cursor));
     cursor += viOut.item2;
-    for (int index = 0; index < viOut.item1; index++) {
-      final inp = TxOutput.fromRaw(raw: raw, hasSegwit: hasSegwit, cursor: cursor);
+    for (var index = 0; index < viOut.item1; index++) {
+      final inp = TxOutput.deserialize(bytes: rawtx, hasSegwit: hasSegwit, cursor: cursor);
       outputs.add(inp.item1);
       cursor = inp.item2;
     }
-    List<TxWitnessInput> witnesses = [];
+    final witnesses = <TxWitnessInput>[];
     if (hasSegwit) {
-      for (int n = 0; n < inputs.length; n++) {
-        final input = inputs[n];
-        if (input.scriptSig.script.isNotEmpty) continue;
-
-        final wVi = IntUtils.decodeVarint(rawtx.sublist(cursor, cursor + 9));
-        cursor += wVi.item2;
-        List<String> witnessesTmp = [];
-        for (int n = 0; n < wVi.item1; n++) {
-          List<int> witness = <int>[];
-          final wtVi = IntUtils.decodeVarint(rawtx.sublist(cursor, cursor + 9));
-          if (wtVi.item1 != 0) {
-            witness = rawtx.sublist(cursor + wtVi.item2, cursor + wtVi.item1 + wtVi.item2);
+      if (cursor + 4 < rawtx.length) {
+        // in this case the tx contains wintness data.
+        for (var n = 0; n < inputs.length; n++) {
+          final wVi = IntUtils.decodeVarint(rawtx.sublist(cursor));
+          cursor += wVi.item2;
+          final witnessesTmp = <String>[];
+          for (var n = 0; n < wVi.item1; n++) {
+            var witness = <int>[];
+            final wtVi = IntUtils.decodeVarint(rawtx.sublist(cursor));
+            if (wtVi.item1 != 0) {
+              witness = rawtx.sublist(cursor + wtVi.item2, cursor + wtVi.item1 + wtVi.item2);
+            }
+            cursor += wtVi.item1 + wtVi.item2;
+            witnessesTmp.add(BytesUtils.toHexString(witness));
           }
-          cursor += wtVi.item1 + wtVi.item2;
-          witnessesTmp.add(BytesUtils.toHexString(witness));
-        }
 
-        witnesses.add(TxWitnessInput(stack: witnessesTmp));
+          witnesses.add(TxWitnessInput(stack: witnessesTmp));
+        }
       }
     }
     List<int>? mwebBytes;
@@ -170,51 +170,49 @@ class BtcTransaction {
       {required int txInIndex,
       required Script script,
       int sighash = BitcoinOpCodeConst.SIGHASH_ALL}) {
-    BtcTransaction tx = copy(this);
+    var tx = copy(this);
     for (final i in tx.inputs) {
       i.scriptSig = Script(script: []);
     }
     tx.inputs[txInIndex].scriptSig = script;
     if ((sighash & 0x1f) == BitcoinOpCodeConst.SIGHASH_NONE) {
-      // tx.outputs.clear();
       tx = tx.copyWith(outputs: []);
-      for (int i = 0; i < tx.inputs.length; i++) {
+      for (var i = 0; i < tx.inputs.length; i++) {
         if (i != txInIndex) {
-          tx.inputs[i].sequence = List<int>.unmodifiable(BitcoinOpCodeConst.EMPTY_TX_SEQUENCE);
+          tx.inputs[i].sequence = BitcoinOpCodeConst.EMPTY_TX_SEQUENCE;
         }
       }
     } else if ((sighash & 0x1f) == BitcoinOpCodeConst.SIGHASH_SINGLE) {
       if (txInIndex >= tx.outputs.length) {
-        throw const BitcoinBasePluginException(
-            "Transaction index is greater than the available outputs");
+        throw const DartBitcoinPluginException(
+            'Transaction index is greater than the available outputs');
       }
 
-      List<TxOutput> outputs = [];
-      for (int i = 0; i < txInIndex; i++) {
+      final outputs = <TxOutput>[];
+      for (var i = 0; i < txInIndex; i++) {
         outputs.add(TxOutput(
             amount: BigInt.from(BitcoinOpCodeConst.NEGATIVE_SATOSHI),
             scriptPubKey: Script(script: [])));
       }
       tx = tx.copyWith(outputs: [...outputs, tx.outputs[txInIndex]]);
-      for (int i = 0; i < tx.inputs.length; i++) {
+      for (var i = 0; i < tx.inputs.length; i++) {
         if (i != txInIndex) {
-          tx.inputs[i].sequence = List<int>.unmodifiable(BitcoinOpCodeConst.EMPTY_TX_SEQUENCE);
+          tx.inputs[i].sequence = BitcoinOpCodeConst.EMPTY_TX_SEQUENCE;
         }
       }
     }
     if ((sighash & BitcoinOpCodeConst.SIGHASH_ANYONECANPAY) != 0) {
       tx = tx.copyWith(inputs: [tx.inputs[txInIndex]]);
     }
-    List<int> txForSign = tx.toBytes(segwit: false);
+    var txForSign = tx.toBytes(segwit: false);
 
-    txForSign = List<int>.from(
-        [...txForSign, ...IntUtils.toBytes(sighash, length: 4, byteOrder: Endian.little)]);
+    txForSign = [...txForSign, ...IntUtils.toBytes(sighash, length: 4, byteOrder: Endian.little)];
     return QuickCrypto.sha256DoubleHash(txForSign);
   }
 
   /// Serializes Transaction to bytes
   List<int> toBytes({bool segwit = false}) {
-    DynamicByteTracker data = DynamicByteTracker();
+    final data = DynamicByteTracker();
     data.add(version);
     var flag = 0;
     if (segwit) flag |= 1;
@@ -260,22 +258,22 @@ class BtcTransaction {
       required BigInt amount,
       CashToken? token}) {
     final tx = copy(this);
-    List<int> hashPrevouts = List<int>.filled(32, 0);
-    List<int> hashSequence = List<int>.filled(32, 0);
-    List<int> hashOutputs = List<int>.filled(32, 0);
-    int basicSigHashType = sighash & 0x1F;
-    bool anyoneCanPay = (sighash & 0xF0) == BitcoinOpCodeConst.SIGHASH_ANYONECANPAY;
-    bool signAll = (basicSigHashType != BitcoinOpCodeConst.SIGHASH_SINGLE) &&
+    var hashPrevouts = List<int>.filled(32, 0);
+    var hashSequence = List<int>.filled(32, 0);
+    var hashOutputs = List<int>.filled(32, 0);
+    final basicSigHashType = sighash & 0x1F;
+    final anyoneCanPay = (sighash & 0xF0) == BitcoinOpCodeConst.SIGHASH_ANYONECANPAY;
+    final signAll = (basicSigHashType != BitcoinOpCodeConst.SIGHASH_SINGLE) &&
         (basicSigHashType != BitcoinOpCodeConst.SIGHASH_NONE);
     if (!anyoneCanPay) {
       hashPrevouts = <int>[];
       for (final txin in tx.inputs) {
-        List<int> txidBytes = List<int>.from(BytesUtils.fromHexString(txin.txId).reversed.toList());
-        hashPrevouts = List<int>.from([
+        final txidBytes = List<int>.from(BytesUtils.fromHexString(txin.txId).reversed.toList());
+        hashPrevouts = [
           ...hashPrevouts,
           ...txidBytes,
           ...IntUtils.toBytes(txin.txIndex, length: 4, byteOrder: Endian.little)
-        ]);
+        ];
       }
       hashPrevouts = QuickCrypto.sha256DoubleHash(hashPrevouts);
     }
@@ -283,48 +281,46 @@ class BtcTransaction {
     if (!anyoneCanPay && signAll) {
       hashSequence = <int>[];
       for (final i in tx.inputs) {
-        hashSequence = List<int>.from([...hashSequence, ...i.sequence]);
+        hashSequence = [...hashSequence, ...i.sequence];
       }
       hashSequence = QuickCrypto.sha256DoubleHash(hashSequence);
     }
     if (signAll) {
       hashOutputs = <int>[];
       for (final i in tx.outputs) {
-        hashOutputs = List<int>.from([...hashOutputs, ...i.toBytes()]);
+        hashOutputs = [...hashOutputs, ...i.toBytes()];
       }
       hashOutputs = QuickCrypto.sha256DoubleHash(hashOutputs);
     } else if (basicSigHashType == BitcoinOpCodeConst.SIGHASH_SINGLE &&
         txInIndex < tx.outputs.length) {
       final out = tx.outputs[txInIndex];
-      List<int> packedAmount = BigintUtils.toBytes(out.amount, length: 8, order: Endian.little);
-      final scriptBytes = out.scriptPubKey.toBytes();
-      List<int> lenScriptBytes = List<int>.from([scriptBytes.length]);
-      hashOutputs = List<int>.from([...packedAmount, ...lenScriptBytes, ...scriptBytes]);
+      final packedAmount = BigintUtils.toBytes(out.amount, length: 8, order: Endian.little);
+      final scriptBytes = IntUtils.prependVarint(out.scriptPubKey.toBytes());
+      hashOutputs = [...packedAmount, ...scriptBytes];
       hashOutputs = QuickCrypto.sha256DoubleHash(hashOutputs);
     }
 
-    DynamicByteTracker txForSigning = DynamicByteTracker();
+    final txForSigning = DynamicByteTracker();
     txForSigning.add(version);
     txForSigning.add(hashPrevouts);
     txForSigning.add(hashSequence);
     final txIn = inputs[txInIndex];
 
-    List<int> txidBytes = List<int>.from(BytesUtils.fromHexString(txIn.txId).reversed.toList());
-    txForSigning.add(List<int>.from(
-        [...txidBytes, ...IntUtils.toBytes(txIn.txIndex, length: 4, byteOrder: Endian.little)]));
+    final txidBytes = BytesUtils.fromHexString(txIn.txId).reversed.toList();
+    txForSigning.add(
+        [...txidBytes, ...IntUtils.toBytes(txIn.txIndex, length: 4, byteOrder: Endian.little)]);
     if (token != null) {
       txForSigning.add(token.toBytes());
     }
-    txForSigning.add(List<int>.from([script.toBytes().length]));
-    txForSigning.add(script.toBytes());
-    List<int> packedAmount = BigintUtils.toBytes(amount, length: 8, order: Endian.little);
+    final varintBytes = IntUtils.prependVarint(script.toBytes());
 
+    txForSigning.add(varintBytes);
+    final packedAmount = BigintUtils.toBytes(amount, length: 8, order: Endian.little);
     txForSigning.add(packedAmount);
     txForSigning.add(txIn.sequence);
     txForSigning.add(hashOutputs);
     txForSigning.add(locktime);
     txForSigning.add(IntUtils.toBytes(sighash, length: 4, byteOrder: Endian.little));
-
     return QuickCrypto.sha256DoubleHash(txForSigning.toBytes());
   }
 
@@ -346,111 +342,95 @@ class BtcTransaction {
       int leafVar = BitcoinOpCodeConst.LEAF_VERSION_TAPSCRIPT,
       int sighash = BitcoinOpCodeConst.TAPROOT_SIGHASH_ALL}) {
     final newTx = copy(this);
-    bool sighashNone = (sighash & 0x03) == BitcoinOpCodeConst.SIGHASH_NONE;
-    bool sighashSingle = (sighash & 0x03) == BitcoinOpCodeConst.SIGHASH_SINGLE;
-    bool anyoneCanPay = (sighash & 0x80) == BitcoinOpCodeConst.SIGHASH_ANYONECANPAY;
-    DynamicByteTracker txForSign = DynamicByteTracker();
+    final sighashNone = (sighash & 0x03) == BitcoinOpCodeConst.SIGHASH_NONE;
+    final sighashSingle = (sighash & 0x03) == BitcoinOpCodeConst.SIGHASH_SINGLE;
+    final anyoneCanPay = (sighash & 0x80) == BitcoinOpCodeConst.SIGHASH_ANYONECANPAY;
+    final txForSign = DynamicByteTracker();
     txForSign.add([0]);
     txForSign.add([sighash]);
     txForSign.add(version);
     txForSign.add(locktime);
-    List<int> hashPrevouts = <int>[];
-    List<int> hashAmounts = <int>[];
-    List<int> hashScriptPubkeys = <int>[];
-    List<int> hashSequences = <int>[];
-    List<int> hashOutputs = <int>[];
+    var hashPrevouts = <int>[];
+    var hashAmounts = <int>[];
+    var hashScriptPubkeys = <int>[];
+    var hashSequences = <int>[];
+    var hashOutputs = <int>[];
     if (!anyoneCanPay) {
       for (final txin in newTx.inputs) {
-        List<int> txidBytes = List<int>.from(BytesUtils.fromHexString(txin.txId).reversed.toList());
-        hashPrevouts = List<int>.from([
+        final txidBytes = BytesUtils.fromHexString(txin.txId).reversed.toList();
+        hashPrevouts = [
           ...hashPrevouts,
           ...txidBytes,
           ...IntUtils.toBytes(txin.txIndex, length: 4, byteOrder: Endian.little)
-        ]);
+        ];
       }
       hashPrevouts = QuickCrypto.sha256Hash(hashPrevouts);
       txForSign.add(hashPrevouts);
 
       for (final i in amounts) {
-        List<int> bytes = BigintUtils.toBytes(i, length: 8, order: Endian.little);
-
-        hashAmounts = List<int>.from([...hashAmounts, ...bytes]);
+        final bytes = BigintUtils.toBytes(i, length: 8, order: Endian.little);
+        hashAmounts = [...hashAmounts, ...bytes];
       }
       hashAmounts = QuickCrypto.sha256Hash(hashAmounts);
       txForSign.add(hashAmounts);
 
       for (final s in scriptPubKeys) {
-        final h = s.toHex();
-
-        /// must checked
-        int scriptLen = h.length ~/ 2;
-        List<int> scriptBytes = BytesUtils.fromHexString(h);
-        List<int> lenBytes = List<int>.from([scriptLen]);
-        hashScriptPubkeys = List<int>.from([...hashScriptPubkeys, ...lenBytes, ...scriptBytes]);
+        final scriptBytes = IntUtils.prependVarint(s.toBytes());
+        hashScriptPubkeys = [...hashScriptPubkeys, ...scriptBytes];
       }
       hashScriptPubkeys = QuickCrypto.sha256Hash(hashScriptPubkeys);
       txForSign.add(hashScriptPubkeys);
 
       for (final txIn in newTx.inputs) {
-        hashSequences = List<int>.from([...hashSequences, ...txIn.sequence]);
+        hashSequences = [...hashSequences, ...txIn.sequence];
       }
       hashSequences = QuickCrypto.sha256Hash(hashSequences);
       txForSign.add(hashSequences);
     }
     if (!(sighashNone || sighashSingle)) {
       for (final txOut in newTx.outputs) {
-        List<int> packedAmount = BigintUtils.toBytes(txOut.amount, length: 8, order: Endian.little);
-
-        List<int> scriptBytes = txOut.scriptPubKey.toBytes();
-        final lenScriptBytes = List<int>.from([scriptBytes.length]);
-        hashOutputs =
-            List<int>.from([...hashOutputs, ...packedAmount, ...lenScriptBytes, ...scriptBytes]);
+        final packedAmount = BigintUtils.toBytes(txOut.amount, length: 8, order: Endian.little);
+        final scriptBytes = IntUtils.prependVarint(txOut.scriptPubKey.toBytes());
+        hashOutputs = [...hashOutputs, ...packedAmount, ...scriptBytes];
       }
       hashOutputs = QuickCrypto.sha256Hash(hashOutputs);
       txForSign.add(hashOutputs);
     }
 
-    final int spendType = extFlags * 2 + 0;
-    txForSign.add(List<int>.from([spendType]));
+    final spendType = extFlags * 2 + 0;
+    txForSign.add([spendType]);
 
     if (anyoneCanPay) {
       final txin = newTx.inputs[txIndex];
-      List<int> txidBytes = List<int>.from(BytesUtils.fromHexString(txin.txId).reversed.toList());
-      List<int> result = List<int>.from(
-          [...txidBytes, ...IntUtils.toBytes(txin.txIndex, length: 4, byteOrder: Endian.little)]);
+      final txidBytes = BytesUtils.fromHexString(txin.txId).reversed.toList();
+      final result = [
+        ...txidBytes,
+        ...IntUtils.toBytes(txin.txIndex, length: 4, byteOrder: Endian.little)
+      ];
       txForSign.add(result);
       txForSign.add(BigintUtils.toBytes(amounts[txIndex], length: 8, order: Endian.little));
-      final sPubKey = scriptPubKeys[txIndex].toHex();
-      final sLength = sPubKey.length ~/ 2;
-      txForSign.add([sLength]);
-      txForSign.add(BytesUtils.fromHexString(sPubKey));
+      final scriptBytes = IntUtils.prependVarint(scriptPubKeys[txIndex].toBytes());
+      txForSign.add(scriptBytes);
       txForSign.add(txin.sequence);
     } else {
-      int index = txIndex;
-      List<int> indexBytes = List<int>.filled(4, 0);
-      writeUint32LE(index, indexBytes);
+      final indexBytes = IntUtils.toBytes(txIndex, length: 4, byteOrder: Endian.little);
       txForSign.add(indexBytes);
     }
     if (sighashSingle) {
       final txOut = newTx.outputs[txIndex];
-
-      List<int> packedAmount = BigintUtils.toBytes(txOut.amount, length: 8, order: Endian.little);
-      final sBytes = txOut.scriptPubKey.toBytes();
-      List<int> lenScriptBytes = List<int>.from([sBytes.length]);
-
-      final hashOut = List<int>.from([...packedAmount, ...lenScriptBytes, ...sBytes]);
+      final packedAmount = BigintUtils.toBytes(txOut.amount, length: 8, order: Endian.little);
+      final scriptBytes = IntUtils.prependVarint(txOut.scriptPubKey.toBytes());
+      final hashOut = [...packedAmount, ...scriptBytes];
       txForSign.add(QuickCrypto.sha256Hash(hashOut));
     }
     if (extFlags == 1) {
-      final leafVarBytes =
-          List<int>.from([leafVar, ...IntUtils.prependVarint(script?.toBytes() ?? <int>[])]);
-      txForSign.add(taggedHash(leafVarBytes, "TapLeaf"));
+      final leafVarBytes = [leafVar, ...IntUtils.prependVarint(script?.toBytes() ?? <int>[])];
+      txForSign.add(taggedHash(leafVarBytes, 'TapLeaf'));
       txForSign.add([0]);
       txForSign.add(List<int>.filled(4, mask8));
     }
     final bytes = txForSign.toBytes();
-
-    return taggedHash(bytes, "TapSighash");
+    return taggedHash(bytes, 'TapSighash');
   }
 
   /// converts result of to_bytes to hexadecimal string
@@ -472,16 +452,16 @@ class BtcTransaction {
   /// Calculates the tx segwit size
   int getVSize() {
     if (!hasSegwit) return getSize();
-    int markerSize = 2;
-    int witSize = 0;
-    List<int> data = <int>[];
+    const markerSize = 2;
+    var witSize = 0;
+    var data = <int>[];
     for (final w in witnesses) {
       final countBytes = List<int>.from([w.stack.length]);
       data = List<int>.from([...data, ...countBytes, ...w.toBytes()]);
     }
     witSize = data.length;
-    int size = getSize() - (markerSize + witSize);
-    double vSize = size + (markerSize + witSize) / 4;
+    final size = getSize() - (markerSize + witSize);
+    final vSize = size + (markerSize + witSize) / 4;
     return vSize.ceil();
   }
 
@@ -492,6 +472,16 @@ class BtcTransaction {
     return BytesUtils.toHexString(reversedHash);
   }
 
+  Map<String, dynamic> toJson() {
+    return {
+      'inputs': inputs.map((e) => e.toJson()).toList(),
+      'outputs': outputs.map((e) => e.toJson()).toList(),
+      'locktime': BytesUtils.toHexString(locktime),
+      'version': BytesUtils.toHexString(version),
+      'witnesses': witnesses.map((e) => e.toJson()).toList()
+    };
+  }
+
   @override
   String toString() {
     return "BtcTransaction{inputs: ${inputs.join(", ")}, outputs: ${outputs.join(", ")}, locktime: ${BytesUtils.toHexString(locktime)}}, version: ${BytesUtils.toHexString(version)}, hasSegwit: $hasSegwit, witnesses:${witnesses.join(",")} ";
diff --git a/lib/src/bitcoin/script/witness.dart b/lib/src/bitcoin/script/witness.dart
index 88c7aca..7a9ba58 100644
--- a/lib/src/bitcoin/script/witness.dart
+++ b/lib/src/bitcoin/script/witness.dart
@@ -1,5 +1,6 @@
 import 'dart:typed_data';
 
+import 'package:blockchain_utils/helper/extensions/extensions.dart';
 import 'package:blockchain_utils/utils/utils.dart';
 
 class ScriptWitness {
@@ -17,7 +18,7 @@ class ScriptWitness {
 /// [stack] the witness items (hex str) list
 class TxWitnessInput {
   TxWitnessInput({required List<String> stack, ScriptWitness? scriptWitness})
-      : stack = List.unmodifiable(stack),
+      : stack = stack.immutable,
         scriptWitness = scriptWitness ?? ScriptWitness();
 
   final List<String> stack;
@@ -30,16 +31,20 @@ class TxWitnessInput {
 
   /// returns a serialized byte version of the witness items list
   List<int> toBytes() {
-    List<int> stackBytes = [];
+    var stackBytes = <int>[];
 
-    for (String item in stack) {
-      List<int> itemBytes = IntUtils.prependVarint(BytesUtils.fromHexString(item));
+    for (final item in stack) {
+      final itemBytes = IntUtils.prependVarint(BytesUtils.fromHexString(item));
       stackBytes = [...stackBytes, ...itemBytes];
     }
 
     return stackBytes;
   }
 
+  Map<String, dynamic> toJson() {
+    return {'stack': stack};
+  }
+
   @override
   String toString() {
     return "TxWitnessInput{stack: ${stack.join(", ")}}";
diff --git a/lib/src/bitcoin/silent_payments/address.dart b/lib/src/bitcoin/silent_payments/address.dart
index 4c3afea..783918e 100644
--- a/lib/src/bitcoin/silent_payments/address.dart
+++ b/lib/src/bitcoin/silent_payments/address.dart
@@ -17,7 +17,6 @@ class SilentPaymentOwner extends SilentPaymentAddress {
   factory SilentPaymentOwner.fromPrivateKeys({
     required ECPrivate b_scan,
     required ECPrivate b_spend,
-    required BasedUtxoNetwork network,
     int? version,
   }) {
     return SilentPaymentOwner(
diff --git a/lib/src/bitcoin/silent_payments/utils.dart b/lib/src/bitcoin/silent_payments/utils.dart
index 1f68c07..8b82da1 100644
--- a/lib/src/bitcoin/silent_payments/utils.dart
+++ b/lib/src/bitcoin/silent_payments/utils.dart
@@ -75,13 +75,13 @@ ECPublic? getPubkeyFromInput(VinInfo vin) {
       break;
     case P2shAddressType.p2pkhInP2sh:
       final redeemScript = vin.scriptSig.sublist(1);
-      if (Script.fromRaw(byteData: redeemScript).getAddressType() == SegwitAddresType.p2wpkh) {
+      if (Script.fromRaw(bytes: redeemScript).getAddressType() == SegwitAddressType.p2wpkh) {
         return ECPublic.fromBytes(vin.txinwitness.scriptWitness.stack.last.buffer.asUint8List());
       }
       break;
-    case SegwitAddresType.p2wpkh:
+    case SegwitAddressType.p2wpkh:
       return ECPublic.fromBytes(vin.txinwitness.scriptWitness.stack.last.buffer.asUint8List());
-    case SegwitAddresType.p2tr:
+    case SegwitAddressType.p2tr:
       final witnessStack = vin.txinwitness.scriptWitness.stack;
       if (witnessStack.isNotEmpty) {
         if (witnessStack.length > 1 && witnessStack.last.buffer.asUint8List()[0] == 0x50) {
diff --git a/lib/src/bitcoin_cash/bcmr.dart b/lib/src/bitcoin_cash/bcmr.dart
index 58ccc41..9d97032 100644
--- a/lib/src/bitcoin_cash/bcmr.dart
+++ b/lib/src/bitcoin_cash/bcmr.dart
@@ -4,7 +4,7 @@ import 'package:blockchain_utils/blockchain_utils.dart';
 /// Bitcoin Cash Metadata Registries Script to convert uris and content hash to bitcoin output script
 class BCMR implements BitcoinScriptOutput {
   /// Bitcoin Cash Metadata Registries PREFIX
-  static const String _pcmrInHex = "42434d52";
+  static const String _pcmrInHex = '42434d52';
   BCMR({required this.uris, required this.hash})
       : assert(
           () {
@@ -16,8 +16,8 @@ class BCMR implements BitcoinScriptOutput {
             return true;
           }(),
           uris.isEmpty
-              ? "URIs must not be empty."
-              : "The BCMR hash should be the SHA-256 hash of the URI contents",
+              ? 'URIs must not be empty.'
+              : 'The BCMR hash should be the SHA-256 hash of the URI contents',
         );
 
   /// list of uris
@@ -29,7 +29,7 @@ class BCMR implements BitcoinScriptOutput {
   ///  'script' property from the interface to define the specific script for Bitcoin Cash Metadata Registries OP_RETURN script.
   @override
   Script get script => Script(script: [
-        "OP_RETURN",
+        'OP_RETURN',
         _pcmrInHex,
         hash,
         ...uris.map((e) => BytesUtils.toHexString(StringUtils.encode(e)))
diff --git a/lib/src/bitcoin_cash/bcmr_registery.dart b/lib/src/bitcoin_cash/bcmr_registery.dart
index 8d1af2d..3df2009 100644
--- a/lib/src/bitcoin_cash/bcmr_registery.dart
+++ b/lib/src/bitcoin_cash/bcmr_registery.dart
@@ -314,7 +314,7 @@ class NftCategoryField {
   const NftCategoryField({required this.identifier});
   final Map<String, NftCategoryFieldType> identifier;
   factory NftCategoryField.fromJson(Map<String, dynamic> json) {
-    final Map<String, NftCategoryFieldType> parsedIdentifier = {};
+    final parsedIdentifier = <String, NftCategoryFieldType>{};
     json.forEach((key, value) {
       parsedIdentifier[key] = NftCategoryFieldType.fromJson(value);
     });
@@ -700,26 +700,16 @@ class ChainSnapshot extends IdentitySnapshot {
     );
   }
   const ChainSnapshot({
-    required String name,
-    required TokenCategory token,
-    String? description,
-    List<String>? tags,
-    String? migrated,
-    String? status,
-    String? splitId,
-    URIs? uris,
-    Extensions? extensions,
-  }) : super(
-          name: name,
-          description: description,
-          tags: tags,
-          migrated: migrated,
-          token: token,
-          status: status,
-          splitId: splitId,
-          uris: uris,
-          extensions: extensions,
-        );
+    required super.name,
+    required TokenCategory super.token,
+    super.description,
+    super.tags,
+    super.migrated,
+    super.status,
+    super.splitId,
+    super.uris,
+    super.extensions,
+  });
 }
 
 class RegistryTimestampKeyedValues<T extends IdentitySnapshot> {
@@ -732,8 +722,7 @@ class RegistryTimestampKeyedValues<T extends IdentitySnapshot> {
 }
 
 class ChainHistory extends RegistryTimestampKeyedValues<ChainSnapshot> {
-  const ChainHistory({required Map<String, ChainSnapshot> timestampMap})
-      : super(timestampMap: timestampMap);
+  const ChainHistory({required super.timestampMap});
 
   factory ChainHistory.fromJson(Map<String, dynamic> json) {
     return ChainHistory(
@@ -745,8 +734,7 @@ class ChainHistory extends RegistryTimestampKeyedValues<ChainSnapshot> {
 }
 
 class IdentityHistory extends RegistryTimestampKeyedValues<IdentitySnapshot> {
-  const IdentityHistory({required Map<String, IdentitySnapshot> timestampMap})
-      : super(timestampMap: timestampMap);
+  const IdentityHistory({required super.timestampMap});
 
   factory IdentityHistory.fromJson(Map<String, dynamic> json) {
     return IdentityHistory(
@@ -989,7 +977,7 @@ class Registry {
   });
 
   Map<String, dynamic> toJson() {
-    final Map<String, dynamic> js = {
+    final js = <String, dynamic>{
       r'$schema': schema,
       'version': version.toJson(),
       'latestRevision': latestRevision,
@@ -1006,21 +994,21 @@ class Registry {
       for (final i in identities!.entries) {
         jsIdentities[i.key] = i.value.toJson();
       }
-      js["identities"] = jsIdentities;
+      js['identities'] = jsIdentities;
     }
     if (chains != null) {
       final jsChains = {};
       for (final i in chains!.entries) {
         jsChains[i.key] = i.value.toJson();
       }
-      js["chains"] = jsChains;
+      js['chains'] = jsChains;
     }
     if (tags != null) {
       final jsTags = {};
       for (final i in tags!.entries) {
         jsTags[i.key] = i.value.toJson();
       }
-      js["tags"] = jsTags;
+      js['tags'] = jsTags;
     }
     return js..removeWhere((key, value) => value == null);
   }
diff --git a/lib/src/cash_token/cash_token.dart b/lib/src/cash_token/cash_token.dart
index 53f852c..7a86d9b 100644
--- a/lib/src/cash_token/cash_token.dart
+++ b/lib/src/cash_token/cash_token.dart
@@ -34,17 +34,17 @@ class CashTokenCapability {
 
   /// (NFTs without a capability) cannot have their commitment modified when spent.
   static const CashTokenCapability noCapability =
-      CashTokenCapability._(0x00, "none");
+      CashTokenCapability._(0x00, 'none');
 
   /// Each Mutable token (NFTs with the mutable capability) allows the spending transaction
   /// to create one NFT of the same category, with any commitment and (optionally) the mutable capability.
   static const CashTokenCapability mutable =
-      CashTokenCapability._(0x01, "mutable");
+      CashTokenCapability._(0x01, 'mutable');
 
   /// Minting tokens (NFTs with the minting capability) allow the spending transaction to create any number of new NFTs of the same category,
   /// each with any commitment and (optionally) the minting or mutable capability.
   static const CashTokenCapability minting =
-      CashTokenCapability._(0x02, "minting");
+      CashTokenCapability._(0x02, 'minting');
 
   ///
   static int _getCapability(int bitfield) {
@@ -60,11 +60,11 @@ class CashTokenCapability {
   /// correct capality from bitfield
   static CashTokenCapability fromBitfield(int bitfield) {
     try {
-      final int intCapability = _getCapability(bitfield);
+      final intCapability = _getCapability(bitfield);
       return values.firstWhere((element) => element.value == intCapability);
     } on StateError {
-      throw const BitcoinBasePluginException(
-          "Invalid CashToken NFT Capability");
+      throw const DartBitcoinPluginException(
+          'Invalid CashToken NFT Capability');
     }
   }
 
@@ -73,8 +73,8 @@ class CashTokenCapability {
     try {
       return values.firstWhere((element) => element.name == name);
     } on StateError {
-      throw const BitcoinBasePluginException(
-          "Invalid CashToken NFT Capability Name");
+      throw const DartBitcoinPluginException(
+          'Invalid CashToken NFT Capability Name');
     }
   }
 
@@ -111,20 +111,20 @@ class CashTokenUtils {
       bool hasAmount = false,
       bool hasCommitmentLength = false,
       CashTokenCapability? capability}) {
-    int capabilityInt = 0;
+    var capabilityInt = 0;
     if (hasNFT) {
       if (capability != null) {
         // throw const MessageException("Capability is necessary for NFTs.");
         capabilityInt = capability.value;
       }
     }
-    final int nft = hasNFT ? _hasNFT : 0;
-    int commitmentLength = 0;
+    final nft = hasNFT ? _hasNFT : 0;
+    var commitmentLength = 0;
     if (hasNFT && hasCommitmentLength) {
       commitmentLength = hasCommitmentLength ? _hasCommitmentLength : 0;
     }
 
-    final int amount = hasAmount ? _hasAmount : 0;
+    final amount = hasAmount ? _hasAmount : 0;
     return nft | commitmentLength | amount | capabilityInt;
   }
 
@@ -160,8 +160,8 @@ class CashTokenUtils {
   }
 
   static Tuple<BigInt, int> _decodeVarintBigInt(List<int> byteint) {
-    int ni = byteint[0];
-    int size = 0;
+    final ni = byteint[0];
+    var size = 0;
 
     if (ni < 253) {
       return Tuple(BigInt.from(ni), 1);
@@ -174,7 +174,7 @@ class CashTokenUtils {
     } else {
       size = 8;
     }
-    BigInt value = BigintUtils.fromBytes(byteint.sublist(1, 1 + size),
+    final value = BigintUtils.fromBytes(byteint.sublist(1, 1 + size),
         byteOrder: Endian.little);
     return Tuple(value, size + 1);
   }
@@ -208,7 +208,7 @@ class CashTokenUtils {
   /// [bitfield]: The bitfield to be validated.
   /// Returns true if the bitfield is valid, otherwise false.
   static bool isValidBitfield(int bitfield) {
-    final int highNibble = bitfield & 0xF0;
+    final highNibble = bitfield & 0xF0;
     if (highNibble >= 0x80 || highNibble == 0x00) {
       return false;
     }
@@ -230,17 +230,17 @@ class CashTokenUtils {
 
 class CashToken {
   factory CashToken.fromJson(Map<String, dynamic> json) {
-    final String category = json["category"];
-    final BigInt amount = BigintUtils.tryParse(json["amount"]) ?? BigInt.zero;
+    final String category = json['category'];
+    final amount = BigintUtils.tryParse(json['amount']) ?? BigInt.zero;
     CashTokenCapability? capability;
     List<int>? commitment;
-    if (json.containsKey("nft")) {
-      capability = CashTokenCapability.fromName(json["nft"]["capability"]);
-      commitment = ((json["nft"]["commitment"] ?? "") as String).isEmpty
+    if (json.containsKey('nft')) {
+      capability = CashTokenCapability.fromName(json['nft']['capability']);
+      commitment = ((json['nft']['commitment'] ?? '') as String).isEmpty
           ? null
-          : BytesUtils.fromHexString(json["nft"]["commitment"]);
+          : BytesUtils.fromHexString(json['nft']['commitment']);
     }
-    int bitfield = CashTokenUtils.buildBitfield(
+    final bitfield = CashTokenUtils.buildBitfield(
         hasNFT: capability != null,
         capability: capability ?? CashTokenCapability.noCapability,
         hasAmount: amount > BigInt.zero,
@@ -261,6 +261,7 @@ class CashToken {
   /// The commitment contents of the NFT held in this output (0 to 40 bytes). This field is omitted if no NFT is present.
   final List<int> commitment;
   final int bitfield;
+
   CashToken.noValidate(
       {required this.category,
       required this.amount,
@@ -273,31 +274,31 @@ class CashToken {
       List<int>? commitment,
       required int bitfield}) {
     if (!CashTokenUtils.isValidBitfield(bitfield)) {
-      throw const BitcoinBasePluginException("Invalid bitfield");
+      throw const DartBitcoinPluginException('Invalid bitfield');
     }
     if (CashTokenUtils.hasAmount(bitfield) && amount == null) {
-      throw const BitcoinBasePluginException(
-          "Invalid cash token: the bitfield indicates an amount, but the amount is null.");
+      throw const DartBitcoinPluginException(
+          'Invalid cash token: the bitfield indicates an amount, but the amount is null.');
     }
     if (amount != null) {
       if (amount < BigInt.zero || amount > CashTokenUtils.maxTokenAmount) {
-        throw const BitcoinBasePluginException(
-            "Invalid amount. Amount must be between zero and 99.");
+        throw const DartBitcoinPluginException(
+            'Invalid amount. Amount must be between zero and 99.');
       }
     }
     if (!StringUtils.isHexBytes(category)) {
-      throw const BitcoinBasePluginException(
-          "Invalid category hexadecimal bytes.");
+      throw const DartBitcoinPluginException(
+          'Invalid category hexadecimal bytes.');
     }
     final toBytes = BytesUtils.fromHexString(category);
     if (toBytes.length != CashTokenUtils.idBytesLength) {
-      throw const BitcoinBasePluginException(
-          "Invalid category. The category should consist of 32 bytes.");
+      throw const DartBitcoinPluginException(
+          'Invalid category. The category should consist of 32 bytes.');
     }
     if (CashTokenUtils.hasCommitmentLength(bitfield) &&
         (commitment == null || commitment.isEmpty)) {
-      throw const BitcoinBasePluginException(
-          "Invalid cash token: the bitfield indicates an commitment, but the commitment is null or empty.");
+      throw const DartBitcoinPluginException(
+          'Invalid cash token: the bitfield indicates an commitment, but the commitment is null or empty.');
     }
     return CashToken.noValidate(
         category: category,
@@ -310,14 +311,14 @@ class CashToken {
         scriptBytes[0] != CashTokenUtils.cashTokenPrefix) {
       return const Tuple(null, 0);
     }
-    int cursor = 1;
-    List<int> id =
+    var cursor = 1;
+    final id =
         scriptBytes.sublist(cursor, cursor + CashTokenUtils.idBytesLength);
 
     cursor += CashTokenUtils.idBytesLength;
-    final int bitfield = scriptBytes[cursor];
+    final bitfield = scriptBytes[cursor];
     cursor += 1;
-    List<int> commitment = [];
+    var commitment = <int>[];
     if (CashTokenUtils.hasCommitmentLength(bitfield)) {
       final vi = IntUtils.decodeVarint(
           scriptBytes.sublist(cursor, scriptBytes.length));
@@ -325,7 +326,7 @@ class CashToken {
       commitment = scriptBytes.sublist(cursor, cursor + vi.item1);
       cursor += vi.item1;
     }
-    BigInt amount = BigInt.zero;
+    var amount = BigInt.zero;
     if (CashTokenUtils.hasAmount(bitfield)) {
       final vi = CashTokenUtils._decodeVarintBigInt(
           scriptBytes.sublist(cursor, scriptBytes.length));
@@ -336,7 +337,7 @@ class CashToken {
         amount < BigInt.zero ||
         amount > CashTokenUtils.maxTokenAmount ||
         CashTokenUtils.hasCommitmentLength(bitfield) && commitment.isEmpty) {
-      throw const BitcoinBasePluginException('Invalid cash token');
+      throw const DartBitcoinPluginException('Invalid cash token');
     }
     return Tuple(
         CashToken(
@@ -351,7 +352,7 @@ class CashToken {
   ///
   /// Returns a list of integers representing the serialized byte representation of the [CashToken].
   List<int> toBytes() {
-    DynamicByteTracker bytes = DynamicByteTracker();
+    final bytes = DynamicByteTracker();
     bytes.add([CashTokenUtils.cashTokenPrefix]);
     bytes.add(BytesUtils.fromHexString(category).reversed.toList());
     bytes.add([bitfield]);
@@ -412,9 +413,17 @@ class CashToken {
   /// Initialized only if the Cash Token has a commitment length.
   late final String? commitmentInHex =
       hasCommitment ? BytesUtils.toHexString(commitment) : null;
+  Map<String, dynamic> toJson() {
+    return {
+      'category': category,
+      'amount': amount.toString(),
+      'bitfield': bitfield,
+      'commitment': BytesUtils.toHexString(commitment),
+    };
+  }
 
   @override
   String toString() {
-    return "CashToken{bitfield: $bitfield, commitment: $commitmentInHex, amount: $amount, category: $category}";
+    return 'CashToken{bitfield: $bitfield, commitment: $commitmentInHex, amount: $amount, category: $category}';
   }
 }
diff --git a/lib/src/crypto/crypto.dart b/lib/src/crypto/crypto.dart
index 2af7a21..c7fd1bc 100644
--- a/lib/src/crypto/crypto.dart
+++ b/lib/src/crypto/crypto.dart
@@ -1,4 +1,4 @@
-library bitcoin_crypto;
+library;
 
 import 'package:bitcoin_base/src/bitcoin/script/op_code/constant_lib.dart';
 import 'package:blockchain_utils/crypto/quick_crypto.dart';
@@ -9,9 +9,9 @@ export 'keypair/ec_public.dart';
 /// Function: taggedHash
 /// Description: Computes a tagged hash of the input data with a provided tag.
 /// Input:
-///   - List<int> data - The data to be hashed.
+///   - `List<int>` data - The data to be hashed.
 ///   - String tag - A unique tag to differentiate the hash.
-/// Output: List<int> - The resulting tagged hash.
+/// Output: `List<int>` - The resulting tagged hash.
 /// Note: This function combines the provided tag with the input data to create a unique
 /// hash by applying a double SHA-256 hash.
 List<int> taggedHash(List<int> data, String tag) {
@@ -30,5 +30,5 @@ List<int> toTapleafTaggedHash(List<int> scriptBytes) {
     BitcoinOpCodeConst.LEAF_VERSION_TAPSCRIPT,
     ...IntUtils.prependVarint(scriptBytes)
   ];
-  return taggedHash(leafVarBytes, "TapLeaf");
+  return taggedHash(leafVarBytes, 'TapLeaf');
 }
diff --git a/lib/src/crypto/keypair/ec_private.dart b/lib/src/crypto/keypair/ec_private.dart
index c5ace75..91d62cc 100644
--- a/lib/src/crypto/keypair/ec_private.dart
+++ b/lib/src/crypto/keypair/ec_private.dart
@@ -9,7 +9,7 @@ import 'package:bip32/src/utils/ecurve.dart' as ecc;
 /// Represents an ECDSA private key.
 class ECPrivate {
   final Bip32PrivateKey prive;
-  ECPrivate(this.prive);
+  const ECPrivate(this.prive);
 
   /// creates an object from hex
   factory ECPrivate.fromHex(String keyHex) {
@@ -45,12 +45,10 @@ class ECPrivate {
   }
 
   /// returns as WIFC (compressed) or WIF format (string)
-  String toWif({bool compressed = true, BitcoinNetwork? network}) {
-    List<int> bytes = <int>[...(network ?? BitcoinNetwork.mainnet).wifNetVer, ...toBytes()];
-    if (compressed) {
-      bytes = <int>[...bytes, 0x01];
-    }
-    return Base58Encoder.checkEncode(bytes);
+  String toWif(
+      {PubKeyModes pubKeyMode = PubKeyModes.compressed,
+      BitcoinNetwork network = BitcoinNetwork.mainnet}) {
+    return WifEncoder.encode(toBytes(), netVer: network.wifNetVer, pubKeyMode: pubKeyMode);
   }
 
   /// returns the key's raw bytes
@@ -96,11 +94,20 @@ class ECPrivate {
   /// sign transaction digest  and returns the signature.
   String signInput(List<int> txDigest, {int sigHash = BitcoinOpCodeConst.SIGHASH_ALL}) {
     final btcSigner = BitcoinSigner.fromKeyBytes(toBytes());
-    List<int> signature = btcSigner.signTransaction(txDigest);
+    var signature = btcSigner.signTransaction(txDigest);
     signature = <int>[...signature, sigHash];
     return BytesUtils.toHexString(signature);
   }
 
+  String signSchnorr(List<int> txDigest, {int sighash = BitcoinOpCodeConst.TAPROOT_SIGHASH_ALL}) {
+    final btcSigner = BitcoinSigner.fromKeyBytes(toBytes());
+    var signatur = btcSigner.signSchnorrTransaction(txDigest, tapScripts: [], tweak: false);
+    if (sighash != BitcoinOpCodeConst.TAPROOT_SIGHASH_ALL) {
+      signatur = <int>[...signatur, sighash];
+    }
+    return BytesUtils.toHexString(signatur);
+  }
+
   /// sign taproot transaction digest and returns the signature.
   String signTapRoot(List<int> txDigest,
       {int sighash = BitcoinOpCodeConst.TAPROOT_SIGHASH_ALL,
@@ -112,16 +119,16 @@ class ECPrivate {
       }
       return true;
     }(),
-        "When the tweak is false, the `tapScripts` are ignored, to use the tap script path, you need to consider the tweak value to be true.");
+        'When the tweak is false, the `tapScripts` are ignored, to use the tap script path, you need to consider the tweak value to be true.');
     final tapScriptBytes =
         !tweak ? [] : tapScripts.map((e) => e.map((e) => e.toBytes()).toList()).toList();
     final btcSigner = BitcoinSigner.fromKeyBytes(toBytes());
-    List<int> signatur =
+    var signature =
         btcSigner.signSchnorrTransaction(txDigest, tapScripts: tapScriptBytes, tweak: tweak);
     if (sighash != BitcoinOpCodeConst.TAPROOT_SIGHASH_ALL) {
-      signatur = <int>[...signatur, sighash];
+      signature = <int>[...signature, sighash];
     }
-    return BytesUtils.toHexString(signatur);
+    return BytesUtils.toHexString(signature);
   }
 
   ECPrivate toTweakedTaprootKey() {
diff --git a/lib/src/crypto/keypair/ec_public.dart b/lib/src/crypto/keypair/ec_public.dart
index 045f993..60db5c8 100644
--- a/lib/src/crypto/keypair/ec_public.dart
+++ b/lib/src/crypto/keypair/ec_public.dart
@@ -5,13 +5,15 @@ import 'package:bitcoin_base/src/models/network.dart';
 import 'package:blockchain_utils/blockchain_utils.dart';
 import 'package:blockchain_utils/crypto/crypto/cdsa/point/base.dart';
 
+typedef PublicKeyType = PubKeyModes;
+
 class ECPublic {
   final Bip32PublicKey publicKey;
   const ECPublic._(this.publicKey);
 
   factory ECPublic.fromBip32(Bip32PublicKey publicKey) {
     if (publicKey.curveType != EllipticCurveTypes.secp256k1) {
-      throw const BitcoinBasePluginException("invalid public key curve for bitcoin");
+      throw const DartBitcoinPluginException('invalid public key curve for bitcoin');
     }
     return ECPublic._(publicKey);
   }
@@ -30,8 +32,8 @@ class ECPublic {
 
   /// toHex converts the ECPublic key to a hex-encoded string.
   /// If 'compressed' is true, the key is in compressed format.
-  String toHex({bool compressed = true}) {
-    if (compressed) {
+  String toHex({PublicKeyType mode = PublicKeyType.compressed}) {
+    if (mode.isCompressed) {
       return BytesUtils.toHexString(publicKey.compressed);
     }
     return BytesUtils.toHexString(publicKey.uncompressed);
@@ -39,58 +41,71 @@ class ECPublic {
 
   /// _toHash160 computes the RIPEMD160 hash of the ECPublic key.
   /// If 'compressed' is true, the key is in compressed format.
-  List<int> _toHash160({bool compressed = true}) {
-    final bytes = BytesUtils.fromHexString(toHex(compressed: compressed));
+  List<int> _toHash160({PublicKeyType mode = PublicKeyType.compressed}) {
+    final bytes = BytesUtils.fromHexString(toHex(mode: mode));
     return QuickCrypto.hash160(bytes);
   }
 
   /// toHash160 computes the RIPEMD160 hash of the ECPublic key.
   /// If 'compressed' is true, the key is in compressed format.
-  String toHash160({bool compressed = true}) {
-    final bytes = BytesUtils.fromHexString(toHex(compressed: compressed));
+  String toHash160({PublicKeyType mode = PublicKeyType.compressed}) {
+    final bytes = BytesUtils.fromHexString(toHex(mode: mode));
     return BytesUtils.toHexString(QuickCrypto.hash160(bytes));
   }
 
   /// toP2pkhAddress generates a P2PKH (Pay-to-Public-Key-Hash) address from the ECPublic key.
   /// If 'compressed' is true, the key is in compressed format.
-  P2pkhAddress toP2pkhAddress({bool compressed = true}) {
-    final h16 = _toHash160(compressed: compressed);
+  P2pkhAddress toAddress({PublicKeyType mode = PublicKeyType.compressed}) {
+    final h16 = _toHash160(mode: mode);
     final toHex = BytesUtils.toHexString(h16);
     return P2pkhAddress.fromHash160(h160: toHex);
   }
 
+  P2pkhAddress toP2pkhAddress({PublicKeyType mode = PublicKeyType.compressed}) {
+    return toAddress(mode: mode);
+  }
+
   /// toP2wpkhAddress generates a P2WPKH (Pay-to-Witness-Public-Key-Hash) SegWit address
   /// from the ECPublic key. If 'compressed' is true, the key is in compressed format.
-  P2wpkhAddress toP2wpkhAddress({bool compressed = true}) {
-    final h16 = _toHash160(compressed: compressed);
+  P2wpkhAddress toSegwitAddress() {
+    final h16 = _toHash160();
     final toHex = BytesUtils.toHexString(h16);
 
     return P2wpkhAddress.fromProgram(program: toHex);
   }
 
+  P2wpkhAddress toP2wpkhAddress() {
+    return toSegwitAddress();
+  }
+
   /// toP2pkAddress generates a P2PK (Pay-to-Public-Key) address from the ECPublic key.
   /// If 'compressed' is true, the key is in compressed format.
-  P2pkAddress toP2pkAddress({bool compressed = true}) {
-    return P2pkAddress(publicKey: this);
+  P2pkAddress toP2pkAddress({PublicKeyType mode = PublicKeyType.compressed}) {
+    final h = toHex(mode: mode);
+    return P2pkAddress(publicKey: ECPublic.fromHex(h));
   }
 
   /// toRedeemScript generates a redeem script from the ECPublic key.
   /// If 'compressed' is true, the key is in compressed format.
-  Script toRedeemScript({bool compressed = true}) {
-    final redeem = toHex(compressed: compressed);
-    return Script(script: [redeem, "OP_CHECKSIG"]);
+  Script toRedeemScript({PublicKeyType mode = PublicKeyType.compressed}) {
+    final redeem = toHex(mode: mode);
+    return Script(script: [redeem, 'OP_CHECKSIG']);
   }
 
   /// toP2pkhInP2sh generates a P2SH (Pay-to-Script-Hash) address
   /// wrapping a P2PK (Pay-to-Public-Key) script derived from the ECPublic key.
   /// If 'compressed' is true, the key is in compressed format.
-  P2shAddress toP2pkhInP2sh({bool compressed = true, useBCHP2sh32 = false}) {
-    final addr = toP2pkhAddress(compressed: compressed);
+  P2shAddress toP2pkhInP2sh({
+    PublicKeyType mode = PublicKeyType.compressed,
+    useBCHP2sh32 = false,
+  }) {
+    final addr = toAddress(mode: mode);
     final script = addr.toScriptPubKey();
     if (useBCHP2sh32) {
       return P2shAddress.fromHash160(
-          h160: BytesUtils.toHexString(QuickCrypto.sha256DoubleHash(script.toBytes())),
-          type: P2shAddressType.p2pkhInP2sh32);
+        h160: BytesUtils.toHexString(QuickCrypto.sha256DoubleHash(script.toBytes())),
+        type: P2shAddressType.p2pkhInP2sh32,
+      );
     }
     return P2shAddress.fromRedeemScript(script: script, type: P2shAddressType.p2pkhInP2sh);
   }
@@ -98,8 +113,11 @@ class ECPublic {
   /// toP2pkInP2sh generates a P2SH (Pay-to-Script-Hash) address
   /// wrapping a P2PK (Pay-to-Public-Key) script derived from the ECPublic key.
   /// If 'compressed' is true, the key is in compressed format.
-  P2shAddress toP2pkInP2sh({bool compressed = true, bool useBCHP2sh32 = false}) {
-    final script = toRedeemScript(compressed: compressed);
+  P2shAddress toP2pkInP2sh({
+    PublicKeyType mode = PublicKeyType.compressed,
+    bool useBCHP2sh32 = false,
+  }) {
+    final script = toRedeemScript(mode: mode);
     if (useBCHP2sh32) {
       return P2shAddress.fromHash160(
           h160: BytesUtils.toHexString(QuickCrypto.sha256DoubleHash(script.toBytes())),
@@ -123,29 +141,29 @@ class ECPublic {
   /// toP2wpkhInP2sh generates a P2SH (Pay-to-Script-Hash) address
   /// wrapping a P2WPKH (Pay-to-Witness-Public-Key-Hash) script derived from the ECPublic key.
   /// If 'compressed' is true, the key is in compressed format.
-  P2shAddress toP2wpkhInP2sh({bool compressed = true}) {
-    final addr = toP2wpkhAddress(compressed: compressed);
+  P2shAddress toP2wpkhInP2sh() {
+    final addr = toSegwitAddress();
     return P2shAddress.fromRedeemScript(
         script: addr.toScriptPubKey(), type: P2shAddressType.p2wpkhInP2sh);
   }
 
   /// toP2wshScript generates a P2WSH (Pay-to-Witness-Script-Hash) script
   /// derived from the ECPublic key. If 'compressed' is true, the key is in compressed format.
-  Script toP2wshRedeemScript({bool compressed = true}) {
-    return Script(script: ['OP_1', toHex(compressed: compressed), "OP_1", "OP_CHECKMULTISIG"]);
+  Script toP2wshRedeemScript() {
+    return Script(script: ['OP_1', toHex(), 'OP_1', 'OP_CHECKMULTISIG']);
   }
 
   /// toP2wshAddress generates a P2WSH (Pay-to-Witness-Script-Hash) address
   /// from the ECPublic key. If 'compressed' is true, the key is in compressed format.
-  P2wshAddress toP2wshAddress({bool compressed = true}) {
-    return P2wshAddress.fromRedeemScript(script: toP2wshRedeemScript(compressed: compressed));
+  P2wshAddress toP2wshAddress() {
+    return P2wshAddress.fromRedeemScript(script: toP2wshRedeemScript());
   }
 
   /// toP2wshInP2sh generates a P2SH (Pay-to-Script-Hash) address
   /// wrapping a P2WSH (Pay-to-Witness-Script-Hash) script derived from the ECPublic key.
   /// If 'compressed' is true, the key is in compressed format.
-  P2shAddress toP2wshInP2sh({bool compressed = true}) {
-    final p2sh = toP2wshAddress(compressed: compressed);
+  P2shAddress toP2wshInP2sh() {
+    final p2sh = toP2wshAddress();
     return P2shAddress.fromRedeemScript(
         script: p2sh.toScriptPubKey(), type: P2shAddressType.p2wshInP2sh);
   }
diff --git a/lib/src/exception/exception.dart b/lib/src/exception/exception.dart
index f06d838..0e031c3 100644
--- a/lib/src/exception/exception.dart
+++ b/lib/src/exception/exception.dart
@@ -1,9 +1,5 @@
 import 'package:blockchain_utils/blockchain_utils.dart';
 
-class BitcoinBasePluginException extends BlockchainUtilsException {
-  @override
-  final String message;
-  @override
-  final Map<String, dynamic>? details;
-  const BitcoinBasePluginException(this.message, {this.details});
+class DartBitcoinPluginException extends BlockchainUtilsException {
+  const DartBitcoinPluginException(super.message, {super.details});
 }
diff --git a/lib/src/models/network.dart b/lib/src/models/network.dart
index adeaafc..0607bef 100644
--- a/lib/src/models/network.dart
+++ b/lib/src/models/network.dart
@@ -1,9 +1,7 @@
 import 'package:bitcoin_base/bitcoin_base.dart';
 import 'package:bitcoin_base/src/exception/exception.dart';
 import 'package:bitcoin_base/src/utils/enumerate.dart';
-import 'package:blockchain_utils/bip/bip/bip.dart';
-import 'package:blockchain_utils/bip/coin_conf/coin_conf.dart';
-import 'package:blockchain_utils/bip/coin_conf/coins_conf.dart';
+import 'package:blockchain_utils/blockchain_utils.dart';
 
 /// Abstract class representing a base for UTXO-based cryptocurrency networks.
 abstract class BasedUtxoNetwork implements Enumerate {
@@ -25,7 +23,7 @@ abstract class BasedUtxoNetwork implements Enumerate {
   abstract final List<BitcoinAddressType> supportedAddress;
 
   @override
-  operator ==(other) {
+  bool operator ==(other) {
     if (identical(other, this)) return true;
     return other is BasedUtxoNetwork && other.runtimeType == runtimeType && value == other.value;
   }
@@ -46,7 +44,9 @@ abstract class BasedUtxoNetwork implements Enumerate {
     BitcoinCashNetwork.testnet,
     BitcoinSVNetwork.mainnet,
     BitcoinSVNetwork.testnet,
-    PepeNetwork.mainnet
+    PepeNetwork.mainnet,
+    ElectraProtocolNetwork.mainnet,
+    ElectraProtocolNetwork.testnet
   ];
 
   static BasedUtxoNetwork fromName(String name) {
@@ -63,11 +63,11 @@ abstract class BasedUtxoNetwork implements Enumerate {
 class BitcoinSVNetwork implements BasedUtxoNetwork {
   /// Mainnet configuration with associated `CoinConf`.
   static const BitcoinSVNetwork mainnet =
-      BitcoinSVNetwork._("BitcoinSVMainnet", CoinsConf.bitcoinSvMainNet);
+      BitcoinSVNetwork._('BitcoinSVMainnet', CoinsConf.bitcoinSvMainNet);
 
   /// Testnet configuration with associated `CoinConf`.
   static const BitcoinSVNetwork testnet =
-      BitcoinSVNetwork._("BitcoinSVTestnet", CoinsConf.bitcoinSvTestNet);
+      BitcoinSVNetwork._('BitcoinSVTestnet', CoinsConf.bitcoinSvTestNet);
 
   /// Overrides the `conf` property from `BasedUtxoNetwork` with the associated `CoinConf`.
   @override
@@ -114,11 +114,11 @@ class BitcoinSVNetwork implements BasedUtxoNetwork {
 class BitcoinNetwork implements BasedUtxoNetwork {
   /// Mainnet configuration with associated `CoinConf`.
   static const BitcoinNetwork mainnet =
-      BitcoinNetwork._("bitcoinMainnet", CoinsConf.bitcoinMainNet);
+      BitcoinNetwork._('bitcoinMainnet', CoinsConf.bitcoinMainNet);
 
   /// Testnet configuration with associated `CoinConf`.
   static const BitcoinNetwork testnet =
-      BitcoinNetwork._("bitcoinTestnet", CoinsConf.bitcoinTestNet);
+      BitcoinNetwork._('bitcoinTestnet', CoinsConf.bitcoinTestNet);
 
   /// Overrides the `conf` property from `BasedUtxoNetwork` with the associated `CoinConf`.
   @override
@@ -154,10 +154,10 @@ class BitcoinNetwork implements BasedUtxoNetwork {
   @override
   List<BitcoinAddressType> get supportedAddress => [
         P2pkhAddressType.p2pkh,
-        SegwitAddresType.p2wpkh,
+        SegwitAddressType.p2wpkh,
         PubKeyAddressType.p2pk,
-        SegwitAddresType.p2tr,
-        SegwitAddresType.p2wsh,
+        SegwitAddressType.p2tr,
+        SegwitAddressType.p2wsh,
         P2shAddressType.p2wshInP2sh,
         P2shAddressType.p2wpkhInP2sh,
         P2shAddressType.p2pkhInP2sh,
@@ -187,11 +187,11 @@ class BitcoinNetwork implements BasedUtxoNetwork {
 class LitecoinNetwork implements BasedUtxoNetwork {
   /// Mainnet configuration with associated `CoinConf`.
   static const LitecoinNetwork mainnet =
-      LitecoinNetwork._("litecoinMainnet", CoinsConf.litecoinMainNet);
+      LitecoinNetwork._('litecoinMainnet', CoinsConf.litecoinMainNet);
 
   /// Testnet configuration with associated `CoinConf`.
   static const LitecoinNetwork testnet =
-      LitecoinNetwork._("litecoinTestnet", CoinsConf.litecoinTestNet);
+      LitecoinNetwork._('litecoinTestnet', CoinsConf.litecoinTestNet);
 
   /// Overrides the `conf` property from `BasedUtxoNetwork` with the associated `CoinConf`.
   @override
@@ -226,10 +226,10 @@ class LitecoinNetwork implements BasedUtxoNetwork {
   @override
   final List<BitcoinAddressType> supportedAddress = const [
     P2pkhAddressType.p2pkh,
-    SegwitAddresType.p2wpkh,
+    SegwitAddressType.p2wpkh,
     PubKeyAddressType.p2pk,
-    SegwitAddresType.p2wsh,
-    SegwitAddresType.mweb,
+    SegwitAddressType.p2wsh,
+    SegwitAddressType.mweb,
     P2shAddressType.p2wshInP2sh,
     P2shAddressType.p2wpkhInP2sh,
     P2shAddressType.p2pkhInP2sh,
@@ -248,10 +248,10 @@ class LitecoinNetwork implements BasedUtxoNetwork {
 /// Class representing a Dash network, implementing the `BasedUtxoNetwork` abstract class.
 class DashNetwork implements BasedUtxoNetwork {
   /// Mainnet configuration with associated `CoinConf`.
-  static const DashNetwork mainnet = DashNetwork._("dashMainnet", CoinsConf.dashMainNet);
+  static const DashNetwork mainnet = DashNetwork._('dashMainnet', CoinsConf.dashMainNet);
 
   /// Testnet configuration with associated `CoinConf`.
-  static const DashNetwork testnet = DashNetwork._("dashTestnet", CoinsConf.dashTestNet);
+  static const DashNetwork testnet = DashNetwork._('dashTestnet', CoinsConf.dashTestNet);
 
   /// Overrides the `conf` property from `BasedUtxoNetwork` with the associated `CoinConf`.
   @override
@@ -275,7 +275,7 @@ class DashNetwork implements BasedUtxoNetwork {
   /// Retrieves the Human-Readable Part (HRP) for Pay-to-Witness-Public-Key-Hash (P2WPKH) addresses.
   @override
   String get p2wpkhHrp =>
-      throw const BitcoinBasePluginException("DashNetwork network does not support P2WPKH/P2WSH");
+      throw const DartBitcoinPluginException('DashNetwork network does not support P2WPKH/P2WSH');
 
   /// Checks if the current network is the mainnet.
   @override
@@ -303,11 +303,11 @@ class DashNetwork implements BasedUtxoNetwork {
 class DogecoinNetwork implements BasedUtxoNetwork {
   /// Mainnet configuration with associated `CoinConf`.
   static const DogecoinNetwork mainnet =
-      DogecoinNetwork._("dogeMainnet", CoinsConf.dogecoinMainNet);
+      DogecoinNetwork._('dogeMainnet', CoinsConf.dogecoinMainNet);
 
   /// Testnet configuration with associated `CoinConf`.
   static const DogecoinNetwork testnet =
-      DogecoinNetwork._("dogeTestnet", CoinsConf.dogecoinTestNet);
+      DogecoinNetwork._('dogeTestnet', CoinsConf.dogecoinTestNet);
 
   /// Overrides the `conf` property from `BasedUtxoNetwork` with the associated `CoinConf`.
   @override
@@ -333,8 +333,8 @@ class DogecoinNetwork implements BasedUtxoNetwork {
 
   /// Retrieves the Human-Readable Part (HRP) for Pay-to-Witness-Public-Key-Hash (P2WPKH) addresses.
   @override
-  String get p2wpkhHrp => throw const BitcoinBasePluginException(
-      "DogecoinNetwork network does not support P2WPKH/P2WSH");
+  String get p2wpkhHrp => throw const DartBitcoinPluginException(
+      'DogecoinNetwork network does not support P2WPKH/P2WSH');
 
   /// Checks if the current network is the mainnet.
   @override
@@ -359,11 +359,11 @@ class DogecoinNetwork implements BasedUtxoNetwork {
 class BitcoinCashNetwork implements BasedUtxoNetwork {
   /// Mainnet configuration with associated `CoinConf`.
   static const BitcoinCashNetwork mainnet =
-      BitcoinCashNetwork._("bitcoinCashMainnet", CoinsConf.bitcoinCashMainNet);
+      BitcoinCashNetwork._('bitcoinCashMainnet', CoinsConf.bitcoinCashMainNet);
 
   /// Testnet configuration with associated `CoinConf`.
   static const BitcoinCashNetwork testnet =
-      BitcoinCashNetwork._("bitcoinCashTestnet", CoinsConf.bitcoinCashTestNet);
+      BitcoinCashNetwork._('bitcoinCashTestnet', CoinsConf.bitcoinCashTestNet);
 
   /// Overrides the `conf` property from `BasedUtxoNetwork` with the associated `CoinConf`.
   @override
@@ -402,7 +402,7 @@ class BitcoinCashNetwork implements BasedUtxoNetwork {
   /// from the associated `CoinConf`.
   @override
   String get p2wpkhHrp =>
-      throw const BitcoinBasePluginException("network does not support p2wpkh HRP");
+      throw const DartBitcoinPluginException('network does not support p2wpkh HRP');
 
   String get networkHRP => conf.params.p2pkhStdHrp!;
 
@@ -435,7 +435,7 @@ class BitcoinCashNetwork implements BasedUtxoNetwork {
 /// Class representing a Dogecoin network, implementing the `BasedUtxoNetwork` abstract class.
 class PepeNetwork implements BasedUtxoNetwork {
   /// Mainnet configuration with associated `CoinConf`.
-  static const PepeNetwork mainnet = PepeNetwork._("pepecoinMainnet", CoinsConf.pepeMainnet);
+  static const PepeNetwork mainnet = PepeNetwork._('pepecoinMainnet', CoinsConf.pepeMainnet);
 
   /// Overrides the `conf` property from `BasedUtxoNetwork` with the associated `CoinConf`.
   @override
@@ -461,8 +461,8 @@ class PepeNetwork implements BasedUtxoNetwork {
 
   /// Retrieves the Human-Readable Part (HRP) for Pay-to-Witness-Public-Key-Hash (P2WPKH) addresses.
   @override
-  String get p2wpkhHrp => throw const BitcoinBasePluginException(
-      "DogecoinNetwork network does not support P2WPKH/P2WSH");
+  String get p2wpkhHrp => throw const DartBitcoinPluginException(
+      'DogecoinNetwork network does not support P2WPKH/P2WSH');
 
   /// Checks if the current network is the mainnet.
   @override
@@ -484,3 +484,68 @@ class PepeNetwork implements BasedUtxoNetwork {
     return [Bip44Coins.pepecoinTestnet, Bip49Coins.pepecoinTestnet];
   }
 }
+
+/// Class representing a Electra Protocol network, implementing the `BasedUtxoNetwork` abstract class.
+class ElectraProtocolNetwork implements BasedUtxoNetwork {
+  /// Mainnet configuration with associated `CoinConf`.
+  static const ElectraProtocolNetwork mainnet =
+      ElectraProtocolNetwork._('electraProtocolMainnet', CoinsConf.electraProtocolMainNet);
+
+  /// Testnet configuration with associated `CoinConf`.
+  static const ElectraProtocolNetwork testnet =
+      ElectraProtocolNetwork._('electraProtocolTestnet', CoinsConf.electraProtocolTestNet);
+
+  /// Overrides the `conf` property from `BasedUtxoNetwork` with the associated `CoinConf`.
+  @override
+  final CoinConf conf;
+  @override
+  final String value;
+
+  /// Constructor for creating a Electra Protocol network with a specific configuration.
+  const ElectraProtocolNetwork._(this.value, this.conf);
+
+  /// Retrieves the Wallet Import Format (WIF) version bytes from the associated `CoinConf`.
+  @override
+  List<int> get wifNetVer => conf.params.wifNetVer!;
+
+  /// Retrieves the Pay-to-Public-Key-Hash (P2PKH) version bytes from the associated `CoinConf`.
+  @override
+  List<int> get p2pkhNetVer => conf.params.p2pkhNetVer!;
+
+  /// Retrieves the Pay-to-Script-Hash (P2SH) version bytes from the associated `CoinConf`.
+  @override
+  List<int> get p2shNetVer => conf.params.p2shNetVer!;
+
+  /// Retrieves the Human-Readable Part (HRP) for Pay-to-Witness-Public-Key-Hash (P2WPKH) addresses
+  /// from the associated `CoinConf`.
+  @override
+  String get p2wpkhHrp => conf.params.p2wpkhHrp!;
+
+  /// Checks if the current network is the mainnet.
+  @override
+  bool get isMainnet => this == ElectraProtocolNetwork.mainnet;
+
+  @override
+  final List<BitcoinAddressType> supportedAddress = const [
+    P2pkhAddressType.p2pkh,
+    SegwitAddressType.p2wpkh,
+    PubKeyAddressType.p2pk,
+    SegwitAddressType.p2wsh,
+    P2shAddressType.p2wshInP2sh,
+    P2shAddressType.p2wpkhInP2sh,
+    P2shAddressType.p2pkhInP2sh,
+    P2shAddressType.p2pkInP2sh,
+  ];
+
+  @override
+  List<BipCoins> get coins {
+    if (isMainnet) {
+      return [Bip44Coins.electraProtocol, Bip49Coins.electraProtocol, Bip84Coins.electraProtocol];
+    }
+    return [
+      Bip44Coins.electraProtocolTestnet,
+      Bip49Coins.electraProtocolTestnet,
+      Bip84Coins.electraProtocolTestnet
+    ];
+  }
+}
diff --git a/lib/src/provider/api_provider.dart b/lib/src/provider/api_provider.dart
index c043b56..a1ef855 100644
--- a/lib/src/provider/api_provider.dart
+++ b/lib/src/provider/api_provider.dart
@@ -1,5 +1,4 @@
 export 'models/models.dart';
-export 'transaction_builder/builder.dart';
-export 'service/services.dart';
-export 'api_provider/providers.dart';
+export 'providers/explorer.dart';
 export 'electrum_methods/methods.dart';
+export 'services/explorer.dart';
diff --git a/lib/src/provider/api_provider/electrum_api_provider.dart b/lib/src/provider/api_provider/electrum_api_provider.dart
index 2df2205..e4603b2 100644
--- a/lib/src/provider/api_provider/electrum_api_provider.dart
+++ b/lib/src/provider/api_provider/electrum_api_provider.dart
@@ -1,6 +1,7 @@
-import 'package:bitcoin_base/src/provider/api_provider.dart';
 import 'dart:async';
 
+import 'package:bitcoin_base/bitcoin_base.dart';
+import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
 import 'package:rxdart/rxdart.dart';
 
 typedef ListenerCallback<T> = StreamSubscription<T> Function(
@@ -46,13 +47,13 @@ class ElectrumApiProvider {
 
   Future<List<int>> getFeeRates() async {
     try {
-      final topDoubleString = await request(ElectrumEstimateFee(numberOfBlock: 1));
-      final middleDoubleString = await request(ElectrumEstimateFee(numberOfBlock: 5));
-      final bottomDoubleString = await request(ElectrumEstimateFee(numberOfBlock: 10));
+      final topDoubleString = await request(ElectrumRequestEstimateFee(numberOfBlock: 1));
+      final middleDoubleString = await request(ElectrumRequestEstimateFee(numberOfBlock: 5));
+      final bottomDoubleString = await request(ElectrumRequestEstimateFee(numberOfBlock: 10));
 
-      final top = (topDoubleString.toInt() / 1000).round();
-      final middle = (middleDoubleString.toInt() / 1000).round();
-      final bottom = (bottomDoubleString.toInt() / 1000).round();
+      final top = (topDoubleString!.toInt() / 1000).round();
+      final middle = (middleDoubleString!.toInt() / 1000).round();
+      final bottom = (bottomDoubleString!.toInt() / 1000).round();
 
       return [bottom, middle, top];
     } catch (_) {
@@ -67,7 +68,7 @@ class ElectrumApiProvider {
 
   void ping() async {
     try {
-      return await request(ElectrumPing());
+      return await request(ElectrumRequestPing());
     } catch (_) {}
   }
 }
diff --git a/lib/src/provider/api_provider/providers.dart b/lib/src/provider/api_provider/providers.dart
deleted file mode 100644
index df92a29..0000000
--- a/lib/src/provider/api_provider/providers.dart
+++ /dev/null
@@ -1,2 +0,0 @@
-export 'api_provider.dart';
-export 'electrum_api_provider.dart';
diff --git a/lib/src/provider/constant/constant.dart b/lib/src/provider/constant/constant.dart
index 172fdee..f10a9e0 100644
--- a/lib/src/provider/constant/constant.dart
+++ b/lib/src/provider/constant/constant.dart
@@ -1,18 +1,18 @@
 class BtcApiConst {
   static const String blockCypherBaseURL =
-      "https://api.blockcypher.com/v1/btc/test3";
-  static const String mempoolBaseURL = "https://mempool.space/testnet/api";
+      'https://api.blockcypher.com/v1/btc/test3';
+  static const String mempoolBaseURL = 'https://mempool.space/testnet/api';
   static const String blockstreamBaseURL =
-      "https://blockstream.info/testnet/api";
+      'https://blockstream.info/testnet/api';
   static const String blockCypherMainBaseURL =
-      "https://api.blockcypher.com/v1/btc/main";
-  static const String mempoolMainBaseURL = "https://mempool.space/api";
-  static const String blockstreamMainBaseURL = "https://blockstream.info/api";
+      'https://api.blockcypher.com/v1/btc/main';
+  static const String mempoolMainBaseURL = 'https://mempool.space/api';
+  static const String blockstreamMainBaseURL = 'https://blockstream.info/api';
   //
   static const String blockCypherDashBaseUri =
-      "https://api.blockcypher.com/v1/dash/main";
+      'https://api.blockcypher.com/v1/dash/main';
   static const String blockCypherDogeBaseUri =
-      "https://api.blockcypher.com/v1/doge/main";
+      'https://api.blockcypher.com/v1/doge/main';
   static const String blockCypherLitecoinBaseUri =
-      "https://api.blockcypher.com/v1/ltc/main";
+      'https://api.blockcypher.com/v1/ltc/main';
 }
diff --git a/lib/src/provider/electrum_methods/methods/add_peer.dart b/lib/src/provider/electrum_methods/methods/add_peer.dart
index 2488bb1..106046b 100644
--- a/lib/src/provider/electrum_methods/methods/add_peer.dart
+++ b/lib/src/provider/electrum_methods/methods/add_peer.dart
@@ -1,10 +1,10 @@
-import 'package:bitcoin_base/src/provider/api_provider.dart';
+import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
 
 /// A newly-started server uses this call to get itself into other servers’ peers lists.
 /// It should not be used by wallet clients.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumAddPeer extends ElectrumRequest<bool, bool> {
-  ElectrumAddPeer({required this.features});
+class ElectrumRequestAddPeer extends ElectrumRequest<bool, bool> {
+  ElectrumRequestAddPeer({required this.features});
 
   /// The same information that a call to the sender’s server.features() RPC call would return.
   final Map<String, dynamic> features;
diff --git a/lib/src/provider/electrum_methods/methods/block_headers.dart b/lib/src/provider/electrum_methods/methods/block_headers.dart
index 2f24a6a..73a7adc 100644
--- a/lib/src/provider/electrum_methods/methods/block_headers.dart
+++ b/lib/src/provider/electrum_methods/methods/block_headers.dart
@@ -1,9 +1,12 @@
 import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
 
+
 /// Return a concatenated chunk of block headers from the main chain.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumBlockHeaders extends ElectrumRequest<Map<String, dynamic>, Map<String, dynamic>> {
-  ElectrumBlockHeaders({required this.startHeight, required this.count, required this.cpHeight});
+class ElectrumRequestBlockHeaders
+    extends ElectrumRequest<Map<String, dynamic>, Map<String, dynamic>> {
+  ElectrumRequestBlockHeaders(
+      {required this.startHeight, required this.count, required this.cpHeight});
 
   /// The height of the first header requested, a non-negative integer.
   final int startHeight;
diff --git a/lib/src/provider/electrum_methods/methods/broad_cast.dart b/lib/src/provider/electrum_methods/methods/broad_cast.dart
index 11ae936..29b993f 100644
--- a/lib/src/provider/electrum_methods/methods/broad_cast.dart
+++ b/lib/src/provider/electrum_methods/methods/broad_cast.dart
@@ -1,10 +1,9 @@
-import 'package:bitcoin_base/src/provider/service/electrum/methods.dart';
-import 'package:bitcoin_base/src/provider/service/electrum/params.dart';
+import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
 
 /// Broadcast a transaction to the network.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumBroadCastTransaction extends ElectrumRequest<String?, String?> {
-  ElectrumBroadCastTransaction({required this.transactionRaw});
+class ElectrumRequestBroadCastTransaction extends ElectrumRequest<String?, String?> {
+  ElectrumRequestBroadCastTransaction({required this.transactionRaw});
 
   /// The raw transaction as a hexadecimal string.
   final String transactionRaw;
diff --git a/lib/src/provider/electrum_methods/methods/donate_address.dart b/lib/src/provider/electrum_methods/methods/donate_address.dart
index f66127f..21ba0bd 100644
--- a/lib/src/provider/electrum_methods/methods/donate_address.dart
+++ b/lib/src/provider/electrum_methods/methods/donate_address.dart
@@ -1,8 +1,9 @@
-import 'package:bitcoin_base/src/provider/api_provider.dart';
+import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
+
 
 /// Return a server donation address.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumDonationAddress extends ElectrumRequest<String, String> {
+class ElectrumRequestDonationAddress extends ElectrumRequest<String, String> {
   /// server.donation_address
   @override
   String get method => ElectrumRequestMethods.serverDontionAddress.method;
diff --git a/lib/src/provider/electrum_methods/methods/electrum_version.dart b/lib/src/provider/electrum_methods/methods/electrum_version.dart
index d080b7d..1df15f8 100644
--- a/lib/src/provider/electrum_methods/methods/electrum_version.dart
+++ b/lib/src/provider/electrum_methods/methods/electrum_version.dart
@@ -1,9 +1,12 @@
 import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
 
+
 /// Identify the client to the server and negotiate the protocol version. Only the first server.version() message is accepted.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumVersion extends ElectrumRequest<List<String>, List<dynamic>> {
-  ElectrumVersion({required this.clientName, required this.protocolVersion});
+class ElectrumRequestVersion
+    extends ElectrumRequest<List<String>, List<dynamic>> {
+  ElectrumRequestVersion(
+      {required this.clientName, required this.protocolVersion});
 
   /// A string identifying the connecting client software.
   final String clientName;
diff --git a/lib/src/provider/electrum_methods/methods/estimate_fee.dart b/lib/src/provider/electrum_methods/methods/estimate_fee.dart
index 5e59971..30eed89 100644
--- a/lib/src/provider/electrum_methods/methods/estimate_fee.dart
+++ b/lib/src/provider/electrum_methods/methods/estimate_fee.dart
@@ -3,8 +3,8 @@ import 'package:bitcoin_base/src/utils/btc_utils.dart';
 
 /// Return the estimated transaction fee per kilobyte for a transaction to be confirmed within a certain number of blocks.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumEstimateFee extends ElectrumRequest<BigInt, dynamic> {
-  ElectrumEstimateFee({this.numberOfBlock = 2});
+class ElectrumRequestEstimateFee extends ElectrumRequest<BigInt?, dynamic> {
+  ElectrumRequestEstimateFee({this.numberOfBlock = 2});
 
   /// The number of blocks to target for confirmation.
   final int numberOfBlock;
@@ -20,7 +20,9 @@ class ElectrumEstimateFee extends ElectrumRequest<BigInt, dynamic> {
 
   /// The estimated transaction fee in Bigint(satoshi)
   @override
-  BigInt onResponse(result) {
-    return BtcUtils.toSatoshi(result.toString()).abs();
+  BigInt? onResponse(result) {
+    final fee = BtcUtils.toSatoshi(result.toString());
+    if (fee.isNegative) return null;
+    return fee;
   }
 }
diff --git a/lib/src/provider/electrum_methods/methods/get_balance.dart b/lib/src/provider/electrum_methods/methods/get_balance.dart
index a8a0ef9..cc12b03 100644
--- a/lib/src/provider/electrum_methods/methods/get_balance.dart
+++ b/lib/src/provider/electrum_methods/methods/get_balance.dart
@@ -1,11 +1,11 @@
-import 'package:bitcoin_base/src/provider/service/electrum/methods.dart';
-import 'package:bitcoin_base/src/provider/service/electrum/params.dart';
+import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
+
 
 /// Return the confirmed and unconfirmed balances of a script hash.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumGetScriptHashBalance
+class ElectrumRequestGetScriptHashBalance
     extends ElectrumRequest<Map<String, dynamic>, Map<String, dynamic>> {
-  ElectrumGetScriptHashBalance({required this.scriptHash});
+  ElectrumRequestGetScriptHashBalance({required this.scriptHash});
 
   /// The script hash as a hexadecimal string (BitcoinBaseAddress.pubKeyHash())
   final String scriptHash;
diff --git a/lib/src/provider/electrum_methods/methods/get_fee_histogram.dart b/lib/src/provider/electrum_methods/methods/get_fee_histogram.dart
index 512da7a..7baf063 100644
--- a/lib/src/provider/electrum_methods/methods/get_fee_histogram.dart
+++ b/lib/src/provider/electrum_methods/methods/get_fee_histogram.dart
@@ -1,9 +1,9 @@
-import 'package:bitcoin_base/src/provider/service/electrum/methods.dart';
-import 'package:bitcoin_base/src/provider/service/electrum/params.dart';
+import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
+
 
 /// Return a histogram of the fee rates paid by transactions in the memory pool, weighted by transaction size.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumGetFeeHistogram extends ElectrumRequest<List<List<int>>, List<dynamic>> {
+class ElectrumRequestGetFeeHistogram extends ElectrumRequest<List<List<double>>, List<dynamic>> {
   /// mempool.get_fee_histogram
   @override
   String get method => ElectrumRequestMethods.getFeeHistogram.method;
@@ -18,7 +18,7 @@ class ElectrumGetFeeHistogram extends ElectrumRequest<List<List<int>>, List<dyna
   /// fee uses sat/vbyte as unit, and must be a non-negative integer or float.
   /// vsize uses vbyte as unit, and must be a non-negative integer.
   @override
-  List<List<int>> onResponse(result) {
-    return result.map((e) => List<int>.from(e)).toList();
+  List<List<double>> onResponse(result) {
+    return result.map((e) => (e as List).map((e) => (e as num).toDouble()).toList()).toList();
   }
 }
diff --git a/lib/src/provider/electrum_methods/methods/get_history.dart b/lib/src/provider/electrum_methods/methods/get_history.dart
index ccf3ccd..4d99d77 100644
--- a/lib/src/provider/electrum_methods/methods/get_history.dart
+++ b/lib/src/provider/electrum_methods/methods/get_history.dart
@@ -1,11 +1,11 @@
-import 'package:bitcoin_base/src/provider/service/electrum/methods.dart';
-import 'package:bitcoin_base/src/provider/service/electrum/params.dart';
+import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
+
 
 /// Return the confirmed and unconfirmed history of a script hash.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumScriptHashGetHistory
+class ElectrumRequestScriptHashGetHistory
     extends ElectrumRequest<List<Map<String, dynamic>>, List<dynamic>> {
-  ElectrumScriptHashGetHistory({required this.scriptHash});
+  ElectrumRequestScriptHashGetHistory({required this.scriptHash});
 
   /// The script hash as a hexadecimal string (BitcoinBaseAddress.pubKeyHash())
   final String scriptHash;
diff --git a/lib/src/provider/electrum_methods/methods/get_mempool.dart b/lib/src/provider/electrum_methods/methods/get_mempool.dart
index 3fc91a7..a68e2a4 100644
--- a/lib/src/provider/electrum_methods/methods/get_mempool.dart
+++ b/lib/src/provider/electrum_methods/methods/get_mempool.dart
@@ -1,11 +1,11 @@
-import 'package:bitcoin_base/src/provider/service/electrum/methods.dart';
-import 'package:bitcoin_base/src/provider/service/electrum/params.dart';
+import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
+
 
 /// Return the unconfirmed transactions of a script hash.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumScriptHashGetMempool
+class ElectrumRequestScriptHashGetMempool
     extends ElectrumRequest<List<Map<String, dynamic>>, List<dynamic>> {
-  ElectrumScriptHashGetMempool({required this.scriptHash});
+  ElectrumRequestScriptHashGetMempool({required this.scriptHash});
 
   /// The script hash as a hexadecimal string (BitcoinBaseAddress.pubKeyHash())
   final String scriptHash;
diff --git a/lib/src/provider/electrum_methods/methods/get_merkle.dart b/lib/src/provider/electrum_methods/methods/get_merkle.dart
index a4d196c..409cc54 100644
--- a/lib/src/provider/electrum_methods/methods/get_merkle.dart
+++ b/lib/src/provider/electrum_methods/methods/get_merkle.dart
@@ -1,10 +1,10 @@
-import 'package:bitcoin_base/src/provider/service/electrum/methods.dart';
-import 'package:bitcoin_base/src/provider/service/electrum/params.dart';
+import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
+
 
 /// Return the merkle branch to a confirmed transaction given its hash and height.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumGetMerkle extends ElectrumRequest<Map<String, dynamic>, Map<String, dynamic>> {
-  ElectrumGetMerkle({required this.transactionHash, required this.height});
+class ElectrumRequestGetMerkle extends ElectrumRequest<Map<String, dynamic>, Map<String, dynamic>> {
+  ElectrumRequestGetMerkle({required this.transactionHash, required this.height});
 
   /// The transaction hash as a hexadecimal string.
   final String transactionHash;
diff --git a/lib/src/provider/electrum_methods/methods/get_transaction.dart b/lib/src/provider/electrum_methods/methods/get_transaction.dart
index 2fbb74a..e8393f1 100644
--- a/lib/src/provider/electrum_methods/methods/get_transaction.dart
+++ b/lib/src/provider/electrum_methods/methods/get_transaction.dart
@@ -1,10 +1,9 @@
-import 'package:bitcoin_base/src/provider/service/electrum/methods.dart';
-import 'package:bitcoin_base/src/provider/service/electrum/params.dart';
+import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
 
 /// Return a raw transaction.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumGetTransactionHex extends ElectrumRequest<String, String> {
-  ElectrumGetTransactionHex({required this.transactionHash});
+class ElectrumRequestGetTransaction extends ElectrumRequest<dynamic, dynamic> {
+  ElectrumRequestGetTransaction({required this.transactionHash});
 
   /// The transaction hash as a hexadecimal string.
   final String transactionHash;
diff --git a/lib/src/provider/electrum_methods/methods/get_unspet.dart b/lib/src/provider/electrum_methods/methods/get_unspet.dart
index c9e3dd1..8a75094 100644
--- a/lib/src/provider/electrum_methods/methods/get_unspet.dart
+++ b/lib/src/provider/electrum_methods/methods/get_unspet.dart
@@ -1,11 +1,12 @@
 import 'package:bitcoin_base/src/provider/models/electrum/electrum_utxo.dart';
-import 'package:bitcoin_base/src/provider/service/electrum/methods.dart';
-import 'package:bitcoin_base/src/provider/service/electrum/params.dart';
+import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
+
 
 /// Return an ordered list of UTXOs sent to a script hash.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumScriptHashListUnspent extends ElectrumRequest<List<ElectrumUtxo>, List<dynamic>> {
-  ElectrumScriptHashListUnspent({required this.scriptHash, this.includeTokens = false});
+class ElectrumRequestScriptHashListUnspent
+    extends ElectrumRequest<List<ElectrumUtxo>, List<dynamic>> {
+  ElectrumRequestScriptHashListUnspent({required this.scriptHash, this.includeTokens = false});
 
   /// The script hash as a hexadecimal string (BitcoinBaseAddress.pubKeyHash())
   final String scriptHash;
@@ -19,7 +20,7 @@ class ElectrumScriptHashListUnspent extends ElectrumRequest<List<ElectrumUtxo>,
 
   @override
   List toJson() {
-    return [scriptHash, if (includeTokens) "include_tokens"];
+    return [scriptHash, if (includeTokens) 'include_tokens'];
   }
 
   /// A list of unspent outputs in blockchain order.
@@ -28,7 +29,7 @@ class ElectrumScriptHashListUnspent extends ElectrumRequest<List<ElectrumUtxo>,
   /// Any output that is spent in the mempool does not appear.
   @override
   List<ElectrumUtxo> onResponse(result) {
-    final List<ElectrumUtxo> utxos = result.map((e) => ElectrumUtxo.fromJson(e)).toList();
+    final utxos = result.map((e) => ElectrumUtxo.fromJson(e)).toList();
     return utxos;
   }
 }
diff --git a/lib/src/provider/electrum_methods/methods/get_value_proof.dart b/lib/src/provider/electrum_methods/methods/get_value_proof.dart
index 8bfe134..edf7faf 100644
--- a/lib/src/provider/electrum_methods/methods/get_value_proof.dart
+++ b/lib/src/provider/electrum_methods/methods/get_value_proof.dart
@@ -1,10 +1,12 @@
 import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
 
+
 /// Returns a name resolution proof, suitable for low-latency (single round-trip) resolution.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumGetValueProof
+class ElectrumRequestGetValueProof
     extends ElectrumRequest<Map<String, dynamic>, dynamic> {
-  ElectrumGetValueProof({required this.scriptHash, required this.cpHeight});
+  ElectrumRequestGetValueProof(
+      {required this.scriptHash, required this.cpHeight});
 
   /// Script hash of the name being resolved.
   final String scriptHash;
diff --git a/lib/src/provider/electrum_methods/methods/header.dart b/lib/src/provider/electrum_methods/methods/header.dart
index f961340..28a832f 100644
--- a/lib/src/provider/electrum_methods/methods/header.dart
+++ b/lib/src/provider/electrum_methods/methods/header.dart
@@ -1,9 +1,11 @@
 import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
 
+
 /// Return the block header at the given height.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumBlockHeader extends ElectrumRequest<dynamic, dynamic> {
-  ElectrumBlockHeader({required this.startHeight, required this.cpHeight});
+class ElectrumRequestBlockHeader extends ElectrumRequest<dynamic, dynamic> {
+  ElectrumRequestBlockHeader(
+      {required this.startHeight, required this.cpHeight});
   final int startHeight;
   final int cpHeight;
 
diff --git a/lib/src/provider/electrum_methods/methods/headers_subscribe.dart b/lib/src/provider/electrum_methods/methods/headers_subscribe.dart
index 2d681b5..1b4351e 100644
--- a/lib/src/provider/electrum_methods/methods/headers_subscribe.dart
+++ b/lib/src/provider/electrum_methods/methods/headers_subscribe.dart
@@ -17,7 +17,7 @@ class ElectrumHeaderResponse {
 
 /// Subscribe to receive block headers when a new block is found.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumHeaderSubscribe
+class ElectrumRequestHeaderSubscribe
     extends ElectrumRequest<ElectrumHeaderResponse, Map<String, dynamic>> {
   /// blockchain.headers.subscribe
   @override
diff --git a/lib/src/provider/electrum_methods/methods/id_from_pos.dart b/lib/src/provider/electrum_methods/methods/id_from_pos.dart
index cf7b2e8..79589ce 100644
--- a/lib/src/provider/electrum_methods/methods/id_from_pos.dart
+++ b/lib/src/provider/electrum_methods/methods/id_from_pos.dart
@@ -1,10 +1,10 @@
-import 'package:bitcoin_base/src/provider/service/electrum/methods.dart';
-import 'package:bitcoin_base/src/provider/service/electrum/params.dart';
+import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
+
 
 /// Return a transaction hash and optionally a merkle proof, given a block height and a position in the block.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumIdFromPos extends ElectrumRequest<dynamic, dynamic> {
-  ElectrumIdFromPos(
+class ElectrumRequestIdFromPos extends ElectrumRequest<dynamic, dynamic> {
+  ElectrumRequestIdFromPos(
       {required this.height, required this.txPos, this.merkle = false});
 
   /// The main chain block height, a non-negative integer.
diff --git a/lib/src/provider/electrum_methods/methods/masternode_announce_broadcast.dart b/lib/src/provider/electrum_methods/methods/masternode_announce_broadcast.dart
index 64be82a..bda9b6c 100644
--- a/lib/src/provider/electrum_methods/methods/masternode_announce_broadcast.dart
+++ b/lib/src/provider/electrum_methods/methods/masternode_announce_broadcast.dart
@@ -1,11 +1,13 @@
 import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
 
+
 /// Pass through the masternode announce message to be broadcast by the daemon.
 /// Whenever a masternode comes online or a client is syncing,
 /// they will send this message which describes the masternode entry and how to validate messages from it.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumMasternodeAnnounceBroadcast extends ElectrumRequest<bool, bool> {
-  ElectrumMasternodeAnnounceBroadcast({required this.signmnb});
+class ElectrumRequestMasternodeAnnounceBroadcast
+    extends ElectrumRequest<bool, bool> {
+  ElectrumRequestMasternodeAnnounceBroadcast({required this.signmnb});
   final String signmnb;
 
   /// masternode.announce.broadcast
diff --git a/lib/src/provider/electrum_methods/methods/masternode_list.dart b/lib/src/provider/electrum_methods/methods/masternode_list.dart
index 316767d..70e25e0 100644
--- a/lib/src/provider/electrum_methods/methods/masternode_list.dart
+++ b/lib/src/provider/electrum_methods/methods/masternode_list.dart
@@ -1,9 +1,10 @@
 import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
 
+
 /// Returns the list of masternodes.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumMasternodeList extends ElectrumRequest<List<String>, List<dynamic>> {
-  ElectrumMasternodeList({required this.payees});
+class ElectrumRequestMasternodeList extends ElectrumRequest<List<String>, List<dynamic>> {
+  ElectrumRequestMasternodeList({required this.payees});
 
   /// An array of masternode payee addresses.
   final List<String> payees;
diff --git a/lib/src/provider/electrum_methods/methods/masternode_subscribe.dart b/lib/src/provider/electrum_methods/methods/masternode_subscribe.dart
index e9b1445..27d5d52 100644
--- a/lib/src/provider/electrum_methods/methods/masternode_subscribe.dart
+++ b/lib/src/provider/electrum_methods/methods/masternode_subscribe.dart
@@ -1,9 +1,11 @@
 import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
 
+
 /// Returns the status of masternode.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumMasternodeSubscribe extends ElectrumRequest<String, String> {
-  ElectrumMasternodeSubscribe({required this.collateral});
+class ElectrumRequestMasternodeSubscribe
+    extends ElectrumRequest<String, String> {
+  ElectrumRequestMasternodeSubscribe({required this.collateral});
 
   /// The txId and the index of the collateral. Example ("8c59133e714797650cf69043d05e409bbf45670eed7c4e4a386e52c46f1b5e24-0")
   final String collateral;
diff --git a/lib/src/provider/electrum_methods/methods/ping.dart b/lib/src/provider/electrum_methods/methods/ping.dart
index d29fdb8..6283845 100644
--- a/lib/src/provider/electrum_methods/methods/ping.dart
+++ b/lib/src/provider/electrum_methods/methods/ping.dart
@@ -1,8 +1,9 @@
 import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
 
+
 /// Ping the server to ensure it is responding, and to keep the session alive. The server may disconnect clients that have sent no requests for roughly 10 minutes.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumPing extends ElectrumRequest<dynamic, dynamic> {
+class ElectrumRequestPing extends ElectrumRequest<dynamic, dynamic> {
   @override
   String get method => ElectrumRequestMethods.ping.method;
 
diff --git a/lib/src/provider/electrum_methods/methods/protx_diff.dart b/lib/src/provider/electrum_methods/methods/protx_diff.dart
index 7004fae..08f91c1 100644
--- a/lib/src/provider/electrum_methods/methods/protx_diff.dart
+++ b/lib/src/provider/electrum_methods/methods/protx_diff.dart
@@ -1,9 +1,11 @@
 import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
 
+
 /// Returns a diff between two deterministic masternode lists. The result also contains proof data..
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumProtXDiff extends ElectrumRequest<Map<String, dynamic>, dynamic> {
-  ElectrumProtXDiff({required this.baseHeight, required this.height});
+class ElectrumRequestProtXDiff
+    extends ElectrumRequest<Map<String, dynamic>, dynamic> {
+  ElectrumRequestProtXDiff({required this.baseHeight, required this.height});
 
   /// The starting block height
   final int baseHeight;
diff --git a/lib/src/provider/electrum_methods/methods/protx_info.dart b/lib/src/provider/electrum_methods/methods/protx_info.dart
index 1f78505..79f7b81 100644
--- a/lib/src/provider/electrum_methods/methods/protx_info.dart
+++ b/lib/src/provider/electrum_methods/methods/protx_info.dart
@@ -1,9 +1,11 @@
 import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
 
+
 /// Returns detailed information about a deterministic masternode.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumProtXInfo extends ElectrumRequest<Map<String, dynamic>, dynamic> {
-  ElectrumProtXInfo({required this.protxHash});
+class ElectrumRequestProtXInfo
+    extends ElectrumRequest<Map<String, dynamic>, dynamic> {
+  ElectrumRequestProtXInfo({required this.protxHash});
 
   /// The hash of the initial ProRegTx
   final String protxHash;
diff --git a/lib/src/provider/electrum_methods/methods/relay_fee.dart b/lib/src/provider/electrum_methods/methods/relay_fee.dart
index aea1478..73123bf 100644
--- a/lib/src/provider/electrum_methods/methods/relay_fee.dart
+++ b/lib/src/provider/electrum_methods/methods/relay_fee.dart
@@ -1,9 +1,10 @@
 import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
+
 import 'package:bitcoin_base/src/utils/btc_utils.dart';
 
 /// Return the minimum fee a low-priority transaction must pay in order to be accepted to the daemon’s memory pool.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumRelayFee extends ElectrumRequest<BigInt, dynamic> {
+class ElectrumRequestRelayFee extends ElectrumRequest<BigInt, dynamic> {
   /// blockchain.relayfee
   @override
   String get method => ElectrumRequestMethods.relayFee.method;
diff --git a/lib/src/provider/electrum_methods/methods/scripthash_unsubscribe.dart b/lib/src/provider/electrum_methods/methods/scripthash_unsubscribe.dart
index 90cfcb8..54b50da 100644
--- a/lib/src/provider/electrum_methods/methods/scripthash_unsubscribe.dart
+++ b/lib/src/provider/electrum_methods/methods/scripthash_unsubscribe.dart
@@ -1,9 +1,10 @@
-import 'package:bitcoin_base/src/provider/api_provider.dart';
+import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
+
 
 /// Unsubscribe from a script hash, preventing future notifications if its status changes.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumScriptHashUnSubscribe extends ElectrumRequest<bool, bool> {
-  ElectrumScriptHashUnSubscribe({required this.scriptHash});
+class ElectrumRequestScriptHashUnSubscribe extends ElectrumRequest<bool, bool> {
+  ElectrumRequestScriptHashUnSubscribe({required this.scriptHash});
 
   /// The script hash as a hexadecimal string (BitcoinBaseAddress.pubKeyHash())
   final String scriptHash;
diff --git a/lib/src/provider/electrum_methods/methods/server_banner.dart b/lib/src/provider/electrum_methods/methods/server_banner.dart
index 4a2c0ac..8bc5b73 100644
--- a/lib/src/provider/electrum_methods/methods/server_banner.dart
+++ b/lib/src/provider/electrum_methods/methods/server_banner.dart
@@ -1,8 +1,9 @@
 import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
 
+
 /// Return a banner to be shown in the Electrum console.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumServerBanner extends ElectrumRequest<String, dynamic> {
+class ElectrumRequestServerBanner extends ElectrumRequest<String, dynamic> {
   @override
   String get method => ElectrumRequestMethods.serverBanner.method;
 
diff --git a/lib/src/provider/electrum_methods/methods/server_features.dart b/lib/src/provider/electrum_methods/methods/server_features.dart
index 725d6ef..94d3c9c 100644
--- a/lib/src/provider/electrum_methods/methods/server_features.dart
+++ b/lib/src/provider/electrum_methods/methods/server_features.dart
@@ -1,8 +1,9 @@
 import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
 
+
 /// Return a list of features and services supported by the server.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumServerFeatures extends ElectrumRequest<dynamic, dynamic> {
+class ElectrumRequestServerFeatures extends ElectrumRequest<dynamic, dynamic> {
   /// server.features
   @override
   String get method => ElectrumRequestMethods.serverFeatures.method;
diff --git a/lib/src/provider/electrum_methods/methods/server_peer_subscribe.dart b/lib/src/provider/electrum_methods/methods/server_peer_subscribe.dart
index 04e8709..a924cd4 100644
--- a/lib/src/provider/electrum_methods/methods/server_peer_subscribe.dart
+++ b/lib/src/provider/electrum_methods/methods/server_peer_subscribe.dart
@@ -1,8 +1,9 @@
-import 'package:bitcoin_base/src/provider/api_provider.dart';
+import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
+
 
 /// Return a list of peer servers. Despite the name this is not a subscription and the server must send no notifications..
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumServerPeersSubscribe extends ElectrumRequest<List<dynamic>, List<dynamic>> {
+class ElectrumRequestServerPeersSubscribe extends ElectrumRequest<List<dynamic>, List<dynamic>> {
   /// server.peers.subscribe
   @override
   String get method => ElectrumRequestMethods.serverPeersSubscribe.method;
diff --git a/lib/src/provider/electrum_methods/methods/status.dart b/lib/src/provider/electrum_methods/methods/status.dart
index 2967676..aca06cb 100644
--- a/lib/src/provider/electrum_methods/methods/status.dart
+++ b/lib/src/provider/electrum_methods/methods/status.dart
@@ -1,9 +1,9 @@
-import 'package:bitcoin_base/src/provider/api_provider.dart';
+import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
 
 /// Subscribe to a script hash.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumScriptHashSubscribe extends ElectrumRequest<String, dynamic> {
-  ElectrumScriptHashSubscribe({required this.scriptHash});
+class ElectrumRequestScriptHashSubscribe extends ElectrumRequest<Map<String, dynamic>, dynamic> {
+  ElectrumRequestScriptHashSubscribe({required this.scriptHash});
 
   /// /// The script hash as a hexadecimal string (BitcoinBaseAddress.pubKeyHash())
   final String scriptHash;
@@ -19,7 +19,7 @@ class ElectrumScriptHashSubscribe extends ElectrumRequest<String, dynamic> {
 
   /// The status of the script hash.
   @override
-  String onResponse(result) {
+  Map<String, dynamic> onResponse(result) {
     return result;
   }
 }
diff --git a/lib/src/provider/models/block_cypher/block_cypher_models.dart b/lib/src/provider/models/block_cypher/block_cypher_models.dart
index 5d4761b..759c8f3 100644
--- a/lib/src/provider/models/block_cypher/block_cypher_models.dart
+++ b/lib/src/provider/models/block_cypher/block_cypher_models.dart
@@ -99,7 +99,7 @@ class BlockCypherUtxo {
   }
 
   List<UtxoWithAddress> toUtxoWithOwner(UtxoAddressDetails owner) {
-    List<UtxoWithAddress> utxos = txRefs.map((ref) {
+    final utxos = txRefs.map((ref) {
       return UtxoWithAddress(
         utxo: ref.toUtxo(owner.address.type),
         ownerDetails: owner,
diff --git a/lib/src/provider/models/config.dart b/lib/src/provider/models/config.dart
index 3421194..057b2dd 100644
--- a/lib/src/provider/models/config.dart
+++ b/lib/src/provider/models/config.dart
@@ -5,19 +5,6 @@ import 'package:bitcoin_base/src/provider/constant/constant.dart';
 enum APIType { mempool, blockCypher }
 
 class APIConfig {
-  APIConfig({
-    required this.url,
-    required this.feeRate,
-    required this.transaction,
-    required this.transactions,
-    required this.sendTransaction,
-    required this.apiType,
-    required this.network,
-    required this.blockHeight,
-    this.block,
-    this.blockTimestamp,
-  });
-
   final String url;
   final String feeRate;
   final String transaction;
@@ -39,8 +26,8 @@ class APIConfig {
   }
 
   String getUtxoUrl(String address) {
-    String baseUrl = url;
-    return baseUrl.replaceAll("###", address);
+    final baseUrl = url;
+    return baseUrl.replaceAll('###', address);
   }
 
   String getFeeApiUrl() {
@@ -48,13 +35,13 @@ class APIConfig {
   }
 
   String getTransactionUrl(String transactionId) {
-    String baseUrl = transaction;
-    return baseUrl.replaceAll("###", transactionId);
+    final baseUrl = transaction;
+    return baseUrl.replaceAll('###', transactionId);
   }
 
   String getBlockUrl(String blockHash) {
     if (block == null) {
-      throw const BitcoinBasePluginException("block url is not available");
+      throw const DartBitcoinPluginException("block url is not available");
     }
 
     String baseUrl = block!;
@@ -63,7 +50,7 @@ class APIConfig {
 
   String getBlockTimestampUrl(int timestamp) {
     if (blockTimestamp == null) {
-      throw const BitcoinBasePluginException("block timestamp url is not available");
+      throw const DartBitcoinPluginException("block timestamp url is not available");
     }
 
     String baseUrl = blockTimestamp!;
@@ -71,13 +58,13 @@ class APIConfig {
   }
 
   String getTransactionsUrl(String address) {
-    String baseUrl = transactions;
-    return baseUrl.replaceAll("###", address);
+    final baseUrl = transactions;
+    return baseUrl.replaceAll('###', address);
   }
 
   String getBlockHeight(int blockHaight) {
-    String baseUrl = blockHeight;
-    return baseUrl.replaceAll("###", "$blockHaight");
+    final baseUrl = blockHeight;
+    return baseUrl.replaceAll('###', '$blockHaight');
   }
 
   factory APIConfig.fromBlockCypher(BasedUtxoNetwork network) {
@@ -99,8 +86,8 @@ class APIConfig {
         baseUrl = BtcApiConst.blockCypherLitecoinBaseUri;
         break;
       default:
-        throw BitcoinBasePluginException(
-            "blockcypher does not support ${network.conf.coinName.name}, u must use your own provider");
+        throw DartBitcoinPluginException(
+            'blockcypher does not support ${network.conf.coinName.name}, u must use your own provider');
     }
 
     return APIConfig(
@@ -125,7 +112,7 @@ class APIConfig {
           baseUrl = BtcApiConst.mempoolBaseURL;
           break;
         default:
-          throw BitcoinBasePluginException(
+          throw DartBitcoinPluginException(
               "mempool does not support ${network.conf.coinName.name}");
       }
     }
@@ -143,4 +130,17 @@ class APIConfig {
       blockTimestamp: "$baseUrl/mining/blocks/timestamp/###",
     );
   }
+
+  APIConfig({
+    required this.url,
+    required this.feeRate,
+    required this.transaction,
+    required this.transactions,
+    required this.sendTransaction,
+    required this.apiType,
+    required this.network,
+    required this.blockHeight,
+    this.block,
+    this.blockTimestamp,
+  });
 }
diff --git a/lib/src/provider/models/electrum/electrum_utxo.dart b/lib/src/provider/models/electrum/electrum_utxo.dart
index 9ec03d7..2607381 100644
--- a/lib/src/provider/models/electrum/electrum_utxo.dart
+++ b/lib/src/provider/models/electrum/electrum_utxo.dart
@@ -5,14 +5,14 @@ import 'package:bitcoin_base/src/provider/api_provider.dart';
 class ElectrumUtxo implements UTXO {
   factory ElectrumUtxo.fromJson(Map<String, dynamic> json) {
     CashToken? token;
-    if (json.containsKey("token_data")) {
-      token = CashToken.fromJson(json["token_data"]);
+    if (json.containsKey('token_data')) {
+      token = CashToken.fromJson(json['token_data']);
     }
     return ElectrumUtxo._(
-        height: json["height"],
-        txId: json["tx_hash"],
-        vout: json["tx_pos"],
-        value: BigInt.parse((json["value"].toString())),
+        height: json['height'],
+        txId: json['tx_hash'],
+        vout: json['tx_pos'],
+        value: BigInt.parse((json['value'].toString())),
         token: token);
   }
   const ElectrumUtxo._(
diff --git a/lib/src/provider/models/fee_rate/fee_rate.dart b/lib/src/provider/models/fee_rate/fee_rate.dart
index 910a825..3a18446 100644
--- a/lib/src/provider/models/fee_rate/fee_rate.dart
+++ b/lib/src/provider/models/fee_rate/fee_rate.dart
@@ -115,8 +115,8 @@ BigInt _parseMempoolFees(dynamic data) {
   } else if (data is int) {
     return BigInt.from((data * kb));
   } else {
-    throw BitcoinBasePluginException(
-        "cannot parse mempool fees excepted double, string got ${data.runtimeType}");
+    throw DartBitcoinPluginException(
+        'cannot parse mempool fees excepted double, string got ${data.runtimeType}');
   }
 }
 
diff --git a/lib/src/provider/models/mempool/mempol_models.dart b/lib/src/provider/models/mempool/mempol_models.dart
index b1ea5b5..46cd8c8 100644
--- a/lib/src/provider/models/mempool/mempol_models.dart
+++ b/lib/src/provider/models/mempool/mempol_models.dart
@@ -186,7 +186,7 @@ class MempolUtxo implements UTXO {
 
 extension MempoolUtxoExtentions on List<MempolUtxo> {
   List<UtxoWithAddress> toUtxoWithOwnerList(UtxoAddressDetails owner) {
-    List<UtxoWithAddress> utxos = map((e) => UtxoWithAddress(
+    final utxos = map((e) => UtxoWithAddress(
           utxo: BitcoinUtxo(
             txHash: e.txid,
             value: e.value,
diff --git a/lib/src/provider/models/multisig_script.dart b/lib/src/provider/models/multisig_script.dart
index 0fb091a..de956b4 100644
--- a/lib/src/provider/models/multisig_script.dart
+++ b/lib/src/provider/models/multisig_script.dart
@@ -6,7 +6,7 @@ import 'package:blockchain_utils/blockchain_utils.dart';
 /// signers in a multi-signature scheme. A multi-signature signer typically includes
 /// information about their public key and weight within the scheme.
 class MultiSignatureSigner {
-  MultiSignatureSigner._(this.publicKey, this.weight);
+  MultiSignatureSigner._(this.publicKey, this.weight, this.keyType);
 
   /// PublicKey returns the public key associated with the signer.
   final String publicKey;
@@ -15,12 +15,15 @@ class MultiSignatureSigner {
   /// The weight is used to determine the number of signatures required for a valid transaction.
   final int weight;
 
+  final PublicKeyType keyType;
+
   /// creates a new instance of a multi-signature signer with the
   /// specified public key and weight.
   factory MultiSignatureSigner(
       {required String publicKey, required int weight}) {
     ECPublic.fromHex(publicKey);
-    return MultiSignatureSigner._(publicKey, weight);
+    return MultiSignatureSigner._(
+        publicKey, weight, BtcUtils.isCompressedPubKey(publicKey));
   }
 }
 
@@ -34,6 +37,7 @@ class MultiSignatureAddress {
     P2shAddressType.p2pkhInP2shwt,
     P2shAddressType.p2pkhInP2sh32wt
   ];
+  final bool canSelectSegwit;
 
   /// Signers is a collection of signers participating in the multi-signature scheme.
   final List<MultiSignatureSigner> signers;
@@ -51,8 +55,12 @@ class MultiSignatureAddress {
 
   BitcoinBaseAddress toP2wshAddress({required BasedUtxoNetwork network}) {
     if (network is! LitecoinNetwork && network is! BitcoinNetwork) {
-      throw BitcoinBasePluginException(
-          "${network.conf.coinName.name} Bitcoin forks that do not support Segwit. use toP2shAddress");
+      throw DartBitcoinPluginException(
+          '${network.conf.coinName.name} Bitcoin forks that do not support Segwit. use toP2shAddress');
+    }
+    if (!canSelectSegwit) {
+      throw const DartBitcoinPluginException(
+          "One of the signer's accounts used an uncompressed public key.");
     }
     return P2wshAddress.fromScriptPubkey(script: multiSigScript);
   }
@@ -66,7 +74,7 @@ class MultiSignatureAddress {
   BitcoinBaseAddress toP2shAddress(
       [P2shAddressType addressType = P2shAddressType.p2pkhInP2sh]) {
     if (!legacySupportP2shTypes.contains(addressType)) {
-      throw BitcoinBasePluginException(
+      throw DartBitcoinPluginException(
           "invalid p2sh type please use one of them ${legacySupportP2shTypes.map((e) => "$e").join(", ")}");
     }
 
@@ -79,12 +87,11 @@ class MultiSignatureAddress {
     return P2shAddress.fromScriptPubkey(script: multiSigScript, type: addressType);
   }
 
-  BitcoinBaseAddress fromType({
-    required BasedUtxoNetwork network,
-    required BitcoinAddressType addressType,
-  }) {
+  BitcoinBaseAddress fromType(
+      {required BasedUtxoNetwork network,
+      required BitcoinAddressType addressType}) {
     switch (addressType) {
-      case SegwitAddresType.p2wsh:
+      case SegwitAddressType.p2wsh:
         return toP2wshAddress(network: network);
       case P2shAddressType.p2wshInP2sh:
         return toP2wshInP2shAddress(network: network);
@@ -94,37 +101,35 @@ class MultiSignatureAddress {
       case P2shAddressType.p2pkhInP2sh32wt:
         return toP2shAddress(addressType as P2shAddressType);
       default:
-        throw const BitcoinBasePluginException(
-            "invalid multisig address type. use of of them [BitcoinAddressType.p2wsh, BitcoinAddressType.p2wshInP2sh, BitcoinAddressType.p2pkhInP2sh]");
+        throw const DartBitcoinPluginException(
+            'invalid multisig address type. use of of them [BitcoinAddressType.p2wsh, BitcoinAddressType.p2wshInP2sh, BitcoinAddressType.p2pkhInP2sh]');
     }
   }
 
   MultiSignatureAddress._(
       {required this.signers,
       required this.threshold,
-      // required this.address,
-      required this.multiSigScript});
+      required this.multiSigScript,
+      required this.canSelectSegwit});
 
   /// CreateMultiSignatureAddress creates a new instance of a MultiSignatureAddress, representing
   /// a multi-signature Bitcoin address configuration. It allows you to specify the minimum number
   /// of required signatures (threshold), provide the collection of signers participating in the
   /// multi-signature scheme, and specify the address type.
-  factory MultiSignatureAddress({
-    required int threshold,
-    required List<MultiSignatureSigner> signers,
-  }) {
+  factory MultiSignatureAddress(
+      {required int threshold, required List<MultiSignatureSigner> signers}) {
     final sumWeight =
         signers.fold<int>(0, (sum, signer) => sum + signer.weight);
     if (threshold > 16 || threshold < 1) {
-      throw const BitcoinBasePluginException(
+      throw const DartBitcoinPluginException(
           'The threshold should be between 1 and 16');
     }
     if (sumWeight > 16) {
-      throw const BitcoinBasePluginException(
+      throw const DartBitcoinPluginException(
           'The total weight of the owners should not exceed 16');
     }
     if (sumWeight < threshold) {
-      throw const BitcoinBasePluginException(
+      throw const DartBitcoinPluginException(
           'The total weight of the signatories should reach the threshold');
     }
     final multiSigScript = <String>['OP_$threshold'];
@@ -136,6 +141,9 @@ class MultiSignatureAddress {
     multiSigScript.addAll(['OP_$sumWeight', 'OP_CHECKMULTISIG']);
     final script = Script(script: multiSigScript);
     return MultiSignatureAddress._(
-        signers: signers, threshold: threshold, multiSigScript: script);
+        signers: signers,
+        threshold: threshold,
+        multiSigScript: script,
+        canSelectSegwit: signers.every((e) => e.keyType.isCompressed));
   }
 }
diff --git a/lib/src/provider/models/utxo_details.dart b/lib/src/provider/models/utxo_details.dart
index f6299e3..501bf6a 100644
--- a/lib/src/provider/models/utxo_details.dart
+++ b/lib/src/provider/models/utxo_details.dart
@@ -7,7 +7,7 @@ abstract class UTXO {
 
 class UtxoAddressDetails {
   /// PublicKey is the public key associated with the UTXO owner.
-  final String? _publicKey;
+  final String? publicKey;
 
   /// Address is the Bitcoin address associated with the UTXO owner.
   final BitcoinBaseAddress address;
@@ -16,19 +16,22 @@ class UtxoAddressDetails {
   /// associated with the UTXO owner. It may be null if the UTXO owner is not using a multi-signature scheme.
   final MultiSignatureAddress? _multiSigAddress;
 
-  UtxoAddressDetails({
-    required String publicKey,
+  UtxoAddressDetails._({
+    required String this.publicKey,
     required this.address,
-  })  : _multiSigAddress = null,
-        _publicKey = publicKey;
+  }) : _multiSigAddress = null;
+  factory UtxoAddressDetails({required String publicKey, required BitcoinBaseAddress address}) {
+    ECPublic.fromHex(publicKey);
+    return UtxoAddressDetails._(publicKey: publicKey, address: address);
+  }
 
   UtxoAddressDetails.multiSigAddress(
       {required MultiSignatureAddress multiSigAddress, required this.address})
-      : _publicKey = null,
+      : publicKey = null,
         _multiSigAddress = multiSigAddress;
 
   UtxoAddressDetails.watchOnly(this.address)
-      : _publicKey = null,
+      : publicKey = null,
         _multiSigAddress = null;
 }
 
@@ -41,30 +44,37 @@ class UtxoWithAddress {
   /// OwnerDetails is a UtxoAddressDetails instance containing information about the UTXO owner.
   final UtxoAddressDetails ownerDetails;
 
-  UtxoWithAddress({
-    required this.utxo,
-    required this.ownerDetails,
-  });
+  const UtxoWithAddress._({required this.utxo, required this.ownerDetails, required this.keyType});
+  factory UtxoWithAddress({required BitcoinUtxo utxo, required UtxoAddressDetails ownerDetails}) {
+    return UtxoWithAddress._(
+        utxo: utxo,
+        ownerDetails: ownerDetails,
+        keyType: ownerDetails.publicKey != null && !utxo.isSegwit
+            ? BtcUtils.isCompressedPubKey(ownerDetails.publicKey!)
+            : PublicKeyType.compressed);
+  }
 
   ECPublic public() {
     if (isMultiSig()) {
-      throw const BitcoinBasePluginException("Cannot access public key in multi-signature address");
+      throw const DartBitcoinPluginException('Cannot access public key in multi-signature address');
     }
-    if (ownerDetails._publicKey == null) {
-      throw const BitcoinBasePluginException(
-          "Cannot access public key in watch only address; use UtxoAddressDetails constractor instead `UtxoAddressDetails.watchOnly`");
+    if (ownerDetails.publicKey == null) {
+      throw const DartBitcoinPluginException(
+          'Cannot access public key in watch only address; use UtxoAddressDetails constractor instead `UtxoAddressDetails.watchOnly`');
     }
-    return ECPublic.fromHex(ownerDetails._publicKey!);
+    return ECPublic.fromHex(ownerDetails.publicKey!);
   }
 
+  final PublicKeyType keyType;
+
   bool isMultiSig() {
     return ownerDetails._multiSigAddress != null;
   }
 
   MultiSignatureAddress get multiSigAddress => isMultiSig()
       ? ownerDetails._multiSigAddress!
-      : throw const BitcoinBasePluginException(
-          "The address is not associated with a multi-signature setup");
+      : throw const DartBitcoinPluginException(
+          'The address is not associated with a multi-signature setup');
 }
 
 /// Abstract base class representing a generic Bitcoin output.
@@ -122,10 +132,7 @@ class BitcoinScriptOutput implements BitcoinBaseOutput {
 
   /// The value (amount) of the Bitcoin output.
   final BigInt value;
-  const BitcoinScriptOutput({
-    required this.script,
-    required this.value,
-  });
+  const BitcoinScriptOutput({required this.script, required this.value});
 
   /// Convert the custom script output to a standard TxOutput.
   @override
@@ -142,12 +149,8 @@ class BitcoinTokenOutput implements BitcoinSpendableBaseOutput {
   final BigInt value;
   final CashToken token;
   final String? utxoHash;
-  BitcoinTokenOutput({
-    required this.address,
-    required this.value,
-    required this.token,
-    this.utxoHash,
-  });
+  BitcoinTokenOutput(
+      {required this.address, required this.value, required this.token, this.utxoHash});
 
   /// Convert the custom script output to a standard TxOutput.
   @override
@@ -170,11 +173,7 @@ class BitcoinBurnableOutput extends BitcoinBaseOutput {
   /// The value (amount) of the burnable output (optional only for token with hasAmount flags).
   final BigInt? value;
 
-  BitcoinBurnableOutput({
-    required this.categoryID,
-    this.utxoHash,
-    this.value,
-  });
+  BitcoinBurnableOutput({required this.categoryID, this.utxoHash, this.value});
 
   @override
   TxOutput get toOutput => throw UnimplementedError();
@@ -202,32 +201,49 @@ class BitcoinUtxo {
   /// BlockHeight represents the block height at which this UTXO was confirmed.
   final int? blockHeight;
 
-  BitcoinUtxo({
+  BitcoinUtxo._({
     required this.txHash,
     required this.value,
     required this.vout,
     required this.scriptType,
     this.blockHeight,
     this.token,
+    required this.isP2tr,
+    required this.isP2shSegwit,
+    required this.isSegwit,
     this.isSilentPayment,
   });
+  factory BitcoinUtxo(
+      {required String txHash,
+      required BigInt value,
+      required int vout,
+      required BitcoinAddressType scriptType,
+      int? blockHeight,
+      CashToken? token}) {
+    final isP2shSegwit =
+        scriptType == P2shAddressType.p2wpkhInP2sh || scriptType == P2shAddressType.p2wshInP2sh;
+    return BitcoinUtxo._(
+        txHash: txHash,
+        value: value,
+        blockHeight: blockHeight,
+        token: token,
+        vout: vout,
+        scriptType: scriptType,
+        isP2tr: scriptType == SegwitAddressType.p2tr,
+        isP2shSegwit: isP2shSegwit,
+        isSegwit: isP2shSegwit || scriptType.isSegwit);
+  }
 
   /// check if utxos is p2tr
-  bool isP2tr() {
-    return scriptType == SegwitAddresType.p2tr;
-  }
+  final bool isP2tr;
 
   bool? isSilentPayment;
 
   /// check if utxos is segwit
-  bool isSegwit() {
-    return scriptType.isSegwit || isP2shSegwit();
-  }
+  final bool isSegwit;
 
-  /// checl if utxos is p2sh neasted segwit
-  bool isP2shSegwit() {
-    return scriptType == P2shAddressType.p2wpkhInP2sh || scriptType == P2shAddressType.p2wshInP2sh;
-  }
+  /// check if utxos is p2sh neasted segwit
+  final bool isP2shSegwit;
 
   /// convert utxos to transaction input with specify sequence like ReplaceByeFee (4Bytes)
   TxInput toInput([List<int>? sequence]) {
@@ -236,7 +252,7 @@ class BitcoinUtxo {
 
   @override
   String toString() {
-    return "txid: $txHash vout: $vout script: ${scriptType.value} value: $value blockHeight: $blockHeight";
+    return 'txid: $txHash vout: $vout script: ${scriptType.value} value: $value blockHeight: $blockHeight';
   }
 }
 
@@ -244,8 +260,8 @@ class BitcoinUtxo {
 extension Calculate on List<UtxoWithAddress> {
   /// sum of utxos network values
   BigInt sumOfUtxosValue() {
-    BigInt sum = BigInt.zero;
-    for (var utxo in this) {
+    var sum = BigInt.zero;
+    for (final utxo in this) {
       sum += utxo.utxo.value;
     }
     return sum;
@@ -253,8 +269,8 @@ extension Calculate on List<UtxoWithAddress> {
 
   /// sum of utxos cash token (FToken) amounts
   Map<String, BigInt> sumOfTokenUtxos() {
-    final Map<String, BigInt> tokens = {};
-    for (var utxo in this) {
+    final tokens = <String, BigInt>{};
+    for (final utxo in this) {
       if (utxo.utxo.token == null) continue;
       final token = utxo.utxo.token!;
       if (!token.hasAmount) continue;
diff --git a/lib/src/provider/api_provider/api_provider.dart b/lib/src/provider/providers/explorer.dart
similarity index 81%
rename from lib/src/provider/api_provider/api_provider.dart
rename to lib/src/provider/providers/explorer.dart
index a31580b..6aabeb7 100644
--- a/lib/src/provider/api_provider/api_provider.dart
+++ b/lib/src/provider/providers/explorer.dart
@@ -1,19 +1,20 @@
 import 'dart:convert';
 import 'package:bitcoin_base/src/provider/models/models.dart';
-import 'package:bitcoin_base/src/provider/service/http/http_service.dart';
+import 'package:bitcoin_base/src/provider/services/explorer.dart';
 import 'package:bitcoin_base/src/models/network.dart';
 import 'package:blockchain_utils/utils/string/string.dart';
 
 class ApiProvider {
   ApiProvider({required this.api, Map<String, String>? header, required this.service})
-      : _header = header ?? {"Content-Type": "application/json"};
+      : _header = header ?? {'Content-Type': 'application/json'};
   factory ApiProvider.fromMempool(
-    BasedUtxoNetwork network, {
+    BasedUtxoNetwork network,
+    ApiService service, {
     Map<String, String>? header,
     String? baseUrl,
   }) {
     final api = APIConfig.mempool(network, baseUrl);
-    return ApiProvider(api: api, header: header, service: BitcoinApiService());
+    return ApiProvider(api: api, header: header, service: service);
   }
   factory ApiProvider.fromBlocCypher(BasedUtxoNetwork network, ApiService service,
       {Map<String, String>? header}) {
@@ -30,20 +31,20 @@ class ApiProvider {
     return response;
   }
 
-  Future<T> _postReqiest<T>(String url, Object? data) async {
+  Future<T> _postRequest<T>(String url, Object? data) async {
     final response = await service.post<T>(url, body: data, headers: _header);
     return response;
   }
 
   Future<Map<String, dynamic>> testmempool(List<dynamic> params) async {
-    final Map<String, dynamic> data = {
-      "jsonrpc": "2.0",
-      "method": "testmempoolaccept",
-      "id": DateTime.now().millisecondsSinceEpoch.toString(),
-      "params": params
+    final data = <String, dynamic>{
+      'jsonrpc': '2.0',
+      'method': 'testmempoolaccept',
+      'id': DateTime.now().millisecondsSinceEpoch.toString(),
+      'params': params
     };
-    final response = await _postReqiest<Map<String, dynamic>>(
-        "https://btc.getblock.io/786c97b8-f53f-427b-80f7-9af7bd5bdb84/testnet/", json.encode(data));
+    final response = await _postRequest<Map<String, dynamic>>(
+        'https://btc.getblock.io/786c97b8-f53f-427b-80f7-9af7bd5bdb84/testnet/', json.encode(data));
     return response;
   }
 
@@ -68,14 +69,14 @@ class ApiProvider {
 
     switch (api.apiType) {
       case APIType.mempool:
-        final response = await _postReqiest<String>(url, txDigest);
+        final response = await _postRequest<String>(url, txDigest);
         return response;
       default:
-        final Map<String, dynamic> digestData = {"tx": txDigest};
-        final response = await _postReqiest<Map<String, dynamic>>(url, json.encode(digestData));
+        final digestData = <String, dynamic>{'tx': txDigest};
+        final response = await _postRequest<Map<String, dynamic>>(url, json.encode(digestData));
         BlockCypherTransaction? tr;
-        if (response["tx"] != null) {
-          tr = BlockCypherTransaction.fromJson(response["tx"]);
+        if (response['tx'] != null) {
+          tr = BlockCypherTransaction.fromJson(response['tx']);
         }
 
         tr ??= BlockCypherTransaction.fromJson(response);
@@ -119,8 +120,8 @@ class ApiProvider {
         return transactions;
       default:
         if (response is Map) {
-          if (response.containsKey("txs")) {
-            final transactions = (response["txs"] as List)
+          if (response.containsKey('txs')) {
+            final transactions = (response['txs'] as List)
                 .map((e) => BlockCypherTransaction.fromJson(e) as T)
                 .toList();
             return transactions;
@@ -159,7 +160,7 @@ class ApiProvider {
         return response;
       default:
         final toJson = StringUtils.toJson<Map<String, dynamic>>(response);
-        return toJson["hash"];
+        return toJson['hash'];
     }
   }
 
diff --git a/lib/src/provider/service/electrum/electrum_ssl_service.dart b/lib/src/provider/service/electrum/electrum_ssl_service.dart
index 0d89497..4222bd8 100644
--- a/lib/src/provider/service/electrum/electrum_ssl_service.dart
+++ b/lib/src/provider/service/electrum/electrum_ssl_service.dart
@@ -1,7 +1,7 @@
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
-import 'package:bitcoin_base/bitcoin_base.dart';
+import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
 import 'package:blockchain_utils/exception/exceptions.dart';
 
 class ElectrumSSLService implements BitcoinBaseElectrumRPCService {
diff --git a/lib/src/provider/service/electrum/electrum_tcp_service.dart b/lib/src/provider/service/electrum/electrum_tcp_service.dart
index bddecb1..c7ed19e 100644
--- a/lib/src/provider/service/electrum/electrum_tcp_service.dart
+++ b/lib/src/provider/service/electrum/electrum_tcp_service.dart
@@ -1,7 +1,9 @@
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
-import 'package:bitcoin_base/bitcoin_base.dart';
+import 'package:bitcoin_base/src/provider/service/electrum/params.dart';
+import 'package:bitcoin_base/src/provider/service/electrum/request_completer.dart';
+import 'package:bitcoin_base/src/provider/service/electrum/service.dart';
 import 'package:blockchain_utils/exception/exceptions.dart';
 
 class ElectrumTCPService implements BitcoinBaseElectrumRPCService {
diff --git a/lib/src/provider/service/services.dart b/lib/src/provider/service/services.dart
index 69edf79..46c73c1 100644
--- a/lib/src/provider/service/services.dart
+++ b/lib/src/provider/service/services.dart
@@ -1,2 +1 @@
-export 'http/http_service.dart';
 export 'electrum/electrum.dart';
diff --git a/lib/src/provider/service/http/http_service.dart b/lib/src/provider/services/explorer.dart
similarity index 96%
rename from lib/src/provider/service/http/http_service.dart
rename to lib/src/provider/services/explorer.dart
index c0ddd78..7367169 100644
--- a/lib/src/provider/service/http/http_service.dart
+++ b/lib/src/provider/services/explorer.dart
@@ -18,7 +18,7 @@ abstract class ApiService {
   /// - [headers]: A map of headers to be included in the request.
   /// - [body]: The request body, typically in JSON format.
   Future<T> post<T>(String url,
-      {Map<String, String> headers = const {"Content-Type": "application/json"}, Object? body});
+      {Map<String, String> headers = const {'Content-Type': 'application/json'}, Object? body});
 }
 
 class ApiProviderException implements Exception {
diff --git a/lib/src/provider/transaction_builder/builder.dart b/lib/src/transaction_builder/builder.dart
similarity index 100%
rename from lib/src/provider/transaction_builder/builder.dart
rename to lib/src/transaction_builder/builder.dart
diff --git a/lib/src/provider/transaction_builder/core.dart b/lib/src/transaction_builder/core.dart
similarity index 100%
rename from lib/src/provider/transaction_builder/core.dart
rename to lib/src/transaction_builder/core.dart
diff --git a/lib/src/provider/transaction_builder/forked_transaction_builder.dart b/lib/src/transaction_builder/forked_transaction_builder.dart
similarity index 69%
rename from lib/src/provider/transaction_builder/forked_transaction_builder.dart
rename to lib/src/transaction_builder/forked_transaction_builder.dart
index 7436315..362ab29 100644
--- a/lib/src/provider/transaction_builder/forked_transaction_builder.dart
+++ b/lib/src/transaction_builder/forked_transaction_builder.dart
@@ -46,9 +46,12 @@ class ForkedTransactionBuilder implements BasedBitcoinTransacationBuilder {
 
   void _validateBuilder() {
     if (network is! BitcoinCashNetwork && network is! BitcoinSVNetwork) {
-      throw const BitcoinBasePluginException(
-          "invalid network. use ForkedTransactionBuilder for BitcoinCashNetwork and BSVNetwork otherwise use BitcoinTransactionBuilder");
+      throw const DartBitcoinPluginException(
+          'invalid network. use ForkedTransactionBuilder for BitcoinCashNetwork and BSVNetwork otherwise use BitcoinTransactionBuilder');
     }
+
+    /// validate every address is related to network
+    /// exception if failed.
     for (final i in utxosInfo) {
       i.ownerDetails.address.toAddress(network);
     }
@@ -99,9 +102,9 @@ class ForkedTransactionBuilder implements BasedBitcoinTransacationBuilder {
         /// and doesn't generate errors when determining the transaction size.
         isFakeTransaction: true);
 
-    /// 71 bytes (64 byte signature, 6-7 byte Der encoding length)
-    const String fakeECDSASignatureBytes =
-        "0101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101";
+    /// 72 bytes (64 byte signature, 6-7 byte Der encoding length + sighash)
+    const fakeECDSASignatureBytes =
+        '010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101';
 
     final transaction =
         transactionBuilder.buildTransaction((trDigest, utxo, multiSigPublicKey, int sighash) {
@@ -171,8 +174,8 @@ class ForkedTransactionBuilder implements BasedBitcoinTransacationBuilder {
         case P2shAddressType.p2pkhInP2sh32wt:
           return script;
         default:
-          throw BitcoinBasePluginException(
-              "unsuported multi-sig type ${utxo.utxo.scriptType} for ${network.conf.coinName.name}");
+          throw DartBitcoinPluginException(
+              'unsuported multi-sig type ${utxo.utxo.scriptType} for ${network.conf.coinName.name}');
       }
     }
 
@@ -183,17 +186,17 @@ class ForkedTransactionBuilder implements BasedBitcoinTransacationBuilder {
       case P2shAddressType.p2pkInP2shwt:
       case P2shAddressType.p2pkInP2sh32:
       case P2shAddressType.p2pkInP2sh32wt:
-        return senderPub.toRedeemScript();
+        return senderPub.toRedeemScript(mode: utxo.keyType);
       case P2pkhAddressType.p2pkh:
       case P2shAddressType.p2pkhInP2sh:
       case P2shAddressType.p2pkhInP2sh32:
       case P2pkhAddressType.p2pkhwt:
       case P2shAddressType.p2pkhInP2shwt:
       case P2shAddressType.p2pkhInP2sh32wt:
-        return senderPub.toP2pkhAddress().toScriptPubKey();
+        return senderPub.toP2pkAddress(mode: utxo.keyType).toScriptPubKey();
       default:
-        throw BitcoinBasePluginException(
-            "${utxo.utxo.scriptType} does not sudpport on ${network.conf.coinName.name}");
+        throw DartBitcoinPluginException(
+            '${utxo.utxo.scriptType} does not sudpport on ${network.conf.coinName.name}');
     }
   }
 
@@ -211,19 +214,19 @@ class ForkedTransactionBuilder implements BasedBitcoinTransacationBuilder {
   /// - tapRootPubKeys: A List of of Script representing taproot public keys for P2TR inputs (ignored for non-P2TR inputs).
 //
   /// Returns:
-  /// - List<int>: representing the transaction digest to be used for signing the input.
+  /// - `List<int>`: representing the transaction digest to be used for signing the input.
   List<int> _generateTransactionDigest(
-    Script scriptPubKeys,
-    int input,
-    UtxoWithAddress utox,
-    BtcTransaction transaction,
-  ) {
+      {required Script scriptPubKeys,
+      required int input,
+      required UtxoWithAddress utox,
+      required BtcTransaction transaction,
+      int sighash = BitcoinOpCodeConst.SIGHASH_ALL | BitcoinOpCodeConst.SIGHASH_FORKED}) {
     return transaction.getTransactionSegwitDigit(
         txInIndex: input,
         script: scriptPubKeys,
         amount: utox.utxo.value,
         token: utox.utxo.token,
-        sighash: BitcoinOpCodeConst.SIGHASH_ALL | BitcoinOpCodeConst.SIGHASH_FORKED);
+        sighash: sighash);
   }
 
   /// buildP2wshOrP2shScriptSig constructs and returns a script signature (represented as a List of strings)
@@ -235,7 +238,7 @@ class ForkedTransactionBuilder implements BasedBitcoinTransacationBuilder {
   /// - utx: A UtxoWithAddress instance representing the unspent transaction output (UTXO) and its owner details.
   //
   /// Returns:
-  /// - List<String>: A List of strings representing the script signature for the P2WSH or P2SH input.
+  /// - `List<String>`: A List of strings representing the script signature for the P2WSH or P2SH input.
   List<String> _buildMiltisigUnlockingScript(List<String> signedDigest, UtxoWithAddress utx) {
     /// The constructed script signature consists of the signed digest elements followed by
     /// the script details of the multi-signature address.
@@ -255,27 +258,27 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
         return [signedDigest];
       case P2pkhAddressType.p2pkh:
       case P2pkhAddressType.p2pkhwt:
-        return [signedDigest, senderPub.toHex()];
+        return [signedDigest, senderPub.toHex(mode: utx.keyType)];
       case P2shAddressType.p2pkhInP2sh:
       case P2shAddressType.p2pkhInP2shwt:
       case P2shAddressType.p2pkhInP2sh32:
       case P2shAddressType.p2pkhInP2sh32wt:
-        final script = senderPub.toP2pkhAddress().toScriptPubKey();
-        return [signedDigest, senderPub.toHex(), script.toHex()];
+        final script = senderPub.toAddress(mode: utx.keyType).toScriptPubKey();
+        return [signedDigest, senderPub.toHex(mode: utx.keyType), script.toHex()];
       case P2shAddressType.p2pkInP2sh:
       case P2shAddressType.p2pkInP2shwt:
       case P2shAddressType.p2pkInP2sh32:
       case P2shAddressType.p2pkInP2sh32wt:
-        final script = senderPub.toRedeemScript();
+        final script = senderPub.toRedeemScript(mode: utx.keyType);
         return [signedDigest, script.toHex()];
       default:
-        throw BitcoinBasePluginException(
+        throw DartBitcoinPluginException(
             'Cannot send from this type of address ${utx.utxo.scriptType}');
     }
   }
 
   Tuple<List<TxInput>, List<UtxoWithAddress>> _buildInputs() {
-    List<UtxoWithAddress> sortedUtxos = List.from(utxosInfo);
+    var sortedUtxos = List<UtxoWithAddress>.from(utxosInfo);
 
     if (inputOrdering == BitcoinOrdering.shuffle) {
       sortedUtxos = sortedUtxos..shuffle();
@@ -291,7 +294,7 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
           },
         );
     }
-    List<TxInput> inputs = sortedUtxos.map((e) => e.utxo.toInput()).toList();
+    final inputs = sortedUtxos.map((e) => e.utxo.toInput()).toList();
     if (enableRBF && inputs.isNotEmpty) {
       inputs[0] = inputs[0].copyWith(sequence: BitcoinOpCodeConst.REPLACE_BY_FEE_SEQUENCE);
     }
@@ -300,7 +303,7 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
   }
 
   List<TxOutput> _buildOutputs() {
-    List<TxOutput> builtOutputs = outputs
+    var builtOutputs = outputs
         .where((element) => element is! BitcoinBurnableOutput)
         .map((e) => e.toOutput)
         .toList();
@@ -334,12 +337,12 @@ be retrieved by anyone who examines the blockchain's history.
 */
   Script _opReturn(String message) {
     final toHex = BytesUtils.toHexString(StringUtils.toBytes(message));
-    return Script(script: ["OP_RETURN", toHex]);
+    return Script(script: ['OP_RETURN', toHex]);
   }
 
   /// Total amount to spend excluding fees
   BigInt _sumOutputAmounts(List<TxOutput> outputs) {
-    BigInt sum = BigInt.zero;
+    var sum = BigInt.zero;
     for (final e in outputs) {
       sum += e.amount;
     }
@@ -348,8 +351,8 @@ be retrieved by anyone who examines the blockchain's history.
 
   /// Total token amount to spend.
   Map<String, BigInt> _sumTokenOutputAmounts(List<TxOutput> outputs) {
-    final Map<String, BigInt> tokens = {};
-    for (var utxo in outputs) {
+    final tokens = <String, BigInt>{};
+    for (final utxo in outputs) {
       if (utxo.cashToken == null) continue;
       final token = utxo.cashToken!;
       if (!token.hasAmount) continue;
@@ -368,47 +371,47 @@ be retrieved by anyone who examines the blockchain's history.
       required BigInt sumAmountsWithFee,
       required BigInt sumUtxoAmount,
       required BigInt sumOutputAmounts}) {
-    if (!isFakeTransaction && sumAmountsWithFee != sumUtxoAmount) {
-      throw BitcoinBasePluginException('Sum value of utxo not spending',
-          details: {"inputAmount": sumUtxoAmount, "fee": fee, "outputAmount": sumOutputAmounts});
+    if (isFakeTransaction) return;
+    if (sumAmountsWithFee != sumUtxoAmount) {
+      throw DartBitcoinPluginException('Sum value of utxo not spending',
+          details: {'inputAmount': sumUtxoAmount, 'fee': fee, 'outputAmount': sumOutputAmounts});
     }
-    if (!isFakeTransaction) {
-      /// sum of token amounts
-      final sumOfTokenUtxos = utxos.sumOfTokenUtxos();
-
-      /// sum of token output amounts
-      final sumTokenOutputAmouts = _sumTokenOutputAmounts(outputs);
-      for (final i in sumOfTokenUtxos.entries) {
-        if (sumTokenOutputAmouts[i.key] != i.value) {
-          BigInt amount = sumTokenOutputAmouts[i.key] ?? BigInt.zero;
-          amount += outputs
-              .whereType<BitcoinBurnableOutput>()
-              .where((element) => element.categoryID == i.key)
-              .fold(BigInt.zero,
-                  (previousValue, element) => previousValue + (element.value ?? BigInt.zero));
-
-          if (amount != i.value) {
-            throw BitcoinBasePluginException(
-                'Sum token value of UTXOs not spending. use BitcoinBurnableOutput if you want to burn tokens.',
-                details: {"token": i.key, "inputValue": i.value, "outputValue": amount});
-          }
+
+    /// sum of token amounts
+    final sumOfTokenUtxos = utxos.sumOfTokenUtxos();
+
+    /// sum of token output amounts
+    final sumTokenOutputAmouts = _sumTokenOutputAmounts(outputs);
+    for (final i in sumOfTokenUtxos.entries) {
+      if (sumTokenOutputAmouts[i.key] != i.value) {
+        var amount = sumTokenOutputAmouts[i.key] ?? BigInt.zero;
+        amount += this
+            .outputs
+            .whereType<BitcoinBurnableOutput>()
+            .where((element) => element.categoryID == i.key)
+            .fold(BigInt.zero,
+                (previousValue, element) => previousValue + (element.value ?? BigInt.zero));
+
+        if (amount != i.value) {
+          throw DartBitcoinPluginException(
+              'Sum token value of UTXOs not spending. use BitcoinBurnableOutput if you want to burn tokens.',
+              details: {'token': i.key, 'inputValue': i.value, 'outputValue': amount});
         }
       }
-      for (final i in utxos) {
-        if (i.utxo.token != null) {
-          final token = i.utxo.token!;
-          if (token.hasAmount) continue;
-          if (!token.hasNFT) continue;
-          final hasOneoutput = outputs.whereType<BitcoinTokenOutput>().any((element) =>
-              element.utxoHash == i.utxo.txHash && element.token.category == token.category);
-          if (hasOneoutput) continue;
-          final hasBurnableOutput = outputs.whereType<BitcoinBurnableOutput>().any((element) =>
-              element.utxoHash == i.utxo.txHash && element.categoryID == token.category);
-          if (hasBurnableOutput) continue;
-          throw BitcoinBasePluginException(
-              'Some NFTs in the inputs lack the corresponding spending in the outputs. If you intend to burn tokens, consider utilizing the BitcoinBurnableOutput.',
-              details: {"category id": token.category});
-        }
+    }
+    for (final i in utxos) {
+      final token = i.utxo.token;
+      if (token != null && token.hasNFT) {
+        if (token.hasAmount) continue;
+        final hasOneoutput = this.outputs.whereType<BitcoinTokenOutput>().any((element) =>
+            element.utxoHash == i.utxo.txHash && element.token.category == token.category);
+        if (hasOneoutput) continue;
+        final hasBurnableOutput = this.outputs.whereType<BitcoinBurnableOutput>().any(
+            (element) => element.utxoHash == i.utxo.txHash && element.categoryID == token.category);
+        if (hasBurnableOutput) continue;
+        throw DartBitcoinPluginException(
+            'Some NFTs in the inputs lack the corresponding spending in the outputs. If you intend to burn tokens, consider utilizing the BitcoinBurnableOutput.',
+            details: {'category id': token.category});
       }
     }
   }
@@ -416,23 +419,23 @@ be retrieved by anyone who examines the blockchain's history.
   @override
   Map<String, int> getSignatureCount() {
     final sortedInputs = _buildInputs();
-    final List<TxInput> inputs = sortedInputs.item1;
-    final List<UtxoWithAddress> utxos = sortedInputs.item2;
-    final Map<String, int> count = {};
+    final inputs = sortedInputs.item1;
+    final utxos = sortedInputs.item2;
+    final count = <String, int>{};
 
-    for (int i = 0; i < inputs.length; i++) {
+    for (var i = 0; i < inputs.length; i++) {
       final indexUtxo = utxos[i];
 
       if (indexUtxo.isMultiSig()) {
         final multiSigAddress = indexUtxo.multiSigAddress;
-        int sumMultiSigWeight = 0;
+        var sumMultiSigWeight = 0;
         final mutlsiSigSignatures = <String>[];
-        for (int ownerIndex = 0; ownerIndex < multiSigAddress.signers.length; ownerIndex++) {
-          for (int weight = 0; weight < multiSigAddress.signers[ownerIndex].weight; weight++) {
+        for (var ownerIndex = 0; ownerIndex < multiSigAddress.signers.length; ownerIndex++) {
+          for (var weight = 0; weight < multiSigAddress.signers[ownerIndex].weight; weight++) {
             if (mutlsiSigSignatures.length >= multiSigAddress.threshold) {
               break;
             }
-            mutlsiSigSignatures.add("");
+            mutlsiSigSignatures.add('');
             count[multiSigAddress.signers[ownerIndex].publicKey] =
                 (count[multiSigAddress.signers[ownerIndex].publicKey] ?? 0) + 1;
           }
@@ -441,8 +444,8 @@ be retrieved by anyone who examines the blockchain's history.
             break;
           }
         }
-        if (sumMultiSigWeight != multiSigAddress.threshold) {
-          throw const BitcoinBasePluginException("some multisig signature does not exist");
+        if (sumMultiSigWeight < multiSigAddress.threshold) {
+          throw const DartBitcoinPluginException('some multisig signature does not exist');
         }
         continue;
       }
@@ -457,9 +460,9 @@ be retrieved by anyone who examines the blockchain's history.
     /// build inputs
     final sortedInputs = _buildInputs();
 
-    final List<TxInput> inputs = sortedInputs.item1;
+    final inputs = sortedInputs.item1;
 
-    final List<UtxoWithAddress> utxos = sortedInputs.item2;
+    final utxos = sortedInputs.item2;
 
     /// build outout
     final outputs = _buildOutputs();
@@ -481,31 +484,38 @@ be retrieved by anyone who examines the blockchain's history.
         sumOutputAmounts: sumOutputAmounts);
 
     /// create new transaction with inputs and outputs and isSegwit transaction or not
+    // BtcTransaction transaction = BtcTransaction.fromRaw(
+    //     "0200000001b8249c5a6cf8f24815377222e4c2bab32154151c367111134ef7ce11c651e4c600000000fd5b0300483045022100b4e774511598efbdf256aaa127f2104c5f25e29311936a75034857901c72fa180220232410ec31b9809b0293a7a2c8c0ade53ca4bdde064ac1baaa27d545678891b84147304402203014d1beaa73fc289d0201bff61a40d1e853103d624fb8520cc6b4afea00d3c10220643eed02e2830b7f751b7355a889e4ab4c02d01df0ca71621d4f5affe5cb3a5d41483045022100bf73bd48dcef332924c7578ff7a5b9d3817ecdb2ad2a4148f56069705365427c022044ce67ca87c3e1309ba43fcb3c23a3618ba0dbd44a802c22efab78b42b9a8e3e41483045022100a3d90b8f959850f9e2655b38e61a8e5323a363803bd62ab0560509e9cd675dae022064ba98f689c21f66e0839660bf15c7a0c44e0e65384d82996a4f3b73a55daef141473044022033128a7572b0bc7d22c6cd2080a882b7e03b15167b1d88b6405fa0131ab6254602207d960421e8a1a2e85431b6398a9af742fb492c967c3acac9fd38d82d7c54756e41483045022100c00232655b098d529deea53dcfffa5b25dc4a2015a52b1b587ae73c813a8d4a502201d100762ddb4779d1c484790a1b38cf369f634ee33541d8ec0ec45c2470141ba4147304402201503e2e7bab40cd5a083c0e03506ad1c260d17b821a142be2591e05fa5bdc86d02201d0280a2fc78a2af4bf7f1245bd8bf3384ada22098ba84645958ff1715655630414730440220090757399dc9f989ff1a7d998af385cd9490fe07c2c216b54967d4138067312a02204c3bb010902d72e90a1133cc8ae34cb629e139863f62ab259f25e5cac2125779414d13015821030f0fb9a244ad31a369ee02b7abfbbb0bfa3812b9a39ed93346d03d67d412d17721022f1b310f4c065331bc0d79ba4661bb9822d67d7c4a1b0a1892e1fd0cd23aa68d210299c2aa85d2b21a62f396907a802a58e521dafd5bddaccbd72786eea189bc4dc921021a7a569e91dbf60581509c7fc946d1003b60c7dee85299538db6353538d595742103a92c9b7cac68758de5783ed8e5123598e4ad137091e42987d3bad8a08e35bf3d21034f355bdcb7cc0af728ef3cceb9615d90684bb5b2ca5f859ab0f0b704075871aa21036360e856310ce5d294e8be33fc807077dc56ac80d95d9cd4ddbd21325eff73f721031d16453b3ab3132acb0a5bc16cc49690d819a585267a15cd5a064e2a0ad4059958ae0000000001f0780f000000000017a914e5d65da9624e4754827edb627fe31d4c75954a388700000000");
+    // transaction = transaction.copyWith(inputs: inputs);
     final transaction = BtcTransaction(inputs: inputs, outputs: outputs, hasSegwit: false);
-
-    const int sighash = BitcoinOpCodeConst.SIGHASH_ALL | BitcoinOpCodeConst.SIGHASH_FORKED;
+    const sighash = BitcoinOpCodeConst.SIGHASH_ALL | BitcoinOpCodeConst.SIGHASH_FORKED;
 
     /// Well, now let's do what we want for each input
-    for (int i = 0; i < inputs.length; i++) {
+    for (var i = 0; i < inputs.length; i++) {
       final indexUtxo = utxos[i];
 
       /// We receive the owner's ScriptPubKey
       final script = _buildInputScriptPubKeys(indexUtxo);
 
       /// We generate transaction digest for current input
-      final digest = _generateTransactionDigest(script, i, indexUtxo, transaction);
+      final digest = _generateTransactionDigest(
+          scriptPubKeys: script,
+          input: i,
+          utox: indexUtxo,
+          transaction: transaction,
+          sighash: sighash);
 
       /// handle multisig address
       if (indexUtxo.isMultiSig()) {
         final multiSigAddress = indexUtxo.multiSigAddress;
-        int sumMultiSigWeight = 0;
+        var sumMultiSigWeight = 0;
         final mutlsiSigSignatures = <String>[];
-        for (int ownerIndex = 0; ownerIndex < multiSigAddress.signers.length; ownerIndex++) {
+        for (var ownerIndex = 0; ownerIndex < multiSigAddress.signers.length; ownerIndex++) {
           /// now we need sign the transaction digest
           final sig =
               sign(digest, indexUtxo, multiSigAddress.signers[ownerIndex].publicKey, sighash);
           if (sig.isEmpty) continue;
-          for (int weight = 0; weight < multiSigAddress.signers[ownerIndex].weight; weight++) {
+          for (var weight = 0; weight < multiSigAddress.signers[ownerIndex].weight; weight++) {
             if (mutlsiSigSignatures.length >= multiSigAddress.threshold) {
               break;
             }
@@ -516,8 +526,8 @@ be retrieved by anyone who examines the blockchain's history.
             break;
           }
         }
-        if (sumMultiSigWeight != multiSigAddress.threshold) {
-          throw const BitcoinBasePluginException("some multisig signature does not exist");
+        if (sumMultiSigWeight < multiSigAddress.threshold) {
+          throw const DartBitcoinPluginException('some multisig signature does not exist');
         }
 
         _addScripts(input: inputs[i], signatures: mutlsiSigSignatures, utxo: indexUtxo);
@@ -525,10 +535,11 @@ be retrieved by anyone who examines the blockchain's history.
       }
 
       /// now we need sign the transaction digest
-      final sig = sign(digest, indexUtxo, indexUtxo.public().toHex(), sighash);
+      final sig = sign(digest, indexUtxo, indexUtxo.ownerDetails.publicKey!, sighash);
       _addScripts(input: inputs[i], signatures: [sig], utxo: indexUtxo);
     }
-
+    final ea = BtcTransaction.fromRaw(transaction.serialize());
+    assert(ea.serialize() == transaction.serialize(), transaction.serialize());
     return transaction;
   }
 
@@ -537,9 +548,9 @@ be retrieved by anyone who examines the blockchain's history.
     /// build inputs
     final sortedInputs = _buildInputs();
 
-    final List<TxInput> inputs = sortedInputs.item1;
+    final inputs = sortedInputs.item1;
 
-    final List<UtxoWithAddress> utxos = sortedInputs.item2;
+    final utxos = sortedInputs.item2;
 
     /// build outout
     final outputs = _buildOutputs();
@@ -563,41 +574,48 @@ be retrieved by anyone who examines the blockchain's history.
     /// create new transaction with inputs and outputs and isSegwit transaction or not
     final transaction = BtcTransaction(inputs: inputs, outputs: outputs, hasSegwit: false);
 
-    const int sighash = BitcoinOpCodeConst.SIGHASH_ALL | BitcoinOpCodeConst.SIGHASH_FORKED;
+    const sighash = BitcoinOpCodeConst.SIGHASH_ALL | BitcoinOpCodeConst.SIGHASH_FORKED;
 
     /// Well, now let's do what we want for each input
-    for (int i = 0; i < inputs.length; i++) {
+    for (var i = 0; i < inputs.length; i++) {
       final indexUtxo = utxos[i];
 
       /// We receive the owner's ScriptPubKey
       final script = _buildInputScriptPubKeys(indexUtxo);
 
       /// We generate transaction digest for current input
-      final digest = _generateTransactionDigest(script, i, indexUtxo, transaction);
+      final digest = _generateTransactionDigest(
+          scriptPubKeys: script,
+          input: i,
+          utox: indexUtxo,
+          transaction: transaction,
+          sighash: sighash);
 
       /// handle multisig address
       if (indexUtxo.isMultiSig()) {
         final multiSigAddress = indexUtxo.multiSigAddress;
-        int sumMultiSigWeight = 0;
+        var sumMultiSigWeight = 0;
         final mutlsiSigSignatures = <String>[];
-        for (int ownerIndex = 0; ownerIndex < multiSigAddress.signers.length; ownerIndex++) {
+        for (var ownerIndex = 0; ownerIndex < multiSigAddress.signers.length; ownerIndex++) {
           /// now we need sign the transaction digest
           final sig =
               await sign(digest, indexUtxo, multiSigAddress.signers[ownerIndex].publicKey, sighash);
+
           if (sig.isEmpty) continue;
-          for (int weight = 0; weight < multiSigAddress.signers[ownerIndex].weight; weight++) {
+          for (var weight = 0; weight < multiSigAddress.signers[ownerIndex].weight; weight++) {
             if (mutlsiSigSignatures.length >= multiSigAddress.threshold) {
               break;
             }
             mutlsiSigSignatures.add(sig);
           }
+
           sumMultiSigWeight += multiSigAddress.signers[ownerIndex].weight;
           if (sumMultiSigWeight >= multiSigAddress.threshold) {
             break;
           }
         }
-        if (sumMultiSigWeight != multiSigAddress.threshold) {
-          throw const BitcoinBasePluginException("some multisig signature does not exist");
+        if (sumMultiSigWeight < multiSigAddress.threshold) {
+          throw const DartBitcoinPluginException('some multisig signature does not exist');
         }
 
         _addScripts(input: inputs[i], signatures: mutlsiSigSignatures, utxo: indexUtxo);
@@ -605,23 +623,18 @@ be retrieved by anyone who examines the blockchain's history.
       }
 
       /// now we need sign the transaction digest
-      final sig = await sign(digest, indexUtxo, indexUtxo.public().toHex(), sighash);
+      final sig = await sign(digest, indexUtxo, indexUtxo.ownerDetails.publicKey!, sighash);
       _addScripts(input: inputs[i], signatures: [sig], utxo: indexUtxo);
     }
-
     return transaction;
   }
 
-  void _addScripts({
-    required UtxoWithAddress utxo,
-    required TxInput input,
-    required List<String> signatures,
-  }) {
+  void _addScripts(
+      {required UtxoWithAddress utxo, required TxInput input, required List<String> signatures}) {
     /// ok we signed, now we need unlocking script for this input
     final scriptSig = utxo.isMultiSig()
         ? _buildMiltisigUnlockingScript(signatures, utxo)
         : _buildUnlockingScript(signatures.first, utxo);
-
     input.scriptSig = Script(script: scriptSig);
   }
 }
@@ -643,15 +656,15 @@ List<BitcoinBaseAddress> _fakeAddressesFromTypes(List<BitcoinAddressType> types)
         return fakePub.toP2wpkhInP2sh();
       case P2shAddressType.p2wshInP2sh:
         return fakePub.toP2wshInP2sh();
-      case SegwitAddresType.p2wpkh:
+      case SegwitAddressType.p2wpkh:
         return fakePub.toP2wpkhAddress();
-      case SegwitAddresType.p2wsh:
+      case SegwitAddressType.p2wsh:
         return fakePub.toP2wshAddress();
-      case SegwitAddresType.p2tr:
+      case SegwitAddressType.p2tr:
       case SilentPaymentsAddresType.p2sp:
         return fakePub.toTaprootAddress();
       default:
-        throw const BitcoinBasePluginException("invalid bitcoin address type");
+        throw DartBitcoinPluginException("invalid bitcoin address type");
     }
   }).toList();
 }
diff --git a/lib/src/provider/transaction_builder/transaction_builder.dart b/lib/src/transaction_builder/transaction_builder.dart
similarity index 81%
rename from lib/src/provider/transaction_builder/transaction_builder.dart
rename to lib/src/transaction_builder/transaction_builder.dart
index 8ec7400..0143f29 100644
--- a/lib/src/provider/transaction_builder/transaction_builder.dart
+++ b/lib/src/transaction_builder/transaction_builder.dart
@@ -10,7 +10,7 @@ import 'package:blockchain_utils/blockchain_utils.dart';
 /// such as UTXOs, memo, enableRBF (Replace-By-Fee), and more.
 ///
 /// Parameters:
-/// - [outPuts]: List of Bitcoin outputs to be included in the transaction.
+/// - [outputs]: List of Bitcoin outputs to be included in the transaction.
 /// - [fee]: Transaction fee (BigInt) for processing the transaction.
 /// - [network]: The target Bitcoin network.
 /// - [utxosInfo]: List of UtxoWithAddress objects providing information about Unspent Transaction Outputs (UTXOs).
@@ -54,14 +54,14 @@ class BitcoinTransactionBuilder implements BasedBitcoinTransacationBuilder {
   /// validate network and address suport before create transaction
   void _validateBuilder() {
     if (network is BitcoinCashNetwork || network is BitcoinSVNetwork) {
-      throw const BitcoinBasePluginException(
-          "invalid network for BitcoinCashNetwork and BSVNetwork use ForkedTransactionBuilder");
+      throw const DartBitcoinPluginException(
+          'invalid network for BitcoinCashNetwork and BSVNetwork use ForkedTransactionBuilder');
     }
     final token = utxosInfo.any((element) => element.utxo.token != null);
     final tokenInput = outputs.whereType<BitcoinTokenOutput>();
     final burn = outputs.whereType<BitcoinBurnableOutput>();
     if (token || tokenInput.isNotEmpty || burn.isNotEmpty) {
-      throw const BitcoinBasePluginException("Cash Token only work on Bitcoin cash network");
+      throw const DartBitcoinPluginException('Cash Token only work on Bitcoin cash network');
     }
     for (final i in utxosInfo) {
       /// Verify each input for its association with this network's address. Raise an exception if the address is incorrect.
@@ -124,17 +124,20 @@ class BitcoinTransactionBuilder implements BasedBitcoinTransacationBuilder {
     );
 
     /// 64 byte schnorr signature length
-    const String fakeSchnorSignatureBytes =
-        "01010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101";
+    const fakeSchnorSignaturBytes =
+        '01010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101';
 
-    /// 71 bytes (64 byte signature, 6-7 byte Der encoding length)
-    const String fakeECDSASignatureBytes =
-        "0101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101";
+    /// 72 bytes (64 byte signature, 6-7 byte Der encoding length)
+    const fakeECDSASignatureBytes =
+        '010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101';
 
     final transaction =
         transactionBuilder.buildTransaction((trDigest, utxo, multiSigPublicKey, int sighash) {
-      if (utxo.utxo.isP2tr()) {
-        return fakeSchnorSignatureBytes;
+      if (utxo.utxo.isP2tr) {
+        if (sighash != BitcoinOpCodeConst.TAPROOT_SIGHASH_ALL) {
+          return '${fakeSchnorSignaturBytes}01';
+        }
+        return fakeSchnorSignaturBytes;
       } else {
         return fakeECDSASignatureBytes;
       }
@@ -201,7 +204,7 @@ class BitcoinTransactionBuilder implements BasedBitcoinTransacationBuilder {
   /// - bool: True if at least one UTXO in the list is a SegWit UTXO, false otherwise.
   bool _hasSegwit() {
     for (final element in utxosInfo) {
-      if (element.utxo.isSegwit()) {
+      if (element.utxo.isSegwit) {
         return true;
       }
     }
@@ -216,7 +219,7 @@ class BitcoinTransactionBuilder implements BasedBitcoinTransacationBuilder {
   /// - bool: True if at least one UTXO in the list is a P2TR UTXO, false otherwise.
   bool _hasTaproot() {
     for (final element in utxosInfo) {
-      if (element.utxo.isP2tr()) {
+      if (element.utxo.isP2tr) {
         return true;
       }
     }
@@ -234,7 +237,7 @@ class BitcoinTransactionBuilder implements BasedBitcoinTransacationBuilder {
             return multiSigAAddr.toP2wshInP2shAddress(network: network).toScriptPubKey();
           }
           return script;
-        case SegwitAddresType.p2wsh:
+        case SegwitAddressType.p2wsh:
           if (isTaproot) {
             return multiSigAAddr.toP2wshAddress(network: network).toScriptPubKey();
           }
@@ -245,37 +248,38 @@ class BitcoinTransactionBuilder implements BasedBitcoinTransacationBuilder {
           }
           return script;
         default:
-          throw BitcoinBasePluginException("unsuported multi-sig type ${utxo.utxo.scriptType}");
+          throw DartBitcoinPluginException('unsuported multi-sig type ${utxo.utxo.scriptType}');
       }
     }
 
     final senderPub = utxo.public();
     switch (utxo.utxo.scriptType) {
       case PubKeyAddressType.p2pk:
-        return senderPub.toRedeemScript();
-      case SegwitAddresType.p2wsh:
+        return senderPub.toRedeemScript(mode: utxo.keyType);
+      case SegwitAddressType.p2wsh:
         if (isTaproot) {
           return senderPub.toP2wshAddress().toScriptPubKey();
         }
         return senderPub.toP2wshRedeemScript();
       case P2pkhAddressType.p2pkh:
-        return senderPub.toP2pkhAddress().toScriptPubKey();
-      case SegwitAddresType.p2wpkh:
+        return senderPub.toP2pkhAddress(mode: utxo.keyType).toScriptPubKey();
+      case SegwitAddressType.p2wpkh:
         if (isTaproot) {
           return senderPub.toP2wpkhAddress().toScriptPubKey();
         }
         return senderPub.toP2pkhAddress().toScriptPubKey();
-      case SegwitAddresType.p2tr:
+      case SegwitAddressType.p2tr:
         return senderPub
             .toTaprootAddress(tweak: utxo.utxo.isSilentPayment != true)
             .toScriptPubKey();
-      case SegwitAddresType.mweb:
+      case SegwitAddressType.mweb:
         return Script(script: []);
+        return senderPub.toAddress().toScriptPubKey();
       case P2shAddressType.p2pkhInP2sh:
         if (isTaproot) {
-          return senderPub.toP2pkhInP2sh().toScriptPubKey();
+          return senderPub.toP2pkhInP2sh(mode: utxo.keyType).toScriptPubKey();
         }
-        return senderPub.toP2pkhAddress().toScriptPubKey();
+        return senderPub.toP2pkhAddress(mode: utxo.keyType).toScriptPubKey();
       case P2shAddressType.p2wpkhInP2sh:
         if (isTaproot) {
           return senderPub.toP2wpkhInP2sh().toScriptPubKey();
@@ -288,11 +292,11 @@ class BitcoinTransactionBuilder implements BasedBitcoinTransacationBuilder {
         return senderPub.toP2wshRedeemScript();
       case P2shAddressType.p2pkInP2sh:
         if (isTaproot) {
-          return senderPub.toP2pkInP2sh().toScriptPubKey();
+          return senderPub.toP2pkInP2sh(mode: utxo.keyType).toScriptPubKey();
         }
-        return senderPub.toRedeemScript();
+        return senderPub.toRedeemScript(mode: utxo.keyType);
     }
-    throw const BitcoinBasePluginException("invalid bitcoin address type");
+    throw const DartBitcoinPluginException('invalid bitcoin address type');
   }
 
   /// generateTransactionDigest generates and returns a transaction digest for a given input in the context of a Bitcoin
@@ -309,11 +313,17 @@ class BitcoinTransactionBuilder implements BasedBitcoinTransacationBuilder {
   /// - tapRootPubKeys: A List of of Script representing taproot public keys for P2TR inputs (ignored for non-P2TR inputs).
 //
   /// Returns:
-  /// - List<int>: representing the transaction digest to be used for signing the input.
-  List<int> _generateTransactionDigest(Script scriptPubKeys, int input, UtxoWithAddress utox,
-      BtcTransaction transaction, List<BigInt> taprootAmounts, List<Script> tapRootPubKeys) {
-    if (utox.utxo.isSegwit()) {
-      if (utox.utxo.isP2tr()) {
+  /// - `List<int>`: representing the transaction digest to be used for signing the input.
+  List<int> _generateTransactionDigest(
+    Script scriptPubKeys,
+    int input,
+    UtxoWithAddress utox,
+    BtcTransaction transaction,
+    List<BigInt> taprootAmounts,
+    List<Script> tapRootPubKeys,
+  ) {
+    if (utox.utxo.isSegwit) {
+      if (utox.utxo.isP2tr) {
         return transaction.getTransactionTaprootDigset(
           txIndex: input,
           scriptPubKeys: tapRootPubKeys,
@@ -335,7 +345,7 @@ class BitcoinTransactionBuilder implements BasedBitcoinTransacationBuilder {
   /// - utx: A UtxoWithAddress instance representing the unspent transaction output (UTXO) and its owner details.
   //
   /// Returns:
-  /// - List<String>: A List of strings representing the script signature for the P2WSH or P2SH input.
+  /// - `List<String>`: A List of strings representing the script signature for the P2WSH or P2SH input.
   List<String> _buildMiltisigUnlockingScript(List<String> signedDigest, UtxoWithAddress utx) {
     /// The constructed script signature consists of the signed digest elements followed by
     /// the script details of the multi-signature address.
@@ -351,18 +361,18 @@ class BitcoinTransactionBuilder implements BasedBitcoinTransacationBuilder {
   /// - utxo: A UtxoWithAddress instance representing the unspent transaction output (UTXO) and its owner details.
   //
   /// Returns:
-  /// - List<string>: A List of strings representing the script signature for the P2SH SegWit input.
+  /// - `List<string>`: A List of strings representing the script signature for the P2SH SegWit input.
   List<String> _buildNestedSegwitReedemScript(UtxoWithAddress utxo) {
     if (utxo.isMultiSig()) {
       switch (utxo.utxo.scriptType) {
         case P2shAddressType.p2wshInP2sh:
-          final script =
-              Script.fromRaw(hexData: utxo.multiSigAddress.multiSigScript.toHex(), hasSegwit: true);
+          final script = Script.deserialize(
+              bytes: utxo.multiSigAddress.multiSigScript.toBytes(), hasSegwit: true);
           final p2wsh = P2wshAddress.fromRedeemScript(script: script);
           return [p2wsh.toScriptPubKey().toHex()];
         default:
-          throw BitcoinBasePluginException(
-              "Invalid p2sh nested segwit type ${utxo.utxo.scriptType.value}");
+          throw DartBitcoinPluginException(
+              'Invalid p2sh nested segwit type ${utxo.utxo.scriptType.value}');
       }
     }
     final senderPub = utxo.public();
@@ -374,8 +384,8 @@ class BitcoinTransactionBuilder implements BasedBitcoinTransacationBuilder {
         final script = senderPub.toP2wpkhAddress().toScriptPubKey();
         return [script.toHex()];
       default:
-        throw BitcoinBasePluginException(
-            "Invalid p2sh nested segwit type ${utxo.utxo.scriptType.value}");
+        throw DartBitcoinPluginException(
+            'Invalid p2sh nested segwit type ${utxo.utxo.scriptType.value}');
     }
   }
 
@@ -387,44 +397,45 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
 */
   List<String> _buildUnlockingScript(String signedDigest, UtxoWithAddress utx) {
     final senderPub = utx.public();
-    if (utx.utxo.isSegwit()) {
-      if (utx.utxo.isP2tr()) {
+    if (utx.utxo.isSegwit) {
+      if (utx.utxo.isP2tr) {
         return [signedDigest];
       }
       switch (utx.utxo.scriptType) {
         case P2shAddressType.p2wshInP2sh:
-        case SegwitAddresType.p2wsh:
+        case SegwitAddressType.p2wsh:
           final script = senderPub.toP2wshRedeemScript();
           return ['', signedDigest, script.toHex()];
-        case SegwitAddresType.p2wpkh:
+        case SegwitAddressType.p2wpkh:
         case P2shAddressType.p2wpkhInP2sh:
           return [signedDigest, senderPub.toHex()];
-        case SegwitAddresType.mweb:
+        case SegwitAddressType.mweb:
           return [];
         default:
-          throw BitcoinBasePluginException(
-              "invalid segwit address type ${utx.utxo.scriptType.value}");
+          throw DartBitcoinPluginException(
+              'invalid segwit address type ${utx.utxo.scriptType.value}');
       }
     } else {
+      final mode = utx.keyType;
       switch (utx.utxo.scriptType) {
         case PubKeyAddressType.p2pk:
           return [signedDigest];
         case P2pkhAddressType.p2pkh:
-          return [signedDigest, senderPub.toHex()];
+          return [signedDigest, senderPub.toHex(mode: mode)];
         case P2shAddressType.p2pkhInP2sh:
-          final script = senderPub.toP2pkhAddress().toScriptPubKey();
-          return [signedDigest, senderPub.toHex(), script.toHex()];
+          final script = senderPub.toAddress(mode: mode).toScriptPubKey();
+          return [signedDigest, senderPub.toHex(mode: mode), script.toHex()];
         case P2shAddressType.p2pkInP2sh:
-          final script = senderPub.toRedeemScript();
+          final script = senderPub.toRedeemScript(mode: mode);
           return [signedDigest, script.toHex()];
         default:
-          throw BitcoinBasePluginException("invalid address type ${utx.utxo.scriptType.value}");
+          throw DartBitcoinPluginException('invalid address type ${utx.utxo.scriptType.value}');
       }
     }
   }
 
   Tuple<List<TxInput>, List<UtxoWithAddress>> _buildInputs() {
-    List<UtxoWithAddress> sortedUtxos = List.from(utxosInfo);
+    var sortedUtxos = List<UtxoWithAddress>.from(utxosInfo);
 
     if (inputOrdering == BitcoinOrdering.shuffle) {
       sortedUtxos = sortedUtxos..shuffle();
@@ -440,35 +451,13 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
           },
         );
     }
-    List<TxInput> inputs = sortedUtxos.map((e) => e.utxo.toInput()).toList();
+    final inputs = sortedUtxos.map((e) => e.utxo.toInput()).toList();
     if (enableRBF && inputs.isNotEmpty) {
       inputs[0] = inputs[0].copyWith(sequence: BitcoinOpCodeConst.REPLACE_BY_FEE_SEQUENCE);
     }
     return Tuple(
         List<TxInput>.unmodifiable(inputs), List<UtxoWithAddress>.unmodifiable(sortedUtxos));
   }
-  // List<TxInput> _buildInputs() {
-  //   List<TxInput> inputs = utxos.map((e) => e.utxo.toInput()).toList();
-  //   if (enableRBF && inputs.isNotEmpty) {
-  //     inputs[0] = inputs[0]
-  //         .copyWith(sequence: BitcoinOpCodeConst.REPLACE_BY_FEE_SEQUENCE);
-  //   }
-  //   if (inputOrdering == BitcoinOrdering.shuffle) {
-  //     inputs = inputs..shuffle();
-  //   } else if (inputOrdering == BitcoinOrdering.bip69) {
-  //     inputs = inputs
-  //       ..sort(
-  //         (a, b) {
-  //           final txidComparison = a.txId.compareTo(b.txId);
-  //           if (txidComparison == 0) {
-  //             return a.txIndex - b.txIndex;
-  //           }
-  //           return txidComparison;
-  //         },
-  //       );
-  //   }
-  //   return List<TxInput>.unmodifiable(inputs);
-  // }
 
   List<TxOutput> _buildOutputs() {
     List<TxOutput> builtOutputs = outputs.map((e) {
@@ -478,6 +467,7 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
 
       return e.toOutput;
     }).toList();
+
     if (memo != null) {
       builtOutputs.add(TxOutput(amount: BigInt.zero, scriptPubKey: _opReturn(memo!)));
     }
@@ -495,6 +485,12 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
           },
         );
     }
+    for (final i in builtOutputs) {
+      if (i.amount.isNegative) {
+        throw DartBitcoinPluginException('Some output has negative amount.',
+            details: {'output': i.amount});
+      }
+    }
     return List<TxOutput>.unmodifiable(builtOutputs);
   }
 
@@ -506,8 +502,8 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
 
       if (address is SilentPaymentAddress) {
         try {
-          utxosInfo.firstWhere((utxo) => utxo.ownerDetails.address.type == SegwitAddresType.p2wsh);
-          throw const BitcoinBasePluginException('Silent payments not supported for P2WSH');
+          utxosInfo.firstWhere((utxo) => utxo.ownerDetails.address.type == SegwitAddressType.p2wsh);
+          throw const DartBitcoinPluginException('Silent payments not supported for P2WSH');
         } catch (_) {}
 
         out.isSilentPayment = true;
@@ -555,12 +551,12 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
   /// be retrieved by anyone who examines the blockchain's history.
   Script _opReturn(String message) {
     final toHex = BytesUtils.toHexString(StringUtils.toBytes(message));
-    return Script(script: ["OP_RETURN", toHex]);
+    return Script(script: ['OP_RETURN', toHex]);
   }
 
   /// Total amount to spend excluding fees
   BigInt _sumOutputAmounts(List<TxOutput> outputs) {
-    BigInt sum = BigInt.zero;
+    var sum = BigInt.zero;
     for (final e in outputs) {
       sum += e.amount;
     }
@@ -572,9 +568,9 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
     /// build inputs
     final sortedInputs = _buildInputs();
 
-    final List<TxInput> inputs = sortedInputs.item1;
+    final inputs = sortedInputs.item1;
 
-    final List<UtxoWithAddress> utxos = sortedInputs.item2;
+    final utxos = sortedInputs.item2;
 
     if (inputPrivKeyInfos != null) {
       _buildSilentPayments();
@@ -600,11 +596,11 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
 
     /// We will check whether you have spent the correct amounts or not
     if (!isFakeTransaction && sumAmountsWithFee != sumUtxoAmount) {
-      throw const BitcoinBasePluginException('Sum value of utxo not spending');
+      throw const DartBitcoinPluginException('Sum value of utxo not spending');
     }
 
     /// create new transaction with inputs and outputs and isSegwit transaction or not
-    BtcTransaction transaction = BtcTransaction(
+    var transaction = BtcTransaction(
       inputs: inputs,
       outputs: outputs,
       hasSegwit: hasSegwit,
@@ -616,8 +612,8 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
 
     /// when the transaction is taproot and we must use getTaproot tansaction digest
     /// we need all of inputs amounts and owner script pub keys
-    List<BigInt> taprootAmounts = [];
-    List<Script> taprootScripts = [];
+    var taprootAmounts = <BigInt>[];
+    var taprootScripts = <Script>[];
 
     if (hasTaproot) {
       taprootAmounts = utxos.map((e) => e.utxo.value).toList();
@@ -625,28 +621,28 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
     }
 
     /// Well, now let's do what we want for each input
-    for (int i = 0; i < inputs.length; i++) {
+    for (var i = 0; i < inputs.length; i++) {
       /// We receive the owner's ScriptPubKey
       final script = _findLockingScript(utxos[i], false);
 
       /// We generate transaction digest for current input
       final digest = _generateTransactionDigest(
           script, i, utxos[i], transaction, taprootAmounts, taprootScripts);
-      final int sighash = utxos[i].utxo.isP2tr()
+      final sighash = utxos[i].utxo.isP2tr
           ? BitcoinOpCodeConst.TAPROOT_SIGHASH_ALL
           : BitcoinOpCodeConst.SIGHASH_ALL;
 
       /// handle multisig address
       if (utxos[i].isMultiSig()) {
         final multiSigAddress = utxos[i].multiSigAddress;
-        int sumMultiSigWeight = 0;
+        var sumMultiSigWeight = 0;
         final mutlsiSigSignatures = <String>[];
-        for (int ownerIndex = 0; ownerIndex < multiSigAddress.signers.length; ownerIndex++) {
+        for (var ownerIndex = 0; ownerIndex < multiSigAddress.signers.length; ownerIndex++) {
           /// now we need sign the transaction digest
           final sig =
               sign(digest, utxos[i], multiSigAddress.signers[ownerIndex].publicKey, sighash);
           if (sig.isEmpty) continue;
-          for (int weight = 0; weight < multiSigAddress.signers[ownerIndex].weight; weight++) {
+          for (var weight = 0; weight < multiSigAddress.signers[ownerIndex].weight; weight++) {
             if (mutlsiSigSignatures.length >= multiSigAddress.threshold) {
               break;
             }
@@ -657,8 +653,8 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
             break;
           }
         }
-        if (sumMultiSigWeight != multiSigAddress.threshold) {
-          throw const BitcoinBasePluginException("some multisig signature does not exist");
+        if (sumMultiSigWeight < multiSigAddress.threshold) {
+          throw const DartBitcoinPluginException('some multisig signature does not exist');
         }
         _addUnlockScriptScript(
             hasSegwit: hasSegwit,
@@ -670,7 +666,7 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
       }
 
       /// now we need sign the transaction digest
-      final sig = sign(digest, utxos[i], utxos[i].public().toHex(), sighash);
+      final sig = sign(digest, utxos[i], utxos[i].ownerDetails.publicKey!, sighash);
       _addUnlockScriptScript(
           hasSegwit: hasSegwit,
           input: inputs[i],
@@ -691,22 +687,22 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
   @override
   Map<String, int> getSignatureCount() {
     final sortedInputs = _buildInputs();
-    final List<TxInput> inputs = sortedInputs.item1;
-    final List<UtxoWithAddress> utxos = sortedInputs.item2;
-    final Map<String, int> count = {};
+    final inputs = sortedInputs.item1;
+    final utxos = sortedInputs.item2;
+    final count = <String, int>{};
 
-    for (int i = 0; i < inputs.length; i++) {
+    for (var i = 0; i < inputs.length; i++) {
       final indexUtxo = utxos[i];
       if (indexUtxo.isMultiSig()) {
         final multiSigAddress = indexUtxo.multiSigAddress;
-        int sumMultiSigWeight = 0;
+        var sumMultiSigWeight = 0;
         final mutlsiSigSignatures = <String>[];
-        for (int ownerIndex = 0; ownerIndex < multiSigAddress.signers.length; ownerIndex++) {
-          for (int weight = 0; weight < multiSigAddress.signers[ownerIndex].weight; weight++) {
+        for (var ownerIndex = 0; ownerIndex < multiSigAddress.signers.length; ownerIndex++) {
+          for (var weight = 0; weight < multiSigAddress.signers[ownerIndex].weight; weight++) {
             if (mutlsiSigSignatures.length >= multiSigAddress.threshold) {
               break;
             }
-            mutlsiSigSignatures.add("");
+            mutlsiSigSignatures.add('');
             count[multiSigAddress.signers[ownerIndex].publicKey] =
                 (count[multiSigAddress.signers[ownerIndex].publicKey] ?? 0) + 1;
           }
@@ -715,8 +711,8 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
             break;
           }
         }
-        if (sumMultiSigWeight != multiSigAddress.threshold) {
-          throw const BitcoinBasePluginException("some multisig signature does not exist");
+        if (sumMultiSigWeight < multiSigAddress.threshold) {
+          throw const DartBitcoinPluginException('some multisig signature does not exist');
         }
         continue;
       }
@@ -731,9 +727,9 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
     /// build inputs
     final sortedInputs = _buildInputs();
 
-    final List<TxInput> inputs = sortedInputs.item1;
+    final inputs = sortedInputs.item1;
 
-    final List<UtxoWithAddress> utxos = sortedInputs.item2;
+    final utxos = sortedInputs.item2;
 
     /// build outout
     final outputs = _buildOutputs();
@@ -755,11 +751,11 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
 
     /// We will check whether you have spent the correct amounts or not
     if (!isFakeTransaction && sumAmountsWithFee != sumUtxoAmount) {
-      throw const BitcoinBasePluginException('Sum value of utxo not spending');
+      throw const DartBitcoinPluginException('Sum value of utxo not spending');
     }
 
     /// create new transaction with inputs and outputs and isSegwit transaction or not
-    BtcTransaction transaction = BtcTransaction(
+    var transaction = BtcTransaction(
       inputs: inputs,
       outputs: outputs,
       hasSegwit: hasSegwit,
@@ -771,8 +767,8 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
 
     /// when the transaction is taproot and we must use getTaproot tansaction digest
     /// we need all of inputs amounts and owner script pub keys
-    List<BigInt> taprootAmounts = [];
-    List<Script> taprootScripts = [];
+    var taprootAmounts = <BigInt>[];
+    var taprootScripts = <Script>[];
 
     if (hasTaproot) {
       taprootAmounts = utxos.map((e) => e.utxo.value).toList();
@@ -780,28 +776,28 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
     }
 
     /// Well, now let's do what we want for each input
-    for (int i = 0; i < inputs.length; i++) {
+    for (var i = 0; i < inputs.length; i++) {
       /// We receive the owner's ScriptPubKey
       final script = _findLockingScript(utxos[i], false);
 
       /// We generate transaction digest for current input
       final digest = _generateTransactionDigest(
           script, i, utxos[i], transaction, taprootAmounts, taprootScripts);
-      final int sighash = utxos[i].utxo.isP2tr()
+      final sighash = utxos[i].utxo.isP2tr
           ? BitcoinOpCodeConst.TAPROOT_SIGHASH_ALL
           : BitcoinOpCodeConst.SIGHASH_ALL;
 
       /// handle multisig address
       if (utxos[i].isMultiSig()) {
         final multiSigAddress = utxos[i].multiSigAddress;
-        int sumMultiSigWeight = 0;
+        var sumMultiSigWeight = 0;
         final mutlsiSigSignatures = <String>[];
-        for (int ownerIndex = 0; ownerIndex < multiSigAddress.signers.length; ownerIndex++) {
+        for (var ownerIndex = 0; ownerIndex < multiSigAddress.signers.length; ownerIndex++) {
           /// now we need sign the transaction digest
           final sig =
               await sign(digest, utxos[i], multiSigAddress.signers[ownerIndex].publicKey, sighash);
           if (sig.isEmpty) continue;
-          for (int weight = 0; weight < multiSigAddress.signers[ownerIndex].weight; weight++) {
+          for (var weight = 0; weight < multiSigAddress.signers[ownerIndex].weight; weight++) {
             if (mutlsiSigSignatures.length >= multiSigAddress.threshold) {
               break;
             }
@@ -813,7 +809,7 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
           }
         }
         if (sumMultiSigWeight != multiSigAddress.threshold) {
-          throw const BitcoinBasePluginException("some multisig signature does not exist");
+          throw const DartBitcoinPluginException('some multisig signature does not exist');
         }
         _addUnlockScriptScript(
             hasSegwit: hasSegwit,
@@ -825,7 +821,7 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
       }
 
       /// now we need sign the transaction digest
-      final sig = await sign(digest, utxos[i], utxos[i].public().toHex(), sighash);
+      final sig = await sign(digest, utxos[i], utxos[i].ownerDetails.publicKey!, sighash);
       _addUnlockScriptScript(
           hasSegwit: hasSegwit,
           input: inputs[i],
@@ -857,9 +853,9 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
 
     /// Now we need to add it to the transaction
     /// check if current utxo is segwit or not
-    if (utxo.utxo.isSegwit()) {
+    if (utxo.utxo.isSegwit) {
       witnesses.add(TxWitnessInput(stack: scriptSig));
-      if (utxo.utxo.isP2shSegwit()) {
+      if (utxo.utxo.isP2shSegwit) {
         /// check if we need redeemScriptSig or not
         /// In a Pay-to-Script-Hash (P2SH) Segregated Witness (SegWit) input,
         /// the redeemScriptSig is needed for historical and compatibility reasons,
@@ -900,15 +896,15 @@ List<BitcoinBaseAddress> _fakeAddressesFromTypes(List<BitcoinAddressType> types)
         return fakePub.toP2wpkhInP2sh();
       case P2shAddressType.p2wshInP2sh:
         return fakePub.toP2wshInP2sh();
-      case SegwitAddresType.p2wpkh:
+      case SegwitAddressType.p2wpkh:
         return fakePub.toP2wpkhAddress();
-      case SegwitAddresType.p2wsh:
+      case SegwitAddressType.p2wsh:
         return fakePub.toP2wshAddress();
-      case SegwitAddresType.p2tr:
+      case SegwitAddressType.p2tr:
       case SilentPaymentsAddresType.p2sp:
         return fakePub.toTaprootAddress();
       default:
-        throw const BitcoinBasePluginException("invalid bitcoin address type");
+        throw const DartBitcoinPluginException("invalid bitcoin address type");
     }
   }).toList();
 }
diff --git a/lib/src/utils/btc_utils.dart b/lib/src/utils/btc_utils.dart
index a27a07c..476a769 100644
--- a/lib/src/utils/btc_utils.dart
+++ b/lib/src/utils/btc_utils.dart
@@ -1,8 +1,17 @@
+import 'package:bitcoin_base/src/crypto/keypair/ec_public.dart';
 import 'package:blockchain_utils/utils/numbers/rational/big_rational.dart';
+import 'package:blockchain_utils/utils/string/string.dart';
 
 class BtcUtils {
+  static PublicKeyType isCompressedPubKey(String publicKey) {
+    final isCompressed =
+        StringUtils.strip0x(publicKey.toLowerCase()).length == 66;
+    if (isCompressed) return PublicKeyType.compressed;
+    return PublicKeyType.uncompressed;
+  }
+
   static BigInt toSatoshi(String decimal) {
-    BigRational dec = BigRational.parseDecimal(decimal);
+    var dec = BigRational.parseDecimal(decimal);
     dec = dec * BigRational(BigInt.from(10).pow(8));
     return dec.toBigInt();
   }
diff --git a/lib/src/utils/enumerate.dart b/lib/src/utils/enumerate.dart
index d92347e..70fc2e7 100644
--- a/lib/src/utils/enumerate.dart
+++ b/lib/src/utils/enumerate.dart
@@ -2,7 +2,7 @@ abstract class Enumerate {
   String get value;
 
   @override
-  operator ==(other) {
+  bool operator ==(other) {
     if (identical(other, this)) return true;
     if (other is! Enumerate) return false;
     return other.runtimeType == runtimeType && value == other.value;
diff --git a/pubspec.yaml b/pubspec.yaml
index d14b166..81d4554 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: bitcoin_base
 description: A versatile library for Bitcoin, Dogecoin, Litecoin, Dash, BSV, and BCH. Supports P2PKH, P2SH, P2WPKH, P2WSH, P2TR, with advanced creation, signing, and spending capabilities.
-version: 4.7.0
+version: 5.0.0
 homepage: "https://github.com/mrtnetwork/bitcoin_base"
 repository: "https://github.com/mrtnetwork/bitcoin_base"
 Author: mrhaydari.t@gmail.com
@@ -22,16 +22,16 @@ dependencies:
   blockchain_utils:
     git:
       url: https://github.com/cake-tech/blockchain_utils
-      ref: cake-update-v3
+      ref: cake-update-v4
   rxdart: ^0.28.0
   intl: ^0.19.0
   http: ^1.1.0
     
 
 dev_dependencies:
-  test: ^1.25.5
-  lints: ^4.0.0
-  flutter_lints: ^4.0.0
+  lints: ^5.0.0
+  test: ^1.25.9
+  flutter_lints: ^5.0.0
  
 
 # For information on the generic Dart part of this file, see the
diff --git a/test/bcmr/art_collection.dart b/test/bcmr/art_collection.dart
index d3140bb..327b87e 100644
--- a/test/bcmr/art_collection.dart
+++ b/test/bcmr/art_collection.dart
@@ -1,88 +1,88 @@
 const artCollection = {
-  r"$schema": "https://cashtokens.org/bcmr-v2.schema.json",
-  "version": {"major": 1, "minor": 1, "patch": 0},
-  "latestRevision": "2023-04-14T00:00:17.720Z",
-  "registryIdentity": {
-    "name": "Example.com Token Registry",
-    "description":
-        "An example registry demonstrating how the issuer of a non-fungible token (NFT) art collection might publish information about the collection.",
-    "uris": {
-      "icon": "https://example.com/registry-icon.svg",
-      "web": "https://example.com/",
-      "registry":
-          "https://example.com/.well-known/bitcoin-cash-metadata-registry.json"
+  r'$schema': 'https://cashtokens.org/bcmr-v2.schema.json',
+  'version': {'major': 1, 'minor': 1, 'patch': 0},
+  'latestRevision': '2023-04-14T00:00:17.720Z',
+  'registryIdentity': {
+    'name': 'Example.com Token Registry',
+    'description':
+        'An example registry demonstrating how the issuer of a non-fungible token (NFT) art collection might publish information about the collection.',
+    'uris': {
+      'icon': 'https://example.com/registry-icon.svg',
+      'web': 'https://example.com/',
+      'registry':
+          'https://example.com/.well-known/bitcoin-cash-metadata-registry.json'
     }
   },
-  "identities": {
-    "89cad9e3e34280eb1e8bc420542c00a7fcc01002b663dbf7f38bceddf80e680c": {
-      "2023-01-13T00:00:00.000Z": {
-        "name": "Example NFT Collection",
-        "description":
+  'identities': {
+    '89cad9e3e34280eb1e8bc420542c00a7fcc01002b663dbf7f38bceddf80e680c': {
+      '2023-01-13T00:00:00.000Z': {
+        'name': 'Example NFT Collection',
+        'description':
             "This is a short description of the collection; in most interfaces, it will be hidden beyond 140 characters or the first newline character.\n\nThis sentence should be hidden in user interfaces with limited space.\n\nThis collection defines metadata for 3 sequential NFTs, Example #0 (XAMPLZ-0), Example #1 (XAMPLZ-1), and Example #2 (XAMPLZ-2). Note that the 'icon' for each NFT is published via IPFS, so clients may download each icon by querying IPFS or by using an IPFS HTTP Gateway.",
-        "token": {
-          "category":
-              "89cad9e3e34280eb1e8bc420542c00a7fcc01002b663dbf7f38bceddf80e680c",
-          "symbol": "XAMPLZ",
-          "nfts": {
-            "parse": {
-              "types": {
-                "": {
-                  "name": "Example #0",
-                  "description":
+        'token': {
+          'category':
+              '89cad9e3e34280eb1e8bc420542c00a7fcc01002b663dbf7f38bceddf80e680c',
+          'symbol': 'XAMPLZ',
+          'nfts': {
+            'parse': {
+              'types': {
+                '': {
+                  'name': 'Example #0',
+                  'description':
                       "An NFT of this category with a zero-length on-chain commitment (VM number 0). Where appropriate, user interfaces may display the ticker symbol of NFTs matching this type as XAMPLZ-0.\n\nIn this example, the art represented by this NFT has a square aspect ratio and uses the SVG format, so the same URI can be used for both the 'icon' and 'image' URIs. For NFTs that represent art in raster formats other aspect ratios, the 'icon' URI should point to a 400px by 400px or SVG icon representing the NFT.",
-                  "uris": {
-                    "icon":
-                        "ipfs://bafybeihnmh5bkbaspp3xfdanje74pekhsklhobzzraeyywq6gcpb3iuvey/0.svg",
-                    "image":
-                        "ipfs://bafybeihnmh5bkbaspp3xfdanje74pekhsklhobzzraeyywq6gcpb3iuvey/0.svg",
-                    "web": "https://example.com/xamplz/0/details"
+                  'uris': {
+                    'icon':
+                        'ipfs://bafybeihnmh5bkbaspp3xfdanje74pekhsklhobzzraeyywq6gcpb3iuvey/0.svg',
+                    'image':
+                        'ipfs://bafybeihnmh5bkbaspp3xfdanje74pekhsklhobzzraeyywq6gcpb3iuvey/0.svg',
+                    'web': 'https://example.com/xamplz/0/details'
                   }
                 },
-                "01": {
-                  "name": "Example #1",
-                  "description":
-                      "An NFT of this category with an on-chain commitment of 0x01 (VM number 1). Where appropriate, user interfaces may display the ticker symbol of NFTs matching this type as XAMPLZ-1.",
-                  "uris": {
-                    "icon":
-                        "ipfs://bafybeihnmh5bkbaspp3xfdanje74pekhsklhobzzraeyywq6gcpb3iuvey/1.svg",
-                    "image":
-                        "ipfs://bafybeihnmh5bkbaspp3xfdanje74pekhsklhobzzraeyywq6gcpb3iuvey/1.svg",
-                    "web": "https://example.com/xamplz/1/details",
-                    "custom-uri-identifier": "protocol://data-for-some-protocol"
+                '01': {
+                  'name': 'Example #1',
+                  'description':
+                      'An NFT of this category with an on-chain commitment of 0x01 (VM number 1). Where appropriate, user interfaces may display the ticker symbol of NFTs matching this type as XAMPLZ-1.',
+                  'uris': {
+                    'icon':
+                        'ipfs://bafybeihnmh5bkbaspp3xfdanje74pekhsklhobzzraeyywq6gcpb3iuvey/1.svg',
+                    'image':
+                        'ipfs://bafybeihnmh5bkbaspp3xfdanje74pekhsklhobzzraeyywq6gcpb3iuvey/1.svg',
+                    'web': 'https://example.com/xamplz/1/details',
+                    'custom-uri-identifier': 'protocol://data-for-some-protocol'
                   }
                 },
-                "02": {
-                  "name": "Example #2",
-                  "description":
-                      "An NFT of this category with an on-chain commitment of 0x02 (VM number 2). Where appropriate, user interfaces may display the ticker symbol of NFTs matching this type as XAMPLZ-2.",
-                  "uris": {
-                    "icon":
-                        "ipfs://bafybeihnmh5bkbaspp3xfdanje74pekhsklhobzzraeyywq6gcpb3iuvey/2.svg",
-                    "image":
-                        "ipfs://bafybeihnmh5bkbaspp3xfdanje74pekhsklhobzzraeyywq6gcpb3iuvey/2.svg",
-                    "web": "https://example.com/another/path",
-                    "another-uri-identifier":
-                        "protocol://data-for-that-protocol"
+                '02': {
+                  'name': 'Example #2',
+                  'description':
+                      'An NFT of this category with an on-chain commitment of 0x02 (VM number 2). Where appropriate, user interfaces may display the ticker symbol of NFTs matching this type as XAMPLZ-2.',
+                  'uris': {
+                    'icon':
+                        'ipfs://bafybeihnmh5bkbaspp3xfdanje74pekhsklhobzzraeyywq6gcpb3iuvey/2.svg',
+                    'image':
+                        'ipfs://bafybeihnmh5bkbaspp3xfdanje74pekhsklhobzzraeyywq6gcpb3iuvey/2.svg',
+                    'web': 'https://example.com/another/path',
+                    'another-uri-identifier':
+                        'protocol://data-for-that-protocol'
                   }
                 }
               }
             }
           }
         },
-        "uris": {
-          "icon": "https://example.com/xamplz-icon.svg",
-          "web": "https://example.com/about-xamplz-nfts",
-          "blog": "https://blog.example.com/",
-          "chat": "https://chat.example.com/",
-          "forum": "https://forum.example.com/",
-          "registry":
-              "https://example.com/.well-known/bitcoin-cash-metadata-registry.json",
-          "support": "https://support.example.com/",
-          "custom-uri-identifier":
-              "protocol://connection-info-for-some-protocol"
+        'uris': {
+          'icon': 'https://example.com/xamplz-icon.svg',
+          'web': 'https://example.com/about-xamplz-nfts',
+          'blog': 'https://blog.example.com/',
+          'chat': 'https://chat.example.com/',
+          'forum': 'https://forum.example.com/',
+          'registry':
+              'https://example.com/.well-known/bitcoin-cash-metadata-registry.json',
+          'support': 'https://support.example.com/',
+          'custom-uri-identifier':
+              'protocol://connection-info-for-some-protocol'
         }
       }
     }
   },
-  "license": "CC0-1.0"
+  'license': 'CC0-1.0'
 };
diff --git a/test/bcmr/bcmr_test.dart b/test/bcmr/bcmr_test.dart
index 88d7d4a..a85df22 100644
--- a/test/bcmr/bcmr_test.dart
+++ b/test/bcmr/bcmr_test.dart
@@ -8,7 +8,7 @@ import 'payouts_or_dividends.dart';
 
 /// https://github.com/bitjson/chip-bcmr/tree/master/examples
 void main() {
-  test("pcmr test", () {
+  test('pcmr test', () {
     final registry = Registry.fromJson(payoutsOrDividends);
     expect(json.encode(registry.toJson()), json.encode(payoutsOrDividends));
     final registry2 = Registry.fromJson(artCollection);
diff --git a/test/bcmr/decentralized_application.dart b/test/bcmr/decentralized_application.dart
index eab21f6..b732560 100644
--- a/test/bcmr/decentralized_application.dart
+++ b/test/bcmr/decentralized_application.dart
@@ -1,77 +1,77 @@
 const decentralizedApplication = {
-  r"$schema": "https://cashtokens.org/bcmr-v2.schema.json",
-  "version": {"major": 1, "minor": 1, "patch": 0},
-  "latestRevision": "2023-04-14T00:00:17.720Z",
-  "registryIdentity": {
-    "name": "Example.com Token Registry",
-    "description":
-        "An example demonstrating how a metadata registry might publish information about a decentralized application.",
-    "uris": {
-      "icon": "https://example.com/registry-icon.svg",
-      "web": "https://example.com/",
-      "registry":
-          "https://example.com/.well-known/bitcoin-cash-metadata-registry.json"
+  r'$schema': 'https://cashtokens.org/bcmr-v2.schema.json',
+  'version': {'major': 1, 'minor': 1, 'patch': 0},
+  'latestRevision': '2023-04-14T00:00:17.720Z',
+  'registryIdentity': {
+    'name': 'Example.com Token Registry',
+    'description':
+        'An example demonstrating how a metadata registry might publish information about a decentralized application.',
+    'uris': {
+      'icon': 'https://example.com/registry-icon.svg',
+      'web': 'https://example.com/',
+      'registry':
+          'https://example.com/.well-known/bitcoin-cash-metadata-registry.json'
     }
   },
-  "identities": {
-    "89cad9e3e34280eb1e8bc420542c00a7fcc01002b663dbf7f38bceddf80e680c": {
-      "2023-01-13T00:00:00.000Z": {
-        "name": "Crowdfunding Campaign: Example",
-        "description":
+  'identities': {
+    '89cad9e3e34280eb1e8bc420542c00a7fcc01002b663dbf7f38bceddf80e680c': {
+      '2023-01-13T00:00:00.000Z': {
+        'name': 'Crowdfunding Campaign: Example',
+        'description':
             "This is a short description of the decentralized application; in most interfaces, it will be hidden beyond 140 characters or the first newline character.\n\nThis sentence should be hidden in user interfaces with limited space.\n\nThis crowdfunding campaign instance has a distinct name and symbol (CFC2023XAMPL) to make it easily distinguishable from other crowdfunding campaigns published using the same contracts.\n\nThis application uses only one type of parsable NFT, 'Pledge Receipt's, so the 'parse.bytecode' (OP_0 OP_TOALTSTACK OP_0 OP_UTXOTOKENCOMMITMENT OP_TOALTSTACK) doesn't require any OP_IF/ENDIF branches; an empty altstack item is pushed to indicate the NFT type (''), and the remaining portion of the commitment is pushed as the only field (Pledge Value).",
-        "token": {
-          "category":
-              "89cad9e3e34280eb1e8bc420542c00a7fcc01002b663dbf7f38bceddf80e680c",
-          "symbol": "CFC2023XAMPL",
-          "nfts": {
-            "description":
-                "Example Crowdfunding Campaign issues your wallet a receipt (NFT) when you make a pledge. Should you decide to cancel your pledge before the campaign completes, this receipt can be redeemed with the on-chain contract to receive a refund.",
-            "fields": {
-              "pledgeValue": {
-                "name": "Pledge Value",
-                "description":
+        'token': {
+          'category':
+              '89cad9e3e34280eb1e8bc420542c00a7fcc01002b663dbf7f38bceddf80e680c',
+          'symbol': 'CFC2023XAMPL',
+          'nfts': {
+            'description':
+                'Example Crowdfunding Campaign issues your wallet a receipt (NFT) when you make a pledge. Should you decide to cancel your pledge before the campaign completes, this receipt can be redeemed with the on-chain contract to receive a refund.',
+            'fields': {
+              'pledgeValue': {
+                'name': 'Pledge Value',
+                'description':
                     "The value pledged to the campaign in Bitcoin Cash.\n\nThis example demonstrates the additional capabilities of the 'number' encoding; clients are informed that pledge value can be aggregated (by addition) in views containing multiple NFTs to provide useful information to the user. For example, if the wallet holds two NFTs with Pledge Values of 123456 and 654321, the wallet can display a total of the user's pledges to this campaign: 0.00777777 BCH.",
-                "encoding": {
-                  "type": "number",
-                  "aggregate": "add",
-                  "decimals": 8,
-                  "unit": "BCH"
+                'encoding': {
+                  'type': 'number',
+                  'aggregate': 'add',
+                  'decimals': 8,
+                  'unit': 'BCH'
                 }
               }
             },
-            "parse": {
-              "bytecode": "006b00cf6b",
-              "types": {
-                "": {
-                  "name": "Pledge Receipt",
-                  "description":
-                      "An NFT of this category with a zero-length on-chain commitment (VM number 0). Where appropriate, user interfaces may display the ticker symbol of NFTs matching this type as CFC2023XAMPL-0.\n\nPledge Receipts are the only type of NFT demonstrated in this example, and they contain only one field: pledgeValue.",
-                  "fields": ["pledgeValue"],
-                  "uris": {
-                    "icon":
-                        "ipfs://bafybeihnmh5bkbaspp3xfdanje74pekhsklhobzzraeyywq6gcpb3iuvey/0.svg",
-                    "web": "https://example.com/campaign",
-                    "custom-uri-identifier": "protocol://data-for-some-protocol"
+            'parse': {
+              'bytecode': '006b00cf6b',
+              'types': {
+                '': {
+                  'name': 'Pledge Receipt',
+                  'description':
+                      'An NFT of this category with a zero-length on-chain commitment (VM number 0). Where appropriate, user interfaces may display the ticker symbol of NFTs matching this type as CFC2023XAMPL-0.\n\nPledge Receipts are the only type of NFT demonstrated in this example, and they contain only one field: pledgeValue.',
+                  'fields': ['pledgeValue'],
+                  'uris': {
+                    'icon':
+                        'ipfs://bafybeihnmh5bkbaspp3xfdanje74pekhsklhobzzraeyywq6gcpb3iuvey/0.svg',
+                    'web': 'https://example.com/campaign',
+                    'custom-uri-identifier': 'protocol://data-for-some-protocol'
                   }
                 }
               }
             }
           }
         },
-        "uris": {
-          "icon": "https://example.com/campaign-icon.svg",
-          "web": "https://example.com/about-campaign",
-          "blog": "https://blog.example.com/",
-          "chat": "https://chat.example.com/",
-          "forum": "https://forum.example.com/",
-          "registry":
-              "https://example.com/.well-known/bitcoin-cash-metadata-registry.json",
-          "support": "https://support.example.com/",
-          "custom-uri-identifier":
-              "protocol://connection-info-for-some-protocol"
+        'uris': {
+          'icon': 'https://example.com/campaign-icon.svg',
+          'web': 'https://example.com/about-campaign',
+          'blog': 'https://blog.example.com/',
+          'chat': 'https://chat.example.com/',
+          'forum': 'https://forum.example.com/',
+          'registry':
+              'https://example.com/.well-known/bitcoin-cash-metadata-registry.json',
+          'support': 'https://support.example.com/',
+          'custom-uri-identifier':
+              'protocol://connection-info-for-some-protocol'
         }
       }
     }
   },
-  "license": "CC0-1.0"
+  'license': 'CC0-1.0'
 };
diff --git a/test/bcmr/fungible_token.dart b/test/bcmr/fungible_token.dart
index 8bac512..e3a1f40 100644
--- a/test/bcmr/fungible_token.dart
+++ b/test/bcmr/fungible_token.dart
@@ -1,36 +1,36 @@
 const fungibleToken = {
-  r"$schema": "https://cashtokens.org/bcmr-v2.schema.json",
-  "version": {"major": 1, "minor": 1, "patch": 0},
-  "latestRevision": "2023-04-14T00:00:17.720Z",
-  "registryIdentity": {
-    "name": "Example.com Token Registry",
-    "description":
-        "An example registry demonstrating how the issuer of a single kind of fungible token might publish information about the token.",
-    "uris": {
-      "icon": "https://example.com/registry-icon.svg",
-      "web": "https://example.com/",
-      "registry":
-          "https://example.com/.well-known/bitcoin-cash-metadata-registry.json"
+  r'$schema': 'https://cashtokens.org/bcmr-v2.schema.json',
+  'version': {'major': 1, 'minor': 1, 'patch': 0},
+  'latestRevision': '2023-04-14T00:00:17.720Z',
+  'registryIdentity': {
+    'name': 'Example.com Token Registry',
+    'description':
+        'An example registry demonstrating how the issuer of a single kind of fungible token might publish information about the token.',
+    'uris': {
+      'icon': 'https://example.com/registry-icon.svg',
+      'web': 'https://example.com/',
+      'registry':
+          'https://example.com/.well-known/bitcoin-cash-metadata-registry.json'
     }
   },
-  "identities": {
-    "89cad9e3e34280eb1e8bc420542c00a7fcc01002b663dbf7f38bceddf80e680c": {
-      "2023-01-03T00:00:00.000Z": {
-        "name": "Example Asset",
-        "description":
+  'identities': {
+    '89cad9e3e34280eb1e8bc420542c00a7fcc01002b663dbf7f38bceddf80e680c': {
+      '2023-01-03T00:00:00.000Z': {
+        'name': 'Example Asset',
+        'description':
             "This is a record of an older entry for the token identity. The token was rebranded (from EXAMPLE to XAMPL) and redenominated (from 8 to 6 decimals), but the existing token category was not modified: users were not required to trade their original EXAMPLE tokens for the redenominated XAMPL tokens, their wallets simply updated the way tokens are displayed using the new metadata. Note, this entry has likely been updated by the issuer to provide useful historical information rather than attempting to preserve the precise contents of the old snapshot; the 'web' URI links to a blog post about XAMPL's re-denomination/re-brand, and outdated URI information is excluded. There may have been metadata updates published between this snapshot and the latest snapshot, but they've been excluded because registries should strive to present a useful history of only meaningful changes to identities. This information can be used in user interfaces to improve continuity following metadata updates or to offer historical context.",
-        "token": {
-          "category":
-              "89cad9e3e34280eb1e8bc420542c00a7fcc01002b663dbf7f38bceddf80e680c",
-          "decimals": 8,
-          "symbol": "EXAMPLE"
+        'token': {
+          'category':
+              '89cad9e3e34280eb1e8bc420542c00a7fcc01002b663dbf7f38bceddf80e680c',
+          'decimals': 8,
+          'symbol': 'EXAMPLE'
         },
-        "uris": {
-          "icon": "https://example.com/old-example-asset-icon.png",
-          "web": "https://blog.example.com/example-asset-is-now-XAMPL"
+        'uris': {
+          'icon': 'https://example.com/old-example-asset-icon.png',
+          'web': 'https://blog.example.com/example-asset-is-now-XAMPL'
         }
       }
     }
   },
-  "license": "CC0-1.0"
+  'license': 'CC0-1.0'
 };
diff --git a/test/bcmr/payouts_or_dividends.dart b/test/bcmr/payouts_or_dividends.dart
index b4c262f..1bf745d 100644
--- a/test/bcmr/payouts_or_dividends.dart
+++ b/test/bcmr/payouts_or_dividends.dart
@@ -1,87 +1,87 @@
 const payoutsOrDividends = {
-  r"$schema": "https://cashtokens.org/bcmr-v2.schema.json",
-  "version": {"major": 1, "minor": 1, "patch": 0},
-  "latestRevision": "2023-04-14T00:00:17.720Z",
-  "registryIdentity": {
-    "name": "Example.com Token Registry",
-    "description":
+  r'$schema': 'https://cashtokens.org/bcmr-v2.schema.json',
+  'version': {'major': 1, 'minor': 1, 'patch': 0},
+  'latestRevision': '2023-04-14T00:00:17.720Z',
+  'registryIdentity': {
+    'name': 'Example.com Token Registry',
+    'description':
         "An example demonstrating how a registry might publish information about fungible tokens that receive on-chain payouts or dividends, either from off-chain activities (e.g. equity or debt instruments) or as part of an on-chain mechanism (e.g. payouts from a decentralized application or sidechain).\n\nDescriptions below are written from the perspective of a client reading this registry shortly after its 'lastRevision' timestamp on 2023-04-14.",
-    "uris": {
-      "icon": "https://example.com/registry-icon.svg",
-      "web": "https://example.com/",
-      "registry":
-          "https://example.com/.well-known/bitcoin-cash-metadata-registry.json"
+    'uris': {
+      'icon': 'https://example.com/registry-icon.svg',
+      'web': 'https://example.com/',
+      'registry':
+          'https://example.com/.well-known/bitcoin-cash-metadata-registry.json'
     }
   },
-  "identities": {
-    "978306aa4e02fd06e251b38d2e961f78f4af2ea6524a3e4531126776276a6af1": {
-      "2023-06-30T00:00:00.000Z": {
-        "name": "Example Payout Shares",
-        "description":
+  'identities': {
+    '978306aa4e02fd06e251b38d2e961f78f4af2ea6524a3e4531126776276a6af1': {
+      '2023-06-30T00:00:00.000Z': {
+        'name': 'Example Payout Shares',
+        'description':
             "This is a description of Example Payout Shares. In most interfaces, it will be hidden beyond 140 characters or the first newline character.\n\nThis sentence should be hidden in user interfaces with limited space.\n\nThis asset entitles holders to on-chain payouts of some kind. For example, they may be shares of a company, interest-paying debt, or utility tokens of a decentralized application where holders have performed some service to the protocol (e.g. sidechain validation, liquidity provision, etc.).\n\nNote that this particular identity snapshot has not yet come into effect (assuming the client is reading the registry shortly after its 'lastRevision' timestamp on 2023-04-14); the next identity snapshot contains the current information for the identity. Instead, this snapshot indicates an update to the identity expected to happen in the future: a payout for 2023Q2, where token holders will trade in fungible tokens of the 2023Q2 category for a quarterly payout and receive an equivalent number of fungible tokens of the new, 2023Q3 category listed in this snapshot.",
-        "migrated": "2023-07-01T00:00:00.000Z",
-        "token": {
-          "category":
-              "89cad9e3e34280eb1e8bc420542c00a7fcc01002b663dbf7f38bceddf80e680c",
-          "decimals": 6,
-          "symbol": "XAMPL-23Q3"
+        'migrated': '2023-07-01T00:00:00.000Z',
+        'token': {
+          'category':
+              '89cad9e3e34280eb1e8bc420542c00a7fcc01002b663dbf7f38bceddf80e680c',
+          'decimals': 6,
+          'symbol': 'XAMPL-23Q3'
         },
-        "uris": {
-          "icon": "https://example.com/asset-icon.svg",
-          "web": "https://example.com/",
-          "migrate": "https://app.example.com/payouts/2023Q2",
-          "blog": "https://blog.example.com/",
-          "chat": "https://chat.example.com/",
-          "forum": "https://forum.example.com/",
-          "registry":
-              "https://example.com/.well-known/bitcoin-cash-metadata-registry.json",
-          "support": "https://support.example.com/",
-          "custom-uri-identifier":
-              "protocol://connection-info-for-some-protocol"
+        'uris': {
+          'icon': 'https://example.com/asset-icon.svg',
+          'web': 'https://example.com/',
+          'migrate': 'https://app.example.com/payouts/2023Q2',
+          'blog': 'https://blog.example.com/',
+          'chat': 'https://chat.example.com/',
+          'forum': 'https://forum.example.com/',
+          'registry':
+              'https://example.com/.well-known/bitcoin-cash-metadata-registry.json',
+          'support': 'https://support.example.com/',
+          'custom-uri-identifier':
+              'protocol://connection-info-for-some-protocol'
         }
       },
-      "2023-03-31T00:00:00.000Z": {
-        "name": "Example Payout Shares",
-        "description":
+      '2023-03-31T00:00:00.000Z': {
+        'name': 'Example Payout Shares',
+        'description':
             "The current identity snapshot for this token identity (assuming the client is reading the registry shortly after its 'lastRevision' timestamp on 2023-04-14). Note that as of now, tokens of this category (b1a35ca...) should be listed by the client simply by base symbol: XAMPL. When the next snapshot's initial timestamp is reached (2023-06-30) their full symbol should be displayed, XAMPL-23Q2, as the latest category for this token identity will become XAMPL-23Q3 (89cad9...), and only tokens of that category should be referred to using the base symbol. Holders of XAMPL-23Q2 can refer to the 'migrate' URI in the next snapshot for information about acquiring the new XAMPL tokens (XAMPL-23Q3) and their 2nd quarterly payout by trading in their XAMPL-23Q2 fungible tokens.",
-        "migrated": "2023-04-01T00:00:00.000Z",
-        "token": {
-          "category":
-              "b1a35cadd5ddb1bd18787eeb99ee061f34b946f0db375d84caadd8ab621c10f5",
-          "decimals": 6,
-          "symbol": "XAMPL-23Q2"
+        'migrated': '2023-04-01T00:00:00.000Z',
+        'token': {
+          'category':
+              'b1a35cadd5ddb1bd18787eeb99ee061f34b946f0db375d84caadd8ab621c10f5',
+          'decimals': 6,
+          'symbol': 'XAMPL-23Q2'
         },
-        "uris": {
-          "icon": "https://example.com/asset-icon.svg",
-          "web": "https://example.com/",
-          "migrate": "https://app.example.com/payouts/2023Q1",
-          "blog": "https://blog.example.com/",
-          "chat": "https://chat.example.com/",
-          "forum": "https://forum.example.com/",
-          "registry":
-              "https://example.com/.well-known/bitcoin-cash-metadata-registry.json",
-          "support": "https://support.example.com/",
-          "custom-uri-identifier":
-              "protocol://connection-info-for-some-protocol"
+        'uris': {
+          'icon': 'https://example.com/asset-icon.svg',
+          'web': 'https://example.com/',
+          'migrate': 'https://app.example.com/payouts/2023Q1',
+          'blog': 'https://blog.example.com/',
+          'chat': 'https://chat.example.com/',
+          'forum': 'https://forum.example.com/',
+          'registry':
+              'https://example.com/.well-known/bitcoin-cash-metadata-registry.json',
+          'support': 'https://support.example.com/',
+          'custom-uri-identifier':
+              'protocol://connection-info-for-some-protocol'
         }
       },
-      "2022-12-31T00:00:00.000Z": {
-        "name": "Example Payout Shares (2023Q1)",
-        "description":
+      '2022-12-31T00:00:00.000Z': {
+        'name': 'Example Payout Shares (2023Q1)',
+        'description':
             "Payout shares for Example Protocol for the first quarter of 2023. These shares can be redeemed with the on-chain payout system to receive the payout and the new tokens for 2023Q2. See the linked website for details.\n\nExample note: this asset (XAMPL-23Q1, 978306...) will still be held in wallets that have not yet redeemed the 2023Q1 payout. Because the payout is held by an on-chain covenant, it's safe to delay redemption indefinitely, as funds (and the new, XAMPL-23Q2 tokens) will remain in the covenant until fully claimed by existing XAMPL-23Q1 holders. Some holders may leave XAMPL-23Q1 tokens in long-term vaults for many quarters before withdrawing, redeeming all payouts, and depositing the latest XAMPL tokens back in such vaults.",
-        "migrated": "2023-01-01T00:00:00.000Z",
-        "token": {
-          "category":
-              "978306aa4e02fd06e251b38d2e961f78f4af2ea6524a3e4531126776276a6af1",
-          "decimals": 6,
-          "symbol": "XAMPL-23Q1"
+        'migrated': '2023-01-01T00:00:00.000Z',
+        'token': {
+          'category':
+              '978306aa4e02fd06e251b38d2e961f78f4af2ea6524a3e4531126776276a6af1',
+          'decimals': 6,
+          'symbol': 'XAMPL-23Q1'
         },
-        "uris": {
-          "icon": "https://example.com/asset-icon-pending-payout.svg",
-          "web": "https://blog.example.com/payout-2023Q1"
+        'uris': {
+          'icon': 'https://example.com/asset-icon-pending-payout.svg',
+          'web': 'https://blog.example.com/payout-2023Q1'
         }
       }
     }
   },
-  "license": "CC0-1.0"
+  'license': 'CC0-1.0'
 };
diff --git a/test/bitcoin_cash_address_test.dart b/test/bitcoin_cash_address_test.dart
index e67fe55..9a38eec 100644
--- a/test/bitcoin_cash_address_test.dart
+++ b/test/bitcoin_cash_address_test.dart
@@ -23,182 +23,182 @@ import 'package:test/test.dart';
 // # THE SOFTWARE.
 
 final Map<String, Map<String, dynamic>> bitcoinCashAddresses = {
-  "bitcoincash:qr7fzmep8g7h7ymfxy74lgc0v950j3r2959lhtxxsl": {
-    "type": 0,
-    "addressType": "P2PKH",
-    "programLength": 20,
-    "programBytes": "fc916f213a3d7f1369313d5fa30f6168f9446a2d",
-  },
-  "bitcoincash:zr7fzmep8g7h7ymfxy74lgc0v950j3r295z4y4gq0v": {
-    "type": 2,
-    "addressType": "Token-Aware P2PKH",
-    "programLength": 20,
-    "programBytes": "fc916f213a3d7f1369313d5fa30f6168f9446a2d",
-  },
-  "bchtest:qr7fzmep8g7h7ymfxy74lgc0v950j3r295pdnvy3hr": {
-    "type": 0,
-    "addressType": "P2PKH",
-    "programLength": 20,
-    "programBytes": "fc916f213a3d7f1369313d5fa30f6168f9446a2d",
-  },
-  "bchtest:zr7fzmep8g7h7ymfxy74lgc0v950j3r295x8qj2hgs": {
-    "type": 2,
-    "addressType": "Token-Aware P2PKH",
-    "programLength": 20,
-    "programBytes": "fc916f213a3d7f1369313d5fa30f6168f9446a2d",
-  },
-  "bchreg:qr7fzmep8g7h7ymfxy74lgc0v950j3r295m39d8z59": {
-    "type": 0,
-    "addressType": "P2PKH",
-    "programLength": 20,
-    "programBytes": "fc916f213a3d7f1369313d5fa30f6168f9446a2d",
-  },
-  "bchreg:zr7fzmep8g7h7ymfxy74lgc0v950j3r295umknfytk": {
-    "type": 2,
-    "addressType": "Token-Aware P2PKH",
-    "programLength": 20,
-    "programBytes": "fc916f213a3d7f1369313d5fa30f6168f9446a2d",
-  },
-  "prefix:qr7fzmep8g7h7ymfxy74lgc0v950j3r295fu6e430r": {
-    "type": 0,
-    "addressType": "P2PKH",
-    "programLength": 20,
-    "programBytes": "fc916f213a3d7f1369313d5fa30f6168f9446a2d",
-  },
-  "prefix:zr7fzmep8g7h7ymfxy74lgc0v950j3r295wkf8mhss": {
-    "type": 2,
-    "addressType": "Token-Aware P2PKH",
-    "programLength": 20,
-    "programBytes": "fc916f213a3d7f1369313d5fa30f6168f9446a2d",
-  },
-  "bitcoincash:qpagr634w55t4wp56ftxx53xukhqgl24yse53qxdge": {
-    "type": 0,
-    "addressType": "P2PKH",
-    "programLength": 20,
-    "programBytes": "7a81ea357528bab834d256635226e5ae047d5524",
-  },
-  "bitcoincash:zpagr634w55t4wp56ftxx53xukhqgl24ys77z7gth2": {
-    "type": 2,
-    "addressType": "Token-Aware P2PKH",
-    "programLength": 20,
-    "programBytes": "7a81ea357528bab834d256635226e5ae047d5524",
-  },
-  "bitcoincash:qq9l9e2dgkx0hp43qm3c3h252e9euugrfc6vlt3r9e": {
-    "type": 0,
-    "addressType": "P2PKH",
-    "programLength": 20,
-    "programBytes": "0bf2e54d458cfb86b106e388dd54564b9e71034e",
-  },
-  "bitcoincash:zq9l9e2dgkx0hp43qm3c3h252e9euugrfcaxv4l962": {
-    "type": 2,
-    "addressType": "Token-Aware P2PKH",
-    "programLength": 20,
-    "programBytes": "0bf2e54d458cfb86b106e388dd54564b9e71034e",
-  },
-  "bitcoincash:qre24q38ghy6k3pegpyvtxahu8q8hqmxmqqn28z85p": {
-    "type": 0,
-    "addressType": "P2PKH",
-    "programLength": 20,
-    "programBytes": "f2aa822745c9ab44394048c59bb7e1c07b8366d8",
-  },
-  "bitcoincash:zre24q38ghy6k3pegpyvtxahu8q8hqmxmq8eeevptj": {
-    "type": 2,
-    "addressType": "Token-Aware P2PKH",
-    "programLength": 20,
-    "programBytes": "f2aa822745c9ab44394048c59bb7e1c07b8366d8",
-  },
-  "bitcoincash:qz7xc0vl85nck65ffrsx5wvewjznp9lflgktxc5878": {
-    "type": 0,
-    "addressType": "P2PKH",
-    "programLength": 20,
-    "programBytes": "bc6c3d9f3d278b6a8948e06a399974853097e9fa",
-  },
-  "bitcoincash:zz7xc0vl85nck65ffrsx5wvewjznp9lflg3p4x6pp5": {
-    "type": 2,
-    "addressType": "Token-Aware P2PKH",
-    "programLength": 20,
-    "programBytes": "bc6c3d9f3d278b6a8948e06a399974853097e9fa",
-  },
-  "bitcoincash:ppawqn2h74a4t50phuza84kdp3794pq3ccvm92p8sh": {
-    "type": 1,
-    "addressType": "P2SH",
-    "programLength": 20,
-    "programBytes": "7ae04d57f57b55d1e1bf05d3d6cd0c7c5a8411c6",
-  },
-  "bitcoincash:rpawqn2h74a4t50phuza84kdp3794pq3cct3k50p0y": {
-    "type": 3,
-    "addressType": "Token-Aware P2SH",
-    "programLength": 20,
-    "programBytes": "7ae04d57f57b55d1e1bf05d3d6cd0c7c5a8411c6",
-  },
-  "bitcoincash:pqv53dwyatxse2xh7nnlqhyr6ryjgfdtagkd4vc388": {
-    "type": 1,
-    "addressType": "P2SH",
-    "programLength": 20,
-    "programBytes": "1948b5c4eacd0ca8d7f4e7f05c83d0c92425abea",
-  },
-  "bitcoincash:rqv53dwyatxse2xh7nnlqhyr6ryjgfdtag38xjkhc5": {
-    "type": 3,
-    "addressType": "Token-Aware P2SH",
-    "programLength": 20,
-    "programBytes": "1948b5c4eacd0ca8d7f4e7f05c83d0c92425abea",
-  },
-  "bitcoincash:prseh0a4aejjcewhc665wjqhppgwrz2lw5txgn666a": {
-    "type": 1,
-    "addressType": "P2SH",
-    "programLength": 20,
-    "programBytes": "e19bbfb5ee652c65d7c6b54748170850e1895f75",
-  },
-  "bitcoincash:rrseh0a4aejjcewhc665wjqhppgwrz2lw5vvmd5u9w": {
-    "type": 3,
-    "addressType": "Token-Aware P2SH",
-    "programLength": 20,
-    "programBytes": "e19bbfb5ee652c65d7c6b54748170850e1895f75",
-  },
-  "bitcoincash:pzltaslh7xnrsxeqm7qtvh0v53n3gfk0v5wwf6d7j4": {
-    "type": 1,
-    "addressType": "P2SH",
-    "programLength": 20,
-    "programBytes": "bebec3f7f1a6381b20df80b65deca4671426cf65",
-  },
-  "bitcoincash:rzltaslh7xnrsxeqm7qtvh0v53n3gfk0v5fy6yrcdx": {
-    "type": 3,
-    "addressType": "Token-Aware P2SH",
-    "programLength": 20,
-    "programBytes": "bebec3f7f1a6381b20df80b65deca4671426cf65",
-  },
-  "bitcoincash:pvqqqqqqqqqqqqqqqqqqqqqqzg69v7ysqqqqqqqqqqqqqqqqqqqqqpkp7fqn0": {
-    "type": 1,
-    "addressType": "P2SH",
-    "programLength": 32,
-    "programBytes":
-        "0000000000000000000000000000123456789000000000000000000000000000",
-  },
-  "bitcoincash:rvqqqqqqqqqqqqqqqqqqqqqqzg69v7ysqqqqqqqqqqqqqqqqqqqqqn9alsp2y": {
-    "type": 3,
-    "addressType": "Token-Aware P2SH",
-    "programLength": 32,
-    "programBytes":
-        "0000000000000000000000000000123456789000000000000000000000000000",
-  },
-  "bitcoincash:pdzyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3jh2p5nn": {
-    "type": 1,
-    "addressType": "P2SH",
-    "programLength": 32,
-    "programBytes":
-        "4444444444444444444444444444444444444444444444444444444444444444",
+  'bitcoincash:qr7fzmep8g7h7ymfxy74lgc0v950j3r2959lhtxxsl': {
+    'type': 0,
+    'addressType': 'P2PKH',
+    'programLength': 20,
+    'programBytes': 'fc916f213a3d7f1369313d5fa30f6168f9446a2d',
+  },
+  'bitcoincash:zr7fzmep8g7h7ymfxy74lgc0v950j3r295z4y4gq0v': {
+    'type': 2,
+    'addressType': 'Token-Aware P2PKH',
+    'programLength': 20,
+    'programBytes': 'fc916f213a3d7f1369313d5fa30f6168f9446a2d',
+  },
+  'bchtest:qr7fzmep8g7h7ymfxy74lgc0v950j3r295pdnvy3hr': {
+    'type': 0,
+    'addressType': 'P2PKH',
+    'programLength': 20,
+    'programBytes': 'fc916f213a3d7f1369313d5fa30f6168f9446a2d',
+  },
+  'bchtest:zr7fzmep8g7h7ymfxy74lgc0v950j3r295x8qj2hgs': {
+    'type': 2,
+    'addressType': 'Token-Aware P2PKH',
+    'programLength': 20,
+    'programBytes': 'fc916f213a3d7f1369313d5fa30f6168f9446a2d',
+  },
+  'bchreg:qr7fzmep8g7h7ymfxy74lgc0v950j3r295m39d8z59': {
+    'type': 0,
+    'addressType': 'P2PKH',
+    'programLength': 20,
+    'programBytes': 'fc916f213a3d7f1369313d5fa30f6168f9446a2d',
+  },
+  'bchreg:zr7fzmep8g7h7ymfxy74lgc0v950j3r295umknfytk': {
+    'type': 2,
+    'addressType': 'Token-Aware P2PKH',
+    'programLength': 20,
+    'programBytes': 'fc916f213a3d7f1369313d5fa30f6168f9446a2d',
+  },
+  'prefix:qr7fzmep8g7h7ymfxy74lgc0v950j3r295fu6e430r': {
+    'type': 0,
+    'addressType': 'P2PKH',
+    'programLength': 20,
+    'programBytes': 'fc916f213a3d7f1369313d5fa30f6168f9446a2d',
+  },
+  'prefix:zr7fzmep8g7h7ymfxy74lgc0v950j3r295wkf8mhss': {
+    'type': 2,
+    'addressType': 'Token-Aware P2PKH',
+    'programLength': 20,
+    'programBytes': 'fc916f213a3d7f1369313d5fa30f6168f9446a2d',
+  },
+  'bitcoincash:qpagr634w55t4wp56ftxx53xukhqgl24yse53qxdge': {
+    'type': 0,
+    'addressType': 'P2PKH',
+    'programLength': 20,
+    'programBytes': '7a81ea357528bab834d256635226e5ae047d5524',
+  },
+  'bitcoincash:zpagr634w55t4wp56ftxx53xukhqgl24ys77z7gth2': {
+    'type': 2,
+    'addressType': 'Token-Aware P2PKH',
+    'programLength': 20,
+    'programBytes': '7a81ea357528bab834d256635226e5ae047d5524',
+  },
+  'bitcoincash:qq9l9e2dgkx0hp43qm3c3h252e9euugrfc6vlt3r9e': {
+    'type': 0,
+    'addressType': 'P2PKH',
+    'programLength': 20,
+    'programBytes': '0bf2e54d458cfb86b106e388dd54564b9e71034e',
+  },
+  'bitcoincash:zq9l9e2dgkx0hp43qm3c3h252e9euugrfcaxv4l962': {
+    'type': 2,
+    'addressType': 'Token-Aware P2PKH',
+    'programLength': 20,
+    'programBytes': '0bf2e54d458cfb86b106e388dd54564b9e71034e',
+  },
+  'bitcoincash:qre24q38ghy6k3pegpyvtxahu8q8hqmxmqqn28z85p': {
+    'type': 0,
+    'addressType': 'P2PKH',
+    'programLength': 20,
+    'programBytes': 'f2aa822745c9ab44394048c59bb7e1c07b8366d8',
+  },
+  'bitcoincash:zre24q38ghy6k3pegpyvtxahu8q8hqmxmq8eeevptj': {
+    'type': 2,
+    'addressType': 'Token-Aware P2PKH',
+    'programLength': 20,
+    'programBytes': 'f2aa822745c9ab44394048c59bb7e1c07b8366d8',
+  },
+  'bitcoincash:qz7xc0vl85nck65ffrsx5wvewjznp9lflgktxc5878': {
+    'type': 0,
+    'addressType': 'P2PKH',
+    'programLength': 20,
+    'programBytes': 'bc6c3d9f3d278b6a8948e06a399974853097e9fa',
+  },
+  'bitcoincash:zz7xc0vl85nck65ffrsx5wvewjznp9lflg3p4x6pp5': {
+    'type': 2,
+    'addressType': 'Token-Aware P2PKH',
+    'programLength': 20,
+    'programBytes': 'bc6c3d9f3d278b6a8948e06a399974853097e9fa',
+  },
+  'bitcoincash:ppawqn2h74a4t50phuza84kdp3794pq3ccvm92p8sh': {
+    'type': 1,
+    'addressType': 'P2SH',
+    'programLength': 20,
+    'programBytes': '7ae04d57f57b55d1e1bf05d3d6cd0c7c5a8411c6',
+  },
+  'bitcoincash:rpawqn2h74a4t50phuza84kdp3794pq3cct3k50p0y': {
+    'type': 3,
+    'addressType': 'Token-Aware P2SH',
+    'programLength': 20,
+    'programBytes': '7ae04d57f57b55d1e1bf05d3d6cd0c7c5a8411c6',
+  },
+  'bitcoincash:pqv53dwyatxse2xh7nnlqhyr6ryjgfdtagkd4vc388': {
+    'type': 1,
+    'addressType': 'P2SH',
+    'programLength': 20,
+    'programBytes': '1948b5c4eacd0ca8d7f4e7f05c83d0c92425abea',
+  },
+  'bitcoincash:rqv53dwyatxse2xh7nnlqhyr6ryjgfdtag38xjkhc5': {
+    'type': 3,
+    'addressType': 'Token-Aware P2SH',
+    'programLength': 20,
+    'programBytes': '1948b5c4eacd0ca8d7f4e7f05c83d0c92425abea',
+  },
+  'bitcoincash:prseh0a4aejjcewhc665wjqhppgwrz2lw5txgn666a': {
+    'type': 1,
+    'addressType': 'P2SH',
+    'programLength': 20,
+    'programBytes': 'e19bbfb5ee652c65d7c6b54748170850e1895f75',
+  },
+  'bitcoincash:rrseh0a4aejjcewhc665wjqhppgwrz2lw5vvmd5u9w': {
+    'type': 3,
+    'addressType': 'Token-Aware P2SH',
+    'programLength': 20,
+    'programBytes': 'e19bbfb5ee652c65d7c6b54748170850e1895f75',
+  },
+  'bitcoincash:pzltaslh7xnrsxeqm7qtvh0v53n3gfk0v5wwf6d7j4': {
+    'type': 1,
+    'addressType': 'P2SH',
+    'programLength': 20,
+    'programBytes': 'bebec3f7f1a6381b20df80b65deca4671426cf65',
+  },
+  'bitcoincash:rzltaslh7xnrsxeqm7qtvh0v53n3gfk0v5fy6yrcdx': {
+    'type': 3,
+    'addressType': 'Token-Aware P2SH',
+    'programLength': 20,
+    'programBytes': 'bebec3f7f1a6381b20df80b65deca4671426cf65',
+  },
+  'bitcoincash:pvqqqqqqqqqqqqqqqqqqqqqqzg69v7ysqqqqqqqqqqqqqqqqqqqqqpkp7fqn0': {
+    'type': 1,
+    'addressType': 'P2SH',
+    'programLength': 32,
+    'programBytes':
+        '0000000000000000000000000000123456789000000000000000000000000000',
+  },
+  'bitcoincash:rvqqqqqqqqqqqqqqqqqqqqqqzg69v7ysqqqqqqqqqqqqqqqqqqqqqn9alsp2y': {
+    'type': 3,
+    'addressType': 'Token-Aware P2SH',
+    'programLength': 32,
+    'programBytes':
+        '0000000000000000000000000000123456789000000000000000000000000000',
+  },
+  'bitcoincash:pdzyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3jh2p5nn': {
+    'type': 1,
+    'addressType': 'P2SH',
+    'programLength': 32,
+    'programBytes':
+        '4444444444444444444444444444444444444444444444444444444444444444',
   },
 };
 
 void main() {
-  test("decode encode address", () {
+  test('decode encode address', () {
     for (final i in bitcoinCashAddresses.keys.toList()) {
       final info = Map.from(bitcoinCashAddresses[i]!);
-      BitcoinCashNetwork network = BitcoinCashNetwork.mainnet;
+      const network = BitcoinCashNetwork.mainnet;
       final address =
           BitcoinCashAddress(i, network: network, validateNetworkPrefix: false);
-      expect(address.baseAddress.addressProgram, info["programBytes"]);
-      final hrp = i.substring(0, i.indexOf(":"));
+      expect(address.baseAddress.addressProgram, info['programBytes']);
+      final hrp = i.substring(0, i.indexOf(':'));
       expect(i, address.toAddress(network, hrp));
     }
   });
diff --git a/test/bitcoin_cash_token_encoding_test.dart b/test/bitcoin_cash_token_encoding_test.dart
index 0e15346..cf8ca80 100644
--- a/test/bitcoin_cash_token_encoding_test.dart
+++ b/test/bitcoin_cash_token_encoding_test.dart
@@ -4,772 +4,771 @@ import 'package:test/test.dart';
 
 final List<Map<String, dynamic>> _validTestVector = [
   {
-    "prefix":
-        "efaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1001",
-    "data": {
-      "amount": "1",
-      "category":
-          "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+    'prefix':
+        'efaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1001',
+    'data': {
+      'amount': '1',
+      'category':
+          'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
     }
   },
   {
-    "prefix":
-        "ef21430000000000000000000000000000000000000000000000000000000034121001",
-    "data": {
-      "amount": "1",
-      "category":
-          "1234000000000000000000000000000000000000000000000000000000004321"
+    'prefix':
+        'ef21430000000000000000000000000000000000000000000000000000000034121001',
+    'data': {
+      'amount': '1',
+      'category':
+          '1234000000000000000000000000000000000000000000000000000000004321'
     }
   },
   {
-    "prefix":
-        "ef21436587090000000000000000000000000000000000000000000090785634121001",
-    "data": {
-      "amount": "1",
-      "category":
-          "1234567890000000000000000000000000000000000000000000000987654321"
+    'prefix':
+        'ef21436587090000000000000000000000000000000000000000000090785634121001',
+    'data': {
+      'amount': '1',
+      'category':
+          '1234567890000000000000000000000000000000000000000000000987654321'
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb1001",
-    "data": {
-      "amount": "1",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb1001',
+    'data': {
+      'amount': '1',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb10fc",
-    "data": {
-      "amount": "252",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb10fc',
+    'data': {
+      'amount': '252',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb10fdfd00",
-    "data": {
-      "amount": "253",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb10fdfd00',
+    'data': {
+      'amount': '253',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb10fdffff",
-    "data": {
-      "amount": "65535",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb10fdffff',
+    'data': {
+      'amount': '65535',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb10fe00000100",
-    "data": {
-      "amount": "65536",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb10fe00000100',
+    'data': {
+      'amount': '65536',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb10fe01000100",
-    "data": {
-      "amount": "65537",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb10fe01000100',
+    'data': {
+      'amount': '65537',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb10feffffffff",
-    "data": {
-      "amount": "4294967295",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb10feffffffff',
+    'data': {
+      'amount': '4294967295',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb10ff0000000001000000",
-    "data": {
-      "amount": "4294967296",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb10ff0000000001000000',
+    'data': {
+      'amount': '4294967296',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb10ff0100000001000000",
-    "data": {
-      "amount": "4294967297",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb10ff0100000001000000',
+    'data': {
+      'amount': '4294967297',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb10ffffffffffffffff7f",
-    "data": {
-      "amount": "9223372036854775807",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb10ffffffffffffffff7f',
+    'data': {
+      'amount': '9223372036854775807',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb20",
-    "data": {
-      "amount": "0",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "", "capability": "none"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb20',
+    'data': {
+      'amount': '0',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': '', 'capability': 'none'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb3001",
-    "data": {
-      "amount": "1",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "", "capability": "none"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb3001',
+    'data': {
+      'amount': '1',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': '', 'capability': 'none'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb30fc",
-    "data": {
-      "amount": "252",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "", "capability": "none"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb30fc',
+    'data': {
+      'amount': '252',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': '', 'capability': 'none'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb30fdfd00",
-    "data": {
-      "amount": "253",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "", "capability": "none"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb30fdfd00',
+    'data': {
+      'amount': '253',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': '', 'capability': 'none'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb30fdffff",
-    "data": {
-      "amount": "65535",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "", "capability": "none"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb30fdffff',
+    'data': {
+      'amount': '65535',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': '', 'capability': 'none'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb30fe00000100",
-    "data": {
-      "amount": "65536",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "", "capability": "none"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb30fe00000100',
+    'data': {
+      'amount': '65536',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': '', 'capability': 'none'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb30feffffffff",
-    "data": {
-      "amount": "4294967295",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "", "capability": "none"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb30feffffffff',
+    'data': {
+      'amount': '4294967295',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': '', 'capability': 'none'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb30ff0000000001000000",
-    "data": {
-      "amount": "4294967296",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "", "capability": "none"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb30ff0000000001000000',
+    'data': {
+      'amount': '4294967296',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': '', 'capability': 'none'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb30ffffffffffffffff7f",
-    "data": {
-      "amount": "9223372036854775807",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "", "capability": "none"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb30ffffffffffffffff7f',
+    'data': {
+      'amount': '9223372036854775807',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': '', 'capability': 'none'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb6001cc",
-    "data": {
-      "amount": "0",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "cc", "capability": "none"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb6001cc',
+    'data': {
+      'amount': '0',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': 'cc', 'capability': 'none'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb60051234567890",
-    "data": {
-      "amount": "0",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "1234567890", "capability": "none"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb60051234567890',
+    'data': {
+      'amount': '0',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': '1234567890', 'capability': 'none'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7001cc01",
-    "data": {
-      "amount": "1",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "cc", "capability": "none"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7001cc01',
+    'data': {
+      'amount': '1',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': 'cc', 'capability': 'none'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7001ccfc",
-    "data": {
-      "amount": "252",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "cc", "capability": "none"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7001ccfc',
+    'data': {
+      'amount': '252',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': 'cc', 'capability': 'none'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7001ccfdfd00",
-    "data": {
-      "amount": "253",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "cc", "capability": "none"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7001ccfdfd00',
+    'data': {
+      'amount': '253',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': 'cc', 'capability': 'none'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7001ccfdffff",
-    "data": {
-      "amount": "65535",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "cc", "capability": "none"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7001ccfdffff',
+    'data': {
+      'amount': '65535',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': 'cc', 'capability': 'none'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7001ccfe00000100",
-    "data": {
-      "amount": "65536",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "cc", "capability": "none"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7001ccfe00000100',
+    'data': {
+      'amount': '65536',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': 'cc', 'capability': 'none'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7001ccfeffffffff",
-    "data": {
-      "amount": "4294967295",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "cc", "capability": "none"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7001ccfeffffffff',
+    'data': {
+      'amount': '4294967295',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': 'cc', 'capability': 'none'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7001ccff0000000001000000",
-    "data": {
-      "amount": "4294967296",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "cc", "capability": "none"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7001ccff0000000001000000',
+    'data': {
+      'amount': '4294967296',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': 'cc', 'capability': 'none'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7001ccffffffffffffffff7f",
-    "data": {
-      "amount": "9223372036854775807",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "cc", "capability": "none"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7001ccffffffffffffffff7f',
+    'data': {
+      'amount': '9223372036854775807',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': 'cc', 'capability': 'none'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb700accccccccccccccccccccfdffff",
-    "data": {
-      "amount": "65535",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "cccccccccccccccccccc", "capability": "none"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb700accccccccccccccccccccfdffff',
+    'data': {
+      'amount': '65535',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': 'cccccccccccccccccccc', 'capability': 'none'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7028cccccccccccccccccccccccccccccc"
-            "ccccccccccccccccccccccccccccccccccccccccccccccccccfe00000100",
-    "data": {
-      "amount": "65536",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {
-        "commitment":
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc",
-        "capability": "none"
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7028cccccccccccccccccccccccccccccc'
+            'ccccccccccccccccccccccccccccccccccccccccccccccccccfe00000100',
+    'data': {
+      'amount': '65536',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {
+        'commitment':
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc',
+        'capability': 'none'
       }
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7029cccccccccccccccccccccccccccccc"
-            "ccccccccccccccccccccccccccccccccccccccccccccccccccccfe00000100",
-    "data": {
-      "amount": "65536",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {
-        "commitment":
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc",
-        "capability": "none"
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7029cccccccccccccccccccccccccccccc'
+            'ccccccccccccccccccccccccccccccccccccccccccccccccccccfe00000100',
+    'data': {
+      'amount': '65536',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {
+        'commitment':
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc',
+        'capability': 'none'
       }
     }
   },
   {
-    "prefix": "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb60fdfd00cccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc",
-    "data": {
-      "amount": "0",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {
-        "commitment": "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc",
-        "capability": "none"
+    'prefix': 'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb60fdfd00cccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc',
+    'data': {
+      'amount': '0',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {
+        'commitment': 'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc',
+        'capability': 'none'
       }
     }
   },
   {
-    "prefix": "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb70fdfd00cccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccfe00000100",
-    "data": {
-      "amount": "65536",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {
-        "commitment": "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc",
-        "capability": "none"
+    'prefix': 'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb70fdfd00cccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccfe00000100',
+    'data': {
+      'amount': '65536',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {
+        'commitment': 'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc',
+        'capability': 'none'
       }
     }
   },
   {
-    "prefix": "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb70fde903cccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccfe00000100",
-    "data": {
-      "amount": "65536",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {
-        "commitment": "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc",
-        "capability": "none"
+    'prefix': 'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb70fde903cccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccfe00000100',
+    'data': {
+      'amount': '65536',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {
+        'commitment': 'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc',
+        'capability': 'none'
       }
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb21",
-    "data": {
-      "amount": "0",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "", "capability": "mutable"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb21',
+    'data': {
+      'amount': '0',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': '', 'capability': 'mutable'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb31feffffffff",
-    "data": {
-      "amount": "4294967295",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "", "capability": "mutable"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb31feffffffff',
+    'data': {
+      'amount': '4294967295',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': '', 'capability': 'mutable'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb6101cc",
-    "data": {
-      "amount": "0",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "cc", "capability": "mutable"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb6101cc',
+    'data': {
+      'amount': '0',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': 'cc', 'capability': 'mutable'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7101ccff0000000001000000",
-    "data": {
-      "amount": "4294967296",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "cc", "capability": "mutable"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7101ccff0000000001000000',
+    'data': {
+      'amount': '4294967296',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': 'cc', 'capability': 'mutable'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7102ccccffffffffffffffff7f",
-    "data": {
-      "amount": "9223372036854775807",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "cccc", "capability": "mutable"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7102ccccffffffffffffffff7f',
+    'data': {
+      'amount': '9223372036854775807',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': 'cccc', 'capability': 'mutable'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb710acccccccccccccccccccc01",
-    "data": {
-      "amount": "1",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "cccccccccccccccccccc", "capability": "mutable"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb710acccccccccccccccccccc01',
+    'data': {
+      'amount': '1',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': 'cccccccccccccccccccc', 'capability': 'mutable'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7128cccccccccccccccccccccccccccccc"
-            "ccccccccccccccccccccccccccccccccccccccccccccccccccfc",
-    "data": {
-      "amount": "252",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {
-        "commitment":
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc",
-        "capability": "mutable"
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7128cccccccccccccccccccccccccccccc'
+            'ccccccccccccccccccccccccccccccccccccccccccccccccccfc',
+    'data': {
+      'amount': '252',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {
+        'commitment':
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc',
+        'capability': 'mutable'
       }
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7129cccccccccccccccccccccccccccccc"
-            "ccccccccccccccccccccccccccccccccccccccccccccccccccccfc",
-    "data": {
-      "amount": "252",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {
-        "commitment":
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc",
-        "capability": "mutable"
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7129cccccccccccccccccccccccccccccc'
+            'ccccccccccccccccccccccccccccccccccccccccccccccccccccfc',
+    'data': {
+      'amount': '252',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {
+        'commitment':
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc',
+        'capability': 'mutable'
       }
     }
   },
   {
-    "prefix": "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb71fdfd00cccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc01",
-    "data": {
-      "amount": "1",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {
-        "commitment": "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc",
-        "capability": "mutable"
+    'prefix': 'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb71fdfd00cccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc01',
+    'data': {
+      'amount': '1',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {
+        'commitment': 'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc',
+        'capability': 'mutable'
       }
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb22",
-    "data": {
-      "amount": "0",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "", "capability": "minting"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb22',
+    'data': {
+      'amount': '0',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': '', 'capability': 'minting'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb3201",
-    "data": {
-      "amount": "1",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "", "capability": "minting"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb3201',
+    'data': {
+      'amount': '1',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': '', 'capability': 'minting'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb32fdfd00",
-    "data": {
-      "amount": "253",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "", "capability": "minting"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb32fdfd00',
+    'data': {
+      'amount': '253',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': '', 'capability': 'minting'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb32fe00000100",
-    "data": {
-      "amount": "65536",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "", "capability": "minting"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb32fe00000100',
+    'data': {
+      'amount': '65536',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': '', 'capability': 'minting'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb32ff0000000001000000",
-    "data": {
-      "amount": "4294967296",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "", "capability": "minting"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb32ff0000000001000000',
+    'data': {
+      'amount': '4294967296',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': '', 'capability': 'minting'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb32ffffffffffffffff7f",
-    "data": {
-      "amount": "9223372036854775807",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "", "capability": "minting"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb32ffffffffffffffff7f',
+    'data': {
+      'amount': '9223372036854775807',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': '', 'capability': 'minting'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb6201cc",
-    "data": {
-      "amount": "0",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "cc", "capability": "minting"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb6201cc',
+    'data': {
+      'amount': '0',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': 'cc', 'capability': 'minting'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb6229cccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccc",
-    "data": {
-      "amount": "0",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {
-        "commitment":
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc",
-        "capability": "minting"
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb6229cccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccc',
+    'data': {
+      'amount': '0',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {
+        'commitment':
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc',
+        'capability': 'minting'
       }
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7201ccfdffff",
-    "data": {
-      "amount": "65535",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "cc", "capability": "minting"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7201ccfdffff',
+    'data': {
+      'amount': '65535',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': 'cc', 'capability': 'minting'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7202ccccfe00000100",
-    "data": {
-      "amount": "65536",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "cccc", "capability": "minting"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7202ccccfe00000100',
+    'data': {
+      'amount': '65536',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': 'cccc', 'capability': 'minting'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb720accccccccccccccccccccff01000000"
-            "01000000",
-    "data": {
-      "amount": "4294967297",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {"commitment": "cccccccccccccccccccc", "capability": "minting"}
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb720accccccccccccccccccccff01000000'
+            '01000000',
+    'data': {
+      'amount': '4294967297',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {'commitment': 'cccccccccccccccccccc', 'capability': 'minting'}
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7228cccccccccccccccccccccccccccccc"
-            "ccccccccccccccccccccccccccccccccccccccccccccccccccffffffffffffffff7f",
-    "data": {
-      "amount": "9223372036854775807",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {
-        "commitment":
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc",
-        "capability": "minting"
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7228cccccccccccccccccccccccccccccc'
+            'ccccccccccccccccccccccccccccccccccccccccccccccccccffffffffffffffff7f',
+    'data': {
+      'amount': '9223372036854775807',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {
+        'commitment':
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc',
+        'capability': 'minting'
       }
     }
   },
   {
-    "prefix":
-        "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7229cccccccccccccccccccccccccccccc"
-            "ccccccccccccccccccccccccccccccccccccccccccccccccccccffffffffffffffff7f",
-    "data": {
-      "amount": "9223372036854775807",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {
-        "commitment":
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc",
-        "capability": "minting"
+    'prefix':
+        'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb7229cccccccccccccccccccccccccccccc'
+            'ccccccccccccccccccccccccccccccccccccccccccccccccccccffffffffffffffff7f',
+    'data': {
+      'amount': '9223372036854775807',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {
+        'commitment':
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc',
+        'capability': 'minting'
       }
     }
   },
   {
-    "prefix": "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb62fdfd00cccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc",
-    "data": {
-      "amount": "0",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {
-        "commitment": "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc",
-        "capability": "minting"
+    'prefix': 'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb62fdfd00cccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc',
+    'data': {
+      'amount': '0',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {
+        'commitment': 'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc',
+        'capability': 'minting'
       }
     }
   },
   {
-    "prefix": "efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb72fdfd00cccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-        "ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccfe00000100",
-    "data": {
-      "amount": "65536",
-      "category":
-          "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-      "nft": {
-        "commitment": "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc",
-        "capability": "minting"
+    'prefix': 'efbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb72fdfd00cccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+        'ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccfe00000100',
+    'data': {
+      'amount': '65536',
+      'category':
+          'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+      'nft': {
+        'commitment': 'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+            'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc',
+        'capability': 'minting'
       }
     }
   }
 ];
 void main() {
-  test("cash token encoding", () {
-    for (int c = 0; c < _validTestVector.length; c++) {
+  test('cash token encoding', () {
+    for (var c = 0; c < _validTestVector.length; c++) {
       final i = _validTestVector[c];
       final appendBytes = QuickCrypto.generateRandom(c * 2);
-      final tokenBytes = BytesUtils.fromHexString(i["prefix"]!);
-      final List<int> combine = [...tokenBytes, ...appendBytes];
+      final tokenBytes = BytesUtils.fromHexString(i['prefix']!);
+      final combine = <int>[...tokenBytes, ...appendBytes];
       final decode = CashToken.fromRaw(combine);
-      final data = Map<String, dynamic>.from(i["data"]);
-      final amount = BigInt.parse(data["amount"]);
+      final data = Map<String, dynamic>.from(i['data']);
+      final amount = BigInt.parse(data['amount']);
       final nft =
-          data["nft"] == null ? null : Map<String, dynamic>.from(data["nft"]);
+          data['nft'] == null ? null : Map<String, dynamic>.from(data['nft']);
       final capability =
-          nft == null ? null : CashTokenCapability.fromName(nft["capability"]);
-      final String commitment =
-          BytesUtils.toHexString(decode.item1!.commitment);
+          nft == null ? null : CashTokenCapability.fromName(nft['capability']);
+      final commitment = BytesUtils.toHexString(decode.item1!.commitment);
       expect(capability, decode.item1!.capability);
-      expect(decode.item1?.toHex(), i["prefix"]!);
-      expect(commitment, (nft?["commitment"] ?? ""));
+      expect(decode.item1?.toHex(), i['prefix']!);
+      expect(commitment, (nft?['commitment'] ?? ''));
       expect(amount, decode.item1!.amount);
       expect(combine.sublist(decode.item2), appendBytes);
     }
diff --git a/test/deserialize_test.dart b/test/deserialize_test.dart
new file mode 100644
index 0000000..e14d009
--- /dev/null
+++ b/test/deserialize_test.dart
@@ -0,0 +1,21 @@
+import 'package:bitcoin_base/src/bitcoin/script/transaction.dart';
+import 'package:test/test.dart';
+
+void main() {
+  _decodeTx();
+}
+
+void _decodeTx() {
+  test('decode transaction', () {
+    const data =
+        '020000000186389e3142effb82e00d38abc93ef856e543221ca6dd7d916760e0cda49f059300000000fd57030047304402204335c0185a9277c531315d0cd6c83bbe8d60d39f1b93864d9a4e67c8cccb400802207813732324a0cccf3989b4c56554bf06eaeea9175557525532926de939cfac3c414730440220515367fed3284a5469489c27fc7ea1915e7a07a939fb56d2188e5a27813b87690220578a491532d4bc84756fb489c2a5093b9f6884cfe852f2b469a89c7e35482ac0414730440220594f4cf6da2c88e430d1cc00d3b9b47b2936a9c4121be1c0e2e3b634e060c58202202c340707cc66aa27bd8fe40d9993751a0efa805b021f861fad460343b2826d4841473044022001c8e211117d20ecd3b3d7359e96485015303b4f55ba3039e40f1e035d867c2f02203c43c3e3f48a8215cb99a22b95d4d99defed9e385dbbacc4501c9c6fbc7db50141473044022000e95343e11b6765aa823c58c4fd1b78495b0a29f3fb428886ce858850827e6d02206bb967529a3289397e7c0482c063d872bc839306940b9e36e35457d840f2bfef4147304402200475c3a062644cf26269c91524cece25ff95cde8cbf52c7f180c1f7e45092fcf02207c4f4449aa69de7e8ae5825375825f5175462766e17bd1d7f96b5096f2d6ae004147304402201339113915d56209270d3be2c91ca0c04392db726a4909026924cce6236444310220476c5c6a8cdb6f973b62dad12b95a651269ad74cf767d5100d88ea98309ff9c4414730440220628dcdc3b1ed6e85d6df25c976fa09488b73e1d81f4ef80d02fcbfd852fd88a00220264ba1fc4fc6d92246f3a3511f76871954aee360c7e2e407dc317736fe910df6414d1301582102b509e03e5773ad6864d037eb1c8f9e9c39698bc5b59272d7f2156da2070d810f210369cc1b70ded5caf25b42b59ae13bdbee386e5dcaa0612a2a258dec02364040682103d850292f0e06a8e64c569a23cb310d192d4ad1b145c7050c6cb23bd9e8a4310421024fa5bd6af09db2740c39ec3e795eab200f091029b65d9013f7d3b52eb1cbc6e0210205a9f0be6d7f598c9a3b06cca6223705b49a43f5de5401eef93ee8c48ddf34b42103aaf256cb145aef9bea0bad969ca498108da7a3ad6da7cdeadcbcade2aa64fcea2103cb2ce8e4c87f7a6184abb30bf21cfb987634959f67bf20336d4208f4d7d62ac52103515a9b03688488850dd184e9229cb43634c1a39e2ccc5b8f2cf2c0a8cebb92e858aeffffffff0284030000000000001976a914e54b088d7f501604b1d85ed9d30f46b5db721ac288acc71c00000000000017a91492b98234f58410b0cea227d6e7e60ec08aa8547e8700000000';
+    final tx = BtcTransaction.fromRaw(data);
+    expect(tx.serialize(), data);
+  });
+  test('decode transaction 2', () {
+    const data =
+        '0200000000010b78c2ebf52b849090b70ba2bb3ec4a4447037ab41e56781f44f7cae3d82d356470000000000ffffffff78c2ebf52b849090b70ba2bb3ec4a4447037ab41e56781f44f7cae3d82d356470100000000ffffffff78c2ebf52b849090b70ba2bb3ec4a4447037ab41e56781f44f7cae3d82d3564702000000484730440220759a2beb31cbc0bfb30ad3cff3f3c84869b6549984ac8f5413bae19b0fed3aed022036718ddc6bbd7c7921d922fe90e7786ef67818208e268507dea99c782a578e1301ffffffff78c2ebf52b849090b70ba2bb3ec4a4447037ab41e56781f44f7cae3d82d356470300000000ffffffff78c2ebf52b849090b70ba2bb3ec4a4447037ab41e56781f44f7cae3d82d35647040000008a47304402202846a5ca5766a4ef0246e59cf11bfd0a182b5ce4fe366e43480df48efe92465f022005a47fdbefa0aa971d8804606362866bcf6d0c2bf8e4ecd0c31d04e7e28d4b7e0141042f1b310f4c065331bc0d79ba4661bb9822d67d7c4a1b0a1892e1fd0cd23aa68d2518d05511d46fc76b5bd2f94625b811df220f825786208cc5b5cca23de230ccffffffff78c2ebf52b849090b70ba2bb3ec4a4447037ab41e56781f44f7cae3d82d3564705000000a447304402203cdbff5392666f0d5bd364c9b83053e3b7508727102cba2f2110136359fd717402205069298f860fbd84f9b60466535c9ca226d92eaf9bf298c97df7f20b758248590141041a7a569e91dbf60581509c7fc946d1003b60c7dee85299538db6353538d59574b4e89d60c7d584d084632d296f125f165b4df8e061a49daeba51d36133d03e1a1976a914c880e94561d70cb61f2108deff2f1a6c10fff6a488acffffffff78c2ebf52b849090b70ba2bb3ec4a4447037ab41e56781f44f7cae3d82d3564706000000a447304402202e5f50e724c564dd1dde5cbad5ed87a803beb1b3f0a1401f3d5ee4a7e1ec9ed2022005efbc073f4862625923c68ac15a830b00f01a7e40fdebe7979528782a8c64180141041a7a569e91dbf60581509c7fc946d1003b60c7dee85299538db6353538d59574b4e89d60c7d584d084632d296f125f165b4df8e061a49daeba51d36133d03e1a1976a914c880e94561d70cb61f2108deff2f1a6c10fff6a488acffffffff78c2ebf52b849090b70ba2bb3ec4a4447037ab41e56781f44f7cae3d82d3564707000000232200209e7470b3013d2e9585f2009241f223beaefc8067f82a2a6f2dd87d74cb5969dbffffffff78c2ebf52b849090b70ba2bb3ec4a4447037ab41e56781f44f7cae3d82d35647080000008c473044022013608955698454f9eff9708cb98f2ff97d3a4d4ab9f8a80996d57a861ae712970220347ad5bca2e6773fb1fc817cd12bac451cfedae8f024e67e8fac905eaa2601370143410499c2aa85d2b21a62f396907a802a58e521dafd5bddaccbd72786eea189bc4dc9c40c3728b587c47395ce41a2afe84ee70016fafa39d3b54e66fc1f11aefda704acffffffff78c2ebf52b849090b70ba2bb3ec4a4447037ab41e56781f44f7cae3d82d3564709000000fd410400473044022062c412f612e08ed3cf5ce5aba3c8e556849a2ffdded9814525393bd4b61c76890220638557c4426a83012b0cf31fccd395c9a063f01942dcdadf5c86b174fceaffbe0147304402206bec40f5bb548e6f0e2c8b6ffe24d1173f60b1ebb0a870cef941e8499d34c9ae02204206d61ecdfd2aa0a300f91dafd9e7399f22bee9298d56d972e0d58e366977fe01473044022050f449a88e32850924a1d19ab9b82f676d2859ec38765d13b0a08902eb8bb95b02203c1bbc81ad3af940470cd100e4bf59bd92570d0dc8b76bf6196a90c8a528520a0147304402205e8e6937d25e139762ca57d4e4777e28bbd730cde2cd72d16b7f73eca04df84d022011141ef7b64b3b10ae9fc1c78c73453c1855ff997c05b2aed56ee24ee53a789f01473044022046c8000f5c97f5e8b388e6294db4ebd8cb45f4c58f844003ed571ee8b5965a6e02202f2880e91746bcf240a6cf1945de81016f6c46cb95265e67289611e1eaaffbd00147304402204610acecbda4763c3d7bcf3e656a1cdb1f0e6286dff755b36640c52d5153011b0220785bb66ff9e36d9de663379d520858d340c66845c3f9c7b4bfd4843bf6c2fc0f01473044022007c91bb30021f4b2d84ca5cc18458aeb6ee96d9d5881d09a37af845524d3ff10022068ffdca9828bc4648cdb954bd76436b373a3da07c376452325e52a01075e7b2201473044022007c91bb30021f4b2d84ca5cc18458aeb6ee96d9d5881d09a37af845524d3ff10022068ffdca9828bc4648cdb954bd76436b373a3da07c376452325e52a01075e7b2201473044022007c91bb30021f4b2d84ca5cc18458aeb6ee96d9d5881d09a37af845524d3ff10022068ffdca9828bc4648cdb954bd76436b373a3da07c376452325e52a01075e7b22014db5015941040f0fb9a244ad31a369ee02b7abfbbb0bfa3812b9a39ed93346d03d67d412d1777965c382f55222a9aed59cb8affc64bb5381f065eab9ef3baa57f2f0ac6bfae921022f1b310f4c065331bc0d79ba4661bb9822d67d7c4a1b0a1892e1fd0cd23aa68d210299c2aa85d2b21a62f396907a802a58e521dafd5bddaccbd72786eea189bc4dc921021a7a569e91dbf60581509c7fc946d1003b60c7dee85299538db6353538d595742103a92c9b7cac68758de5783ed8e5123598e4ad137091e42987d3bad8a08e35bf3d21034f355bdcb7cc0af728ef3cceb9615d90684bb5b2ca5f859ab0f0b704075871aa41046360e856310ce5d294e8be33fc807077dc56ac80d95d9cd4ddbd21325eff73f7eb1c2784a65901538479361e94c0a2597973adef0836a6a7eddf50b7997c88a341046360e856310ce5d294e8be33fc807077dc56ac80d95d9cd4ddbd21325eff73f7eb1c2784a65901538479361e94c0a2597973adef0836a6a7eddf50b7997c88a341046360e856310ce5d294e8be33fc807077dc56ac80d95d9cd4ddbd21325eff73f7eb1c2784a65901538479361e94c0a2597973adef0836a6a7eddf50b7997c88a359aeffffffff78c2ebf52b849090b70ba2bb3ec4a4447037ab41e56781f44f7cae3d82d356470a000000484730440220028b766844f8d4e5c28b2464605dfa79435c9203481976db468517ca96674b320220761f5687ce7d6067ba3cbe652e11b8495ac274b5ce0e7f1b8f59b2c34f007bf701ffffffff0be803000000000000160014b4bd9b543a615fe9b73ced34a9a38572ae18a395e8030000000000002200209e7470b3013d2e9585f2009241f223beaefc8067f82a2a6f2dd87d74cb5969dbe8030000000000004341040f0fb9a244ad31a369ee02b7abfbbb0bfa3812b9a39ed93346d03d67d412d1777965c382f55222a9aed59cb8affc64bb5381f065eab9ef3baa57f2f0ac6bfae9ace80300000000000022512039d1075e641ac7deda75bfbfa28aa5c65d7f39b1315e024f62e1064b1ec71d3ee8030000000000001976a914f9c4fccde68b163563e0d60842d1accd19c1207b88ace80300000000000017a91454db4f9a5c6f2de3110925e1f8cf42aeab807e6687e80300000000000017a91454db4f9a5c6f2de3110925e1f8cf42aeab807e6687e80300000000000017a914baf6af81b991265c3e3223f4649cf1b21afa73b987e80300000000000017a914c95d7440311017931c7adb20ab103e116e17ccbb87e80300000000000017a914d6215d5c57d6d65ae73eb0d8fe2ad7cfa07d441f879ba80000000000004341040f0fb9a244ad31a369ee02b7abfbbb0bfa3812b9a39ed93346d03d67d412d1777965c382f55222a9aed59cb8affc64bb5381f065eab9ef3baa57f2f0ac6bfae9ac02473044022044cd5a0eca8585d1dfb183dc12b37bfb41308244540d6a6ba449b6663f85f5e402206221b9980ecc54538e249a1c01972c6198c150945d12b6d124ebe523bd7bd2c30121021a7a569e91dbf60581509c7fc946d1003b60c7dee85299538db6353538d595740300473044022010b9f2310bc25214db7508df0107c8683c7c2f3eabb60aad2c35bed84d516159022059a643ad81a966716db06a2d707fefb234bffcac975ece1bc4b900239b50b7e501255121031d16453b3ab3132acb0a5bc16cc49690d819a585267a15cd5a064e2a0ad4059951ae000140daf8270bffc7a39c45114f5b180f5f82bc920803f3a612a4b517ce609e7e4ef30d8939102af08c9407f0cc4f9c63ffdda9914634dc59b1786d6d6b9d1b8a31960000000300473044022058f436dd9dc7d2966cd44a52989c972fb67e017d02e08723293fcfc4a3da3bff02200f8ff1bb6a95709ed5cfc47e9f567cba1fca8c9c10cd2db4f348152b3420361001255121031d16453b3ab3132acb0a5bc16cc49690d819a585267a15cd5a064e2a0ad4059951ae00000000000000';
+    final tx = BtcTransaction.fromRaw(data);
+    expect(tx.serialize(), data);
+  });
+}
diff --git a/test/encode_decode_transaction_test.dart b/test/encode_decode_transaction_test.dart
index b77dfdb..70b8b52 100644
--- a/test/encode_decode_transaction_test.dart
+++ b/test/encode_decode_transaction_test.dart
@@ -2,74 +2,74 @@ import 'package:bitcoin_base/bitcoin_base.dart';
 import 'package:test/test.dart';
 
 void main() {
-  test("test1", () {
+  test('test1', () {
     final tx = BtcTransaction(inputs: [
       TxInput(
         txId:
-            "daaa0beab7411cee74768b3f1d7da7ad55fcbc9d835fda0afbe1b9a41ae42f75",
+            'daaa0beab7411cee74768b3f1d7da7ad55fcbc9d835fda0afbe1b9a41ae42f75',
         txIndex: 0,
         scriptSig: Script(
           script: [
-            "304402203795e2aa978afbbd676b36c0edd1a39478744d320c5e02dd6a39d154755a5a3e02205545a7765bae3db9b820b1db9be2f8955a8998fa92ac08b0d7416aa30a3cee4241",
-            "03ac064f4489ff812c643471ed25b990e6be7212566c932b8680b900c8e6db0fd9"
+            '304402203795e2aa978afbbd676b36c0edd1a39478744d320c5e02dd6a39d154755a5a3e02205545a7765bae3db9b820b1db9be2f8955a8998fa92ac08b0d7416aa30a3cee4241',
+            '03ac064f4489ff812c643471ed25b990e6be7212566c932b8680b900c8e6db0fd9'
           ],
         ),
       ),
       TxInput(
           txId:
-              "daaa0beab7411cee74768b3f1d7da7ad55fcbc9d835fda0afbe1b9a41ae42f75",
+              'daaa0beab7411cee74768b3f1d7da7ad55fcbc9d835fda0afbe1b9a41ae42f75',
           txIndex: 2,
           scriptSig: Script(script: [
-            "3044022071b39d6aefdea7a7837310e5d78b1069ae82ed007991f8bca80bf3baf26340cc02200bc356be6e9f0019849b75b00322262a23ce179e7c0313207addfdbe596dabfd41",
-            "03ac064f4489ff812c643471ed25b990e6be7212566c932b8680b900c8e6db0fd9"
+            '3044022071b39d6aefdea7a7837310e5d78b1069ae82ed007991f8bca80bf3baf26340cc02200bc356be6e9f0019849b75b00322262a23ce179e7c0313207addfdbe596dabfd41',
+            '03ac064f4489ff812c643471ed25b990e6be7212566c932b8680b900c8e6db0fd9'
           ]))
     ], outputs: [
       TxOutput(
           amount: BigInt.from(10067000),
           scriptPubKey: Script(
             script: [
-              "OP_DUP",
-              "OP_HASH160",
-              "b8d913342894ec7b066420952a618ec2a8269bc2",
-              "OP_EQUALVERIFY",
-              "OP_CHECKSIG"
+              'OP_DUP',
+              'OP_HASH160',
+              'b8d913342894ec7b066420952a618ec2a8269bc2',
+              'OP_EQUALVERIFY',
+              'OP_CHECKSIG'
             ],
           )),
       TxOutput(
           amount: BigInt.from(1000),
           cashToken: CashToken(
             category:
-                "4e7873d4529edfd2c6459139257042950230baa9297f111b8675829443f70430",
+                '4e7873d4529edfd2c6459139257042950230baa9297f111b8675829443f70430',
             bitfield: 16,
             amount: BigInt.from(2000),
           ),
           scriptPubKey: Script(
             script: [
-              "OP_HASH256",
-              "1d12ffe8e85fdab36794cb09418982efdbd5c8cee5fbeb216ac43887ea4817b8",
-              "OP_EQUAL"
+              'OP_HASH256',
+              '1d12ffe8e85fdab36794cb09418982efdbd5c8cee5fbeb216ac43887ea4817b8',
+              'OP_EQUAL'
             ],
           )),
       TxOutput(
           amount: BigInt.from(1000),
           cashToken: CashToken(
             category:
-                "4e7873d4529edfd2c6459139257042950230baa9297f111b8675829443f70430",
+                '4e7873d4529edfd2c6459139257042950230baa9297f111b8675829443f70430',
             bitfield: 16,
-            amount: BigInt.parse("799999999999996000"),
+            amount: BigInt.parse('799999999999996000'),
           ),
           scriptPubKey: Script(
             script: [
-              "OP_DUP",
-              "OP_HASH160",
-              "b8d913342894ec7b066420952a618ec2a8269bc2",
-              "OP_EQUALVERIFY",
-              "OP_CHECKSIG"
+              'OP_DUP',
+              'OP_HASH160',
+              'b8d913342894ec7b066420952a618ec2a8269bc2',
+              'OP_EQUALVERIFY',
+              'OP_CHECKSIG'
             ],
           )),
     ]);
-    const String raw =
-        "0200000002752fe41aa4b9e1fb0ada5f839dbcfc55ada77d1d3f8b7674ee1c41b7ea0baada000000006a47304402203795e2aa978afbbd676b36c0edd1a39478744d320c5e02dd6a39d154755a5a3e02205545a7765bae3db9b820b1db9be2f8955a8998fa92ac08b0d7416aa30a3cee42412103ac064f4489ff812c643471ed25b990e6be7212566c932b8680b900c8e6db0fd9ffffffff752fe41aa4b9e1fb0ada5f839dbcfc55ada77d1d3f8b7674ee1c41b7ea0baada020000006a473044022071b39d6aefdea7a7837310e5d78b1069ae82ed007991f8bca80bf3baf26340cc02200bc356be6e9f0019849b75b00322262a23ce179e7c0313207addfdbe596dabfd412103ac064f4489ff812c643471ed25b990e6be7212566c932b8680b900c8e6db0fd9ffffffff03389c9900000000001976a914b8d913342894ec7b066420952a618ec2a8269bc288ace80300000000000048ef3004f743948275861b117f29a9ba300295427025399145c6d2df9e52d473784e10fdd007aa201d12ffe8e85fdab36794cb09418982efdbd5c8cee5fbeb216ac43887ea4817b887e80300000000000044ef3004f743948275861b117f29a9ba300295427025399145c6d2df9e52d473784e10ff60f04fecc22b1a0b76a914b8d913342894ec7b066420952a618ec2a8269bc288ac00000000";
+    const raw =
+        '0200000002752fe41aa4b9e1fb0ada5f839dbcfc55ada77d1d3f8b7674ee1c41b7ea0baada000000006a47304402203795e2aa978afbbd676b36c0edd1a39478744d320c5e02dd6a39d154755a5a3e02205545a7765bae3db9b820b1db9be2f8955a8998fa92ac08b0d7416aa30a3cee42412103ac064f4489ff812c643471ed25b990e6be7212566c932b8680b900c8e6db0fd9ffffffff752fe41aa4b9e1fb0ada5f839dbcfc55ada77d1d3f8b7674ee1c41b7ea0baada020000006a473044022071b39d6aefdea7a7837310e5d78b1069ae82ed007991f8bca80bf3baf26340cc02200bc356be6e9f0019849b75b00322262a23ce179e7c0313207addfdbe596dabfd412103ac064f4489ff812c643471ed25b990e6be7212566c932b8680b900c8e6db0fd9ffffffff03389c9900000000001976a914b8d913342894ec7b066420952a618ec2a8269bc288ace80300000000000048ef3004f743948275861b117f29a9ba300295427025399145c6d2df9e52d473784e10fdd007aa201d12ffe8e85fdab36794cb09418982efdbd5c8cee5fbeb216ac43887ea4817b887e80300000000000044ef3004f743948275861b117f29a9ba300295427025399145c6d2df9e52d473784e10ff60f04fecc22b1a0b76a914b8d913342894ec7b066420952a618ec2a8269bc288ac00000000';
     final tr = BtcTransaction.fromRaw(raw);
     expect(tx.toHex(), raw);
     expect(tr.toHex(), raw);
@@ -77,10 +77,10 @@ void main() {
     /// https://chipnet.imaginary.cash/tx/4ab0ce5507e228ca07a0fc5a75b91714e9855f4e859435dd26a09366ce31e575
   });
 
-  test("test 2", () {
+  test('test 2', () {
     /// https://tbch4.loping.net/tx/caa91b0fea2843a99c3cd7375ac4d3102b6b74a25e52cd866ad7ecc486204f0d
-    const String encodedTr =
-        "020000000252b6818f78bff46cbfdf3384875d3471f063f7c49f62658ffa22973c87649b5e000000006c473044022029198caf8776bcf9a8c3fcc79dbd4d3498cd938ba95962e5473fb77ad8d8a6510220265e7a0a14dca7bc1edb0a7bda4cd987f7893377b9cd9cfc9dbef97f85660bed41232103ac064f4489ff812c643471ed25b990e6be7212566c932b8680b900c8e6db0fd9acffffffff52b6818f78bff46cbfdf3384875d3471f063f7c49f62658ffa22973c87649b5e010000006c4730440220639b44bece1b3c2ed597c25497ee6f843ec2de033cb83292e0576b3f84cfc995022032713a60006d76c15bd0a6ddef758c06d61baa5f278bc993d98f03f69165d74741232103ac064f4489ff812c643471ed25b990e6be7212566c932b8680b900c8e6db0fd9acffffffff0510f699000000000023aa209f4ab972963cf18d86aa57fa875147f996916f06c28179f449cd14188818ba3187e80300000000000060efc4bf086c2c7bbb0405343873cf81b8b5d81d65126ce1bcddaa96591e79870d3f72156769746875622e636f6d2f6d72746e6574776f726bfe005a6202aa209f4ab972963cf18d86aa57fa875147f996916f06c28179f449cd14188818ba3187e80300000000000060efc4bf086c2c7bbb0405343873cf81b8b5d81d65126ce1bcddaa96591e79870d3f71156769746875622e636f6d2f6d72746e6574776f726bfe005a6202aa209f4ab972963cf18d86aa57fa875147f996916f06c28179f449cd14188818ba3187e80300000000000060efc4bf086c2c7bbb0405343873cf81b8b5d81d65126ce1bcddaa96591e79870d3f71156769746875622e636f6d2f6d72746e6574776f726bfe005a6202aa209f4ab972963cf18d86aa57fa875147f996916f06c28179f449cd14188818ba3187e80300000000000060efc4bf086c2c7bbb0405343873cf81b8b5d81d65126ce1bcddaa96591e79870d3f71156769746875622e636f6d2f6d72746e6574776f726bfe005a6202aa209f4ab972963cf18d86aa57fa875147f996916f06c28179f449cd14188818ba318700000000";
+    const encodedTr =
+        '020000000252b6818f78bff46cbfdf3384875d3471f063f7c49f62658ffa22973c87649b5e000000006c473044022029198caf8776bcf9a8c3fcc79dbd4d3498cd938ba95962e5473fb77ad8d8a6510220265e7a0a14dca7bc1edb0a7bda4cd987f7893377b9cd9cfc9dbef97f85660bed41232103ac064f4489ff812c643471ed25b990e6be7212566c932b8680b900c8e6db0fd9acffffffff52b6818f78bff46cbfdf3384875d3471f063f7c49f62658ffa22973c87649b5e010000006c4730440220639b44bece1b3c2ed597c25497ee6f843ec2de033cb83292e0576b3f84cfc995022032713a60006d76c15bd0a6ddef758c06d61baa5f278bc993d98f03f69165d74741232103ac064f4489ff812c643471ed25b990e6be7212566c932b8680b900c8e6db0fd9acffffffff0510f699000000000023aa209f4ab972963cf18d86aa57fa875147f996916f06c28179f449cd14188818ba3187e80300000000000060efc4bf086c2c7bbb0405343873cf81b8b5d81d65126ce1bcddaa96591e79870d3f72156769746875622e636f6d2f6d72746e6574776f726bfe005a6202aa209f4ab972963cf18d86aa57fa875147f996916f06c28179f449cd14188818ba3187e80300000000000060efc4bf086c2c7bbb0405343873cf81b8b5d81d65126ce1bcddaa96591e79870d3f71156769746875622e636f6d2f6d72746e6574776f726bfe005a6202aa209f4ab972963cf18d86aa57fa875147f996916f06c28179f449cd14188818ba3187e80300000000000060efc4bf086c2c7bbb0405343873cf81b8b5d81d65126ce1bcddaa96591e79870d3f71156769746875622e636f6d2f6d72746e6574776f726bfe005a6202aa209f4ab972963cf18d86aa57fa875147f996916f06c28179f449cd14188818ba3187e80300000000000060efc4bf086c2c7bbb0405343873cf81b8b5d81d65126ce1bcddaa96591e79870d3f71156769746875622e636f6d2f6d72746e6574776f726bfe005a6202aa209f4ab972963cf18d86aa57fa875147f996916f06c28179f449cd14188818ba318700000000';
     final decode = BtcTransaction.fromRaw(encodedTr);
     expect(decode.toHex(), encodedTr);
   });
diff --git a/test/keys_test.dart b/test/keys_test.dart
index 6f788a8..2074258 100644
--- a/test/keys_test.dart
+++ b/test/keys_test.dart
@@ -3,9 +3,9 @@ import 'package:blockchain_utils/blockchain_utils.dart';
 import 'package:test/test.dart';
 
 void main() {
-  group("TestPrivateKeys", () {
-    const keyWifc = "KwDiBf89QgGbjEhKnhXJuH7LrciVrZi3qYjgd9M7rFU73sVHnoWn";
-    const keyWif = "5HpHagT65TZzG1PH3CSu63k8DbpvD8s5ip4nEB3kEsreAnchuDf";
+  group('TestPrivateKeys', () {
+    const keyWifc = 'KwDiBf89QgGbjEhKnhXJuH7LrciVrZi3qYjgd9M7rFU73sVHnoWn';
+    const keyWif = '5HpHagT65TZzG1PH3CSu63k8DbpvD8s5ip4nEB3kEsreAnchuDf';
     final keyBytes = [
       0x00,
       0x00,
@@ -41,19 +41,18 @@ void main() {
       0x01,
     ];
 
-    test("test1", () {
-      final p = ECPrivate.fromWif(keyWifc,
-          netVersion: BitcoinNetwork.mainnet.wifNetVer);
+    test('test1', () {
+      final p = ECPrivate.fromWif(keyWifc, netVersion: BitcoinNetwork.mainnet.wifNetVer);
 
       expect(p.toBytes(), keyBytes);
-      expect(p.toWif(compressed: false), keyWif);
+      expect(p.toWif(pubKeyMode: PubKeyModes.uncompressed), keyWif);
     });
   });
 
-  group("TestPublicKeys", () {
-    const String publicKeyHex =
+  group('TestPublicKeys', () {
+    const publicKeyHex =
         '0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8';
-    final List<int> publicKeyBytes = List<int>.from([
+    final publicKeyBytes = List<int>.from([
       121,
       190,
       102,
@@ -119,95 +118,78 @@ void main() {
       212,
       184
     ]);
-    const String unCompressedAddress = '1EHNa6Q4Jz2uvNExL497mE43ikXhwF6kZm';
+    const unCompressedAddress = '1EHNa6Q4Jz2uvNExL497mE43ikXhwF6kZm';
 
-    test("testPubkeyCreation", () {
+    test('testPubkeyCreation', () {
       final pub1 = ECPublic.fromHex(publicKeyHex);
-      expect(
-          pub1.toP2pkhAddress(compressed: false).toAddress(BitcoinNetwork.mainnet),
+      expect(pub1.toAddress(mode: PublicKeyType.uncompressed).toAddress(BitcoinNetwork.mainnet),
           unCompressedAddress);
       expect(pub1.toBytes(whitPrefix: false), publicKeyBytes);
-      expect(pub1.toHash160(), pub1.toP2pkhAddress(compressed: true).addressProgram);
+      expect(pub1.toHash160(), pub1.toAddress().addressProgram);
     });
   });
 
-  group("TestP2pkhAddresses", () {
-    const String hash160 = '91b24bf9f5288532960ac687abb035127b1d28a5';
-    const String hash160c = '751e76e8199196d454941c45d1b3a323f1433bd6';
-    const String address = '1EHNa6Q4Jz2uvNExL497mE43ikXhwF6kZm';
-    const String addressc = '1BgGZ9tcN4rm9KBzDn7KprQz87SZ26SAMH';
-    test("test1", () {
+  group('TestP2pkhAddresses', () {
+    const hash160 = '91b24bf9f5288532960ac687abb035127b1d28a5';
+    const hash160c = '751e76e8199196d454941c45d1b3a323f1433bd6';
+    const address = '1EHNa6Q4Jz2uvNExL497mE43ikXhwF6kZm';
+    const addressc = '1BgGZ9tcN4rm9KBzDn7KprQz87SZ26SAMH';
+    test('test1', () {
       final p1 = P2pkhAddress.fromHash160(h160: hash160);
       final p2 = P2pkhAddress.fromHash160(h160: hash160c);
       expect(p1.toAddress(BitcoinNetwork.mainnet), address);
       expect(p2.toAddress(BitcoinNetwork.mainnet), addressc);
     });
-    test("test2", () {
-      final p1 = P2pkhAddress.fromAddress(
-          address: address, network: BitcoinNetwork.mainnet);
-      final p2 = P2pkhAddress.fromAddress(
-          address: addressc, network: BitcoinNetwork.mainnet);
+    test('test2', () {
+      final p1 = P2pkhAddress.fromAddress(address: address, network: BitcoinNetwork.mainnet);
+      final p2 = P2pkhAddress.fromAddress(address: addressc, network: BitcoinNetwork.mainnet);
       expect(p1.addressProgram, hash160);
       expect(p2.addressProgram, hash160c);
     });
   });
 
-  group("TestSignAndVerify", () {
-    const String message = "The test!";
-    const String keyWifc =
-        "KwDiBf89QgGbjEhKnhXJuH7LrciVrZi3qYjgd9M7rFU73sVHnoWn";
-    final ECPrivate priv = ECPrivate.fromWif(keyWifc,
-        netVersion: BitcoinNetwork.mainnet.wifNetVer);
-    final ECPublic pub = priv.getPublic();
+  group('TestSignAndVerify', () {
+    const message = 'The test!';
+    const keyWifc = 'KwDiBf89QgGbjEhKnhXJuH7LrciVrZi3qYjgd9M7rFU73sVHnoWn';
+    final priv = ECPrivate.fromWif(keyWifc, netVersion: BitcoinNetwork.mainnet.wifNetVer);
+    final pub = priv.getPublic();
 
-    test("test1", () {
+    test('test1', () {
       final sign = priv.signMessage(StringUtils.encode(message));
       pub.verify(StringUtils.encode(message), BytesUtils.fromHexString(sign));
 
-      expect(
-          pub.verify(
-              StringUtils.encode(message), BytesUtils.fromHexString(sign)),
-          true);
+      expect(pub.verify(StringUtils.encode(message), BytesUtils.fromHexString(sign)), true);
     });
 
-    test("test2", () {});
+    test('test2', () {});
   });
 
-  group("TestP2pkhAddresses", () {
-    final ECPrivate priv = ECPrivate.fromWif(
-        'cTALNpTpRbbxTCJ2A5Vq88UxT44w1PE2cYqiB3n4hRvzyCev1Wwo',
+  group('TestP2pkhAddresses', () {
+    final priv = ECPrivate.fromWif('cTALNpTpRbbxTCJ2A5Vq88UxT44w1PE2cYqiB3n4hRvzyCev1Wwo',
         netVersion: BitcoinNetwork.testnet.wifNetVer);
-    ECPublic pub = priv.getPublic();
-    const String p2shaddress = '2NDkr9uD2MSY5em3rsjkff8fLZcJzCfY3W1';
-    test("test create", () {
+    final pub = priv.getPublic();
+    const p2shaddress = '2NDkr9uD2MSY5em3rsjkff8fLZcJzCfY3W1';
+    test('test create', () {
       final script = Script(script: [pub.toHex(), 'OP_CHECKSIG']);
-      final addr = P2shAddress.fromRedeemScript(
-          script: script, type: P2shAddressType.p2pkInP2sh);
+      final addr = P2shAddress.fromRedeemScript(script: script, type: P2shAddressType.p2pkInP2sh);
       expect(addr.toAddress(BitcoinNetwork.testnet), p2shaddress);
     });
   });
 
-  group("TestP2pkhAddresses", () {
-    final ECPrivate priv = ECPrivate.fromWif(
-        'cVdte9ei2xsVjmZSPtyucG43YZgNkmKTqhwiUA8M4Fc3LdPJxPmZ',
+  group('TestP2pkhAddresses', () {
+    final priv = ECPrivate.fromWif('cVdte9ei2xsVjmZSPtyucG43YZgNkmKTqhwiUA8M4Fc3LdPJxPmZ',
         netVersion: BitcoinNetwork.testnet.wifNetVer);
-    ECPublic pub = priv.getPublic();
-    const String correctP2wpkhAddress =
-        'tb1qxmt9xgewg6mxc4mvnzvrzu4f2v0gy782fydg0w';
-    const String correctP2shP2wpkhAddress =
-        '2N8Z5t3GyPW1hSAEJZqQ1GUkZ9ofoGhgKPf';
-    const String correctP2wshAddress =
-        'tb1qy4kdfavhluvnhpwcqmqrd8x0ge2ynnsl7mv2mdmdskx4g3fc6ckq8f44jg';
-    const String correctP2shP2wshAddress =
-        '2NC2DBZd3WfEF9cZcpBRDYxCTGCVCfPUf7Q';
-    test("test1", () {
-      final address = P2wpkhAddress.fromProgram(
-          program: pub.toP2wpkhAddress().addressProgram);
+    final pub = priv.getPublic();
+    const correctP2wpkhAddress = 'tb1qxmt9xgewg6mxc4mvnzvrzu4f2v0gy782fydg0w';
+    const correctP2shP2wpkhAddress = '2N8Z5t3GyPW1hSAEJZqQ1GUkZ9ofoGhgKPf';
+    const correctP2wshAddress = 'tb1qy4kdfavhluvnhpwcqmqrd8x0ge2ynnsl7mv2mdmdskx4g3fc6ckq8f44jg';
+    const correctP2shP2wshAddress = '2NC2DBZd3WfEF9cZcpBRDYxCTGCVCfPUf7Q';
+    test('test1', () {
+      final address = P2wpkhAddress.fromProgram(program: pub.toP2wpkhAddress().addressProgram);
       expect(correctP2wpkhAddress, address.toAddress(BitcoinNetwork.testnet));
     });
-    test("test2", () {
-      final addr = ECPrivate.fromWif(
-              "cTmyBsxMQ3vyh4J3jCKYn2Au7AhTKvqeYuxxkinsg6Rz3BBPrYKK",
+    test('test2', () {
+      final addr = ECPrivate.fromWif('cTmyBsxMQ3vyh4J3jCKYn2Au7AhTKvqeYuxxkinsg6Rz3BBPrYKK',
               netVersion: BitcoinNetwork.testnet.wifNetVer)
           .getPublic()
           .toP2wpkhAddress();
@@ -215,29 +197,19 @@ void main() {
           script: addr.toScriptPubKey(), type: P2shAddressType.p2pkInP2sh);
       expect(correctP2shP2wpkhAddress, p2sh.toAddress(BitcoinNetwork.testnet));
     });
-    test("test3", () {
-      final prive = ECPrivate.fromWif(
-          "cNn8itYxAng4xR4eMtrPsrPpDpTdVNuw7Jb6kfhFYZ8DLSZBCg37",
+    test('test3', () {
+      final prive = ECPrivate.fromWif('cNn8itYxAng4xR4eMtrPsrPpDpTdVNuw7Jb6kfhFYZ8DLSZBCg37',
           netVersion: BitcoinNetwork.testnet.wifNetVer);
-      final script = Script(script: [
-        'OP_1',
-        prive.getPublic().toHex(),
-        'OP_1',
-        'OP_CHECKMULTISIG'
-      ]);
+      final script =
+          Script(script: ['OP_1', prive.getPublic().toHex(), 'OP_1', 'OP_CHECKMULTISIG']);
       final pw = P2wshAddress.fromRedeemScript(script: script);
       expect(pw.toAddress(BitcoinNetwork.testnet), correctP2wshAddress);
     });
-    test("test4", () {
-      final prive = ECPrivate.fromWif(
-          "cNn8itYxAng4xR4eMtrPsrPpDpTdVNuw7Jb6kfhFYZ8DLSZBCg37",
+    test('test4', () {
+      final prive = ECPrivate.fromWif('cNn8itYxAng4xR4eMtrPsrPpDpTdVNuw7Jb6kfhFYZ8DLSZBCg37',
           netVersion: BitcoinNetwork.testnet.wifNetVer);
-      final script = Script(script: [
-        'OP_1',
-        prive.getPublic().toHex(),
-        'OP_1',
-        'OP_CHECKMULTISIG'
-      ]);
+      final script =
+          Script(script: ['OP_1', prive.getPublic().toHex(), 'OP_1', 'OP_CHECKMULTISIG']);
       final pw = P2wshAddress.fromRedeemScript(script: script);
       final p2sh = P2shAddress.fromRedeemScript(
           script: pw.toScriptPubKey(), type: P2shAddressType.p2pkInP2sh);
@@ -245,50 +217,42 @@ void main() {
     });
   });
 
-  group("TestP2trAddresses", () {
-    final privEven = ECPrivate.fromWif(
-        'cTLeemg1bCXXuRctid7PygEn7Svxj4zehjTcoayrbEYPsHQo248w',
+  group('TestP2trAddresses', () {
+    final privEven = ECPrivate.fromWif('cTLeemg1bCXXuRctid7PygEn7Svxj4zehjTcoayrbEYPsHQo248w',
         netVersion: BitcoinNetwork.testnet.wifNetVer);
-    const String correctEvenPk =
-        '0271fe85f75e97d22e74c2dd6425e843def8b662b928f24f724ae6a2fd0c4e0419';
-    const String correctEvenTrAddr =
-        'tb1pk426x6qvmncj5vzhtp5f2pzhdu4qxsshszswga8ea6sycj9nulmsu7syz0';
-    const String correctEvenTweakedPk =
-        'b555a3680cdcf12a305758689504576f2a03421780a0e474f9eea04c48b3e7f7';
+    const correctEvenPk = '0271fe85f75e97d22e74c2dd6425e843def8b662b928f24f724ae6a2fd0c4e0419';
+    const correctEvenTrAddr = 'tb1pk426x6qvmncj5vzhtp5f2pzhdu4qxsshszswga8ea6sycj9nulmsu7syz0';
+    const correctEvenTweakedPk = 'b555a3680cdcf12a305758689504576f2a03421780a0e474f9eea04c48b3e7f7';
 
-    final privOdd = ECPrivate.fromWif(
-        'cRPxBiKrJsH94FLugmiL4xnezMyoFqGcf4kdgNXGuypNERhMK6AT',
+    final privOdd = ECPrivate.fromWif('cRPxBiKrJsH94FLugmiL4xnezMyoFqGcf4kdgNXGuypNERhMK6AT',
         netVersion: BitcoinNetwork.testnet.wifNetVer);
-    const String correctOddPk =
-        '03a957ff7ead882e4c95be2afa684ab0e84447149883aba60c067adc054472785b';
-    const String correctOddTrAddr =
-        'tb1pdr8q4tuqqeglxxhkxl3trxt0dy5jrnaqvg0ddwu7plraxvntp8dqv8kvyq';
-    const String correctOddTweakedPk =
-        '68ce0aaf800651f31af637e2b1996f692921cfa0621ed6bb9e0fc7d3326b09da';
-    test("test1", () {
+    const correctOddPk = '03a957ff7ead882e4c95be2afa684ab0e84447149883aba60c067adc054472785b';
+    const correctOddTrAddr = 'tb1pdr8q4tuqqeglxxhkxl3trxt0dy5jrnaqvg0ddwu7plraxvntp8dqv8kvyq';
+    const correctOddTweakedPk = '68ce0aaf800651f31af637e2b1996f692921cfa0621ed6bb9e0fc7d3326b09da';
+    test('test1', () {
       final pub = privEven.getPublic();
       expect(pub.toHex(), correctEvenPk);
     });
-    test("test2", () {
+    test('test2', () {
       final pub = privEven.getPublic();
       final addr = pub.toTaprootAddress().toAddress(BitcoinNetwork.testnet);
       expect(addr, correctEvenTrAddr);
     });
-    test("test3", () {
+    test('test3', () {
       final pub = privEven.getPublic();
       final addr = pub.toTaprootAddress();
       expect(addr.addressProgram, correctEvenTweakedPk);
     });
-    test("test4", () {
+    test('test4', () {
       final pub = privOdd.getPublic();
       expect(pub.toHex(), correctOddPk);
     });
-    test("test5", () {
+    test('test5', () {
       final pub = privOdd.getPublic();
       final addr = pub.toTaprootAddress().toAddress(BitcoinNetwork.testnet);
       expect(addr, correctOddTrAddr);
     });
-    test("test6", () {
+    test('test6', () {
       final pub = privOdd.getPublic();
       final addr = pub.toTaprootAddress();
       expect(addr.addressProgram, correctOddTweakedPk);
diff --git a/test/p2kh_tr_test.dart b/test/p2kh_tr_test.dart
index e77a9a0..208d4d1 100644
--- a/test/p2kh_tr_test.dart
+++ b/test/p2kh_tr_test.dart
@@ -2,7 +2,7 @@ import 'package:bitcoin_base/bitcoin_base.dart';
 import 'package:test/test.dart';
 
 void main() {
-  group("P2KH", () {
+  group('P2KH', () {
     final txin = TxInput(
         txId:
             'fb48f4e23bf6ddf606714141ac78c3e921c8c0bebeb7c8abb2c799e9ff96ce6c',
@@ -38,20 +38,20 @@ void main() {
         address: 'myPAE9HwPeKHh8FjKwBNBaHnemApo3dw6e',
         network: BitcoinNetwork.testnet);
 
-    const String coreTxResult =
+    const coreTxResult =
         '02000000016cce96ffe999c7b2abc8b7bebec0c821e9c378ac41417106f6ddf63be2f448fb0000000000ffffffff0280969800000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88ac4081ba01000000001976a914c992931350c9ba48538003706953831402ea34ea88ac00000000';
-    const String coreTxSignedResult =
+    const coreTxSignedResult =
         '02000000016cce96ffe999c7b2abc8b7bebec0c821e9c378ac41417106f6ddf63be2f448fb000000006a473044022079dad1afef077fa36dcd3488708dd05ef37888ef550b45eb00cdb04ba3fc980e02207a19f6261e69b604a92e2bffdf6ddbed0c64f55d5003e9dfb58b874b07aef3d7012103a2fef1829e0742b89c218c51898d9e7cb9d51201ba2bf9d9e9214ebb6af32708ffffffff0280969800000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88ac4081ba01000000001976a914c992931350c9ba48538003706953831402ea34ea88ac00000000';
-    const String coreTxSignedLowSSigallResult =
+    const coreTxSignedLowSSigallResult =
         '02000000016cce96ffe999c7b2abc8b7bebec0c821e9c378ac41417106f6ddf63be2f448fb000000006a473044022044ef433a24c6010a90af14f7739e7c60ce2c5bc3eab96eaee9fbccfdbb3e272202205372a617cb235d0a0ec2889dbfcadf15e10890500d184c8dda90794ecdf79492012103a2fef1829e0742b89c218c51898d9e7cb9d51201ba2bf9d9e9214ebb6af32708ffffffff0280969800000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88ac4081ba01000000001976a91442151d0c21442c2b038af0ad5ee64b9d6f4f4e4988ac00000000';
-    const String coreTxSignedLowSSignoneResult =
+    const coreTxSignedLowSSignoneResult =
         '02000000016cce96ffe999c7b2abc8b7bebec0c821e9c378ac41417106f6ddf63be2f448fb000000006a47304402201e4b7a2ed516485fdde697ba63f6670d43aa6f18d82f18bae12d5fd228363ac10220670602bec9df95d7ec4a619a2f44e0b8dcf522fdbe39530dd78d738c0ed0c430022103a2fef1829e0742b89c218c51898d9e7cb9d51201ba2bf9d9e9214ebb6af32708ffffffff0280969800000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88ac4081ba01000000001976a91442151d0c21442c2b038af0ad5ee64b9d6f4f4e4988ac00000000';
-    const String coreTxSignedLowSSignoneTxid =
+    const coreTxSignedLowSSignoneTxid =
         '105933681b0ca37ae0c0af43ae6f111803c899232b7fd586584b532dbe21ae6f';
 
     final sigTxin1 = TxInput(
         txId:
-            "76464c2b9e2af4d63ef38a77964b3b77e629dddefc5cb9eb1a3645b1608b790f",
+            '76464c2b9e2af4d63ef38a77964b3b77e629dddefc5cb9eb1a3645b1608b790f',
         txIndex: 0);
     final sigTxin2 = TxInput(
         txId:
@@ -93,21 +93,21 @@ void main() {
           'OP_EQUALVERIFY',
           'OP_CHECKSIG'
         ]));
-    const String sigSighashSingleResult =
+    const sigSighashSingleResult =
         '02000000010f798b60b145361aebb95cfcdedd29e6773b4b96778af33ed6f42a9e2b4c4676000000006a47304402202cfd7077fe8adfc5a65fb3953fa3482cad1413c28b53f12941c1082898d4935102201d393772c47f0699592268febb5b4f64dabe260f440d5d0f96dae5bc2b53e11e032102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a546ffffffff0240548900000000001976a914c3f8e5b0f8455a2b02c29c4488a550278209b66988aca0bb0d00000000001976a91442151d0c21442c2b038af0ad5ee64b9d6f4f4e4988ac00000000';
-    const String signSighashAll2in2outResult =
+    const signSighashAll2in2outResult =
         '02000000020f798b60b145361aebb95cfcdedd29e6773b4b96778af33ed6f42a9e2b4c4676000000006a4730440220355c3cf50b1d320d4ddfbe1b407ddbe508f8e31a38cc5531dec3534e8cb2e565022037d4e8d7ba9dd1c788c0d8b5b99270d4c1d4087cdee7f139a71fea23dceeca33012102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a546ffffffff0f798b60b145361aebb95cfcdedd29e6773b4b96778af33ed6f42a9e2b4c4676010000006a47304402206b728374b8879fd7a10cbd4f347934d583f4301aa5d592211487732c235b85b6022030acdc07761f227c27010bd022df4b22eb9875c65a59e8e8a5722229bc7362f4012102364d6f04487a71b5966eae3e14a4dc6f00dbe8e55e61bedd0b880766bfe72b5dffffffff0240548900000000001976a914c3f8e5b0f8455a2b02c29c4488a550278209b66988aca0bb0d00000000001976a91442151d0c21442c2b038af0ad5ee64b9d6f4f4e4988ac00000000';
-    const String signSighashNone2in2outResult =
+    const signSighashNone2in2outResult =
         '02000000020f798b60b145361aebb95cfcdedd29e6773b4b96778af33ed6f42a9e2b4c4676000000006a47304402202a2804048b7f84f2dd7641ec05bbaf3da9ae0d2a9f9ad476d376adfd8bf5033302205170fee2ab7b955d72ae2beac3bae15679d75584c37d78d82b07df5402605bab022102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a546ffffffff0f798b60b145361aebb95cfcdedd29e6773b4b96778af33ed6f42a9e2b4c4676010000006a473044022021a82914b002bd02090fbdb37e2e739e9ba97367e74db5e1de834bbab9431a2f02203a11f49a3f6ac03b1550ee04f9d84deee2045bc038cb8c3e70869470126a064d022102364d6f04487a71b5966eae3e14a4dc6f00dbe8e55e61bedd0b880766bfe72b5dffffffff0240548900000000001976a914c3f8e5b0f8455a2b02c29c4488a550278209b66988aca0bb0d00000000001976a91442151d0c21442c2b038af0ad5ee64b9d6f4f4e4988ac00000000';
 
-    const String signSighashAllSingleAnyone2in2outResult =
+    const signSighashAllSingleAnyone2in2outResult =
         '02000000020f798b60b145361aebb95cfcdedd29e6773b4b96778af33ed6f42a9e2b4c4676000000006a47304402205360315c439214dd1da10ea00a7531c0a211a865387531c358e586000bfb41b3022064a729e666b4d8ac7a09cb7205c8914c2eb634080597277baf946903d5438f49812102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a546ffffffff0f798b60b145361aebb95cfcdedd29e6773b4b96778af33ed6f42a9e2b4c4676010000006a473044022067943abe9fa7584ba9816fc9bf002b043f7f97e11de59155d66e0411a679ba2c02200a13462236fa520b80b4ed85c7ded363b4c9264eb7b2d9746200be48f2b6f4cb832102364d6f04487a71b5966eae3e14a4dc6f00dbe8e55e61bedd0b880766bfe72b5dffffffff0240548900000000001976a914c3f8e5b0f8455a2b02c29c4488a550278209b66988aca0bb0d00000000001976a91442151d0c21442c2b038af0ad5ee64b9d6f4f4e4988ac00000000';
 
-    test("test1", () {
+    test('test1', () {
       final tx = BtcTransaction(inputs: [txin], outputs: [txout, changeTxout]);
       expect(tx.serialize(), coreTxResult);
     });
-    test("test2", () {
+    test('test2', () {
       final tx = BtcTransaction(inputs: [txin], outputs: [txout, changeTxout]);
       final digit = tx.getTransactionDigest(
           txInIndex: 0,
@@ -122,7 +122,7 @@ void main() {
       txin.scriptSig = Script(script: [sig, sk.getPublic().toHex()]);
       expect(tx.serialize(), coreTxSignedResult);
     });
-    test("test3", () {
+    test('test3', () {
       final tx =
           BtcTransaction(inputs: [txin], outputs: [txout, changeLowSTxout]);
       final digit = tx.getTransactionDigest(
@@ -131,7 +131,7 @@ void main() {
       txin.scriptSig = Script(script: [sig, sk.getPublic().toHex()]);
       expect(tx.serialize(), coreTxSignedLowSSigallResult);
     });
-    test("test4", () {
+    test('test4', () {
       final tx =
           BtcTransaction(inputs: [txin], outputs: [txout, changeLowSTxout]);
       final digit = tx.getTransactionDigest(
@@ -143,7 +143,7 @@ void main() {
       expect(tx.serialize(), coreTxSignedLowSSignoneResult);
       expect(tx.txId(), coreTxSignedLowSSignoneTxid);
     });
-    test("test5", () {
+    test('test5', () {
       final tx =
           BtcTransaction(inputs: [sigTxin1], outputs: [sigTxout1, sigTxout2]);
       final digit = tx.getTransactionDigest(
@@ -155,7 +155,7 @@ void main() {
       sigTxin1.scriptSig = Script(script: [sig, sigSk1.getPublic().toHex()]);
       expect(tx.serialize(), sigSighashSingleResult);
     });
-    test("test6", () {
+    test('test6', () {
       final tx = BtcTransaction(
           inputs: [sigTxin1, sigTxin2], outputs: [sigTxout1, sigTxout2]);
       final digit = tx.getTransactionDigest(
@@ -174,7 +174,7 @@ void main() {
       sigTxin2.scriptSig = Script(script: [sig2, sigSk2.getPublic().toHex()]);
       expect(tx.serialize(), signSighashAll2in2outResult);
     });
-    test("test7", () {
+    test('test7', () {
       final tx = BtcTransaction(
           inputs: [sigTxin1, sigTxin2], outputs: [sigTxout1, sigTxout2]);
       final digit = tx.getTransactionDigest(
@@ -193,7 +193,7 @@ void main() {
       sigTxin2.scriptSig = Script(script: [sig2, sigSk2.getPublic().toHex()]);
       expect(tx.serialize(), signSighashNone2in2outResult);
     });
-    test("test8", () {
+    test('test8', () {
       final tx = BtcTransaction(
           inputs: [sigTxin1, sigTxin2], outputs: [sigTxout1, sigTxout2]);
       final digit = tx.getTransactionDigest(
diff --git a/test/p2sh_test.dart b/test/p2sh_test.dart
index 76cb159..f206817 100644
--- a/test/p2sh_test.dart
+++ b/test/p2sh_test.dart
@@ -2,7 +2,7 @@ import 'package:bitcoin_base/bitcoin_base.dart';
 import 'package:test/test.dart';
 
 void main() {
-  group("P2Sh", () {
+  group('P2Sh', () {
     final fromAddr = P2pkhAddress.fromAddress(
         address: 'n4bkvTyU1dVdzsrhWBqBw8fEMbHjJvtmJR',
         network: BitcoinNetwork.testnet);
@@ -49,10 +49,10 @@ void main() {
     const spendP2shCsvP2pkhResult =
         '0200000001951bc57b24230947ede095c3aac44223df70076342b796c6ff0a5fe523c657f5000000008947304402205c2e23d8ad7825cf44b998045cb19b49cf6447cbc1cb76a254cda43f7939982002202d8f88ab6afd2e8e1d03f70e5edc2a277c713018225d5b18889c5ad8fd6677b4012103a2fef1829e0742b89c218c51898d9e7cb9d51201ba2bf9d9e9214ebb6af327081e02c800b27576a914c3f8e5b0f8455a2b02c29c4488a550278209b66988acc80000000100ab9041000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88ac00000000';
 
-    test("test1", () {
+    test('test1', () {
       final txin = TxInput(
           txId:
-              "76464c2b9e2af4d63ef38a77964b3b77e629dddefc5cb9eb1a3645b1608b790f",
+              '76464c2b9e2af4d63ef38a77964b3b77e629dddefc5cb9eb1a3645b1608b790f',
           txIndex: 0);
       final tx = BtcTransaction(inputs: [txin], outputs: [txout]);
       final digit = tx.getTransactionDigest(
@@ -61,7 +61,8 @@ void main() {
       txin.scriptSig = Script(script: [sig, sk.getPublic().toHex()]);
       expect(tx.serialize(), createP2shAndSendResult);
     });
-    test("test2", () {
+
+    test('test2', () {
       final tx = BtcTransaction(inputs: [txinSpend], outputs: [txout2]);
       final digit =
           tx.getTransactionDigest(txInIndex: 0, script: p2pkRedeemScript);
@@ -69,7 +70,7 @@ void main() {
       txinSpend.scriptSig = Script(script: [sig, p2pkRedeemScript.toHex()]);
       expect(tx.serialize(), spendP2shResult);
     });
-    test("test3", () {
+    test('test3', () {
       final redeemScript = Script(script: [
         seq.forScript(),
         'OP_CHECKSEQUENCEVERIFY',
diff --git a/test/p2tr_test.dart b/test/p2tr_test.dart
index d3bd846..ee57418 100644
--- a/test/p2tr_test.dart
+++ b/test/p2tr_test.dart
@@ -1,4 +1,7 @@
 import 'package:bitcoin_base/bitcoin_base.dart';
+import 'package:bitcoin_base/src/provider/api_provider/electrum_api_provider.dart';
+import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
+import 'package:blockchain_utils/blockchain_utils.dart';
 import 'package:test/test.dart';
 
 void main() {
@@ -22,60 +25,49 @@ void main() {
     late String signedTx3;
 
     setUp(() {
-      toPriv1 = ECPrivate.fromWif(
-          "cT33CWKwcV8afBs5NYzeSzeSoGETtAB8izjDjMEuGqyqPoF7fbQR",
+      toPriv1 = ECPrivate.fromWif('cT33CWKwcV8afBs5NYzeSzeSoGETtAB8izjDjMEuGqyqPoF7fbQR',
           netVersion: BitcoinNetwork.testnet.wifNetVer);
       toPub1 = toPriv1.getPublic();
-      toPriv2 = ECPrivate.fromWif(
-          "cNxX8M7XU8VNa5ofd8yk1eiZxaxNrQQyb7xNpwAmsrzEhcVwtCjs",
+      toPriv2 = ECPrivate.fromWif('cNxX8M7XU8VNa5ofd8yk1eiZxaxNrQQyb7xNpwAmsrzEhcVwtCjs',
           netVersion: BitcoinNetwork.testnet.wifNetVer);
       toPub2 = toPriv2.getPublic();
       toAddress2 = toPub2.toTaprootAddress();
-      privkeyTrScript1 = ECPrivate.fromWif(
-          "cSW2kQbqC9zkqagw8oTYKFTozKuZ214zd6CMTDs4V32cMfH3dgKa",
+      privkeyTrScript1 = ECPrivate.fromWif('cSW2kQbqC9zkqagw8oTYKFTozKuZ214zd6CMTDs4V32cMfH3dgKa',
           netVersion: BitcoinNetwork.testnet.wifNetVer);
       pubkeyTrScript1 = privkeyTrScript1.getPublic();
-      trScriptP2pk1 =
-          Script(script: [pubkeyTrScript1.toXOnlyHex(), 'OP_CHECKSIG']);
-      toTaprootScriptAddress1 =
-          "tb1p0fcjs5l5xqdyvde5u7ut7sr0gzaxp4yya8mv06d2ygkeu82l65xs6k4uqr";
-      fromPriv2 = ECPrivate.fromWif(
-          "cT33CWKwcV8afBs5NYzeSzeSoGETtAB8izjDjMEuGqyqPoF7fbQR",
+      trScriptP2pk1 = Script(script: [pubkeyTrScript1.toXOnlyHex(), 'OP_CHECKSIG']);
+      toTaprootScriptAddress1 = 'tb1p0fcjs5l5xqdyvde5u7ut7sr0gzaxp4yya8mv06d2ygkeu82l65xs6k4uqr';
+      fromPriv2 = ECPrivate.fromWif('cT33CWKwcV8afBs5NYzeSzeSoGETtAB8izjDjMEuGqyqPoF7fbQR',
           netVersion: BitcoinNetwork.testnet.wifNetVer);
       fromPub2 = fromPriv2.getPublic();
       fromAddress2 = fromPub2.toTaprootAddress(scripts: [
         [trScriptP2pk1]
       ]);
       txIn2 = TxInput(
-          txId:
-              "3d4c9d73c4c65772e645ff26493590ae4913d9c37125b72398222a553b73fa66",
-          txIndex: 0);
-      txOut2 = TxOutput(
-          amount: BigInt.from(3000), scriptPubKey: toAddress2.toScriptPubKey());
+          txId: '3d4c9d73c4c65772e645ff26493590ae4913d9c37125b72398222a553b73fa66', txIndex: 0);
+      txOut2 = TxOutput(amount: BigInt.from(3000), scriptPubKey: toAddress2.toScriptPubKey());
       scriptPubKey2 = fromAddress2.toScriptPubKey();
       signedTx2 =
-          "0200000000010166fa733b552a229823b72571c3d91349ae90354926ff45e67257c6c4739d4c3d0000000000ffffffff01b80b000000000000225120d4213cd57207f22a9e905302007b99b84491534729bd5f4065bdcb42ed10fcd50140f1776ddef90a87b646a45ad4821b8dd33e01c5036cbe071a2e1e609ae0c0963685cb8749001944dbe686662dd7c95178c85c4f59c685b646ab27e34df766b7b100000000";
+          '0200000000010166fa733b552a229823b72571c3d91349ae90354926ff45e67257c6c4739d4c3d0000000000ffffffff01b80b000000000000225120d4213cd57207f22a9e905302007b99b84491534729bd5f4065bdcb42ed10fcd50140f1776ddef90a87b646a45ad4821b8dd33e01c5036cbe071a2e1e609ae0c0963685cb8749001944dbe686662dd7c95178c85c4f59c685b646ab27e34df766b7b100000000';
       signedTx3 =
-          "0200000000010166fa733b552a229823b72571c3d91349ae90354926ff45e67257c6c4739d4c3d0000000000ffffffff01b80b000000000000225120d4213cd57207f22a9e905302007b99b84491534729bd5f4065bdcb42ed10fcd50340bf0a391574b56651923abdb256731059008a08b5a3406cd81ce10ef5e7f936c6b9f7915ec1054e2a480e4552fa177aed868dc8b28c6263476871b21584690ef8222013f523102815e9fbbe132ffb8329b0fef5a9e4836d216dce1824633287b0abc6ac21c01036a7ed8d24eac9057e114f22342ebf20c16d37f0d25cfd2c900bf401ec09c900000000";
+          '0200000000010166fa733b552a229823b72571c3d91349ae90354926ff45e67257c6c4739d4c3d0000000000ffffffff01b80b000000000000225120d4213cd57207f22a9e905302007b99b84491534729bd5f4065bdcb42ed10fcd50340bf0a391574b56651923abdb256731059008a08b5a3406cd81ce10ef5e7f936c6b9f7915ec1054e2a480e4552fa177aed868dc8b28c6263476871b21584690ef8222013f523102815e9fbbe132ffb8329b0fef5a9e4836d216dce1824633287b0abc6ac21c01036a7ed8d24eac9057e114f22342ebf20c16d37f0d25cfd2c900bf401ec09c900000000';
       // Initialize your variables here if needed
     });
 
     // 1-create address with single script spending path
     test('address_with_script_path', () {
-      var toAddress = toPub1.toTaprootAddress(scripts: [
+      final toAddress = toPub1.toTaprootAddress(scripts: [
         [trScriptP2pk1]
       ]);
 
-      expect(
-          toAddress.toAddress(BitcoinNetwork.testnet), toTaprootScriptAddress1);
+      expect(toAddress.toAddress(BitcoinNetwork.testnet), toTaprootScriptAddress1);
     });
 
     // 2-spend taproot from key path (has single tapleaf script for spending)
     test('spend_key_path2', () {
-      var tx =
-          BtcTransaction(inputs: [txIn2], outputs: [txOut2], hasSegwit: true);
+      var tx = BtcTransaction(inputs: [txIn2], outputs: [txOut2], hasSegwit: true);
 
-      const int signHash = BitcoinOpCodeConst.TAPROOT_SIGHASH_ALL;
+      const signHash = BitcoinOpCodeConst.TAPROOT_SIGHASH_ALL;
       final txDigit = tx.getTransactionTaprootDigset(
           txIndex: 0,
           scriptPubKeys: [scriptPubKey2],
@@ -90,6 +82,8 @@ void main() {
         TxWitnessInput(stack: [signatur])
       ]);
       expect(tx.serialize(), signedTx2);
+      final decode = BtcTransaction.fromRaw(tx.serialize());
+      expect(decode.serialize(), tx.serialize());
     });
 
     // // 3-spend taproot from script path (has single tapleaf script for spending)
@@ -111,31 +105,29 @@ void main() {
       final controlBlock = ControlBlock(public: fromPub2);
 
       tx = tx.copyWith(witnesses: [
-        TxWitnessInput(
-            stack: [sig, trScriptP2pk1.toHex(), controlBlock.toHex()])
+        TxWitnessInput(stack: [sig, trScriptP2pk1.toHex(), controlBlock.toHex()])
       ]);
       expect(tx.serialize(), signedTx3);
+      final decode = BtcTransaction.fromRaw(tx.serialize());
+      expect(decode.serialize(), tx.serialize());
     });
   });
 
   group('TestCreateP2trWithTwoTapScripts', () {
-    late final ECPrivate privkeyTrScriptA = ECPrivate.fromWif(
+    late final privkeyTrScriptA = ECPrivate.fromWif(
         'cSW2kQbqC9zkqagw8oTYKFTozKuZ214zd6CMTDs4V32cMfH3dgKa',
         netVersion: BitcoinNetwork.testnet.wifNetVer);
-    late final ECPublic pubkeyTrScriptA = privkeyTrScriptA.getPublic();
-    late final trScriptP2pkA =
-        Script(script: [pubkeyTrScriptA.toXOnlyHex(), 'OP_CHECKSIG']);
+    late final pubkeyTrScriptA = privkeyTrScriptA.getPublic();
+    late final trScriptP2pkA = Script(script: [pubkeyTrScriptA.toXOnlyHex(), 'OP_CHECKSIG']);
 
-    late final ECPrivate privkeyTrScriptB = ECPrivate.fromWif(
+    late final privkeyTrScriptB = ECPrivate.fromWif(
         'cSv48xapaqy7fPs8VvoSnxNBNA2jpjcuURRqUENu3WVq6Eh4U3JU',
         netVersion: BitcoinNetwork.testnet.wifNetVer);
-    late final ECPublic pubkeyTrScriptB = privkeyTrScriptB.getPublic();
+    late final pubkeyTrScriptB = privkeyTrScriptB.getPublic();
 
-    late final trScriptP2pkB =
-        Script(script: [pubkeyTrScriptB.toXOnlyHex(), 'OP_CHECKSIG']);
+    late final trScriptP2pkB = Script(script: [pubkeyTrScriptB.toXOnlyHex(), 'OP_CHECKSIG']);
 
-    late final ECPrivate fromPriv = ECPrivate.fromWif(
-        "cT33CWKwcV8afBs5NYzeSzeSoGETtAB8izjDjMEuGqyqPoF7fbQR",
+    late final fromPriv = ECPrivate.fromWif('cT33CWKwcV8afBs5NYzeSzeSoGETtAB8izjDjMEuGqyqPoF7fbQR',
         netVersion: BitcoinNetwork.testnet.wifNetVer);
     late final fromPub = fromPriv.getPublic();
     late final fromAddress = fromPub.toTaprootAddress(scripts: [
@@ -143,27 +135,23 @@ void main() {
     ]);
 
     late final txIn = TxInput(
-        txId:
-            '808ec85db7b005f1292cea744b24e9d72ba4695e065e2d968ca17744b5c5c14d',
-        txIndex: 0);
+        txId: '808ec85db7b005f1292cea744b24e9d72ba4695e065e2d968ca17744b5c5c14d', txIndex: 0);
 
-    late final ECPrivate toPriv = ECPrivate.fromWif(
-        "cNxX8M7XU8VNa5ofd8yk1eiZxaxNrQQyb7xNpwAmsrzEhcVwtCjs",
+    late final toPriv = ECPrivate.fromWif('cNxX8M7XU8VNa5ofd8yk1eiZxaxNrQQyb7xNpwAmsrzEhcVwtCjs',
         netVersion: BitcoinNetwork.testnet.wifNetVer);
     late final toPub = toPriv.getPublic();
     late final toAddress = toPub.toTaprootAddress();
-    late final txOut = TxOutput(
-        amount: BigInt.from(3000), scriptPubKey: toAddress.toScriptPubKey());
+    late final txOut =
+        TxOutput(amount: BigInt.from(3000), scriptPubKey: toAddress.toScriptPubKey());
 
     late final scriptPubkey = fromAddress.toScriptPubKey();
     late final allUtxosScriptpubkeys = [scriptPubkey];
-    const String signedTx3 =
-        "020000000001014dc1c5b54477a18c962d5e065e69a42bd7e9244b74ea2c29f105b0b75dc88e800000000000ffffffff01b80b000000000000225120d4213cd57207f22a9e905302007b99b84491534729bd5f4065bdcb42ed10fcd50340ab89d20fee5557e57b7cf85840721ef28d68e91fd162b2d520e553b71d604388ea7c4b2fcc4d946d5d3be3c12ef2d129ffb92594bc1f42cdaec8280d0c83ecc2222013f523102815e9fbbe132ffb8329b0fef5a9e4836d216dce1824633287b0abc6ac41c01036a7ed8d24eac9057e114f22342ebf20c16d37f0d25cfd2c900bf401ec09c9682f0e85d59cb20fd0e4503c035d609f127c786136f276d475e8321ec9e77e6c00000000";
+    const signedTx3 =
+        '020000000001014dc1c5b54477a18c962d5e065e69a42bd7e9244b74ea2c29f105b0b75dc88e800000000000ffffffff01b80b000000000000225120d4213cd57207f22a9e905302007b99b84491534729bd5f4065bdcb42ed10fcd50340ab89d20fee5557e57b7cf85840721ef28d68e91fd162b2d520e553b71d604388ea7c4b2fcc4d946d5d3be3c12ef2d129ffb92594bc1f42cdaec8280d0c83ecc2222013f523102815e9fbbe132ffb8329b0fef5a9e4836d216dce1824633287b0abc6ac41c01036a7ed8d24eac9057e114f22342ebf20c16d37f0d25cfd2c900bf401ec09c9682f0e85d59cb20fd0e4503c035d609f127c786136f276d475e8321ec9e77e6c00000000';
 
     // 1-spend taproot from first script path (A) of two (A,B)
-    test("test_spend_script_path_A_from_AB", () {
-      BtcTransaction tx =
-          BtcTransaction(inputs: [txIn], outputs: [txOut], hasSegwit: true);
+    test('test_spend_script_path_A_from_AB', () {
+      var tx = BtcTransaction(inputs: [txIn], outputs: [txOut], hasSegwit: true);
 
       final txDigit = tx.getTransactionTaprootDigset(
           amounts: [BigInt.from(3500)],
@@ -180,39 +168,36 @@ void main() {
 
       final controlBlock = ControlBlock(public: fromPub, scripts: leafB);
       tx = tx.copyWith(witnesses: [
-        TxWitnessInput(
-            stack: [sign, trScriptP2pkA.toHex(), controlBlock.toHex()])
+        TxWitnessInput(stack: [sign, trScriptP2pkA.toHex(), controlBlock.toHex()])
       ]);
 
       expect(tx.serialize(), signedTx3);
+      final decode = BtcTransaction.fromRaw(tx.serialize());
+      expect(decode.serialize(), tx.serialize());
     });
   });
 
-  group("TestCreateP2trWithThreeTapScripts", () {
+  group('TestCreateP2trWithThreeTapScripts', () {
     // 1-spend taproot from key path (has three tapleaf script for spending)
     final privkeyTrScriptA = ECPrivate.fromWif(
         'cSW2kQbqC9zkqagw8oTYKFTozKuZ214zd6CMTDs4V32cMfH3dgKa',
         netVersion: BitcoinNetwork.testnet.wifNetVer);
     final pubkeyTrScriptA = privkeyTrScriptA.getPublic();
-    final trScriptP2pkA =
-        Script(script: [pubkeyTrScriptA.toXOnlyHex(), 'OP_CHECKSIG']);
+    final trScriptP2pkA = Script(script: [pubkeyTrScriptA.toXOnlyHex(), 'OP_CHECKSIG']);
 
     final privkeyTrScriptB = ECPrivate.fromWif(
         'cSv48xapaqy7fPs8VvoSnxNBNA2jpjcuURRqUENu3WVq6Eh4U3JU',
         netVersion: BitcoinNetwork.testnet.wifNetVer);
     final pubkeyTrScriptB = privkeyTrScriptB.getPublic();
-    final trScriptP2pkB =
-        Script(script: [pubkeyTrScriptB.toXOnlyHex(), 'OP_CHECKSIG']);
+    final trScriptP2pkB = Script(script: [pubkeyTrScriptB.toXOnlyHex(), 'OP_CHECKSIG']);
 
     final privkeyTrScriptC = ECPrivate.fromWif(
         'cRkZPNnn3jdr64o3PDxNHG68eowDfuCdcyL6nVL4n3czvunuvryC',
         netVersion: BitcoinNetwork.testnet.wifNetVer);
     final pubkeyTrScriptC = privkeyTrScriptC.getPublic();
-    final trScriptP2pkC =
-        Script(script: [pubkeyTrScriptC.toXOnlyHex(), 'OP_CHECKSIG']);
+    final trScriptP2pkC = Script(script: [pubkeyTrScriptC.toXOnlyHex(), 'OP_CHECKSIG']);
 
-    final fromPriv = ECPrivate.fromWif(
-        'cT33CWKwcV8afBs5NYzeSzeSoGETtAB8izjDjMEuGqyqPoF7fbQR',
+    final fromPriv = ECPrivate.fromWif('cT33CWKwcV8afBs5NYzeSzeSoGETtAB8izjDjMEuGqyqPoF7fbQR',
         netVersion: BitcoinNetwork.testnet.wifNetVer);
     final fromPub = fromPriv.getPublic();
     final fromAddress = fromPub.toTaprootAddress(scripts: [
@@ -221,17 +206,13 @@ void main() {
     ]);
 
     final txIn = TxInput(
-        txId:
-            '9b8a01d0f333b2440d4d305d26641e14e0e1932ebc3c4f04387c0820fada87d3',
-        txIndex: 0);
+        txId: '9b8a01d0f333b2440d4d305d26641e14e0e1932ebc3c4f04387c0820fada87d3', txIndex: 0);
 
-    final toPriv = ECPrivate.fromWif(
-        'cNxX8M7XU8VNa5ofd8yk1eiZxaxNrQQyb7xNpwAmsrzEhcVwtCjs',
+    final toPriv = ECPrivate.fromWif('cNxX8M7XU8VNa5ofd8yk1eiZxaxNrQQyb7xNpwAmsrzEhcVwtCjs',
         netVersion: BitcoinNetwork.testnet.wifNetVer);
     final toPub = toPriv.getPublic();
     final toAddress = toPub.toTaprootAddress();
-    final txOut = TxOutput(
-        amount: BigInt.from(3000), scriptPubKey: toAddress.toScriptPubKey());
+    final txOut = TxOutput(amount: BigInt.from(3000), scriptPubKey: toAddress.toScriptPubKey());
 
     // final fromAmount = priceToBtcUnit(0.000035);
     final allAmounts = [BigInt.from(3500)];
@@ -239,32 +220,29 @@ void main() {
     final scriptPubkey = fromAddress.toScriptPubKey();
     final allUtxosScriptPubkeys = [scriptPubkey];
 
-    const String signedTx =
+    const signedTx =
         '02000000000101d387dafa20087c38044f3cbc2e93e1e0141e64265d304d0d44b233f3d0018a9b0000000000ffffffff01b80b000000000000225120d4213cd57207f22a9e905302007b99b84491534729bd5f4065bdcb42ed10fcd50340644e392f5fd88d812bad30e73ff9900cdcf7f260ecbc862819542fd4683fa9879546613be4e2fc762203e45715df1a42c65497a63edce5f1dfe5caea5170273f2220e808f1396f12a253cf00efdf841e01c8376b616fb785c39595285c30f2817e71ac61c01036a7ed8d24eac9057e114f22342ebf20c16d37f0d25cfd2c900bf401ec09c9ed9f1b2b0090138e31e11a31c1aea790928b7ce89112a706e5caa703ff7e0ab928109f92c2781611bb5de791137cbd40a5482a4a23fd0ffe50ee4de9d5790dd100000000';
 
-    test("test_spend_script_path_A_from_AB", () {
-      BtcTransaction tx =
-          BtcTransaction(inputs: [txIn], outputs: [txOut], hasSegwit: true);
+    test('test_spend_script_path_A_from_AB', () {
+      var tx = BtcTransaction(inputs: [txIn], outputs: [txOut], hasSegwit: true);
       final digit = tx.getTransactionTaprootDigset(
           txIndex: 0,
           extFlags: 1,
           scriptPubKeys: allUtxosScriptPubkeys.map((e) => e).toList(),
           script: trScriptP2pkB,
           amounts: allAmounts.map((e) => e).toList());
-      final sig = privkeyTrScriptB.signTapRoot(
-        digit,
-        tweak: false,
-      );
+      final sig = privkeyTrScriptB.signTapRoot(digit, tweak: false);
 
       final leafA = toTapleafTaggedHash(trScriptP2pkA.toBytes());
       final leafC = toTapleafTaggedHash(trScriptP2pkC.toBytes());
-      final controlBlock = ControlBlock(
-          public: fromPub, scripts: List<int>.from([...leafA, ...leafC]));
+      final controlBlock =
+          ControlBlock(public: fromPub, scripts: List<int>.from([...leafA, ...leafC]));
       tx = tx.copyWith(witnesses: [
-        TxWitnessInput(
-            stack: [sig, trScriptP2pkB.toHex(), controlBlock.toHex()])
+        TxWitnessInput(stack: [sig, trScriptP2pkB.toHex(), controlBlock.toHex()])
       ]);
       expect(tx.serialize(), signedTx);
+      final decode = BtcTransaction.fromRaw(tx.serialize());
+      expect(decode.serialize(), tx.serialize());
     });
   });
 }
diff --git a/test/p2wpkh_test.dart b/test/p2wpkh_test.dart
index 0263810..a27af4d 100644
--- a/test/p2wpkh_test.dart
+++ b/test/p2wpkh_test.dart
@@ -2,9 +2,9 @@ import 'package:bitcoin_base/bitcoin_base.dart';
 import 'package:test/test.dart';
 
 void main() {
-  group("P2WPKH", () {
+  group('P2WPKH', () {
     final sk = ECPrivate.fromWif(
-        "cTALNpTpRbbxTCJ2A5Vq88UxT44w1PE2cYqiB3n4hRvzyCev1Wwo",
+        'cTALNpTpRbbxTCJ2A5Vq88UxT44w1PE2cYqiB3n4hRvzyCev1Wwo',
         netVersion: BitcoinNetwork.testnet.wifNetVer);
 
     final p2pkhAddr = sk.getPublic().toP2pkhAddress();
@@ -13,7 +13,7 @@ void main() {
 
     final txin1 = TxInput(
         txId:
-            "5a7b3aaa66d6b7b7abcdc9f1d05db4eee94a700297a319e19454e143875e1078",
+            '5a7b3aaa66d6b7b7abcdc9f1d05db4eee94a700297a319e19454e143875e1078',
         txIndex: 0);
 
     final txout1 = TxOutput(
@@ -21,7 +21,7 @@ void main() {
 
     final txinSpend = TxInput(
         txId:
-            "b3ca1c4cc778380d1e5376a5517445104e46e97176e40741508a3b07a6483ad3",
+            'b3ca1c4cc778380d1e5376a5517445104e46e97176e40741508a3b07a6483ad3',
         txIndex: 0);
     final txinSpendAmount = BigInt.from(990000);
     final txout2 = TxOutput(
@@ -36,12 +36,12 @@ void main() {
 
     final txinSpendP2pkh = TxInput(
         txId:
-            "1e2a5279c868d61fb2ff0b1c2b04aa3eff02cd74952a8b4e799532635a9132cc",
+            '1e2a5279c868d61fb2ff0b1c2b04aa3eff02cd74952a8b4e799532635a9132cc',
         txIndex: 0);
 
     final txinSpendP2wpkh = TxInput(
         txId:
-            "fff39047310fbf04bdd0e0bc75dde4267ae4d25219d8ad95e0ca1cee907a60da",
+            'fff39047310fbf04bdd0e0bc75dde4267ae4d25219d8ad95e0ca1cee907a60da',
         txIndex: 0);
     final txinSpendP2wpkhAmount = BigInt.from(950000);
 
@@ -50,7 +50,7 @@ void main() {
 
     final txin1Signone = TxInput(
         txId:
-            "fb4c338a00a75d73f9a6bd203ed4bd8884edeb111fac25a7946d5df6562f1942",
+            'fb4c338a00a75d73f9a6bd203ed4bd8884edeb111fac25a7946d5df6562f1942',
         txIndex: 0);
     final txin1SignoneAmount = BigInt.from(1000000);
 
@@ -61,7 +61,7 @@ void main() {
 
     final txin1Sigsingle = TxInput(
         txId:
-            "b04909d4b5239a56d676c1d9d722f325a86878c9aa535915aa0df97df47cedeb",
+            'b04909d4b5239a56d676c1d9d722f325a86878c9aa535915aa0df97df47cedeb',
         txIndex: 0);
     final txin1SigsingleAmount = BigInt.from(1930000);
 
@@ -72,13 +72,13 @@ void main() {
 
     final txin1SiganyonecanpayAll = TxInput(
         txId:
-            "f67e97a2564dceed405e214843e3c954b47dd4f8b26ea48f82382f51f7626036",
+            'f67e97a2564dceed405e214843e3c954b47dd4f8b26ea48f82382f51f7626036',
         txIndex: 0);
     final txin1SiganyonecanpayAllAmount = BigInt.from(180000);
 
     final txin2SiganyonecanpayAll = TxInput(
         txId:
-            "f4afddb77cd11a79bed059463085382c50d60c7f9e4075d8469cfe60040f68eb",
+            'f4afddb77cd11a79bed059463085382c50d60c7f9e4075d8469cfe60040f68eb',
         txIndex: 0);
     final txin2SiganyonecanpayAllAmount = BigInt.from(180000);
 
@@ -89,13 +89,13 @@ void main() {
 
     final txin1SiganyonecanpayNone = TxInput(
         txId:
-            "d2ae5d4a3f390f108769139c9b5757846be6693b785c4e21eab777eec7289095",
+            'd2ae5d4a3f390f108769139c9b5757846be6693b785c4e21eab777eec7289095',
         txIndex: 0);
     final txin1SiganyonecanpayNoneAmount = BigInt.from(900000);
 
     final txin2SiganyonecanpayNone = TxInput(
         txId:
-            "ee5062d426677372e6de96e2eb47d572af5deaaef3ef225f3179dfa1ece3f4f5",
+            'ee5062d426677372e6de96e2eb47d572af5deaaef3ef225f3179dfa1ece3f4f5',
         txIndex: 0);
     final txin2SiganyonecanpayNoneAmount = BigInt.from(700000);
 
@@ -106,7 +106,7 @@ void main() {
 
     final txin1SiganyonecanpaySingle = TxInput(
         txId:
-            "c7bb5672266c8a5b64fe91e953a9e23e3206e3b1a2ddc8e5999b607b82485042",
+            'c7bb5672266c8a5b64fe91e953a9e23e3206e3b1a2ddc8e5999b607b82485042',
         txIndex: 0);
     final txin1SiganyonecanpaySingleAmount = BigInt.from(1000000);
 
@@ -116,22 +116,22 @@ void main() {
         amount: BigInt.from(490000), scriptPubKey: p2pkhAddr.toScriptPubKey());
 
     const createSendToP2wpkhResult =
-        "020000000178105e8743e15494e119a39702704ae9eeb45dd0f1c9cdabb7b7d666aa3a7b5a000000006a4730440220415155963673e5582aadfdb8d53874c9764cfd56c28be8d5f2838fdab6365f9902207bf28f875e15ff53e81f3245feb07c6120df4a653feabba3b7bf274790ea1fd1012102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a546ffffffff01301b0f0000000000160014fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a00000000";
+        '020000000178105e8743e15494e119a39702704ae9eeb45dd0f1c9cdabb7b7d666aa3a7b5a000000006a4730440220415155963673e5582aadfdb8d53874c9764cfd56c28be8d5f2838fdab6365f9902207bf28f875e15ff53e81f3245feb07c6120df4a653feabba3b7bf274790ea1fd1012102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a546ffffffff01301b0f0000000000160014fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a00000000';
     const spendP2pkhResult =
-        "02000000000101d33a48a6073b8a504107e47671e9464e10457451a576531e0d3878c74c1ccab30000000000ffffffff0120f40e00000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88ac0247304402201c7ec9b049daa99c78675810b5e36b0b61add3f84180eaeaa613f8525904bdc302204854830d463a4699b6d69e37c08b8d3c6158185d46499170cfcc24d4a9e9a37f012102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a54600000000";
+        '02000000000101d33a48a6073b8a504107e47671e9464e10457451a576531e0d3878c74c1ccab30000000000ffffffff0120f40e00000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88ac0247304402201c7ec9b049daa99c78675810b5e36b0b61add3f84180eaeaa613f8525904bdc302204854830d463a4699b6d69e37c08b8d3c6158185d46499170cfcc24d4a9e9a37f012102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a54600000000';
     const p2pkhAndP2wpkhToP2pkhResult =
-        "02000000000102cc32915a633295794e8b2a9574cd02ff3eaa042b1c0bffb21fd668c879522a1e000000006a47304402200fe842622e656a6780093f60b0597a36a57481611543a2e9576f9e8f1b34edb8022008ba063961c600834760037be20f45bbe077541c533b3fd257eae8e08d0de3b3012102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a546ffffffffda607a90ee1ccae095add81952d2e47a26e4dd75bce0d0bd04bf0f314790f3ff0000000000ffffffff01209a1d00000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88ac00024730440220274bb5445294033a36c360c48cc5e441ba8cc2bc1554dcb7d367088ec40a0d0302202a36f6e03f969e1b0c582f006257eec8fa2ada8cd34fe41ae2aa90d6728999d1012102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a54600000000";
+        '02000000000102cc32915a633295794e8b2a9574cd02ff3eaa042b1c0bffb21fd668c879522a1e000000006a47304402200fe842622e656a6780093f60b0597a36a57481611543a2e9576f9e8f1b34edb8022008ba063961c600834760037be20f45bbe077541c533b3fd257eae8e08d0de3b3012102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a546ffffffffda607a90ee1ccae095add81952d2e47a26e4dd75bce0d0bd04bf0f314790f3ff0000000000ffffffff01209a1d00000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88ac00024730440220274bb5445294033a36c360c48cc5e441ba8cc2bc1554dcb7d367088ec40a0d0302202a36f6e03f969e1b0c582f006257eec8fa2ada8cd34fe41ae2aa90d6728999d1012102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a54600000000';
     const testSignoneSendResult =
-        "0200000000010142192f56f65d6d94a725ac1f11ebed8488bdd43e20bda6f9735da7008a334cfb0000000000ffffffff0200350c00000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88ac30e60200000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88ac0247304402202c47de56a42143ea94c15bdeee237104524a009e50d5359596f7c6f2208a280b022076d6be5dcab09f7645d1ee001c1af14f44420c0d0b16724d741d2a5c19816902022102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a54600000000";
+        '0200000000010142192f56f65d6d94a725ac1f11ebed8488bdd43e20bda6f9735da7008a334cfb0000000000ffffffff0200350c00000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88ac30e60200000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88ac0247304402202c47de56a42143ea94c15bdeee237104524a009e50d5359596f7c6f2208a280b022076d6be5dcab09f7645d1ee001c1af14f44420c0d0b16724d741d2a5c19816902022102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a54600000000';
     const testSigsingleSendResult =
-        "02000000000101ebed7cf47df90daa155953aac97868a825f322d7d9c176d6569a23b5d40949b00000000000ffffffff0240420f00000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88acc0090e00000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88ac0247304402205189808e5cd0d49a8211202ea1afd7d01c180892ddf054508c349c2aa5630ee202202cbe5efa11fdde964603f4b9112d5e9ac452fba2e8ad5b6cddffbc8f0043b59e032102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a54600000000";
+        '02000000000101ebed7cf47df90daa155953aac97868a825f322d7d9c176d6569a23b5d40949b00000000000ffffffff0240420f00000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88acc0090e00000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88ac0247304402205189808e5cd0d49a8211202ea1afd7d01c180892ddf054508c349c2aa5630ee202202cbe5efa11fdde964603f4b9112d5e9ac452fba2e8ad5b6cddffbc8f0043b59e032102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a54600000000';
     const testSiganyonecanpayAllSendResult =
-        "02000000000102366062f7512f38828fa46eb2f8d47db454c9e34348215e40edce4d56a2977ef60000000000ffffffffeb680f0460fe9c46d875409e7f0cd6502c3885304659d0be791ad17cb7ddaff40000000000ffffffff0220bf0200000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88ac10980200000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88ac024730440220046813b802c046c9cfa309e85d1f36b17f1eb1dfb3e8d3c4ae2f74915a3b1c1f02200c5631038bb8b6c7b5283892bb1279a40e7ac13d2392df0c7b36bde7444ec54c812102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a5460247304402206fb60dc79b5ca6c699d04ec96c4f196938332c2909fd17c04023ebcc7408f36e02202b071771a58c84e20b7bf1fcec05c0ef55c1100436a055bfcb2bf7ed1c0683a9012102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a54600000000";
+        '02000000000102366062f7512f38828fa46eb2f8d47db454c9e34348215e40edce4d56a2977ef60000000000ffffffffeb680f0460fe9c46d875409e7f0cd6502c3885304659d0be791ad17cb7ddaff40000000000ffffffff0220bf0200000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88ac10980200000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88ac024730440220046813b802c046c9cfa309e85d1f36b17f1eb1dfb3e8d3c4ae2f74915a3b1c1f02200c5631038bb8b6c7b5283892bb1279a40e7ac13d2392df0c7b36bde7444ec54c812102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a5460247304402206fb60dc79b5ca6c699d04ec96c4f196938332c2909fd17c04023ebcc7408f36e02202b071771a58c84e20b7bf1fcec05c0ef55c1100436a055bfcb2bf7ed1c0683a9012102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a54600000000';
     const testSiganyonecanpayNoneSendResult =
-        "02000000000102959028c7ee77b7ea214e5c783b69e66b8457579b9c136987100f393f4a5daed20000000000fffffffff5f4e3eca1df79315f22eff3aeea5daf72d547ebe296dee672736726d46250ee0000000000ffffffff0200350c00000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88ac60ae0a00000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88ac0247304402203bbcbd2003244e9ccde7f705d3017f3baa2cb2d47efb63ede7e39704eff3987702206932aa4b402de898ff2fd3b2182f344dc9051b4c326dacc07b1e59059042f3ad822102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a54602473044022052dd29ab8bb0814b13633691148feceded29466ff8a1812d6d51c6fa53c55b5402205f25b3ae0da860da29a6745b0b587aa3fc3e05bef3121d3693ca2e3f4c2c3195012102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a54600000000";
+        '02000000000102959028c7ee77b7ea214e5c783b69e66b8457579b9c136987100f393f4a5daed20000000000fffffffff5f4e3eca1df79315f22eff3aeea5daf72d547ebe296dee672736726d46250ee0000000000ffffffff0200350c00000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88ac60ae0a00000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88ac0247304402203bbcbd2003244e9ccde7f705d3017f3baa2cb2d47efb63ede7e39704eff3987702206932aa4b402de898ff2fd3b2182f344dc9051b4c326dacc07b1e59059042f3ad822102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a54602473044022052dd29ab8bb0814b13633691148feceded29466ff8a1812d6d51c6fa53c55b5402205f25b3ae0da860da29a6745b0b587aa3fc3e05bef3121d3693ca2e3f4c2c3195012102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a54600000000';
     const testSiganyonecanpaySingleSendResult =
-        "02000000000101425048827b609b99e5c8dda2b1e306323ee2a953e991fe645b8a6c267256bbc70000000000ffffffff0220a10700000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88ac107a0700000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88ac02473044022064b63a1da4181764a1e8246d353b72c420999c575807ec80329c64264fd5b19e022076ec4ba6c02eae7dc9340f8c76956d5efb7d0fbad03b1234297ebed8c38e43d8832102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a54600000000";
-    test("test_signed_send_to_p2wpkh", () {
+        '02000000000101425048827b609b99e5c8dda2b1e306323ee2a953e991fe645b8a6c267256bbc70000000000ffffffff0220a10700000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88ac107a0700000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88ac02473044022064b63a1da4181764a1e8246d353b72c420999c575807ec80329c64264fd5b19e022076ec4ba6c02eae7dc9340f8c76956d5efb7d0fbad03b1234297ebed8c38e43d8832102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a54600000000';
+    test('test_signed_send_to_p2wpkh', () {
       final tx = BtcTransaction(inputs: [txin1], outputs: [txout1]);
       final digit = tx.getTransactionDigest(
           txInIndex: 0, script: p2pkhAddr.toScriptPubKey());
@@ -139,21 +139,19 @@ void main() {
       txin1.scriptSig = Script(script: [sig, sk.getPublic().toHex()]);
       expect(tx.serialize(), createSendToP2wpkhResult);
     });
-    test("test_spend_p2wpkh", () {
-      BtcTransaction tx = BtcTransaction(
+    test('test_spend_p2wpkh', () {
+      var tx = BtcTransaction(
           inputs: [txinSpend], outputs: [txout2], hasSegwit: true);
       final digit = tx.getTransactionSegwitDigit(
           txInIndex: 0, script: p2pkhRedeemScript, amount: txinSpendAmount);
       final sig = sk.signInput(digit);
-      // tx.addWitnesses();
       tx = tx.copyWith(witnesses: [
         TxWitnessInput(stack: [sig, sk.getPublic().toHex()])
       ]);
-      // txin1.scriptSig = Script(script: [sig, sk.getPublic().toHex()]);
       expect(tx.serialize(), spendP2pkhResult);
     });
-    test("test_p2pkh_and_p2wpkh_to_p2pkh", () {
-      BtcTransaction tx = BtcTransaction(
+    test('test_p2pkh_and_p2wpkh_to_p2pkh', () {
+      var tx = BtcTransaction(
           inputs: [txinSpendP2pkh, txinSpendP2wpkh],
           outputs: [txout3],
           hasSegwit: true);
@@ -161,21 +159,19 @@ void main() {
           txInIndex: 0, script: p2pkhAddr.toScriptPubKey());
       final sig = sk.signInput(digit);
       txinSpendP2pkh.scriptSig = Script(script: [sig, sk.getPublic().toHex()]);
-      // tx.addWitnesses(TxWitnessInput(stack: []));
       final segwitDigit = tx.getTransactionSegwitDigit(
           amount: txinSpendP2wpkhAmount,
           script: p2pkhRedeemScript,
           txInIndex: 1);
       final sig2 = sk.signInput(segwitDigit);
-      // tx.addWitnesses(TxWitnessInput(stack: [sig2, sk.getPublic().toHex()]));
       tx = tx.copyWith(witnesses: [
         TxWitnessInput(stack: []),
         TxWitnessInput(stack: [sig2, sk.getPublic().toHex()])
       ]);
       expect(tx.serialize(), p2pkhAndP2wpkhToP2pkhResult);
     });
-    test("test_signone_send", () {
-      BtcTransaction tx = BtcTransaction(
+    test('test_signone_send', () {
+      var tx = BtcTransaction(
           inputs: [txin1Signone], outputs: [txout1Signone], hasSegwit: true);
       final digit = tx.getTransactionSegwitDigit(
           txInIndex: 0,
@@ -183,7 +179,6 @@ void main() {
           amount: txin1SignoneAmount,
           sighash: BitcoinOpCodeConst.SIGHASH_NONE);
       final sig = sk.signInput(digit, sigHash: BitcoinOpCodeConst.SIGHASH_NONE);
-      // tx.addWitnesses();
       tx = tx.copyWith(witnesses: [
         TxWitnessInput(stack: [sig, sk.getPublic().toHex()])
       ]);
@@ -191,8 +186,8 @@ void main() {
 
       expect(tx.serialize(), testSignoneSendResult);
     });
-    test("test_sigsingle_send", () {
-      BtcTransaction tx = BtcTransaction(
+    test('test_sigsingle_send', () {
+      var tx = BtcTransaction(
           inputs: [txin1Sigsingle],
           outputs: [txout1Sigsingle],
           hasSegwit: true);
@@ -210,8 +205,8 @@ void main() {
 
       expect(tx.serialize(), testSigsingleSendResult);
     });
-    test("test_siganyonecanpay_all_send", () {
-      BtcTransaction tx = BtcTransaction(
+    test('test_siganyonecanpay_all_send', () {
+      var tx = BtcTransaction(
           inputs: [txin1SiganyonecanpayAll],
           outputs: [txout1SiganyonecanpayAll, txout2SiganyonecanpayAll],
           hasSegwit: true);
@@ -225,9 +220,7 @@ void main() {
           sigHash: BitcoinOpCodeConst.SIGHASH_ALL |
               BitcoinOpCodeConst.SIGHASH_ANYONECANPAY);
 
-      // tx.addWitnesses(TxWitnessInput(stack: [sig, sk.getPublic().toHex()]));
       tx = tx.copyWith(inputs: [...tx.inputs, txin2SiganyonecanpayAll]);
-      // tx.inputs.add(txin2SiganyonecanpayAll);
       final digit2 = tx.getTransactionSegwitDigit(
           txInIndex: 1,
           script: p2pkhRedeemScript,
@@ -235,7 +228,6 @@ void main() {
           sighash: BitcoinOpCodeConst.SIGHASH_ALL);
       final sig2 =
           sk.signInput(digit2, sigHash: BitcoinOpCodeConst.SIGHASH_ALL);
-      // tx.addWitnesses();
       tx = tx.copyWith(witnesses: [
         TxWitnessInput(stack: [sig, sk.getPublic().toHex()]),
         TxWitnessInput(stack: [sig2, sk.getPublic().toHex()])
@@ -244,8 +236,8 @@ void main() {
       expect(tx.serialize(), testSiganyonecanpayAllSendResult);
     });
 
-    test("test_siganyonecanpay_none_send", () {
-      BtcTransaction tx = BtcTransaction(
+    test('test_siganyonecanpay_none_send', () {
+      var tx = BtcTransaction(
           inputs: [txin1SiganyonecanpayNone],
           outputs: [txout1SiganyonecanpayNone],
           hasSegwit: true);
@@ -258,9 +250,7 @@ void main() {
       final sig = sk.signInput(digit,
           sigHash: BitcoinOpCodeConst.SIGHASH_NONE |
               BitcoinOpCodeConst.SIGHASH_ANYONECANPAY);
-      // tx.addWitnesses();
       tx = tx.copyWith(inputs: [...tx.inputs, txin2SiganyonecanpayNone]);
-      // tx.inputs.add(txin2SiganyonecanpayNone);
       tx = tx.copyWith(outputs: [...tx.outputs, txout2SiganyonecanpayNone]);
       final digit2 = tx.getTransactionSegwitDigit(
           txInIndex: 1,
@@ -269,7 +259,6 @@ void main() {
           sighash: BitcoinOpCodeConst.SIGHASH_ALL);
       final sig2 =
           sk.signInput(digit2, sigHash: BitcoinOpCodeConst.SIGHASH_ALL);
-      // tx.addWitnesses();
       tx = tx.copyWith(witnesses: [
         TxWitnessInput(stack: [sig, sk.getPublic().toHex()]),
         TxWitnessInput(stack: [sig2, sk.getPublic().toHex()])
@@ -278,8 +267,8 @@ void main() {
       final fromRaw = BtcTransaction.fromRaw(tx.serialize());
       expect(fromRaw.serialize(), tx.serialize());
     });
-    test("test_siganyonecanpay_single_send", () {
-      BtcTransaction tx = BtcTransaction(
+    test('test_siganyonecanpay_single_send', () {
+      var tx = BtcTransaction(
           inputs: [txin1SiganyonecanpaySingle],
           outputs: [txout1SiganyonecanpaySingle],
           hasSegwit: true);
@@ -292,7 +281,6 @@ void main() {
       final sig = sk.signInput(digit,
           sigHash: BitcoinOpCodeConst.SIGHASH_SINGLE |
               BitcoinOpCodeConst.SIGHASH_ANYONECANPAY);
-      // tx.addWitnesses();
       tx = tx.copyWith(witnesses: [
         TxWitnessInput(stack: [sig, sk.getPublic().toHex()])
       ]);
diff --git a/test/p2wsh_test.dart b/test/p2wsh_test.dart
index 88f17e4..c14b93e 100644
--- a/test/p2wsh_test.dart
+++ b/test/p2wsh_test.dart
@@ -2,12 +2,12 @@ import 'package:bitcoin_base/bitcoin_base.dart';
 import 'package:test/test.dart';
 
 void main() {
-  group("P2WSH", () {
+  group('P2WSH', () {
     final sk1 = ECPrivate.fromWif(
-        "cTALNpTpRbbxTCJ2A5Vq88UxT44w1PE2cYqiB3n4hRvzyCev1Wwo",
+        'cTALNpTpRbbxTCJ2A5Vq88UxT44w1PE2cYqiB3n4hRvzyCev1Wwo',
         netVersion: BitcoinNetwork.testnet.wifNetVer);
     final sk2 = ECPrivate.fromWif(
-        "cRvyLwCPLU88jsyj94L7iJjQX5C2f8koG4G2gevN4BeSGcEvfKe9",
+        'cRvyLwCPLU88jsyj94L7iJjQX5C2f8koG4G2gevN4BeSGcEvfKe9',
         netVersion: BitcoinNetwork.testnet.wifNetVer);
 
     final p2wshScript = Script(script: [
@@ -24,14 +24,14 @@ void main() {
 
     final txin1 = TxInput(
         txId:
-            "6e9a0692ed4b3328909d66d41531854988dc39edba5df186affaefda91824e69",
+            '6e9a0692ed4b3328909d66d41531854988dc39edba5df186affaefda91824e69',
         txIndex: 0);
     final txout1 = TxOutput(
         amount: BigInt.from(970000), scriptPubKey: p2wshAddr.toScriptPubKey());
 
     final txinSpend = TxInput(
         txId:
-            "6233aca9f2d6165da2d7b4e35d73b039a22b53f58ce5af87dddee7682be937ea",
+            '6233aca9f2d6165da2d7b4e35d73b039a22b53f58ce5af87dddee7682be937ea',
         txIndex: 0);
     final txinSpendAmount = BigInt.from(970000);
     final txout2 = TxOutput(
@@ -40,18 +40,18 @@ void main() {
 
     final txin1Multiple = TxInput(
         txId:
-            "24d949f8c77d7fc0cd09c8d5fccf7a0249178c16170c738da19f6c4b176c9f4b",
+            '24d949f8c77d7fc0cd09c8d5fccf7a0249178c16170c738da19f6c4b176c9f4b',
         txIndex: 0);
 
     final txin2Multiple = TxInput(
         txId:
-            "65f4d69c91a8de54dc11096eaa315e84ef91a389d1d1c17a691b72095100a3a4",
+            '65f4d69c91a8de54dc11096eaa315e84ef91a389d1d1c17a691b72095100a3a4',
         txIndex: 0);
     final txin2MultipleAmount = BigInt.from(690000);
 
     final txin3Multiple = TxInput(
         txId:
-            "6c8fc6453a2a3039c2b5b55dcc59587e8b0afa52f92607385b5f4c7e84f38aa2",
+            '6c8fc6453a2a3039c2b5b55dcc59587e8b0afa52f92607385b5f4c7e84f38aa2',
         txIndex: 0);
     final txin3MultipleAmount = BigInt.from(790000);
 
@@ -64,12 +64,12 @@ void main() {
         amount: BigInt.from(1770000), scriptPubKey: p2pkhAddr.toScriptPubKey());
 
     const createSendToP2pkhResult =
-        "0200000001694e8291daeffaaf86f15dbaed39dc8849853115d4669d9028334bed92069a6e000000006a473044022038516db4e67c9217b871c690c09f60a57235084f888e23b8ac77ba01d0cba7ae022027a811be50cf54718fc6b88ea900bfa9c8d3e218208fef0e185163e3a47d9a08012102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a546ffffffff0110cd0e00000000002200203956f9730cf7275000f4e3faf5db0505b216222c1f7ca1bdfb81a877003fcb9300000000";
+        '0200000001694e8291daeffaaf86f15dbaed39dc8849853115d4669d9028334bed92069a6e000000006a473044022038516db4e67c9217b871c690c09f60a57235084f888e23b8ac77ba01d0cba7ae022027a811be50cf54718fc6b88ea900bfa9c8d3e218208fef0e185163e3a47d9a08012102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a546ffffffff0110cd0e00000000002200203956f9730cf7275000f4e3faf5db0505b216222c1f7ca1bdfb81a877003fcb9300000000';
     const spendP2pkhResult =
-        "02000000000101ea37e92b68e7dedd87afe58cf5532ba239b0735de3b4d7a25d16d6f2a9ac33620000000000ffffffff0100a60e00000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88ac040047304402205c88b6c247c6b59e1cc48493b66629b6c011d97b99ecf991b595e891542cf1a802204fa0e3c238818a65adc87a0b2511ba780e4b57ff6c1ba6b27815b1dca7b72c1c01473044022012840e38d61972f32208c23a05c73952cc36503112b0c2250fc8428b1e9c5fe4022051758dc7ce32567e2b71efb9df6dc161c9ec4bc0c2e8116c4228d27810cdb4d70147522102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a5462103a2fef1829e0742b89c218c51898d9e7cb9d51201ba2bf9d9e9214ebb6af3270852ae00000000";
+        '02000000000101ea37e92b68e7dedd87afe58cf5532ba239b0735de3b4d7a25d16d6f2a9ac33620000000000ffffffff0100a60e00000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88ac040047304402205c88b6c247c6b59e1cc48493b66629b6c011d97b99ecf991b595e891542cf1a802204fa0e3c238818a65adc87a0b2511ba780e4b57ff6c1ba6b27815b1dca7b72c1c01473044022012840e38d61972f32208c23a05c73952cc36503112b0c2250fc8428b1e9c5fe4022051758dc7ce32567e2b71efb9df6dc161c9ec4bc0c2e8116c4228d27810cdb4d70147522102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a5462103a2fef1829e0742b89c218c51898d9e7cb9d51201ba2bf9d9e9214ebb6af3270852ae00000000';
     const multipleInputMultipleOuputResult =
-        "020000000001034b9f6c174b6c9fa18d730c17168c1749027acffcd5c809cdc07f7dc7f849d924000000006a47304402206932c93458a6ebb85f9fd6f69666cd383a3b8c8d517a096501438840d90493070220544d996a737ca9affda3573635b09e215be1ffddbee9b1260fc3d85d61d90ae5012102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a546ffffffffa4a3005109721b697ac1d1d189a391ef845e31aa6e0911dc54dea8919cd6f4650000000000ffffffffa28af3847e4c5f5b380726f952fa0a8b7e5859cc5db5b5c239302a3a45c68f6c0000000000ffffffff03a0860100000000002200203956f9730cf7275000f4e3faf5db0505b216222c1f7ca1bdfb81a877003fcb93a086010000000000160014fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a10021b00000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88ac00040047304402206503d3610d916835412449f262c8623146503d6f58c9b0343e8d1670b906c4da02200b2b8db13ddc9f157bb95e74c28d273adce49944307aa6a041dba1ed7c528d610147304402207ea74eff48e56f2c0d9afb70b2a90ebf6fcd3ce1e084350f3c061f88dde5eff402203c841f7bf969d04b383ebb1dee4118724bfc9da0260b10f64a0ba7ef3a8d43f00147522102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a5462103a2fef1829e0742b89c218c51898d9e7cb9d51201ba2bf9d9e9214ebb6af3270852ae024730440220733fcbd21517a1559e9561668e480ffd0a24b62520cfa16ca7689b20f7f82be402204f053a27f19e0bd1346676c74c65e9e452515bc6510ab307ac3a3fb6d3c89ca7012102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a54600000000";
-    test("test1", () {
+        '020000000001034b9f6c174b6c9fa18d730c17168c1749027acffcd5c809cdc07f7dc7f849d924000000006a47304402206932c93458a6ebb85f9fd6f69666cd383a3b8c8d517a096501438840d90493070220544d996a737ca9affda3573635b09e215be1ffddbee9b1260fc3d85d61d90ae5012102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a546ffffffffa4a3005109721b697ac1d1d189a391ef845e31aa6e0911dc54dea8919cd6f4650000000000ffffffffa28af3847e4c5f5b380726f952fa0a8b7e5859cc5db5b5c239302a3a45c68f6c0000000000ffffffff03a0860100000000002200203956f9730cf7275000f4e3faf5db0505b216222c1f7ca1bdfb81a877003fcb93a086010000000000160014fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a10021b00000000001976a914fd337ad3bf81e086d96a68e1f8d6a0a510f8c24a88ac00040047304402206503d3610d916835412449f262c8623146503d6f58c9b0343e8d1670b906c4da02200b2b8db13ddc9f157bb95e74c28d273adce49944307aa6a041dba1ed7c528d610147304402207ea74eff48e56f2c0d9afb70b2a90ebf6fcd3ce1e084350f3c061f88dde5eff402203c841f7bf969d04b383ebb1dee4118724bfc9da0260b10f64a0ba7ef3a8d43f00147522102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a5462103a2fef1829e0742b89c218c51898d9e7cb9d51201ba2bf9d9e9214ebb6af3270852ae024730440220733fcbd21517a1559e9561668e480ffd0a24b62520cfa16ca7689b20f7f82be402204f053a27f19e0bd1346676c74c65e9e452515bc6510ab307ac3a3fb6d3c89ca7012102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a54600000000';
+    test('test1', () {
       final tx = BtcTransaction(inputs: [txin1], outputs: [txout1]);
       final digit = tx.getTransactionDigest(
           txInIndex: 0, script: p2pkhAddr.toScriptPubKey());
@@ -77,8 +77,8 @@ void main() {
       txin1.scriptSig = Script(script: [sig, sk1.getPublic().toHex()]);
       expect(tx.serialize(), createSendToP2pkhResult);
     });
-    test("test2", () {
-      BtcTransaction tx = BtcTransaction(
+    test('test2', () {
+      var tx = BtcTransaction(
           inputs: [txinSpend], outputs: [txout2], hasSegwit: true);
       final digit1 = tx.getTransactionSegwitDigit(
           txInIndex: 0, script: p2wshRedeemScript, amount: txinSpendAmount);
@@ -91,8 +91,8 @@ void main() {
       ]);
       expect(tx.serialize(), spendP2pkhResult);
     });
-    test("test3", () {
-      BtcTransaction tx = BtcTransaction(
+    test('test3', () {
+      var tx = BtcTransaction(
           inputs: [txin1Multiple, txin2Multiple, txin3Multiple],
           outputs: [output1Multiple, output2Multiple, output3Multiple],
           hasSegwit: true);
diff --git a/test/silent_payments.dart b/test/silent_payments.dart
index 1593f9c..3ccfa62 100644
--- a/test/silent_payments.dart
+++ b/test/silent_payments.dart
@@ -61,7 +61,7 @@ main() {
 
           inputPrivKeyInfos.add(ECPrivateInfo(
             privkey,
-            prevoutScript.getAddressType() == SegwitAddresType.p2tr,
+            prevoutScript.getAddressType() == SegwitAddressType.p2tr,
             tweak: false,
           ));
           inputPubKeys.add(pubkey);
@@ -115,8 +115,9 @@ main() {
         final List<SilentPaymentOwner> receivingAddresses = [];
 
         final silentPaymentOwner = SilentPaymentOwner.fromPrivateKeys(
-            b_scan: ECPrivate.fromHex(given["key_material"]["scan_priv_key"]),
-            b_spend: ECPrivate.fromHex(given["key_material"]["spend_priv_key"]));
+          b_scan: ECPrivate.fromHex(given["key_material"]["scan_priv_key"]),
+          b_spend: ECPrivate.fromHex(given["key_material"]["spend_priv_key"]),
+        );
 
         // Add change address
         receivingAddresses.add(silentPaymentOwner);
@@ -195,8 +196,12 @@ main() {
 
             // Sign the message with schnorr
             final btcSigner = BitcoinSigner.fromKeyBytes(fullPrivateKey.toBytes());
-            List<int> sig =
-                btcSigner.signSchnorrTransaction(msg, tapScripts: [], tweak: false, aux: aux);
+            List<int> sig = btcSigner.signSchnorrTransaction(
+              msg,
+              tapScripts: [],
+              tweak: false,
+              auxRand: aux,
+            );
 
             // Verify the message is correct
             expect(btcSigner.verifyKey.verifySchnorr(msg, sig, isTweak: false), true);

From 10bb92c563e2e05041f4215ae20d834db6c9b2cf Mon Sep 17 00:00:00 2001
From: Rafael Saes <git@rafael.saes.dev>
Date: Tue, 14 Jan 2025 10:46:15 -0300
Subject: [PATCH 40/62] feat: misc

---
 example/pubspec.lock                          |  8 ++--
 lib/bitcoin_base.dart                         |  4 --
 lib/src/bitcoin/address/derivations.dart      |  4 +-
 lib/src/crypto/keypair/ec_public.dart         |  6 +++
 lib/src/provider/api_provider.dart            |  2 +
 .../methods/get_transaction.dart              |  8 ++--
 lib/src/provider/models/utxo_details.dart     | 47 +++++++++----------
 .../electrum.dart}                            |  9 ++--
 lib/src/provider/providers/explorer.dart      |  5 +-
 test/p2tr_test.dart                           |  3 --
 10 files changed, 47 insertions(+), 49 deletions(-)
 rename lib/src/provider/{api_provider/electrum_api_provider.dart => providers/electrum.dart} (87%)

diff --git a/example/pubspec.lock b/example/pubspec.lock
index 2ade285..5457856 100644
--- a/example/pubspec.lock
+++ b/example/pubspec.lock
@@ -29,7 +29,7 @@ packages:
     description:
       path: "."
       ref: cake-update-v4
-      resolved-ref: "8a39e4342c15a4476c6ee57b5efba46452130868"
+      resolved-ref: "7bf4c263900a81fcddbd7797169f0e2fbd3a9f46"
       url: "https://github.com/cake-tech/blockchain_utils"
     source: git
     version: "4.0.0"
@@ -300,10 +300,10 @@ packages:
     dependency: transitive
     description:
       name: typed_data
-      sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c
+      sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.2"
+    version: "1.4.0"
   vector_math:
     dependency: transitive
     description:
@@ -329,5 +329,5 @@ packages:
     source: hosted
     version: "1.1.0"
 sdks:
-  dart: ">=3.4.0 <4.0.0"
+  dart: ">=3.5.0 <4.0.0"
   flutter: ">=3.18.0-18.0.pre.54"
diff --git a/lib/bitcoin_base.dart b/lib/bitcoin_base.dart
index 4a5869b..b9391f1 100644
--- a/lib/bitcoin_base.dart
+++ b/lib/bitcoin_base.dart
@@ -16,10 +16,6 @@ export 'src/bitcoin/amount/amount.dart';
 
 export 'src/crypto/crypto.dart';
 
-export 'src/bitcoin/script/scripts.dart';
-
-export 'src/crypto/crypto.dart';
-
 export 'src/models/network.dart';
 
 export 'src/provider/api_provider.dart';
diff --git a/lib/src/bitcoin/address/derivations.dart b/lib/src/bitcoin/address/derivations.dart
index 3b3510f..b93b49c 100644
--- a/lib/src/bitcoin/address/derivations.dart
+++ b/lib/src/bitcoin/address/derivations.dart
@@ -46,8 +46,8 @@ abstract class BitcoinDerivationPaths {
   static const String BIP86 = "m/86'/0'/0'";
   static const String NON_STANDARD = "m/0'";
 
-  static const String SILENT_PAYMENTS_SCAN = "m/352'/0'/0'/1'";
-  static const String SILENT_PAYMENTS_SPEND = "m/352'/0'/0'/0'";
+  static const String SILENT_PAYMENTS_SCAN = "m/352'/0'/0'/1'/0";
+  static const String SILENT_PAYMENTS_SPEND = "m/352'/0'/0'/0'/0";
 
   static const String LITECOIN = "m/84'/2'/0'";
 
diff --git a/lib/src/crypto/keypair/ec_public.dart b/lib/src/crypto/keypair/ec_public.dart
index 60db5c8..aed2122 100644
--- a/lib/src/crypto/keypair/ec_public.dart
+++ b/lib/src/crypto/keypair/ec_public.dart
@@ -276,3 +276,9 @@ class ECPublic {
     return ECPublic.fromBytes(publicKey.uncompressed);
   }
 }
+
+extension Bip32Slip10Secp256k1Ext on Bip32Slip10Secp256k1 {
+  ECPublic toECPublic() {
+    return ECPublic.fromBip32(publicKey);
+  }
+}
diff --git a/lib/src/provider/api_provider.dart b/lib/src/provider/api_provider.dart
index a1ef855..618a091 100644
--- a/lib/src/provider/api_provider.dart
+++ b/lib/src/provider/api_provider.dart
@@ -1,4 +1,6 @@
 export 'models/models.dart';
 export 'providers/explorer.dart';
+export 'providers/electrum.dart';
 export 'electrum_methods/methods.dart';
 export 'services/explorer.dart';
+export 'service/services.dart';
diff --git a/lib/src/provider/electrum_methods/methods/get_transaction.dart b/lib/src/provider/electrum_methods/methods/get_transaction.dart
index e8393f1..70a0cb7 100644
--- a/lib/src/provider/electrum_methods/methods/get_transaction.dart
+++ b/lib/src/provider/electrum_methods/methods/get_transaction.dart
@@ -2,8 +2,8 @@ import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
 
 /// Return a raw transaction.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumRequestGetTransaction extends ElectrumRequest<dynamic, dynamic> {
-  ElectrumRequestGetTransaction({required this.transactionHash});
+class ElectrumRequestGetTransactionHex extends ElectrumRequest<String, String> {
+  ElectrumRequestGetTransactionHex({required this.transactionHash});
 
   /// The transaction hash as a hexadecimal string.
   final String transactionHash;
@@ -28,9 +28,9 @@ class ElectrumRequestGetTransaction extends ElectrumRequest<dynamic, dynamic> {
   }
 }
 
-class ElectrumGetTransactionVerbose
+class ElectrumRequestGetTransactionVerbose
     extends ElectrumRequest<Map<String, dynamic>, Map<String, dynamic>> {
-  ElectrumGetTransactionVerbose({required this.transactionHash});
+  ElectrumRequestGetTransactionVerbose({required this.transactionHash});
 
   /// The transaction hash as a hexadecimal string.
   final String transactionHash;
diff --git a/lib/src/provider/models/utxo_details.dart b/lib/src/provider/models/utxo_details.dart
index 501bf6a..7b695b6 100644
--- a/lib/src/provider/models/utxo_details.dart
+++ b/lib/src/provider/models/utxo_details.dart
@@ -44,15 +44,10 @@ class UtxoWithAddress {
   /// OwnerDetails is a UtxoAddressDetails instance containing information about the UTXO owner.
   final UtxoAddressDetails ownerDetails;
 
-  const UtxoWithAddress._({required this.utxo, required this.ownerDetails, required this.keyType});
-  factory UtxoWithAddress({required BitcoinUtxo utxo, required UtxoAddressDetails ownerDetails}) {
-    return UtxoWithAddress._(
-        utxo: utxo,
-        ownerDetails: ownerDetails,
-        keyType: ownerDetails.publicKey != null && !utxo.isSegwit
+  UtxoWithAddress({required this.utxo, required this.ownerDetails})
+      : keyType = ownerDetails.publicKey != null && !utxo.isSegwit
             ? BtcUtils.isCompressedPubKey(ownerDetails.publicKey!)
-            : PublicKeyType.compressed);
-  }
+            : PublicKeyType.compressed;
 
   ECPublic public() {
     if (isMultiSig()) {
@@ -213,25 +208,29 @@ class BitcoinUtxo {
     required this.isSegwit,
     this.isSilentPayment,
   });
-  factory BitcoinUtxo(
-      {required String txHash,
-      required BigInt value,
-      required int vout,
-      required BitcoinAddressType scriptType,
-      int? blockHeight,
-      CashToken? token}) {
+  factory BitcoinUtxo({
+    required String txHash,
+    required BigInt value,
+    required int vout,
+    required BitcoinAddressType scriptType,
+    int? blockHeight,
+    CashToken? token,
+    bool? isSilentPayment,
+  }) {
     final isP2shSegwit =
         scriptType == P2shAddressType.p2wpkhInP2sh || scriptType == P2shAddressType.p2wshInP2sh;
     return BitcoinUtxo._(
-        txHash: txHash,
-        value: value,
-        blockHeight: blockHeight,
-        token: token,
-        vout: vout,
-        scriptType: scriptType,
-        isP2tr: scriptType == SegwitAddressType.p2tr,
-        isP2shSegwit: isP2shSegwit,
-        isSegwit: isP2shSegwit || scriptType.isSegwit);
+      txHash: txHash,
+      value: value,
+      blockHeight: blockHeight,
+      token: token,
+      vout: vout,
+      scriptType: scriptType,
+      isP2tr: scriptType == SegwitAddressType.p2tr,
+      isP2shSegwit: isP2shSegwit,
+      isSegwit: isP2shSegwit || scriptType.isSegwit,
+      isSilentPayment: isSilentPayment,
+    );
   }
 
   /// check if utxos is p2tr
diff --git a/lib/src/provider/api_provider/electrum_api_provider.dart b/lib/src/provider/providers/electrum.dart
similarity index 87%
rename from lib/src/provider/api_provider/electrum_api_provider.dart
rename to lib/src/provider/providers/electrum.dart
index e4603b2..49ba258 100644
--- a/lib/src/provider/api_provider/electrum_api_provider.dart
+++ b/lib/src/provider/providers/electrum.dart
@@ -1,7 +1,6 @@
 import 'dart:async';
 
 import 'package:bitcoin_base/bitcoin_base.dart';
-import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
 import 'package:rxdart/rxdart.dart';
 
 typedef ListenerCallback<T> = StreamSubscription<T> Function(
@@ -11,15 +10,15 @@ typedef ListenerCallback<T> = StreamSubscription<T> Function(
   bool? cancelOnError,
 });
 
-class ElectrumApiProvider {
+class ElectrumProvider {
   final BitcoinBaseElectrumRPCService rpc;
-  ElectrumApiProvider._(this.rpc);
+  ElectrumProvider._(this.rpc);
   int _id = 0;
   int get id => _id;
   Timer? _aliveTimer;
 
-  static Future<ElectrumApiProvider> connect(Future<BitcoinBaseElectrumRPCService> rpc) async {
-    final provider = ElectrumApiProvider._(await rpc);
+  static Future<ElectrumProvider> connect(Future<BitcoinBaseElectrumRPCService> rpc) async {
+    final provider = ElectrumProvider._(await rpc);
     provider.keepAlive();
     return provider;
   }
diff --git a/lib/src/provider/providers/explorer.dart b/lib/src/provider/providers/explorer.dart
index 6aabeb7..340bd8a 100644
--- a/lib/src/provider/providers/explorer.dart
+++ b/lib/src/provider/providers/explorer.dart
@@ -8,13 +8,12 @@ class ApiProvider {
   ApiProvider({required this.api, Map<String, String>? header, required this.service})
       : _header = header ?? {'Content-Type': 'application/json'};
   factory ApiProvider.fromMempool(
-    BasedUtxoNetwork network,
-    ApiService service, {
+    BasedUtxoNetwork network, {
     Map<String, String>? header,
     String? baseUrl,
   }) {
     final api = APIConfig.mempool(network, baseUrl);
-    return ApiProvider(api: api, header: header, service: service);
+    return ApiProvider(api: api, header: header, service: BitcoinApiService());
   }
   factory ApiProvider.fromBlocCypher(BasedUtxoNetwork network, ApiService service,
       {Map<String, String>? header}) {
diff --git a/test/p2tr_test.dart b/test/p2tr_test.dart
index ee57418..a9fc93d 100644
--- a/test/p2tr_test.dart
+++ b/test/p2tr_test.dart
@@ -1,7 +1,4 @@
 import 'package:bitcoin_base/bitcoin_base.dart';
-import 'package:bitcoin_base/src/provider/api_provider/electrum_api_provider.dart';
-import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
-import 'package:blockchain_utils/blockchain_utils.dart';
 import 'package:test/test.dart';
 
 void main() {

From 161a143759151979a35811b58744ba0732d331dd Mon Sep 17 00:00:00 2001
From: Rafael Saes <git@rafael.saes.dev>
Date: Wed, 15 Jan 2025 17:51:37 -0300
Subject: [PATCH 41/62] feat: batch requests

---
 .../electrum_methods/methods/add_peer.dart    |   2 +-
 .../methods/block_headers.dart                |   2 +-
 .../electrum_methods/methods/broad_cast.dart  |   2 +-
 .../methods/donate_address.dart               |   3 +-
 .../methods/electrum_version.dart             |   9 +-
 .../methods/estimate_fee.dart                 |   2 +-
 .../electrum_methods/methods/get_balance.dart |  33 +++++-
 .../methods/get_fee_histogram.dart            |   3 +-
 .../electrum_methods/methods/get_history.dart |  36 +++++-
 .../electrum_methods/methods/get_mempool.dart |   3 +-
 .../electrum_methods/methods/get_merkle.dart  |   3 +-
 .../methods/get_transaction.dart              |   4 +-
 .../electrum_methods/methods/get_unspet.dart  |   3 +-
 .../methods/get_value_proof.dart              |   9 +-
 .../electrum_methods/methods/header.dart      |   6 +-
 .../methods/headers_subscribe.dart            |   2 +-
 .../electrum_methods/methods/id_from_pos.dart |   6 +-
 .../masternode_announce_broadcast.dart        |   9 +-
 .../methods/masternode_list.dart              |   3 +-
 .../methods/masternode_subscribe.dart         |   6 +-
 .../electrum_methods/methods/ping.dart        |   3 +-
 .../electrum_methods/methods/protx_diff.dart  |   2 +-
 .../electrum_methods/methods/protx_info.dart  |   6 +-
 .../electrum_methods/methods/relay_fee.dart   |   2 +-
 .../methods/scripthash_unsubscribe.dart       |   3 +-
 .../methods/server_banner.dart                |   3 +-
 .../methods/server_features.dart              |   3 +-
 .../methods/server_peer_subscribe.dart        |   3 +-
 .../electrum_methods/methods/status.dart      |   2 +-
 .../methods/tweaks_subscribe.dart             |   2 +-
 lib/src/provider/providers/electrum.dart      |  10 ++
 .../electrum/electrum_ssl_service.dart        |  73 ++++++++++--
 .../electrum/electrum_tcp_service.dart        |  85 +++++++++++---
 lib/src/provider/service/electrum/params.dart | 111 ++++++++++++++++--
 .../provider/service/electrum/service.dart    |   6 +-
 35 files changed, 347 insertions(+), 113 deletions(-)

diff --git a/lib/src/provider/electrum_methods/methods/add_peer.dart b/lib/src/provider/electrum_methods/methods/add_peer.dart
index 106046b..c5f69da 100644
--- a/lib/src/provider/electrum_methods/methods/add_peer.dart
+++ b/lib/src/provider/electrum_methods/methods/add_peer.dart
@@ -14,7 +14,7 @@ class ElectrumRequestAddPeer extends ElectrumRequest<bool, bool> {
   String get method => ElectrumRequestMethods.serverAddPeer.method;
 
   @override
-  List toJson() {
+  List toParams() {
     return [features];
   }
 
diff --git a/lib/src/provider/electrum_methods/methods/block_headers.dart b/lib/src/provider/electrum_methods/methods/block_headers.dart
index 73a7adc..ceff2fb 100644
--- a/lib/src/provider/electrum_methods/methods/block_headers.dart
+++ b/lib/src/provider/electrum_methods/methods/block_headers.dart
@@ -22,7 +22,7 @@ class ElectrumRequestBlockHeaders
   String get method => ElectrumRequestMethods.blockHeaders.method;
 
   @override
-  List toJson() {
+  List toParams() {
     return [startHeight, count, cpHeight];
   }
 
diff --git a/lib/src/provider/electrum_methods/methods/broad_cast.dart b/lib/src/provider/electrum_methods/methods/broad_cast.dart
index 29b993f..b89cce1 100644
--- a/lib/src/provider/electrum_methods/methods/broad_cast.dart
+++ b/lib/src/provider/electrum_methods/methods/broad_cast.dart
@@ -13,7 +13,7 @@ class ElectrumRequestBroadCastTransaction extends ElectrumRequest<String?, Strin
   String get method => ElectrumRequestMethods.broadcast.method;
 
   @override
-  List toJson() {
+  List toParams() {
     return [transactionRaw];
   }
 
diff --git a/lib/src/provider/electrum_methods/methods/donate_address.dart b/lib/src/provider/electrum_methods/methods/donate_address.dart
index 21ba0bd..1195514 100644
--- a/lib/src/provider/electrum_methods/methods/donate_address.dart
+++ b/lib/src/provider/electrum_methods/methods/donate_address.dart
@@ -1,6 +1,5 @@
 import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
 
-
 /// Return a server donation address.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
 class ElectrumRequestDonationAddress extends ElectrumRequest<String, String> {
@@ -9,7 +8,7 @@ class ElectrumRequestDonationAddress extends ElectrumRequest<String, String> {
   String get method => ElectrumRequestMethods.serverDontionAddress.method;
 
   @override
-  List toJson() {
+  List toParams() {
     return [];
   }
 
diff --git a/lib/src/provider/electrum_methods/methods/electrum_version.dart b/lib/src/provider/electrum_methods/methods/electrum_version.dart
index 1df15f8..6924d3c 100644
--- a/lib/src/provider/electrum_methods/methods/electrum_version.dart
+++ b/lib/src/provider/electrum_methods/methods/electrum_version.dart
@@ -1,12 +1,9 @@
 import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
 
-
 /// Identify the client to the server and negotiate the protocol version. Only the first server.version() message is accepted.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumRequestVersion
-    extends ElectrumRequest<List<String>, List<dynamic>> {
-  ElectrumRequestVersion(
-      {required this.clientName, required this.protocolVersion});
+class ElectrumRequestVersion extends ElectrumRequest<List<String>, List<dynamic>> {
+  ElectrumRequestVersion({required this.clientName, required this.protocolVersion});
 
   /// A string identifying the connecting client software.
   final String clientName;
@@ -18,7 +15,7 @@ class ElectrumRequestVersion
   String get method => ElectrumRequestMethods.version.method;
 
   @override
-  List toJson() {
+  List toParams() {
     return [clientName, protocolVersion];
   }
 
diff --git a/lib/src/provider/electrum_methods/methods/estimate_fee.dart b/lib/src/provider/electrum_methods/methods/estimate_fee.dart
index 30eed89..103676a 100644
--- a/lib/src/provider/electrum_methods/methods/estimate_fee.dart
+++ b/lib/src/provider/electrum_methods/methods/estimate_fee.dart
@@ -14,7 +14,7 @@ class ElectrumRequestEstimateFee extends ElectrumRequest<BigInt?, dynamic> {
   String get method => ElectrumRequestMethods.estimateFee.method;
 
   @override
-  List toJson() {
+  List toParams() {
     return [numberOfBlock];
   }
 
diff --git a/lib/src/provider/electrum_methods/methods/get_balance.dart b/lib/src/provider/electrum_methods/methods/get_balance.dart
index cc12b03..11e1743 100644
--- a/lib/src/provider/electrum_methods/methods/get_balance.dart
+++ b/lib/src/provider/electrum_methods/methods/get_balance.dart
@@ -1,6 +1,5 @@
 import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
 
-
 /// Return the confirmed and unconfirmed balances of a script hash.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
 class ElectrumRequestGetScriptHashBalance
@@ -15,7 +14,7 @@ class ElectrumRequestGetScriptHashBalance
   String get method => ElectrumRequestMethods.getBalance.method;
 
   @override
-  List toJson() {
+  List toParams() {
     return [scriptHash];
   }
 
@@ -26,3 +25,33 @@ class ElectrumRequestGetScriptHashBalance
     return result;
   }
 }
+
+class ElectrumBatchRequestGetScriptHashBalance
+    extends ElectrumBatchRequest<Map<String, dynamic>, Map<String, dynamic>> {
+  ElectrumBatchRequestGetScriptHashBalance({required this.scriptHashes});
+
+  /// The script hash as a hexadecimal string (BitcoinBaseAddress.pubKeyHash())
+  final List<String> scriptHashes;
+
+  /// blockchain.scripthash.get_history
+  @override
+  String get method => ElectrumRequestMethods.getBalance.method;
+
+  @override
+  List<List> toParams() {
+    return [
+      ...scriptHashes.map((e) => [e])
+    ];
+  }
+
+  /// A list of confirmed transactions in blockchain order,
+  ///  with the output of blockchain.scripthash.get_mempool() appended to the list.
+  ///  Each confirmed transaction is a dictionary
+  @override
+  ElectrumBatchRequestResult<Map<String, dynamic>> onResponse(
+    Map<String, dynamic> result,
+    ElectrumBatchRequestDetails details,
+  ) {
+    return ElectrumBatchRequestResult(details, Map<String, dynamic>.from(result));
+  }
+}
diff --git a/lib/src/provider/electrum_methods/methods/get_fee_histogram.dart b/lib/src/provider/electrum_methods/methods/get_fee_histogram.dart
index 7baf063..4371d93 100644
--- a/lib/src/provider/electrum_methods/methods/get_fee_histogram.dart
+++ b/lib/src/provider/electrum_methods/methods/get_fee_histogram.dart
@@ -1,6 +1,5 @@
 import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
 
-
 /// Return a histogram of the fee rates paid by transactions in the memory pool, weighted by transaction size.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
 class ElectrumRequestGetFeeHistogram extends ElectrumRequest<List<List<double>>, List<dynamic>> {
@@ -9,7 +8,7 @@ class ElectrumRequestGetFeeHistogram extends ElectrumRequest<List<List<double>>,
   String get method => ElectrumRequestMethods.getFeeHistogram.method;
 
   @override
-  List toJson() {
+  List toParams() {
     return [];
   }
 
diff --git a/lib/src/provider/electrum_methods/methods/get_history.dart b/lib/src/provider/electrum_methods/methods/get_history.dart
index 4d99d77..0ce9738 100644
--- a/lib/src/provider/electrum_methods/methods/get_history.dart
+++ b/lib/src/provider/electrum_methods/methods/get_history.dart
@@ -1,6 +1,5 @@
 import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
 
-
 /// Return the confirmed and unconfirmed history of a script hash.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
 class ElectrumRequestScriptHashGetHistory
@@ -15,7 +14,7 @@ class ElectrumRequestScriptHashGetHistory
   String get method => ElectrumRequestMethods.getHistory.method;
 
   @override
-  List toJson() {
+  List toParams() {
     return [scriptHash];
   }
 
@@ -27,3 +26,36 @@ class ElectrumRequestScriptHashGetHistory
     return result.map((e) => Map<String, dynamic>.from(e)).toList();
   }
 }
+
+class ElectrumBatchRequestScriptHashGetHistory
+    extends ElectrumBatchRequest<List<Map<String, dynamic>>, List<dynamic>> {
+  ElectrumBatchRequestScriptHashGetHistory({required this.scriptHashes});
+
+  /// The script hash as a hexadecimal string (BitcoinBaseAddress.pubKeyHash())
+  final List<String> scriptHashes;
+
+  /// blockchain.scripthash.get_history
+  @override
+  String get method => ElectrumRequestMethods.getHistory.method;
+
+  @override
+  List<List> toParams() {
+    return [
+      ...scriptHashes.map((e) => [e])
+    ];
+  }
+
+  /// A list of confirmed transactions in blockchain order,
+  ///  with the output of blockchain.scripthash.get_mempool() appended to the list.
+  ///  Each confirmed transaction is a dictionary
+  @override
+  ElectrumBatchRequestResult<List<Map<String, dynamic>>> onResponse(
+    List<dynamic> result,
+    ElectrumBatchRequestDetails details,
+  ) {
+    return ElectrumBatchRequestResult(
+      details,
+      result.map((e) => Map<String, dynamic>.from(e)).toList(),
+    );
+  }
+}
diff --git a/lib/src/provider/electrum_methods/methods/get_mempool.dart b/lib/src/provider/electrum_methods/methods/get_mempool.dart
index a68e2a4..d416626 100644
--- a/lib/src/provider/electrum_methods/methods/get_mempool.dart
+++ b/lib/src/provider/electrum_methods/methods/get_mempool.dart
@@ -1,6 +1,5 @@
 import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
 
-
 /// Return the unconfirmed transactions of a script hash.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
 class ElectrumRequestScriptHashGetMempool
@@ -15,7 +14,7 @@ class ElectrumRequestScriptHashGetMempool
   String get method => ElectrumRequestMethods.getMempool.method;
 
   @override
-  List toJson() {
+  List toParams() {
     return [scriptHash];
   }
 
diff --git a/lib/src/provider/electrum_methods/methods/get_merkle.dart b/lib/src/provider/electrum_methods/methods/get_merkle.dart
index 409cc54..6f84e1b 100644
--- a/lib/src/provider/electrum_methods/methods/get_merkle.dart
+++ b/lib/src/provider/electrum_methods/methods/get_merkle.dart
@@ -1,6 +1,5 @@
 import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
 
-
 /// Return the merkle branch to a confirmed transaction given its hash and height.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
 class ElectrumRequestGetMerkle extends ElectrumRequest<Map<String, dynamic>, Map<String, dynamic>> {
@@ -17,7 +16,7 @@ class ElectrumRequestGetMerkle extends ElectrumRequest<Map<String, dynamic>, Map
   String get method => ElectrumRequestMethods.getMerkle.method;
 
   @override
-  List toJson() {
+  List toParams() {
     return [transactionHash, height];
   }
 
diff --git a/lib/src/provider/electrum_methods/methods/get_transaction.dart b/lib/src/provider/electrum_methods/methods/get_transaction.dart
index 70a0cb7..c004cb5 100644
--- a/lib/src/provider/electrum_methods/methods/get_transaction.dart
+++ b/lib/src/provider/electrum_methods/methods/get_transaction.dart
@@ -13,7 +13,7 @@ class ElectrumRequestGetTransactionHex extends ElectrumRequest<String, String> {
   String get method => ElectrumRequestMethods.getTransaction.method;
 
   @override
-  List toJson() {
+  List toParams() {
     return [transactionHash, false];
   }
 
@@ -40,7 +40,7 @@ class ElectrumRequestGetTransactionVerbose
   String get method => ElectrumRequestMethods.getTransaction.method;
 
   @override
-  List toJson() {
+  List toParams() {
     return [transactionHash, true];
   }
 
diff --git a/lib/src/provider/electrum_methods/methods/get_unspet.dart b/lib/src/provider/electrum_methods/methods/get_unspet.dart
index 8a75094..ffcc08e 100644
--- a/lib/src/provider/electrum_methods/methods/get_unspet.dart
+++ b/lib/src/provider/electrum_methods/methods/get_unspet.dart
@@ -1,7 +1,6 @@
 import 'package:bitcoin_base/src/provider/models/electrum/electrum_utxo.dart';
 import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
 
-
 /// Return an ordered list of UTXOs sent to a script hash.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
 class ElectrumRequestScriptHashListUnspent
@@ -19,7 +18,7 @@ class ElectrumRequestScriptHashListUnspent
   String get method => ElectrumRequestMethods.listunspent.method;
 
   @override
-  List toJson() {
+  List toParams() {
     return [scriptHash, if (includeTokens) 'include_tokens'];
   }
 
diff --git a/lib/src/provider/electrum_methods/methods/get_value_proof.dart b/lib/src/provider/electrum_methods/methods/get_value_proof.dart
index edf7faf..5e0a8ab 100644
--- a/lib/src/provider/electrum_methods/methods/get_value_proof.dart
+++ b/lib/src/provider/electrum_methods/methods/get_value_proof.dart
@@ -1,12 +1,9 @@
 import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
 
-
 /// Returns a name resolution proof, suitable for low-latency (single round-trip) resolution.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumRequestGetValueProof
-    extends ElectrumRequest<Map<String, dynamic>, dynamic> {
-  ElectrumRequestGetValueProof(
-      {required this.scriptHash, required this.cpHeight});
+class ElectrumRequestGetValueProof extends ElectrumRequest<Map<String, dynamic>, dynamic> {
+  ElectrumRequestGetValueProof({required this.scriptHash, required this.cpHeight});
 
   /// Script hash of the name being resolved.
   final String scriptHash;
@@ -19,7 +16,7 @@ class ElectrumRequestGetValueProof
   String get method => ElectrumRequestMethods.getValueProof.method;
 
   @override
-  List toJson() {
+  List toParams() {
     return [scriptHash, cpHeight];
   }
 
diff --git a/lib/src/provider/electrum_methods/methods/header.dart b/lib/src/provider/electrum_methods/methods/header.dart
index 28a832f..3000c3f 100644
--- a/lib/src/provider/electrum_methods/methods/header.dart
+++ b/lib/src/provider/electrum_methods/methods/header.dart
@@ -1,11 +1,9 @@
 import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
 
-
 /// Return the block header at the given height.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
 class ElectrumRequestBlockHeader extends ElectrumRequest<dynamic, dynamic> {
-  ElectrumRequestBlockHeader(
-      {required this.startHeight, required this.cpHeight});
+  ElectrumRequestBlockHeader({required this.startHeight, required this.cpHeight});
   final int startHeight;
   final int cpHeight;
 
@@ -14,7 +12,7 @@ class ElectrumRequestBlockHeader extends ElectrumRequest<dynamic, dynamic> {
   String get method => ElectrumRequestMethods.blockHeader.method;
 
   @override
-  List toJson() {
+  List toParams() {
     return [startHeight, cpHeight];
   }
 
diff --git a/lib/src/provider/electrum_methods/methods/headers_subscribe.dart b/lib/src/provider/electrum_methods/methods/headers_subscribe.dart
index 1b4351e..50c1760 100644
--- a/lib/src/provider/electrum_methods/methods/headers_subscribe.dart
+++ b/lib/src/provider/electrum_methods/methods/headers_subscribe.dart
@@ -24,7 +24,7 @@ class ElectrumRequestHeaderSubscribe
   String get method => ElectrumRequestMethods.headersSubscribe.method;
 
   @override
-  List toJson() {
+  List toParams() {
     return [];
   }
 
diff --git a/lib/src/provider/electrum_methods/methods/id_from_pos.dart b/lib/src/provider/electrum_methods/methods/id_from_pos.dart
index 79589ce..5739a48 100644
--- a/lib/src/provider/electrum_methods/methods/id_from_pos.dart
+++ b/lib/src/provider/electrum_methods/methods/id_from_pos.dart
@@ -1,11 +1,9 @@
 import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
 
-
 /// Return a transaction hash and optionally a merkle proof, given a block height and a position in the block.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
 class ElectrumRequestIdFromPos extends ElectrumRequest<dynamic, dynamic> {
-  ElectrumRequestIdFromPos(
-      {required this.height, required this.txPos, this.merkle = false});
+  ElectrumRequestIdFromPos({required this.height, required this.txPos, this.merkle = false});
 
   /// The main chain block height, a non-negative integer.
   final int height;
@@ -21,7 +19,7 @@ class ElectrumRequestIdFromPos extends ElectrumRequest<dynamic, dynamic> {
   String get method => ElectrumRequestMethods.idFromPos.method;
 
   @override
-  List toJson() {
+  List toParams() {
     return [height, txPos, merkle];
   }
 
diff --git a/lib/src/provider/electrum_methods/methods/masternode_announce_broadcast.dart b/lib/src/provider/electrum_methods/methods/masternode_announce_broadcast.dart
index bda9b6c..00004da 100644
--- a/lib/src/provider/electrum_methods/methods/masternode_announce_broadcast.dart
+++ b/lib/src/provider/electrum_methods/methods/masternode_announce_broadcast.dart
@@ -1,22 +1,19 @@
 import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
 
-
 /// Pass through the masternode announce message to be broadcast by the daemon.
 /// Whenever a masternode comes online or a client is syncing,
 /// they will send this message which describes the masternode entry and how to validate messages from it.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumRequestMasternodeAnnounceBroadcast
-    extends ElectrumRequest<bool, bool> {
+class ElectrumRequestMasternodeAnnounceBroadcast extends ElectrumRequest<bool, bool> {
   ElectrumRequestMasternodeAnnounceBroadcast({required this.signmnb});
   final String signmnb;
 
   /// masternode.announce.broadcast
   @override
-  String get method =>
-      ElectrumRequestMethods.masternodeAnnounceBroadcast.method;
+  String get method => ElectrumRequestMethods.masternodeAnnounceBroadcast.method;
 
   @override
-  List toJson() {
+  List toParams() {
     return [signmnb];
   }
 
diff --git a/lib/src/provider/electrum_methods/methods/masternode_list.dart b/lib/src/provider/electrum_methods/methods/masternode_list.dart
index 70e25e0..62b2ac7 100644
--- a/lib/src/provider/electrum_methods/methods/masternode_list.dart
+++ b/lib/src/provider/electrum_methods/methods/masternode_list.dart
@@ -1,6 +1,5 @@
 import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
 
-
 /// Returns the list of masternodes.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
 class ElectrumRequestMasternodeList extends ElectrumRequest<List<String>, List<dynamic>> {
@@ -14,7 +13,7 @@ class ElectrumRequestMasternodeList extends ElectrumRequest<List<String>, List<d
   String get method => ElectrumRequestMethods.masternodeList.method;
 
   @override
-  List toJson() {
+  List toParams() {
     return [payees];
   }
 
diff --git a/lib/src/provider/electrum_methods/methods/masternode_subscribe.dart b/lib/src/provider/electrum_methods/methods/masternode_subscribe.dart
index 27d5d52..f5bebd2 100644
--- a/lib/src/provider/electrum_methods/methods/masternode_subscribe.dart
+++ b/lib/src/provider/electrum_methods/methods/masternode_subscribe.dart
@@ -1,10 +1,8 @@
 import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
 
-
 /// Returns the status of masternode.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumRequestMasternodeSubscribe
-    extends ElectrumRequest<String, String> {
+class ElectrumRequestMasternodeSubscribe extends ElectrumRequest<String, String> {
   ElectrumRequestMasternodeSubscribe({required this.collateral});
 
   /// The txId and the index of the collateral. Example ("8c59133e714797650cf69043d05e409bbf45670eed7c4e4a386e52c46f1b5e24-0")
@@ -15,7 +13,7 @@ class ElectrumRequestMasternodeSubscribe
   String get method => ElectrumRequestMethods.masternodeSubscribe.method;
 
   @override
-  List toJson() {
+  List toParams() {
     return [collateral];
   }
 
diff --git a/lib/src/provider/electrum_methods/methods/ping.dart b/lib/src/provider/electrum_methods/methods/ping.dart
index 6283845..f767b31 100644
--- a/lib/src/provider/electrum_methods/methods/ping.dart
+++ b/lib/src/provider/electrum_methods/methods/ping.dart
@@ -1,6 +1,5 @@
 import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
 
-
 /// Ping the server to ensure it is responding, and to keep the session alive. The server may disconnect clients that have sent no requests for roughly 10 minutes.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
 class ElectrumRequestPing extends ElectrumRequest<dynamic, dynamic> {
@@ -8,7 +7,7 @@ class ElectrumRequestPing extends ElectrumRequest<dynamic, dynamic> {
   String get method => ElectrumRequestMethods.ping.method;
 
   @override
-  List toJson() {
+  List toParams() {
     return [];
   }
 
diff --git a/lib/src/provider/electrum_methods/methods/protx_diff.dart b/lib/src/provider/electrum_methods/methods/protx_diff.dart
index 08f91c1..c7d99d5 100644
--- a/lib/src/provider/electrum_methods/methods/protx_diff.dart
+++ b/lib/src/provider/electrum_methods/methods/protx_diff.dart
@@ -18,7 +18,7 @@ class ElectrumRequestProtXDiff
   String get method => ElectrumRequestMethods.protxDiff.method;
 
   @override
-  List toJson() {
+  List toParams() {
     return [baseHeight, height];
   }
 
diff --git a/lib/src/provider/electrum_methods/methods/protx_info.dart b/lib/src/provider/electrum_methods/methods/protx_info.dart
index 79f7b81..a5dcac2 100644
--- a/lib/src/provider/electrum_methods/methods/protx_info.dart
+++ b/lib/src/provider/electrum_methods/methods/protx_info.dart
@@ -1,10 +1,8 @@
 import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
 
-
 /// Returns detailed information about a deterministic masternode.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumRequestProtXInfo
-    extends ElectrumRequest<Map<String, dynamic>, dynamic> {
+class ElectrumRequestProtXInfo extends ElectrumRequest<Map<String, dynamic>, dynamic> {
   ElectrumRequestProtXInfo({required this.protxHash});
 
   /// The hash of the initial ProRegTx
@@ -15,7 +13,7 @@ class ElectrumRequestProtXInfo
   String get method => ElectrumRequestMethods.protxInfo.method;
 
   @override
-  List toJson() {
+  List toParams() {
     return [protxHash];
   }
 
diff --git a/lib/src/provider/electrum_methods/methods/relay_fee.dart b/lib/src/provider/electrum_methods/methods/relay_fee.dart
index 73123bf..e641901 100644
--- a/lib/src/provider/electrum_methods/methods/relay_fee.dart
+++ b/lib/src/provider/electrum_methods/methods/relay_fee.dart
@@ -10,7 +10,7 @@ class ElectrumRequestRelayFee extends ElectrumRequest<BigInt, dynamic> {
   String get method => ElectrumRequestMethods.relayFee.method;
 
   @override
-  List toJson() {
+  List toParams() {
     return [];
   }
 
diff --git a/lib/src/provider/electrum_methods/methods/scripthash_unsubscribe.dart b/lib/src/provider/electrum_methods/methods/scripthash_unsubscribe.dart
index 54b50da..51c4349 100644
--- a/lib/src/provider/electrum_methods/methods/scripthash_unsubscribe.dart
+++ b/lib/src/provider/electrum_methods/methods/scripthash_unsubscribe.dart
@@ -1,6 +1,5 @@
 import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
 
-
 /// Unsubscribe from a script hash, preventing future notifications if its status changes.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
 class ElectrumRequestScriptHashUnSubscribe extends ElectrumRequest<bool, bool> {
@@ -14,7 +13,7 @@ class ElectrumRequestScriptHashUnSubscribe extends ElectrumRequest<bool, bool> {
   String get method => ElectrumRequestMethods.scriptHashUnSubscribe.method;
 
   @override
-  List toJson() {
+  List toParams() {
     return [scriptHash];
   }
 
diff --git a/lib/src/provider/electrum_methods/methods/server_banner.dart b/lib/src/provider/electrum_methods/methods/server_banner.dart
index 8bc5b73..d41eed8 100644
--- a/lib/src/provider/electrum_methods/methods/server_banner.dart
+++ b/lib/src/provider/electrum_methods/methods/server_banner.dart
@@ -1,6 +1,5 @@
 import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
 
-
 /// Return a banner to be shown in the Electrum console.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
 class ElectrumRequestServerBanner extends ElectrumRequest<String, dynamic> {
@@ -8,7 +7,7 @@ class ElectrumRequestServerBanner extends ElectrumRequest<String, dynamic> {
   String get method => ElectrumRequestMethods.serverBanner.method;
 
   @override
-  List toJson() {
+  List toParams() {
     return [];
   }
 
diff --git a/lib/src/provider/electrum_methods/methods/server_features.dart b/lib/src/provider/electrum_methods/methods/server_features.dart
index 94d3c9c..5b36d72 100644
--- a/lib/src/provider/electrum_methods/methods/server_features.dart
+++ b/lib/src/provider/electrum_methods/methods/server_features.dart
@@ -1,6 +1,5 @@
 import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
 
-
 /// Return a list of features and services supported by the server.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
 class ElectrumRequestServerFeatures extends ElectrumRequest<dynamic, dynamic> {
@@ -9,7 +8,7 @@ class ElectrumRequestServerFeatures extends ElectrumRequest<dynamic, dynamic> {
   String get method => ElectrumRequestMethods.serverFeatures.method;
 
   @override
-  List toJson() {
+  List toParams() {
     return [];
   }
 
diff --git a/lib/src/provider/electrum_methods/methods/server_peer_subscribe.dart b/lib/src/provider/electrum_methods/methods/server_peer_subscribe.dart
index a924cd4..f4a77bf 100644
--- a/lib/src/provider/electrum_methods/methods/server_peer_subscribe.dart
+++ b/lib/src/provider/electrum_methods/methods/server_peer_subscribe.dart
@@ -1,6 +1,5 @@
 import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
 
-
 /// Return a list of peer servers. Despite the name this is not a subscription and the server must send no notifications..
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
 class ElectrumRequestServerPeersSubscribe extends ElectrumRequest<List<dynamic>, List<dynamic>> {
@@ -9,7 +8,7 @@ class ElectrumRequestServerPeersSubscribe extends ElectrumRequest<List<dynamic>,
   String get method => ElectrumRequestMethods.serverPeersSubscribe.method;
 
   @override
-  List toJson() {
+  List toParams() {
     return [];
   }
 
diff --git a/lib/src/provider/electrum_methods/methods/status.dart b/lib/src/provider/electrum_methods/methods/status.dart
index aca06cb..87049ad 100644
--- a/lib/src/provider/electrum_methods/methods/status.dart
+++ b/lib/src/provider/electrum_methods/methods/status.dart
@@ -13,7 +13,7 @@ class ElectrumRequestScriptHashSubscribe extends ElectrumRequest<Map<String, dyn
   String get method => ElectrumRequestMethods.scriptHashSubscribe.method;
 
   @override
-  List toJson() {
+  List toParams() {
     return [scriptHash];
   }
 
diff --git a/lib/src/provider/electrum_methods/methods/tweaks_subscribe.dart b/lib/src/provider/electrum_methods/methods/tweaks_subscribe.dart
index b2f6bea..4a940f7 100644
--- a/lib/src/provider/electrum_methods/methods/tweaks_subscribe.dart
+++ b/lib/src/provider/electrum_methods/methods/tweaks_subscribe.dart
@@ -108,7 +108,7 @@ class ElectrumTweaksSubscribe
   String get method => ElectrumRequestMethods.tweaksSubscribe.method;
 
   @override
-  List toJson() {
+  List toParams() {
     return [height, count, historicalMode];
   }
 
diff --git a/lib/src/provider/providers/electrum.dart b/lib/src/provider/providers/electrum.dart
index 49ba258..c784a09 100644
--- a/lib/src/provider/providers/electrum.dart
+++ b/lib/src/provider/providers/electrum.dart
@@ -23,6 +23,16 @@ class ElectrumProvider {
     return provider;
   }
 
+  Future<List<ElectrumBatchRequestResult<T>>> batchRequest<T, U>(
+    ElectrumBatchRequest<T, U> request, [
+    Duration? timeout,
+  ]) async {
+    final id = ++_id;
+    final params = request.toRequest(id);
+    final result = await rpc.batchCall<U>(params as ElectrumBatchRequestDetails, timeout);
+    return result.map((r) => request.onResponse(r, params)).toList();
+  }
+
   /// Sends a request to the Electrum server using the specified [request] parameter.
   ///
   /// The [timeout] parameter, if provided, sets the maximum duration for the request.
diff --git a/lib/src/provider/service/electrum/electrum_ssl_service.dart b/lib/src/provider/service/electrum/electrum_ssl_service.dart
index 4222bd8..142cb6b 100644
--- a/lib/src/provider/service/electrum/electrum_ssl_service.dart
+++ b/lib/src/provider/service/electrum/electrum_ssl_service.dart
@@ -116,9 +116,18 @@ class ElectrumSSLService implements BitcoinBaseElectrumRPCService {
       }
 
       if (isJSONStringCorrect(unterminatedString)) {
-        final response = json.decode(unterminatedString) as Map<String, dynamic>;
-        _handleResponse(response);
-        unterminatedString = '';
+        try {
+          final response = json.decode(unterminatedString) as Map<String, dynamic>;
+          _handleResponse(response);
+          unterminatedString = '';
+        } catch (_) {
+          final response = json.decode(unterminatedString) as List<dynamic>;
+          for (final element in response) {
+            _handleResponse(element as Map<String, dynamic>);
+          }
+
+          unterminatedString = '';
+        }
       }
     } on TypeError catch (e) {
       if (!e.toString().contains('Map<String, Object>') &&
@@ -129,10 +138,17 @@ class ElectrumSSLService implements BitcoinBaseElectrumRPCService {
       unterminatedString += message;
 
       if (isJSONStringCorrect(unterminatedString)) {
-        final response = json.decode(unterminatedString) as Map<String, dynamic>;
-        _handleResponse(response);
-        // unterminatedString = null;
-        unterminatedString = '';
+        try {
+          final response = json.decode(unterminatedString) as Map<String, dynamic>;
+          _handleResponse(response);
+          unterminatedString = '';
+        } catch (_) {
+          final response = json.decode(unterminatedString) as List<dynamic>;
+          for (final element in response) {
+            _handleResponse(element as Map<String, dynamic>);
+          }
+          unterminatedString = '';
+        }
       }
     } catch (_) {}
   }
@@ -168,8 +184,10 @@ class ElectrumSSLService implements BitcoinBaseElectrumRPCService {
       }
     }
 
-    final result = _findResult(response, _tasks[id]!.request);
-    _finish(id!, result);
+    try {
+      final result = _findResult(response, _tasks[id]!.request);
+      _finish(id!, result);
+    } catch (_) {}
   }
 
   void _onMessage(List<int> event) {
@@ -184,12 +202,13 @@ class ElectrumSSLService implements BitcoinBaseElectrumRPCService {
     }
   }
 
-  dynamic _findResult(dynamic data, ElectrumRequestDetails request) {
+  dynamic _findResult(dynamic data, BaseElectrumRequestDetails request) {
     final error = data["error"];
 
     if (error != null) {
+      final id = request.params["id"];
       if (error is String) {
-        _errors[request.id] = RPCError(
+        _errors[id] = RPCError(
           data: error,
           errorCode: 0,
           message: error,
@@ -198,7 +217,7 @@ class ElectrumSSLService implements BitcoinBaseElectrumRPCService {
       } else {
         final code = int.tryParse(((error['code']?.toString()) ?? "0")) ?? 0;
         final message = error['message'] ?? "";
-        _errors[request.id] = RPCError(
+        _errors[id] = RPCError(
           errorCode: code,
           message: message,
           data: error["data"],
@@ -279,5 +298,35 @@ class ElectrumSSLService implements BitcoinBaseElectrumRPCService {
     }
   }
 
+  List<AsyncRequestCompleter<T>> _registerBatchTask<T>(ElectrumBatchRequestDetails mainParams) {
+    return mainParams.params.map((params) {
+      final completer = AsyncRequestCompleter<T>(params);
+
+      final id = params["id"] as int;
+      _tasks[id] = SocketTask(
+        completer: completer.completer,
+        request: mainParams,
+        isSubscription: false,
+      );
+
+      return completer;
+    }).toList();
+  }
+
+  @override
+  Future<List<T>> batchCall<T>(ElectrumBatchRequestDetails params, [Duration? timeout]) async {
+    try {
+      final completers = _registerBatchTask<T>(params);
+      add(params.toTCPParams());
+      final result = await Future.wait(completers.map((e) => e.completer.future))
+          .timeout(timeout ?? defaultRequestTimeOut);
+      return result;
+    } finally {
+      for (final id in params.idsToParams.keys) {
+        _tasks.remove(id);
+      }
+    }
+  }
+
   RPCError? getError(int id) => _errors[id];
 }
diff --git a/lib/src/provider/service/electrum/electrum_tcp_service.dart b/lib/src/provider/service/electrum/electrum_tcp_service.dart
index c7ed19e..4783a0b 100644
--- a/lib/src/provider/service/electrum/electrum_tcp_service.dart
+++ b/lib/src/provider/service/electrum/electrum_tcp_service.dart
@@ -114,9 +114,18 @@ class ElectrumTCPService implements BitcoinBaseElectrumRPCService {
       }
 
       if (isJSONStringCorrect(unterminatedString)) {
-        final response = json.decode(unterminatedString) as Map<String, dynamic>;
-        _handleResponse(response);
-        unterminatedString = '';
+        try {
+          final response = json.decode(unterminatedString) as Map<String, dynamic>;
+          _handleResponse(response);
+          unterminatedString = '';
+        } catch (_) {
+          final response = json.decode(unterminatedString) as List<dynamic>;
+          for (final element in response) {
+            _handleResponse(element as Map<String, dynamic>);
+          }
+
+          unterminatedString = '';
+        }
       }
     } on TypeError catch (e) {
       if (!e.toString().contains('Map<String, Object>') &&
@@ -127,10 +136,17 @@ class ElectrumTCPService implements BitcoinBaseElectrumRPCService {
       unterminatedString += message;
 
       if (isJSONStringCorrect(unterminatedString)) {
-        final response = json.decode(unterminatedString) as Map<String, dynamic>;
-        _handleResponse(response);
-        // unterminatedString = null;
-        unterminatedString = '';
+        try {
+          final response = json.decode(unterminatedString) as Map<String, dynamic>;
+          _handleResponse(response);
+          unterminatedString = '';
+        } catch (_) {
+          final response = json.decode(unterminatedString) as List<dynamic>;
+          for (final element in response) {
+            _handleResponse(element as Map<String, dynamic>);
+          }
+          unterminatedString = '';
+        }
       }
     } catch (_) {}
   }
@@ -179,22 +195,25 @@ class ElectrumTCPService implements BitcoinBaseElectrumRPCService {
     }
   }
 
-  dynamic _findResult(dynamic data, ElectrumRequestDetails request) {
-    if (data["error"] != null) {
-      if (data["error"] is String) {
-        _errors[request.id] = RPCError(
-          data: data["error"],
+  dynamic _findResult(dynamic data, BaseElectrumRequestDetails request) {
+    final error = data["error"];
+
+    if (error != null) {
+      final id = request.params["id"];
+      if (error is String) {
+        _errors[id] = RPCError(
+          data: error,
           errorCode: 0,
-          message: data["error"],
+          message: error,
           request: request.params,
         );
       } else {
-        final code = int.tryParse(((data["error"]?['code']?.toString()) ?? "0")) ?? 0;
-        final message = data["error"]?['message'] ?? "";
-        _errors[request.id] = RPCError(
+        final code = int.tryParse(((error['code']?.toString()) ?? "0")) ?? 0;
+        final message = error['message'] ?? "";
+        _errors[id] = RPCError(
           errorCode: code,
           message: message,
-          data: data["error"]?["data"],
+          data: error["data"],
           request: data["request"] ?? request.params,
         );
 
@@ -203,8 +222,6 @@ class ElectrumTCPService implements BitcoinBaseElectrumRPCService {
           return <String, dynamic>{};
         }
       }
-
-      throw _errors[request.id]!;
     }
 
     return data["result"] ?? data["params"]?[0];
@@ -274,5 +291,35 @@ class ElectrumTCPService implements BitcoinBaseElectrumRPCService {
     }
   }
 
+  List<AsyncRequestCompleter<T>> _registerBatchTask<T>(ElectrumBatchRequestDetails mainParams) {
+    return mainParams.params.map((params) {
+      final completer = AsyncRequestCompleter<T>(params);
+
+      final id = params["id"] as int;
+      _tasks[id] = SocketTask(
+        completer: completer.completer,
+        request: mainParams,
+        isSubscription: false,
+      );
+
+      return completer;
+    }).toList();
+  }
+
+  @override
+  Future<List<T>> batchCall<T>(ElectrumBatchRequestDetails params, [Duration? timeout]) async {
+    try {
+      final completers = _registerBatchTask<T>(params);
+      add(params.toTCPParams());
+      final result = await Future.wait(completers.map((e) => e.completer.future))
+          .timeout(timeout ?? defaultRequestTimeOut);
+      return result;
+    } finally {
+      for (final id in params.idsToParams.keys) {
+        _tasks.remove(id);
+      }
+    }
+  }
+
   String getErrorMessage(int id) => _errors[id]?.data ?? '';
 }
diff --git a/lib/src/provider/service/electrum/params.dart b/lib/src/provider/service/electrum/params.dart
index d253ff7..a86add3 100644
--- a/lib/src/provider/service/electrum/params.dart
+++ b/lib/src/provider/service/electrum/params.dart
@@ -1,13 +1,26 @@
 import 'package:blockchain_utils/blockchain_utils.dart';
 
 /// Abstract class representing parameters for Electrum requests.
-abstract class ElectrumRequestParams {
+abstract class BaseElectrumRequestParams {
   abstract final String method;
-  List<dynamic> toJson();
+}
+
+abstract class ElectrumRequestParams implements BaseElectrumRequestParams {
+  List<dynamic> toParams();
 }
 
 /// Represents details of an Electrum request, including id, method, and parameters.
-class ElectrumRequestDetails {
+abstract class BaseElectrumRequestDetails {
+  const BaseElectrumRequestDetails({required this.method, required this.params});
+
+  final String method;
+  final dynamic params;
+
+  List<int> toTCPParams();
+  List<int> toWebSocketParams();
+}
+
+class ElectrumRequestDetails implements BaseElectrumRequestDetails {
   const ElectrumRequestDetails({
     required this.id,
     required this.method,
@@ -15,38 +28,116 @@ class ElectrumRequestDetails {
   });
 
   final int id;
-
+  @override
   final String method;
 
+  @override
   final Map<String, dynamic> params;
 
+  @override
   List<int> toTCPParams() {
     final param = "${StringUtils.fromJson(params)}\n";
     return StringUtils.encode(param);
   }
 
+  @override
   List<int> toWebSocketParams() {
     return StringUtils.encode(StringUtils.fromJson(params));
   }
 }
 
 /// Abstract class representing an Electrum request with generic result and response types.
-abstract class ElectrumRequest<RESULT, RESPONSE> implements ElectrumRequestParams {
+abstract class BaseElectrumRequest<RESULT, RESPONSE> implements BaseElectrumRequestParams {
   String? get validate => null;
 
+  BaseElectrumRequestDetails toRequest(int requestId);
+}
+
+abstract class ElectrumRequest<RESULT, RESPONSE> extends BaseElectrumRequest<RESULT, RESPONSE>
+    implements ElectrumRequestParams {
   RESULT onResponse(RESPONSE result) {
     return result as RESULT;
   }
 
+  @override
   ElectrumRequestDetails toRequest(int requestId) {
-    List<dynamic> inJson = toJson();
-    inJson.removeWhere((v) => v == null);
-    final params = {
+    final params = toParams();
+    params.removeWhere((v) => v == null);
+    final json = {
       "jsonrpc": "2.0",
       "method": method,
-      "params": inJson,
+      "params": params,
       "id": requestId,
     };
-    return ElectrumRequestDetails(id: requestId, params: params, method: method);
+    return ElectrumRequestDetails(id: requestId, params: json, method: method);
+  }
+}
+
+abstract class ElectrumBatchRequestParams implements BaseElectrumRequestParams {
+  List<List<dynamic>> toParams();
+}
+
+class ElectrumBatchRequestDetails implements BaseElectrumRequestDetails {
+  const ElectrumBatchRequestDetails({
+    required this.idsToParams,
+    required this.method,
+    required this.params,
+  });
+
+  final Map<int, List<dynamic>> idsToParams;
+
+  @override
+  final String method;
+
+  @override
+  final List<Map<String, dynamic>> params;
+
+  @override
+  List<int> toTCPParams() {
+    final param = "${StringUtils.fromJson(params)}\n";
+    return StringUtils.encode(param);
+  }
+
+  @override
+  List<int> toWebSocketParams() {
+    return StringUtils.encode(StringUtils.fromJson(params));
+  }
+}
+
+class ElectrumBatchRequestResult<RESULT> {
+  final ElectrumBatchRequestDetails request;
+  final RESULT result;
+
+  ElectrumBatchRequestResult(this.request, this.result);
+}
+
+abstract class ElectrumBatchRequest<RESULT, RESPONSE> extends BaseElectrumRequest<RESULT, RESPONSE>
+    implements ElectrumBatchRequestParams {
+  ElectrumBatchRequestResult<RESULT> onResponse(
+    RESPONSE result,
+    ElectrumBatchRequestDetails details,
+  ) {
+    return ElectrumBatchRequestResult<RESULT>(details, result as RESULT);
+  }
+
+  @override
+  BaseElectrumRequestDetails toRequest(int requestId) {
+    List<List<dynamic>> params = toParams();
+    final idsToParams = <int, List<dynamic>>{};
+
+    final json = params.map((e) {
+      final json = {
+        "jsonrpc": "2.0",
+        "method": method,
+        "params": e,
+        "id": requestId,
+      };
+      idsToParams[requestId] = e;
+
+      requestId++;
+      return json;
+    }).toList();
+
+    return ElectrumBatchRequestDetails(idsToParams: idsToParams, params: json, method: method);
   }
 }
diff --git a/lib/src/provider/service/electrum/service.dart b/lib/src/provider/service/electrum/service.dart
index 96090d7..8b4cd46 100644
--- a/lib/src/provider/service/electrum/service.dart
+++ b/lib/src/provider/service/electrum/service.dart
@@ -18,7 +18,7 @@ class SocketTask {
   final Completer<dynamic>? completer;
   final BehaviorSubject<dynamic>? subject;
   final bool isSubscription;
-  final ElectrumRequestDetails request;
+  final BaseElectrumRequestDetails request;
 }
 
 /// Abstract class for providing JSON-RPC service functionality.
@@ -47,6 +47,10 @@ abstract class BitcoinBaseElectrumRPCService {
   }) {
     throw UnimplementedError();
   }
+
+  Future<List<T>> batchCall<T>(ElectrumBatchRequestDetails params, [Duration? timeout]) async {
+    throw UnimplementedError();
+  }
 }
 
 bool isJSONStringCorrect(String source) {

From 51335610b9986eff1e7912f6cc219392946ff4db Mon Sep 17 00:00:00 2001
From: Rafael Saes <git@rafael.saes.dev>
Date: Thu, 16 Jan 2025 13:53:56 -0300
Subject: [PATCH 42/62] feat(batch): allow finding params by request id

---
 .../electrum_methods/methods/get_balance.dart | 11 ++-
 .../electrum_methods/methods/get_history.dart | 13 ++--
 .../methods/get_transaction.dart              | 74 +++++++++++++++++++
 .../electrum/electrum_ssl_service.dart        |  9 ++-
 .../electrum/electrum_tcp_service.dart        |  2 +-
 lib/src/provider/service/electrum/params.dart | 21 ++++--
 .../provider/service/electrum/service.dart    |  2 +
 7 files changed, 113 insertions(+), 19 deletions(-)

diff --git a/lib/src/provider/electrum_methods/methods/get_balance.dart b/lib/src/provider/electrum_methods/methods/get_balance.dart
index 11e1743..c75504e 100644
--- a/lib/src/provider/electrum_methods/methods/get_balance.dart
+++ b/lib/src/provider/electrum_methods/methods/get_balance.dart
@@ -49,9 +49,14 @@ class ElectrumBatchRequestGetScriptHashBalance
   ///  Each confirmed transaction is a dictionary
   @override
   ElectrumBatchRequestResult<Map<String, dynamic>> onResponse(
-    Map<String, dynamic> result,
-    ElectrumBatchRequestDetails details,
+    Map<String, dynamic> data,
+    ElectrumBatchRequestDetails request,
   ) {
-    return ElectrumBatchRequestResult(details, Map<String, dynamic>.from(result));
+    final id = data['id'] as int;
+    return ElectrumBatchRequestResult(
+      request: request,
+      id: id,
+      result: Map<String, dynamic>.from(data['result']),
+    );
   }
 }
diff --git a/lib/src/provider/electrum_methods/methods/get_history.dart b/lib/src/provider/electrum_methods/methods/get_history.dart
index 0ce9738..bf1ea72 100644
--- a/lib/src/provider/electrum_methods/methods/get_history.dart
+++ b/lib/src/provider/electrum_methods/methods/get_history.dart
@@ -28,7 +28,7 @@ class ElectrumRequestScriptHashGetHistory
 }
 
 class ElectrumBatchRequestScriptHashGetHistory
-    extends ElectrumBatchRequest<List<Map<String, dynamic>>, List<dynamic>> {
+    extends ElectrumBatchRequest<List<Map<String, dynamic>>, Map<String, dynamic>> {
   ElectrumBatchRequestScriptHashGetHistory({required this.scriptHashes});
 
   /// The script hash as a hexadecimal string (BitcoinBaseAddress.pubKeyHash())
@@ -50,12 +50,15 @@ class ElectrumBatchRequestScriptHashGetHistory
   ///  Each confirmed transaction is a dictionary
   @override
   ElectrumBatchRequestResult<List<Map<String, dynamic>>> onResponse(
-    List<dynamic> result,
-    ElectrumBatchRequestDetails details,
+    Map<String, dynamic> data,
+    ElectrumBatchRequestDetails request,
   ) {
+    final id = data['id'] as int;
+    final result = data['result'] as List<dynamic>;
     return ElectrumBatchRequestResult(
-      details,
-      result.map((e) => Map<String, dynamic>.from(e)).toList(),
+      request: request,
+      id: id,
+      result: result.map((e) => Map<String, dynamic>.from(e)).toList(),
     );
   }
 }
diff --git a/lib/src/provider/electrum_methods/methods/get_transaction.dart b/lib/src/provider/electrum_methods/methods/get_transaction.dart
index c004cb5..3834dd4 100644
--- a/lib/src/provider/electrum_methods/methods/get_transaction.dart
+++ b/lib/src/provider/electrum_methods/methods/get_transaction.dart
@@ -28,6 +28,43 @@ class ElectrumRequestGetTransactionHex extends ElectrumRequest<String, String> {
   }
 }
 
+class ElectrumBatchRequestGetTransactionHex
+    extends ElectrumBatchRequest<String, Map<String, dynamic>> {
+  ElectrumBatchRequestGetTransactionHex({required this.transactionHashes});
+
+  /// The transaction hash as a hexadecimal string.
+  final List<String> transactionHashes;
+
+  /// blockchain.transaction.get
+  @override
+  String get method => ElectrumRequestMethods.getTransaction.method;
+
+  @override
+  List<List> toParams() {
+    return [
+      ...transactionHashes.map((e) => [e])
+    ];
+  }
+
+  /// If verbose is false:
+  /// The raw transaction as a hexadecimal string.
+  ///
+  /// If verbose is true:
+  /// The result is a coin-specific dictionary – whatever the coin daemon returns when asked for a verbose form of the raw transaction.
+  @override
+  ElectrumBatchRequestResult<String> onResponse(
+    Map<String, dynamic> data,
+    ElectrumBatchRequestDetails request,
+  ) {
+    final id = data['id'] as int;
+    return ElectrumBatchRequestResult(
+      request: request,
+      id: id,
+      result: data['result'] as String,
+    );
+  }
+}
+
 class ElectrumRequestGetTransactionVerbose
     extends ElectrumRequest<Map<String, dynamic>, Map<String, dynamic>> {
   ElectrumRequestGetTransactionVerbose({required this.transactionHash});
@@ -54,3 +91,40 @@ class ElectrumRequestGetTransactionVerbose
     return result;
   }
 }
+
+class ElectrumBatchRequestGetTransactionVerbose
+    extends ElectrumBatchRequest<Map<String, dynamic>, Map<String, dynamic>> {
+  ElectrumBatchRequestGetTransactionVerbose({required this.transactionHashes});
+
+  /// The transaction hash as a hexadecimal string.
+  final List<String> transactionHashes;
+
+  /// blockchain.transaction.get
+  @override
+  String get method => ElectrumRequestMethods.getTransaction.method;
+
+  @override
+  List<List> toParams() {
+    return [
+      ...transactionHashes.map((e) => [e, true])
+    ];
+  }
+
+  /// If verbose is false:
+  /// The raw transaction as a hexadecimal string.
+  ///
+  /// If verbose is true:
+  /// The result is a coin-specific dictionary – whatever the coin daemon returns when asked for a verbose form of the raw transaction.
+  @override
+  ElectrumBatchRequestResult<Map<String, dynamic>> onResponse(
+    Map<String, dynamic> data,
+    ElectrumBatchRequestDetails request,
+  ) {
+    final id = data['id'] as int;
+    return ElectrumBatchRequestResult(
+      request: request,
+      id: id,
+      result: data['result'] as Map<String, dynamic>,
+    );
+  }
+}
diff --git a/lib/src/provider/service/electrum/electrum_ssl_service.dart b/lib/src/provider/service/electrum/electrum_ssl_service.dart
index 142cb6b..8253ef9 100644
--- a/lib/src/provider/service/electrum/electrum_ssl_service.dart
+++ b/lib/src/provider/service/electrum/electrum_ssl_service.dart
@@ -242,7 +242,11 @@ class ElectrumSSLService implements BitcoinBaseElectrumRPCService {
 
     final notCompleted = task.completer != null && task.completer!.isCompleted == false;
     if (notCompleted) {
-      task.completer!.complete(result);
+      if (task.isBatchRequest) {
+        task.completer!.complete({"id": id, "result": result});
+      } else {
+        task.completer!.complete(result);
+      }
     }
 
     if (!task.isSubscription) {
@@ -307,6 +311,7 @@ class ElectrumSSLService implements BitcoinBaseElectrumRPCService {
         completer: completer.completer,
         request: mainParams,
         isSubscription: false,
+        isBatchRequest: true,
       );
 
       return completer;
@@ -322,7 +327,7 @@ class ElectrumSSLService implements BitcoinBaseElectrumRPCService {
           .timeout(timeout ?? defaultRequestTimeOut);
       return result;
     } finally {
-      for (final id in params.idsToParams.keys) {
+      for (final id in params.paramsById.keys) {
         _tasks.remove(id);
       }
     }
diff --git a/lib/src/provider/service/electrum/electrum_tcp_service.dart b/lib/src/provider/service/electrum/electrum_tcp_service.dart
index 4783a0b..b1b748a 100644
--- a/lib/src/provider/service/electrum/electrum_tcp_service.dart
+++ b/lib/src/provider/service/electrum/electrum_tcp_service.dart
@@ -315,7 +315,7 @@ class ElectrumTCPService implements BitcoinBaseElectrumRPCService {
           .timeout(timeout ?? defaultRequestTimeOut);
       return result;
     } finally {
-      for (final id in params.idsToParams.keys) {
+      for (final id in params.paramsById.keys) {
         _tasks.remove(id);
       }
     }
diff --git a/lib/src/provider/service/electrum/params.dart b/lib/src/provider/service/electrum/params.dart
index a86add3..8a68a42 100644
--- a/lib/src/provider/service/electrum/params.dart
+++ b/lib/src/provider/service/electrum/params.dart
@@ -79,12 +79,12 @@ abstract class ElectrumBatchRequestParams implements BaseElectrumRequestParams {
 
 class ElectrumBatchRequestDetails implements BaseElectrumRequestDetails {
   const ElectrumBatchRequestDetails({
-    required this.idsToParams,
+    required this.paramsById,
     required this.method,
     required this.params,
   });
 
-  final Map<int, List<dynamic>> idsToParams;
+  final Map<int, List<dynamic>> paramsById;
 
   @override
   final String method;
@@ -107,23 +107,28 @@ class ElectrumBatchRequestDetails implements BaseElectrumRequestDetails {
 class ElectrumBatchRequestResult<RESULT> {
   final ElectrumBatchRequestDetails request;
   final RESULT result;
+  final int id;
 
-  ElectrumBatchRequestResult(this.request, this.result);
+  ElectrumBatchRequestResult({
+    required this.request,
+    required this.id,
+    required this.result,
+  });
 }
 
 abstract class ElectrumBatchRequest<RESULT, RESPONSE> extends BaseElectrumRequest<RESULT, RESPONSE>
     implements ElectrumBatchRequestParams {
   ElectrumBatchRequestResult<RESULT> onResponse(
     RESPONSE result,
-    ElectrumBatchRequestDetails details,
+    ElectrumBatchRequestDetails request,
   ) {
-    return ElectrumBatchRequestResult<RESULT>(details, result as RESULT);
+    throw UnimplementedError();
   }
 
   @override
   BaseElectrumRequestDetails toRequest(int requestId) {
     List<List<dynamic>> params = toParams();
-    final idsToParams = <int, List<dynamic>>{};
+    final paramsById = <int, List<dynamic>>{};
 
     final json = params.map((e) {
       final json = {
@@ -132,12 +137,12 @@ abstract class ElectrumBatchRequest<RESULT, RESPONSE> extends BaseElectrumReques
         "params": e,
         "id": requestId,
       };
-      idsToParams[requestId] = e;
+      paramsById[requestId] = e;
 
       requestId++;
       return json;
     }).toList();
 
-    return ElectrumBatchRequestDetails(idsToParams: idsToParams, params: json, method: method);
+    return ElectrumBatchRequestDetails(paramsById: paramsById, params: json, method: method);
   }
 }
diff --git a/lib/src/provider/service/electrum/service.dart b/lib/src/provider/service/electrum/service.dart
index 8b4cd46..96c6072 100644
--- a/lib/src/provider/service/electrum/service.dart
+++ b/lib/src/provider/service/electrum/service.dart
@@ -11,6 +11,7 @@ class SocketTask {
   SocketTask({
     required this.isSubscription,
     required this.request,
+    this.isBatchRequest = false,
     this.completer,
     this.subject,
   });
@@ -18,6 +19,7 @@ class SocketTask {
   final Completer<dynamic>? completer;
   final BehaviorSubject<dynamic>? subject;
   final bool isSubscription;
+  final bool isBatchRequest;
   final BaseElectrumRequestDetails request;
 }
 

From dbded1a7bdb22f125754b097ff8c806fbb905e1f Mon Sep 17 00:00:00 2001
From: Rafael Saes <git@rafael.saes.dev>
Date: Tue, 21 Jan 2025 14:00:21 -0300
Subject: [PATCH 43/62] feat(util): getKeyNetVersion

---
 lib/src/bitcoin/address/util.dart | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/lib/src/bitcoin/address/util.dart b/lib/src/bitcoin/address/util.dart
index 1208b82..e52948f 100644
--- a/lib/src/bitcoin/address/util.dart
+++ b/lib/src/bitcoin/address/util.dart
@@ -153,4 +153,13 @@ class BitcoinAddressUtils {
         throw Exception("Derivation not available for $scriptType");
     }
   }
+
+  static Bip32KeyNetVersions? getKeyNetVersion(BasedUtxoNetwork network) {
+    switch (network) {
+      case LitecoinNetwork.mainnet:
+        return Bip44Conf.litecoinMainNet.altKeyNetVer;
+      default:
+        return null;
+    }
+  }
 }

From db0856e1f69f148c8cfc5e8861e1c777ce8f85db Mon Sep 17 00:00:00 2001
From: Rafael Saes <git@rafael.saes.dev>
Date: Wed, 22 Jan 2025 20:11:06 -0300
Subject: [PATCH 44/62] feat: support batch subscription

---
 lib/bitcoin_base.dart                         |   4 +
 .../electrum_methods/methods/status.dart      |  36 ++++-
 lib/src/provider/providers/electrum.dart      |  29 +++-
 .../provider/service/electrum/electrum.dart   |   1 +
 .../electrum/electrum_ssl_service.dart        | 128 +++++++++++++-----
 .../electrum/electrum_tcp_service.dart        | 126 ++++++++++++-----
 .../service/electrum/electrum_version.dart    |  44 ++++++
 lib/src/provider/service/electrum/params.dart |   6 +
 .../provider/service/electrum/service.dart    |   8 +-
 9 files changed, 306 insertions(+), 76 deletions(-)
 create mode 100644 lib/src/provider/service/electrum/electrum_version.dart

diff --git a/lib/bitcoin_base.dart b/lib/bitcoin_base.dart
index b9391f1..f277292 100644
--- a/lib/bitcoin_base.dart
+++ b/lib/bitcoin_base.dart
@@ -22,6 +22,10 @@ export 'src/provider/api_provider.dart';
 
 export 'src/provider/models/electrum/electrum_utxo.dart';
 
+export 'src/provider/service/electrum/electrum.dart';
+
+export 'src/provider/service/electrum/electrum_version.dart';
+
 export 'src/utils/utils.dart';
 
 export 'src/utils/btc_utils.dart';
diff --git a/lib/src/provider/electrum_methods/methods/status.dart b/lib/src/provider/electrum_methods/methods/status.dart
index 87049ad..95e09fa 100644
--- a/lib/src/provider/electrum_methods/methods/status.dart
+++ b/lib/src/provider/electrum_methods/methods/status.dart
@@ -2,7 +2,7 @@ import 'package:bitcoin_base/src/provider/service/electrum/electrum.dart';
 
 /// Subscribe to a script hash.
 /// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
-class ElectrumRequestScriptHashSubscribe extends ElectrumRequest<Map<String, dynamic>, dynamic> {
+class ElectrumRequestScriptHashSubscribe extends ElectrumRequest<String?, String?> {
   ElectrumRequestScriptHashSubscribe({required this.scriptHash});
 
   /// /// The script hash as a hexadecimal string (BitcoinBaseAddress.pubKeyHash())
@@ -19,7 +19,39 @@ class ElectrumRequestScriptHashSubscribe extends ElectrumRequest<Map<String, dyn
 
   /// The status of the script hash.
   @override
-  Map<String, dynamic> onResponse(result) {
+  String? onResponse(result) {
     return result;
   }
 }
+
+class ElectrumBatchRequestScriptHashSubscribe
+    extends ElectrumBatchRequest<String?, Map<String, dynamic>> {
+  ElectrumBatchRequestScriptHashSubscribe({required this.scriptHashes});
+
+  /// The script hash as a hexadecimal string (BitcoinBaseAddress.pubKeyHash())
+  final List<String> scriptHashes;
+
+  /// blockchain.scripthash.get_history
+  @override
+  String get method => ElectrumRequestMethods.scriptHashSubscribe.method;
+
+  @override
+  List<List> toParams() {
+    return [
+      ...scriptHashes.map((e) => [e])
+    ];
+  }
+
+  /// A list of confirmed transactions in blockchain order,
+  ///  with the output of blockchain.scripthash.get_mempool() appended to the list.
+  ///  Each confirmed transaction is a dictionary
+  @override
+  ElectrumBatchRequestResult<String?> onResponse(
+    Map<String, dynamic> data,
+    ElectrumBatchRequestDetails request,
+  ) {
+    final id = data['id'] as int;
+    final result = data['result'] as String?;
+    return ElectrumBatchRequestResult(request: request, id: id, result: result);
+  }
+}
diff --git a/lib/src/provider/providers/electrum.dart b/lib/src/provider/providers/electrum.dart
index c784a09..e964b04 100644
--- a/lib/src/provider/providers/electrum.dart
+++ b/lib/src/provider/providers/electrum.dart
@@ -3,6 +3,13 @@ import 'dart:async';
 import 'package:bitcoin_base/bitcoin_base.dart';
 import 'package:rxdart/rxdart.dart';
 
+class BatchSubscription<T> {
+  final BehaviorSubject<T> subscription;
+  final ElectrumBatchRequestDetails params;
+
+  BatchSubscription(this.subscription, this.params);
+}
+
 typedef ListenerCallback<T> = StreamSubscription<T> Function(
   void Function(T)? onData, {
   Function? onError,
@@ -28,9 +35,11 @@ class ElectrumProvider {
     Duration? timeout,
   ]) async {
     final id = ++_id;
-    final params = request.toRequest(id);
-    final result = await rpc.batchCall<U>(params as ElectrumBatchRequestDetails, timeout);
-    return result.map((r) => request.onResponse(r, params)).toList();
+    final params = request.toRequest(id) as ElectrumBatchRequestDetails;
+    _id = request.finalId;
+
+    final results = await rpc.batchCall<U>(params, timeout);
+    return results.map((r) => request.onResponse(r, params)).toList();
   }
 
   /// Sends a request to the Electrum server using the specified [request] parameter.
@@ -43,6 +52,20 @@ class ElectrumProvider {
     return request.onResponse(result);
   }
 
+  Future<List<BatchSubscription<U>>?> batchSubscribe<T, U>(
+    ElectrumBatchRequest<T, U> request, [
+    Duration? timeout,
+  ]) async {
+    final id = ++_id;
+    final params = request.toRequest(id) as ElectrumBatchRequestDetails;
+    _id = request.finalId;
+    final subscriptions = rpc.batchSubscribe<U>(params);
+
+    if (subscriptions == null) return null;
+
+    return subscriptions.map((s) => BatchSubscription(s.subscription, params)).toList();
+  }
+
   // Preserving generic type T in subscribe method
   BehaviorSubject<U>? subscribe<T, U>(ElectrumRequest<T, U> request) {
     final id = ++_id;
diff --git a/lib/src/provider/service/electrum/electrum.dart b/lib/src/provider/service/electrum/electrum.dart
index bf6e9cb..f8bbc94 100644
--- a/lib/src/provider/service/electrum/electrum.dart
+++ b/lib/src/provider/service/electrum/electrum.dart
@@ -1,6 +1,7 @@
 export 'methods.dart';
 export 'params.dart';
 export 'service.dart';
+export 'electrum_version.dart';
 export 'request_completer.dart';
 export 'electrum_ssl_service.dart';
 export 'electrum_tcp_service.dart';
diff --git a/lib/src/provider/service/electrum/electrum_ssl_service.dart b/lib/src/provider/service/electrum/electrum_ssl_service.dart
index 8253ef9..e3f327c 100644
--- a/lib/src/provider/service/electrum/electrum_ssl_service.dart
+++ b/lib/src/provider/service/electrum/electrum_ssl_service.dart
@@ -184,50 +184,74 @@ class ElectrumSSLService implements BitcoinBaseElectrumRPCService {
       }
     }
 
-    try {
-      final result = _findResult(response, _tasks[id]!.request);
-      _finish(id!, result);
-    } catch (_) {}
+    final result = _findResult(response, _tasks[id]?.request);
+    _finish(id!, result);
   }
 
   void _onMessage(List<int> event) {
-    final msg = utf8.decode(event.toList());
-    final messagesList = msg.split("\n");
-    for (var message in messagesList) {
-      if (message.isEmpty) {
-        continue;
-      }
+    try {
+      final msg = utf8.decode(event.toList());
+      final messagesList = msg.split("\n");
+      for (var message in messagesList) {
+        if (message.isEmpty) {
+          continue;
+        }
 
-      _parseResponse(message);
-    }
+        _parseResponse(message);
+      }
+    } catch (_) {}
   }
 
-  dynamic _findResult(dynamic data, BaseElectrumRequestDetails request) {
+  dynamic _findResult(dynamic data, BaseElectrumRequestDetails? request) {
     final error = data["error"];
+    int? id;
+    try {
+      id = request?.params["id"];
+    } catch (_) {}
+    final requestParams = data["request"] ?? request?.params;
 
     if (error != null) {
-      final id = request.params["id"];
       if (error is String) {
-        _errors[id] = RPCError(
-          data: error,
-          errorCode: 0,
-          message: error,
-          request: request.params,
-        );
+        if (id != null) {
+          _errors[id] = RPCError(
+            data: error,
+            errorCode: 0,
+            message: error,
+            request: requestParams,
+          );
+        }
       } else {
         final code = int.tryParse(((error['code']?.toString()) ?? "0")) ?? 0;
         final message = error['message'] ?? "";
-        _errors[id] = RPCError(
-          errorCode: code,
-          message: message,
-          data: error["data"],
-          request: data["request"] ?? request.params,
-        );
+
+        if (id != null) {
+          _errors[id] = RPCError(
+            errorCode: code,
+            message: message,
+            data: error["data"],
+            request: requestParams,
+          );
+        }
 
         if (message.toLowerCase().contains("unknown method") ||
             message.toLowerCase().contains("unsupported request")) {
           return <String, dynamic>{};
         }
+
+        if (message.toLowerCase().contains("batch limit")) {
+          for (final k in _tasks.keys) {
+            if (_tasks[k]?.isBatchRequest ?? false) {
+              _errors[k] = RPCError(
+                errorCode: code,
+                message: message,
+                data: error["data"],
+                request: requestParams,
+              );
+
+              _tasks[k]!.completer?.completeError(_errors[k]!);
+            }
+          }
+        }
       }
     }
 
@@ -240,19 +264,23 @@ class ElectrumSSLService implements BitcoinBaseElectrumRPCService {
       return;
     }
 
-    final notCompleted = task.completer != null && task.completer!.isCompleted == false;
-    if (notCompleted) {
-      if (task.isBatchRequest) {
-        task.completer!.complete({"id": id, "result": result});
-      } else {
-        task.completer!.complete(result);
+    if (!task.isSubscription) {
+      final notCompleted = task.completer != null && task.completer!.isCompleted == false;
+      if (notCompleted) {
+        if (task.isBatchRequest) {
+          task.completer!.complete({"id": id, "result": result});
+        } else {
+          task.completer!.complete(result);
+        }
       }
-    }
 
-    if (!task.isSubscription) {
       _tasks.remove(id);
     } else {
-      task.subject?.add(result);
+      if (task.isBatchRequest) {
+        task.subject?.add({"id": id, "result": result});
+      } else {
+        task.subject?.add(result);
+      }
     }
   }
 
@@ -278,6 +306,36 @@ class ElectrumSSLService implements BitcoinBaseElectrumRPCService {
     }
   }
 
+  List<AsyncBehaviorSubject<T>> _registerBatchSubscription<T>(
+    ElectrumBatchRequestDetails mainParams,
+  ) {
+    return mainParams.params.map((params) {
+      final subscription = AsyncBehaviorSubject<T>(params);
+
+      final id = params["id"] as int;
+      _tasks[id] = SocketTask(
+        subject: subscription.subscription,
+        request: mainParams,
+        isSubscription: true,
+        isBatchRequest: true,
+      );
+
+      return subscription;
+    }).toList();
+  }
+
+  @override
+  List<AsyncBehaviorSubject<T>>? batchSubscribe<T>(ElectrumBatchRequestDetails params) {
+    try {
+      final subscriptions = _registerBatchSubscription<T>(params);
+      add(params.toTCPParams());
+
+      return subscriptions;
+    } catch (e) {
+      return null;
+    }
+  }
+
   AsyncRequestCompleter<T> _registerTask<T>(ElectrumRequestDetails params) {
     final completer = AsyncRequestCompleter<T>(params.params);
 
diff --git a/lib/src/provider/service/electrum/electrum_tcp_service.dart b/lib/src/provider/service/electrum/electrum_tcp_service.dart
index b1b748a..ece40c6 100644
--- a/lib/src/provider/service/electrum/electrum_tcp_service.dart
+++ b/lib/src/provider/service/electrum/electrum_tcp_service.dart
@@ -177,50 +177,74 @@ class ElectrumTCPService implements BitcoinBaseElectrumRPCService {
       });
     }
 
-    try {
-      final result = _findResult(response, _tasks[id]!.request);
-      _finish(id!, result);
-    } catch (_) {}
+    final result = _findResult(response, _tasks[id]!.request);
+    _finish(id!, result);
   }
 
   void _onMessage(List<int> event) {
-    final msg = utf8.decode(event.toList());
-    final messagesList = msg.split("\n");
-    for (var message in messagesList) {
-      if (message.isEmpty) {
-        continue;
-      }
+    try {
+      final msg = utf8.decode(event.toList());
+      final messagesList = msg.split("\n");
+      for (var message in messagesList) {
+        if (message.isEmpty) {
+          continue;
+        }
 
-      _parseResponse(message);
-    }
+        _parseResponse(message);
+      }
+    } catch (_) {}
   }
 
-  dynamic _findResult(dynamic data, BaseElectrumRequestDetails request) {
+  dynamic _findResult(dynamic data, BaseElectrumRequestDetails? request) {
     final error = data["error"];
+    int? id;
+    try {
+      id = request?.params["id"];
+    } catch (_) {}
+    final requestParams = data["request"] ?? request?.params;
 
     if (error != null) {
-      final id = request.params["id"];
       if (error is String) {
-        _errors[id] = RPCError(
-          data: error,
-          errorCode: 0,
-          message: error,
-          request: request.params,
-        );
+        if (id != null) {
+          _errors[id] = RPCError(
+            data: error,
+            errorCode: 0,
+            message: error,
+            request: requestParams,
+          );
+        }
       } else {
         final code = int.tryParse(((error['code']?.toString()) ?? "0")) ?? 0;
         final message = error['message'] ?? "";
-        _errors[id] = RPCError(
-          errorCode: code,
-          message: message,
-          data: error["data"],
-          request: data["request"] ?? request.params,
-        );
+
+        if (id != null) {
+          _errors[id] = RPCError(
+            errorCode: code,
+            message: message,
+            data: error["data"],
+            request: requestParams,
+          );
+        }
 
         if (message.toLowerCase().contains("unknown method") ||
             message.toLowerCase().contains("unsupported request")) {
           return <String, dynamic>{};
         }
+
+        if (message.toLowerCase().contains("batch limit")) {
+          for (final k in _tasks.keys) {
+            if (_tasks[k]?.isBatchRequest ?? false) {
+              _errors[k] = RPCError(
+                errorCode: code,
+                message: message,
+                data: error["data"],
+                request: requestParams,
+              );
+
+              _tasks[k]!.completer?.completeError(_errors[k]!);
+            }
+          }
+        }
       }
     }
 
@@ -233,15 +257,23 @@ class ElectrumTCPService implements BitcoinBaseElectrumRPCService {
       return;
     }
 
-    final notCompleted = task.completer != null && task.completer!.isCompleted == false;
-    if (notCompleted) {
-      task.completer!.complete(result);
-    }
-
     if (!task.isSubscription) {
+      final notCompleted = task.completer != null && task.completer!.isCompleted == false;
+      if (notCompleted) {
+        if (task.isBatchRequest) {
+          task.completer!.complete({"id": id, "result": result});
+        } else {
+          task.completer!.complete(result);
+        }
+      }
+
       _tasks.remove(id);
     } else {
-      task.subject?.add(result);
+      if (task.isBatchRequest) {
+        task.subject?.add({"id": id, "result": result});
+      } else {
+        task.subject?.add(result);
+      }
     }
   }
 
@@ -267,6 +299,36 @@ class ElectrumTCPService implements BitcoinBaseElectrumRPCService {
     }
   }
 
+  List<AsyncBehaviorSubject<T>> _registerBatchSubscription<T>(
+    ElectrumBatchRequestDetails mainParams,
+  ) {
+    return mainParams.params.map((params) {
+      final subscription = AsyncBehaviorSubject<T>(params);
+
+      final id = params["id"] as int;
+      _tasks[id] = SocketTask(
+        subject: subscription.subscription,
+        request: mainParams,
+        isSubscription: true,
+        isBatchRequest: true,
+      );
+
+      return subscription;
+    }).toList();
+  }
+
+  @override
+  List<AsyncBehaviorSubject<T>>? batchSubscribe<T>(ElectrumBatchRequestDetails params) {
+    try {
+      final subscriptions = _registerBatchSubscription<T>(params);
+      add(params.toTCPParams());
+
+      return subscriptions;
+    } catch (e) {
+      return null;
+    }
+  }
+
   AsyncRequestCompleter<T> _registerTask<T>(ElectrumRequestDetails params) {
     final completer = AsyncRequestCompleter<T>(params.params);
 
diff --git a/lib/src/provider/service/electrum/electrum_version.dart b/lib/src/provider/service/electrum/electrum_version.dart
new file mode 100644
index 0000000..2a94e75
--- /dev/null
+++ b/lib/src/provider/service/electrum/electrum_version.dart
@@ -0,0 +1,44 @@
+import 'package:bitcoin_base/src/exception/exception.dart';
+
+class ElectrumVersion {
+  final int major;
+  final int minor;
+  final int patch;
+
+  const ElectrumVersion(this.major, this.minor, this.patch);
+
+  factory ElectrumVersion.fromStr(String version) {
+    final parts = version.split('.');
+    if (parts.length != 3) {
+      throw DartBitcoinPluginException('Invalid version string: $version');
+    }
+
+    return ElectrumVersion(int.parse(parts[0]), int.parse(parts[1]), int.parse(parts[2]));
+  }
+
+  int compareTo(ElectrumVersion other) {
+    if (major > other.major) {
+      return 1;
+    } else if (major < other.major) {
+      return -1;
+    }
+
+    if (major == other.major) {
+      if (minor > other.minor) {
+        return 1;
+      } else if (minor < other.minor) {
+        return -1;
+      }
+    }
+
+    if (minor == other.minor) {
+      if (patch > other.patch) {
+        return 1;
+      } else if (patch < other.patch) {
+        return -1;
+      }
+    }
+
+    return 0;
+  }
+}
diff --git a/lib/src/provider/service/electrum/params.dart b/lib/src/provider/service/electrum/params.dart
index 8a68a42..58f608c 100644
--- a/lib/src/provider/service/electrum/params.dart
+++ b/lib/src/provider/service/electrum/params.dart
@@ -109,6 +109,8 @@ class ElectrumBatchRequestResult<RESULT> {
   final RESULT result;
   final int id;
 
+  List<dynamic>? get paramForRequest => request.paramsById[id];
+
   ElectrumBatchRequestResult({
     required this.request,
     required this.id,
@@ -125,6 +127,8 @@ abstract class ElectrumBatchRequest<RESULT, RESPONSE> extends BaseElectrumReques
     throw UnimplementedError();
   }
 
+  int finalId = 0;
+
   @override
   BaseElectrumRequestDetails toRequest(int requestId) {
     List<List<dynamic>> params = toParams();
@@ -143,6 +147,8 @@ abstract class ElectrumBatchRequest<RESULT, RESPONSE> extends BaseElectrumReques
       return json;
     }).toList();
 
+    finalId = requestId;
+
     return ElectrumBatchRequestDetails(paramsById: paramsById, params: json, method: method);
   }
 }
diff --git a/lib/src/provider/service/electrum/service.dart b/lib/src/provider/service/electrum/service.dart
index 96c6072..826a398 100644
--- a/lib/src/provider/service/electrum/service.dart
+++ b/lib/src/provider/service/electrum/service.dart
@@ -32,11 +32,15 @@ abstract class BitcoinBaseElectrumRPCService {
 
   AsyncBehaviorSubject<T>? subscribe<T>(ElectrumRequestDetails params);
 
+  List<AsyncBehaviorSubject<T>>? batchSubscribe<T>(ElectrumBatchRequestDetails params);
+
   /// Makes an HTTP GET request with the specified [params].
   ///
   /// The optional [timeout] parameter sets the maximum duration for the request.
   Future<T> call<T>(ElectrumRequestDetails params, [Duration? timeout]);
 
+  Future<List<T>> batchCall<T>(ElectrumBatchRequestDetails params, [Duration? timeout]);
+
   bool get isConnected;
   void disconnect();
   void reconnect();
@@ -49,10 +53,6 @@ abstract class BitcoinBaseElectrumRPCService {
   }) {
     throw UnimplementedError();
   }
-
-  Future<List<T>> batchCall<T>(ElectrumBatchRequestDetails params, [Duration? timeout]) async {
-    throw UnimplementedError();
-  }
 }
 
 bool isJSONStringCorrect(String source) {

From 049a1cc5f137d1bc206b19fd05289a8d9d9251f3 Mon Sep 17 00:00:00 2001
From: Mohsen <mrhaydari.t@gmail.com>
Date: Thu, 23 Jan 2025 10:29:17 +0330
Subject: [PATCH 45/62] v5.1.0

Update dependencies
---
 CHANGELOG.md         | 5 +++++
 example/pubspec.lock | 4 ++--
 example/pubspec.yaml | 2 +-
 pubspec.yaml         | 4 ++--
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8c20001..92a9a79 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,9 @@
+## 5.1.0
+
+* Update dependencies
+
 ## 5.0.0
+
 * Update dependencies
 * Minimum required Dart SDK version updated to 3.3.
 
diff --git a/example/pubspec.lock b/example/pubspec.lock
index e317342..f2e78f6 100644
--- a/example/pubspec.lock
+++ b/example/pubspec.lock
@@ -20,10 +20,10 @@ packages:
     dependency: "direct main"
     description:
       name: blockchain_utils
-      sha256: d25cf2ebfa340c5261e77bc0b960f97529c283160d1b9b4f63f3015816369d9f
+      sha256: "7d0a1a3df35e75433486c5967073be4dda19efb9232a5233e1558fa522405df7"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "4.0.1"
   boolean_selector:
     dependency: transitive
     description:
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
index c07a9b7..9838c82 100644
--- a/example/pubspec.yaml
+++ b/example/pubspec.yaml
@@ -39,7 +39,7 @@ dependencies:
     path: ../
   # blockchain_utils:
   #   path: ../../../blockchain_utils
-  blockchain_utils: ^4.0.0
+  blockchain_utils: ^4.0.1
   http: ^1.2.0
 
 dev_dependencies:
diff --git a/pubspec.yaml b/pubspec.yaml
index bf68a62..202aa3b 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: bitcoin_base
 description: A versatile library for Bitcoin, Dogecoin, Litecoin, Dash, BSV, and BCH. Supports P2PKH, P2SH, P2WPKH, P2WSH, P2TR, with advanced creation, signing, and spending capabilities.
-version: 5.0.0
+version: 5.1.0
 homepage: "https://github.com/mrtnetwork/bitcoin_base"
 repository: "https://github.com/mrtnetwork/bitcoin_base"
 Author: mrhaydari.t@gmail.com
@@ -16,7 +16,7 @@ environment:
 
 
 dependencies:
-  blockchain_utils: ^4.0.0
+  blockchain_utils: ^4.0.1
   
   # blockchain_utils:
   #   path: ../../blockchain_utils

From f205495f132c9397d5ca37c02cd113e8253443be Mon Sep 17 00:00:00 2001
From: Mohsen <mrhaydari.t@gmail.com>
Date: Thu, 23 Jan 2025 10:37:30 +0330
Subject: [PATCH 46/62] update lints

---
 analysis_options.yaml | 4 ++--
 pubspec.yaml          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/analysis_options.yaml b/analysis_options.yaml
index c20153f..3c029d1 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -1,5 +1,5 @@
-# include: package:lints/recommended.yaml
-include: package:flutter_lints/flutter.yaml
+include: package:lints/recommended.yaml
+# include: package:flutter_lints/flutter.yaml
 # Additional information about this file can be found at
 # https://dart.dev/guides/language/analysis-options
 # Uncomment the following section to specify additional rules.
diff --git a/pubspec.yaml b/pubspec.yaml
index 202aa3b..b59f777 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -23,7 +23,7 @@ dependencies:
     
 
 dev_dependencies:
-  lints: ^5.0.0
+  lints: ^5.1.1
   test: ^1.25.9
   flutter_lints: ^5.0.0
  

From c34df96c72446538e5b645951b03f3be384c7f66 Mon Sep 17 00:00:00 2001
From: Rafael Saes <git@rafael.saes.dev>
Date: Fri, 24 Jan 2025 16:23:50 -0300
Subject: [PATCH 47/62] feat: derivation from address, electrum send error on
 batch request or subscription, electrum version to string

---
 lib/src/bitcoin/address/derivations.dart           | 14 ++++++++++++++
 .../service/electrum/electrum_ssl_service.dart     | 10 ++++++++--
 .../service/electrum/electrum_tcp_service.dart     | 10 ++++++++--
 .../service/electrum/electrum_version.dart         |  5 +++++
 4 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/lib/src/bitcoin/address/derivations.dart b/lib/src/bitcoin/address/derivations.dart
index b93b49c..a2ac6b1 100644
--- a/lib/src/bitcoin/address/derivations.dart
+++ b/lib/src/bitcoin/address/derivations.dart
@@ -14,6 +14,20 @@ class BitcoinDerivationInfo {
   final BitcoinAddressType scriptType;
   final String? description;
 
+  static BitcoinDerivationInfo fromDerivationAndAddress(
+    BitcoinDerivationType derivationType,
+    String address,
+    BasedUtxoNetwork network,
+  ) {
+    final derivations = BITCOIN_DERIVATIONS[derivationType]!;
+    final scriptType = BitcoinAddressUtils.addressTypeFromStr(address, network);
+
+    return derivations.firstWhere(
+      (element) => element.scriptType == scriptType,
+      orElse: () => derivations.first,
+    );
+  }
+
   factory BitcoinDerivationInfo.fromJSON(Map<String, dynamic> json) {
     return BitcoinDerivationInfo(
       derivationType: BitcoinDerivationType.values[json['derivationType']],
diff --git a/lib/src/provider/service/electrum/electrum_ssl_service.dart b/lib/src/provider/service/electrum/electrum_ssl_service.dart
index e3f327c..74d2a51 100644
--- a/lib/src/provider/service/electrum/electrum_ssl_service.dart
+++ b/lib/src/provider/service/electrum/electrum_ssl_service.dart
@@ -240,7 +240,9 @@ class ElectrumSSLService implements BitcoinBaseElectrumRPCService {
 
         if (message.toLowerCase().contains("batch limit")) {
           for (final k in _tasks.keys) {
-            if (_tasks[k]?.isBatchRequest ?? false) {
+            final task = _tasks[k];
+
+            if (task?.isBatchRequest ?? false) {
               _errors[k] = RPCError(
                 errorCode: code,
                 message: message,
@@ -248,7 +250,11 @@ class ElectrumSSLService implements BitcoinBaseElectrumRPCService {
                 request: requestParams,
               );
 
-              _tasks[k]!.completer?.completeError(_errors[k]!);
+              if (task!.isSubscription) {
+                task.subject?.addError(_errors[k]!);
+              } else {
+                task.completer?.completeError(_errors[k]!);
+              }
             }
           }
         }
diff --git a/lib/src/provider/service/electrum/electrum_tcp_service.dart b/lib/src/provider/service/electrum/electrum_tcp_service.dart
index ece40c6..0fef7e8 100644
--- a/lib/src/provider/service/electrum/electrum_tcp_service.dart
+++ b/lib/src/provider/service/electrum/electrum_tcp_service.dart
@@ -233,7 +233,9 @@ class ElectrumTCPService implements BitcoinBaseElectrumRPCService {
 
         if (message.toLowerCase().contains("batch limit")) {
           for (final k in _tasks.keys) {
-            if (_tasks[k]?.isBatchRequest ?? false) {
+            final task = _tasks[k];
+
+            if (task?.isBatchRequest ?? false) {
               _errors[k] = RPCError(
                 errorCode: code,
                 message: message,
@@ -241,7 +243,11 @@ class ElectrumTCPService implements BitcoinBaseElectrumRPCService {
                 request: requestParams,
               );
 
-              _tasks[k]!.completer?.completeError(_errors[k]!);
+              if (task!.isSubscription) {
+                task.subject?.addError(_errors[k]!);
+              } else {
+                task.completer?.completeError(_errors[k]!);
+              }
             }
           }
         }
diff --git a/lib/src/provider/service/electrum/electrum_version.dart b/lib/src/provider/service/electrum/electrum_version.dart
index 2a94e75..23d3512 100644
--- a/lib/src/provider/service/electrum/electrum_version.dart
+++ b/lib/src/provider/service/electrum/electrum_version.dart
@@ -41,4 +41,9 @@ class ElectrumVersion {
 
     return 0;
   }
+
+  @override
+  String toString() {
+    return '$major.$minor.$patch';
+  }
 }

From 5a5db6fe470de3c49ae16638322c46487defe5f3 Mon Sep 17 00:00:00 2001
From: Mohsen <mrhaydari.t@gmail.com>
Date: Thu, 6 Feb 2025 12:03:59 +0330
Subject: [PATCH 48/62] V5.2.0

Update dependencies
---
 CHANGELOG.md                                   | 4 ++++
 example/pubspec.lock                           | 6 +++---
 example/pubspec.yaml                           | 2 +-
 lib/src/bitcoin/address/core.dart              | 2 +-
 lib/src/provider/models/fee_rate/fee_rate.dart | 2 +-
 pubspec.yaml                                   | 4 ++--
 6 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 92a9a79..517a24f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 5.2.0
+
+* Update dependencies
+
 ## 5.1.0
 
 * Update dependencies
diff --git a/example/pubspec.lock b/example/pubspec.lock
index f2e78f6..babb167 100644
--- a/example/pubspec.lock
+++ b/example/pubspec.lock
@@ -15,15 +15,15 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "5.0.0"
+    version: "5.2.0"
   blockchain_utils:
     dependency: "direct main"
     description:
       name: blockchain_utils
-      sha256: "7d0a1a3df35e75433486c5967073be4dda19efb9232a5233e1558fa522405df7"
+      sha256: b6cb335397685e7625bb74bbd4ff4f0dd0f6ce3e3f65a40da4aa5a3c54eaa78c
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.1"
+    version: "4.1.0"
   boolean_selector:
     dependency: transitive
     description:
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
index 9838c82..4c8b875 100644
--- a/example/pubspec.yaml
+++ b/example/pubspec.yaml
@@ -39,7 +39,7 @@ dependencies:
     path: ../
   # blockchain_utils:
   #   path: ../../../blockchain_utils
-  blockchain_utils: ^4.0.1
+  blockchain_utils: ^4.1.0
   http: ^1.2.0
 
 dev_dependencies:
diff --git a/lib/src/bitcoin/address/core.dart b/lib/src/bitcoin/address/core.dart
index 00517f4..57eef50 100644
--- a/lib/src/bitcoin/address/core.dart
+++ b/lib/src/bitcoin/address/core.dart
@@ -39,7 +39,7 @@ abstract class BitcoinAddressType implements Enumerate {
   T cast<T extends BitcoinAddressType>() {
     if (this is! T) {
       throw DartBitcoinPluginException('BitcoinAddressType casting failed.',
-          details: {'excepted': '$T', 'type': value});
+          details: {'expected': '$T', 'type': value});
     }
     return this as T;
   }
diff --git a/lib/src/provider/models/fee_rate/fee_rate.dart b/lib/src/provider/models/fee_rate/fee_rate.dart
index ec94008..8e2e279 100644
--- a/lib/src/provider/models/fee_rate/fee_rate.dart
+++ b/lib/src/provider/models/fee_rate/fee_rate.dart
@@ -100,6 +100,6 @@ BigInt _parseMempoolFees(dynamic data) {
     return BigInt.from((data * kb));
   } else {
     throw DartBitcoinPluginException(
-        'cannot parse mempool fees excepted double, string got ${data.runtimeType}');
+        'cannot parse mempool fees expected double, string got ${data.runtimeType}');
   }
 }
diff --git a/pubspec.yaml b/pubspec.yaml
index b59f777..34e832d 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: bitcoin_base
 description: A versatile library for Bitcoin, Dogecoin, Litecoin, Dash, BSV, and BCH. Supports P2PKH, P2SH, P2WPKH, P2WSH, P2TR, with advanced creation, signing, and spending capabilities.
-version: 5.1.0
+version: 5.2.0
 homepage: "https://github.com/mrtnetwork/bitcoin_base"
 repository: "https://github.com/mrtnetwork/bitcoin_base"
 Author: mrhaydari.t@gmail.com
@@ -16,7 +16,7 @@ environment:
 
 
 dependencies:
-  blockchain_utils: ^4.0.1
+  blockchain_utils: ^4.1.0
   
   # blockchain_utils:
   #   path: ../../blockchain_utils

From 1dc04cd60c55965fca4afe3ec2d2551653704cf0 Mon Sep 17 00:00:00 2001
From: Rafael Saes <git@rafael.saes.dev>
Date: Fri, 14 Feb 2025 15:53:23 -0300
Subject: [PATCH 49/62] feat: ltc mweb deriv

---
 lib/src/bitcoin/address/derivations.dart | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lib/src/bitcoin/address/derivations.dart b/lib/src/bitcoin/address/derivations.dart
index a2ac6b1..f7a00c4 100644
--- a/lib/src/bitcoin/address/derivations.dart
+++ b/lib/src/bitcoin/address/derivations.dart
@@ -64,6 +64,7 @@ abstract class BitcoinDerivationPaths {
   static const String SILENT_PAYMENTS_SPEND = "m/352'/0'/0'/0'/0";
 
   static const String LITECOIN = "m/84'/2'/0'";
+  static const String LITECOIN_MWEB = "m/1000'";
 
   static const String SAMOURAI_BAD_BANK = "m/84'/0'/2147483644'";
   static const String SAMOURAI_WHIRLPOOL_PREMIX = "m/84'/0'/2147483645'";
@@ -113,6 +114,13 @@ abstract class BitcoinDerivationInfos {
     scriptType: SegwitAddressType.p2wpkh,
   );
 
+  static final BitcoinDerivationInfo LITECOIN_MWEB = BitcoinDerivationInfo(
+    derivationType: BitcoinDerivationType.bip39,
+    derivationPath: BitcoinDerivationPaths.LITECOIN_MWEB,
+    description: "Litecoin MWEB",
+    scriptType: SegwitAddressType.mweb,
+  );
+
   static final BitcoinDerivationInfo SILENT_PAYMENTS_SCAN = BitcoinDerivationInfo(
     derivationType: BitcoinDerivationType.bip39,
     derivationPath: BitcoinDerivationPaths.SILENT_PAYMENTS_SCAN,

From 87da254431d863f3106ae159f0a6bf0987911a95 Mon Sep 17 00:00:00 2001
From: Rafael Saes <git@rafael.saes.dev>
Date: Fri, 14 Feb 2025 19:28:20 -0300
Subject: [PATCH 50/62] fix: wrong script type

---
 lib/src/bitcoin/script/output.dart            |  2 +-
 lib/src/bitcoin/script/transaction.dart       | 14 +++---
 .../forked_transaction_builder.dart           | 43 ++++++++++---------
 3 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/lib/src/bitcoin/script/output.dart b/lib/src/bitcoin/script/output.dart
index 45750f4..668e9e3 100644
--- a/lib/src/bitcoin/script/output.dart
+++ b/lib/src/bitcoin/script/output.dart
@@ -99,6 +99,6 @@ class TxOutput {
 
   @override
   String toString() {
-    return 'TxOutput{cashToken: ${cashToken?.toString()}}, amount: $amount, script: ${scriptPubKey.toString()}}';
+    return 'TxOutput{cashToken: ${cashToken?.toString()}, amount: $amount, script: ${scriptPubKey.toString()}}';
   }
 }
diff --git a/lib/src/bitcoin/script/transaction.dart b/lib/src/bitcoin/script/transaction.dart
index b31e55a..075af9b 100644
--- a/lib/src/bitcoin/script/transaction.dart
+++ b/lib/src/bitcoin/script/transaction.dart
@@ -251,12 +251,13 @@ class BtcTransaction {
   /// [script] The scriptCode (template) that corresponds to the segwit, transaction output type that we want to spend.
   /// [amount] The amount of the UTXO to spend is included in the signature for segwit (in satoshis).
   /// [sighash] The type of the signature hash to be created.
-  List<int> getTransactionSegwitDigit(
-      {required int txInIndex,
-      required Script script,
-      int sighash = BitcoinOpCodeConst.SIGHASH_ALL,
-      required BigInt amount,
-      CashToken? token}) {
+  List<int> getTransactionSegwitDigit({
+    required int txInIndex,
+    required Script script,
+    int sighash = BitcoinOpCodeConst.SIGHASH_ALL,
+    required BigInt amount,
+    CashToken? token,
+  }) {
     final tx = copy(this);
     var hashPrevouts = List<int>.filled(32, 0);
     var hashSequence = List<int>.filled(32, 0);
@@ -321,6 +322,7 @@ class BtcTransaction {
     txForSigning.add(hashOutputs);
     txForSigning.add(locktime);
     txForSigning.add(IntUtils.toBytes(sighash, length: 4, byteOrder: Endian.little));
+
     return QuickCrypto.sha256DoubleHash(txForSigning.toBytes());
   }
 
diff --git a/lib/src/transaction_builder/forked_transaction_builder.dart b/lib/src/transaction_builder/forked_transaction_builder.dart
index 362ab29..24bbda5 100644
--- a/lib/src/transaction_builder/forked_transaction_builder.dart
+++ b/lib/src/transaction_builder/forked_transaction_builder.dart
@@ -193,7 +193,7 @@ class ForkedTransactionBuilder implements BasedBitcoinTransacationBuilder {
       case P2pkhAddressType.p2pkhwt:
       case P2shAddressType.p2pkhInP2shwt:
       case P2shAddressType.p2pkhInP2sh32wt:
-        return senderPub.toP2pkAddress(mode: utxo.keyType).toScriptPubKey();
+        return senderPub.toP2pkhAddress(mode: utxo.keyType).toScriptPubKey();
       default:
         throw DartBitcoinPluginException(
             '${utxo.utxo.scriptType} does not sudpport on ${network.conf.coinName.name}');
@@ -215,18 +215,18 @@ class ForkedTransactionBuilder implements BasedBitcoinTransacationBuilder {
 //
   /// Returns:
   /// - `List<int>`: representing the transaction digest to be used for signing the input.
-  List<int> _generateTransactionDigest(
-      {required Script scriptPubKeys,
-      required int input,
-      required UtxoWithAddress utox,
-      required BtcTransaction transaction,
-      int sighash = BitcoinOpCodeConst.SIGHASH_ALL | BitcoinOpCodeConst.SIGHASH_FORKED}) {
+  List<int> _generateTransactionDigest({
+    required Script scriptPubKeys,
+    required int input,
+    required UtxoWithAddress utox,
+    required BtcTransaction transaction,
+  }) {
     return transaction.getTransactionSegwitDigit(
         txInIndex: input,
         script: scriptPubKeys,
         amount: utox.utxo.value,
         token: utox.utxo.token,
-        sighash: sighash);
+        sighash: BitcoinOpCodeConst.SIGHASH_ALL | BitcoinOpCodeConst.SIGHASH_FORKED);
   }
 
   /// buildP2wshOrP2shScriptSig constructs and returns a script signature (represented as a List of strings)
@@ -499,11 +499,11 @@ be retrieved by anyone who examines the blockchain's history.
 
       /// We generate transaction digest for current input
       final digest = _generateTransactionDigest(
-          scriptPubKeys: script,
-          input: i,
-          utox: indexUtxo,
-          transaction: transaction,
-          sighash: sighash);
+        scriptPubKeys: script,
+        input: i,
+        utox: indexUtxo,
+        transaction: transaction,
+      );
 
       /// handle multisig address
       if (indexUtxo.isMultiSig()) {
@@ -585,11 +585,11 @@ be retrieved by anyone who examines the blockchain's history.
 
       /// We generate transaction digest for current input
       final digest = _generateTransactionDigest(
-          scriptPubKeys: script,
-          input: i,
-          utox: indexUtxo,
-          transaction: transaction,
-          sighash: sighash);
+        scriptPubKeys: script,
+        input: i,
+        utox: indexUtxo,
+        transaction: transaction,
+      );
 
       /// handle multisig address
       if (indexUtxo.isMultiSig()) {
@@ -629,8 +629,11 @@ be retrieved by anyone who examines the blockchain's history.
     return transaction;
   }
 
-  void _addScripts(
-      {required UtxoWithAddress utxo, required TxInput input, required List<String> signatures}) {
+  void _addScripts({
+    required UtxoWithAddress utxo,
+    required TxInput input,
+    required List<String> signatures,
+  }) {
     /// ok we signed, now we need unlocking script for this input
     final scriptSig = utxo.isMultiSig()
         ? _buildMiltisigUnlockingScript(signatures, utxo)

From 941ac9aeb89b2df2bbb27f04afa591e6d395a306 Mon Sep 17 00:00:00 2001
From: Mohsen <mrhaydari.t@gmail.com>
Date: Tue, 18 Feb 2025 21:33:23 +0330
Subject: [PATCH 51/62] V5.3.0

Update dependencies
---
 CHANGELOG.md         | 4 ++++
 example/pubspec.lock | 6 +++---
 example/pubspec.yaml | 2 +-
 pubspec.yaml         | 4 ++--
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 517a24f..6b16580 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 5.3.0
+
+* Update dependencies
+
 ## 5.2.0
 
 * Update dependencies
diff --git a/example/pubspec.lock b/example/pubspec.lock
index babb167..51f424d 100644
--- a/example/pubspec.lock
+++ b/example/pubspec.lock
@@ -15,15 +15,15 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "5.2.0"
+    version: "5.3.0"
   blockchain_utils:
     dependency: "direct main"
     description:
       name: blockchain_utils
-      sha256: b6cb335397685e7625bb74bbd4ff4f0dd0f6ce3e3f65a40da4aa5a3c54eaa78c
+      sha256: "8633ec5db6200807286500f060a39a281f1b5468ecfbd88c4390ff358999e720"
       url: "https://pub.dev"
     source: hosted
-    version: "4.1.0"
+    version: "4.2.0"
   boolean_selector:
     dependency: transitive
     description:
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
index 4c8b875..8fd860e 100644
--- a/example/pubspec.yaml
+++ b/example/pubspec.yaml
@@ -39,7 +39,7 @@ dependencies:
     path: ../
   # blockchain_utils:
   #   path: ../../../blockchain_utils
-  blockchain_utils: ^4.1.0
+  blockchain_utils: ^4.2.0
   http: ^1.2.0
 
 dev_dependencies:
diff --git a/pubspec.yaml b/pubspec.yaml
index 34e832d..45af41b 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: bitcoin_base
 description: A versatile library for Bitcoin, Dogecoin, Litecoin, Dash, BSV, and BCH. Supports P2PKH, P2SH, P2WPKH, P2WSH, P2TR, with advanced creation, signing, and spending capabilities.
-version: 5.2.0
+version: 5.3.0
 homepage: "https://github.com/mrtnetwork/bitcoin_base"
 repository: "https://github.com/mrtnetwork/bitcoin_base"
 Author: mrhaydari.t@gmail.com
@@ -16,7 +16,7 @@ environment:
 
 
 dependencies:
-  blockchain_utils: ^4.1.0
+  blockchain_utils: ^4.2.0
   
   # blockchain_utils:
   #   path: ../../blockchain_utils

From a53b3b3fd82556dd273d95529869e15ccb9d07ce Mon Sep 17 00:00:00 2001
From: Rafael Saes <git@rafael.saes.dev>
Date: Tue, 18 Feb 2025 15:51:00 -0300
Subject: [PATCH 52/62] feat: bch derivations

---
 lib/src/bitcoin/address/derivations.dart | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/src/bitcoin/address/derivations.dart b/lib/src/bitcoin/address/derivations.dart
index f7a00c4..ee01a6c 100644
--- a/lib/src/bitcoin/address/derivations.dart
+++ b/lib/src/bitcoin/address/derivations.dart
@@ -66,6 +66,8 @@ abstract class BitcoinDerivationPaths {
   static const String LITECOIN = "m/84'/2'/0'";
   static const String LITECOIN_MWEB = "m/1000'";
 
+  static const String BCH = "m/44'/145'/0'";
+
   static const String SAMOURAI_BAD_BANK = "m/84'/0'/2147483644'";
   static const String SAMOURAI_WHIRLPOOL_PREMIX = "m/84'/0'/2147483645'";
   static const String SAMOURAI_WHIRLPOOL_POSTMIX = "m/84'/0'/2147483646'";
@@ -113,7 +115,6 @@ abstract class BitcoinDerivationInfos {
     description: "Default Litecoin",
     scriptType: SegwitAddressType.p2wpkh,
   );
-
   static final BitcoinDerivationInfo LITECOIN_MWEB = BitcoinDerivationInfo(
     derivationType: BitcoinDerivationType.bip39,
     derivationPath: BitcoinDerivationPaths.LITECOIN_MWEB,
@@ -121,6 +122,13 @@ abstract class BitcoinDerivationInfos {
     scriptType: SegwitAddressType.mweb,
   );
 
+  static final BitcoinDerivationInfo BCH = BitcoinDerivationInfo(
+    derivationType: BitcoinDerivationType.bip39,
+    derivationPath: BitcoinDerivationPaths.BCH,
+    description: "Bitcoin Cash (BCH) Default",
+    scriptType: P2pkhAddressType.p2pkh,
+  );
+
   static final BitcoinDerivationInfo SILENT_PAYMENTS_SCAN = BitcoinDerivationInfo(
     derivationType: BitcoinDerivationType.bip39,
     derivationPath: BitcoinDerivationPaths.SILENT_PAYMENTS_SCAN,

From aaf1bb6e86dbbff73051d4f697b5becf99120287 Mon Sep 17 00:00:00 2001
From: Rafael Saes <git@rafael.saes.dev>
Date: Mon, 10 Mar 2025 19:40:20 -0300
Subject: [PATCH 53/62] feat: mweb estimate

---
 lib/src/crypto/keypair/ec_public.dart                | 4 ++++
 lib/src/transaction_builder/transaction_builder.dart | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/src/crypto/keypair/ec_public.dart b/lib/src/crypto/keypair/ec_public.dart
index aed2122..67efc9e 100644
--- a/lib/src/crypto/keypair/ec_public.dart
+++ b/lib/src/crypto/keypair/ec_public.dart
@@ -168,6 +168,10 @@ class ECPublic {
         script: p2sh.toScriptPubKey(), type: P2shAddressType.p2wshInP2sh);
   }
 
+  MwebAddress toMwebAddress() {
+    return MwebAddress.fromRedeemScript(script: toRedeemScript());
+  }
+
   bool compareToAddress(BitcoinBaseAddress other, BasedUtxoNetwork network) {
     late BitcoinBaseAddress address;
 
diff --git a/lib/src/transaction_builder/transaction_builder.dart b/lib/src/transaction_builder/transaction_builder.dart
index 0143f29..06c9db6 100644
--- a/lib/src/transaction_builder/transaction_builder.dart
+++ b/lib/src/transaction_builder/transaction_builder.dart
@@ -274,7 +274,6 @@ class BitcoinTransactionBuilder implements BasedBitcoinTransacationBuilder {
             .toScriptPubKey();
       case SegwitAddressType.mweb:
         return Script(script: []);
-        return senderPub.toAddress().toScriptPubKey();
       case P2shAddressType.p2pkhInP2sh:
         if (isTaproot) {
           return senderPub.toP2pkhInP2sh(mode: utxo.keyType).toScriptPubKey();
@@ -903,6 +902,8 @@ List<BitcoinBaseAddress> _fakeAddressesFromTypes(List<BitcoinAddressType> types)
       case SegwitAddressType.p2tr:
       case SilentPaymentsAddresType.p2sp:
         return fakePub.toTaprootAddress();
+      case SegwitAddressType.mweb:
+        return fakePub.toMwebAddress();
       default:
         throw const DartBitcoinPluginException("invalid bitcoin address type");
     }

From eecc27c47a12d4a20a178ea5cef63ce5240a4bfa Mon Sep 17 00:00:00 2001
From: Rafael Saes <git@rafael.saes.dev>
Date: Tue, 11 Mar 2025 15:42:00 -0300
Subject: [PATCH 54/62] fix: missing script cast

---
 lib/src/bitcoin/script/script.dart | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/src/bitcoin/script/script.dart b/lib/src/bitcoin/script/script.dart
index 58af80b..f102c7d 100644
--- a/lib/src/bitcoin/script/script.dart
+++ b/lib/src/bitcoin/script/script.dart
@@ -168,6 +168,7 @@ class Script {
   /// returns a serialized byte version of the script
   List<int> toBytes() {
     if (script.isEmpty) return <int>[];
+    if (script.every((x) => x is int)) return script.cast();
     final scriptBytes = DynamicByteTracker();
     for (final token in script) {
       if (BitcoinOpCodeConst.OP_CODES.containsKey(token)) {

From 5d36e48911583d826d48adca7496cb7979082cbc Mon Sep 17 00:00:00 2001
From: Mohsen <mrhaydari.t@gmail.com>
Date: Tue, 25 Mar 2025 19:34:37 +0330
Subject: [PATCH 55/62] V6.0.0

- Added support for BIP-327: MuSig2 for BIP340-compatible multi-signatures
- Implemented BIP-174: Partially Signed Bitcoin Transaction (PSBT) format
- Integrated BIP-370: PSBT Version 2 enhancements
- Included BIP-371: Taproot fields for PSBT
- Extended support for BIP-373: MuSig2-related PSBT fields
---
 CHANGELOG.md                                  |    8 +
 README.md                                     |   15 +
 .../lib/bitcoin_cash/burn_token_example.dart  |    3 +-
 .../create_cash_token_example.dart            |    2 -
 .../global/old_examples/bitcoin_example.dart  |    4 +-
 .../litecoin_example/litecoin_example.dart    |    8 +-
 .../spending_builders.dart                    |   33 +-
 .../multi_sig_transactions.dart               |    2 +-
 .../transaction_builder_example.dart          |    2 +-
 example/lib/musig/methods.dart                |   88 +
 example/lib/musig/musig_example_test.dart     |  214 ++
 example/lib/psbt/psbt_example.dart            |  622 +++++
 example/lib/psbt/psbt_musig2_example.dart     |   85 +
 .../electrum/electrum_ssl_service.dart        |   14 +-
 example/pubspec.lock                          |    7 +-
 example/pubspec.yaml                          |    6 +-
 example/test/methods.dart                     |  180 ++
 example/test/musig_example_test.dart          |  217 ++
 example/test/psbt_musig2_test.dart            |   77 +
 example/test/test_test.dart                   |    1 -
 example/test/testmusig_test.dart              |   82 +
 lib/bitcoin_base.dart                         |   12 +-
 lib/src/bitcoin/address/address.dart          |    4 +-
 lib/src/bitcoin/address/core.dart             |   16 +-
 lib/src/bitcoin/address/legacy_address.dart   |   59 +-
 lib/src/bitcoin/address/segwit_address.dart   |   30 +-
 .../bitcoin/address/utils/address_utils.dart  |    2 +-
 lib/src/bitcoin/bitcoin.dart                  |    3 +
 lib/src/bitcoin/script/control_block.dart     |   25 -
 lib/src/bitcoin/script/input.dart             |   63 +-
 lib/src/bitcoin/script/op_code/constant.dart  |  609 +++--
 .../bitcoin/script/op_code/constant_lib.dart  |    4 -
 lib/src/bitcoin/script/op_code/tools.dart     |   48 -
 lib/src/bitcoin/script/output.dart            |   63 +-
 lib/src/bitcoin/script/script.dart            |  117 +-
 lib/src/bitcoin/script/scripts.dart           |    4 +-
 lib/src/bitcoin/script/sequence.dart          |   22 +-
 lib/src/bitcoin/script/transaction.dart       |  315 +--
 lib/src/bitcoin/script/utils.dart             |  386 +++
 lib/src/bitcoin/script/witness.dart           |   32 +-
 .../bitcoin/taproot/constants/constants.dart  |  139 +
 lib/src/bitcoin/taproot/taproot.dart          |    2 +
 lib/src/bitcoin/taproot/types/types.dart      |  226 ++
 lib/src/bitcoin/taproot/utils/utils.dart      |  192 ++
 lib/src/cash_token/cash_token.dart            |   25 +-
 lib/src/crypto/crypto.dart                    |   33 +-
 lib/src/crypto/keypair/ec_private.dart        |   76 +-
 lib/src/crypto/keypair/ec_public.dart         |   95 +-
 lib/src/crypto/musig/signer.dart              |  265 ++
 lib/src/models/network.dart                   |   54 +-
 .../provider/electrum_methods/methods.dart    |    1 +
 .../methods/get_raw_transaction.dart          |   31 +
 .../block_cypher/block_cypher_models.dart     |   17 +-
 lib/src/provider/models/config.dart           |   10 +-
 .../models/electrum/electrum_utxo.dart        |   27 +-
 .../models/mempool/mempol_models.dart         |    8 +-
 lib/src/provider/models/multisig_script.dart  |   83 +-
 lib/src/provider/models/utxo_details.dart     |   30 +-
 lib/src/psbt/psbt.dart                        |    7 +
 lib/src/psbt/psbt_builder/builder.dart        |   16 +
 .../psbt/psbt_builder/core/psbt_builder.dart  |  272 ++
 lib/src/psbt/psbt_builder/impl/input.dart     |  217 ++
 lib/src/psbt/psbt_builder/impl/output.dart    |   36 +
 lib/src/psbt/psbt_builder/impl/signer.dart    |  153 ++
 .../psbt_builder/types/internal_types.dart    |  693 +++++
 lib/src/psbt/psbt_builder/types/types.dart    | 1141 +++++++++
 lib/src/psbt/psbt_builder/versiones/v1.dart   |  140 +
 lib/src/psbt/psbt_builder/versiones/v2.dart   |  182 ++
 lib/src/psbt/reader/byte_reader.dart          |   29 +
 lib/src/psbt/signer/signer.dart               |  133 +
 lib/src/psbt/types/types.dart                 |    5 +
 lib/src/psbt/types/types/global.dart          |  787 ++++++
 lib/src/psbt/types/types/inputs.dart          | 2273 +++++++++++++++++
 lib/src/psbt/types/types/outputs.dart         | 1041 ++++++++
 lib/src/psbt/types/types/psbt.dart            |  314 +++
 lib/src/psbt/types/types/types.dart           |   24 +
 lib/src/psbt/utils/utils.dart                 | 1111 ++++++++
 .../forked_transaction_builder.dart           |   28 +-
 .../transaction_builder.dart                  |   39 +-
 pubspec.yaml                                  |    4 +-
 test/bitcoin_cash_token_encoding_test.dart    |    2 +-
 test/deserialize_test.dart                    |    5 +-
 test/encode_decode_transaction_test.dart      |   26 +-
 test/keys_test.dart                           |   13 +-
 test/p2kh_tr_test.dart                        |   72 +-
 test/p2sh_test.dart                           |   24 +-
 test/p2tr_test.dart                           |  183 +-
 test/p2wpkh_test.dart                         |   94 +-
 test/p2wsh_test.dart                          |   16 +-
 test/psbt/bip_0174_test.dart                  |  280 ++
 test/psbt/bip_0370_test.dart                  |  332 +++
 test/psbt/bip_0371_test.dart                  |  168 ++
 test/psbt/bip_0373_test.dart                  |  231 ++
 .../psbt_builder_sighash_none_test.dart       |  110 +
 .../psbt_builder_sighash_single_test.dart     |  165 ++
 .../psbt_builder_update_input_test.dart       |  142 +
 test/psbt/builder/psbt_builder_v0_test.dart   |  285 +++
 .../psbt/builder/psbt_update_output_test.dart |  276 ++
 test/psbt/builder/utxos_vector.dart           |  980 +++++++
 test/psbt/builder/utxos_vector2.dart          |  718 ++++++
 100 files changed, 16599 insertions(+), 966 deletions(-)
 create mode 100644 example/lib/musig/methods.dart
 create mode 100644 example/lib/musig/musig_example_test.dart
 create mode 100644 example/lib/psbt/psbt_example.dart
 create mode 100644 example/lib/psbt/psbt_musig2_example.dart
 create mode 100644 example/test/methods.dart
 create mode 100644 example/test/musig_example_test.dart
 create mode 100644 example/test/psbt_musig2_test.dart
 delete mode 100644 example/test/test_test.dart
 create mode 100644 example/test/testmusig_test.dart
 create mode 100644 lib/src/bitcoin/bitcoin.dart
 delete mode 100644 lib/src/bitcoin/script/control_block.dart
 delete mode 100644 lib/src/bitcoin/script/op_code/constant_lib.dart
 delete mode 100644 lib/src/bitcoin/script/op_code/tools.dart
 create mode 100644 lib/src/bitcoin/script/utils.dart
 create mode 100644 lib/src/bitcoin/taproot/constants/constants.dart
 create mode 100644 lib/src/bitcoin/taproot/taproot.dart
 create mode 100644 lib/src/bitcoin/taproot/types/types.dart
 create mode 100644 lib/src/bitcoin/taproot/utils/utils.dart
 create mode 100644 lib/src/crypto/musig/signer.dart
 create mode 100644 lib/src/provider/electrum_methods/methods/get_raw_transaction.dart
 create mode 100644 lib/src/psbt/psbt.dart
 create mode 100644 lib/src/psbt/psbt_builder/builder.dart
 create mode 100644 lib/src/psbt/psbt_builder/core/psbt_builder.dart
 create mode 100644 lib/src/psbt/psbt_builder/impl/input.dart
 create mode 100644 lib/src/psbt/psbt_builder/impl/output.dart
 create mode 100644 lib/src/psbt/psbt_builder/impl/signer.dart
 create mode 100644 lib/src/psbt/psbt_builder/types/internal_types.dart
 create mode 100644 lib/src/psbt/psbt_builder/types/types.dart
 create mode 100644 lib/src/psbt/psbt_builder/versiones/v1.dart
 create mode 100644 lib/src/psbt/psbt_builder/versiones/v2.dart
 create mode 100644 lib/src/psbt/reader/byte_reader.dart
 create mode 100644 lib/src/psbt/signer/signer.dart
 create mode 100644 lib/src/psbt/types/types.dart
 create mode 100644 lib/src/psbt/types/types/global.dart
 create mode 100644 lib/src/psbt/types/types/inputs.dart
 create mode 100644 lib/src/psbt/types/types/outputs.dart
 create mode 100644 lib/src/psbt/types/types/psbt.dart
 create mode 100644 lib/src/psbt/types/types/types.dart
 create mode 100644 lib/src/psbt/utils/utils.dart
 create mode 100644 test/psbt/bip_0174_test.dart
 create mode 100644 test/psbt/bip_0370_test.dart
 create mode 100644 test/psbt/bip_0371_test.dart
 create mode 100644 test/psbt/bip_0373_test.dart
 create mode 100644 test/psbt/builder/psbt_builder_sighash_none_test.dart
 create mode 100644 test/psbt/builder/psbt_builder_sighash_single_test.dart
 create mode 100644 test/psbt/builder/psbt_builder_update_input_test.dart
 create mode 100644 test/psbt/builder/psbt_builder_v0_test.dart
 create mode 100644 test/psbt/builder/psbt_update_output_test.dart
 create mode 100644 test/psbt/builder/utxos_vector.dart
 create mode 100644 test/psbt/builder/utxos_vector2.dart

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6b16580..7564311 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 6.0.0
+
+- Added support for BIP-327: MuSig2 for BIP340-compatible multi-signatures
+- Implemented BIP-174: Partially Signed Bitcoin Transaction (PSBT) format
+- Integrated BIP-370: PSBT Version 2 enhancements
+- Included BIP-371: Taproot fields for PSBT
+- Extended support for BIP-373: MuSig2-related PSBT fields
+
 ## 5.3.0
 
 * Update dependencies
diff --git a/README.md b/README.md
index abc55cb..24c5120 100644
--- a/README.md
+++ b/README.md
@@ -80,6 +80,21 @@ Using this package, you can create a Bitcoin transaction in two ways: either thr
   
 - P2SH(SEGWIT): A P2SH (Pay-to-Script-Hash) Segregated Witness (SegWit) address in Bitcoin combines the benefits of P2SH and SegWit technologies, allowing for enhanced transaction security, reduced fees, and improved scalability.
 
+### MuSig2 BIP-327: MuSig2 for BIP340-compatible Multi-Signatures
+  You can find the examples here.
+
+ - Sign/Verify: Supports signing and verifying multisignature transactions using MuSig2
+ - NonceAgg: Aggregates nonces from multiple participants for secure signature generation.
+ - KeyAgg: Combines multiple public keys into a single aggregated public key for efficient multisignature verification
+
+### PSBT
+  You can find the examples here.
+
+- BIP-0174: Partially Signed Bitcoin Transaction Format
+- BIP-0370: PSBT Version 2
+- BIP-0371: Taproot Fields for PSBT
+- BIP-0373: MuSig2 PSBT Fields
+
 ### Addresses specific to Bitcoin Cash
 
 - P2SH32: Pay to Script Hash 32
diff --git a/example/lib/bitcoin_cash/burn_token_example.dart b/example/lib/bitcoin_cash/burn_token_example.dart
index b0e8a36..31fc72c 100644
--- a/example/lib/bitcoin_cash/burn_token_example.dart
+++ b/example/lib/bitcoin_cash/burn_token_example.dart
@@ -61,8 +61,7 @@ void main() async {
   if (sumOfUtxo == BigInt.zero) {
     return;
   }
-  // print(sumOfUtxo);
-  // return;
+
   /// CashToken{bitfield: 16, commitment: null, amount: 2000, category: 4e7873d4529edfd2c6459139257042950230baa9297f111b8675829443f70430}
   final CashToken token = elctrumUtxos
       .firstWhere((e) =>
diff --git a/example/lib/bitcoin_cash/create_cash_token_example.dart b/example/lib/bitcoin_cash/create_cash_token_example.dart
index 19af892..0b07035 100644
--- a/example/lib/bitcoin_cash/create_cash_token_example.dart
+++ b/example/lib/bitcoin_cash/create_cash_token_example.dart
@@ -64,8 +64,6 @@ void main() async {
     /// if we dont have utxos with index 0 we must create them with some estimate transaction before create transaction
     return;
   }
-  // print("vout $vout0Hash");
-  // return;
   final bchTransaction = ForkedTransactionBuilder(
       outPuts: [
         BitcoinTokenOutput(
diff --git a/example/lib/global/old_examples/bitcoin_example.dart b/example/lib/global/old_examples/bitcoin_example.dart
index 98c3412..4084aa1 100644
--- a/example/lib/global/old_examples/bitcoin_example.dart
+++ b/example/lib/global/old_examples/bitcoin_example.dart
@@ -181,7 +181,7 @@ void _spendFromP2pkhTo10DifferentType() async {
   /// Calculate the size of the transaction in bytes.
   /// You can determine the transaction fee by multiplying the transaction size
   /// Formula: transaction fee = (transaction size in bytes * fee rate in bytes)
-  final size = tr.hasSegwit ? tr.getVSize() : tr.getSize();
+  final size = tr.hasWitness ? tr.getVSize() : tr.getSize();
 
   /// broadcast transaction
   /// https://mempool.space/testnet/tx/05411dce1a1c9e3f44b54413bdf71e7ab3eff1e2f94818a3568c39814c27b258
@@ -427,7 +427,7 @@ void _spendFrom10DifferentTypeToP2pkh() async {
   /// Calculate the size of the transaction in bytes.
   /// You can determine the transaction fee by multiplying the transaction size
   /// Formula: transaction fee = (transaction size in bytes * fee rate in bytes)
-  final size = tr.hasSegwit ? tr.getVSize() : tr.getSize();
+  final size = tr.hasWitness ? tr.getVSize() : tr.getSize();
 
   /// broadcast transaction
   /// https://mempool.space/testnet/tx/3e697e0993a6882689ff9b66ff73cdf53e4a3029664ec4a516da2b291e1cd8a6
diff --git a/example/lib/global/old_examples/litecoin_example/litecoin_example.dart b/example/lib/global/old_examples/litecoin_example/litecoin_example.dart
index ccf5f5e..f225cb3 100644
--- a/example/lib/global/old_examples/litecoin_example/litecoin_example.dart
+++ b/example/lib/global/old_examples/litecoin_example/litecoin_example.dart
@@ -141,7 +141,7 @@ void _spendLTCP2pkhAddress() async {
   /// Calculate the size of the transaction in bytes.
   /// You can determine the transaction fee by multiplying the transaction size
   /// Formula: transaction fee = (transaction size in bytes * fee rate in bytes)
-  final size = tr.hasSegwit ? tr.getVSize() : tr.getSize();
+  final size = tr.hasWitness ? tr.getVSize() : tr.getSize();
 
   /// broadcast transaction
   await _broadcastTransaction(tr.serialize());
@@ -287,7 +287,7 @@ void _spendFrom2P2shAddressAndOneMultiSigP2shAddress() async {
   /// Calculate the size of the transaction in bytes.
   /// You can determine the transaction fee by multiplying the transaction size
   /// Formula: transaction fee = (transaction size in bytes * fee rate in bytes)
-  final size = tr.hasSegwit ? tr.getVSize() : tr.getSize();
+  final size = tr.hasWitness ? tr.getVSize() : tr.getSize();
 
   /// broadcast transaction
   await _broadcastTransaction(tr.serialize());
@@ -399,7 +399,7 @@ void _spendFromNestedSegwitP2WPKHInP2SH() async {
   /// Calculate the size of the transaction in bytes.
   /// You can determine the transaction fee by multiplying the transaction size
   /// Formula: transaction fee = (transaction size in bytes * fee rate in bytes)
-  final size = tr.hasSegwit ? tr.getVSize() : tr.getSize();
+  final size = tr.hasWitness ? tr.getVSize() : tr.getSize();
 
   /// broadcast transaction
   await _broadcastTransaction(tr.serialize());
@@ -519,7 +519,7 @@ void _spendFromSegwitP2WPKHAddress() async {
   /// Calculate the size of the transaction in bytes.
   /// You can determine the transaction fee by multiplying the transaction size
   /// Formula: transaction fee = (transaction size in bytes * fee rate in bytes)
-  final size = tr.hasSegwit ? tr.getVSize() : tr.getSize();
+  final size = tr.hasWitness ? tr.getVSize() : tr.getSize();
 
   /// broadcast transaction
   await _broadcastTransaction(tr.serialize());
diff --git a/example/lib/global/old_examples/spending_with_scripts/spending_builders.dart b/example/lib/global/old_examples/spending_with_scripts/spending_builders.dart
index 060550f..0f49320 100644
--- a/example/lib/global/old_examples/spending_with_scripts/spending_builders.dart
+++ b/example/lib/global/old_examples/spending_with_scripts/spending_builders.dart
@@ -32,8 +32,7 @@ BtcTransaction buildP2wpkTransaction({
 
   // create BtcTransaction instance with inputs, outputs and segwit
   // For P2TR, P2WPKH, P2WSH, and P2SH (SegWit) transactions, we need to set 'hasSegwit' to true.
-  BtcTransaction tx =
-      BtcTransaction(inputs: txin, outputs: txOut, hasSegwit: true);
+  BtcTransaction tx = BtcTransaction(inputs: txin, outputs: txOut);
 
   for (int i = 0; i < txin.length; i++) {
     // For SegWit transactions (excluding P2TR), we use the 'getTransactionSegwitDigit' method
@@ -47,7 +46,7 @@ BtcTransaction buildP2wpkTransaction({
         amount: utxo[i].utxo.value);
     // sign transaction
     final signedTx =
-        sign(txDigit, utxo[i].public().toHex(), BitcoinOpCodeConst.SIGHASH_ALL);
+        sign(txDigit, utxo[i].public().toHex(), BitcoinOpCodeConst.sighashAll);
 
     // create unlock script
 
@@ -98,8 +97,7 @@ BtcTransaction buildP2WSHTransaction({
 
   // create BtcTransaction instance with inputs, outputs and segwit
   // For P2TR, P2WPKH, P2WSH, and P2SH (SegWit) transactions, we need to set 'hasSegwit' to true.
-  BtcTransaction tx =
-      BtcTransaction(inputs: txin, outputs: txOut, hasSegwit: true);
+  BtcTransaction tx = BtcTransaction(inputs: txin, outputs: txOut);
   for (int i = 0; i < txin.length; i++) {
     // For SegWit transactions (excluding P2TR), we use the 'getTransactionSegwitDigit' method
     // to obtain the input digest for signing.
@@ -113,7 +111,7 @@ BtcTransaction buildP2WSHTransaction({
 
     // sign transaction
     final signedTx = sign(txDigit, utxo[i].public().toP2wshScript().toHex(),
-        BitcoinOpCodeConst.SIGHASH_ALL);
+        BitcoinOpCodeConst.sighashAll);
 
     // create unlock script
 
@@ -156,7 +154,7 @@ BtcTransaction buildP2pkhTransaction({
       .toList();
 
   // For P2TR, P2WPKH, P2WSH, and P2SH (SegWit) transactions, in this case we need to set 'hasSegwit' to false.
-  final tx = BtcTransaction(inputs: txin, outputs: txOut, hasSegwit: false);
+  final tx = BtcTransaction(inputs: txin, outputs: txOut);
   for (int i = 0; i < txin.length; i++) {
     // For None-SegWit transactions, we use the 'getTransactionDigest' method
     // to obtain the input digest for signing.
@@ -169,7 +167,7 @@ BtcTransaction buildP2pkhTransaction({
 
     // sign transaction
     final signedTx =
-        sign(txDigit, utxo[i].public().toHex(), BitcoinOpCodeConst.SIGHASH_ALL);
+        sign(txDigit, utxo[i].public().toHex(), BitcoinOpCodeConst.sighashAll);
 
     // set unlocking script for current index
     txin[i].scriptSig = Script(script: [signedTx, utxo[i].public().toHex()]);
@@ -202,7 +200,7 @@ BtcTransaction buildP2shNoneSegwitTransaction({
       .toList();
 
   // For P2TR, P2WPKH, P2WSH, and P2SH (SegWit) transactions, in this caase we need to set 'hasSegwit' to false.
-  final tx = BtcTransaction(inputs: txin, outputs: txOut, hasSegwit: false);
+  final tx = BtcTransaction(inputs: txin, outputs: txOut);
   for (int i = 0; i < txin.length; i++) {
     final ownerPublic = utxo[i].public();
     final scriptPubKey =
@@ -219,7 +217,7 @@ BtcTransaction buildP2shNoneSegwitTransaction({
     );
     // sign transaction
     final signedTx =
-        sign(txDigit, utxo[i].public().toHex(), BitcoinOpCodeConst.SIGHASH_ALL);
+        sign(txDigit, utxo[i].public().toHex(), BitcoinOpCodeConst.sighashAll);
 
     // set unlocking script for current index
     switch (utxo[i].ownerDetails.address.type) {
@@ -269,7 +267,7 @@ BtcTransaction buildP2SHSegwitTransaction({
   final List<TxWitnessInput> witnesses = [];
 
   // For P2TR, P2WPKH, P2WSH, and P2SH (SegWit) transactions, we need to set 'hasSegwit' to true.
-  final tx = BtcTransaction(inputs: txin, outputs: txOut, hasSegwit: true);
+  final tx = BtcTransaction(inputs: txin, outputs: txOut);
 
   for (int i = 0; i < txin.length; i++) {
     final ownerPublic = utxo[i].public();
@@ -290,7 +288,7 @@ BtcTransaction buildP2SHSegwitTransaction({
 
     // sign transaction
     final signedTx =
-        sign(txDigit, utxo[i].public().toHex(), BitcoinOpCodeConst.SIGHASH_ALL);
+        sign(txDigit, utxo[i].public().toHex(), BitcoinOpCodeConst.sighashAll);
 
     // In a SegWit P2SH (Pay-to-Script-Hash) transaction, you will find both a scriptSig field and a witness field.
     //  This combination is used to maintain compatibility with non-SegWit Bitcoin nodes while taking advantage
@@ -347,8 +345,7 @@ BtcTransaction buildP2trTransaction({
       .toList();
 
   // For P2TR, P2WPKH, P2WSH, and P2SH (SegWit) transactions, we need to set 'hasSegwit' to true.
-  BtcTransaction tx =
-      BtcTransaction(inputs: txin, outputs: txOut, hasSegwit: true);
+  BtcTransaction tx = BtcTransaction(inputs: txin, outputs: txOut);
 
   // in a SegWit (Segregated Witness) transaction, the witness data serves as the unlocking script
   // for the transaction inputs. In traditional non-SegWit transactions,
@@ -373,16 +370,12 @@ BtcTransaction buildP2trTransaction({
           utxo.map((e) => e.ownerDetails.address.toScriptPubKey()).toList(),
       amounts: utxo.map((e) => e.utxo.value).toList(),
 
-      // The tapleaf script that we are spending (ext_flag=1)
-      script: null,
-      sighash: BitcoinOpCodeConst.TAPROOT_SIGHASH_ALL,
-      // default is 0; 1 is for script spending (BIP342)
-      extFlags: 0,
+      sighash: BitcoinOpCodeConst.sighashDefault,
     );
 
     // sign transaction using `signTapRoot` method of thransaction
     final signedTx =
-        sign(txDigit, utxo[i].public().toHex(), BitcoinOpCodeConst.SIGHASH_ALL);
+        sign(txDigit, utxo[i].public().toHex(), BitcoinOpCodeConst.sighashAll);
 
     // add witness for current index
     witnesses.add(TxWitnessInput(stack: [signedTx]));
diff --git a/example/lib/global/old_examples/spending_with_transaction_builder/multi_sig_transactions.dart b/example/lib/global/old_examples/spending_with_transaction_builder/multi_sig_transactions.dart
index 8166e85..e9a5a85 100644
--- a/example/lib/global/old_examples/spending_with_transaction_builder/multi_sig_transactions.dart
+++ b/example/lib/global/old_examples/spending_with_transaction_builder/multi_sig_transactions.dart
@@ -282,7 +282,7 @@ void main() async {
 
   // we check if transaction is segwit or not
   // When one of the input UTXO addresses is SegWit, the transaction is considered SegWit.
-  final isSegwitTr = transaction.hasSegwit;
+  final isSegwitTr = transaction.hasWitness;
 
   // transaction id
   final transactionId = transaction.txId();
diff --git a/example/lib/global/old_examples/spending_with_transaction_builder/transaction_builder_example.dart b/example/lib/global/old_examples/spending_with_transaction_builder/transaction_builder_example.dart
index a303df7..ecfd778 100644
--- a/example/lib/global/old_examples/spending_with_transaction_builder/transaction_builder_example.dart
+++ b/example/lib/global/old_examples/spending_with_transaction_builder/transaction_builder_example.dart
@@ -229,7 +229,7 @@ void main() async {
 
   // we check if transaction is segwit or not
   // When one of the input UTXO addresses is SegWit, the transaction is considered SegWit.
-  final isSegwitTr = transaction.hasSegwit;
+  final isSegwitTr = transaction.hasWitness;
 
   // transaction id
   // ignore: unused_local_variable
diff --git a/example/lib/musig/methods.dart b/example/lib/musig/methods.dart
new file mode 100644
index 0000000..d67b119
--- /dev/null
+++ b/example/lib/musig/methods.dart
@@ -0,0 +1,88 @@
+import 'package:bitcoin_base/bitcoin_base.dart';
+import 'package:example/services_examples/electrum/electrum_ssl_service.dart';
+
+Future<ElectrumProvider> getProvider(
+    {String url = "testnet4-electrumx.wakiyamap.dev:51002"}) async {
+  final service = await ElectrumSSLService.connect(
+      "testnet4-electrumx.wakiyamap.dev:51002");
+  return ElectrumProvider(service);
+}
+
+class PsbtUtxoRequest {
+  final BitcoinBaseAddress address;
+  final Script? p2shRedeemScript;
+  final Script? witnessScript;
+  final TapLeafMerkleProof? merkleProof;
+  final TaprootTree? treeScript;
+  final TaprootLeaf? leafScript;
+  final List<int>? xOnlyOrInternalPubKey;
+  final List<int>? merkleRoot;
+  final List<TapLeafMerkleProof>? leafScripts;
+  final List<ECPrivate> privateKeys;
+  final List<PsbtInputMuSig2ParticipantPublicKeys>? muSig2ParticipantPublicKeys;
+  final List<PsbtInputRipemd160>? ripemd160;
+  final List<PsbtInputSha256>? sha256;
+  final List<PsbtInputHash160>? hash160;
+  final List<PsbtInputHash256>? hash256;
+  const PsbtUtxoRequest(
+      {required this.address,
+      this.p2shRedeemScript,
+      this.witnessScript,
+      this.leafScript,
+      this.merkleProof,
+      this.treeScript,
+      this.xOnlyOrInternalPubKey,
+      this.merkleRoot,
+      this.leafScripts,
+      this.privateKeys = const [],
+      this.muSig2ParticipantPublicKeys,
+      this.ripemd160,
+      this.hash160,
+      this.hash256,
+      this.sha256});
+}
+
+Future<List<PsbtUtxo>> getPsbtUtxo(
+    {required List<PsbtUtxoRequest> addresses,
+    bool local = true,
+    List<Map<String, dynamic>>? data}) async {
+  final provider = await getProvider();
+
+  final utxos = await Future.wait(addresses.map((e) async {
+    return await provider.request(ElectrumRequestScriptHashListUnspent(
+        scriptHash: e.address.pubKeyHash()));
+  }));
+
+  final utxoss = List.generate(utxos.length, (i) async {
+    final request = addresses[i];
+    final accountUtxos = utxos[i];
+    final er = await Future.wait(accountUtxos
+        .map((e) => provider.request(ElectrumRequestGetRawTransaction(e.txId)))
+        .toList());
+    return List.generate(
+      accountUtxos.length,
+      (index) {
+        return PsbtUtxo(
+            utxo: accountUtxos[index].toUtxo(request.address.type),
+            p2shRedeemScript: request.p2shRedeemScript,
+            p2wshWitnessScript: request.witnessScript,
+            tx: er[index],
+            scriptPubKey: request.address.toScriptPubKey(),
+            leafScript: request.leafScript,
+            leafScripts: request.leafScripts,
+            merkleProof: request.merkleProof,
+            treeScript: request.treeScript,
+            merkleRoot: request.merkleRoot,
+            privateKeys: request.privateKeys,
+            xOnlyOrInternalPubKey: request.xOnlyOrInternalPubKey,
+            muSig2ParticipantPublicKeys: request.muSig2ParticipantPublicKeys,
+            hash160: request.hash160,
+            hash256: request.hash256,
+            ripemd160: request.ripemd160,
+            sha256: request.sha256);
+      },
+    );
+  });
+  final e = await Future.wait(utxoss);
+  return e.expand((e) => e).toList();
+}
diff --git a/example/lib/musig/musig_example_test.dart b/example/lib/musig/musig_example_test.dart
new file mode 100644
index 0000000..fdbf52f
--- /dev/null
+++ b/example/lib/musig/musig_example_test.dart
@@ -0,0 +1,214 @@
+// ignore_for_file: unused_element
+
+import 'package:bitcoin_base/bitcoin_base.dart';
+import 'package:blockchain_utils/blockchain_utils.dart';
+
+void main() async {
+  final key = _getPubKey();
+  final key2 = _getPubKey(path: "m/86'/1'/0'/0/2");
+  final key3 = _getPubKey(path: "m/86'/1'/0'/0/3");
+  final signer = Musig2Signer.generate([key, key2, key3]);
+
+  final treeScript = _generateScriptTree();
+  final address = _generateAddress();
+  final input = TxInput(
+      txId: '9bb72872594cb9b7a029f3daf0fe277dfbe5de3d52d4b55ba283cfa97b9310cc',
+      txIndex: 1);
+  final amount = BtcUtils.toSatoshi("0.00500000");
+  final rAmount = BtcUtils.toSatoshi("0.00010000");
+  final fee = BtcUtils.toSatoshi("0.00001");
+  final change = amount - (rAmount + fee);
+  final output = TxOutput(
+      amount: rAmount, scriptPubKey: signer.toAddress().toScriptPubKey());
+  final changeOutput =
+      TxOutput(amount: change, scriptPubKey: address.toScriptPubKey());
+  BtcTransaction transaction =
+      BtcTransaction(inputs: [input], outputs: [output, changeOutput]);
+  transaction = _spendWithKeyPath(
+      transaction: transaction,
+      existsUtxosScriptPubKeys: [address],
+      existsUtxosAmounts: [amount],
+      treeScript: treeScript);
+}
+
+BtcTransaction _spendWithKeyPath(
+    {required BtcTransaction transaction,
+    required List<P2trAddress> existsUtxosScriptPubKeys,
+    required List<BigInt> existsUtxosAmounts,
+    required TaprootTree treeScript}) {
+  final key1 = _getPrivateKey(path: "m/86'/1'/0'/0/2");
+  final key2 = _getPrivateKey(path: "m/86'/1'/0'/0/3");
+  final key3 = _getPrivateKey(path: "m/86'/1'/0'/0/4");
+  final pk1 = key1.getPublic();
+  final pk2 = key2.getPublic();
+  final pk3 = key3.getPublic();
+  final signer =
+      Musig2Signer.generate([pk1, pk2, pk3], privateKeys: [key1, key2, key3]);
+  final digest = transaction
+      .getTransactionTaprootDigset(
+          txIndex: 0,
+          scriptPubKeys:
+              existsUtxosScriptPubKeys.map((e) => e.toScriptPubKey()).toList(),
+          amounts: existsUtxosAmounts)
+      .asImmutableBytes;
+
+  final signature = signer.fullSign(digest, treeScript: treeScript);
+  return transaction.copyWith(witnesses: [
+    TxWitnessInput(stack: [BytesUtils.toHexString(signature)])
+  ]);
+}
+
+BtcTransaction _spendWithLeafA(
+    {required BtcTransaction transaction,
+    required List<P2trAddress> existsUtxosScriptPubKeys,
+    required List<BigInt> existsUtxosAmounts,
+    required TaprootTree treeScript}) {
+  final internalKey = _getInternalPubKey();
+  final key1 = _getPrivateKey(path: "m/86'/1'/0'/0/2");
+  final key3 = _getPrivateKey(path: "m/86'/1'/0'/0/4");
+  final pk1 = key1.getPublic();
+  final pk3 = key3.getPublic();
+  final musigSigner = MuSig2.aggPublicKeys(
+      keys: [pk1.publicKey.compressed, pk3.publicKey.compressed]);
+  final tapleafScript1 = TaprootLeaf(
+      script: Script(script: [
+    BytesUtils.toHexString(musigSigner.publicKey.toXonly()),
+    BitcoinOpcode.opCheckSig
+  ]));
+  final digest = transaction
+      .getTransactionTaprootDigset(
+          txIndex: 0,
+          tapleafScript: tapleafScript1,
+          scriptPubKeys:
+              existsUtxosScriptPubKeys.map((e) => e.toScriptPubKey()).toList(),
+          amounts: existsUtxosAmounts)
+      .asImmutableBytes;
+  final nonce1 = MuSig2.nonceGenerate(
+      publicKey: pk1.toBytes(mode: PubKeyModes.compressed), msg: digest);
+  final nonce3 = MuSig2.nonceGenerate(
+      publicKey: pk3.toBytes(mode: PubKeyModes.compressed), msg: digest);
+  final aggNonce = MuSig2.nonceAgg([nonce1.pubnonce, nonce3.pubnonce]);
+  final session = MuSig2Session(
+      aggnonce: aggNonce,
+      publicKeys: [
+        pk1.toBytes(mode: PubKeyModes.compressed),
+        pk3.toBytes(mode: PubKeyModes.compressed)
+      ],
+      tweaks: [],
+      msg: digest);
+  final sig1 = MuSig2.sign(
+      secnonce: nonce1.secnonce, sk: key1.toBytes(), session: session);
+  final sig3 = MuSig2.sign(
+      secnonce: nonce3.secnonce, sk: key3.toBytes(), session: session);
+  final signature =
+      MuSig2.partialSigAgg(signatures: [sig1, sig3], session: session);
+  final controlBlock = TaprootControlBlock.generate(
+      xOnlyOrInternalPubKey: internalKey.toXOnly(),
+      leafScript: tapleafScript1,
+      scriptTree: treeScript);
+
+  return transaction.copyWith(witnesses: [
+    TxWitnessInput(stack: [
+      BytesUtils.toHexString(signature),
+      tapleafScript1.script.toHex(),
+      controlBlock.toHex()
+    ])
+  ]);
+}
+
+BtcTransaction _spendWithLeafC(
+    {required BtcTransaction transaction,
+    required List<P2trAddress> existsUtxosScriptPubKeys,
+    required List<BigInt> existsUtxosAmounts,
+    required TaprootTree treeScript}) {
+  final internalKey = _getInternalPubKey();
+  final key2 = _getPrivateKey(path: "m/86'/1'/0'/0/3");
+  final key1 = _getPrivateKey(path: "m/86'/1'/0'/0/2");
+  final pk1 = key1.getPublic();
+  final pk2 = key2.getPublic();
+  final leafC = TaprootLeaf(
+      script: Script(script: [
+    pk1.toXOnlyHex(),
+    BitcoinOpcode.opCheckSig,
+    pk2.toXOnlyHex(),
+    BitcoinOpcode.opCheckSigAdd,
+    2,
+    BitcoinOpcode.opNumEqual
+  ]));
+  final digest = transaction
+      .getTransactionTaprootDigset(
+          txIndex: 0,
+          tapleafScript: leafC,
+          scriptPubKeys:
+              existsUtxosScriptPubKeys.map((e) => e.toScriptPubKey()).toList(),
+          amounts: existsUtxosAmounts)
+      .asImmutableBytes;
+  final sig1 = key1.signTapRoot(digest, tweak: false);
+  final sig2 = key2.signTapRoot(digest, tweak: false);
+  final controlBlock = TaprootControlBlock.generate(
+      xOnlyOrInternalPubKey: internalKey.toXOnly(),
+      leafScript: leafC,
+      scriptTree: treeScript);
+
+  return transaction.copyWith(witnesses: [
+    TxWitnessInput(
+        stack: [sig2, sig1, leafC.script.toHex(), controlBlock.toHex()])
+  ]);
+}
+
+Bip32Slip10Secp256k1 _deriveKey(
+    {String key =
+        "tprv8ZgxMBicQKsPdgBQV2Y9EVPSjAGhyZXArhwSzHwnV3FytzPRr8KCR8EKEpLeHbANAncgbc31a6QoXjBTARQiZ2h1Z2NgSCjFYeTqKpAN5Gc",
+    String path = "m/86'/1'/0'/0/1"}) {
+  Bip32Slip10Secp256k1 secp = Bip32Slip10Secp256k1.fromExtendedKey(
+      key, Bip44Coins.bitcoinTestnet.conf.keyNetVer);
+  return secp.derivePath(path) as Bip32Slip10Secp256k1;
+}
+
+ECPublic _getPubKey({String path = "m/86'/1'/0'/0/1"}) {
+  return ECPublic.fromBytes(_deriveKey(path: path).publicKey.compressed);
+}
+
+ECPrivate _getPrivateKey({String path = "m/86'/1'/0'/0/1"}) {
+  return ECPrivate.fromBytes(_deriveKey(path: path).privateKey.raw);
+}
+
+TaprootBranch _generateScriptTree() {
+  final pk1 = _getPubKey(path: "m/86'/1'/0'/0/2");
+  final pk2 = _getPubKey(path: "m/86'/1'/0'/0/3");
+  final pk3 = _getPubKey(path: "m/86'/1'/0'/0/4");
+  final musigSigner = Musig2Signer.generate([pk1, pk3]);
+  final leaf1 = TaprootLeaf(
+      script: Script(script: [
+    BytesUtils.toHexString(musigSigner.aggPublicKey.toXOnly()),
+    BitcoinOpcode.opCheckSig
+  ]));
+  final leaf2 = TaprootLeaf(
+      script: Script(script: [pk3.toXOnlyHex(), BitcoinOpcode.opCheckSig]));
+
+  final leaf3 = TaprootLeaf(
+      script: Script(script: [
+    pk1.toXOnlyHex(),
+    BitcoinOpcode.opCheckSig,
+    pk2.toXOnlyHex(),
+    BitcoinOpcode.opCheckSigAdd,
+    2,
+    BitcoinOpcode.opNumEqual
+  ]));
+  return TaprootBranch(a: leaf3, b: TaprootBranch(a: leaf1, b: leaf2));
+}
+
+ECPublic _getInternalPubKey() {
+  final pk1 = _getPubKey(path: "m/86'/1'/0'/0/2");
+  final pk2 = _getPubKey(path: "m/86'/1'/0'/0/3");
+  final pk3 = _getPubKey(path: "m/86'/1'/0'/0/4");
+  final internalKey = Musig2Signer.generate([pk1, pk2, pk3]);
+
+  return internalKey.aggPublicKey;
+}
+
+P2trAddress _generateAddress() {
+  final internalKey = _getInternalPubKey();
+  return P2trAddress.fromInternalKey(
+      internalKey: internalKey.toXOnly(), treeScript: _generateScriptTree());
+}
diff --git a/example/lib/psbt/psbt_example.dart b/example/lib/psbt/psbt_example.dart
new file mode 100644
index 0000000..52ef167
--- /dev/null
+++ b/example/lib/psbt/psbt_example.dart
@@ -0,0 +1,622 @@
+import 'package:bitcoin_base/bitcoin_base.dart';
+import 'package:blockchain_utils/blockchain_utils.dart';
+
+import '../musig/methods.dart';
+
+void main() async {
+  final psbt = PsbtBuilderV0.create();
+  final btcAddress1 = _getBtcAddress1();
+  final btcAddress2 = _getBtcAddress2();
+  final btcAddress3 = _getBtcAddress3();
+  final btcAddress4 = _getBtcAddress4();
+  final btcAddress5 = _getBtcAddress5();
+  final btcAddress6 = _getBtcAddress6();
+  final btcAddress7 = _getBtcAddress7();
+  final btcAddress8 = _getBtcAddress8();
+  final btcAddress9 = _getBtcAddress9();
+  final btcAddress10 = _getBtcAddress10();
+  final btcAddress11 = _getBtcAddress11();
+  final btcAddress12 = _getBtcAddress12();
+  final btcAddress13 = _getBtcAddress13();
+  final btcAddress14 = _getBtcAddress14();
+  final internalKey12 = _getSigner().signerPublicKey.toXOnly();
+  final treeScript12 = _getScript12();
+  final leafScript12 = _getScript12();
+  final treeScript13 = _getScript13();
+  final leafScript13 = _getLeafScript13();
+
+  final internalKey13 = _getInternalKey8();
+  final internalKey14 = _getTapScriptSigner6();
+  final treeScript14 = _treeScript25();
+  final btcAddress15 =
+      P2shAddress.fromScript(script: Script(script: [BitcoinOpcode.opTrue]));
+  final btcAddress16 =
+      P2wshAddress.fromScript(script: Script(script: [BitcoinOpcode.opTrue]));
+  final btcAddress17 = P2shAddress.fromScript(
+      script: btcAddress16.toScriptPubKey(), type: P2shAddressType.p2wshInP2sh);
+
+  final opHash160 = _getOpHash160();
+  final sha256 = _getOpSHA256();
+  final hash256 = _getOpHASH256();
+  final tapHash160 = _getTapScriptHash160();
+
+  final utxos = await getPsbtUtxo(addresses: [
+    PsbtUtxoRequest(
+        address: tapHash160.$1,
+        leafScript: TaprootLeaf(script: tapHash160.$2),
+        treeScript: TaprootLeaf(script: tapHash160.$2),
+        xOnlyOrInternalPubKey: tapHash160.$3.xOnly,
+        // p2shRedeemScript: opHash160.$3,
+        hash160: [PsbtInputHash160.fromPreImage(opHash160.$4)]),
+    PsbtUtxoRequest(
+        address: opHash160.$1,
+        p2shRedeemScript: opHash160.$3,
+        hash160: [PsbtInputHash160.fromPreImage(opHash160.$4)]),
+    PsbtUtxoRequest(
+        address: opHash160.$2,
+        witnessScript: opHash160.$3,
+        hash160: [PsbtInputHash160.fromPreImage(opHash160.$4)]),
+    PsbtUtxoRequest(
+        address: sha256.$1,
+        p2shRedeemScript: sha256.$3,
+        sha256: [PsbtInputSha256.fromPreImage(sha256.$4)]),
+    PsbtUtxoRequest(
+        address: sha256.$2,
+        witnessScript: sha256.$3,
+        sha256: [PsbtInputSha256.fromPreImage(sha256.$4)]),
+    PsbtUtxoRequest(
+        address: hash256.$1,
+        p2shRedeemScript: hash256.$3,
+        hash256: [PsbtInputHash256.fromPreImage(sha256.$4)]),
+    PsbtUtxoRequest(
+        address: hash256.$2,
+        witnessScript: hash256.$3,
+        hash256: [PsbtInputHash256.fromPreImage(sha256.$4)]),
+    PsbtUtxoRequest(
+        address: btcAddress14,
+        treeScript: treeScript14,
+        privateKeys: [_getSigner31().privateKey, _getSigner32().privateKey],
+        xOnlyOrInternalPubKey: internalKey14.signerPublicKey.toXOnly()),
+    PsbtUtxoRequest(
+        address: btcAddress13,
+        treeScript: treeScript13,
+        leafScript: leafScript13,
+        privateKeys: [_getSigner30().privateKey, _getSigner31().privateKey],
+        xOnlyOrInternalPubKey: internalKey13.toXOnly()),
+    PsbtUtxoRequest(
+        address: btcAddress12,
+        leafScript: leafScript12,
+        treeScript: treeScript12,
+        xOnlyOrInternalPubKey: internalKey12,
+        privateKeys: [
+          _getSigner2().privateKey,
+          _getSigner3().privateKey,
+        ]),
+    PsbtUtxoRequest(
+        address: btcAddress9,
+        witnessScript: _mSigOnlyWitness().multiSigScript,
+        privateKeys: [
+          _getSigner2().privateKey,
+          _getSigner().privateKey,
+          _getSigner3().privateKey
+        ]),
+    PsbtUtxoRequest(
+        address: btcAddress10,
+        p2shRedeemScript: _multisig().multiSigScript,
+        privateKeys: [
+          _getSigner2().privateKey,
+          _getSigner().privateKey,
+          _getSigner5().privateKey
+        ]),
+    PsbtUtxoRequest(
+        address: btcAddress11,
+        p2shRedeemScript: _multisig2().multiSigScript,
+        privateKeys: [
+          _getSigner2().privateKey,
+          _getSigner().privateKey,
+          _getSigner5().privateKey
+        ]),
+    PsbtUtxoRequest(
+        address: btcAddress15, p2shRedeemScript: Script(script: ["OP_TRUE"])),
+    PsbtUtxoRequest(
+        address: btcAddress17,
+        p2shRedeemScript: btcAddress16.toScriptPubKey(),
+        witnessScript: Script(script: ["OP_TRUE"])),
+    PsbtUtxoRequest(
+        address: btcAddress1,
+        privateKeys: [_getSigner().privateKey],
+        p2shRedeemScript: _getSigner().signerPublicKey.toRedeemScript()),
+    PsbtUtxoRequest(
+        address: btcAddress5,
+        witnessScript: _getSigner5().signerPublicKey.toP2wshScript(),
+        privateKeys: [_getSigner5().privateKey],
+        p2shRedeemScript:
+            _getSigner5().signerPublicKey.toP2wshAddress().toScriptPubKey()),
+    PsbtUtxoRequest(
+        address: btcAddress6,
+        privateKeys: [_getSigner6().privateKey],
+        xOnlyOrInternalPubKey: _getSigner6().privateKey.getPublic().toXOnly()),
+    PsbtUtxoRequest(
+        address: btcAddress2, privateKeys: [_getSigner2().privateKey]),
+    PsbtUtxoRequest(
+        address: btcAddress3,
+        p2shRedeemScript:
+            _getSigner3().signerPublicKey.toAddress().toScriptPubKey(),
+        privateKeys: [_getSigner3().privateKey]),
+    PsbtUtxoRequest(
+        address: btcAddress4,
+        privateKeys: [_getSigner4().privateKey],
+        p2shRedeemScript:
+            _getSigner4().signerPublicKey.toSegwitAddress().toScriptPubKey()),
+    PsbtUtxoRequest(
+        address: btcAddress7,
+        privateKeys: [_getSigner11().privateKey],
+        p2shRedeemScript: _getSigner11()
+            .signerPublicKey
+            .toRedeemScript(mode: PubKeyModes.uncompressed)),
+    PsbtUtxoRequest(
+        address: btcAddress8, privateKeys: [_getSigner12().privateKey]),
+  ]);
+  psbt.addUtxos(utxos);
+  final totalAmount =
+      utxos.fold<BigInt>(BigInt.zero, (p, c) => p + c.utxo.value);
+
+  final rec1Amount = BtcUtils.toSatoshi("0.00002");
+
+  final fee = BtcUtils.toSatoshi("0.0001");
+  final changeAmount = totalAmount - (rec1Amount + fee);
+  assert(!changeAmount.isNegative);
+
+  psbt.addOutput(
+      PsbtTransactionOutput(amount: rec1Amount, address: _getReceipt2()));
+  psbt.addOutput(
+      PsbtTransactionOutput(amount: changeAmount, address: _getReceipt()));
+
+  psbt.signAllInput(
+    (param) {
+      if (param.scriptPubKey == btcAddress13.toScriptPubKey()) {
+        assert(param.address == btcAddress13);
+        return PsbtSignerResponse(
+          sighash: BitcoinOpCodeConst.sighashAll,
+          signers: [_getSigner30(), _getSigner31()],
+          tapleafHash: leafScript13.hash(),
+        );
+      }
+      if (param.scriptPubKey == btcAddress14.toScriptPubKey()) {
+        assert(param.address == btcAddress14);
+        return PsbtSignerResponse(
+          sighash: BitcoinOpCodeConst.sighashNone,
+          signers: [_getSigner31(), _getSigner32()],
+        );
+      }
+      if (param.scriptPubKey == btcAddress1.toScriptPubKey()) {
+        assert(param.address == btcAddress1);
+        return PsbtSignerResponse(signers: [_getSigner()]);
+      }
+      if (param.scriptPubKey == btcAddress2.toScriptPubKey()) {
+        assert(param.address == btcAddress2);
+        return PsbtSignerResponse(signers: [_getSigner2()]);
+      }
+      if (param.scriptPubKey == btcAddress3.toScriptPubKey()) {
+        assert(param.address == btcAddress3);
+        return PsbtSignerResponse(signers: [_getSigner3()]);
+      }
+      if (param.scriptPubKey == btcAddress4.toScriptPubKey()) {
+        assert(param.address == btcAddress4);
+        return PsbtSignerResponse(signers: [_getSigner4()]);
+      }
+      if (param.scriptPubKey == btcAddress5.toScriptPubKey()) {
+        assert(param.address == btcAddress5);
+        return PsbtSignerResponse(signers: [_getSigner5()]);
+      }
+      if (param.scriptPubKey == btcAddress6.toScriptPubKey()) {
+        assert(param.address == btcAddress6);
+        return PsbtSignerResponse(signers: [_getSigner6()]);
+      }
+      if (param.scriptPubKey == btcAddress7.toScriptPubKey()) {
+        assert(param.address == btcAddress7);
+        return PsbtSignerResponse(signers: [_getSigner11()]);
+      }
+      if (param.scriptPubKey == btcAddress8.toScriptPubKey()) {
+        assert(param.address == btcAddress8);
+        return PsbtSignerResponse(signers: [_getSigner12()]);
+      }
+      if (param.scriptPubKey == btcAddress12.toScriptPubKey()) {
+        assert(param.address == btcAddress12);
+        return PsbtSignerResponse(
+          signers: [_getSigner2(), _getSigner3()],
+          tapleafHash: leafScript12.hash(),
+        );
+      }
+      if (param.scriptPubKey == btcAddress9.toScriptPubKey()) {
+        assert(param.address == btcAddress9);
+        return PsbtSignerResponse(
+          signers: [_getSigner2(), _getSigner(), _getSigner3()],
+        );
+      }
+      if (param.scriptPubKey == btcAddress10.toScriptPubKey()) {
+        assert(param.address == btcAddress10);
+        return PsbtSignerResponse(
+          signers: [_getSigner2(), _getSigner(), _getSigner5()],
+        );
+      }
+      if (param.scriptPubKey == btcAddress11.toScriptPubKey()) {
+        assert(param.address == btcAddress11);
+        return PsbtSignerResponse(
+          signers: [_getSigner2(), _getSigner(), _getSigner5()],
+        );
+      }
+
+      return null;
+    },
+  );
+  // ignore: unused_local_variable
+  final finalTx = psbt.finalizeAll(
+    onFinalizeInput: (params) {
+      if (params.scriptPubKey == btcAddress13.toScriptPubKey()) {
+        return PsbtFinalizeResponse(tapleafHash: leafScript13.hash());
+      }
+      return null;
+    },
+  );
+}
+
+PsbtDefaultSigner _getSigner() {
+  final acc = _deriveKey(path: "m/86'/1'/0'/0/1022");
+  return PsbtDefaultSigner(ECPrivate.fromBytes(acc.privateKey.raw));
+}
+
+PsbtDefaultSigner _getSigner11() {
+  final acc = _deriveKey(path: "m/86'/1'/0'/0/1033");
+  return PsbtDefaultSigner(ECPrivate.fromBytes(acc.privateKey.raw));
+}
+
+PsbtDefaultSigner _getSigner12() {
+  final acc = _deriveKey(path: "m/86'/1'/0'/0/1034");
+  return PsbtDefaultSigner(ECPrivate.fromBytes(acc.privateKey.raw));
+}
+
+PsbtDefaultSigner _getSigner6() {
+  final acc = _deriveKey(path: "m/86'/1'/0'/0/0");
+  return PsbtDefaultSigner(ECPrivate.fromBytes(acc.privateKey.raw));
+}
+
+PsbtDefaultSigner _getSigner2() {
+  final acc = _deriveKey(path: "m/86'/1'/0'/0/1025");
+  return PsbtDefaultSigner(ECPrivate.fromBytes(acc.privateKey.raw));
+}
+
+BitcoinBaseAddress _getBtcAddress2() {
+  final s = _getSigner2();
+  return s.privateKey.getPublic().toSegwitAddress();
+}
+
+BitcoinBaseAddress _getBtcAddress1() {
+  final s = _getSigner();
+  return s.privateKey.getPublic().toP2pkInP2sh();
+}
+
+BitcoinBaseAddress _getBtcAddress7() {
+  final s = _getSigner11();
+  return s.privateKey
+      .getPublic()
+      .toP2pkInP2sh(mode: PublicKeyType.uncompressed);
+}
+
+BitcoinBaseAddress _getBtcAddress8() {
+  final s = _getSigner12();
+  return s.privateKey.getPublic().toAddress(mode: PublicKeyType.uncompressed);
+}
+
+BitcoinBaseAddress _getBtcAddress6() {
+  final s = _getSigner6();
+  return s.privateKey.getPublic().toTaprootAddress();
+}
+
+BitcoinBaseAddress _getReceipt() {
+  final acc = _deriveKey(path: "m/86'/1'/0'/0/1022");
+  final pk = ECPublic.fromBytes(acc.publicKey.compressed);
+  return pk.toP2wpkhInP2sh();
+}
+
+BitcoinBaseAddress _getReceipt2() {
+  final acc = _deriveKey(path: "m/86'/1'/0'/0/1025");
+  final pk = ECPublic.fromBytes(acc.publicKey.compressed);
+  return pk.toP2wshInP2sh();
+}
+
+PsbtDefaultSigner _getSigner3() {
+  final acc = _deriveKey(path: "m/86'/1'/0'/0/1025");
+  return PsbtDefaultSigner(ECPrivate.fromBytes(acc.privateKey.raw));
+}
+
+BitcoinBaseAddress _getBtcAddress3() {
+  final s = _getSigner3();
+  return s.privateKey.getPublic().toP2pkhInP2sh();
+}
+
+PsbtDefaultSigner _getSigner4() {
+  final acc = _deriveKey(path: "m/86'/1'/0'/0/1022");
+  return PsbtDefaultSigner(ECPrivate.fromBytes(acc.privateKey.raw));
+}
+
+PsbtDefaultSigner _getSigner5() {
+  final acc = _deriveKey(path: "m/86'/1'/0'/0/1025");
+  return PsbtDefaultSigner(ECPrivate.fromBytes(acc.privateKey.raw));
+}
+
+BitcoinBaseAddress _getBtcAddress5() {
+  final s = _getSigner5();
+  return s.privateKey.getPublic().toP2wshInP2sh();
+}
+
+BitcoinBaseAddress _getBtcAddress4() {
+  final s = _getSigner4();
+  return s.privateKey.getPublic().toP2wpkhInP2sh();
+}
+
+TaprootLeaf _getScript12() {
+  final pk2 = _getSigner2().privateKey.getPublic();
+  final pk3 = _getSigner3().privateKey.getPublic();
+  return TaprootLeaf(
+      script: Script(script: [
+    pk2.toXOnlyHex(),
+    BitcoinOpcode.opCheckSig,
+    pk3.toXOnlyHex(),
+    BitcoinOpcode.opCheckSigAdd,
+    2,
+    BitcoinOpcode.opNumEqual,
+  ]));
+}
+
+BitcoinBaseAddress _getBtcAddress12() {
+  final s = _getSigner();
+
+  return P2trAddress.fromInternalKey(
+      internalKey: s.privateKey.getPublic().toXOnly(),
+      treeScript: _getScript12());
+}
+
+PsbtDefaultSigner _getTapScriptSigner() {
+  final acc = _deriveKey(path: "m/86'/1'/0'/0/1022");
+  return PsbtDefaultSigner(ECPrivate.fromBytes(acc.privateKey.raw));
+}
+
+MultiSignatureAddress _mSigOnlyWitness() {
+  final s1 = _getSigner();
+  final s2 = _getSigner2();
+  final s3 = _getSigner3();
+  final m = MultiSignatureAddress(threshold: 3, signers: [
+    MultiSignatureSigner(publicKey: s1.signerPublicKey.toHex(), weight: 1),
+    MultiSignatureSigner(publicKey: s2.signerPublicKey.toHex(), weight: 1),
+    MultiSignatureSigner(publicKey: s3.signerPublicKey.toHex(), weight: 1),
+  ]);
+
+  return m;
+}
+
+MultiSignatureAddress _multisig() {
+  final s1 = _getSigner();
+  final s2 = _getSigner2();
+  final s3 = _getSigner5();
+  final m = MultiSignatureAddress(threshold: 4, signers: [
+    MultiSignatureSigner(publicKey: s1.signerPublicKey.toHex(), weight: 1),
+    MultiSignatureSigner(
+        publicKey: s2.signerPublicKey.toHex(mode: PubKeyModes.uncompressed),
+        weight: 1),
+    MultiSignatureSigner(
+        publicKey: s3.signerPublicKey.toHex(mode: PubKeyModes.uncompressed),
+        weight: 2),
+  ]);
+
+  return m;
+}
+
+MultiSignatureAddress _multisig2() {
+  final s1 = _getSigner();
+  final s2 = _getSigner2();
+  final s3 = _getSigner5();
+  final m = MultiSignatureAddress(threshold: 2, signers: [
+    MultiSignatureSigner(publicKey: s1.signerPublicKey.toHex(), weight: 1),
+    MultiSignatureSigner(
+        publicKey: s2.signerPublicKey.toHex(mode: PubKeyModes.uncompressed),
+        weight: 1),
+    MultiSignatureSigner(
+        publicKey: s3.signerPublicKey.toHex(mode: PubKeyModes.uncompressed),
+        weight: 1),
+  ]);
+
+  return m;
+}
+
+BitcoinBaseAddress _getBtcAddress9() {
+  return _mSigOnlyWitness().toP2wshAddress(network: BitcoinNetwork.testnet);
+}
+
+BitcoinBaseAddress _getBtcAddress10() {
+  return _multisig().toP2shAddress();
+}
+
+BitcoinBaseAddress _getBtcAddress11() {
+  return _multisig2().toP2shAddress();
+}
+
+PsbtDefaultSigner _getSigner30() {
+  final acc = _deriveKey(path: "m/86'/1'/0'/0/1025");
+  return PsbtDefaultSigner(ECPrivate.fromBytes(acc.privateKey.raw));
+}
+
+PsbtDefaultSigner _getTapScriptSigner6() {
+  final acc = _deriveKey(path: "m/86'/1'/0'/1/80");
+  return PsbtDefaultSigner(ECPrivate.fromBytes(acc.privateKey.raw));
+}
+
+PsbtDefaultSigner _getSigner33() {
+  final acc = _deriveKey(path: "m/86'/1'/0'/0'/1025");
+  return PsbtDefaultSigner(ECPrivate.fromBytes(acc.privateKey.raw));
+}
+
+PsbtDefaultSigner _getSigner31() {
+  final acc = _deriveKey(path: "m/86'/1'/0'/0/1022");
+  return PsbtDefaultSigner(ECPrivate.fromBytes(acc.privateKey.raw));
+}
+
+PsbtDefaultSigner _getSigner32() {
+  final acc = _deriveKey(path: "m/86'/1'/0'/0/1025");
+  return PsbtDefaultSigner(ECPrivate.fromBytes(acc.privateKey.raw));
+}
+
+TaprootLeaf _getLeafScript13() {
+  final pk2 = _getSigner30().privateKey.getPublic();
+  final pk4 = _getSigner31().privateKey.getPublic();
+  return TaprootLeaf(
+      script: Script(script: [
+    pk2.toXOnlyHex(),
+    BitcoinOpcode.opCheckSig,
+    pk4.toXOnlyHex(),
+    BitcoinOpcode.opCheckSigAdd,
+    2,
+    BitcoinOpcode.opNumEqual,
+  ]));
+}
+
+TaprootTree _getScript13() {
+  final pk2 = _getSigner30().privateKey.getPublic();
+  final pk3 = _getSigner33().privateKey.getPublic();
+  final pk4 = _getSigner31().privateKey.getPublic();
+  final pk5 = _getSigner32().privateKey.getPublic();
+  final c1 = TaprootLeaf(
+      script: Script(script: [pk2.toXOnlyHex(), BitcoinOpcode.opCheckSig]));
+  final c2 = TaprootLeaf(
+      script: Script(script: [pk3.toXOnlyHex(), BitcoinOpcode.opCheckSig]));
+  final c3 = TaprootLeaf(
+      script: Script(script: [pk4.toXOnlyHex(), BitcoinOpcode.opCheckSig]));
+
+  final c4 = TaprootLeaf(
+      script: Script(script: [
+    pk2.toXOnlyHex(),
+    BitcoinOpcode.opCheckSig,
+    pk4.toXOnlyHex(),
+    BitcoinOpcode.opCheckSigAdd,
+    2,
+    BitcoinOpcode.opNumEqual,
+  ]));
+  final c5 = TaprootLeaf(
+      script: Script(script: [pk5.toXOnlyHex(), BitcoinOpcode.opCheckSig]));
+
+  return TaprootBranch(
+      a: TaprootBranch(
+          a: c1,
+          b: TaprootBranch(
+              a: c1, b: TaprootBranch(a: c2, b: TaprootBranch(a: c3, b: c5)))),
+      b: TaprootBranch(a: c4, b: c1));
+}
+
+ECPublic _getInternalKey8() {
+  return _getTapScriptSigner().signerPublicKey;
+}
+
+P2trAddress _getBtcAddress13() {
+  final pk1 = _getTapScriptSigner();
+  return P2trAddress.fromInternalKey(
+      internalKey: pk1.signerPublicKey.toXOnly(), treeScript: _getScript13());
+}
+
+TaprootTree _treeScript25() {
+  final pk2 = _getSigner12().privateKey.getPublic();
+  final pk3 = _getSigner11().privateKey.getPublic();
+  final pk4 = _getSigner31().privateKey.getPublic();
+  final pk5 = _getSigner32().privateKey.getPublic();
+  final pk6 = _getSigner32().privateKey.getPublic();
+  return TaprootLeaf(
+      script: Script(script: [
+    pk2.toXOnlyHex(),
+    BitcoinOpcode.opCheckSig,
+    pk3.toXOnlyHex(),
+    BitcoinOpcode.opCheckSigAdd,
+    pk4.toXOnlyHex(),
+    BitcoinOpcode.opCheckSigAdd,
+    pk5.toXOnlyHex(),
+    BitcoinOpcode.opCheckSigAdd,
+    pk6.toXOnlyHex(),
+    BitcoinOpcode.opCheckSigAdd,
+    3,
+    BitcoinOpcode.opNumEqual,
+  ]));
+}
+
+P2trAddress _getBtcAddress14() {
+  final pk7 = _getTapScriptSigner6().privateKey.getPublic();
+  final c4 = _treeScript25();
+  return P2trAddress.fromInternalKey(
+      internalKey: pk7.toXOnly(), treeScript: c4);
+}
+
+(BitcoinBaseAddress, BitcoinBaseAddress, Script, List<int>) _getOpHash160() {
+  final payload = StringUtils.encode('https://github.com/mrtnetwork');
+  final hash160 = QuickCrypto.hash160(payload);
+  final script = Script(script: [
+    BitcoinOpcode.opHash160,
+    BytesUtils.toHexString(hash160),
+    BitcoinOpcode.opEqual
+  ]);
+  final p2sh = P2shAddress.fromScript(script: script);
+  final p2wsh = P2wshAddress.fromScript(script: script);
+  return (p2sh, p2wsh, script, payload);
+}
+
+(BitcoinBaseAddress, BitcoinBaseAddress, Script, List<int>) _getOpSHA256() {
+  final payload = StringUtils.encode('https://github.com/mrtnetwork');
+  final hash160 = QuickCrypto.sha256Hash(payload);
+  final script = Script(script: [
+    BitcoinOpcode.opSha256,
+    BytesUtils.toHexString(hash160),
+    BitcoinOpcode.opEqual
+  ]);
+  final p2sh = P2shAddress.fromScript(script: script);
+  final p2wsh = P2wshAddress.fromScript(script: script);
+  return (p2sh, p2wsh, script, payload);
+}
+
+(BitcoinBaseAddress, BitcoinBaseAddress, Script, List<int>) _getOpHASH256() {
+  final preimage = StringUtils.encode('https://github.com/mrtnetwork');
+  final hash = QuickCrypto.sha256DoubleHash(preimage);
+  final script = Script(script: [
+    BitcoinOpcode.opHash256,
+    BytesUtils.toHexString(hash),
+    BitcoinOpcode.opEqual
+  ]);
+  final p2sh = P2shAddress.fromScript(script: script);
+  final p2wsh = P2wshAddress.fromScript(script: script);
+  return (p2sh, p2wsh, script, preimage);
+}
+
+(BitcoinBaseAddress, Script, TaprootControlBlock, List<int>)
+    _getTapScriptHash160() {
+  final preImage = StringUtils.encode('https://github.com/mrtnetwork');
+  final hash = QuickCrypto.hash160(preImage);
+  final script = Script(script: [
+    BitcoinOpcode.opHash160,
+    BytesUtils.toHexString(hash),
+    BitcoinOpcode.opEqual
+  ]);
+  final key = ECPrivate.fromBytes(List<int>.filled(32, 12));
+  final block = TaprootControlBlock.generate(
+      xOnlyOrInternalPubKey: key.getPublic().toXOnly(),
+      leafScript: TaprootLeaf(script: script),
+      scriptTree: TaprootLeaf(script: script));
+
+  final p2sh = P2trAddress.fromInternalKey(
+      internalKey: key.getPublic().toXOnly(),
+      treeScript: TaprootLeaf(script: script));
+  return (p2sh, script, block, preImage);
+}
+
+Bip32Slip10Secp256k1 _deriveKey(
+    {String key =
+        "tprv8ZgxMBicQKsPdgBQV2Y9EVPSjAGhyZXArhwSzHwnV3FytzPRr8KCR8EKEpLeHbANAncgbc31a6QoXjBTARQiZ2h1Z2NgSCjFYeTqKpAN5Gc",
+    String path = "m/86'/1'/0'/0/1"}) {
+  Bip32Slip10Secp256k1 secp = Bip32Slip10Secp256k1.fromExtendedKey(
+      key, Bip44Coins.bitcoinTestnet.conf.keyNetVer);
+  return secp.derivePath(path) as Bip32Slip10Secp256k1;
+}
diff --git a/example/lib/psbt/psbt_musig2_example.dart b/example/lib/psbt/psbt_musig2_example.dart
new file mode 100644
index 0000000..eb9a70e
--- /dev/null
+++ b/example/lib/psbt/psbt_musig2_example.dart
@@ -0,0 +1,85 @@
+import 'package:bitcoin_base/bitcoin_base.dart';
+import 'package:blockchain_utils/blockchain_utils.dart';
+import 'package:example/musig/methods.dart';
+
+Bip32Slip10Secp256k1 _deriveKey(
+    {String key =
+        "tprv8ZgxMBicQKsPdgBQV2Y9EVPSjAGhyZXArhwSzHwnV3FytzPRr8KCR8EKEpLeHbANAncgbc31a6QoXjBTARQiZ2h1Z2NgSCjFYeTqKpAN5Gc",
+    String path = "m/86'/1'/0'/0/1"}) {
+  Bip32Slip10Secp256k1 secp = Bip32Slip10Secp256k1.fromExtendedKey(
+      key, Bip44Coins.bitcoinTestnet.conf.keyNetVer);
+  return secp.derivePath(path) as Bip32Slip10Secp256k1;
+}
+
+ECPrivate _getPrivateKey({String path = "m/86'/1'/0'/0/1"}) {
+  final key = _deriveKey(path: path);
+  return ECPrivate.fromBytes(key.privateKey.raw);
+}
+
+void main() async {
+  final key = _getPrivateKey();
+  final key2 = _getPrivateKey(path: "m/86'/1'/0'/0/2");
+  final key3 = _getPrivateKey(path: "m/86'/1'/0'/0/3");
+
+  final aggpk = Musig2Signer.generate(
+      [key.getPublic(), key2.getPublic(), key3.getPublic()]);
+  final address =
+      P2trAddress.fromInternalKey(internalKey: aggpk.aggPublicKey.toXOnly());
+  final utxo = await getPsbtUtxo(addresses: [
+    PsbtUtxoRequest(
+        address: address,
+        xOnlyOrInternalPubKey: aggpk.aggPublicKey.toXOnly(),
+        muSig2ParticipantPublicKeys: [
+          PsbtInputMuSig2ParticipantPublicKeys(
+              aggregatePubKey: aggpk.aggPublicKey, pubKeys: aggpk.publicKeys)
+        ])
+  ]);
+  final psbt = PsbtBuilderV0.create();
+  psbt.addUtxos(utxo);
+  psbt.addOutput(PsbtTransactionOutput(
+      amount: BtcUtils.toSatoshi('0.00001'), address: address));
+  for (int i = 0; i < utxo.length; i++) {
+    final noncePub1 = aggpk.generateNonce(key.getPublic());
+    final noncePub2 = aggpk.generateNonce(key2.getPublic());
+    final noncePub3 = aggpk.generateNonce(key3.getPublic());
+    psbt.musig2AddPubKeyNonce(
+        i,
+        PsbtInputMuSig2PublicNonce(
+            publicKey: key.getPublic(),
+            plainPublicKey: aggpk.aggPublicKey,
+            publicNonce: noncePub1.pubnonce));
+    psbt.musig2AddPubKeyNonce(
+        i,
+        PsbtInputMuSig2PublicNonce(
+            publicKey: key2.getPublic(),
+            plainPublicKey: aggpk.aggPublicKey,
+            publicNonce: noncePub2.pubnonce));
+    psbt.musig2AddPubKeyNonce(
+        i,
+        PsbtInputMuSig2PublicNonce(
+            publicKey: key3.getPublic(),
+            plainPublicKey: aggpk.aggPublicKey,
+            publicNonce: noncePub3.pubnonce));
+    psbt.signInput(
+        signer: (p0) => PsbtSignerResponse(signers: [
+              PsbtMusig2DefaultSigner(
+                  privateKey: key,
+                  aggPublicKey: aggpk.aggPublicKey,
+                  publicKeys: aggpk.publicKeys,
+                  nonce: noncePub1),
+              PsbtMusig2DefaultSigner(
+                  privateKey: key2,
+                  aggPublicKey: aggpk.aggPublicKey,
+                  publicKeys: aggpk.publicKeys,
+                  nonce: noncePub2),
+              PsbtMusig2DefaultSigner(
+                  privateKey: key3,
+                  aggPublicKey: aggpk.aggPublicKey,
+                  publicKeys: aggpk.publicKeys,
+                  nonce: noncePub3),
+            ]),
+        index: i);
+  }
+  // ignore: unused_local_variable
+  final finalTx = psbt.finalizeAll();
+}
diff --git a/example/lib/services_examples/electrum/electrum_ssl_service.dart b/example/lib/services_examples/electrum/electrum_ssl_service.dart
index 048d825..658b2a2 100644
--- a/example/lib/services_examples/electrum/electrum_ssl_service.dart
+++ b/example/lib/services_examples/electrum/electrum_ssl_service.dart
@@ -5,6 +5,7 @@ import 'dart:convert';
 import 'dart:io';
 import 'package:bitcoin_base/bitcoin_base.dart';
 import 'package:blockchain_utils/service/models/params.dart';
+import 'package:blockchain_utils/utils/string/string.dart';
 import 'package:example/services_examples/electrum/request_completer.dart';
 
 class ElectrumSSLService with ElectrumServiceProvider {
@@ -67,10 +68,17 @@ class ElectrumSSLService with ElectrumServiceProvider {
         defaultRequestTimeOut: defaultRequestTimeOut);
   }
 
+  String? ddd;
   void _onMessge(List<int> event) {
-    final Map<String, dynamic> decode = json.decode(utf8.decode(event));
-    if (decode.containsKey("id")) {
-      final int id = int.parse(decode["id"]!.toString());
+    final msg = utf8.decode(event);
+    if (msg.contains("jsonrpc")) {
+      ddd = msg;
+    } else {
+      ddd = "$ddd$msg";
+    }
+    Map<String, dynamic>? decode = StringUtils.tryToJson(ddd);
+    if (decode?.containsKey("id") ?? false) {
+      final int id = int.parse(decode!["id"]!.toString());
       final request = requests.remove(id);
       request?.completer.complete(decode);
     }
diff --git a/example/pubspec.lock b/example/pubspec.lock
index 51f424d..197f4ac 100644
--- a/example/pubspec.lock
+++ b/example/pubspec.lock
@@ -19,10 +19,9 @@ packages:
   blockchain_utils:
     dependency: "direct main"
     description:
-      name: blockchain_utils
-      sha256: "8633ec5db6200807286500f060a39a281f1b5468ecfbd88c4390ff358999e720"
-      url: "https://pub.dev"
-    source: hosted
+      path: "../../blockchain_utils"
+      relative: true
+    source: path
     version: "4.2.0"
   boolean_selector:
     dependency: transitive
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
index 8fd860e..51fad58 100644
--- a/example/pubspec.yaml
+++ b/example/pubspec.yaml
@@ -37,9 +37,9 @@ dependencies:
   cupertino_icons: ^1.0.2
   bitcoin_base: 
     path: ../
-  # blockchain_utils:
-  #   path: ../../../blockchain_utils
-  blockchain_utils: ^4.2.0
+  blockchain_utils:
+    path: ../../../blockchain_utils
+  # blockchain_utils: ^4.2.0
   http: ^1.2.0
 
 dev_dependencies:
diff --git a/example/test/methods.dart b/example/test/methods.dart
new file mode 100644
index 0000000..dae8a97
--- /dev/null
+++ b/example/test/methods.dart
@@ -0,0 +1,180 @@
+// ignore_for_file: avoid_print
+
+import 'package:bitcoin_base/bitcoin_base.dart';
+import 'package:blockchain_utils/utils/binary/utils.dart';
+import 'package:blockchain_utils/utils/string/string.dart';
+import 'package:example/services_examples/electrum/electrum_ssl_service.dart';
+import 'testmusig_test.dart';
+import 'package:http/http.dart' as http;
+
+Future<ElectrumProvider> getProvider(
+    {String url = "testnet4-electrumx.wakiyamap.dev:51002"}) async {
+  final service = await ElectrumSSLService.connect(
+      "testnet4-electrumx.wakiyamap.dev:51002");
+  return ElectrumProvider(service);
+}
+
+Future<void> callBitcoinRpc(String method, [List<dynamic>? params]) async {
+  const rpcUser = 'mohsen';
+  const rpcPassword = 'mohsen';
+  const rpcUrl = 'http://127.0.0.1:48332/'; // Adjust for Testnet/Regtest
+
+  // Create the request payload
+  final body = StringUtils.fromJson({
+    "jsonrpc": "1.0",
+    "id": "dart-client",
+    "method": method,
+    "params": params ?? []
+  });
+
+  final headers = {
+    'Content-Type': 'application/json',
+    'Authorization':
+        'Basic ${StringUtils.decode(StringUtils.encode('$rpcUser:$rpcPassword'), type: StringEncoding.base64)}'
+  };
+
+  try {
+    final response =
+        await http.post(Uri.parse(rpcUrl), headers: headers, body: body);
+
+    if (response.statusCode == 200) {
+      print(response.body);
+    } else {
+      print('RPC Error: ${response.statusCode} ${response.body}');
+    }
+  } catch (e) {
+    print('Error: $e');
+  }
+}
+
+Future<void> listdescriptors() async {
+  await callBitcoinRpc("listdescriptors", [true]);
+}
+
+Future<void> testMempool(String digest) async {
+  await callBitcoinRpc("testmempoolaccept", [
+    [digest]
+  ]);
+}
+
+Future<void> sendTx(String digest) async {
+  await callBitcoinRpc("sendrawtransaction", [digest]);
+}
+
+class ElectrumUtxoWithTx {
+  final ElectrumUtxo utxo;
+  final BtcTransaction transaction;
+  final BitcoinBaseAddress address;
+  const ElectrumUtxoWithTx(
+      {required this.utxo, required this.transaction, required this.address});
+  factory ElectrumUtxoWithTx.fromJson(Map<String, dynamic> json) {
+    return ElectrumUtxoWithTx(
+        utxo: ElectrumUtxo.fromJson(json["utxo"]),
+        transaction: BtcTransaction.deserialize(
+            BytesUtils.fromHexString(json["transaction"])),
+        address:
+            BitcoinAddress(json["address"], network: BitcoinNetwork.testnet)
+                .baseAddress);
+  }
+
+  Map<String, dynamic> toJson() {
+    return {
+      "utxo": utxo.toJson(),
+      "transaction": transaction.toHex(),
+      "address": address.toAddress(BitcoinNetwork.testnet)
+    };
+  }
+}
+
+class PsbtUtxoRequest {
+  final BitcoinBaseAddress address;
+  final Script? p2shRedeemScript;
+  final Script? witnessScript;
+  final TapLeafMerkleProof? merkleProof;
+  final TaprootTree? treeScript;
+  final TaprootLeaf? leafScript;
+  final List<int>? xOnlyOrInternalPubKey;
+  final List<int>? merkleRoot;
+  final List<TapLeafMerkleProof>? leafScripts;
+  final List<ECPrivate> privateKeys;
+  final List<PsbtInputMuSig2ParticipantPublicKeys>? muSig2ParticipantPublicKeys;
+  final List<PsbtInputRipemd160>? ripemd160;
+  final List<PsbtInputSha256>? sha256;
+  final List<PsbtInputHash160>? hash160;
+  final List<PsbtInputHash256>? hash256;
+  const PsbtUtxoRequest(
+      {required this.address,
+      this.p2shRedeemScript,
+      this.witnessScript,
+      this.leafScript,
+      this.merkleProof,
+      this.treeScript,
+      this.xOnlyOrInternalPubKey,
+      this.merkleRoot,
+      this.leafScripts,
+      this.privateKeys = const [],
+      this.muSig2ParticipantPublicKeys,
+      this.ripemd160,
+      this.hash160,
+      this.hash256,
+      this.sha256});
+}
+
+Future<List<PsbtUtxo>> getPsbtUtxo(
+    {required List<PsbtUtxoRequest> addresses,
+    bool local = true,
+    List<Map<String, dynamic>>? data}) async {
+  final provider = await getProvider();
+
+  final utxos = await Future.wait(addresses.map((e) async {
+    return await provider.request(ElectrumRequestScriptHashListUnspent(
+        scriptHash: e.address.pubKeyHash()));
+  }));
+
+  final utxoss = List.generate(utxos.length, (i) async {
+    final request = addresses[i];
+    final accountUtxos = utxos[i];
+    final er = await Future.wait(accountUtxos
+        .map((e) => provider.request(ElectrumRequestGetRawTransaction(e.txId)))
+        .toList());
+    return List.generate(
+      accountUtxos.length,
+      (index) {
+        final r = PsbtUtxo(
+            utxo: accountUtxos[index].toUtxo(request.address.type),
+            p2shRedeemScript: request.p2shRedeemScript,
+            p2wshWitnessScript: request.witnessScript,
+            tx: er[index],
+            scriptPubKey: request.address.toScriptPubKey(),
+            leafScript: request.leafScript,
+            leafScripts: request.leafScripts,
+            merkleProof: request.merkleProof,
+            treeScript: request.treeScript,
+            merkleRoot: request.merkleRoot,
+            privateKeys: request.privateKeys,
+            xOnlyOrInternalPubKey: request.xOnlyOrInternalPubKey,
+            muSig2ParticipantPublicKeys: request.muSig2ParticipantPublicKeys,
+            hash160: request.hash160,
+            hash256: request.hash256,
+            ripemd160: request.ripemd160,
+            sha256: request.sha256);
+        // final toJs = r.toJson();
+        // toJs["address"] = request.address.toAddress(BitcoinNetwork.testnet);
+        // toJs["select_leaf"] = request.leafScript?.toHex();
+        // toJs.removeWhere((k, v) => v == null);
+        // return toJs;
+        return r;
+      },
+    );
+  });
+  final e = await Future.wait(utxoss);
+  // print(StringUtils.fromJson(utxoss));
+  // // return [];
+  return e.expand((e) => e).toList();
+}
+
+BitcoinBaseAddress getP2pkOutput() {
+  final acc = getKey(path: "m/86'/1'/0'/0/1022");
+  final pk = ECPublic.fromBytes(acc.publicKey.compressed);
+  return pk.toP2pkAddress();
+}
diff --git a/example/test/musig_example_test.dart b/example/test/musig_example_test.dart
new file mode 100644
index 0000000..96702a0
--- /dev/null
+++ b/example/test/musig_example_test.dart
@@ -0,0 +1,217 @@
+// ignore_for_file: unused_element
+
+import 'package:bitcoin_base/bitcoin_base.dart';
+import 'package:blockchain_utils/blockchain_utils.dart';
+
+import 'methods.dart';
+
+void main() async {
+  final key = _getPubKey();
+  final key2 = _getPubKey(path: "m/86'/1'/0'/0/2");
+  final key3 = _getPubKey(path: "m/86'/1'/0'/0/3");
+  final signer = Musig2Signer.generate([key, key2, key3]);
+
+  final treeScript = _generateScriptTree();
+  final address = _generateAddress();
+  final input = TxInput(
+      txId: '9bb72872594cb9b7a029f3daf0fe277dfbe5de3d52d4b55ba283cfa97b9310cc',
+      txIndex: 1);
+  final amount = BtcUtils.toSatoshi("0.00500000");
+  final rAmount = BtcUtils.toSatoshi("0.00010000");
+  final fee = BtcUtils.toSatoshi("0.00001");
+  final change = amount - (rAmount + fee);
+  final output = TxOutput(
+      amount: rAmount, scriptPubKey: signer.toAddress().toScriptPubKey());
+  final changeOutput =
+      TxOutput(amount: change, scriptPubKey: address.toScriptPubKey());
+  BtcTransaction transaction =
+      BtcTransaction(inputs: [input], outputs: [output, changeOutput]);
+  transaction = _spendWithKeyPath(
+      transaction: transaction,
+      existsUtxosScriptPubKeys: [address],
+      existsUtxosAmounts: [amount],
+      treeScript: treeScript);
+  await testMempool(transaction.serialize());
+}
+
+BtcTransaction _spendWithKeyPath(
+    {required BtcTransaction transaction,
+    required List<P2trAddress> existsUtxosScriptPubKeys,
+    required List<BigInt> existsUtxosAmounts,
+    required TaprootTree treeScript}) {
+  final key1 = _getPrivateKey(path: "m/86'/1'/0'/0/2");
+  final key2 = _getPrivateKey(path: "m/86'/1'/0'/0/3");
+  final key3 = _getPrivateKey(path: "m/86'/1'/0'/0/4");
+  final pk1 = key1.getPublic();
+  final pk2 = key2.getPublic();
+  final pk3 = key3.getPublic();
+  final signer =
+      Musig2Signer.generate([pk1, pk2, pk3], privateKeys: [key1, key2, key3]);
+  final digest = transaction
+      .getTransactionTaprootDigset(
+          txIndex: 0,
+          scriptPubKeys:
+              existsUtxosScriptPubKeys.map((e) => e.toScriptPubKey()).toList(),
+          amounts: existsUtxosAmounts)
+      .asImmutableBytes;
+
+  final signature = signer.fullSign(digest, treeScript: treeScript);
+  return transaction.copyWith(witnesses: [
+    TxWitnessInput(stack: [BytesUtils.toHexString(signature)])
+  ]);
+}
+
+BtcTransaction _spendWithLeafA(
+    {required BtcTransaction transaction,
+    required List<P2trAddress> existsUtxosScriptPubKeys,
+    required List<BigInt> existsUtxosAmounts,
+    required TaprootTree treeScript}) {
+  final internalKey = _getInternalPubKey();
+  final key1 = _getPrivateKey(path: "m/86'/1'/0'/0/2");
+  final key3 = _getPrivateKey(path: "m/86'/1'/0'/0/4");
+  final pk1 = key1.getPublic();
+  final pk3 = key3.getPublic();
+  final musigSigner = MuSig2.aggPublicKeys(
+      keys: [pk1.publicKey.compressed, pk3.publicKey.compressed]);
+  final tapleafScript1 = TaprootLeaf(
+      script: Script(script: [
+    BytesUtils.toHexString(musigSigner.publicKey.toXonly()),
+    BitcoinOpcode.opCheckSig
+  ]));
+  final digest = transaction
+      .getTransactionTaprootDigset(
+          txIndex: 0,
+          tapleafScript: tapleafScript1,
+          scriptPubKeys:
+              existsUtxosScriptPubKeys.map((e) => e.toScriptPubKey()).toList(),
+          amounts: existsUtxosAmounts)
+      .asImmutableBytes;
+  final nonce1 = MuSig2.nonceGenerate(
+      publicKey: pk1.toBytes(mode: PubKeyModes.compressed), msg: digest);
+  final nonce3 = MuSig2.nonceGenerate(
+      publicKey: pk3.toBytes(mode: PubKeyModes.compressed), msg: digest);
+  final aggNonce = MuSig2.nonceAgg([nonce1.pubnonce, nonce3.pubnonce]);
+  final session = MuSig2Session(
+      aggnonce: aggNonce,
+      publicKeys: [
+        pk1.toBytes(mode: PubKeyModes.compressed),
+        pk3.toBytes(mode: PubKeyModes.compressed)
+      ],
+      tweaks: [],
+      msg: digest);
+  final sig1 = MuSig2.sign(
+      secnonce: nonce1.secnonce, sk: key1.toBytes(), session: session);
+  final sig3 = MuSig2.sign(
+      secnonce: nonce3.secnonce, sk: key3.toBytes(), session: session);
+  final signature =
+      MuSig2.partialSigAgg(signatures: [sig1, sig3], session: session);
+  final controlBlock = TaprootControlBlock.generate(
+      xOnlyOrInternalPubKey: internalKey.toXOnly(),
+      leafScript: tapleafScript1,
+      scriptTree: treeScript);
+
+  return transaction.copyWith(witnesses: [
+    TxWitnessInput(stack: [
+      BytesUtils.toHexString(signature),
+      tapleafScript1.script.toHex(),
+      controlBlock.toHex()
+    ])
+  ]);
+}
+
+BtcTransaction _spendWithLeafC(
+    {required BtcTransaction transaction,
+    required List<P2trAddress> existsUtxosScriptPubKeys,
+    required List<BigInt> existsUtxosAmounts,
+    required TaprootTree treeScript}) {
+  final internalKey = _getInternalPubKey();
+  final key2 = _getPrivateKey(path: "m/86'/1'/0'/0/3");
+  final key1 = _getPrivateKey(path: "m/86'/1'/0'/0/2");
+  final pk1 = key1.getPublic();
+  final pk2 = key2.getPublic();
+  final leafC = TaprootLeaf(
+      script: Script(script: [
+    pk1.toXOnlyHex(),
+    BitcoinOpcode.opCheckSig,
+    pk2.toXOnlyHex(),
+    BitcoinOpcode.opCheckSigAdd,
+    2,
+    BitcoinOpcode.opNumEqual
+  ]));
+  final digest = transaction
+      .getTransactionTaprootDigset(
+          txIndex: 0,
+          tapleafScript: leafC,
+          scriptPubKeys:
+              existsUtxosScriptPubKeys.map((e) => e.toScriptPubKey()).toList(),
+          amounts: existsUtxosAmounts)
+      .asImmutableBytes;
+  final sig1 = key1.signTapRoot(digest, tweak: false);
+  final sig2 = key2.signTapRoot(digest, tweak: false);
+  final controlBlock = TaprootControlBlock.generate(
+      xOnlyOrInternalPubKey: internalKey.toXOnly(),
+      leafScript: leafC,
+      scriptTree: treeScript);
+
+  return transaction.copyWith(witnesses: [
+    TxWitnessInput(
+        stack: [sig2, sig1, leafC.script.toHex(), controlBlock.toHex()])
+  ]);
+}
+
+Bip32Slip10Secp256k1 _deriveKey(
+    {String key =
+        "tprv8ZgxMBicQKsPdgBQV2Y9EVPSjAGhyZXArhwSzHwnV3FytzPRr8KCR8EKEpLeHbANAncgbc31a6QoXjBTARQiZ2h1Z2NgSCjFYeTqKpAN5Gc",
+    String path = "m/86'/1'/0'/0/1"}) {
+  Bip32Slip10Secp256k1 secp = Bip32Slip10Secp256k1.fromExtendedKey(
+      key, Bip44Coins.bitcoinTestnet.conf.keyNetVer);
+  return secp.derivePath(path) as Bip32Slip10Secp256k1;
+}
+
+ECPublic _getPubKey({String path = "m/86'/1'/0'/0/1"}) {
+  return ECPublic.fromBytes(_deriveKey(path: path).publicKey.compressed);
+}
+
+ECPrivate _getPrivateKey({String path = "m/86'/1'/0'/0/1"}) {
+  return ECPrivate.fromBytes(_deriveKey(path: path).privateKey.raw);
+}
+
+TaprootBranch _generateScriptTree() {
+  final pk1 = _getPubKey(path: "m/86'/1'/0'/0/2");
+  final pk2 = _getPubKey(path: "m/86'/1'/0'/0/3");
+  final pk3 = _getPubKey(path: "m/86'/1'/0'/0/4");
+  final musigSigner = Musig2Signer.generate([pk1, pk3]);
+  final leaf1 = TaprootLeaf(
+      script: Script(script: [
+    BytesUtils.toHexString(musigSigner.aggPublicKey.toXOnly()),
+    BitcoinOpcode.opCheckSig
+  ]));
+  final leaf2 = TaprootLeaf(
+      script: Script(script: [pk3.toXOnlyHex(), BitcoinOpcode.opCheckSig]));
+
+  final leaf3 = TaprootLeaf(
+      script: Script(script: [
+    pk1.toXOnlyHex(),
+    BitcoinOpcode.opCheckSig,
+    pk2.toXOnlyHex(),
+    BitcoinOpcode.opCheckSigAdd,
+    2,
+    BitcoinOpcode.opNumEqual
+  ]));
+  return TaprootBranch(a: leaf3, b: TaprootBranch(a: leaf1, b: leaf2));
+}
+
+ECPublic _getInternalPubKey() {
+  final pk1 = _getPubKey(path: "m/86'/1'/0'/0/2");
+  final pk2 = _getPubKey(path: "m/86'/1'/0'/0/3");
+  final pk3 = _getPubKey(path: "m/86'/1'/0'/0/4");
+  final internalKey = Musig2Signer.generate([pk1, pk2, pk3]);
+
+  return internalKey.aggPublicKey;
+}
+
+P2trAddress _generateAddress() {
+  final internalKey = _getInternalPubKey();
+  return P2trAddress.fromInternalKey(
+      internalKey: internalKey.toXOnly(), treeScript: _generateScriptTree());
+}
diff --git a/example/test/psbt_musig2_test.dart b/example/test/psbt_musig2_test.dart
new file mode 100644
index 0000000..f19b4fc
--- /dev/null
+++ b/example/test/psbt_musig2_test.dart
@@ -0,0 +1,77 @@
+import 'package:bitcoin_base/bitcoin_base.dart';
+import 'testmusig_test.dart';
+import 'methods.dart';
+
+ECPrivate getAccoutPrivateKey({String path = "m/86'/1'/0'/0/1"}) {
+  final key = getKey(path: path);
+  return ECPrivate.fromBytes(key.privateKey.raw);
+}
+
+void main() async {
+  final key = getAccoutPrivateKey();
+  final key2 = getAccoutPrivateKey(path: "m/86'/1'/0'/0/2");
+  final key3 = getAccoutPrivateKey(path: "m/86'/1'/0'/0/3");
+
+  /// 73609a5081514d4cb92190636db8a40ead4b12d6000d2e839b92f2cc3cfb3b92cda58dfd722201c41329322d94457938a15207660f8701322631583769803165
+  final aggpk = Musig2Signer.generate(
+      [key.getPublic(), key2.getPublic(), key3.getPublic()]);
+  final address =
+      P2trAddress.fromInternalKey(internalKey: aggpk.aggPublicKey.toXOnly());
+  final utxo = await getPsbtUtxo(addresses: [
+    PsbtUtxoRequest(
+        address: address,
+        xOnlyOrInternalPubKey: aggpk.aggPublicKey.toXOnly(),
+        muSig2ParticipantPublicKeys: [
+          PsbtInputMuSig2ParticipantPublicKeys(
+              aggregatePubKey: aggpk.aggPublicKey, pubKeys: aggpk.publicKeys)
+        ])
+  ]);
+  final psbt = PsbtBuilderV0.create();
+  psbt.addUtxos(utxo);
+  psbt.addOutput(PsbtTransactionOutput(
+      amount: BtcUtils.toSatoshi('0.00001'), address: address));
+  for (int i = 0; i < utxo.length; i++) {
+    final noncePub1 = aggpk.generateNonce(key.getPublic());
+    final noncePub2 = aggpk.generateNonce(key2.getPublic());
+    final noncePub3 = aggpk.generateNonce(key3.getPublic());
+    psbt.musig2AddPubKeyNonce(
+        i,
+        PsbtInputMuSig2PublicNonce(
+            publicKey: key.getPublic(),
+            plainPublicKey: aggpk.aggPublicKey,
+            publicNonce: noncePub1.pubnonce));
+    psbt.musig2AddPubKeyNonce(
+        i,
+        PsbtInputMuSig2PublicNonce(
+            publicKey: key2.getPublic(),
+            plainPublicKey: aggpk.aggPublicKey,
+            publicNonce: noncePub2.pubnonce));
+    psbt.musig2AddPubKeyNonce(
+        i,
+        PsbtInputMuSig2PublicNonce(
+            publicKey: key3.getPublic(),
+            plainPublicKey: aggpk.aggPublicKey,
+            publicNonce: noncePub3.pubnonce));
+    psbt.signInput(
+        signer: (p0) => PsbtSignerResponse(signers: [
+              PsbtMusig2DefaultSigner(
+                  privateKey: key,
+                  aggPublicKey: aggpk.aggPublicKey,
+                  publicKeys: aggpk.publicKeys,
+                  nonce: noncePub1),
+              PsbtMusig2DefaultSigner(
+                  privateKey: key2,
+                  aggPublicKey: aggpk.aggPublicKey,
+                  publicKeys: aggpk.publicKeys,
+                  nonce: noncePub2),
+              PsbtMusig2DefaultSigner(
+                  privateKey: key3,
+                  aggPublicKey: aggpk.aggPublicKey,
+                  publicKeys: aggpk.publicKeys,
+                  nonce: noncePub3),
+            ]),
+        index: i);
+  }
+  final tx = psbt.finalizeAll();
+  await testMempool(tx.serialize());
+}
diff --git a/example/test/test_test.dart b/example/test/test_test.dart
deleted file mode 100644
index ab73b3a..0000000
--- a/example/test/test_test.dart
+++ /dev/null
@@ -1 +0,0 @@
-void main() {}
diff --git a/example/test/testmusig_test.dart b/example/test/testmusig_test.dart
new file mode 100644
index 0000000..c70456d
--- /dev/null
+++ b/example/test/testmusig_test.dart
@@ -0,0 +1,82 @@
+import 'package:bitcoin_base/bitcoin_base.dart';
+import 'package:blockchain_utils/blockchain_utils.dart';
+
+import 'methods.dart';
+
+/// "m/86'/1'/0'/0/1034"
+Bip32Slip10Secp256k1 getKey(
+    {String key =
+        "tprv8ZgxMBicQKsPdgBQV2Y9EVPSjAGhyZXArhwSzHwnV3FytzPRr8KCR8EKEpLeHbANAncgbc31a6QoXjBTARQiZ2h1Z2NgSCjFYeTqKpAN5Gc",
+    String path = "m/86'/1'/0'/0/1"}) {
+  Bip32Slip10Secp256k1 secp = Bip32Slip10Secp256k1.fromExtendedKey(
+      key, Bip44Coins.bitcoinTestnet.conf.keyNetVer);
+  return secp.derivePath(path) as Bip32Slip10Secp256k1;
+}
+
+void main() async {
+  final key = getKey();
+  final key2 = getKey(path: "m/86'/1'/0'/0/2");
+  final key3 = getKey(path: "m/86'/1'/0'/0/3");
+
+  final aggpk = MuSig2.aggPublicKeys(keys: [
+    key.publicKey.compressed,
+    key2.publicKey.compressed,
+    key3.publicKey.compressed
+  ]);
+
+  final pk = ECPublic.fromBytes(aggpk.toBytes());
+  final tweakPubKey = TaprootUtils.calculateTweek(aggpk.publicKey.toXonly());
+  final address =
+      P2trAddress.fromInternalKey(internalKey: aggpk.publicKey.toBytes());
+  // print(address.toAddress(BitcoinNetwork.testnet));
+  // return;
+  final input = TxInput(
+      txId: '7af6690448027f9a6ba99eb1b2c9f56a604d5d497e4135f65387a9a5aae39cb6',
+      txIndex: 1);
+  final amount = BtcUtils.toSatoshi("0.00500000");
+  final rAmount = BtcUtils.toSatoshi("0.00010000");
+  final fee =
+      (BigRational.from(500) * BigRational.parseDecimal("1.1")).toBigInt();
+  final change = amount - (rAmount + fee);
+  assert(!change.isNegative);
+  final output =
+      TxOutput(amount: rAmount, scriptPubKey: pk.toAddress().toScriptPubKey());
+  final changeOutput =
+      TxOutput(amount: change, scriptPubKey: address.toScriptPubKey());
+  BtcTransaction tx =
+      BtcTransaction(inputs: [input], outputs: [output, changeOutput]);
+  final digest = tx.getTransactionTaprootDigset(
+    txIndex: 0,
+    scriptPubKeys: [address.toScriptPubKey()],
+    amounts: [amount],
+  ).asImmutableBytes;
+  final nonce1 =
+      MuSig2.nonceGenerate(publicKey: key.publicKey.compressed, msg: digest);
+  final nonce2 =
+      MuSig2.nonceGenerate(publicKey: key2.publicKey.compressed, msg: digest);
+  final nonce3 =
+      MuSig2.nonceGenerate(publicKey: key3.publicKey.compressed, msg: digest);
+  final aggNonce =
+      MuSig2.nonceAgg([nonce1.pubnonce, nonce2.pubnonce, nonce3.pubnonce]);
+  final session = MuSig2Session(
+      aggnonce: aggNonce,
+      publicKeys: [
+        key.publicKey.compressed,
+        key2.publicKey.compressed,
+        key3.publicKey.compressed
+      ],
+      tweaks: [MuSig2Tweak(tweak: tweakPubKey)],
+      msg: digest);
+  final sig1 = MuSig2.sign(
+      secnonce: nonce1.secnonce, sk: key.privateKey.raw, session: session);
+  final sig2 = MuSig2.sign(
+      secnonce: nonce2.secnonce, sk: key2.privateKey.raw, session: session);
+  final sig3 = MuSig2.sign(
+      secnonce: nonce3.secnonce, sk: key3.privateKey.raw, session: session);
+  final signature =
+      MuSig2.partialSigAgg(signatures: [sig1, sig2, sig3], session: session);
+  tx = tx.copyWith(witnesses: [
+    TxWitnessInput(stack: [BytesUtils.toHexString(signature)])
+  ]);
+  await testMempool(tx.serialize());
+}
diff --git a/lib/bitcoin_base.dart b/lib/bitcoin_base.dart
index e908780..a9c0611 100644
--- a/lib/bitcoin_base.dart
+++ b/lib/bitcoin_base.dart
@@ -1,14 +1,8 @@
-/// library bitcoin_base
-/// a comprehensive and versatile Go library for all your Bitcoin transaction needs.
-/// offers robust support for various Bitcoin transaction types,
-/// including spending transactions, Bitcoin address management,
-///  Bitcoin Schnorr signatures, BIP-39 mnemonic phrase generation,
-/// hierarchical deterministic (HD) wallet derivation, and Web3 Secret Storage Definition.
 library;
 
-export 'src/bitcoin/address/address.dart';
+export 'src/bitcoin/bitcoin.dart';
 
-export 'src/bitcoin/script/scripts.dart';
+export 'src/exception/exception.dart';
 
 export 'src/crypto/crypto.dart';
 
@@ -23,3 +17,5 @@ export 'src/cash_token/cash_token.dart';
 export 'src/bitcoin_cash/bitcoin_cash.dart';
 
 export 'src/transaction_builder/builder.dart';
+
+export 'src/psbt/psbt.dart';
diff --git a/lib/src/bitcoin/address/address.dart b/lib/src/bitcoin/address/address.dart
index f878515..99cf14f 100644
--- a/lib/src/bitcoin/address/address.dart
+++ b/lib/src/bitcoin/address/address.dart
@@ -8,8 +8,10 @@
 // - Enhanced functionality for improved handling of addresses across diverse networks.
 library;
 
-import 'package:bitcoin_base/bitcoin_base.dart';
+import 'package:bitcoin_base/src/bitcoin/script/scripts.dart';
+import 'package:bitcoin_base/src/bitcoin/taproot/taproot.dart';
 import 'package:bitcoin_base/src/exception/exception.dart';
+import 'package:bitcoin_base/src/models/network.dart';
 import 'package:bitcoin_base/src/utils/enumerate.dart';
 import 'package:blockchain_utils/blockchain_utils.dart';
 part 'core.dart';
diff --git a/lib/src/bitcoin/address/core.dart b/lib/src/bitcoin/address/core.dart
index 57eef50..93f2703 100644
--- a/lib/src/bitcoin/address/core.dart
+++ b/lib/src/bitcoin/address/core.dart
@@ -7,16 +7,18 @@ abstract class BitcoinAddressType implements Enumerate {
   const BitcoinAddressType._(this.value);
 
   /// Factory method to create a BitcoinAddressType enum value from a name or value.
-  static BitcoinAddressType fromValue(String value) {
+  static BitcoinAddressType fromValue(String? value) {
     return values.firstWhere((element) => element.value == value,
-        orElse: () => throw DartBitcoinPluginException(
-            'Invalid BitcoinAddressType: $value'));
+        orElse: () =>
+            throw DartBitcoinPluginException('Unknown address type. $value'));
   }
 
   /// Check if the address type is Pay-to-Script-Hash (P2SH).
   bool get isP2sh;
-  int get hashLength;
   bool get isSegwit;
+  bool get isP2tr => false;
+  int get hashLength;
+  bool get isP2sh32 => isP2sh && hashLength == 32;
 
   // Enum values as a list for iteration
   static const List<BitcoinAddressType> values = [
@@ -38,7 +40,8 @@ abstract class BitcoinAddressType implements Enumerate {
   ];
   T cast<T extends BitcoinAddressType>() {
     if (this is! T) {
-      throw DartBitcoinPluginException('BitcoinAddressType casting failed.',
+      throw DartBitcoinPluginException(
+          "Invalid cast: expected ${T.runtimeType}, but found $runtimeType.",
           details: {'expected': '$T', 'type': value});
     }
     return this as T;
@@ -152,6 +155,9 @@ class SegwitAddressType extends BitcoinAddressType {
   @override
   bool get isSegwit => true;
 
+  @override
+  bool get isP2tr => this == p2tr;
+
   @override
   int get hashLength {
     switch (this) {
diff --git a/lib/src/bitcoin/address/legacy_address.dart b/lib/src/bitcoin/address/legacy_address.dart
index 0b0202e..0b7627d 100644
--- a/lib/src/bitcoin/address/legacy_address.dart
+++ b/lib/src/bitcoin/address/legacy_address.dart
@@ -41,9 +41,32 @@ abstract class LegacyAddress implements BitcoinBaseAddress {
   String pubKeyHash() {
     return _BitcoinAddressUtils.pubKeyHash(toScriptPubKey());
   }
+
+  @override
+  operator ==(other) {
+    if (identical(this, other)) return true;
+    if (other is! LegacyAddress) return false;
+    if (runtimeType != other.runtimeType) return false;
+    if (type != other.type) return false;
+    return _addressProgram == other._addressProgram;
+  }
+
+  @override
+  int get hashCode =>
+      HashCodeGenerator.generateHashCode([_addressProgram, type]);
 }
 
 class P2shAddress extends LegacyAddress {
+  factory P2shAddress.fromScript32(
+      {required Script script,
+      P2shAddressType addressType = P2shAddressType.p2pkInP2sh32}) {
+    if (addressType.hashLength != 32) {
+      throw DartBitcoinPluginException("Invalid P2sh 32 address type.");
+    }
+    return P2shAddress.fromHash160(
+        addrHash: BytesUtils.toHexString(
+            QuickCrypto.sha256DoubleHash(script.toBytes())));
+  }
   P2shAddress.fromScript(
       {required super.script, this.type = P2shAddressType.p2pkInP2sh})
       : super.fromScript();
@@ -64,7 +87,7 @@ class P2shAddress extends LegacyAddress {
   String toAddress(BasedUtxoNetwork network) {
     if (!network.supportedAddress.contains(type)) {
       throw DartBitcoinPluginException(
-          'network does not support ${type.value} address');
+          'network does not support ${type.value} address.');
     }
     return super.toAddress(network);
   }
@@ -77,6 +100,17 @@ class P2shAddress extends LegacyAddress {
     }
     return Script(script: ['OP_HASH160', addressProgram, 'OP_EQUAL']);
   }
+
+  @override
+  operator ==(other) {
+    if (identical(this, other)) return true;
+    if (other is! LegacyAddress) return false;
+    if (runtimeType != other.runtimeType) return false;
+    return _addressProgram == other._addressProgram;
+  }
+
+  @override
+  int get hashCode => HashCodeGenerator.generateHashCode([_addressProgram]);
 }
 
 class P2pkhAddress extends LegacyAddress {
@@ -108,29 +142,38 @@ class P2pkhAddress extends LegacyAddress {
 }
 
 class P2pkAddress extends LegacyAddress {
-  P2pkAddress({required String publicKey}) : super._() {
+  P2pkAddress._(this.publicKey) : super._();
+  factory P2pkAddress({required String publicKey}) {
     final toBytes = BytesUtils.fromHexString(publicKey);
     if (!Secp256k1PublicKeyEcdsa.isValidBytes(toBytes)) {
-      throw const DartBitcoinPluginException('Invalid secp256k1 public key');
+      throw const DartBitcoinPluginException('Invalid Public key.');
     }
-    publicHex = publicKey;
+    return P2pkAddress._(StringUtils.strip0x(publicKey.toLowerCase()));
   }
-  late final String publicHex;
+  final String publicKey;
 
-  /// Returns the scriptPubKey (P2SH) that corresponds to this address
   @override
   Script toScriptPubKey() {
-    return Script(script: [publicHex, 'OP_CHECKSIG']);
+    return Script(script: [publicKey, 'OP_CHECKSIG']);
   }
 
   @override
   String toAddress(BasedUtxoNetwork network) {
     return _BitcoinAddressUtils.legacyToAddress(
         network: network,
-        addressProgram: _BitcoinAddressUtils.pubkeyToHash160(publicHex),
+        addressProgram: _BitcoinAddressUtils.pubkeyToHash160(publicKey),
         type: type);
   }
 
   @override
   final PubKeyAddressType type = PubKeyAddressType.p2pk;
+  @override
+  operator ==(other) {
+    if (identical(this, other)) return true;
+    if (other is! P2pkAddress) return false;
+    return publicKey == other.publicKey;
+  }
+
+  @override
+  int get hashCode => HashCodeGenerator.generateHashCode([publicKey, type]);
 }
diff --git a/lib/src/bitcoin/address/segwit_address.dart b/lib/src/bitcoin/address/segwit_address.dart
index 2e3e8c1..20a2eda 100644
--- a/lib/src/bitcoin/address/segwit_address.dart
+++ b/lib/src/bitcoin/address/segwit_address.dart
@@ -43,6 +43,20 @@ abstract class SegwitAddress implements BitcoinBaseAddress {
   String pubKeyHash() {
     return _BitcoinAddressUtils.pubKeyHash(toScriptPubKey());
   }
+
+  @override
+  operator ==(other) {
+    if (identical(this, other)) return true;
+    if (other is! SegwitAddress) return false;
+    if (runtimeType != other.runtimeType) return false;
+    if (type != other.type) return false;
+    return addressProgram == addressProgram &&
+        segwitVersion == other.segwitVersion;
+  }
+
+  @override
+  int get hashCode =>
+      HashCodeGenerator.generateHashCode([addressProgram, segwitVersion, type]);
 }
 
 class P2wpkhAddress extends SegwitAddress {
@@ -53,8 +67,6 @@ class P2wpkhAddress extends SegwitAddress {
       : super.fromProgram(
             segwitVersion: _BitcoinAddressUtils.segwitV0,
             addresType: SegwitAddressType.p2wpkh);
-  P2wpkhAddress.fromScript({required super.script})
-      : super.fromScript(segwitVersion: _BitcoinAddressUtils.segwitV0);
 
   /// returns the scriptPubKey of a P2WPKH witness script
   @override
@@ -74,8 +86,18 @@ class P2trAddress extends SegwitAddress {
       : super.fromProgram(
             segwitVersion: _BitcoinAddressUtils.segwitV1,
             addresType: SegwitAddressType.p2tr);
-  P2trAddress.fromScript({required super.script})
-      : super.fromScript(segwitVersion: _BitcoinAddressUtils.segwitV1);
+  P2trAddress.fromInternalKey({
+    required List<int> internalKey,
+    TaprootTree? treeScript,
+    List<int>? merkleRoot,
+  }) : super.fromProgram(
+            program: BytesUtils.toHexString(TaprootUtils.tweakPublicKey(
+                    internalKey,
+                    treeScript: treeScript,
+                    merkleRoot: merkleRoot)
+                .toXonly()),
+            segwitVersion: _BitcoinAddressUtils.segwitV1,
+            addresType: SegwitAddressType.p2tr);
 
   /// returns the scriptPubKey of a P2TR witness script
   @override
diff --git a/lib/src/bitcoin/address/utils/address_utils.dart b/lib/src/bitcoin/address/utils/address_utils.dart
index 22538bf..a3df388 100644
--- a/lib/src/bitcoin/address/utils/address_utils.dart
+++ b/lib/src/bitcoin/address/utils/address_utils.dart
@@ -176,7 +176,7 @@ class _BitcoinAddressUtils {
     try {
       final toBytes = BytesUtils.fromHexString(hash160);
       if (toBytes.length == addressType.hashLength) {
-        return hash160;
+        return StringUtils.strip0x(hash160.toLowerCase());
       }
       // ignore: empty_catches
     } catch (e) {}
diff --git a/lib/src/bitcoin/bitcoin.dart b/lib/src/bitcoin/bitcoin.dart
new file mode 100644
index 0000000..c3bd859
--- /dev/null
+++ b/lib/src/bitcoin/bitcoin.dart
@@ -0,0 +1,3 @@
+export 'address/address.dart';
+export 'script/scripts.dart';
+export 'taproot/taproot.dart';
diff --git a/lib/src/bitcoin/script/control_block.dart b/lib/src/bitcoin/script/control_block.dart
deleted file mode 100644
index 209e4eb..0000000
--- a/lib/src/bitcoin/script/control_block.dart
+++ /dev/null
@@ -1,25 +0,0 @@
-import 'package:bitcoin_base/src/bitcoin/script/op_code/constant.dart';
-import 'package:bitcoin_base/src/crypto/keypair/ec_public.dart';
-import 'package:blockchain_utils/utils/binary/utils.dart';
-
-import 'script.dart';
-
-class ControlBlock {
-  ControlBlock({required this.public, this.scriptToSpend, List<int>? scripts})
-      : scripts = BytesUtils.tryToBytes(scripts, unmodifiable: true);
-  final ECPublic public;
-  final Script? scriptToSpend;
-  final List<int>? scripts;
-
-  List<int> toBytes() {
-    final version = <int>[BitcoinOpCodeConst.LEAF_VERSION_TAPSCRIPT];
-
-    final pubKey = BytesUtils.fromHexString(public.toXOnlyHex());
-    final marklePath = scripts ?? [];
-    return [...version, ...pubKey, ...marklePath];
-  }
-
-  String toHex() {
-    return BytesUtils.toHexString(toBytes());
-  }
-}
diff --git a/lib/src/bitcoin/script/input.dart b/lib/src/bitcoin/script/input.dart
index c5f841b..ea70f26 100644
--- a/lib/src/bitcoin/script/input.dart
+++ b/lib/src/bitcoin/script/input.dart
@@ -1,6 +1,9 @@
 import 'dart:typed_data';
 
 import 'package:bitcoin_base/src/bitcoin/script/op_code/constant.dart';
+import 'package:bitcoin_base/src/exception/exception.dart';
+import 'package:blockchain_utils/crypto/quick_crypto.dart';
+import 'package:blockchain_utils/helper/extensions/extensions.dart';
 import 'package:blockchain_utils/utils/utils.dart';
 import 'script.dart';
 
@@ -11,14 +14,36 @@ import 'script.dart';
 /// [scriptSig] the script that satisfies the locking conditions
 /// [sequence] the input sequence (for timelocks, RBF, etc.)
 class TxInput {
-  TxInput(
+  TxInput._(
       {required this.txId,
       required this.txIndex,
       Script? scriptSig,
       List<int>? sequance})
-      : sequence = List.unmodifiable(
-            sequance ?? BitcoinOpCodeConst.DEFAULT_TX_SEQUENCE),
+      : sequence =
+            (sequance ?? BitcoinOpCodeConst.defaultTxSequence).asImmutableBytes,
         scriptSig = scriptSig ?? Script(script: []);
+  factory TxInput(
+      {required String txId,
+      required int txIndex,
+      Script? scriptSig,
+      List<int>? sequance}) {
+    if (sequance != null &&
+        sequance.length != BitcoinOpCodeConst.sequenceLengthInBytes) {
+      throw DartBitcoinPluginException(
+          "Invalid sequence length: expected ${BitcoinOpCodeConst.sequenceLengthInBytes}, but got ${sequance.length}.");
+    }
+    final txBytes = BytesUtils.tryFromHexString(txId);
+    if (txBytes?.length != QuickCrypto.sha256DigestSize) {
+      throw DartBitcoinPluginException(
+          "Invalid transaction ID: Expected ${QuickCrypto.sha256DigestSize} bytes, but received a different length.",
+          details: {"transactionID": txId});
+    }
+    return TxInput._(
+        txId: StringUtils.strip0x(txId.toLowerCase()),
+        txIndex: txIndex,
+        sequance: sequance,
+        scriptSig: scriptSig);
+  }
   TxInput copyWith(
       {String? txId, int? txIndex, Script? scriptSig, List<int>? sequence}) {
     return TxInput(
@@ -34,7 +59,7 @@ class TxInput {
   List<int> sequence;
 
   /// creates a copy of the object
-  TxInput copy() {
+  TxInput clone() {
     return TxInput(
         txId: txId, txIndex: txIndex, scriptSig: scriptSig, sequance: sequence);
   }
@@ -42,10 +67,8 @@ class TxInput {
   /// serializes TxInput to bytes
   List<int> toBytes() {
     final txidBytes = BytesUtils.fromHexString(txId).reversed.toList();
-
     final txoutBytes =
         IntUtils.toBytes(txIndex, length: 4, byteOrder: Endian.little);
-    // writeUint32LE(txIndex, txoutBytes);
     final scriptSigBytes = scriptSig.toBytes();
     final scriptSigLengthVarint = IntUtils.encodeVarint(scriptSigBytes.length);
     final data = List<int>.from([
@@ -59,7 +82,7 @@ class TxInput {
   }
 
   static Tuple<TxInput, int> deserialize(
-      {required List<int> bytes, int cursor = 0, bool hasSegwit = false}) {
+      {required List<int> bytes, int cursor = 0}) {
     final inpHash = bytes.sublist(cursor, cursor + 32).reversed.toList();
     cursor += 32;
     final outputN = IntUtils.fromBytes(bytes.sublist(cursor, cursor + 4),
@@ -75,17 +98,24 @@ class TxInput {
         TxInput(
             txId: BytesUtils.toHexString(inpHash),
             txIndex: outputN,
-            scriptSig: Script.deserialize(
-                bytes: unlockingScript, hasSegwit: hasSegwit),
+            scriptSig: Script.deserialize(bytes: unlockingScript),
             sequance: sequenceNumberData),
         cursor);
   }
 
+  List<int> txIdBytes() {
+    return BytesUtils.fromHexString(txId).reversed.toList();
+  }
+
+  int sequenceAsNumber() {
+    return IntUtils.fromBytes(sequence, byteOrder: Endian.little);
+  }
+
   Map<String, dynamic> toJson() {
     return {
       'txid': txId,
       'txIndex': txIndex,
-      'scriptSig': scriptSig.script,
+      'scriptSig': scriptSig.toJson(),
       'sequance': BytesUtils.toHexString(sequence),
     };
   }
@@ -94,4 +124,17 @@ class TxInput {
   String toString() {
     return 'TxInput{txId: $txId, txIndex: $txIndex, scriptSig: $scriptSig, sequence: ${BytesUtils.toHexString(sequence)}}';
   }
+
+  @override
+  operator ==(other) {
+    if (identical(this, other)) return true;
+    if (other is! TxInput) return false;
+    return txIndex == other.txIndex &&
+        txId == other.txId &&
+        BytesUtils.bytesEqual(sequence, other.sequence);
+  }
+
+  @override
+  int get hashCode =>
+      HashCodeGenerator.generateHashCode([txIndex, txId, sequence]);
 }
diff --git a/lib/src/bitcoin/script/op_code/constant.dart b/lib/src/bitcoin/script/op_code/constant.dart
index 7091ec1..d761839 100644
--- a/lib/src/bitcoin/script/op_code/constant.dart
+++ b/lib/src/bitcoin/script/op_code/constant.dart
@@ -1,3 +1,119 @@
+import 'package:blockchain_utils/helper/extensions/extensions.dart';
+
+enum BitcoinOpcode {
+  op0("OP_0", 0x00),
+  opFalse("OP_FALSE", 0x00),
+  opPushData1("OP_PUSHDATA1", 0x4c),
+  opPushData2("OP_PUSHDATA2", 0x4d),
+  opPushData4("OP_PUSHDATA4", 0x4e),
+  op1Negate("OP_1NEGATE", 0x4f),
+  op1("OP_1", 0x51),
+  opTrue("OP_TRUE", 0x51),
+  op2("OP_2", 0x52),
+  op3("OP_3", 0x53),
+  op4("OP_4", 0x54),
+  op5("OP_5", 0x55),
+  op6("OP_6", 0x56),
+  op7("OP_7", 0x57),
+  op8("OP_8", 0x58),
+  op9("OP_9", 0x59),
+  op10("OP_10", 0x5a),
+  op11("OP_11", 0x5b),
+  op12("OP_12", 0x5c),
+  op13("OP_13", 0x5d),
+  op14("OP_14", 0x5e),
+  op15("OP_15", 0x5f),
+  op16("OP_16", 0x60),
+
+  // Flow control
+  opNop("OP_NOP", 0x61),
+  opIf("OP_IF", 0x63),
+  opNotIf("OP_NOTIF", 0x64),
+  opElse("OP_ELSE", 0x67),
+  opEndIf("OP_ENDIF", 0x68),
+  opVerify("OP_VERIFY", 0x69),
+  opReturn("OP_RETURN", 0x6a),
+
+  // Stack operations
+  opToAltStack("OP_TOALTSTACK", 0x6b),
+  opFromAltStack("OP_FROMALTSTACK", 0x6c),
+  opIfDup("OP_IFDUP", 0x73),
+  opDepth("OP_DEPTH", 0x74),
+  opDrop("OP_DROP", 0x75),
+  opDup("OP_DUP", 0x76),
+  opNip("OP_NIP", 0x77),
+  opOver("OP_OVER", 0x78),
+  opPick("OP_PICK", 0x79),
+  opRoll("OP_ROLL", 0x7a),
+  opRot("OP_ROT", 0x7b),
+  opSwap("OP_SWAP", 0x7c),
+  opTuck("OP_TUCK", 0x7d),
+  op2Drop("OP_2DROP", 0x6d),
+  op2Dup("OP_2DUP", 0x6e),
+  op3Dup("OP_3DUP", 0x6f),
+  op2Over("OP_2OVER", 0x70),
+  op2Rot("OP_2ROT", 0x71),
+  op2Swap("OP_2SWAP", 0x72),
+  opSize("OP_SIZE", 0x82),
+  opEqual("OP_EQUAL", 0x87),
+  opEqualVerify("OP_EQUALVERIFY", 0x88),
+
+  // Arithmetic
+  op1Add("OP_1ADD", 0x8b),
+  op1Sub("OP_1SUB", 0x8c),
+  opNegate("OP_NEGATE", 0x8f),
+  opAbs("OP_ABS", 0x90),
+  opNot("OP_NOT", 0x91),
+  op0NotEqual("OP_0NOTEQUAL", 0x92),
+  opAdd("OP_ADD", 0x93),
+  opSub("OP_SUB", 0x94),
+  opBoolAnd("OP_BOOLAND", 0x9a),
+  opBoolOr("OP_BOOLOR", 0x9b),
+  opNumEqual("OP_NUMEQUAL", 0x9c),
+  opNumEqualVerify("OP_NUMEQUALVERIFY", 0x9d),
+  opNumNotEqual("OP_NUMNOTEQUAL", 0x9e),
+  opLessThan("OP_LESSTHAN", 0x9f),
+  opGreaterThan("OP_GREATERTHAN", 0xa0),
+  opLessThanOrEqual("OP_LESSTHANOREQUAL", 0xa1),
+  opGreaterThanOrEqual("OP_GREATERTHANOREQUAL", 0xa2),
+  opMin("OP_MIN", 0xa3),
+  opMax("OP_MAX", 0xa4),
+  opWithin("OP_WITHIN", 0xa5),
+
+  // Crypto
+  opRipemd160("OP_RIPEMD160", 0xa6),
+  opSha1("OP_SHA1", 0xa7),
+  opSha256("OP_SHA256", 0xa8),
+  opHash160("OP_HASH160", 0xa9),
+  opHash256("OP_HASH256", 0xaa),
+  opCodeSeparator("OP_CODESEPARATOR", 0xab),
+  opCheckSig("OP_CHECKSIG", 0xac),
+  opCheckSigVerify("OP_CHECKSIGVERIFY", 0xad),
+  opCheckMultiSig("OP_CHECKMULTISIG", 0xae),
+  opCheckMultiSigVerify("OP_CHECKMULTISIGVERIFY", 0xaf),
+  opCheckSigAdd("OP_CHECKSIGADD", 0xba),
+  opCheckLockTimeVerify("OP_CHECKLOCKTIMEVERIFY", 0xb1),
+  opCheckSequenceVerify("OP_CHECKSEQUENCEVERIFY", 0xb2);
+
+  final String name;
+  final int value;
+
+  const BitcoinOpcode(this.name, this.value);
+
+  static BitcoinOpcode? findByName(String name) {
+    return values.firstWhereNullable((e) => e.name == name);
+  }
+
+  static BitcoinOpcode? findByValue(int value) {
+    return values.firstWhereNullable((e) => e.value == value);
+  }
+
+  bool get isOpPushData =>
+      this == BitcoinOpcode.opPushData1 ||
+      this == BitcoinOpcode.opPushData2 ||
+      this == BitcoinOpcode.opPushData4;
+}
+
 /// ignore_for_file: constant_identifier_names, equal_keys_in_map, non_constant_identifier_names
 /// Constants and identifiers used in the Bitcoin-related code.
 // ignore_for_file: constant_identifier_names, non_constant_identifier_names, equal_keys_in_map
@@ -11,259 +127,254 @@ class BitcoinOpCodeConst {
         byte == BitcoinOpCodeConst.opPushData4;
   }
 
-  static const Map<String, List<int>> OP_CODES = {
-    'OP_0': [0x00],
-    'OP_FALSE': [0x00],
-    'OP_PUSHDATA1': [0x4c],
-    'OP_PUSHDATA2': [0x4d],
-    'OP_PUSHDATA4': [0x4e],
-    'OP_1NEGATE': [0x4f],
-    'OP_1': [0x51],
-    'OP_TRUE': [0x51],
-    'OP_2': [0x52],
-    'OP_3': [0x53],
-    'OP_4': [0x54],
-    'OP_5': [0x55],
-    'OP_6': [0x56],
-    'OP_7': [0x57],
-    'OP_8': [0x58],
-    'OP_9': [0x59],
-    'OP_10': [0x5a],
-    'OP_11': [0x5b],
-    'OP_12': [0x5c],
-    'OP_13': [0x5d],
-    'OP_14': [0x5e],
-    'OP_15': [0x5f],
-    'OP_16': [0x60],
-
-    /// flow control
-    'OP_NOP': [0x61],
-    'OP_IF': [0x63],
-    'OP_NOTIF': [0x64],
-    'OP_ELSE': [0x67],
-    'OP_ENDIF': [0x68],
-    'OP_VERIFY': [0x69],
-    'OP_RETURN': [0x6a],
-
-    /// stack
-    'OP_TOALTSTACK': [0x6b],
-    'OP_FROMALTSTACK': [0x6c],
-    'OP_IFDUP': [0x73],
-    'OP_DEPTH': [0x74],
-    'OP_DROP': [0x75],
-    'OP_DUP': [0x76],
-    'OP_NIP': [0x77],
-    'OP_OVER': [0x78],
-    'OP_PICK': [0x79],
-    'OP_ROLL': [0x7a],
-    'OP_ROT': [0x7b],
-    'OP_SWAP': [0x7c],
-    'OP_TUCK': [0x7d],
-    'OP_2DROP': [0x6d],
-    'OP_2DUP': [0x6e],
-    'OP_3DUP': [0x6f],
-    'OP_2OVER': [0x70],
-    'OP_2ROT': [0x71],
-    'OP_2SWAP': [0x72],
-
-    /// splice
-    /// 'OP_CAT': [0x7e],
-    /// 'OP_SUBSTR': [0x7f],
-    /// 'OP_LEFT': [0x80],
-    /// 'OP_RIGHT': [0x81],
-    'OP_SIZE': [0x82],
-
-    /// bitwise logic
-    /// 'OP_INVERT': [0x83],
-    /// 'OP_AND': [0x84],
-    /// 'OP_OR': [0x85],
-    /// 'OP_XOR': [0x86],
-    'OP_EQUAL': [0x87],
-    'OP_EQUALVERIFY': [0x88],
-
-    /// arithmetic
-    'OP_1ADD': [0x8b],
-    'OP_1SUB': [0x8c],
-
-    /// 'OP_2MUL': [0x8d],
-    /// 'OP_2DIV': [0x8e],
-    'OP_NEGATE': [0x8f],
-    'OP_ABS': [0x90],
-    'OP_NOT': [0x91],
-    'OP_0NOTEQUAL': [0x92],
-    'OP_ADD': [0x93],
-    'OP_SUB': [0x94],
-
-    /// 'OP_MUL': [0x95],
-    /// 'OP_DIV': [0x96],
-    /// 'OP_MOD': [0x97],
-    /// 'OP_LSHIFT': [0x98],
-    /// 'OP_RSHIFT': [0x99],
-    'OP_BOOLAND': [0x9a],
-    'OP_BOOLOR': [0x9b],
-    'OP_NUMEQUAL': [0x9c],
-    'OP_NUMEQUALVERIFY': [0x9d],
-    'OP_NUMNOTEQUAL': [0x9e],
-    'OP_LESSTHAN': [0x9f],
-    'OP_GREATERTHAN': [0xa0],
-    'OP_LESSTHANOREQUAL': [0xa1],
-    'OP_GREATERTHANOREQUAL': [0xa2],
-    'OP_MIN': [0xa3],
-    'OP_MAX': [0xa4],
-    'OP_WITHIN': [0xa5],
-
-    /// crypto
-    'OP_RIPEMD160': [0xa6],
-    'OP_SHA1': [0xa7],
-    'OP_SHA256': [0xa8],
-    'OP_HASH160': [0xa9],
-    'OP_HASH256': [0xaa],
-    'OP_CODESEPARATOR': [0xab],
-    'OP_CHECKSIG': [0xac],
-    'OP_CHECKSIGVERIFY': [0xad],
-    'OP_CHECKMULTISIG': [0xae],
-    'OP_CHECKMULTISIGVERIFY': [0xaf],
-
-    /// locktime
-    'OP_NOP2': [0xb1],
-    'OP_CHECKLOCKTIMEVERIFY': [0xb1],
-    'OP_NOP3': [0xb2],
-    'OP_CHECKSEQUENCEVERIFY': [0xb2],
-  };
-
-  static final Map<int, String> CODE_OPS = {
-    /// constants
-    0: 'OP_0',
-    76: 'OP_PUSHDATA1',
-    77: 'OP_PUSHDATA2',
-    78: 'OP_PUSHDATA4',
-    79: 'OP_1NEGATE',
-    81: 'OP_1',
-    82: 'OP_2',
-    83: 'OP_3',
-    84: 'OP_4',
-    85: 'OP_5',
-    86: 'OP_6',
-    87: 'OP_7',
-    88: 'OP_8',
-    89: 'OP_9',
-    90: 'OP_10',
-    91: 'OP_11',
-    92: 'OP_12',
-    93: 'OP_13',
-    94: 'OP_14',
-    95: 'OP_15',
-    96: 'OP_16',
-
-    /// flow control
-    97: 'OP_NOP',
-    99: 'OP_IF',
-    100: 'OP_NOTIF',
-    103: 'OP_ELSE',
-    104: 'OP_ENDIF',
-    105: 'OP_VERIFY',
-    106: 'OP_RETURN',
-
-    /// stack
-    107: 'OP_TOALTSTACK',
-    108: 'OP_FROMALTSTACK',
-    115: 'OP_IFDUP',
-    116: 'OP_DEPTH',
-    117: 'OP_DROP',
-    118: 'OP_DUP',
-    119: 'OP_NIP',
-    120: 'OP_OVER',
-    121: 'OP_PICK',
-    122: 'OP_ROLL',
-    123: 'OP_ROT',
-    124: 'OP_SWAP',
-    125: 'OP_TUCK',
-    109: 'OP_2DROP',
-    110: 'OP_2DUP',
-    111: 'OP_3DUP',
-    112: 'OP_2OVER',
-    113: 'OP_2ROT',
-    114: 'OP_2SWAP',
-
-    /// splice
-    130: 'OP_SIZE',
-
-    /// bitwise logic
-    135: 'OP_EQUAL',
-    136: 'OP_EQUALVERIFY',
-
-    /// arithmetic
-    139: 'OP_1ADD',
-    140: 'OP_1SUB',
-    143: 'OP_NEGATE',
-    144: 'OP_ABS',
-    145: 'OP_NOT',
-    146: 'OP_0NOTEQUAL',
-    147: 'OP_ADD',
-    148: 'OP_SUB',
-    154: 'OP_BOOLAND',
-    155: 'OP_BOOLOR',
-    156: 'OP_NUMEQUAL',
-    157: 'OP_NUMEQUALVERIFY',
-    158: 'OP_NUMNOTEQUAL',
-    159: 'OP_LESSTHAN',
-    160: 'OP_GREATERTHAN',
-    161: 'OP_LESSTHANOREQUAL',
-    162: 'OP_GREATERTHANOREQUAL',
-    163: 'OP_MIN',
-    164: 'OP_MAX',
-    165: 'OP_WITHIN',
-
-    /// crypto
-    166: 'OP_RIPEMD160',
-    167: 'OP_SHA1',
-    168: 'OP_SHA256',
-    169: 'OP_HASH160',
-    170: 'OP_HASH256',
-    171: 'OP_CODESEPARATOR',
-    172: 'OP_CHECKSIG',
-    173: 'OP_CHECKSIGVERIFY',
-    174: 'OP_CHECKMULTISIG',
-    175: 'OP_CHECKMULTISIGVERIFY',
-
-    /// locktime
-    177: 'OP_NOP2',
-    178: 'OP_NOP3',
-    177: 'OP_CHECKLOCKTIMEVERIFY',
-    178: 'OP_CHECKSEQUENCEVERIFY',
-  };
-
-  /// SIGHASH types
-  static const int SIGHASH_SINGLE = 0x03;
-  static const int SIGHASH_ANYONECANPAY = 0x80;
-  static const int SIGHASH_ALL = 0x01;
-  static const int SIGHASH_FORKED = 0x40;
-  static const int SIGHASH_Test = 0x00000041;
-  static const int SIGHASH_NONE = 0x02;
-  static const int TAPROOT_SIGHASH_ALL = 0x00;
+  // static const Map<String, List<int>> OP_CODES = {
+  //   'OP_0': [0x00],
+  //   'OP_FALSE': [0x00],
+  //   'OP_PUSHDATA1': [0x4c],
+  //   'OP_PUSHDATA2': [0x4d],
+  //   'OP_PUSHDATA4': [0x4e],
+  //   'OP_1NEGATE': [0x4f],
+  //   'OP_1': [0x51],
+  //   'OP_TRUE': [0x51],
+  //   'OP_2': [0x52],
+  //   'OP_3': [0x53],
+  //   'OP_4': [0x54],
+  //   'OP_5': [0x55],
+  //   'OP_6': [0x56],
+  //   'OP_7': [0x57],
+  //   'OP_8': [0x58],
+  //   'OP_9': [0x59],
+  //   'OP_10': [0x5a],
+  //   'OP_11': [0x5b],
+  //   'OP_12': [0x5c],
+  //   'OP_13': [0x5d],
+  //   'OP_14': [0x5e],
+  //   'OP_15': [0x5f],
+  //   'OP_16': [0x60],
+
+  //   /// flow control
+  //   'OP_NOP': [0x61],
+  //   'OP_IF': [0x63],
+  //   'OP_NOTIF': [0x64],
+  //   'OP_ELSE': [0x67],
+  //   'OP_ENDIF': [0x68],
+  //   'OP_VERIFY': [0x69],
+  //   'OP_RETURN': [0x6a],
+
+  //   /// stack
+  //   'OP_TOALTSTACK': [0x6b],
+  //   'OP_FROMALTSTACK': [0x6c],
+  //   'OP_IFDUP': [0x73],
+  //   'OP_DEPTH': [0x74],
+  //   'OP_DROP': [0x75],
+  //   'OP_DUP': [0x76],
+  //   'OP_NIP': [0x77],
+  //   'OP_OVER': [0x78],
+  //   'OP_PICK': [0x79],
+  //   'OP_ROLL': [0x7a],
+  //   'OP_ROT': [0x7b],
+  //   'OP_SWAP': [0x7c],
+  //   'OP_TUCK': [0x7d],
+  //   'OP_2DROP': [0x6d],
+  //   'OP_2DUP': [0x6e],
+  //   'OP_3DUP': [0x6f],
+  //   'OP_2OVER': [0x70],
+  //   'OP_2ROT': [0x71],
+  //   'OP_2SWAP': [0x72],
+  //   'OP_SIZE': [0x82],
+  //   'OP_EQUAL': [0x87],
+  //   'OP_EQUALVERIFY': [0x88],
+
+  //   /// arithmetic
+  //   'OP_1ADD': [0x8b],
+  //   'OP_1SUB': [0x8c],
+  //   'OP_NEGATE': [0x8f],
+  //   'OP_ABS': [0x90],
+  //   'OP_NOT': [0x91],
+  //   'OP_0NOTEQUAL': [0x92],
+  //   'OP_ADD': [0x93],
+  //   'OP_SUB': [0x94],
+  //   'OP_BOOLAND': [0x9a],
+  //   'OP_BOOLOR': [0x9b],
+  //   'OP_NUMEQUAL': [0x9c],
+  //   'OP_NUMEQUALVERIFY': [0x9d],
+  //   'OP_NUMNOTEQUAL': [0x9e],
+  //   'OP_LESSTHAN': [0x9f],
+  //   'OP_GREATERTHAN': [0xa0],
+  //   'OP_LESSTHANOREQUAL': [0xa1],
+  //   'OP_GREATERTHANOREQUAL': [0xa2],
+  //   'OP_MIN': [0xa3],
+  //   'OP_MAX': [0xa4],
+  //   'OP_WITHIN': [0xa5],
+
+  //   /// crypto
+  //   'OP_RIPEMD160': [0xa6],
+  //   'OP_SHA1': [0xa7],
+  //   'OP_SHA256': [0xa8],
+  //   'OP_HASH160': [0xa9],
+  //   'OP_HASH256': [0xaa],
+  //   'OP_CODESEPARATOR': [0xab],
+  //   'OP_CHECKSIG': [0xac],
+  //   'OP_CHECKSIGVERIFY': [0xad],
+  //   'OP_CHECKMULTISIG': [0xae],
+  //   'OP_CHECKMULTISIGVERIFY': [0xaf],
+  //   "OP_CHECKSIGADD": [0xba],
+
+  //   /// locktime
+  //   // 'OP_NOP2': [0xb1],
+  //   'OP_CHECKLOCKTIMEVERIFY': [0xb1],
+  //   // 'OP_NOP3': [0xb2],
+  //   'OP_CHECKSEQUENCEVERIFY': [0xb2],
+  // };
+
+  // static final Map<int, String> CODE_OPS = {
+  //   /// constants
+  //   0: 'OP_0',
+  //   // 0: 'OP_FALSE',
+  //   76: 'OP_PUSHDATA1',
+  //   77: 'OP_PUSHDATA2',
+  //   78: 'OP_PUSHDATA4',
+  //   79: 'OP_1NEGATE',
+  //   81: 'OP_1',
+  //   82: 'OP_2',
+  //   83: 'OP_3',
+  //   84: 'OP_4',
+  //   85: 'OP_5',
+  //   86: 'OP_6',
+  //   87: 'OP_7',
+  //   88: 'OP_8',
+  //   89: 'OP_9',
+  //   90: 'OP_10',
+  //   91: 'OP_11',
+  //   92: 'OP_12',
+  //   93: 'OP_13',
+  //   94: 'OP_14',
+  //   95: 'OP_15',
+  //   96: 'OP_16',
+
+  //   /// flow control
+  //   97: 'OP_NOP',
+  //   99: 'OP_IF',
+  //   100: 'OP_NOTIF',
+  //   103: 'OP_ELSE',
+  //   104: 'OP_ENDIF',
+  //   105: 'OP_VERIFY',
+  //   106: 'OP_RETURN',
+
+  //   /// stack
+  //   107: 'OP_TOALTSTACK',
+  //   108: 'OP_FROMALTSTACK',
+  //   115: 'OP_IFDUP',
+  //   116: 'OP_DEPTH',
+  //   117: 'OP_DROP',
+  //   118: 'OP_DUP',
+  //   119: 'OP_NIP',
+  //   120: 'OP_OVER',
+  //   121: 'OP_PICK',
+  //   122: 'OP_ROLL',
+  //   123: 'OP_ROT',
+  //   124: 'OP_SWAP',
+  //   125: 'OP_TUCK',
+  //   109: 'OP_2DROP',
+  //   110: 'OP_2DUP',
+  //   111: 'OP_3DUP',
+  //   112: 'OP_2OVER',
+  //   113: 'OP_2ROT',
+  //   114: 'OP_2SWAP',
+
+  //   /// splice
+  //   130: 'OP_SIZE',
+
+  //   /// bitwise logic
+  //   135: 'OP_EQUAL',
+  //   136: 'OP_EQUALVERIFY',
+
+  //   /// arithmetic
+  //   139: 'OP_1ADD',
+  //   140: 'OP_1SUB',
+  //   143: 'OP_NEGATE',
+  //   144: 'OP_ABS',
+  //   145: 'OP_NOT',
+  //   146: 'OP_0NOTEQUAL',
+  //   147: 'OP_ADD',
+  //   148: 'OP_SUB',
+  //   154: 'OP_BOOLAND',
+  //   155: 'OP_BOOLOR',
+  //   156: 'OP_NUMEQUAL',
+  //   157: 'OP_NUMEQUALVERIFY',
+  //   158: 'OP_NUMNOTEQUAL',
+  //   159: 'OP_LESSTHAN',
+  //   160: 'OP_GREATERTHAN',
+  //   161: 'OP_LESSTHANOREQUAL',
+  //   162: 'OP_GREATERTHANOREQUAL',
+  //   163: 'OP_MIN',
+  //   164: 'OP_MAX',
+  //   165: 'OP_WITHIN',
+
+  //   /// crypto
+  //   166: 'OP_RIPEMD160',
+  //   167: 'OP_SHA1',
+  //   168: 'OP_SHA256',
+  //   169: 'OP_HASH160',
+  //   170: 'OP_HASH256',
+  //   171: 'OP_CODESEPARATOR',
+  //   172: 'OP_CHECKSIG',
+  //   173: 'OP_CHECKSIGVERIFY',
+  //   174: 'OP_CHECKMULTISIG',
+  //   175: 'OP_CHECKMULTISIGVERIFY',
+  //   0xba: "OP_CHECKSIGADD",
+
+  //   /// locktime
+  //   // 177: 'OP_NOP2',
+  //   // 178: 'OP_NOP3',
+  //   177: 'OP_CHECKLOCKTIMEVERIFY',
+  //   178: 'OP_CHECKSEQUENCEVERIFY',
+  // };
+
+  static const int sighashSingle = 0x03;
+  static const int sighashAnyoneCanPay = 0x80;
+  static const int sighashAll = 0x01;
+  static const int sighashForked = 0x40;
+  static const int sighashTest = 0x00000041;
+  static const int sighashNone = 0x02;
+  static const int sighashDefault = 0x00;
+
+  static const int sighashAllAnyOneCanPay = 0x81;
+  static const int sighashNoneAnyOneCanPay = 0x82;
+  static const int sighashSingleAnyOneCanPay = 0x83;
 
   /// Transaction lock types
-  static const int TYPE_ABSOLUTE_TIMELOCK = 0x101;
-  static const int TYPE_RELATIVE_TIMELOCK = 0x201;
-  static const int TYPE_REPLACE_BY_FEE = 0x301;
+  static const int typeAbsoluteTimelock = 0x101;
+  static const int typeRelativeTimelock = 0x201;
+  static const int typeReplaceByFee = 0x301;
 
   /// Default values and sequences
-  static const List<int> DEFAULT_TX_LOCKTIME = [0x00, 0x00, 0x00, 0x00];
-  static const List<int> EMPTY_TX_SEQUENCE = [0x00, 0x00, 0x00, 0x00];
-  static const List<int> DEFAULT_TX_SEQUENCE = [0xff, 0xff, 0xff, 0xff];
-  static const List<int> ABSOLUTE_TIMELOCK_SEQUENCE = [0xfe, 0xff, 0xff, 0xff];
-  static const List<int> REPLACE_BY_FEE_SEQUENCE = [0x01, 0x00, 0x00, 0x00];
+  static const List<int> defaultTxLocktime = [0x00, 0x00, 0x00, 0x00];
+  static const List<int> defaultTxSequence = [0xff, 0xff, 0xff, 0xff];
+  static const List<int> emptyTxSequence = [0x00, 0x00, 0x00, 0x00];
+
+  static const List<int> absoluteTimelockSequence = [0xfe, 0xff, 0xff, 0xff];
+  static const List<int> replaceByFeeSequence = [0x01, 0x00, 0x00, 0x00];
 
   /// Script version and Bitcoin-related identifiers
-  static const int LEAF_VERSION_TAPSCRIPT = 0xc0;
-  static const List<int> DEFAULT_TX_VERSION = [0x02, 0x00, 0x00, 0x00];
-  static const int SATOSHIS_PER_BITCOIN = 100000000;
-  static const int NEGATIVE_SATOSHI = -1;
-
-  /// Bitcoin address types
-  static const String P2PKH_ADDRESS = 'p2pkh';
-  static const String P2SH_ADDRESS = 'p2sh';
-  static const String P2WPKH_ADDRESS_V0 = 'p2wpkhv0';
-  static const String P2WSH_ADDRESS_V0 = 'p2wshv0';
-  static const String P2TR_ADDRESS_V1 = 'p2trv1';
+  static const int leafVersionTapscript = 0xc0;
+  static const List<int> defaultTxVersion = [0x02, 0x00, 0x00, 0x00];
+  static const int satoshisPerBitcoin = 100000000;
+  static BigInt negativeSatoshi = BigInt.from(-1);
+
+  static const int sequenceLengthInBytes = 4;
+  static const int locktimeLengthInBytes = 4;
+  static const int versionLengthInBytes = 4;
+  static const int outputIndexBytesLength = 4;
+  static const int sighashByteLength = 4;
+  static const String opReturn = "OP_RETURN";
+  static const String opTrue = "OP_TRUE";
+  static const String opCheckSig = "OP_CHECKSIG";
+  static const String opCheckMultiSig = "OP_CHECKMULTISIG";
+  static const String opCheckMultiSigVerify = "OP_CHECKMULTISIGVERIFY";
+  static const String opCheckSigAdd = "OP_CHECKSIGADD";
+
+  static const int minInputLocktime = 500000000;
+  static const int defaultTxVersionNumber = 2;
+  static const int sighashBytesLength = 1;
 }
diff --git a/lib/src/bitcoin/script/op_code/constant_lib.dart b/lib/src/bitcoin/script/op_code/constant_lib.dart
deleted file mode 100644
index e6c4f56..0000000
--- a/lib/src/bitcoin/script/op_code/constant_lib.dart
+++ /dev/null
@@ -1,4 +0,0 @@
-library;
-
-export 'constant.dart';
-export 'tools.dart';
diff --git a/lib/src/bitcoin/script/op_code/tools.dart b/lib/src/bitcoin/script/op_code/tools.dart
deleted file mode 100644
index 1dafe7b..0000000
--- a/lib/src/bitcoin/script/op_code/tools.dart
+++ /dev/null
@@ -1,48 +0,0 @@
-import 'dart:typed_data';
-
-import 'package:bitcoin_base/src/bitcoin/script/op_code/constant.dart';
-import 'package:bitcoin_base/src/exception/exception.dart';
-import 'package:blockchain_utils/utils/utils.dart';
-
-List<int> opPushData(String hexData) {
-  final dataBytes = BytesUtils.fromHexString(hexData);
-  if (dataBytes.length < BitcoinOpCodeConst.opPushData1) {
-    return [dataBytes.length, ...dataBytes];
-  } else if (dataBytes.length < mask8) {
-    return [BitcoinOpCodeConst.opPushData1, dataBytes.length, ...dataBytes];
-  } else if (dataBytes.length < mask16) {
-    final lengthBytes =
-        IntUtils.toBytes(dataBytes.length, length: 2, byteOrder: Endian.little);
-    return [BitcoinOpCodeConst.opPushData2, ...lengthBytes, ...dataBytes];
-  } else if (dataBytes.length < mask32) {
-    final lengthBytes =
-        IntUtils.toBytes(dataBytes.length, length: 4, byteOrder: Endian.little);
-    return [BitcoinOpCodeConst.opPushData4, ...lengthBytes, ...dataBytes];
-  } else {
-    throw const DartBitcoinPluginException(
-        'Data too large. Cannot push into script');
-  }
-}
-
-List<int> pushInteger(int integer) {
-  if (integer < 0) {
-    throw const DartBitcoinPluginException(
-        'Integer is currently required to be positive.');
-  }
-
-  /// Calculate the number of bytes required to represent the integer
-  final numberOfBytes = (integer.bitLength + 7) ~/ 8;
-
-  /// Convert to little-endian bytes
-  var integerBytes = List<int>.filled(numberOfBytes, 0);
-  for (var i = 0; i < numberOfBytes; i++) {
-    integerBytes[i] = (integer >> (i * 8)) & mask8;
-  }
-
-  /// If the last bit is set, add a sign byte to signify a positive integer
-  if ((integer & (1 << (numberOfBytes * 8 - 1))) != 0) {
-    integerBytes = List<int>.from([...integerBytes, 0x00]);
-  }
-
-  return List<int>.from(opPushData(BytesUtils.toHexString(integerBytes)));
-}
diff --git a/lib/src/bitcoin/script/output.dart b/lib/src/bitcoin/script/output.dart
index 555d062..4654f56 100644
--- a/lib/src/bitcoin/script/output.dart
+++ b/lib/src/bitcoin/script/output.dart
@@ -1,29 +1,44 @@
 import 'dart:typed_data';
 import 'package:bitcoin_base/src/cash_token/cash_token.dart';
 import 'package:bitcoin_base/src/bitcoin/script/script.dart';
+import 'package:bitcoin_base/src/exception/exception.dart';
+import 'package:blockchain_utils/helper/extensions/extensions.dart';
 import 'package:blockchain_utils/utils/utils.dart';
+import 'package:bitcoin_base/src/bitcoin/script/op_code/constant.dart';
 
 /// Represents a transaction output.
 ///
 /// [amount] the value we want to send to this output in satoshis
 /// [scriptPubKey] the script that will lock this amount
 class TxOutput {
-  const TxOutput(
+  factory TxOutput.negativeOne() {
+    return TxOutput._(
+        amount: BitcoinOpCodeConst.negativeSatoshi,
+        scriptPubKey: Script(script: []));
+  }
+  // BitcoinOpCodeConst.negativeSatoshi
+  const TxOutput._(
       {required this.amount, required this.scriptPubKey, this.cashToken});
+  factory TxOutput(
+      {required BigInt amount,
+      required Script scriptPubKey,
+      CashToken? cashToken}) {
+    try {
+      return TxOutput._(
+          amount: amount.asUint64,
+          scriptPubKey: scriptPubKey,
+          cashToken: cashToken);
+    } catch (_) {
+      throw DartBitcoinPluginException(
+          "Invalid output amount: must be a non-negative 64-bit integer.");
+    }
+  }
   final CashToken? cashToken;
   final BigInt amount;
   final Script scriptPubKey;
 
-  Map<String, dynamic> toJson() {
-    return {
-      'cashToken': cashToken?.toJson(),
-      'amount': amount.toString(),
-      'scriptPubKey': scriptPubKey.script
-    };
-  }
-
   ///  creates a copy of the object
-  TxOutput copy() {
+  TxOutput clone() {
     return TxOutput(
         amount: amount,
         scriptPubKey: Script(script: List.from(scriptPubKey.script)),
@@ -46,7 +61,7 @@ class TxOutput {
   }
 
   static Tuple<TxOutput, int> deserialize(
-      {required List<int> bytes, required int cursor, bool hasSegwit = false}) {
+      {required List<int> bytes, required int cursor}) {
     final value = BigintUtils.fromBytes(bytes.sublist(cursor, cursor + 8),
             byteOrder: Endian.little)
         .toSigned(64);
@@ -54,7 +69,7 @@ class TxOutput {
 
     final vi = IntUtils.decodeVarint(bytes.sublist(cursor));
     cursor += vi.item2;
-    final token = CashToken.fromRaw(bytes.sublist(cursor));
+    final token = CashToken.deserialize(bytes.sublist(cursor));
 
     final lockScript = bytes.sublist(cursor + token.item2, cursor + vi.item1);
     cursor += vi.item1;
@@ -62,13 +77,33 @@ class TxOutput {
         TxOutput(
             amount: value,
             cashToken: token.item1,
-            scriptPubKey:
-                Script.deserialize(bytes: lockScript, hasSegwit: hasSegwit)),
+            scriptPubKey: Script.deserialize(bytes: lockScript)),
         cursor);
   }
 
+  Map<String, dynamic> toJson() {
+    return {
+      'cashToken': cashToken?.toJson(),
+      'amount': amount.toString(),
+      'scriptPubKey': scriptPubKey.script
+    };
+  }
+
   @override
   String toString() {
     return 'TxOutput{cashToken: ${cashToken?.toString()}}, amount: $amount, script: ${scriptPubKey.toString()}}';
   }
+
+  @override
+  operator ==(other) {
+    if (identical(this, other)) return true;
+    if (other is! TxOutput) return false;
+    return amount == other.amount &&
+        scriptPubKey == other.scriptPubKey &&
+        cashToken == other.cashToken;
+  }
+
+  @override
+  int get hashCode =>
+      HashCodeGenerator.generateHashCode([amount, scriptPubKey, cashToken]);
 }
diff --git a/lib/src/bitcoin/script/script.dart b/lib/src/bitcoin/script/script.dart
index 04d08d5..56fed68 100644
--- a/lib/src/bitcoin/script/script.dart
+++ b/lib/src/bitcoin/script/script.dart
@@ -1,36 +1,69 @@
 import 'package:bitcoin_base/src/bitcoin/script/scripts.dart';
+import 'package:bitcoin_base/src/exception/exception.dart';
 import 'package:blockchain_utils/blockchain_utils.dart';
 
-/// A Script contains just a list of OP_CODES and also knows how to serialize into bytes
-///
-/// [script] the list with all the script OP_CODES and data
 class Script {
-  Script({required List<dynamic> script})
-      : assert(() {
-          for (final i in script) {
-            if (i is! String && i is! int) return false;
+  static final Script empty = Script();
+  Script._({required List<dynamic> script})
+      : script = script.immutable,
+        _scriptBytes = _toBytes(script).asImmutableBytes;
+  factory Script.fromJson(Map<String, dynamic> json) {
+    return Script(script: json["script"]);
+  }
+  factory Script({List<dynamic> script = const []}) {
+    for (final i in script) {
+      if (i is! String && i is! int && i is! BitcoinOpcode) {
+        throw DartBitcoinPluginException(
+            "A valid script is a composition of opcodes, hexadecimal strings, and integers arranged in a structured list.");
+      }
+    }
+    List<dynamic> scripts = [];
+    for (final token in script) {
+      if (token is BitcoinOpcode) {
+        if (token.isOpPushData) continue;
+        scripts.add(token.name);
+        continue;
+      }
+      final opcode = BitcoinOpcode.findByName(token.toString());
+      if (opcode != null) {
+        scripts.add(opcode.name);
+      } else if (token is int && token >= 0 && token <= 16) {
+        scripts.add('OP_$token');
+      } else {
+        if (token is int) {
+          final opcode = BitcoinOpcode.findByValue(token);
+          if (opcode?.isOpPushData ?? false) continue;
+          scripts.add(token);
+        } else {
+          final tokenBytes = BytesUtils.tryFromHexString(token);
+          if (tokenBytes == null) {
+            throw DartBitcoinPluginException(
+                "A valid script is a composition of opcodes, hexadecimal strings, and integers arranged in a structured list.");
           }
-          return true;
-        }(),
-            'A valid script is a composition of opcodes, hexadecimal strings, and integers arranged in a structured list.'),
-        script = List.unmodifiable(script);
+          scripts.add(StringUtils.strip0x((token as String).toLowerCase()));
+        }
+      }
+    }
+
+    return Script._(script: scripts);
+  }
   final List<dynamic> script;
+  final List<int> _scriptBytes;
 
-  static Script deserialize(
-      {required List<int> bytes, bool hasSegwit = false}) {
-    final commands = <String>[];
-    var index = 0;
-    // final scriptBytes = BytesUtils.fromHexString(hexData);
+  factory Script.deserialize({required List<int> bytes}) {
+    final List<String> commands = [];
+    int index = 0;
     while (index < bytes.length) {
       final byte = bytes[index];
-      if (BitcoinOpCodeConst.CODE_OPS.containsKey(byte)) {
-        if (!BitcoinOpCodeConst.isOpPushData(byte)) {
-          commands.add(BitcoinOpCodeConst.CODE_OPS[byte]!);
+      final opcode = BitcoinOpcode.findByValue(byte);
+      if (opcode != null) {
+        if (!opcode.isOpPushData) {
+          commands.add(opcode.name);
         }
 
         /// skip op
         index = index + 1;
-        if (byte == BitcoinOpCodeConst.opPushData1) {
+        if (opcode == BitcoinOpcode.opPushData1) {
           // get len
           final bytesToRead = bytes[index];
           // skip len
@@ -40,14 +73,14 @@ class Script {
 
           /// add length
           index = index + bytesToRead;
-        } else if (byte == BitcoinOpCodeConst.opPushData2) {
+        } else if (opcode == BitcoinOpcode.opPushData2) {
           /// get len
           final bytesToRead = readUint16LE(bytes, index);
           index = index + 2;
           commands.add(BytesUtils.toHexString(
               bytes.sublist(index, index + bytesToRead)));
           index = index + bytesToRead;
-        } else if (byte == BitcoinOpCodeConst.opPushData4) {
+        } else if (opcode == BitcoinOpcode.opPushData4) {
           final bytesToRead = readUint32LE(bytes, index);
 
           index = index + 4;
@@ -70,19 +103,23 @@ class Script {
     return Script(script: commands);
   }
 
-  List<int> toBytes() {
+  static List<int> _toBytes(List<dynamic> script) {
     if (script.isEmpty) return <int>[];
     final scriptBytes = DynamicByteTracker();
     for (final token in script) {
-      if (BitcoinOpCodeConst.OP_CODES.containsKey(token)) {
-        scriptBytes.add(BitcoinOpCodeConst.OP_CODES[token]!);
-      } else if (token is int && token >= 0 && token <= 16) {
-        scriptBytes.add(BitcoinOpCodeConst.OP_CODES['OP_$token']!);
+      final opcode = BitcoinOpcode.findByName(token.toString());
+      if (opcode != null) {
+        scriptBytes.add([opcode.value]);
       } else {
         if (token is int) {
-          scriptBytes.add(pushInteger(token));
+          scriptBytes.add(BitcoinScriptUtils.pushInteger(token));
         } else {
-          scriptBytes.add(opPushData(token));
+          final tokenBytes = BytesUtils.tryFromHexString(token);
+          if (tokenBytes == null) {
+            throw DartBitcoinPluginException(
+                "A valid script is a composition of opcodes, hexadecimal strings, and integers arranged in a structured list.");
+          }
+          scriptBytes.add(BitcoinScriptUtils.opPushData(tokenBytes));
         }
       }
     }
@@ -90,12 +127,32 @@ class Script {
     return scriptBytes.toBytes();
   }
 
+  List<int> toBytes() {
+    return _scriptBytes.clone();
+  }
+
   String toHex() {
     return BytesUtils.toHexString(toBytes());
   }
 
+  Map<String, dynamic> toJson() {
+    return {"script": script};
+  }
+
   @override
   String toString() {
-    return "Script{script: ${script.join(", ")}}";
+    return script.toString();
   }
+
+  @override
+  operator ==(other) {
+    if (identical(this, other)) return true;
+    if (other is Script) {
+      return BytesUtils.bytesEqual(_scriptBytes, other._scriptBytes);
+    }
+    return false;
+  }
+
+  @override
+  int get hashCode => HashCodeGenerator.generateBytesHashCode(_scriptBytes);
 }
diff --git a/lib/src/bitcoin/script/scripts.dart b/lib/src/bitcoin/script/scripts.dart
index edeea0a..ef82d93 100644
--- a/lib/src/bitcoin/script/scripts.dart
+++ b/lib/src/bitcoin/script/scripts.dart
@@ -1,8 +1,8 @@
-export 'control_block.dart';
 export 'input.dart';
 export 'output.dart';
 export 'script.dart';
 export 'sequence.dart';
 export 'transaction.dart';
 export 'witness.dart';
-export 'op_code/constant_lib.dart';
+export 'utils.dart';
+export 'op_code/constant.dart';
diff --git a/lib/src/bitcoin/script/sequence.dart b/lib/src/bitcoin/script/sequence.dart
index e4cfd0f..9090d64 100644
--- a/lib/src/bitcoin/script/sequence.dart
+++ b/lib/src/bitcoin/script/sequence.dart
@@ -6,12 +6,12 @@ import 'package:blockchain_utils/utils/utils.dart';
 /// Helps setting up appropriate sequence. Used to provide the sequence to transaction inputs and to scripts.
 ///
 /// [value] The value of the block height or the 512 seconds increments
-/// [seqType] Specifies the type of sequence (TYPE_RELATIVE_TIMELOCK | TYPE_ABSOLUTE_TIMELOCK | TYPE_REPLACE_BY_FEE
-/// [isTypeBlock] If type is TYPE_RELATIVE_TIMELOCK then this specifies its type (block height or 512 secs increments)
+/// [seqType] Specifies the type of sequence (.typeRelativeTimelock | .typeAbsoluteTimelock | .typeReplaceByFee
+/// [isTypeBlock] If type is .typeRelativeTimelock then this specifies its type (block height or 512 secs increments)
 class Sequence {
   Sequence(
       {required this.seqType, required this.value, this.isTypeBlock = true}) {
-    if (seqType == BitcoinOpCodeConst.TYPE_RELATIVE_TIMELOCK &&
+    if (seqType == BitcoinOpCodeConst.typeRelativeTimelock &&
         (value < 1 || value > mask16)) {
       throw const DartBitcoinPluginException(
           'Sequence should be between 1 and 65535');
@@ -23,15 +23,15 @@ class Sequence {
 
   /// Serializes the relative sequence as required in a transaction
   List<int> forInputSequence() {
-    if (seqType == BitcoinOpCodeConst.TYPE_ABSOLUTE_TIMELOCK) {
-      return List<int>.from(BitcoinOpCodeConst.ABSOLUTE_TIMELOCK_SEQUENCE);
+    if (seqType == BitcoinOpCodeConst.typeAbsoluteTimelock) {
+      return List<int>.from(BitcoinOpCodeConst.absoluteTimelockSequence);
     }
 
-    if (seqType == BitcoinOpCodeConst.TYPE_REPLACE_BY_FEE) {
-      return List<int>.from(BitcoinOpCodeConst.REPLACE_BY_FEE_SEQUENCE);
+    if (seqType == BitcoinOpCodeConst.typeReplaceByFee) {
+      return List<int>.from(BitcoinOpCodeConst.replaceByFeeSequence);
     }
-    if (seqType == BitcoinOpCodeConst.TYPE_RELATIVE_TIMELOCK) {
-      var seq = 0;
+    if (seqType == BitcoinOpCodeConst.typeRelativeTimelock) {
+      int seq = 0;
       if (!isTypeBlock) {
         seq |= 1 << 22;
       }
@@ -44,12 +44,12 @@ class Sequence {
 
   /// Returns the appropriate integer for a script; e.g. for relative timelocks
   int forScript() {
-    if (seqType == BitcoinOpCodeConst.TYPE_REPLACE_BY_FEE) {
+    if (seqType == BitcoinOpCodeConst.typeReplaceByFee) {
       throw const DartBitcoinPluginException(
           'RBF is not to be included in a script.');
     }
     var scriptIntiger = value;
-    if (seqType == BitcoinOpCodeConst.TYPE_RELATIVE_TIMELOCK && !isTypeBlock) {
+    if (seqType == BitcoinOpCodeConst.typeRelativeTimelock && !isTypeBlock) {
       scriptIntiger |= 1 << 22;
     }
     return scriptIntiger;
diff --git a/lib/src/bitcoin/script/transaction.dart b/lib/src/bitcoin/script/transaction.dart
index c0273a0..d889868 100644
--- a/lib/src/bitcoin/script/transaction.dart
+++ b/lib/src/bitcoin/script/transaction.dart
@@ -1,7 +1,7 @@
 import 'dart:typed_data';
+import 'package:bitcoin_base/src/bitcoin/taproot/taproot.dart';
 import 'package:bitcoin_base/src/cash_token/cash_token.dart';
 import 'package:bitcoin_base/src/bitcoin/script/op_code/constant.dart';
-import 'package:bitcoin_base/src/crypto/crypto.dart';
 import 'package:bitcoin_base/src/exception/exception.dart';
 import 'package:blockchain_utils/helper/helper.dart';
 import 'package:blockchain_utils/utils/utils.dart';
@@ -17,122 +17,138 @@ import 'witness.dart';
 /// [outputs] A list of all the transaction outputs
 /// [locktime] The transaction's locktime parameter
 /// [version] The transaction version
-/// [hasSegwit] Specifies a tx that includes segwit inputs
 /// [witnesses] The witness structure that corresponds to the inputs
 class BtcTransaction {
-  BtcTransaction(
-      {required List<TxInput> inputs,
-      required List<TxOutput> outputs,
+  BtcTransaction._(
+      {List<TxInput> inputs = const [],
+      List<TxOutput> outputs = const [],
       List<TxWitnessInput> witnesses = const [],
-      this.hasSegwit = false,
-      List<int>? lock,
-      List<int>? version})
-      : locktime = lock?.immutable ?? BitcoinOpCodeConst.DEFAULT_TX_LOCKTIME,
-        version = version?.immutable ?? BitcoinOpCodeConst.DEFAULT_TX_VERSION,
+      required List<int> locktime,
+      required List<int> version})
+      : locktime = locktime.asImmutableBytes,
+        version = version.asImmutableBytes,
         inputs = inputs.immutable,
         outputs = outputs.immutable,
         witnesses = witnesses.immutable;
+  factory BtcTransaction(
+      {List<TxInput> inputs = const [],
+      List<TxOutput> outputs = const [],
+      List<TxWitnessInput> witnesses = const [],
+      List<int> locktime = BitcoinOpCodeConst.defaultTxLocktime,
+      List<int> version = BitcoinOpCodeConst.defaultTxVersion}) {
+    if (locktime.length != BitcoinOpCodeConst.locktimeLengthInBytes) {
+      throw DartBitcoinPluginException(
+          "Invalid locktime length: expected ${BitcoinOpCodeConst.locktimeLengthInBytes}, but got ${locktime.length}.");
+    }
+    if (version.length != BitcoinOpCodeConst.versionLengthInBytes) {
+      throw DartBitcoinPluginException(
+          "Invalid version length: expected ${BitcoinOpCodeConst.versionLengthInBytes}, but got ${version.length}.");
+    }
+    return BtcTransaction._(
+        inputs: inputs,
+        outputs: outputs,
+        witnesses: witnesses,
+        version: version,
+        locktime: locktime);
+  }
   final List<TxInput> inputs;
   final List<TxOutput> outputs;
   final List<int> locktime;
   final List<int> version;
-  final bool hasSegwit;
   final List<TxWitnessInput> witnesses;
 
   BtcTransaction copyWith({
     List<TxInput>? inputs,
     List<TxOutput>? outputs,
     List<TxWitnessInput>? witnesses,
-    bool? hasSegwit,
-    List<int>? lock,
+    List<int>? locktime,
     List<int>? version,
   }) {
     return BtcTransaction(
         inputs: inputs ?? this.inputs,
         outputs: outputs ?? this.outputs,
         witnesses: witnesses ?? this.witnesses,
-        hasSegwit: hasSegwit ?? this.hasSegwit,
-        lock: lock ?? locktime,
+        locktime: locktime ?? this.locktime,
         version: version ?? this.version);
   }
 
   /// creates a copy of the object (classmethod)
-  static BtcTransaction copy(BtcTransaction tx) {
+  static BtcTransaction clone(BtcTransaction tx) {
     return BtcTransaction(
-        hasSegwit: tx.hasSegwit,
-        inputs: tx.inputs.map((e) => e.copy()).toList(),
-        outputs: tx.outputs.map((e) => e.copy()).toList(),
-        witnesses: tx.witnesses.map((e) => e.copy()).toList(),
-        lock: tx.locktime,
+        inputs: tx.inputs.map((e) => e.clone()).toList(),
+        outputs: tx.outputs.map((e) => e.clone()).toList(),
+        witnesses: tx.witnesses.map((e) => e.clone()).toList(),
+        locktime: tx.locktime,
         version: tx.version);
   }
 
   /// Instantiates a Transaction from serialized raw hexadacimal data (classmethod)
-  static BtcTransaction fromRaw(String raw) {
-    final rawtx = BytesUtils.fromHexString(raw);
-    final version = rawtx.sublist(0, 4);
-    var cursor = 4;
-    List<int>? flag;
-    var hasSegwit = false;
-    if (rawtx[4] == 0) {
-      flag = List<int>.from(rawtx.sublist(5, 6));
-      if (flag[0] == 1) {
-        hasSegwit = true;
+  static BtcTransaction deserialize(List<int> txBytes,
+      {bool allowWitness = true}) {
+    try {
+      final version = txBytes.sublist(0, 4);
+      int cursor = 4;
+      bool hasWitness = false;
+      if (allowWitness && txBytes[4] == 0 && txBytes[5] == 1) {
+        hasWitness = true;
+        cursor += 2;
       }
-      cursor += 2;
-    }
-    final vi = IntUtils.decodeVarint(rawtx.sublist(cursor));
-    cursor += vi.item2;
-    final inputs = <TxInput>[];
-    for (var index = 0; index < vi.item1; index++) {
-      final inp = TxInput.deserialize(
-          bytes: rawtx, hasSegwit: hasSegwit, cursor: cursor);
-      inputs.add(inp.item1);
-      cursor = inp.item2;
-    }
-    final outputs = <TxOutput>[];
-    final viOut = IntUtils.decodeVarint(rawtx.sublist(cursor));
-    cursor += viOut.item2;
-    for (var index = 0; index < viOut.item1; index++) {
-      final inp = TxOutput.deserialize(
-          bytes: rawtx, hasSegwit: hasSegwit, cursor: cursor);
-      outputs.add(inp.item1);
-      cursor = inp.item2;
-    }
-    final witnesses = <TxWitnessInput>[];
-    if (hasSegwit) {
-      if (cursor + 4 < rawtx.length) {
-        // in this case the tx contains wintness data.
-        for (var n = 0; n < inputs.length; n++) {
-          final wVi = IntUtils.decodeVarint(rawtx.sublist(cursor));
-          cursor += wVi.item2;
-          final witnessesTmp = <String>[];
-          for (var n = 0; n < wVi.item1; n++) {
-            var witness = <int>[];
-            final wtVi = IntUtils.decodeVarint(rawtx.sublist(cursor));
-            if (wtVi.item1 != 0) {
-              witness = rawtx.sublist(
-                  cursor + wtVi.item2, cursor + wtVi.item1 + wtVi.item2);
+      final vi = IntUtils.decodeVarint(txBytes.sublist(cursor));
+      cursor += vi.item2;
+      final List<TxInput> inputs = [];
+      for (int index = 0; index < vi.item1; index++) {
+        final inp = TxInput.deserialize(bytes: txBytes, cursor: cursor);
+        inputs.add(inp.item1);
+        cursor = inp.item2;
+      }
+      final outputs = <TxOutput>[];
+      final viOut = IntUtils.decodeVarint(txBytes.sublist(cursor));
+      cursor += viOut.item2;
+      for (int index = 0; index < viOut.item1; index++) {
+        final inp = TxOutput.deserialize(bytes: txBytes, cursor: cursor);
+        outputs.add(inp.item1);
+        cursor = inp.item2;
+      }
+      final List<TxWitnessInput> witnesses = [];
+      if (hasWitness) {
+        if (cursor + 4 < txBytes.length) {
+          for (int n = 0; n < inputs.length; n++) {
+            final wVi = IntUtils.decodeVarint(txBytes.sublist(cursor));
+            cursor += wVi.item2;
+            final witnessesTmp = <String>[];
+            for (int n = 0; n < wVi.item1; n++) {
+              List<int> witness = [];
+              final wtVi = IntUtils.decodeVarint(txBytes.sublist(cursor));
+              if (wtVi.item1 != 0) {
+                witness = txBytes.sublist(
+                    cursor + wtVi.item2, cursor + wtVi.item1 + wtVi.item2);
+              }
+              cursor += wtVi.item1 + wtVi.item2;
+              witnessesTmp.add(BytesUtils.toHexString(witness));
             }
-            cursor += wtVi.item1 + wtVi.item2;
-            witnessesTmp.add(BytesUtils.toHexString(witness));
-          }
 
-          witnesses.add(TxWitnessInput(stack: witnessesTmp));
+            witnesses.add(TxWitnessInput(stack: witnessesTmp));
+          }
         }
       }
+      List<int> locktime = BitcoinOpCodeConst.defaultTxLocktime;
+      if ((txBytes.length - cursor) >= 4) {
+        locktime = txBytes.sublist(cursor, cursor + 4);
+        cursor += 4;
+      }
+      assert(txBytes.length == cursor,
+          "Transaction deserialization failed. Unexpected bytes.");
+
+      return BtcTransaction(
+          inputs: inputs,
+          outputs: outputs,
+          witnesses: witnesses,
+          version: version,
+          locktime: locktime);
+    } catch (e) {
+      throw DartBitcoinPluginException("Transaction deserialization failed.",
+          details: {"error": e.toString()});
     }
-    List<int>? lock;
-    if ((rawtx.length - cursor) >= 4) {
-      lock = rawtx.sublist(cursor, cursor + 4);
-    }
-    return BtcTransaction(
-        inputs: inputs,
-        outputs: outputs,
-        witnesses: witnesses,
-        hasSegwit: hasSegwit,
-        version: version,
-        lock: lock);
   }
 
   /// returns the transaction input's digest that is to be signed according.
@@ -143,42 +159,40 @@ class BtcTransaction {
   List<int> getTransactionDigest(
       {required int txInIndex,
       required Script script,
-      int sighash = BitcoinOpCodeConst.SIGHASH_ALL}) {
-    var tx = copy(this);
+      int sighash = BitcoinOpCodeConst.sighashAll}) {
+    BtcTransaction tx = clone(this);
     for (final i in tx.inputs) {
       i.scriptSig = Script(script: []);
     }
     tx.inputs[txInIndex].scriptSig = script;
-    if ((sighash & 0x1f) == BitcoinOpCodeConst.SIGHASH_NONE) {
+    if ((sighash & 0x1f) == BitcoinOpCodeConst.sighashNone) {
       tx = tx.copyWith(outputs: []);
-      for (var i = 0; i < tx.inputs.length; i++) {
+      for (int i = 0; i < tx.inputs.length; i++) {
         if (i != txInIndex) {
-          tx.inputs[i].sequence = BitcoinOpCodeConst.EMPTY_TX_SEQUENCE;
+          tx.inputs[i].sequence = BitcoinOpCodeConst.emptyTxSequence;
         }
       }
-    } else if ((sighash & 0x1f) == BitcoinOpCodeConst.SIGHASH_SINGLE) {
+    } else if ((sighash & 0x1f) == BitcoinOpCodeConst.sighashSingle) {
       if (txInIndex >= tx.outputs.length) {
-        throw const DartBitcoinPluginException(
-            'Transaction index is greater than the available outputs');
+        throw DartBitcoinPluginException(
+            "SIGHASH_SINGLE error: Input index $txInIndex is greater than or equal to the number of outputs (${tx.outputs.length}). This input cannot be signed.");
       }
 
-      final outputs = <TxOutput>[];
-      for (var i = 0; i < txInIndex; i++) {
-        outputs.add(TxOutput(
-            amount: BigInt.from(BitcoinOpCodeConst.NEGATIVE_SATOSHI),
-            scriptPubKey: Script(script: [])));
+      final List<TxOutput> outputs = [];
+      for (int i = 0; i < txInIndex; i++) {
+        outputs.add(TxOutput.negativeOne());
       }
       tx = tx.copyWith(outputs: [...outputs, tx.outputs[txInIndex]]);
-      for (var i = 0; i < tx.inputs.length; i++) {
+      for (int i = 0; i < tx.inputs.length; i++) {
         if (i != txInIndex) {
-          tx.inputs[i].sequence = BitcoinOpCodeConst.EMPTY_TX_SEQUENCE;
+          tx.inputs[i].sequence = BitcoinOpCodeConst.emptyTxSequence;
         }
       }
     }
-    if ((sighash & BitcoinOpCodeConst.SIGHASH_ANYONECANPAY) != 0) {
+    if ((sighash & BitcoinOpCodeConst.sighashAnyoneCanPay) != 0) {
       tx = tx.copyWith(inputs: [tx.inputs[txInIndex]]);
     }
-    var txForSign = tx.toBytes(segwit: false);
+    List<int> txForSign = tx.toBytes(allowWitness: false);
 
     txForSign = [
       ...txForSign,
@@ -188,10 +202,10 @@ class BtcTransaction {
   }
 
   /// Serializes Transaction to bytes
-  List<int> toBytes({bool segwit = false}) {
+  List<int> toBytes({bool allowWitness = true}) {
     final data = DynamicByteTracker();
     data.add(version);
-    if (segwit) {
+    if (allowWitness && witnesses.isNotEmpty) {
       data.add([0x00, 0x01]);
     }
     final txInCountBytes = IntUtils.encodeVarint(inputs.length);
@@ -205,10 +219,8 @@ class BtcTransaction {
     for (final txOut in outputs) {
       data.add(txOut.toBytes());
     }
-    if (segwit) {
+    if (allowWitness && witnesses.isNotEmpty) {
       for (final wit in witnesses) {
-        final witnessesCountBytes = List<int>.from([wit.stack.length]);
-        data.add(witnessesCountBytes);
         data.add(wit.toBytes());
       }
     }
@@ -225,18 +237,18 @@ class BtcTransaction {
   List<int> getTransactionSegwitDigit(
       {required int txInIndex,
       required Script script,
-      int sighash = BitcoinOpCodeConst.SIGHASH_ALL,
+      int sighash = BitcoinOpCodeConst.sighashAll,
       required BigInt amount,
       CashToken? token}) {
-    final tx = copy(this);
-    var hashPrevouts = List<int>.filled(32, 0);
-    var hashSequence = List<int>.filled(32, 0);
-    var hashOutputs = List<int>.filled(32, 0);
+    final tx = clone(this);
+    List<int> hashPrevouts = List<int>.filled(32, 0);
+    List<int> hashSequence = List<int>.filled(32, 0);
+    List<int> hashOutputs = List<int>.filled(32, 0);
     final basicSigHashType = sighash & 0x1F;
     final anyoneCanPay =
-        (sighash & 0xF0) == BitcoinOpCodeConst.SIGHASH_ANYONECANPAY;
-    final signAll = (basicSigHashType != BitcoinOpCodeConst.SIGHASH_SINGLE) &&
-        (basicSigHashType != BitcoinOpCodeConst.SIGHASH_NONE);
+        (sighash & 0xF0) == BitcoinOpCodeConst.sighashAnyoneCanPay;
+    final signAll = (basicSigHashType != BitcoinOpCodeConst.sighashSingle) &&
+        (basicSigHashType != BitcoinOpCodeConst.sighashNone);
     if (!anyoneCanPay) {
       hashPrevouts = <int>[];
       for (final txin in tx.inputs) {
@@ -264,7 +276,8 @@ class BtcTransaction {
         hashOutputs = [...hashOutputs, ...i.toBytes()];
       }
       hashOutputs = QuickCrypto.sha256DoubleHash(hashOutputs);
-    } else if (basicSigHashType == BitcoinOpCodeConst.SIGHASH_SINGLE &&
+    }
+    if (basicSigHashType == BitcoinOpCodeConst.sighashSingle &&
         txInIndex < tx.outputs.length) {
       final out = tx.outputs[txInIndex];
       final packedAmount =
@@ -307,33 +320,29 @@ class BtcTransaction {
   /// [txIndex] The index of the input that we wish to sign
   /// [scriptPubKeys] he scriptPubkeys that correspond to all the inputs/UTXOs
   /// [amounts] The amounts that correspond to all the inputs/UTXOs
-  /// [extFlags] Extension mechanism, default is 0; 1 is for script spending (BIP342)
-  /// [script] The script that we are spending (ext_flag=1)
-  /// [leafVar] The script version, LEAF_VERSION_TAPSCRIPT for the default tapscript
   /// [sighash] The type of the signature hash to be created
   List<int> getTransactionTaprootDigset(
       {required int txIndex,
       required List<Script> scriptPubKeys,
       required List<BigInt> amounts,
-      int extFlags = 0,
-      Script? script,
-      int leafVar = BitcoinOpCodeConst.LEAF_VERSION_TAPSCRIPT,
-      int sighash = BitcoinOpCodeConst.TAPROOT_SIGHASH_ALL}) {
-    final newTx = copy(this);
-    final sighashNone = (sighash & 0x03) == BitcoinOpCodeConst.SIGHASH_NONE;
-    final sighashSingle = (sighash & 0x03) == BitcoinOpCodeConst.SIGHASH_SINGLE;
+      List<int>? annex,
+      TaprootLeaf? tapleafScript,
+      int sighash = BitcoinOpCodeConst.sighashDefault}) {
+    final newTx = clone(this);
+    final sighashNone = (sighash & 0x03) == BitcoinOpCodeConst.sighashNone;
+    final sighashSingle = (sighash & 0x03) == BitcoinOpCodeConst.sighashSingle;
     final anyoneCanPay =
-        (sighash & 0x80) == BitcoinOpCodeConst.SIGHASH_ANYONECANPAY;
+        (sighash & 0x80) == BitcoinOpCodeConst.sighashAnyoneCanPay;
     final txForSign = DynamicByteTracker();
     txForSign.add([0]);
     txForSign.add([sighash]);
     txForSign.add(version);
     txForSign.add(locktime);
-    var hashPrevouts = <int>[];
-    var hashAmounts = <int>[];
-    var hashScriptPubkeys = <int>[];
-    var hashSequences = <int>[];
-    var hashOutputs = <int>[];
+    List<int> hashPrevouts = [];
+    List<int> hashAmounts = [];
+    List<int> hashScriptPubkeys = [];
+    List<int> hashSequences = [];
+    List<int> hashOutputs = [];
     if (!anyoneCanPay) {
       for (final txin in newTx.inputs) {
         final txidBytes = BytesUtils.fromHexString(txin.txId).reversed.toList();
@@ -378,7 +387,10 @@ class BtcTransaction {
       txForSign.add(hashOutputs);
     }
 
-    final spendType = extFlags * 2 + 0;
+    int spendType = tapleafScript == null ? 0 : 2;
+    if (annex != null) {
+      spendType += 1;
+    }
     txForSign.add([spendType]);
 
     if (anyoneCanPay) {
@@ -400,7 +412,13 @@ class BtcTransaction {
           IntUtils.toBytes(txIndex, length: 4, byteOrder: Endian.little);
       txForSign.add(indexBytes);
     }
-    if (sighashSingle) {
+    if (annex != null) {
+      final annexBytes = IntUtils.prependVarint(annex);
+      txForSign.add(QuickCrypto.sha256Hash(annexBytes));
+    }
+
+    ///
+    if (sighashSingle && txIndex < newTx.outputs.length) {
       final txOut = newTx.outputs[txIndex];
       final packedAmount =
           BigintUtils.toBytes(txOut.amount, length: 8, order: Endian.little);
@@ -408,22 +426,18 @@ class BtcTransaction {
       final hashOut = [...packedAmount, ...scriptBytes];
       txForSign.add(QuickCrypto.sha256Hash(hashOut));
     }
-    if (extFlags == 1) {
-      final leafVarBytes = [
-        leafVar,
-        ...IntUtils.prependVarint(script?.toBytes() ?? <int>[])
-      ];
-      txForSign.add(taggedHash(leafVarBytes, 'TapLeaf'));
+    if (tapleafScript != null) {
+      txForSign.add(tapleafScript.hash());
       txForSign.add([0]);
       txForSign.add(List<int>.filled(4, mask8));
     }
     final bytes = txForSign.toBytes();
-    return taggedHash(bytes, 'TapSighash');
+    return TaprootUtils.tapSigTaggedHash(bytes);
   }
 
   /// converts result of to_bytes to hexadecimal string
-  String toHex() {
-    final bytes = toBytes(segwit: hasSegwit);
+  String toHex({bool allowWitness = true}) {
+    final bytes = toBytes(allowWitness: allowWitness);
     return BytesUtils.toHexString(bytes);
   }
 
@@ -433,20 +447,19 @@ class BtcTransaction {
   }
 
   /// Calculates the tx size
-  int getSize() {
-    return toBytes(segwit: hasSegwit).length;
+  int getSize({bool allowWitness = true}) {
+    return toBytes(allowWitness: allowWitness).length;
   }
 
+  bool get hasWitness => witnesses.isNotEmpty;
+
   /// Calculates the tx segwit size
-  int getVSize() {
-    if (!hasSegwit) return getSize();
+  int getVSize({bool allowWitness = true}) {
+    if (!allowWitness || witnesses.isEmpty) return getSize();
     const markerSize = 2;
-    var witSize = 0;
-    var data = <int>[];
-    for (final w in witnesses) {
-      final countBytes = List<int>.from([w.stack.length]);
-      data = List<int>.from([...data, ...countBytes, ...w.toBytes()]);
-    }
+    int witSize = 0;
+    List<int> data =
+        witnesses.map((e) => e.toBytes()).expand((e) => e).toList();
     witSize = data.length;
     final size = getSize() - (markerSize + witSize);
     final vSize = size + (markerSize + witSize) / 4;
@@ -455,7 +468,7 @@ class BtcTransaction {
 
   /// Calculates txid and returns it
   String txId() {
-    final bytes = toBytes(segwit: false);
+    final bytes = toBytes(allowWitness: false);
     final reversedHash = QuickCrypto.sha256DoubleHash(bytes).reversed.toList();
     return BytesUtils.toHexString(reversedHash);
   }
@@ -466,12 +479,12 @@ class BtcTransaction {
       'outputs': outputs.map((e) => e.toJson()).toList(),
       'locktime': BytesUtils.toHexString(locktime),
       'version': BytesUtils.toHexString(version),
-      'witnesses': witnesses.map((e) => e.toJson()).toList()
+      'witnesses': witnesses.map((e) => e.toJson()).toList(),
     };
   }
 
   @override
   String toString() {
-    return "BtcTransaction{inputs: ${inputs.join(", ")}, outputs: ${outputs.join(", ")}, locktime: ${BytesUtils.toHexString(locktime)}}, version: ${BytesUtils.toHexString(version)}, hasSegwit: $hasSegwit, witnesses:${witnesses.join(",")} ";
+    return "BtcTransaction{inputs: ${inputs.join(", ")}, outputs: ${outputs.join(", ")}, locktime: ${BytesUtils.toHexString(locktime)}}, version: ${BytesUtils.toHexString(version)}, witnesses:${witnesses.join(",")} ";
   }
 }
diff --git a/lib/src/bitcoin/script/utils.dart b/lib/src/bitcoin/script/utils.dart
new file mode 100644
index 0000000..72f6ca6
--- /dev/null
+++ b/lib/src/bitcoin/script/utils.dart
@@ -0,0 +1,386 @@
+import 'dart:typed_data';
+import 'package:bitcoin_base/src/bitcoin/address/address.dart';
+import 'package:bitcoin_base/src/bitcoin/script/op_code/constant.dart';
+import 'package:bitcoin_base/src/bitcoin/script/script.dart';
+import 'package:bitcoin_base/src/exception/exception.dart';
+import 'package:bitcoin_base/src/provider/models/models.dart';
+import 'package:blockchain_utils/blockchain_utils.dart';
+
+enum ScriptPubKeyType {
+  p2pk("P2PK"),
+  p2pkh("P2PKH"),
+  p2sh("P2SH"),
+  p2sh32("P2SH32"),
+  p2wpkh("P2WPKH"),
+  p2tr("P2TR"),
+  p2wsh("P2WSH");
+
+  final String name;
+  const ScriptPubKeyType(this.name);
+  bool get isSegwit =>
+      this == ScriptPubKeyType.p2wpkh ||
+      this == ScriptPubKeyType.p2wsh ||
+      this == ScriptPubKeyType.p2tr;
+  bool get isP2tr => this == ScriptPubKeyType.p2tr;
+  bool get isP2sh => this == ScriptPubKeyType.p2sh;
+  bool get isP2sh32 => this == ScriptPubKeyType.p2sh32;
+}
+
+class BitcoinScriptUtils {
+  static bool scriptContains(
+      {required Script script, required List<dynamic> elements}) {
+    if (elements.length != script.script.length) return false;
+    for (int i = 0; i < script.script.length; i++) {
+      final element = elements[i];
+      if (element != null) {
+        if (script.script[i] != element) {
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+
+  static bool isP2pkh(Script script) {
+    if (scriptContains(script: script, elements: [
+      'OP_DUP',
+      'OP_HASH160',
+      null,
+      'OP_EQUALVERIFY',
+      'OP_CHECKSIG'
+    ])) {
+      final addressProgram = script.script[2];
+      return (addressProgram is String && addressProgram.length == 40);
+    }
+    return false;
+  }
+
+  static bool isP2sh(Script script) {
+    if (scriptContains(
+        script: script, elements: ['OP_HASH160', null, 'OP_EQUAL'])) {
+      final pubKeyBytes = BytesUtils.tryFromHexString(script.script[1]);
+      return pubKeyBytes?.length == P2shAddressType.p2pkInP2sh.hashLength;
+    }
+    return false;
+  }
+
+  static bool isP2sh32(Script script) {
+    if (scriptContains(
+        script: script, elements: ['OP_HASH256', null, 'OP_EQUAL'])) {
+      final pubKeyBytes = BytesUtils.tryFromHexString(script.script[1]);
+      return pubKeyBytes?.length == P2shAddressType.p2pkhInP2sh32.hashLength;
+    }
+    return false;
+  }
+
+  static bool isP2pk(Script script) {
+    if (scriptContains(script: script, elements: [null, "OP_CHECKSIG"])) {
+      final pubKeyBytes = BytesUtils.tryFromHexString(script.script[0]);
+      return pubKeyBytes?.length == EcdsaKeysConst.pubKeyCompressedByteLen ||
+          pubKeyBytes?.length == EcdsaKeysConst.pubKeyUncompressedByteLen;
+    }
+    return false;
+  }
+
+  static bool isP2tr(Script script) {
+    if (scriptContains(script: script, elements: ['OP_1', null])) {
+      final pubKeyBytes = BytesUtils.tryFromHexString(script.script[1]);
+      return pubKeyBytes?.length == SegwitAddressType.p2tr.hashLength;
+    }
+    return false;
+  }
+
+  static bool isP2wpkh(Script script) {
+    if (scriptContains(script: script, elements: ['OP_0', null])) {
+      final pubKeyBytes = BytesUtils.tryFromHexString(script.script[1]);
+      return pubKeyBytes?.length == SegwitAddressType.p2wpkh.hashLength;
+    }
+    return false;
+  }
+
+  static bool isRipemd160(Script script) {
+    if (scriptContains(
+        script: script, elements: ['OP_RIPEMD160', null, "OP_EQUAL"])) {
+      final toBytes = BytesUtils.tryFromHexString(script.script[1]);
+      return toBytes?.length == QuickCrypto.hash160DigestSize;
+    }
+    return false;
+  }
+
+  static bool isSha256(Script script) {
+    if (scriptContains(
+        script: script, elements: ['OP_SHA256', null, "OP_EQUAL"])) {
+      final toBytes = BytesUtils.tryFromHexString(script.script[1]);
+      return toBytes?.length == QuickCrypto.sha256DigestSize;
+    }
+    return false;
+  }
+
+  static bool isHash256(Script script) {
+    if (scriptContains(
+        script: script, elements: ['OP_HASH256', null, "OP_EQUAL"])) {
+      final toBytes = BytesUtils.tryFromHexString(script.script[1]);
+      return toBytes?.length == QuickCrypto.sha256DigestSize;
+    }
+    return false;
+  }
+
+  static bool isHash160(Script script) {
+    if (scriptContains(
+        script: script, elements: ['OP_HASH160', null, "OP_EQUAL"])) {
+      final toBytes = BytesUtils.tryFromHexString(script.script[1]);
+      return toBytes?.length == QuickCrypto.hash160DigestSize;
+    }
+    return false;
+  }
+
+  static bool isP2wsh(Script script) {
+    if (scriptContains(script: script, elements: ['OP_0', null])) {
+      final pubKeyBytes = BytesUtils.tryFromHexString(script.script[1]);
+      return pubKeyBytes?.length == SegwitAddressType.p2wsh.hashLength;
+    }
+    return false;
+  }
+
+  static bool isXOnlyOpChecksig(Script script) {
+    if (scriptContains(script: script, elements: [null, "OP_CHECKSIG"])) {
+      final xOnlyKey = BytesUtils.tryFromHexString(script.script[0]);
+      return xOnlyKey?.length == EcdsaKeysConst.pointCoordByteLen;
+    }
+    return false;
+  }
+
+  static ScriptPubKeyType? findScriptType(Script script) {
+    if (isP2pkh(script)) {
+      return ScriptPubKeyType.p2pkh;
+    } else if (isP2sh(script)) {
+      return ScriptPubKeyType.p2sh;
+    } else if (isP2sh32(script)) {
+      return ScriptPubKeyType.p2sh32;
+    } else if (isP2pk(script)) {
+      return ScriptPubKeyType.p2pk;
+    } else if (isP2tr(script)) {
+      return ScriptPubKeyType.p2tr;
+    } else if (isP2wsh(script)) {
+      return ScriptPubKeyType.p2wsh;
+    } else if (isP2wpkh(script)) {
+      return ScriptPubKeyType.p2wpkh;
+    }
+    return null;
+  }
+
+  static bool isOpReturn(Script script) {
+    return script.script.isNotEmpty &&
+        script.script[0] == BitcoinOpCodeConst.opReturn;
+  }
+
+  static bool isOpTrue(Script script) {
+    return script.script.length == 1 &&
+        BitcoinOpcode.findByName(script.script[0])?.value ==
+            BitcoinOpcode.opTrue.value;
+  }
+
+  static bool isPubKeyOpCheckSig(Script script) {
+    if (scriptContains(script: script, elements: [null, "OP_CHECKSIG"])) {
+      final pubKeyBytes = BytesUtils.tryFromHexString(script.script[0]);
+      return pubKeyBytes?.length == EcdsaKeysConst.pubKeyCompressedByteLen ||
+          pubKeyBytes?.length == EcdsaKeysConst.pubKeyUncompressedByteLen;
+    }
+    return false;
+  }
+
+  static bool hasOpCheckSig(Script script) {
+    return script.script.contains(BitcoinOpcode.opCheckSig.name);
+  }
+
+  static bool hasOpCheckSigAdd(Script script) {
+    return script.script.contains(BitcoinOpcode.opCheckSigAdd.name);
+  }
+
+  static bool hasOpCheckMultisig(Script script) {
+    return script.script.contains(BitcoinOpcode.opCheckMultiSig.name);
+  }
+
+  static bool hasOpCheckMultiSigVerify(Script scriot) {
+    return scriot.script.contains(BitcoinOpcode.opCheckMultiSigVerify.name);
+  }
+
+  static bool hasAnyOpCheckSig(Script script) {
+    if (hasOpCheckSig(script) ||
+        hasOpCheckMultisig(script) ||
+        hasOpCheckSigAdd(script) ||
+        hasOpCheckMultiSigVerify(script)) {
+      return true;
+    }
+    return false;
+  }
+
+  static int? decodeOpN(String opcode) {
+    if (!opcode.startsWith("OP_")) return null;
+    int n = int.tryParse(opcode.replaceFirst("OP_", '')) ?? -1;
+    if (n < 0 || n > 16) return null;
+    return n;
+  }
+
+  static bool isMultisigScript(Script script) {
+    final opCodes = script.script;
+    if (opCodes.length < 4) return false;
+    if (opCodes.last != 'OP_CHECKMULTISIG' &&
+        opCodes.last != "OP_CHECKMULTISIGVERIFY") {
+      return false;
+    }
+    final int? threshold = decodeOpN(opCodes.first.toString());
+    final int? total = decodeOpN(opCodes[opCodes.length - 2].toString());
+    if (threshold == null || total == null) {
+      return false;
+    }
+    if (threshold > total) return false;
+    int pubkeyCount = opCodes.length - 3;
+    if (pubkeyCount != total) return false;
+
+    return true;
+  }
+
+  static MultiSignatureAddress? parseMultisigScript(Script script) {
+    final opCodes = script.script;
+    if (opCodes.length < 4) return null;
+    if (opCodes.last != 'OP_CHECKMULTISIG' &&
+        opCodes.last != "OP_CHECKMULTISIGVERIFY") {
+      return null;
+    }
+    final int? threshold = decodeOpN(opCodes.first.toString());
+    final int? total = decodeOpN(opCodes[opCodes.length - 2].toString());
+    if (threshold == null || total == null) {
+      return null;
+    }
+    try {
+      List<MultiSignatureSigner> signers = [];
+      final pubKeys = opCodes.sublist(1, opCodes.length - 2);
+      int i = 0;
+      while (i < pubKeys.length) {
+        int weight = 1;
+        final pubkey = pubKeys[i];
+        for (int j = i + 1; j < pubKeys.length; j++) {
+          if (pubKeys[j] == pubkey) {
+            weight++;
+            continue;
+          }
+          break;
+        }
+        i += weight;
+        signers.add(MultiSignatureSigner(publicKey: pubkey, weight: weight));
+      }
+      final sumWeight = signers.fold<int>(0, (p, c) => p + c.weight);
+      if (sumWeight != total) {
+        return null;
+      }
+      if (sumWeight < threshold) return null;
+      return MultiSignatureAddress(threshold: threshold, signers: signers);
+    } catch (_) {
+      return null;
+    }
+  }
+
+  static P2trMultiSignatureAddress? isP2trMultiScript(Script script) {
+    final opCodes = script.script;
+    if (opCodes.length < 4) return null;
+    if (opCodes.last != 'OP_NUMEQUAL') return null;
+    final int? threshold = decodeOpN(opCodes[opCodes.length - 2].toString());
+    if (threshold == null || threshold > 15) {
+      return null;
+    }
+    try {
+      List<P2trMultiSignatureSigner> signers = [];
+      final xOnlyKeys = opCodes.sublist(0, opCodes.length - 2).cast<String>();
+      int i = 0;
+      while (i < xOnlyKeys.length) {
+        int weight = 1;
+        final xOnly = xOnlyKeys[i];
+        for (int j = i + 2; j < xOnlyKeys.length; j += 2) {
+          if (xOnlyKeys[j] == xOnly) {
+            weight++;
+            continue;
+          }
+          break;
+        }
+        i += weight * 2;
+        signers.add(P2trMultiSignatureSigner(xOnly: xOnly, weight: weight));
+      }
+      final sumWeight = signers.fold<int>(0, (p, c) => p + c.weight);
+
+      if (sumWeight < threshold) return null;
+      return P2trMultiSignatureAddress(threshold: threshold, signers: signers);
+    } catch (_) {
+      return null;
+    }
+  }
+
+  static BitcoinBaseAddress findAddressFromScriptPubKey(Script script) {
+    if (BitcoinScriptUtils.isP2wpkh(script)) {
+      return P2wpkhAddress.fromProgram(program: script.script[1]);
+    }
+    if (BitcoinScriptUtils.isP2pkh(script)) {
+      return P2pkhAddress.fromHash160(addrHash: script.script[2]);
+    }
+    if (BitcoinScriptUtils.isP2pk(script)) {
+      return P2pkAddress(publicKey: script.script[0]);
+    }
+    if (BitcoinScriptUtils.isP2sh(script)) {
+      return P2shAddress.fromHash160(addrHash: script.script[1]);
+    }
+    if (BitcoinScriptUtils.isP2sh32(script)) {
+      return P2shAddress.fromHash160(
+          addrHash: script.script[1], type: P2shAddressType.p2pkInP2sh32);
+    }
+    if (BitcoinScriptUtils.isP2wsh(script)) {
+      return P2wshAddress.fromProgram(program: script.script[1]);
+    }
+    if (BitcoinScriptUtils.isP2tr(script)) {
+      return P2trAddress.fromProgram(program: script.script[1]);
+    }
+    throw DartBitcoinPluginException(
+        "Unable to create address. Unknow scriptPubKey ${script.script}");
+  }
+
+  static List<int> opPushData(List<int> dataBytes) {
+    if (dataBytes.length < BitcoinOpCodeConst.opPushData1) {
+      return [dataBytes.length, ...dataBytes];
+    } else if (dataBytes.length < mask8) {
+      return [BitcoinOpCodeConst.opPushData1, dataBytes.length, ...dataBytes];
+    } else if (dataBytes.length < mask16) {
+      final lengthBytes = IntUtils.toBytes(dataBytes.length,
+          length: 2, byteOrder: Endian.little);
+      return [BitcoinOpCodeConst.opPushData2, ...lengthBytes, ...dataBytes];
+    } else if (dataBytes.length < mask32) {
+      final lengthBytes = IntUtils.toBytes(dataBytes.length,
+          length: 4, byteOrder: Endian.little);
+      return [BitcoinOpCodeConst.opPushData4, ...lengthBytes, ...dataBytes];
+    } else {
+      throw const DartBitcoinPluginException(
+          'Data too large. Cannot push into script');
+    }
+  }
+
+  static List<int> pushInteger(int integer) {
+    if (integer < 0) {
+      throw const DartBitcoinPluginException(
+          'Integer is currently required to be positive.');
+    }
+
+    /// Calculate the number of bytes required to represent the integer
+    final numberOfBytes = (integer.bitLength + 7) ~/ 8;
+
+    /// Convert to little-endian bytes
+    List<int> integerBytes = List<int>.filled(numberOfBytes, 0);
+    for (var i = 0; i < numberOfBytes; i++) {
+      integerBytes[i] = (integer >> (i * 8)) & mask8;
+    }
+
+    /// If the last bit is set, add a sign byte to signify a positive integer
+    if ((integer & (1 << (numberOfBytes * 8 - 1))) != 0) {
+      integerBytes = List<int>.from([...integerBytes, 0x00]);
+    }
+    final data = opPushData(integerBytes);
+    return data;
+  }
+}
diff --git a/lib/src/bitcoin/script/witness.dart b/lib/src/bitcoin/script/witness.dart
index 47c29c0..1de84ba 100644
--- a/lib/src/bitcoin/script/witness.dart
+++ b/lib/src/bitcoin/script/witness.dart
@@ -9,20 +9,40 @@ class TxWitnessInput {
   final List<String> stack;
 
   /// creates a copy of the object (classmethod)
-  TxWitnessInput copy() {
+  TxWitnessInput clone() {
+    return TxWitnessInput(stack: stack);
+  }
+
+  factory TxWitnessInput.deserialize(List<int> bytes) {
+    final length = IntUtils.decodeVarint(bytes);
+    int offset = length.item2;
+    final List<String> stack = [];
+    for (int n = 0; n < length.item1; n++) {
+      List<int> witness = [];
+      final itemLen = IntUtils.decodeVarint(bytes.sublist(offset));
+      offset += itemLen.item2;
+      if (itemLen.item1 != 0) {
+        witness = bytes.sublist(offset, offset + itemLen.item1);
+      }
+      offset += itemLen.item1;
+      stack.add(BytesUtils.toHexString(witness));
+    }
+
     return TxWitnessInput(stack: stack);
   }
 
   /// returns a serialized byte version of the witness items list
   List<int> toBytes() {
-    var stackBytes = <int>[];
-
+    final bytes = DynamicByteTracker();
+    final length = IntUtils.encodeVarint(stack.length);
+    bytes.add(length);
     for (final item in stack) {
-      final itemBytes = IntUtils.prependVarint(BytesUtils.fromHexString(item));
-      stackBytes = [...stackBytes, ...itemBytes];
+      final itemBytes = BytesUtils.fromHexString(item);
+      final varint = IntUtils.prependVarint(itemBytes);
+      bytes.add(varint);
     }
 
-    return stackBytes;
+    return bytes.toBytes();
   }
 
   Map<String, dynamic> toJson() {
diff --git a/lib/src/bitcoin/taproot/constants/constants.dart b/lib/src/bitcoin/taproot/constants/constants.dart
new file mode 100644
index 0000000..161d4f5
--- /dev/null
+++ b/lib/src/bitcoin/taproot/constants/constants.dart
@@ -0,0 +1,139 @@
+class TaprootConst {
+  static const List<int> tapBranchHashDomain = [
+    25,
+    65,
+    161,
+    242,
+    229,
+    110,
+    185,
+    95,
+    162,
+    169,
+    241,
+    148,
+    190,
+    92,
+    1,
+    247,
+    33,
+    111,
+    51,
+    237,
+    130,
+    176,
+    145,
+    70,
+    52,
+    144,
+    208,
+    91,
+    245,
+    22,
+    160,
+    21
+  ];
+  static const List<int> tapTweakHashDomain = [
+    232,
+    15,
+    225,
+    99,
+    156,
+    156,
+    160,
+    80,
+    227,
+    175,
+    27,
+    57,
+    193,
+    67,
+    198,
+    62,
+    66,
+    156,
+    188,
+    235,
+    21,
+    217,
+    64,
+    251,
+    181,
+    197,
+    161,
+    244,
+    175,
+    87,
+    197,
+    233
+  ];
+  static const List<int> tapLeafHashDomain = [
+    174,
+    234,
+    143,
+    220,
+    66,
+    8,
+    152,
+    49,
+    5,
+    115,
+    75,
+    88,
+    8,
+    29,
+    30,
+    38,
+    56,
+    211,
+    95,
+    28,
+    181,
+    64,
+    8,
+    212,
+    211,
+    87,
+    202,
+    3,
+    190,
+    120,
+    233,
+    238
+  ];
+
+  static const List<int> tapSigHshDomain = [
+    244,
+    10,
+    72,
+    223,
+    75,
+    42,
+    112,
+    200,
+    180,
+    146,
+    75,
+    242,
+    101,
+    70,
+    97,
+    237,
+    61,
+    149,
+    253,
+    102,
+    163,
+    19,
+    235,
+    135,
+    35,
+    117,
+    151,
+    198,
+    40,
+    228,
+    160,
+    49
+  ];
+}
diff --git a/lib/src/bitcoin/taproot/taproot.dart b/lib/src/bitcoin/taproot/taproot.dart
new file mode 100644
index 0000000..9547307
--- /dev/null
+++ b/lib/src/bitcoin/taproot/taproot.dart
@@ -0,0 +1,2 @@
+export 'types/types.dart';
+export 'utils/utils.dart';
diff --git a/lib/src/bitcoin/taproot/types/types.dart b/lib/src/bitcoin/taproot/types/types.dart
new file mode 100644
index 0000000..51d3e48
--- /dev/null
+++ b/lib/src/bitcoin/taproot/types/types.dart
@@ -0,0 +1,226 @@
+import 'package:bitcoin_base/src/bitcoin/script/scripts.dart';
+import 'package:bitcoin_base/src/bitcoin/taproot/utils/utils.dart';
+import 'package:bitcoin_base/src/crypto/crypto.dart';
+import 'package:bitcoin_base/src/exception/exception.dart';
+import 'package:blockchain_utils/blockchain_utils.dart';
+
+/// Abstract class representing a Taproot tree structure (leaf or branch).
+abstract class TaprootTree {
+  const TaprootTree();
+  List<int> hash();
+  String toHex() {
+    return BytesUtils.toHexString(hash());
+  }
+
+  T cast<T extends TaprootTree>() {
+    if (this is! T) {
+      throw DartBitcoinPluginException(
+          "Invalid cast: expected ${T.runtimeType}, but found $runtimeType.",
+          details: {"expected": "$T", "type": runtimeType.toString()});
+    }
+    return this as T;
+  }
+
+  Map<String, dynamic> toJson();
+  factory TaprootTree.fromJson(Map<String, dynamic> json) {
+    if (json.containsKey("a")) {
+      return TaprootBranch.fromJson(json);
+    }
+    return TaprootLeaf.fromJson(json);
+  }
+}
+
+/// Represents a Taproot script leaf node (a script inside a Taproot tree).
+class TaprootLeaf extends TaprootTree {
+  final Script script;
+  final int leafVersion;
+  final List<int> _hash;
+
+  factory TaprootLeaf.fromJson(Map<String, dynamic> json) {
+    return TaprootLeaf(
+        script: Script.fromJson(json["script"]),
+        leafVersion: IntUtils.parse(json["leaf_version"]));
+  }
+  TaprootLeaf(
+      {required this.script,
+      this.leafVersion = BitcoinOpCodeConst.leafVersionTapscript})
+      : _hash = TaprootUtils.tapleafTaggedHash(
+                script: script, leafVersion: leafVersion)
+            .asImmutableBytes;
+  @override
+  Map<String, dynamic> toJson() {
+    return {
+      "script": script.toJson(),
+      "leaf_version": leafVersion,
+    };
+  }
+
+  @override
+  List<int> hash() {
+    return _hash.clone();
+  }
+
+  @override
+  operator ==(other) {
+    if (identical(this, other)) return true;
+    if (other is TaprootLeaf && BytesUtils.bytesEqual(_hash, other._hash)) {
+      return true;
+    }
+    return false;
+  }
+
+  @override
+  int get hashCode => HashCodeGenerator.generateBytesHashCode(_hash);
+}
+
+/// Represents an internal node (Merkle branch) in the Taproot tree.
+class TaprootBranch extends TaprootTree {
+  final List<int> _branch;
+  final TaprootTree a;
+  final TaprootTree b;
+
+  TaprootBranch._({required this.a, required this.b, required List<int> branch})
+      : _branch = branch.asImmutableBytes;
+  factory TaprootBranch({required TaprootTree a, required TaprootTree b}) {
+    final aHash = a.hash();
+    final bHash = b.hash();
+    final branch = TaprootUtils.tapbranchTaggedHash(aHash, bHash);
+    if (BytesUtils.isLessThanBytes(aHash, bHash)) {
+      return TaprootBranch._(a: a, b: b, branch: branch);
+    }
+    return TaprootBranch._(a: b, b: a, branch: branch);
+  }
+  factory TaprootBranch.fromJson(Map<String, dynamic> json) {
+    return TaprootBranch(
+        a: TaprootTree.fromJson(json["a"]), b: TaprootTree.fromJson(json["b"]));
+  }
+  @override
+  Map<String, dynamic> toJson() {
+    return {"a": a.toJson(), "b": b.toJson()};
+  }
+
+  @override
+  List<int> hash() {
+    return _branch.clone();
+  }
+
+  @override
+  operator ==(other) {
+    if (identical(this, other)) return true;
+    if (other is TaprootBranch &&
+        BytesUtils.bytesEqual(_branch, other._branch)) {
+      return true;
+    }
+    return false;
+  }
+
+  @override
+  int get hashCode => HashCodeGenerator.generateBytesHashCode(_branch);
+}
+
+class TaprootControlBlock {
+  TaprootControlBlock._(
+      {required List<int> xOnly,
+      required List<int> merklePath,
+      required this.leafVersion})
+      : merklePath = merklePath.asImmutableBytes,
+        xOnly = xOnly.asImmutableBytes;
+  factory TaprootControlBlock(
+      {required List<int> xOnly,
+      required int leafVersion,
+      List<int>? merklePath}) {
+    if (merklePath != null &&
+        merklePath.isNotEmpty &&
+        (merklePath.length % QuickCrypto.sha256DigestSize != 0)) {
+      throw DartBitcoinPluginException(
+          "Invalid Merkle path: Length (${merklePath.length}) is not a multiple of ${QuickCrypto.sha256DigestSize} bytes.");
+    }
+    if (xOnly.length != EcdsaKeysConst.pointCoordByteLen) {
+      throw DartBitcoinPluginException(
+          "Invalid x-only public key length: Expected ${EcdsaKeysConst.pointCoordByteLen} bytes, got ${xOnly.length} bytes.");
+    }
+    return TaprootControlBlock._(
+        xOnly: xOnly, merklePath: merklePath ?? [], leafVersion: leafVersion);
+  }
+  factory TaprootControlBlock.generate(
+      {required List<int> xOnlyOrInternalPubKey,
+      required TaprootLeaf leafScript,
+      required TaprootTree scriptTree}) {
+    final proof = TaprootUtils.generateMerkleProof(
+        scriptTree: scriptTree, leafScript: leafScript);
+    if (proof == null) {
+      throw DartBitcoinPluginException(
+          "Leaf script not found in the provided Taproot script tree.");
+    }
+    List<int> xOnly;
+    if (xOnlyOrInternalPubKey.length == EcdsaKeysConst.pointCoordByteLen) {
+      xOnly = xOnlyOrInternalPubKey;
+    } else {
+      try {
+        xOnly = ECPublic.fromBytes(xOnlyOrInternalPubKey).toXOnly();
+      } catch (_) {
+        throw DartBitcoinPluginException(
+            "Invalid xOnlyOrInternalPubKey: It must be a valid x-only or secp256k1 public key.");
+      }
+    }
+    final keyBytes =
+        TaprootUtils.tweakPublicKey(xOnly, treeScript: scriptTree).toBytes();
+    final parity = keyBytes[0] & 1;
+    final leafVersion = leafScript.leafVersion | parity;
+    return TaprootControlBlock(
+        xOnly: xOnly, merklePath: proof, leafVersion: leafVersion);
+  }
+
+  factory TaprootControlBlock.deserialize(List<int> bytes) {
+    if (bytes.length < EcdsaKeysConst.pubKeyCompressedByteLen) {
+      throw DartBitcoinPluginException("Invalid control block bytes length.");
+    }
+    final path = bytes.sublist(EcdsaKeysConst.pubKeyCompressedByteLen);
+    if (path.length % QuickCrypto.sha256DigestSize != 0) {
+      throw DartBitcoinPluginException(
+          "Invalid control block: too short (must be at least 33 bytes, got ${bytes.length})");
+    }
+    return TaprootControlBlock(
+        xOnly: bytes.sublist(1, EcdsaKeysConst.pubKeyCompressedByteLen),
+        leafVersion: bytes[0],
+        merklePath: path);
+  }
+
+  final List<int> xOnly;
+  final List<int> merklePath;
+  final int leafVersion;
+
+  List<int> toBytes() {
+    return [leafVersion, ...xOnly, ...merklePath];
+  }
+
+  String toHex() {
+    return BytesUtils.toHexString(toBytes());
+  }
+}
+
+class TapLeafMerkleProof {
+  final TaprootLeaf script;
+  final TaprootControlBlock controlBlock;
+  const TapLeafMerkleProof({required this.script, required this.controlBlock});
+  factory TapLeafMerkleProof.generate(
+      {required List<int> xOnlyOrInternalPubKey,
+      required TaprootLeaf leafScript,
+      required TaprootTree scriptTree}) {
+    return TapLeafMerkleProof(
+        script: leafScript,
+        controlBlock: TaprootControlBlock.generate(
+            xOnlyOrInternalPubKey: xOnlyOrInternalPubKey,
+            leafScript: leafScript,
+            scriptTree: scriptTree));
+  }
+  factory TapLeafMerkleProof.fromJson(Map<String, dynamic> json) {
+    return TapLeafMerkleProof(
+        script: TaprootLeaf.fromJson(json['script']),
+        controlBlock: TaprootControlBlock.deserialize(
+            BytesUtils.fromHexString(json["control_block"])));
+  }
+  Map<String, dynamic> toJson() {
+    return {"script": script.toJson(), "control_block": controlBlock.toHex()};
+  }
+}
diff --git a/lib/src/bitcoin/taproot/utils/utils.dart b/lib/src/bitcoin/taproot/utils/utils.dart
new file mode 100644
index 0000000..2e05424
--- /dev/null
+++ b/lib/src/bitcoin/taproot/utils/utils.dart
@@ -0,0 +1,192 @@
+import 'dart:typed_data';
+
+import 'package:bitcoin_base/src/bitcoin/script/op_code/constant.dart';
+import 'package:bitcoin_base/src/bitcoin/script/script.dart';
+import 'package:bitcoin_base/src/bitcoin/taproot/constants/constants.dart';
+import 'package:bitcoin_base/src/bitcoin/taproot/types/types.dart';
+import 'package:bitcoin_base/src/crypto/keypair/ec_public.dart';
+import 'package:bitcoin_base/src/exception/exception.dart';
+import 'package:blockchain_utils/blockchain_utils.dart';
+
+class TaprootUtils {
+  static List<int> taggedHash(List<int> data, List<int> tagDigest) {
+    return QuickCrypto.sha256Hash([...tagDigest, ...tagDigest, ...data]);
+  }
+
+  static List<int> tapLeafTaggedHash(List<int> data) {
+    return taggedHash(data, TaprootConst.tapLeafHashDomain);
+  }
+
+  static List<int> tapSigTaggedHash(List<int> data) {
+    return taggedHash(data, TaprootConst.tapSigHshDomain);
+  }
+
+  static List<int> tapTweakTaggedHash(List<int> data) {
+    return taggedHash(data, TaprootConst.tapTweakHashDomain);
+  }
+
+  static List<int> tapleafTaggedHash(
+      {required Script script,
+      int leafVersion = BitcoinOpCodeConst.leafVersionTapscript}) {
+    final leafVarBytes = [
+      leafVersion,
+      ...IntUtils.prependVarint(script.toBytes())
+    ];
+    return tapLeafTaggedHash(leafVarBytes);
+  }
+
+  static List<int> tapbranchTaggedHash(List<int> a, List<int> b) {
+    if (BytesUtils.isLessThanBytes(a, b)) {
+      return taggedHash([...a, ...b], TaprootConst.tapBranchHashDomain);
+    }
+    return taggedHash([...b, ...a], TaprootConst.tapBranchHashDomain);
+  }
+
+  static List<int>? generateMerkleProof(
+      {required TaprootTree scriptTree, required TaprootLeaf leafScript}) {
+    if (scriptTree == leafScript) return [];
+    if (scriptTree is TaprootLeaf) {
+      return null;
+    }
+    final branch = scriptTree.cast<TaprootBranch>();
+    final a = generateMerkleProof(scriptTree: branch.a, leafScript: leafScript);
+    if (a != null) {
+      return [...a, ...branch.b.hash()];
+    }
+    final b = generateMerkleProof(scriptTree: branch.b, leafScript: leafScript);
+    if (b != null) {
+      return [...b, ...branch.a.hash()];
+    }
+    return null;
+  }
+
+  static ProjectiveECCPoint tweakPublicKey(List<int> pubKey,
+      {TaprootTree? treeScript, List<int>? merkleRoot}) {
+    if (merkleRoot != null && merkleRoot.length != 32) {
+      throw DartBitcoinPluginException(
+          "Invalid Merkle root: must be exactly 32 bytes.",
+          details: {
+            "length": merkleRoot.length,
+          });
+    }
+    List<int>? xKey = pubKey.clone();
+    if (xKey.length == EcdsaKeysConst.pubKeyCompressedByteLen) {
+      xKey = xKey.sublist(1);
+    }
+
+    final tweak =
+        calculateTweek(xKey, treeScript: treeScript, merkleRoot: merkleRoot);
+    return tweakInternalKey(xKey, tweak);
+  }
+
+  static List<int> calculateTweek(List<int> xKey,
+      {TaprootTree? treeScript, List<int>? merkleRoot}) {
+    if (treeScript != null && merkleRoot != null) {
+      throw DartBitcoinPluginException(
+          "Provide either a Merkle root or script trees to generate one, but not both.");
+    }
+    if (xKey.length != 32) {
+      throw DartBitcoinPluginException("Invalid XOnlyKey length.",
+          details: {"excpected": 32, "length": xKey.length});
+    }
+    final tweek = tapTweakTaggedHash(
+      [...xKey, ...treeScript?.hash() ?? merkleRoot ?? []],
+    );
+    return tweek;
+  }
+
+  static ProjectiveECCPoint tweakInternalKey(
+      List<int> internalPubKey, List<int> leafHash) {
+    final x = BigintUtils.fromBytes(internalPubKey);
+    final n = Curves.generatorSecp256k1 * BigintUtils.fromBytes(leafHash);
+    final outPoint = P2TRUtils.liftX(x) + n;
+    return outPoint as ProjectiveECCPoint;
+  }
+
+  static List<TaprootLeaf> extractLeafs(TaprootTree treeScript) {
+    if (treeScript is TaprootLeaf) return [treeScript];
+    final branch = treeScript.cast<TaprootBranch>();
+    return [...extractLeafs(branch.a), ...extractLeafs(branch.b)];
+  }
+
+  static List<TaprootLeaf> extractLeafs2(TaprootTree treeScript) {
+    if (treeScript is TaprootLeaf) return [treeScript];
+    final branch = treeScript.cast<TaprootBranch>();
+    return [...extractLeafs(branch.a), ...extractLeafs(branch.b)];
+  }
+
+  /// Computes the Taproot Merkle Root from a list of leaf hashes.
+  static List<int>? computeTaprootMerkleRoot(List<List<int>> leavesHashes) {
+    if (leavesHashes.isEmpty) return null; // No scripts, key-path spend
+
+    // Sort leaf hashes lexicographically
+    leavesHashes.sort((a, b) => BytesUtils.compareBytes(a, b));
+
+    // Process the tree iteratively
+    while (leavesHashes.length > 1) {
+      List<List<int>> newLevel = [];
+
+      for (int i = 0; i < leavesHashes.length; i += 2) {
+        List<int> left = leavesHashes[i];
+        List<int> right =
+            (i + 1 < leavesHashes.length) ? leavesHashes[i + 1] : left;
+
+        // // Ensure lexicographic order before hashing
+        // if (Uint8List.fromList(left).compareTo(Uint8List.fromList(right)) > 0) {
+        //   Uint8List temp = left;
+        //   left = right;
+        //   right = temp;
+        // }
+
+        // Compute TapBranch(A, B) = TaggedHash("TapBranch", A || B)
+        Uint8List parent = Uint8List.fromList(tapbranchTaggedHash(left, right));
+        newLevel.add(parent);
+      }
+
+      leavesHashes = newLevel; // Move to the next level
+    }
+
+    return leavesHashes.first; // The final hash is the Merkle root
+  }
+
+  static List<TapLeafMerkleProof> generateAllPossibleProofs(
+      {required TaprootTree treeScript,
+      required List<int> xOnlyOrInternalPubKey}) {
+    final leafs = extractLeafs(treeScript).toSet();
+    return leafs
+        .map(
+          (e) => TapLeafMerkleProof.generate(
+              leafScript: e,
+              scriptTree: treeScript,
+              xOnlyOrInternalPubKey: xOnlyOrInternalPubKey),
+        )
+        .toList();
+  }
+
+  static List<int> toXOnly(List<int> xOnlyOrInternalPubKey) {
+    if (xOnlyOrInternalPubKey.length == EcdsaKeysConst.pointCoordByteLen) {
+      return xOnlyOrInternalPubKey;
+    }
+    if (xOnlyOrInternalPubKey.length ==
+        EcdsaKeysConst.pubKeyCompressedByteLen) {
+      return xOnlyOrInternalPubKey.sublist(1);
+    }
+    if (xOnlyOrInternalPubKey.length ==
+            EcdsaKeysConst.pubKeyCompressedByteLen ||
+        xOnlyOrInternalPubKey.length ==
+            EcdsaKeysConst.pubKeyUncompressedByteLen) {
+      try {
+        return ECPublic.fromBytes(xOnlyOrInternalPubKey).toXOnly();
+      } catch (_) {}
+    }
+    throw DartBitcoinPluginException("Invalid xOnly or Public key.");
+  }
+
+  static String toXonlyHex(String xOnlyKey) {
+    final bytes = BytesUtils.tryFromHexString(xOnlyKey);
+    if (bytes == null || bytes.length != EcdsaKeysConst.pointCoordByteLen) {
+      throw DartBitcoinPluginException("Invalid xOnly key.");
+    }
+    return StringUtils.strip0x(xOnlyKey.toLowerCase());
+  }
+}
diff --git a/lib/src/cash_token/cash_token.dart b/lib/src/cash_token/cash_token.dart
index 7a86d9b..7e3064e 100644
--- a/lib/src/cash_token/cash_token.dart
+++ b/lib/src/cash_token/cash_token.dart
@@ -262,12 +262,12 @@ class CashToken {
   final List<int> commitment;
   final int bitfield;
 
-  CashToken.noValidate(
+  CashToken._(
       {required this.category,
       required this.amount,
       required List<int> commitment,
       required this.bitfield})
-      : commitment = List<int>.unmodifiable(commitment);
+      : commitment = commitment.asImmutableBytes;
   factory CashToken(
       {required String category,
       BigInt? amount,
@@ -300,18 +300,18 @@ class CashToken {
       throw const DartBitcoinPluginException(
           'Invalid cash token: the bitfield indicates an commitment, but the commitment is null or empty.');
     }
-    return CashToken.noValidate(
-        category: category,
+    return CashToken._(
+        category: StringUtils.strip0x(category.toLowerCase()),
         amount: amount ?? BigInt.zero,
         commitment: commitment ?? const [],
         bitfield: bitfield);
   }
-  static Tuple<CashToken?, int> fromRaw(List<int> scriptBytes) {
+  static Tuple<CashToken?, int> deserialize(List<int> scriptBytes) {
     if (scriptBytes.isEmpty ||
         scriptBytes[0] != CashTokenUtils.cashTokenPrefix) {
       return const Tuple(null, 0);
     }
-    var cursor = 1;
+    int cursor = 1;
     final id =
         scriptBytes.sublist(cursor, cursor + CashTokenUtils.idBytesLength);
 
@@ -422,6 +422,19 @@ class CashToken {
     };
   }
 
+  @override
+  operator ==(other) {
+    if (identical(this, other)) return true;
+    if (other is! CashToken) return false;
+    return category == other.category &&
+        amount == other.amount &&
+        bitfield == other.bitfield &&
+        BytesUtils.bytesEqual(commitment, other.commitment);
+  }
+
+  @override
+  int get hashCode => HashCodeGenerator.generateBytesHashCode(
+      commitment, [category, amount, bitfield]);
   @override
   String toString() {
     return 'CashToken{bitfield: $bitfield, commitment: $commitmentInHex, amount: $amount, category: $category}';
diff --git a/lib/src/crypto/crypto.dart b/lib/src/crypto/crypto.dart
index c7fd1bc..18c3d6c 100644
--- a/lib/src/crypto/crypto.dart
+++ b/lib/src/crypto/crypto.dart
@@ -1,34 +1,3 @@
-library;
-
-import 'package:bitcoin_base/src/bitcoin/script/op_code/constant_lib.dart';
-import 'package:blockchain_utils/crypto/quick_crypto.dart';
-import 'package:blockchain_utils/utils/utils.dart';
 export 'keypair/ec_private.dart';
 export 'keypair/ec_public.dart';
-
-/// Function: taggedHash
-/// Description: Computes a tagged hash of the input data with a provided tag.
-/// Input:
-///   - `List<int>` data - The data to be hashed.
-///   - String tag - A unique tag to differentiate the hash.
-/// Output: `List<int>` - The resulting tagged hash.
-/// Note: This function combines the provided tag with the input data to create a unique
-/// hash by applying a double SHA-256 hash.
-List<int> taggedHash(List<int> data, String tag) {
-  /// Calculate the hash of the tag as List<int>.
-  final tagDigest = QuickCrypto.sha256Hash(List<int>.from(tag.codeUnits));
-
-  /// Concatenate the tag hash with itself and the input data.
-  final concat = List<int>.from([...tagDigest, ...tagDigest, ...data]);
-
-  /// Compute a double SHA-256 hash of the concatenated data.
-  return QuickCrypto.sha256Hash(concat);
-}
-
-List<int> toTapleafTaggedHash(List<int> scriptBytes) {
-  final leafVarBytes = [
-    BitcoinOpCodeConst.LEAF_VERSION_TAPSCRIPT,
-    ...IntUtils.prependVarint(scriptBytes)
-  ];
-  return taggedHash(leafVarBytes, 'TapLeaf');
-}
+export 'musig/signer.dart';
diff --git a/lib/src/crypto/keypair/ec_private.dart b/lib/src/crypto/keypair/ec_private.dart
index af1a731..aaa506b 100644
--- a/lib/src/crypto/keypair/ec_private.dart
+++ b/lib/src/crypto/keypair/ec_private.dart
@@ -1,6 +1,11 @@
-import 'package:bitcoin_base/bitcoin_base.dart';
+import 'package:bitcoin_base/src/bitcoin/script/op_code/constant.dart';
+import 'package:bitcoin_base/src/bitcoin/taproot/taproot.dart';
+import 'package:bitcoin_base/src/exception/exception.dart';
+import 'package:bitcoin_base/src/models/network.dart';
 import 'package:blockchain_utils/blockchain_utils.dart';
 
+import 'ec_public.dart';
+
 /// Represents an ECDSA private key.
 class ECPrivate {
   final Bip32PrivateKey prive;
@@ -56,46 +61,63 @@ class ECPrivate {
 
   /// sign transaction digest  and returns the signature.
   String signInput(List<int> txDigest,
-      {int sigHash = BitcoinOpCodeConst.SIGHASH_ALL}) {
+      {int? sigHash = BitcoinOpCodeConst.sighashAll}) {
     final btcSigner = BitcoinSigner.fromKeyBytes(toBytes());
-    var signature = btcSigner.signTransaction(txDigest);
-    signature = <int>[...signature, sigHash];
+    List<int> signature = btcSigner.signTransaction(txDigest);
+    if (sigHash != null) {
+      signature = <int>[...signature, sigHash];
+    }
     return BytesUtils.toHexString(signature);
   }
 
   String signSchnorr(List<int> txDigest,
-      {int sighash = BitcoinOpCodeConst.TAPROOT_SIGHASH_ALL}) {
+      {int sighash = BitcoinOpCodeConst.sighashDefault}) {
     final btcSigner = BitcoinSigner.fromKeyBytes(toBytes());
-    var signatur = btcSigner.signSchnorrTransaction(txDigest,
+    var signature = btcSigner.signSchnorrTransaction(txDigest,
         tapScripts: [], tweak: false);
-    if (sighash != BitcoinOpCodeConst.TAPROOT_SIGHASH_ALL) {
-      signatur = <int>[...signatur, sighash];
+    if (sighash != BitcoinOpCodeConst.sighashDefault) {
+      signature = <int>[...signature, sighash];
     }
-    return BytesUtils.toHexString(signatur);
+    return BytesUtils.toHexString(signature);
   }
 
-  /// sign taproot transaction digest and returns the signature.
+  /// Signs a Taproot transaction digest and returns the signature.
+  ///
+  /// - [txDigest]: The transaction digest to be signed.
+  /// - [sighash]: The sighash type (default: `TAPROOT_SIGHASH_ALL`).
+  /// - [treeScript]: Taproot script tree for Tweaking with public key.
+  /// - [merkleRoot]: Merkle root for the Taproot tree. If provided, this overrides the default computation of the Merkle root from [treeScript].
+  /// - [tweak]: If `true`, the internal key is tweaked, either with or without [treeScript] or [merkleRoot], before signing.
   String signTapRoot(List<int> txDigest,
-      {int sighash = BitcoinOpCodeConst.TAPROOT_SIGHASH_ALL,
-      List<List<Script>> tapScripts = const [],
+      {int sighash = BitcoinOpCodeConst.sighashDefault,
+      TaprootTree? treeScript,
+      List<int>? merkleRoot,
       bool tweak = true}) {
-    assert(() {
-      if (!tweak && tapScripts.isNotEmpty) {
-        return false;
-      }
-      return true;
-    }(),
-        'When the tweak is false, the `tapScripts` are ignored, to use the tap script path, you need to consider the tweak value to be true.');
-    final tapScriptBytes = !tweak
-        ? []
-        : tapScripts.map((e) => e.map((e) => e.toBytes()).toList()).toList();
+    if (!tweak && treeScript != null) {
+      throw DartBitcoinPluginException(
+          "Invalid parameters: 'tweak' must be true when using 'treeScript'.");
+    }
     final btcSigner = BitcoinSigner.fromKeyBytes(toBytes());
-    var signatur = btcSigner.signSchnorrTransaction(txDigest,
-        tapScripts: tapScriptBytes, tweak: tweak);
-    if (sighash != BitcoinOpCodeConst.TAPROOT_SIGHASH_ALL) {
-      signatur = <int>[...signatur, sighash];
+    List<int> signature = btcSigner.signSchnorrTx(txDigest,
+        tweak: tweak
+            ? TaprootUtils.calculateTweek(getPublic().toXOnly(),
+                treeScript: merkleRoot != null ? null : treeScript,
+                merkleRoot: merkleRoot)
+            : null);
+    if (sighash != BitcoinOpCodeConst.sighashDefault) {
+      signature = <int>[...signature, sighash];
     }
-    return BytesUtils.toHexString(signatur);
+    return BytesUtils.toHexString(signature);
+  }
+
+  /// Signs a Taproot transaction digest and returns the signature.
+  ///
+  /// - [txDigest]: The transaction digest to be signed.
+  /// - [tweak]: Optional public key tweak to be applied when signing.
+  List<int> signBtcSchnorr(List<int> txDigest, {List<int>? tweak}) {
+    final btcSigner = BitcoinSigner.fromKeyBytes(toBytes());
+    List<int> signature = btcSigner.signSchnorrTx(txDigest, tweak: tweak);
+    return signature;
   }
 
   static ECPrivate random() {
diff --git a/lib/src/crypto/keypair/ec_public.dart b/lib/src/crypto/keypair/ec_public.dart
index 4be69d3..e2d3272 100644
--- a/lib/src/crypto/keypair/ec_public.dart
+++ b/lib/src/crypto/keypair/ec_public.dart
@@ -1,12 +1,13 @@
 import 'package:bitcoin_base/src/bitcoin/address/address.dart';
 import 'package:bitcoin_base/src/bitcoin/script/script.dart';
+import 'package:bitcoin_base/src/bitcoin/taproot/taproot.dart';
 import 'package:bitcoin_base/src/exception/exception.dart';
 import 'package:blockchain_utils/blockchain_utils.dart';
 
 typedef PublicKeyType = PubKeyModes;
 
 class ECPublic {
-  final Bip32PublicKey publicKey;
+  final Secp256k1PublicKeyEcdsa publicKey;
   const ECPublic._(this.publicKey);
 
   factory ECPublic.fromBip32(Bip32PublicKey publicKey) {
@@ -14,13 +15,13 @@ class ECPublic {
       throw const DartBitcoinPluginException(
           'invalid public key curve for bitcoin');
     }
-    return ECPublic._(publicKey);
+    return ECPublic._(publicKey.pubKey as Secp256k1PublicKeyEcdsa);
   }
+  ProjectiveECCPoint get point => publicKey.point.cast();
 
   /// Constructs an ECPublic key from a byte representation.
   factory ECPublic.fromBytes(List<int> public) {
-    final publicKey = Bip32PublicKey.fromBytes(public, Bip32KeyData(),
-        Bip32Const.mainNetKeyNetVersions, EllipticCurveTypes.secp256k1);
+    final publicKey = Secp256k1PublicKeyEcdsa.fromBytes(public);
     return ECPublic._(publicKey);
   }
 
@@ -32,30 +33,26 @@ class ECPublic {
   /// toHex converts the ECPublic key to a hex-encoded string.
   /// If 'compressed' is true, the key is in compressed format.
   String toHex({PublicKeyType mode = PublicKeyType.compressed}) {
-    if (mode.isCompressed) {
-      return BytesUtils.toHexString(publicKey.compressed);
-    }
-    return BytesUtils.toHexString(publicKey.uncompressed);
+    return BytesUtils.toHexString(toBytes(mode: mode));
   }
 
-  /// _toHash160 computes the RIPEMD160 hash of the ECPublic key.
+  /// toHash160 computes the RIPEMD160 hash of the ECPublic key.
   /// If 'compressed' is true, the key is in compressed format.
-  List<int> _toHash160({PublicKeyType mode = PublicKeyType.compressed}) {
+  List<int> toHash160({PublicKeyType mode = PublicKeyType.compressed}) {
     final bytes = BytesUtils.fromHexString(toHex(mode: mode));
     return QuickCrypto.hash160(bytes);
   }
 
   /// toHash160 computes the RIPEMD160 hash of the ECPublic key.
   /// If 'compressed' is true, the key is in compressed format.
-  String toHash160({PublicKeyType mode = PublicKeyType.compressed}) {
-    final bytes = BytesUtils.fromHexString(toHex(mode: mode));
-    return BytesUtils.toHexString(QuickCrypto.hash160(bytes));
+  String toHash160Hex({PublicKeyType mode = PublicKeyType.compressed}) {
+    return BytesUtils.toHexString(toHash160(mode: mode));
   }
 
   /// toAddress generates a P2PKH (Pay-to-Public-Key-Hash) address from the ECPublic key.
   /// If 'compressed' is true, the key is in compressed format.
   P2pkhAddress toAddress({PublicKeyType mode = PublicKeyType.compressed}) {
-    final h16 = _toHash160(mode: mode);
+    final h16 = toHash160(mode: mode);
     final toHex = BytesUtils.toHexString(h16);
     return P2pkhAddress.fromHash160(addrHash: toHex);
   }
@@ -63,7 +60,7 @@ class ECPublic {
   /// toSegwitAddress generates a P2WPKH (Pay-to-Witness-Public-Key-Hash) SegWit address
   /// from the ECPublic key. If 'compressed' is true, the key is in compressed format.
   P2wpkhAddress toSegwitAddress() {
-    final h16 = _toHash160();
+    final h16 = toHash160();
     final toHex = BytesUtils.toHexString(h16);
 
     return P2wpkhAddress.fromProgram(program: toHex);
@@ -72,15 +69,13 @@ class ECPublic {
   /// toP2pkAddress generates a P2PK (Pay-to-Public-Key) address from the ECPublic key.
   /// If 'compressed' is true, the key is in compressed format.
   P2pkAddress toP2pkAddress({PublicKeyType mode = PublicKeyType.compressed}) {
-    final h = toHex(mode: mode);
-    return P2pkAddress(publicKey: h);
+    return P2pkAddress(publicKey: toHex(mode: mode));
   }
 
   /// toRedeemScript generates a redeem script from the ECPublic key.
   /// If 'compressed' is true, the key is in compressed format.
   Script toRedeemScript({PublicKeyType mode = PublicKeyType.compressed}) {
-    final redeem = toHex(mode: mode);
-    return Script(script: [redeem, 'OP_CHECKSIG']);
+    return Script(script: [toHex(mode: mode), 'OP_CHECKSIG']);
   }
 
   /// toP2pkhInP2sh generates a P2SH (Pay-to-Script-Hash) address
@@ -117,12 +112,14 @@ class ECPublic {
         script: script, type: P2shAddressType.p2pkInP2sh);
   }
 
-  /// ToTaprootAddress generates a P2TR(Taproot) address from the ECPublic key
+  /// ToTaprootAddre.
+  /// ss generates a P2TR(Taproot) address from the ECPublic key
   /// and an optional script. The 'script' parameter can be used to specify
   /// custom spending conditions.
-  P2trAddress toTaprootAddress({List<List<Script>>? scripts}) {
-    final pubKey = toTapRotHex(script: scripts);
-    return P2trAddress.fromProgram(program: pubKey);
+  P2trAddress toTaprootAddress({TaprootTree? treeScript}) {
+    return P2trAddress.fromInternalKey(
+        internalKey: publicKey.point.cast<ProjectiveECCPoint>().toXonly(),
+        treeScript: treeScript);
   }
 
   /// toP2wpkhInP2sh generates a P2SH (Pay-to-Script-Hash) address
@@ -155,34 +152,31 @@ class ECPublic {
         script: p2sh.toScriptPubKey(), type: P2shAddressType.p2wshInP2sh);
   }
 
-  /// toBytes returns the uncompressed byte representation of the ECPublic key.
-  List<int> toBytes({bool whitPrefix = true}) {
-    if (!whitPrefix) {
-      return publicKey.uncompressed.sublist(1);
+  List<int> toBytes({PubKeyModes mode = PubKeyModes.uncompressed}) {
+    switch (mode) {
+      case PubKeyModes.uncompressed:
+        return publicKey.uncompressed;
+      case PubKeyModes.compressed:
+        return publicKey.compressed;
     }
-    return publicKey.uncompressed;
   }
 
-  /// toCompressedBytes returns the compressed byte representation of the ECPublic key.
-  List<int> toCompressedBytes() {
-    return publicKey.compressed;
+  /// returns the x coordinate only as hex string after tweaking (needed for taproot)
+  String tweakPublicKey({TaprootTree? treeScript}) {
+    final pubKey = TaprootUtils.tweakPublicKey(
+        toBytes(mode: PubKeyModes.compressed),
+        treeScript: treeScript);
+    return BytesUtils.toHexString(pubKey.toXonly());
   }
 
-  /// returns the x coordinate only as hex string after tweaking (needed for taproot)
-  String toTapRotHex({List<List<Script>>? script}) {
-    final scriptBytes =
-        script?.map((e) => e.map((e) => e.toBytes()).toList()).toList();
-    final pubKey = P2TRUtils.tweakPublicKey(
-        publicKey.point as ProjectiveECCPoint,
-        script: scriptBytes);
-    return BytesUtils.toHexString(
-        BigintUtils.toBytes(pubKey.x, length: publicKey.point.curve.baselen));
+  List<int> toXOnly() {
+    return publicKey.point.cast<ProjectiveECCPoint>().toXonly();
   }
 
   /// toXOnlyHex extracts and returns the x-coordinate (first 32 bytes) of the ECPublic key
   /// as a hexadecimal string.
   String toXOnlyHex() {
-    return BytesUtils.toHexString(publicKey.uncompressed.sublist(1, 33));
+    return BytesUtils.toHexString(toXOnly());
   }
 
   /// returns true if the message was signed with this public key's
@@ -200,9 +194,24 @@ class ECPublic {
 
   /// returns true if the message was signed with this public key's
   bool verifySchnorrTransactionSignature(List<int> message, List<int> signature,
-      {List<dynamic>? tapleafScripts, bool isTweak = true}) {
+      {List<List<Script>> tapleafScripts = const [], bool isTweak = true}) {
     final verifyKey = BitcoinVerifier.fromKeyBytes(toBytes());
+    final tapScriptBytes = !isTweak
+        ? []
+        : tapleafScripts
+            .map((e) => e.map((e) => e.toBytes()).toList())
+            .toList();
     return verifyKey.verifySchnorr(message, signature,
-        tapleafScripts: tapleafScripts, isTweak: isTweak);
+        tapleafScripts: tapScriptBytes, isTweak: isTweak);
+  }
+
+  @override
+  operator ==(other) {
+    if (identical(this, other)) return true;
+    if (other is! ECPublic) return false;
+    return other.publicKey == publicKey;
   }
+
+  @override
+  int get hashCode => publicKey.hashCode;
 }
diff --git a/lib/src/crypto/musig/signer.dart b/lib/src/crypto/musig/signer.dart
new file mode 100644
index 0000000..29c0e43
--- /dev/null
+++ b/lib/src/crypto/musig/signer.dart
@@ -0,0 +1,265 @@
+import 'package:bitcoin_base/src/bitcoin/address/address.dart';
+import 'package:bitcoin_base/src/bitcoin/script/op_code/constant.dart';
+import 'package:bitcoin_base/src/bitcoin/taproot/taproot.dart';
+import 'package:bitcoin_base/src/crypto/crypto.dart';
+import 'package:bitcoin_base/src/exception/exception.dart';
+import 'package:blockchain_utils/blockchain_utils.dart';
+
+/// A signer class for MuSig2, handling key aggregation, nonce generation,
+/// signing, and partial signature aggregation.
+class Musig2Signer {
+  /// A list of private keys for signing. This can be empty for public-only operations.
+  final List<ECPrivate> privateKeys;
+
+  /// A list of public keys used in the MuSig2 signing process.
+  final List<ECPublic> publicKeys;
+
+  /// The aggregated MuSig2 public key, used for Taproot or MuSig2 signing.
+  final ECPublic aggPublicKey;
+
+  /// Private constructor to enforce the use of the factory constructor.
+  Musig2Signer._({
+    required List<ECPrivate> privateKeys,
+    required List<ECPublic> publicKeys,
+    required this.aggPublicKey,
+  })  : privateKeys = privateKeys.immutable,
+        publicKeys = publicKeys.immutable;
+
+  /// Generates a new `Musig2Signer` instance by aggregating the provided public keys.
+  ///
+  /// - If `sortKeys` is `true`, the public keys will be lexicographically sorted before aggregation.
+  /// - If `privateKeys` are provided, they will be used for signing.
+  factory Musig2Signer.generate(List<ECPublic> publicKeys,
+      {List<ECPrivate> privateKeys = const [], bool sortKeys = false}) {
+    List<List<int>> publicKeysBytes =
+        publicKeys.map((e) => e.toBytes(mode: PubKeyModes.compressed)).toList();
+
+    if (sortKeys) {
+      publicKeysBytes = MuSig2Utils.sortPublicKeys(publicKeysBytes);
+    }
+
+    final aggKey = MuSig2.aggPublicKeys(keys: publicKeysBytes);
+
+    return Musig2Signer._(
+      privateKeys: privateKeys,
+      publicKeys: sortKeys
+          ? publicKeysBytes.map((e) => ECPublic.fromBytes(e)).toList()
+          : publicKeys,
+      aggPublicKey: ECPublic.fromBytes(aggKey.publicKey.toBytes()),
+    );
+  }
+
+  /// Generates a Taproot address using the aggregated MuSig2 public key.
+  ///
+  /// - If a `scriptTree` is provided, it will be included in the Taproot address.
+  P2trAddress toAddress({TaprootTree? scriptTree}) {
+    return P2trAddress.fromInternalKey(
+        internalKey: aggPublicKey.toXOnly(), treeScript: scriptTree);
+  }
+
+  /// Generates a list of MuSig2 nonces for signing.
+  ///
+  /// - `rand` is optional random data for nonce generation.
+  /// - `sk` (optional) is the private key for deterministic nonce generation.
+  /// - `aggPubKey` is the aggregate public key.
+  /// - `msg` is the message being signed.
+  /// - `extra` is additional data used in nonce generation.
+  List<MuSig2Nonce> generateNonces(
+      {List<int>? rand,
+      List<int>? sk,
+      List<int>? aggPubKey,
+      List<int>? msg,
+      List<int>? extra}) {
+    return publicKeys
+        .map((e) => MuSig2.nonceGenerate(
+            publicKey: e.toBytes(mode: PubKeyModes.compressed),
+            aggPubKey: aggPubKey,
+            extra: extra,
+            msg: msg,
+            rand: rand,
+            sk: sk))
+        .toList();
+  }
+
+  /// Generates a MuSig2 nonce for a participant.
+  ///
+  /// - `publicKey`: The public key of the participant.
+  /// - `rand`: Optional random data used for nonce generation. If not provided, a random value will be generated.
+  /// - `sk`: Optional private key for deterministic nonce generation. If provided, `rand` and `extra` will be ignored.
+  /// - `aggPubKey`: The aggregate public key in the MuSig2 session, used to generate nonces across multiple participants.
+  /// - `msg`: The message that is being signed, used to generate the nonce.
+  /// - `extra`: Optional additional data to include in the nonce generation.
+  ///
+  /// Returns a `MuSig2Nonce` object containing the generated nonce data.
+  MuSig2Nonce generateNonce(ECPublic publicKey,
+      {List<int>? rand,
+      List<int>? sk,
+      List<int>? aggPubKey,
+      List<int>? msg,
+      List<int>? extra}) {
+    return MuSig2.nonceGenerate(
+        publicKey: publicKey.toBytes(mode: PubKeyModes.compressed),
+        aggPubKey: aggPubKey,
+        extra: extra,
+        msg: msg,
+        rand: rand,
+        sk: sk);
+  }
+
+  /// Aggregates multiple MuSig2 nonces into a single aggregated nonce.
+  List<int> aggNonce(List<MuSig2Nonce> nonces) {
+    return MuSig2.nonceAgg(nonces.map((e) => e.pubnonce).toList());
+  }
+
+  /// Signs a message using the provided MuSig2 secret nonces.
+  ///
+  /// - Each signer must provide their secret nonce (`secNonces`).
+  /// - The message (`message`) must be the same for all participants.
+  /// - Returns a list of partial signatures.
+  ///
+  /// Throws an exception if a corresponding private key is not found.
+  List<List<int>> partialSign(
+      {required List<MuSig2Nonce> secNonces,
+      required List<int> message,
+      List<int>? merkleRoot,
+      TaprootTree? treeScript,
+      bool tweak = true,
+      List<ECPrivate> extraKeys = const []}) {
+    final aggNonce = this.aggNonce(secNonces);
+    final session = MuSig2Session(
+        aggnonce: aggNonce,
+        publicKeys: publicKeys
+            .map((e) => e.toBytes(mode: PubKeyModes.compressed))
+            .toList(),
+        msg: message,
+        tweaks: [
+          if (tweak)
+            MuSig2Tweak(
+                tweak: TaprootUtils.calculateTweek(aggPublicKey.toXOnly(),
+                    treeScript: merkleRoot != null ? null : treeScript,
+                    merkleRoot: merkleRoot))
+        ]);
+    List<List<int>> signatures = [];
+    final privateKeys = [...this.privateKeys, ...extraKeys];
+    for (final i in secNonces) {
+      final pubKey = publicKeys.firstWhere(
+        (e) => e.point == i.publicKey,
+        orElse: () => throw DartBitcoinPluginException(
+            "Unable to find nonce public key in MuSig2 public keys."),
+      );
+
+      final key = privateKeys.firstWhere(
+        (e) => e.prive.publicKey.point == pubKey.point,
+        orElse: () {
+          throw DartBitcoinPluginException(
+              "Unable to find private key for the given public nonce.",
+              details: {"publicKey": pubKey.toHex()});
+        },
+      );
+
+      final sig = MuSig2.sign(
+          secnonce: i.secnonce, sk: key.toBytes(), session: session);
+      signatures.add(sig);
+    }
+
+    return signatures;
+  }
+
+  /// Aggregates the provided partial signatures into a final MuSig2 signature.
+  ///
+  /// - `signatures`: List of partial signatures from all participants.
+  /// - `secNonces`: The secret nonces used for signing.
+  /// - `message`: The message that was signed.
+  ///
+  /// Returns the final aggregated signature.
+  List<int> aggSigs(
+      {required List<List<int>> signatures,
+      required List<MuSig2Nonce> secNonces,
+      required List<int> message,
+      int? sighash = BitcoinOpCodeConst.sighashDefault,
+      List<int>? merkleRoot,
+      TaprootTree? treeScript,
+      bool tweak = true,
+      List<ECPrivate> extraKeys = const []}) {
+    final aggNonce = this.aggNonce(secNonces);
+    final session = MuSig2Session(
+        aggnonce: aggNonce,
+        tweaks: [
+          if (tweak)
+            MuSig2Tweak(
+                tweak: TaprootUtils.calculateTweek(aggPublicKey.toXOnly(),
+                    treeScript: merkleRoot != null ? null : treeScript,
+                    merkleRoot: merkleRoot))
+        ],
+        publicKeys: publicKeys
+            .map((e) => e.toBytes(mode: PubKeyModes.compressed))
+            .toList(),
+        msg: message);
+    final aggSignature =
+        MuSig2.partialSigAgg(signatures: signatures, session: session);
+    if (sighash != null && sighash != BitcoinOpCodeConst.sighashDefault) {
+      return [...aggSignature, sighash];
+    }
+    return aggSignature;
+  }
+
+  /// Generates nonces, signs the message, and returns the final aggregated signature.
+  ///
+  /// This is a convenience method that performs all signing steps in one call.
+  ///
+  /// - `digest`: The hash of the message to be signed.
+  ///
+  /// Returns the final aggregated signature.
+  List<int> fullSign(
+    List<int> digest, {
+    List<int>? merkleRoot,
+    TaprootTree? treeScript,
+    List<ECPrivate> extraKeys = const [],
+    bool tweak = true,
+  }) {
+    final nonces = generateNonces();
+    final signatures = partialSign(
+        secNonces: nonces,
+        message: digest,
+        merkleRoot: merkleRoot,
+        treeScript: treeScript,
+        tweak: tweak,
+        extraKeys: extraKeys);
+    return aggSigs(
+        signatures: signatures,
+        secNonces: nonces,
+        message: digest,
+        merkleRoot: merkleRoot,
+        treeScript: treeScript,
+        tweak: tweak);
+  }
+
+  /// Verifies a MuSig2 partial signature.
+  ///
+  /// - `signature`: The partial signature to verify.
+  /// - `pubNonce`: The public nonce associated with the signer.
+  /// - `publicKey`: The public key of the signer.
+  /// - `aggNonce`: The aggregated nonce for the signing session.
+  /// - `digest`: The message digest that was signed.
+  ///
+  /// Returns `true` if the partial signature is valid, otherwise `false`.
+  bool partialSigVerify(
+      {required List<int> signature,
+      required List<int> pubNonce,
+      required ECPublic publicKey,
+      required List<int> aggNonce,
+      required List<int> digest}) {
+    final session = MuSig2Session(
+        aggnonce: aggNonce,
+        publicKeys: publicKeys
+            .map((e) => e.toBytes(mode: PubKeyModes.compressed))
+            .toList(),
+        msg: digest);
+
+    return MuSig2.partialSigVerify(
+        signature: signature,
+        pubnonce: pubNonce,
+        pk: publicKey.toBytes(mode: PubKeyModes.compressed),
+        session: session);
+  }
+}
diff --git a/lib/src/models/network.dart b/lib/src/models/network.dart
index 89b24b6..9b04633 100644
--- a/lib/src/models/network.dart
+++ b/lib/src/models/network.dart
@@ -1,4 +1,4 @@
-import 'package:bitcoin_base/bitcoin_base.dart';
+import 'package:bitcoin_base/src/bitcoin/address/address.dart';
 import 'package:bitcoin_base/src/exception/exception.dart';
 import 'package:bitcoin_base/src/utils/enumerate.dart';
 import 'package:blockchain_utils/blockchain_utils.dart';
@@ -562,3 +562,55 @@ class ElectraProtocolNetwork implements BasedUtxoNetwork {
     ];
   }
 }
+
+/// Class representing a Dogecoin network, implementing the `BasedUtxoNetwork` abstract class.
+class BonkcoinNetwork implements BasedUtxoNetwork {
+  /// Mainnet configuration with associated `CoinConf`.
+  static const BonkcoinNetwork mainnet =
+      BonkcoinNetwork._('bonkcoinMainnet', CoinsConf.dogecoinMainNet);
+
+  /// Overrides the `conf` property from `BasedUtxoNetwork` with the associated `CoinConf`.
+  @override
+  final CoinConf conf;
+
+  /// Constructor for creating a Dogecoin network with a specific configuration.
+  const BonkcoinNetwork._(this.value, this.conf);
+
+  @override
+  final String value;
+
+  /// Retrieves the Wallet Import Format (WIF) version bytes from the associated `CoinConf`.
+  @override
+  List<int> get wifNetVer => conf.params.wifNetVer!;
+
+  /// Retrieves the Pay-to-Public-Key-Hash (P2PKH) version bytes from the associated `CoinConf`.
+  @override
+  List<int> get p2pkhNetVer => conf.params.p2pkhNetVer!;
+
+  /// Retrieves the Pay-to-Script-Hash (P2SH) version bytes from the associated `CoinConf`.
+  @override
+  List<int> get p2shNetVer => [25];
+
+  /// Retrieves the Human-Readable Part (HRP) for Pay-to-Witness-Public-Key-Hash (P2WPKH) addresses.
+  @override
+  String get p2wpkhHrp => throw const DartBitcoinPluginException(
+      'BonkcoinNetwork network does not support P2WPKH/P2WSH');
+
+  /// Checks if the current network is the mainnet.
+  @override
+  bool get isMainnet => this == BonkcoinNetwork.mainnet;
+
+  @override
+  final List<BitcoinAddressType> supportedAddress = const [
+    PubKeyAddressType.p2pk,
+    P2pkhAddressType.p2pkh,
+    P2shAddressType.p2pkhInP2sh,
+    P2shAddressType.p2pkInP2sh
+  ];
+
+  @override
+  List<BipCoins> get coins {
+    if (isMainnet) return [Bip44Coins.dogecoin, Bip49Coins.dogecoin];
+    return [Bip44Coins.dogecoinTestnet, Bip49Coins.dogecoinTestnet];
+  }
+}
diff --git a/lib/src/provider/electrum_methods/methods.dart b/lib/src/provider/electrum_methods/methods.dart
index 052a047..f217aae 100644
--- a/lib/src/provider/electrum_methods/methods.dart
+++ b/lib/src/provider/electrum_methods/methods.dart
@@ -27,3 +27,4 @@ export 'methods/relay_fee.dart';
 export 'methods/scripthash_unsubscribe.dart';
 export 'methods/server_peer_subscribe.dart';
 export 'methods/status.dart';
+export 'methods/get_raw_transaction.dart';
diff --git a/lib/src/provider/electrum_methods/methods/get_raw_transaction.dart b/lib/src/provider/electrum_methods/methods/get_raw_transaction.dart
new file mode 100644
index 0000000..61ce0c4
--- /dev/null
+++ b/lib/src/provider/electrum_methods/methods/get_raw_transaction.dart
@@ -0,0 +1,31 @@
+import 'package:bitcoin_base/src/bitcoin/script/transaction.dart';
+import 'package:bitcoin_base/src/provider/core/methods.dart';
+import 'package:bitcoin_base/src/provider/core/params.dart';
+import 'package:blockchain_utils/utils/binary/utils.dart';
+
+/// Return a raw transaction.
+/// https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-methods.html
+class ElectrumRequestGetRawTransaction
+    extends ElectrumRequest<BtcTransaction, String> {
+  ElectrumRequestGetRawTransaction(this.transactionHash);
+
+  /// The transaction hash as a hexadecimal string.
+  final String transactionHash;
+
+  /// blockchain.transaction.get
+  @override
+  String get method => ElectrumRequestMethods.getTransaction.method;
+
+  @override
+  List toJson() {
+    return [transactionHash, false];
+  }
+
+  @override
+  BtcTransaction onResonse(String result) {
+    final txBytes = BytesUtils.fromHexString(result);
+    final tx = BtcTransaction.deserialize(txBytes);
+    assert(BytesUtils.bytesEqual(tx.toBytes(), txBytes), result);
+    return tx;
+  }
+}
diff --git a/lib/src/provider/models/block_cypher/block_cypher_models.dart b/lib/src/provider/models/block_cypher/block_cypher_models.dart
index 759c8f3..09f994c 100644
--- a/lib/src/provider/models/block_cypher/block_cypher_models.dart
+++ b/lib/src/provider/models/block_cypher/block_cypher_models.dart
@@ -1,5 +1,6 @@
 import 'package:bitcoin_base/src/bitcoin/address/address.dart';
 import 'package:bitcoin_base/src/provider/models/utxo_details.dart';
+import 'package:blockchain_utils/utils/numbers/utils/bigint_utils.dart';
 
 class TxRef implements UTXO {
   final String txHash;
@@ -32,7 +33,7 @@ class TxRef implements UTXO {
       blockHeight: json['block_height'],
       txInputN: json['tx_input_n'],
       txOutputN: json['tx_output_n'],
-      value: BigInt.from(json['value']),
+      value: BigintUtils.parse(json['value']),
       refBalance: json['ref_balance'],
       spent: json['spent'],
       confirmations: json['confirmations'],
@@ -40,6 +41,20 @@ class TxRef implements UTXO {
       script: json['script'],
     );
   }
+  @override
+  Map<String, dynamic> toJson() {
+    return {
+      "tx_hash": txHash,
+      "block_height": blockHeight,
+      "tx_input_n": txInputN,
+      "value": value.toString(),
+      "tx_output_n": txOutputN,
+      "spent": spent,
+      "confirmations": confirmations,
+      "confirmed": confirmed.toString(),
+      "script": script
+    };
+  }
 
   @override
   BitcoinUtxo toUtxo(BitcoinAddressType addressType) {
diff --git a/lib/src/provider/models/config.dart b/lib/src/provider/models/config.dart
index 6e9b89e..6b3a01b 100644
--- a/lib/src/provider/models/config.dart
+++ b/lib/src/provider/models/config.dart
@@ -1,5 +1,5 @@
-import 'package:bitcoin_base/bitcoin_base.dart';
 import 'package:bitcoin_base/src/exception/exception.dart';
+import 'package:bitcoin_base/src/models/network.dart';
 import 'package:bitcoin_base/src/provider/constant/constant.dart';
 
 enum APIType { mempool, blockCypher }
@@ -82,15 +82,15 @@ class APIConfig {
         blockHeight: '$baseUrl/blocks/###');
   }
 
-  factory APIConfig.mempool(BasedUtxoNetwork network) {
-    String baseUrl;
+  factory APIConfig.mempool(BasedUtxoNetwork network, {String? baseUrl}) {
     switch (network) {
       case BitcoinNetwork.mainnet:
-        baseUrl = BtcApiConst.mempoolMainBaseURL;
+        baseUrl ??= BtcApiConst.mempoolMainBaseURL;
         break;
       case BitcoinNetwork.testnet:
-        baseUrl = BtcApiConst.mempoolBaseURL;
+        baseUrl ??= BtcApiConst.mempoolBaseURL;
         break;
+
       default:
         throw DartBitcoinPluginException(
             'mempool does not support ${network.conf.coinName.name}');
diff --git a/lib/src/provider/models/electrum/electrum_utxo.dart b/lib/src/provider/models/electrum/electrum_utxo.dart
index 0c168e2..4e6e848 100644
--- a/lib/src/provider/models/electrum/electrum_utxo.dart
+++ b/lib/src/provider/models/electrum/electrum_utxo.dart
@@ -1,19 +1,19 @@
 import 'package:bitcoin_base/src/bitcoin/address/address.dart';
 import 'package:bitcoin_base/src/cash_token/cash_token.dart';
 import 'package:bitcoin_base/src/provider/api_provider.dart';
+import 'package:blockchain_utils/utils/numbers/utils/bigint_utils.dart';
+import 'package:blockchain_utils/utils/numbers/utils/int_utils.dart';
 
 class ElectrumUtxo implements UTXO {
   factory ElectrumUtxo.fromJson(Map<String, dynamic> json) {
-    CashToken? token;
-    if (json.containsKey('token_data')) {
-      token = CashToken.fromJson(json['token_data']);
-    }
     return ElectrumUtxo._(
-        height: json['height'],
+        height: IntUtils.parse(json['height']),
         txId: json['tx_hash'],
-        vout: json['tx_pos'],
-        value: BigInt.parse((json['value'].toString())),
-        token: token);
+        vout: IntUtils.parse(json['tx_pos']),
+        value: BigintUtils.parse(json['value']),
+        token: json["token_data"] == null
+            ? null
+            : CashToken.fromJson(json['token_data']));
   }
   const ElectrumUtxo._(
       {required this.height,
@@ -37,4 +37,15 @@ class ElectrumUtxo implements UTXO {
         blockHeight: height,
         token: token);
   }
+
+  @override
+  Map<String, dynamic> toJson() {
+    return {
+      "token_data": token?.toJson(),
+      "height": height,
+      "tx_hash": txId,
+      "tx_pos": vout,
+      "value": value.toString()
+    };
+  }
 }
diff --git a/lib/src/provider/models/mempool/mempol_models.dart b/lib/src/provider/models/mempool/mempol_models.dart
index 46cd8c8..666dd24 100644
--- a/lib/src/provider/models/mempool/mempol_models.dart
+++ b/lib/src/provider/models/mempool/mempol_models.dart
@@ -1,5 +1,6 @@
 import 'package:bitcoin_base/src/bitcoin/address/address.dart';
 import 'package:bitcoin_base/src/provider/models/utxo_details.dart';
+import 'package:blockchain_utils/utils/numbers/utils/bigint_utils.dart';
 
 class MempoolPrevOut {
   final String scriptPubKey;
@@ -169,7 +170,7 @@ class MempolUtxo implements UTXO {
       txid: json['txid'],
       vout: json['vout'],
       status: MempoolStatus.fromJson(json['status']),
-      value: BigInt.parse(json['value'].toString()),
+      value: BigintUtils.parse(json['value']),
     );
   }
 
@@ -182,6 +183,11 @@ class MempolUtxo implements UTXO {
         scriptType: addressType,
         blockHeight: 1);
   }
+
+  @override
+  Map<String, dynamic> toJson() {
+    return {"txid": txid, "vout": vout, "status": status, "value": value};
+  }
 }
 
 extension MempoolUtxoExtentions on List<MempolUtxo> {
diff --git a/lib/src/provider/models/multisig_script.dart b/lib/src/provider/models/multisig_script.dart
index 15603d1..d6410a2 100644
--- a/lib/src/provider/models/multisig_script.dart
+++ b/lib/src/provider/models/multisig_script.dart
@@ -1,5 +1,10 @@
-import 'package:bitcoin_base/bitcoin_base.dart';
+import 'package:bitcoin_base/src/bitcoin/address/address.dart';
+import 'package:bitcoin_base/src/bitcoin/script/script.dart';
+import 'package:bitcoin_base/src/bitcoin/taproot/taproot.dart';
+import 'package:bitcoin_base/src/crypto/crypto.dart';
 import 'package:bitcoin_base/src/exception/exception.dart';
+import 'package:bitcoin_base/src/models/network.dart';
+import 'package:bitcoin_base/src/utils/btc_utils.dart';
 import 'package:blockchain_utils/blockchain_utils.dart';
 
 /// MultiSignatureSigner is an interface that defines methods required for representing
@@ -21,9 +26,12 @@ class MultiSignatureSigner {
   /// specified public key and weight.
   factory MultiSignatureSigner(
       {required String publicKey, required int weight}) {
-    ECPublic.fromHex(publicKey);
+    final pubkeyMode = BtcUtils.isCompressedPubKey(publicKey);
+
     return MultiSignatureSigner._(
-        publicKey, weight, BtcUtils.isCompressedPubKey(publicKey));
+        ECPublic.fromHex(publicKey).toHex(mode: pubkeyMode),
+        weight,
+        pubkeyMode);
   }
 }
 
@@ -147,3 +155,72 @@ class MultiSignatureAddress {
         canSelectSegwit: signers.every((e) => e.keyType.isCompressed));
   }
 }
+
+class P2trMultiSignatureSigner {
+  P2trMultiSignatureSigner._(this.xOnly, this.weight);
+
+  final String xOnly;
+
+  /// Weight returns the weight or significance of the signer within the multi-signature scheme.
+  /// The weight is used to determine the number of signatures required for a valid transaction.
+  final int weight;
+
+  factory P2trMultiSignatureSigner(
+      {required String xOnly, required int weight}) {
+    return P2trMultiSignatureSigner._(TaprootUtils.toXonlyHex(xOnly), weight);
+  }
+}
+
+class P2trMultiSignatureAddress {
+  /// Signers is a collection of signers participating in the multi-signature scheme.
+  final List<P2trMultiSignatureSigner> signers;
+
+  /// Threshold is the minimum number of signatures required to spend the bitcoins associated
+  /// with this address.
+  final int threshold;
+
+  /// ScriptDetails provides details about the multi-signature script used in transactions,
+  /// including "OP_M", compressed public keys, "OP_N", and "OP_CHECKMULTISIG."
+  final Script multiSigScript;
+  P2trMultiSignatureAddress._(
+      {required List<P2trMultiSignatureSigner> signers,
+      required this.threshold,
+      required this.multiSigScript})
+      : signers = signers.immutable;
+
+  factory P2trMultiSignatureAddress(
+      {required int threshold,
+      required List<P2trMultiSignatureSigner> signers}) {
+    final sumWeight =
+        signers.fold<int>(0, (sum, signer) => sum + signer.weight);
+    if (threshold > 15 || threshold < 1) {
+      throw const DartBitcoinPluginException(
+          'The threshold should be between 1 and 15');
+    }
+    if (sumWeight > 15) {
+      throw const DartBitcoinPluginException(
+          'The total weight of the owners should not exceed 15');
+    }
+    if (sumWeight < threshold) {
+      throw const DartBitcoinPluginException(
+          'The total weight of the signatories should reach the threshold');
+    }
+    final multiSigScript = <String>[];
+    for (int i = 0; i < signers.length; i++) {
+      final signer = signers[i];
+      for (var w = 0; w < signer.weight; w++) {
+        if (i == 0 && w == 0) {
+          multiSigScript.add(signer.xOnly);
+          multiSigScript.add("OP_CHECKSIG");
+          continue;
+        }
+        multiSigScript.add(signer.xOnly);
+        multiSigScript.add("OP_CHECKSIGADD");
+      }
+    }
+    multiSigScript.addAll(['OP_$threshold', 'OP_NUMEQUAL']);
+    final script = Script(script: multiSigScript);
+    return P2trMultiSignatureAddress._(
+        signers: signers, threshold: threshold, multiSigScript: script);
+  }
+}
diff --git a/lib/src/provider/models/utxo_details.dart b/lib/src/provider/models/utxo_details.dart
index abb5a1c..b1d8093 100644
--- a/lib/src/provider/models/utxo_details.dart
+++ b/lib/src/provider/models/utxo_details.dart
@@ -1,8 +1,15 @@
-import 'package:bitcoin_base/bitcoin_base.dart';
+import 'package:bitcoin_base/src/bitcoin/bitcoin.dart';
+import 'package:bitcoin_base/src/cash_token/cash_token.dart';
+import 'package:bitcoin_base/src/crypto/crypto.dart';
 import 'package:bitcoin_base/src/exception/exception.dart';
+import 'package:bitcoin_base/src/provider/models/models.dart';
+import 'package:bitcoin_base/src/utils/btc_utils.dart';
+import 'package:blockchain_utils/utils/numbers/utils/bigint_utils.dart';
+import 'package:blockchain_utils/utils/numbers/utils/int_utils.dart';
 
 abstract class UTXO {
   BitcoinUtxo toUtxo(BitcoinAddressType addressType);
+  Map<String, dynamic> toJson();
 }
 
 class UtxoAddressDetails {
@@ -206,6 +213,16 @@ class BitcoinUtxo {
       required this.isP2tr,
       required this.isP2shSegwit,
       required this.isSegwit});
+  factory BitcoinUtxo.fromJson(Map<String, dynamic> json) {
+    return BitcoinUtxo(
+        txHash: json["tx_hash"],
+        value: BigintUtils.parse(json["value"]),
+        vout: json["vout"],
+        scriptType: BitcoinAddressType.fromValue(json["script_type"]),
+        blockHeight: IntUtils.tryParse(json["block_height"]),
+        token:
+            json["token"] == null ? null : CashToken.fromJson(json["token"]));
+  }
   factory BitcoinUtxo(
       {required String txHash,
       required BigInt value,
@@ -241,6 +258,17 @@ class BitcoinUtxo {
     return TxInput(txId: txHash, txIndex: vout, sequance: sequence);
   }
 
+  Map<String, dynamic> toJson() {
+    return {
+      "token": token?.toJson(),
+      "tx_hash": txHash,
+      "value": value.toString(),
+      "vout": vout,
+      "script_type": scriptType.value,
+      "block_height": blockHeight
+    };
+  }
+
   @override
   String toString() {
     return 'txid: $txHash vout: $vout script: ${scriptType.value} value: $value blockHeight: $blockHeight';
diff --git a/lib/src/psbt/psbt.dart b/lib/src/psbt/psbt.dart
new file mode 100644
index 0000000..8d6255c
--- /dev/null
+++ b/lib/src/psbt/psbt.dart
@@ -0,0 +1,7 @@
+export 'types/types/global.dart';
+export 'types/types/inputs.dart';
+export 'types/types/outputs.dart';
+export 'psbt_builder/builder.dart';
+export 'types/types/psbt.dart';
+export 'utils/utils.dart';
+export 'signer/signer.dart';
diff --git a/lib/src/psbt/psbt_builder/builder.dart b/lib/src/psbt/psbt_builder/builder.dart
new file mode 100644
index 0000000..7e1b81e
--- /dev/null
+++ b/lib/src/psbt/psbt_builder/builder.dart
@@ -0,0 +1,16 @@
+export 'types/types.dart';
+import 'package:bitcoin_base/src/bitcoin/script/scripts.dart';
+import 'package:bitcoin_base/src/exception/exception.dart';
+import 'package:bitcoin_base/src/psbt/types/types/global.dart';
+import 'package:bitcoin_base/src/psbt/types/types/inputs.dart';
+import 'package:bitcoin_base/src/psbt/types/types/outputs.dart';
+import 'package:bitcoin_base/src/psbt/psbt_builder/types/types.dart';
+import 'package:bitcoin_base/src/psbt/types/types/psbt.dart';
+import 'package:bitcoin_base/src/psbt/utils/utils.dart';
+import 'package:blockchain_utils/blockchain_utils.dart';
+part 'core/psbt_builder.dart';
+part 'versiones/v1.dart';
+part 'versiones/v2.dart';
+part 'impl/signer.dart';
+part 'impl/input.dart';
+part 'impl/output.dart';
diff --git a/lib/src/psbt/psbt_builder/core/psbt_builder.dart b/lib/src/psbt/psbt_builder/core/psbt_builder.dart
new file mode 100644
index 0000000..2980db5
--- /dev/null
+++ b/lib/src/psbt/psbt_builder/core/psbt_builder.dart
@@ -0,0 +1,272 @@
+part of 'package:bitcoin_base/src/psbt/psbt_builder/builder.dart';
+
+abstract class PsbtBuilderImpl {
+  Psbt get _psbt;
+
+  /// Retrieves the transaction input at the specified index.
+  ///
+  /// Returns the `TxInput` at the given index.
+  /// Throws an error if the index is out of bounds.
+  TxInput txInput(int index);
+
+  /// Retrieves the transaction output at the specified index.
+  ///
+  /// Returns the `TxOutput` at the given index.
+  /// Throws an error if the index is out of bounds.
+  TxOutput txOutput(int index);
+
+  /// Retrieves a list of all transaction inputs.
+  ///
+  /// Returns a list of `TxInput` objects representing all inputs in the transaction.
+  List<TxInput> txInputs();
+
+  /// Retrieves a list of all transaction outputs.
+  ///
+  /// Returns a list of `TxOutput` objects representing all outputs in the transaction.
+  List<TxOutput> txOutputs();
+
+  /// Retrieves the PSBT representation of a transaction output at the specified index.
+  PsbtTransactionOutput psbtOutput(int index) {
+    return PsbtTransactionOutput.generateFromOutput(
+        psbtOutput: _psbt.output, output: txOutput(index), index: index);
+  }
+
+  /// Retrieves the PSBT representation of a transaction input at the specified index.
+  PsbtTransactionInput psbtInput(int index) {
+    final txInputs = this.txInputs();
+    PsbtUtils.validateTxInputs(
+        psbInput: _psbt.input,
+        inputIndex: index,
+        inputsLength: txInputs.length);
+    return PsbtTransactionInput.generateFromInput(
+        index: index, input: _psbt.input, txInput: txInputs[index]);
+  }
+
+  /// Retrieves a list of all PSBT transaction inputs.
+  List<PsbtTransactionInput> psbtInputs() {
+    final inputs = txInputs();
+    return List.generate(
+        inputs.length,
+        (index) => PsbtTransactionInput.generateFromInput(
+            index: index, input: _psbt.input, txInput: inputs[index]));
+  }
+
+  /// Retrieves a list of all PSBT transaction outputs.
+  List<PsbtTransactionOutput> psbtOutputs() {
+    return List.generate(_psbt.output.length, (index) => psbtOutput(index));
+  }
+
+  /// Constructs an unsigned Bitcoin transaction from the PSBT.
+  ///
+  /// This method builds a [BtcTransaction] using the current PSBT data,
+  /// excluding any signatures or finalization.
+  ///
+  /// Note:
+  /// - The returned transaction is not ready for broadcast since it lacks signatures.
+  /// - Use this to review or analyze the transaction before signing.
+  ///
+  /// Returns a [BtcTransaction] representing the unsigned transaction.
+  BtcTransaction buildUnsignedTransaction();
+
+  /// Checks if the specified input index is finalized.
+  ///
+  /// An input is considered finalized if it contains either:
+  /// - A finalized script signature (`PsbtInputTypes.finalizedScriptSig`).
+  /// - A finalized witness (`PsbtInputTypes.finalizedWitness`).
+  ///
+  /// Returns `true` if the input at the given index is finalized, otherwise `false`.
+  bool indexFinalized(int index) {
+    bool alreadyFinalized =
+        _psbt.input.hasInput(index, PsbtInputTypes.finalizedScriptSig);
+    return alreadyFinalized |=
+        _psbt.input.hasInput(index, PsbtInputTypes.finalizedWitness);
+  }
+
+  /// Encodes the PSBT as a Base64 string.
+  ///
+  /// Returns a Base64-encoded representation of the PSBT.
+  String toBase64() {
+    return _psbt.toBase64();
+  }
+
+  /// Encodes the PSBT as a hexadecimal string.
+  ///
+  /// Returns a hex-encoded representation of the PSBT.
+  String toHex() {
+    return _psbt.toHex();
+  }
+
+  /// Returns the raw PSBT data as a hexadecimal string.
+  String toBytes() {
+    return _psbt.toHex();
+  }
+
+  /// Serializes the PSBT into a JSON-compatible map.
+  Map<String, dynamic> toJson() {
+    return _psbt.toJson();
+  }
+
+  void _musig2AddPubKeyNonce(
+      int index, PsbtInputMuSig2PublicNonce pubKeyNonce) {
+    List<TxInput> txInputs = this.txInputs();
+    PsbtUtils.validateTxInputs(
+        psbInput: _psbt.input,
+        inputIndex: index,
+        inputsLength: txInputs.length);
+    PsbtUtils.validateAddMusig2PubKeyNonce(
+        inputIndex: index,
+        psbt: _psbt,
+        txInputs: txInputs,
+        pubKeyNonce: pubKeyNonce);
+    _psbt.input.updateInputs(index, [pubKeyNonce]);
+  }
+
+  void _addNewTxOutput(PsbtTransactionOutput output) {
+    PsbtUtils.validateCanAddOrUpdateOutput(psbt: _psbt);
+  }
+
+  void _updateTxOutput(int index, PsbtTransactionOutput output) {
+    PsbtUtils.validateTxOutputs(
+        psbtOutput: _psbt.output, outputIndex: index, outputs: txOutputs());
+    final currentOutput = txOutput(index);
+    final newOutPut = output.toTxOutput();
+    if (newOutPut != currentOutput) {
+      PsbtUtils.validateCanAddOrUpdateOutput(psbt: _psbt, outputIndex: index);
+    }
+  }
+
+  void _removeOutput(int index) {
+    final outputs = txOutputs();
+    PsbtUtils.validateTxOutputs(
+        psbtOutput: _psbt.output, outputIndex: index, outputs: outputs);
+    PsbtUtils.validateCanAddOrUpdateOutput(
+        psbt: _psbt, outputIndex: index, isUpdate: false);
+  }
+
+  void _removeTxInput(int index) {
+    PsbtUtils.validateTxInputs(
+        psbInput: _psbt.input,
+        inputIndex: index,
+        inputsLength: txInputs().length);
+    PsbtUtils.validateCanAddOrUpdateInput(psbt: _psbt, inputIndex: index);
+  }
+
+  void _updateTxInput(int index, PsbtTransactionInput input) {
+    List<TxInput> txInputs = this.txInputs();
+    PsbtUtils.validateTxInputs(
+        psbInput: _psbt.input,
+        inputIndex: index,
+        inputsLength: txInputs.length);
+    PsbtUtils.validateCanAddOrUpdateInput(psbt: _psbt, inputIndex: index);
+    txInputs = List.generate(txInputs.length, (i) {
+      if (i == index) return input.txInput;
+      return txInputs[i];
+    });
+    PsbtUtils.buildTransactionLocktime(inputs: txInputs);
+  }
+
+  void _addNewTxInput(PsbtTransactionInput input) {
+    List<TxInput> inputs = txInputs();
+    if (inputs.any((e) =>
+        e.txId == input.txInput.txId && e.txIndex == input.txInput.txIndex)) {
+      throw DartBitcoinPluginException(
+          "Duplicate input detected: Transaction ID (${input.txInput.txId}), Output Index (${input.txInput.txIndex})"
+          "Each input in a transaction must be unique.");
+    }
+    PsbtUtils.validateCanAddOrUpdateInput(psbt: _psbt);
+    PsbtUtils.validateNewInputLocktime(inputs: inputs, newInput: input.txInput);
+  }
+}
+
+abstract class PsbtBuilder extends PsbtBuilderImpl
+    with PsbtSignerImpl, PsbtInputImpl, PsbtOutputImpl {
+  PsbtVersion get psbtVersion => _psbt.version;
+  @override
+  final Psbt _psbt;
+  PsbtBuilder._({required Psbt psbt}) : _psbt = psbt.clone();
+  static PSBTBUILDER fromPsbt<PSBTBUILDER extends PsbtBuilder>(Psbt psbt) {
+    PsbtBuilder builder = switch (psbt.version) {
+      PsbtVersion.v0 => PsbtBuilderV0._(psbt),
+      PsbtVersion.v2 => PsbtBuilderV2._(psbt),
+    };
+    if (builder is! PSBTBUILDER) {
+      throw DartBitcoinPluginException(
+        "Failed to initialize PSBT builder. Type mismatch: Expected PsbtBuilder<$PSBTBUILDER>, but got ${builder.runtimeType}.",
+      );
+    }
+    return builder;
+  }
+
+  /// Creates a `PsbtBuilder` instance from a Base64-encoded PSBT string.
+  ///
+  /// This method:
+  /// - Decodes the Base64 string.
+  /// - Deserializes it into a `Psbt` object.
+  /// - Returns the correct `PsbtBuilder` subtype based on the PSBT version.
+  ///
+  static PSBTBUILDER fromBase64<PSBTBUILDER extends PsbtBuilder>(
+      String base64) {
+    final decode = StringUtils.tryEncode(base64, type: StringEncoding.base64);
+    if (decode == null) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT base64: Decoding failed or malformed input.");
+    }
+    return fromBytes(decode);
+  }
+
+  /// Creates a `PsbtBuilder` instance from a hex-encoded PSBT string.
+  ///
+  /// This method:
+  /// - Decodes the hex string.
+  /// - Deserializes it into a `Psbt` object.
+  /// - Returns the correct `PsbtBuilder` subtype based on the PSBT version.
+  ///
+  static PSBTBUILDER fromHex<PSBTBUILDER extends PsbtBuilder>(String psbtHex) {
+    final decode = BytesUtils.tryFromHexString(psbtHex);
+    if (decode == null) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT Hex: Decoding failed or malformed input.");
+    }
+    return fromBytes(decode);
+  }
+
+  /// Creates a `PsbtBuilder` instance from a PSBT bytes.
+  ///
+  /// This method:
+  /// - Deserializes it into a `Psbt` object.
+  /// - Returns the correct `PsbtBuilder` subtype based on the PSBT version.
+  ///
+  static PSBTBUILDER fromBytes<PSBTBUILDER extends PsbtBuilder>(
+      List<int> bytes) {
+    PsbtBuilder builder;
+    try {
+      final psbt = Psbt.deserialize(bytes);
+      switch (psbt.version) {
+        case PsbtVersion.v0:
+          builder = PsbtBuilderV0._(psbt);
+          break;
+        case PsbtVersion.v2:
+          builder = PsbtBuilderV2._(psbt);
+          break;
+      }
+    } catch (e) {
+      throw DartBitcoinPluginException(
+        "Invalid PSBT: Failed to deserialize.",
+        details: {"error": e.toString()},
+      );
+    }
+    if (builder is! PSBTBUILDER) {
+      throw DartBitcoinPluginException(
+        "Failed to initialize PSBT builder. Type mismatch: Expected PsbtBuilder<$PSBTBUILDER>, but got ${builder.runtimeType}.",
+      );
+    }
+    return builder;
+  }
+
+  /// Creates a deep copy (clone) of the current `PsbtBuilder` instance.
+  ///
+  /// This method clones the internal PSBT object and returns a new instance
+  /// of the `PsbtBuilder` subclass, allowing you to modify the copy without affecting the original.
+  ///
+  PsbtBuilder clone();
+}
diff --git a/lib/src/psbt/psbt_builder/impl/input.dart b/lib/src/psbt/psbt_builder/impl/input.dart
new file mode 100644
index 0000000..4b4351b
--- /dev/null
+++ b/lib/src/psbt/psbt_builder/impl/input.dart
@@ -0,0 +1,217 @@
+part of 'package:bitcoin_base/src/psbt/psbt_builder/builder.dart';
+
+mixin PsbtInputImpl on PsbtBuilderImpl {
+  /// Replaces the current input at the specified index.
+  ///
+  /// If the transaction ID (`txId`), transaction index (`txIndex`),
+  /// or sequence number changes, this will update the input accordingly.
+  ///
+  /// Note: If any existing input contains a signature with an unmodifiable
+  /// sighash (e.g., `SIGHASH_ALL`), or if an input is already finalized with
+  /// an unmodifiable sighash, this operation will result in an error.
+  void updateInput(int index, PsbtTransactionInput input) {
+    _updateTxInput(index, input);
+  }
+
+  /// Remove the current input at the specified index.
+  ///
+  /// Note: If any existing input contains a signature with an unmodifiable
+  /// sighash (e.g., `SIGHASH_ALL`), or if an input is already finalized with
+  /// an unmodifiable sighash, this operation will result in an error.
+  void removeInput(int index) {
+    _removeTxInput(index);
+  }
+
+  /// Adds a UTXO as an input to the PSBT.
+  ///
+  /// This method converts the given `PsbtUtxo` into a `PsbtTransactionInput`
+  /// and adds it to the transaction.
+  ///
+  /// Note: If any existing input contains a signature with an unmodifiable
+  /// sighash (e.g., `SIGHASH_ALL`), or if an input is already finalized with
+  /// an unmodifiable sighash, this operation will result in an error.
+  void addUtxo(PsbtUtxo psbtUtxo) {
+    addInput(PsbtTransactionInput.fromUtxo(psbtUtxo));
+  }
+
+  /// Adds a new transaction input to the PSBT.
+  ///
+  /// Note: If any existing input contains a signature with an unmodifiable
+  /// sighash (e.g., `SIGHASH_ALL`), or if an input is already finalized with
+  /// an unmodifiable sighash, this operation will result in an error.
+  void addInput(PsbtTransactionInput input) {
+    _addNewTxInput(input);
+  }
+
+  /// Adds multiple UTXOs as inputs to the PSBT.
+  ///
+  /// This method converts each `PsbtUtxo` in the list into a `PsbtTransactionInput`
+  /// and adds it to the transaction.
+  ///
+  /// Note: If any existing input contains a signature with an unmodifiable
+  /// sighash (e.g., `SIGHASH_ALL`), or if an input is already finalized with
+  /// an unmodifiable sighash, this operation will result in an error.
+  void addUtxos(List<PsbtUtxo> psbtUtxos) {
+    for (final i in psbtUtxos) {
+      addUtxo(i);
+    }
+  }
+
+  /// Adds a MuSig2 public nonce to the specified input in the PSBT.
+  ///
+  /// This method associates a `PsbtInputMuSig2PublicNonce` with the input at
+  /// the given index, which is required for the MuSig2 signing process.
+  void musig2AddPubKeyNonce(int index, PsbtInputMuSig2PublicNonce pubKeyNonce) {
+    _musig2AddPubKeyNonce(index, pubKeyNonce);
+  }
+
+  /// Finalizes the specified input in the PSBT.
+  ///
+  /// This method attempts to finalize the input at the given index.
+  ///
+  /// Note:
+  /// - If the input is already finalized, this method does nothing.
+  /// - If you are spending a custom script, you must provide an
+  ///   `onFinalizeInput` callback to handle the finalization manually;
+  ///   otherwise, the operation will fail.
+  void finalizeInput(int index, {ONFINALIZEINPUT? onFinalizeInput}) {
+    if (indexFinalized(index)) return;
+    final txInputs = this.txInputs();
+    PsbtFinalizeResponse? userFinalizedInput;
+    if (onFinalizeInput != null) {
+      final params = _generateFinalizeParams(index: index, txInputs: txInputs);
+      userFinalizedInput = onFinalizeInput(params);
+    }
+
+    final inputs = PsbtUtils.finalizeInput(
+        psbt: _psbt,
+        index: index,
+        txInputs: txInputs,
+        userFinalizedInput: userFinalizedInput,
+        unsignedTx: buildUnsignedTransaction());
+    _psbt.input.updateInputs(index, inputs.toPsbtInput());
+    _cleanFinalizedInput(index);
+  }
+
+  /// Finalizes the specified input in the PSBT.
+  ///
+  /// This method attempts to finalize the input at the given index.
+  ///
+  /// Note:
+  /// - If the input is already finalized, this method does nothing.
+  /// - If you are spending a custom script, you must provide an
+  ///   `onFinalizeInput` callback to handle the finalization manually;
+  ///   otherwise, the operation will fail.
+  Future<void> finalizeInputAsync(int index,
+      {ONFINALIZEINPUTASYNC? onFinalizeInput}) async {
+    if (indexFinalized(index)) return;
+    final txInputs = this.txInputs();
+    PsbtFinalizeResponse? userFinalizedInput;
+    if (onFinalizeInput != null) {
+      final params = _generateFinalizeParams(index: index, txInputs: txInputs);
+      userFinalizedInput = await onFinalizeInput(params);
+    }
+    final inputs = PsbtUtils.finalizeInput(
+        psbt: _psbt,
+        index: index,
+        txInputs: txInputs,
+        userFinalizedInput: userFinalizedInput,
+        unsignedTx: buildUnsignedTransaction());
+    _psbt.input.updateInputs(index, inputs.toPsbtInput());
+    _cleanFinalizedInput(index);
+  }
+
+  /// Finalizes all inputs in the PSBT and returns the finalized transaction.
+  ///
+  /// This method attempts to finalize each input in the PSBT.
+  ///
+  /// Note:
+  /// - If an input is already finalized, it will be skipped.
+  /// - If any input requires custom script handling, you must provide an
+  ///   `onFinalizeInput` callback to finalize it manually; otherwise,
+  ///   the operation may fail.
+  ///
+  /// Returns the finalized [BtcTransaction] if successful.
+  BtcTransaction finalizeAll({ONFINALIZEINPUT? onFinalizeInput}) {
+    for (int i = 0; i < _psbt.input.entries.length; i++) {
+      finalizeInput(i, onFinalizeInput: onFinalizeInput);
+    }
+    return _finalizeInputTx();
+  }
+
+  /// Finalizes all inputs in the PSBT and returns the finalized transaction.
+  ///
+  /// This method attempts to finalize each input in the PSBT.
+  ///
+  /// Note:
+  /// - If an input is already finalized, it will be skipped.
+  /// - If any input requires custom script handling, you must provide an
+  ///   `onFinalizeInput` callback to finalize it manually; otherwise,
+  ///   the operation may fail.
+  ///
+  /// Returns the finalized [BtcTransaction] if successful.
+  Future<BtcTransaction> finalizeAllAsync(
+      {ONFINALIZEINPUTASYNC? onFinalizeInput}) async {
+    for (int i = 0; i < _psbt.input.entries.length; i++) {
+      if (indexFinalized(i)) continue;
+      await finalizeInputAsync(i, onFinalizeInput: onFinalizeInput);
+    }
+    return _finalizeInputTx();
+  }
+
+  PsbtFinalizeParams _generateFinalizeParams(
+      {required int index, required List<TxInput> txInputs}) {
+    final scriptPubKey = PsbtUtils.getInputScriptPubKey(
+        psbt: _psbt, input: txInputs[index], index: index);
+    final address =
+        BitcoinScriptUtils.findAddressFromScriptPubKey(scriptPubKey);
+    final inputData = psbtInput(index);
+    return PsbtFinalizeParams(
+        index: index,
+        inputData: inputData,
+        scriptPubKey: scriptPubKey,
+        address: address);
+  }
+
+  void _cleanFinalizedInput(int index) {
+    if (indexFinalized(index)) {
+      _psbt.input.removeInputKeys(index, [
+        PsbtInputTypes.bip32DerivationPath,
+        PsbtInputTypes.taprootBip32Derivation,
+        PsbtInputTypes.partialSignature,
+        PsbtInputTypes.taprootScriptSpentSignature,
+        PsbtInputTypes.redeemScript,
+        PsbtInputTypes.taprootLeafScript,
+        PsbtInputTypes.witnessScript,
+        PsbtInputTypes.taprootMerkleRoot,
+        PsbtInputTypes.taprootInternalKey,
+        PsbtInputTypes.taprootLeafScript,
+        PsbtInputTypes.taprootKeySpentSignature,
+      ]);
+    }
+  }
+
+  BtcTransaction _finalizeInputTx() {
+    BtcTransaction finalTx = buildUnsignedTransaction();
+    List<TxWitnessInput> witnesses = [];
+    for (int i = 0; i < _psbt.input.entries.length; i++) {
+      final input = finalTx.inputs[i];
+      final finalizedScriptSig = _psbt.input
+          .getInput<PsbtInputFinalizedScriptSig>(
+              i, PsbtInputTypes.finalizedScriptSig);
+      final finalizedWitness = _psbt.input
+          .getInput<PsbtInputFinalizedScriptWitness>(
+              i, PsbtInputTypes.finalizedWitness);
+      if (finalizedScriptSig != null) {
+        input.scriptSig = finalizedScriptSig.finalizedScriptSig;
+      }
+      if (finalizedWitness != null) {
+        witnesses.add(finalizedWitness.finalizedScriptWitness);
+      }
+    }
+    if (witnesses.isNotEmpty) {
+      finalTx = finalTx.copyWith(witnesses: witnesses);
+    }
+    return finalTx;
+  }
+}
diff --git a/lib/src/psbt/psbt_builder/impl/output.dart b/lib/src/psbt/psbt_builder/impl/output.dart
new file mode 100644
index 0000000..5a5a94e
--- /dev/null
+++ b/lib/src/psbt/psbt_builder/impl/output.dart
@@ -0,0 +1,36 @@
+part of 'package:bitcoin_base/src/psbt/psbt_builder/builder.dart';
+
+mixin PsbtOutputImpl on PsbtBuilderImpl {
+  /// Adds a new transaction output to the PSBT.
+  ///
+  /// This method appends the given `PsbtTransactionOutput` to the transaction.
+  ///
+  /// Note: If any existing input contains a signature with an unmodifiable
+  /// sighash (e.g., `SIGHASH_ALL`), or if an input is already finalized with
+  /// an unmodifiable sighash, this operation will result in an error.
+  void addOutput(PsbtTransactionOutput output) {
+    _addNewTxOutput(output);
+  }
+
+  /// Updates an existing transaction output in the PSBT.
+  ///
+  /// Replaces the output at the specified index with a new `PsbtTransactionOutput`.
+  ///
+  /// Note: If any existing input contains a signature with an unmodifiable
+  /// sighash (e.g., `SIGHASH_ALL`), or if an input is already finalized with
+  /// an unmodifiable sighash, this operation will result in an error.
+  void updateOutput(int index, PsbtTransactionOutput output) {
+    _updateTxOutput(index, output);
+  }
+
+  /// Removes a transaction output from the PSBT.
+  ///
+  /// Deletes the output at the specified index.
+  ///
+  /// Note: If any existing input contains a signature with an unmodifiable
+  /// sighash (e.g., `SIGHASH_ALL`), or if an input is already finalized with
+  /// an unmodifiable sighash, this operation will result in an error.
+  void removeOutput(int index) {
+    _removeOutput(index);
+  }
+}
diff --git a/lib/src/psbt/psbt_builder/impl/signer.dart b/lib/src/psbt/psbt_builder/impl/signer.dart
new file mode 100644
index 0000000..36e29ed
--- /dev/null
+++ b/lib/src/psbt/psbt_builder/impl/signer.dart
@@ -0,0 +1,153 @@
+part of 'package:bitcoin_base/src/psbt/psbt_builder/builder.dart';
+
+mixin PsbtSignerImpl on PsbtBuilderImpl {
+  void _checkFinalizeInput(int index) {
+    if (PsbtUtils.finalized(index: index, input: _psbt.input)) {
+      throw DartBitcoinPluginException(
+          "Input at index $index is already finalized and cannot be modified.");
+    }
+  }
+
+  /// Signs the specified input in the PSBT using the provided signer function.
+  ///
+  /// This method signs the input at the given index using the `signer` callback.
+  ///
+  /// Note:
+  /// - If the input is already finalized, this method will fail and throw an error.
+  /// - The `signer` function will receive all relevant transaction and input data.
+  /// - The `signer` function should return one or multiple `PsbtSigner` or `PsbtMusig2Signer`
+  ///   objects, depending on the script's signature requirements.
+  ///
+  /// - If any required signer’s public key is not found in the script, signing will fail.
+  /// - If any signature does not pass verification, signing will fail.
+  /// - If spending a Taproot leaf script with multiple possible leaf scripts,
+  ///   you must determine the correct tapleafHash; otherwise, signing will fail.
+  ///
+  /// Throws an error if signing fails for any reason.
+  void signInput({required ONBTCSIGNER signer, required int index}) {
+    _checkFinalizeInput(index);
+    final txInputs = this.txInputs();
+    final params = PsbtUtils.getPsbtInputInfo(
+        psbt: _psbt, inputIndex: index, txInputs: txInputs);
+    final request = PsbtSignerParams(
+        scriptPubKey: params.scriptPubKey,
+        index: index,
+        inputData: psbtInput(index),
+        address: params.address);
+    final btcSigner = signer(request);
+    if (btcSigner == null || btcSigner.signers.isEmpty) return;
+    for (final signer in btcSigner.signers) {
+      final digest = PsbtUtils.generateInputTransactionDigest(
+          index: index,
+          unsignedTx: buildUnsignedTransaction(),
+          params: params,
+          input: _psbt.input,
+          tapleafHash: btcSigner.tapleafHash,
+          sighashType: btcSigner.sighash,
+          psbt: _psbt);
+      final signature = signer.btcSignInput(digest.createRequest(signer));
+      final psbtSignature = digest.createSignature(signature, signer);
+      final sighash = digest.getPsbtSigHash();
+      _psbt.input
+          .updateInputs(index, [psbtSignature, if (sighash != null) sighash]);
+    }
+  }
+
+  /// Signs all inputs in the PSBT using the provided signer function.
+  ///
+  /// This method iterates through all inputs and attempts to sign each one using
+  /// the `signer` callback.
+  ///
+  /// Note:
+  /// - If the input is already finalized, this method will fail and throw an error.
+  /// - The `signer` function will receive all relevant transaction and input data.
+  /// - The `signer` function should return one or multiple `PsbtSigner` or `PsbtMusig2Signer`
+  ///   objects, depending on the script's signature requirements.
+  ///
+  /// - If any required signer’s public key is not found in the script, signing will fail.
+  /// - If any signature does not pass verification, signing will fail.
+  /// - If spending a Taproot leaf script with multiple possible leaf scripts,
+  ///   you must determine the correct tapleafHash; otherwise, signing will fail.
+  ///
+  /// Throws an error if signing fails for any reason.
+  void signAllInput(ONBTCSIGNER signer) {
+    for (int i = 0; i < _psbt.input.entries.length; i++) {
+      if (indexFinalized(i)) continue;
+      signInput(index: i, signer: signer);
+    }
+  }
+
+  /// Signs all inputs in the PSBT using the provided signer function.
+  ///
+  /// This method iterates through all inputs and attempts to sign each one using
+  /// the `signer` callback.
+  ///
+  /// Note:
+  /// - If the input is already finalized, this method will fail and throw an error.
+  /// - The `signer` function will receive all relevant transaction and input data.
+  /// - The `signer` function should return one or multiple `PsbtSigner` or `PsbtMusig2Signer`
+  ///   objects, depending on the script's signature requirements.
+  ///
+  /// - If any required signer’s public key is not found in the script, signing will fail.
+  /// - If any signature does not pass verification, signing will fail.
+  /// - If spending a Taproot leaf script with multiple possible leaf scripts,
+  ///   you must determine the correct tapleafHash; otherwise, signing will fail.
+  ///
+  /// Throws an error if signing fails for any reason.
+  Future<void> signAllInputAsync(
+      {required ONBTCSIGNERASYNC signer, int? sighashType}) async {
+    for (int i = 0; i < _psbt.input.entries.length; i++) {
+      if (indexFinalized(i)) continue;
+      await signInputAsync(index: i, signer: signer, sighashType: sighashType);
+    }
+  }
+
+  /// Signs the specified input in the PSBT using the provided signer function.
+  ///
+  /// This method signs the input at the given index using the `signer` callback.
+  ///
+  /// Note:
+  /// - If the input is already finalized, this method will fail and throw an error.
+  /// - The `signer` function will receive all relevant transaction and input data.
+  /// - The `signer` function should return one or multiple `PsbtSigner` or `PsbtMusig2Signer`
+  ///   objects, depending on the script's signature requirements.
+  ///
+  /// - If any required signer’s public key is not found in the script, signing will fail.
+  /// - If any signature does not pass verification, signing will fail.
+  /// - If spending a Taproot leaf script with multiple possible leaf scripts,
+  ///   you must determine the correct tapleafHash; otherwise, signing will fail.
+  ///
+  /// Throws an error if signing fails for any reason.
+  Future<void> signInputAsync(
+      {required int index,
+      required ONBTCSIGNERASYNC signer,
+      int? sighashType}) async {
+    _checkFinalizeInput(index);
+    final txInputs = this.txInputs();
+    final params = PsbtUtils.getPsbtInputInfo(
+        psbt: _psbt, inputIndex: index, txInputs: txInputs);
+    final request = PsbtSignerParams(
+        scriptPubKey: params.scriptPubKey,
+        index: index,
+        inputData: psbtInput(index),
+        address: params.address);
+    final btcSigner = await signer(request);
+    if (btcSigner == null) return;
+    for (final signer in btcSigner.signers) {
+      final digest = PsbtUtils.generateInputTransactionDigest(
+          index: index,
+          unsignedTx: buildUnsignedTransaction(),
+          params: params,
+          input: _psbt.input,
+          tapleafHash: btcSigner.tapleafHash,
+          sighashType: sighashType,
+          psbt: _psbt);
+      final signature =
+          await signer.btcSignInputAsync(digest.createRequest(signer));
+      final psbtSignature = digest.createSignature(signature, signer);
+      final sighash = digest.getPsbtSigHash();
+      _psbt.input
+          .updateInputs(index, [psbtSignature, if (sighash != null) sighash]);
+    }
+  }
+}
diff --git a/lib/src/psbt/psbt_builder/types/internal_types.dart b/lib/src/psbt/psbt_builder/types/internal_types.dart
new file mode 100644
index 0000000..13a1a4f
--- /dev/null
+++ b/lib/src/psbt/psbt_builder/types/internal_types.dart
@@ -0,0 +1,693 @@
+import 'package:bitcoin_base/src/bitcoin/address/address.dart';
+import 'package:bitcoin_base/src/bitcoin/script/scripts.dart';
+import 'package:bitcoin_base/src/bitcoin/taproot/taproot.dart';
+import 'package:bitcoin_base/src/crypto/crypto.dart';
+import 'package:bitcoin_base/src/exception/exception.dart';
+import 'package:bitcoin_base/src/psbt/psbt.dart';
+import 'package:blockchain_utils/blockchain_utils.dart';
+
+enum PsbtTxType {
+  legacy,
+  witnessV0,
+  witnessV1;
+
+  bool get isLegacy => this == legacy;
+  bool get isSegwit => this != legacy;
+  bool get isP2tr => this == witnessV1;
+}
+
+abstract class PsbtInputInfo {
+  final PsbtTxType type;
+  abstract final Script redeemScript;
+  final Script scriptPubKey;
+  final BigInt amount;
+  final int index;
+  final Script? p2shRedeemScript;
+  final Script? witnessScript;
+  final BitcoinBaseAddress address;
+  bool get isScriptSpending =>
+      p2shRedeemScript != null || witnessScript != null;
+  PsbtInputInfo(
+      {required this.type,
+      required this.index,
+      required this.amount,
+      required this.scriptPubKey,
+      required this.address,
+      this.p2shRedeemScript,
+      this.witnessScript});
+  T cast<T extends PsbtInputInfo>() {
+    if (this is! T) {
+      throw DartBitcoinPluginException(
+          "Invalid cast: expected ${T.runtimeType}, but found $runtimeType.");
+    }
+    return this as T;
+  }
+}
+
+class PsbtNonTaprootInputInfo extends PsbtInputInfo {
+  @override
+  final Script redeemScript;
+  PsbtNonTaprootInputInfo._({
+    required super.p2shRedeemScript,
+    required this.redeemScript,
+    required super.index,
+    required super.scriptPubKey,
+    required super.amount,
+    required super.witnessScript,
+    required super.type,
+    required super.address,
+    // required super.existsSignatures,
+  });
+  factory PsbtNonTaprootInputInfo.legacy({
+    required Script? p2shRedeemScript,
+    required Script redeemScript,
+    required int index,
+    required Script scriptPubKey,
+    required BigInt amount,
+    required BitcoinBaseAddress address,
+    // required List<PsbtInputSignatures> existsSignatures,
+  }) {
+    return PsbtNonTaprootInputInfo._(
+      p2shRedeemScript: p2shRedeemScript,
+      redeemScript: redeemScript,
+      index: index,
+      scriptPubKey: scriptPubKey,
+      amount: amount,
+      witnessScript: null,
+      type: PsbtTxType.legacy,
+      address: address,
+    );
+  }
+  factory PsbtNonTaprootInputInfo.v0(
+      {required Script redeemScript,
+      required int index,
+      required Script scriptPubKey,
+      required BigInt amount,
+      required BitcoinBaseAddress address,
+      // required List<PsbtInputSignatures> existsSignatures,
+      Script? p2shRedeemScript,
+      Script? witnessScript}) {
+    return PsbtNonTaprootInputInfo._(
+        p2shRedeemScript: p2shRedeemScript,
+        redeemScript: redeemScript,
+        index: index,
+        scriptPubKey: scriptPubKey,
+        amount: amount,
+        witnessScript: witnessScript,
+        type: PsbtTxType.witnessV0,
+        address: address);
+  }
+}
+
+class PsbtTaprootInputInfo extends PsbtInputInfo {
+  final List<Script> allScriptPubKeys;
+  final List<BigInt> allAmounts;
+  final PsbtInputTaprootInternalKey internalPublicKey;
+  final PsbtInputTaprootMerkleRoot? merkleRoot;
+  final List<PsbtInputTaprootLeafScript>? tapleafScripts;
+  final PsbtMusig2InputInfo? musig2inputInfo;
+  bool get isKeyPath => tapleafScripts == null;
+  PsbtTaprootInputInfo(
+      {required super.index,
+      required super.amount,
+      required super.scriptPubKey,
+      required this.internalPublicKey,
+      List<PsbtInputTaprootLeafScript>? tapleafScripts,
+      this.merkleRoot,
+      required List<Script> allScriptPubKeys,
+      required List<BigInt> allAmounts,
+      required super.address,
+      required this.musig2inputInfo})
+      : allScriptPubKeys = allScriptPubKeys.immutable,
+        allAmounts = allAmounts.immutable,
+        tapleafScripts = tapleafScripts?.immutable,
+        super(type: PsbtTxType.witnessV1);
+
+  @override
+  Script get redeemScript => scriptPubKey;
+
+  @override
+  bool get isScriptSpending => merkleRoot != null;
+}
+
+class PsbtGeneratedTransactionDigest {
+  final List<int> digest;
+  final PsbtInputTaprootLeafScript? leafScript;
+  final int sighashType;
+  final PsbtInputInfo params;
+  final Psbt psbt;
+  PsbtGeneratedTransactionDigest(
+      {required List<int> digest,
+      this.leafScript,
+      required this.sighashType,
+      required this.params,
+      List<PsbtInputMuSig2PublicNonce>? aggNonce,
+      required this.psbt})
+      : digest = digest.asImmutableBytes;
+
+  PsbtInputData createSignature(
+      SignInputResponse signature, PsbtBtcSigner signer) {
+    final pubkey =
+        _validateSigner(signer.signerPublicKey, signer is PsbtBtcMusig2Signer);
+    if (params.type.isP2tr) {
+      final taprootParams = params.cast<PsbtTaprootInputInfo>();
+      if (signer is PsbtBtcMusig2Signer) {
+        final nonce = _getMusigSignerNonce(signature);
+        return PsbtInputMuSig2ParticipantPartialSignature(
+            publicKey: signer.signerPublicKey,
+            plainPublicKey: nonce.plainPublicKey,
+            tapleafHash: nonce.tapleafHash,
+            partialSignature: PsbtUtils.validateMusigPartialSignature(
+                signature: signature.signature, index: taprootParams.index));
+      }
+      final schnorrSignature = PsbtUtils.validateSchnorrSignature(
+          signature: signature.signature,
+          index: params.index,
+          expectedSighash: sighashType);
+      if (leafScript == null) {
+        return PsbtInputTaprootKeySpendSignature(schnorrSignature);
+      }
+
+      return PsbtInputTaprootScriptSpendSignature(
+          signature: schnorrSignature,
+          leafHash: leafScript!.leafScript.hash(),
+          xOnlyPubKey: signature.signerPublicKey.toXOnly());
+    }
+    final ecdsaSignature = PsbtUtils.validateEcdsaSignature(
+        signature: signature.signature,
+        index: params.index,
+        expectedSighash: sighashType);
+    return PsbtInputPartialSig(
+        signature: ecdsaSignature,
+        publicKey: signature.signerPublicKey.toBytes(
+            mode: pubkey!.mode == PsbtScriptKeyMode.compressed
+                ? PubKeyModes.compressed
+                : PubKeyModes.uncompressed));
+  }
+
+  PsbtInputMuSig2PublicNonce _getMusigSignerNonce(SignInputResponse signature) {
+    if (!params.type.isP2tr) {
+      throw DartBitcoinPluginException(
+          "MuSig2 Public Nonce Only Work with taproot input.");
+    }
+    final taprootParams = params.cast<PsbtTaprootInputInfo>();
+    final musig = taprootParams.musig2inputInfo;
+    if (musig == null) {
+      throw DartBitcoinPluginException(
+          "Missing MuSig2 participant public keys: PSBT input at index ${params.index} does not contain MuSig2 aggregated public keys.");
+    }
+    return musig.getMusigSignerNonce(
+        xOnly: taprootParams.internalPublicKey.xOnlyPubKey,
+        signerPublicKey: signature.signerPublicKey,
+        leafScript: leafScript?.leafScript);
+  }
+
+  List<int>? generateTaprootTweak() {
+    final taprootParams = params.cast<PsbtTaprootInputInfo>();
+    List<int>? tweak;
+    if (leafScript == null) {
+      tweak = TaprootUtils.calculateTweek(
+          taprootParams.internalPublicKey.xOnlyPubKey);
+    }
+    return tweak;
+  }
+
+  PsbtSignInputDigest createRequest(PsbtBtcSigner signer) {
+    _validateSigner(signer.signerPublicKey, signer is PsbtBtcMusig2Signer);
+    if (params.type == PsbtTxType.witnessV1) {
+      final taprootParams = params.cast<PsbtTaprootInputInfo>();
+      List<int>? tweak;
+      if (leafScript == null) {
+        tweak = TaprootUtils.calculateTweek(
+            taprootParams.internalPublicKey.xOnlyPubKey);
+      }
+      if (signer is PsbtBtcMusig2Signer) {
+        final musig = taprootParams.musig2inputInfo;
+        if (musig == null) {
+          throw DartBitcoinPluginException(
+              "Missing MuSig2 participant public keys: PSBT input at index ${params.index} does not contain MuSig2 aggregated public keys.");
+        }
+        return PsbtMusig2SigningInputDigest(
+            digest: digest,
+            aggNonce: musig.generateAggNonce(
+                xOnly: taprootParams.internalPublicKey.xOnlyPubKey,
+                aggPublicKey: signer.aggPublicKey,
+                leafScript: leafScript?.leafScript),
+            tweak: tweak);
+      } else {
+        return PsbtSigningInputDigest(
+            digest: digest,
+            isTaproot: true,
+            tweak: tweak,
+            sighash: sighashType);
+      }
+    } else {
+      return PsbtSigningInputDigest(
+          digest: digest, isTaproot: false, sighash: sighashType);
+    }
+  }
+
+  PsbtScriptKeyInfo? _validateSigner(ECPublic publicKey, bool isMusigPubKey) {
+    if (params.type.isP2tr && isMusigPubKey) {
+      final taprootParams = params.cast<PsbtTaprootInputInfo>();
+      final musig = taprootParams.musig2inputInfo;
+      if (musig == null) {
+        throw DartBitcoinPluginException(
+            "Missing MuSig2 participant public keys: PSBT input at index ${params.index}.");
+      }
+      return null;
+    }
+    if (params.isScriptSpending) {
+      final script = leafScript?.script ?? params.redeemScript;
+      final pubKey = PsbtUtils.findSciptKeyInfo(
+          publicKey: publicKey, script: script, type: params.type);
+      if (pubKey == null) {
+        throw DartBitcoinPluginException(
+            "Signer public key does not match the scriptPubKey for input ${params.index}.");
+      }
+      return pubKey;
+    } else {
+      if (params.type.isP2tr) {
+        final taprootParam = params.cast<PsbtTaprootInputInfo>();
+        if (!BytesUtils.bytesEqual(
+            publicKey.toXOnly(), taprootParam.internalPublicKey.xOnlyPubKey)) {
+          throw DartBitcoinPluginException(
+              "Signer public key does not match the internalPublicKey for input ${params.index}.");
+        }
+        return null;
+      }
+      final script = params.scriptPubKey;
+      final pubKey = PsbtUtils.findSciptKeyInfo(
+          publicKey: publicKey, script: script, type: params.type);
+      if (pubKey == null) {
+        throw DartBitcoinPluginException(
+            "Signer public key does not match the scriptPubKey for input ${params.index}.");
+      }
+      return pubKey;
+    }
+  }
+
+  PsbtInputPartialSig getPartialSignature() {
+    List<PsbtInputPartialSig> partialSigs = psbt.input
+            .getInputs<PsbtInputPartialSig>(
+                params.index, PsbtInputTypes.partialSignature) ??
+        [];
+    assert(!params.type.isP2tr);
+    final script =
+        params.isScriptSpending ? params.redeemScript : params.scriptPubKey;
+    partialSigs = partialSigs.where((e) {
+      return PsbtUtils.keyInScript(
+              publicKey: e.publicKey, script: script, type: params.type) &&
+          verifyEcdsaSignature(e);
+    }).toList();
+
+    if (partialSigs.isEmpty) {
+      throw DartBitcoinPluginException(
+          "No valid signature found for input ${params.index}.");
+    }
+    return partialSigs.first;
+  }
+
+  List<PsbtInputTaprootScriptSpendSignature> getTaprootScriptSignatures(
+      List<String> xOnlyKeys) {
+    final musig2Signatures = PsbtUtils.getReadyMusig2Signature(this);
+    List<PsbtInputTaprootScriptSpendSignature> partialSigs = [
+      ...psbt.input.getInputs<PsbtInputTaprootScriptSpendSignature>(
+              params.index, PsbtInputTypes.taprootScriptSpentSignature) ??
+          [],
+      if (musig2Signatures != null)
+        musig2Signatures.cast<PsbtInputTaprootScriptSpendSignature>(),
+    ];
+    partialSigs = partialSigs
+        .where((e) =>
+            xOnlyKeys.contains(e.xOnlyPubKeyHex) &&
+            BytesUtils.bytesEqual(e.leafHash, leafScript!.leafScript.hash()) &&
+            verifySchnorrSignature(
+                xOnly: e.xOnlyPubKey, signature: e.signature))
+        .toList();
+    if (partialSigs.isEmpty) {
+      throw DartBitcoinPluginException(
+          "No signature found for input ${params.index}.",
+          details: {"scriptPubKey": params.scriptPubKey.toString()});
+    }
+    return partialSigs;
+  }
+
+  bool verifyEcdsaSignature(PsbtInputPartialSig sig) {
+    try {
+      return sig.publicKey.verifyTransaactionSignature(digest, sig.signature);
+    } catch (_) {
+      return false;
+    }
+  }
+
+  List<PsbtInputPartialSig> getPartialSignatures(List<ECPublic> publicKeys) {
+    final partialSigs = psbt.input
+        .getInputs<PsbtInputPartialSig>(
+            params.index, PsbtInputTypes.partialSignature)
+        ?.where(
+            (e) => publicKeys.contains(e.publicKey) && verifyEcdsaSignature(e))
+        .toList();
+    if (partialSigs == null) {
+      throw DartBitcoinPluginException(
+          "No valid signature found for input ${params.index}.",
+          details: {"scriptPubKey": params.scriptPubKey.toString()});
+    }
+    return partialSigs;
+  }
+
+  String getScriptSha256(Script script) {
+    if (!BitcoinScriptUtils.isSha256(script)) {
+      throw DartBitcoinPluginException(
+          "The provided script does not match the expected SHA-256 script type.");
+    }
+    final hashBytes = BytesUtils.tryFromHexString(script.script[1]);
+    final hashesh = psbt.input
+        .getInputs<PsbtInputSha256>(params.index, PsbtInputTypes.sha256)
+        ?.firstWhereNullable((e) => BytesUtils.bytesEqual(e.hash, hashBytes));
+    if (hashesh == null) {
+      throw DartBitcoinPluginException(
+          "Failed to find matching input for the provided hash.",
+          details: {"scriptPubKey": params.scriptPubKey.toString()});
+    }
+    return hashesh.preImageHex();
+  }
+
+  String getScriptHash256(Script script) {
+    if (!BitcoinScriptUtils.isHash256(script)) {
+      throw DartBitcoinPluginException(
+          "The provided script does not match the expected HASH256 script type.");
+    }
+    final hashBytes = BytesUtils.tryFromHexString(script.script[1]);
+    final hashesh = psbt.input
+        .getInputs<PsbtInputHash256>(params.index, PsbtInputTypes.hash256)
+        ?.firstWhereNullable((e) => BytesUtils.bytesEqual(e.hash, hashBytes));
+    if (hashesh == null) {
+      throw DartBitcoinPluginException(
+          "Failed to find matching input for the provided hash.",
+          details: {"scriptPubKey": params.scriptPubKey.toString()});
+    }
+    return hashesh.preImageHex();
+  }
+
+  String getScriptHash160(Script script) {
+    if (!BitcoinScriptUtils.isHash160(script)) {
+      throw DartBitcoinPluginException(
+          "The provided script does not match the expected HASH160 script type.");
+    }
+    final hashBytes = BytesUtils.tryFromHexString(script.script[1]);
+    final hashesh = psbt.input
+        .getInputs<PsbtInputHash160>(params.index, PsbtInputTypes.hash160)
+        ?.firstWhereNullable((e) => BytesUtils.bytesEqual(e.hash, hashBytes));
+    if (hashesh == null) {
+      throw DartBitcoinPluginException(
+          "Failed to find matching input for the provided hash.",
+          details: {"scriptPubKey": params.scriptPubKey.toString()});
+    }
+    return hashesh.preImageHex();
+  }
+
+  String getScriptRipemd160(Script script) {
+    if (!BitcoinScriptUtils.isRipemd160(script)) {
+      throw DartBitcoinPluginException(
+          "The provided script does not match the expected RIPEMD160 script type.");
+    }
+    final hashBytes = BytesUtils.tryFromHexString(script.script[1]);
+    final hashesh = psbt.input
+        .getInputs<PsbtInputRipemd160>(params.index, PsbtInputTypes.ripemd160)
+        ?.firstWhereNullable((e) => BytesUtils.bytesEqual(e.hash, hashBytes));
+    if (hashesh == null) {
+      throw DartBitcoinPluginException(
+          "Failed to find matching input for the provided hash.",
+          details: {"scriptPubKey": params.scriptPubKey.toString()});
+    }
+    return hashesh.preImageHex();
+  }
+
+  bool verifySchnorrSignature(
+      {required List<int> xOnly, required List<int> signature}) {
+    try {
+      final tweak = generateTaprootTweak();
+      return BitcoinVerifier.verifySchnorrSignature(
+          xOnly: xOnly, message: digest, signature: signature, tweak: tweak);
+    } catch (_) {
+      return false;
+    }
+  }
+
+  String getTaprootKeyPathSignature() {
+    final taprootParams = params.cast<PsbtTaprootInputInfo>();
+    final musig = PsbtUtils.getReadyMusig2Signature(this)
+        ?.cast<PsbtInputTaprootKeySpendSignature>();
+    List<PsbtInputTaprootKeySpendSignature> signatures = [
+      ...psbt.input.getInputs<PsbtInputTaprootKeySpendSignature>(
+              params.index, PsbtInputTypes.taprootKeySpentSignature) ??
+          [],
+      if (musig != null) musig
+    ];
+    final signature = signatures.firstWhereNullable((e) =>
+        verifySchnorrSignature(
+            xOnly: taprootParams.internalPublicKey.xOnlyPubKey,
+            signature: e.signature));
+
+    if (signature == null) {
+      throw DartBitcoinPluginException(
+          "No valid signature found for input ${params.index} type P2TR key-path.");
+    }
+    return signature.signatureHex();
+  }
+
+  PsbtInputTaprootScriptSpendSignature getTaprootScriptSignature(String xOnly) {
+    return getTaprootScriptSignatures([xOnly]).first;
+  }
+
+  PsbtInputSigHash? getPsbtSigHash() {
+    if (params.type.isP2tr &&
+        sighashType != BitcoinOpCodeConst.sighashDefault) {
+      return PsbtInputSigHash(sighashType);
+    } else if (sighashType != BitcoinOpCodeConst.sighashAll) {
+      return PsbtInputSigHash(sighashType);
+    }
+    return null;
+  }
+}
+
+class PsbtInputSighashInfo {
+  final int inputIndex;
+  final int sighashType;
+  const PsbtInputSighashInfo(
+      {required this.inputIndex, required this.sighashType});
+  bool get isSighashAll => sighashType == BitcoinOpCodeConst.sighashAll;
+  bool get isSighashSignle => sighashType == BitcoinOpCodeConst.sighashSingle;
+  bool get isSighashNone => sighashType == BitcoinOpCodeConst.sighashNone;
+  bool get isSighashAllAnyOneCanPay =>
+      sighashType == BitcoinOpCodeConst.sighashAllAnyOneCanPay;
+  bool get isSighashSingleAnyOneCanPay =>
+      sighashType == BitcoinOpCodeConst.sighashSingleAnyOneCanPay;
+  bool get isSighashNoneAnyOneCanPay =>
+      sighashType == BitcoinOpCodeConst.sighashNoneAnyOneCanPay;
+
+  @override
+  String toString() {
+    if (isSighashAll) {
+      return "SIGHASH_ALL";
+    }
+    if (isSighashAllAnyOneCanPay) {
+      return "SIGHASH_ALL_ANYONECANPAY";
+    }
+    if (isSighashSignle) {
+      return "SIGHASH_SINGLE";
+    }
+    if (isSighashSingleAnyOneCanPay) {
+      return "SIGHASH_SINGLE_ANYONECANPAY";
+    }
+    if (isSighashNone) {
+      return "SIGHASH_NONE";
+    }
+    if (isSighashNoneAnyOneCanPay) {
+      return "SIGHASH_NONE_ANYONECANPAY";
+    }
+    return "0x${sighashType.toRadixString(16)}";
+  }
+
+  bool canModifyInput(int inputIndex) {
+    if (isSighashAllAnyOneCanPay ||
+        isSighashSingleAnyOneCanPay ||
+        isSighashNoneAnyOneCanPay) {
+      return inputIndex != this.inputIndex;
+    }
+    return false;
+  }
+
+  bool canModifyOutput(
+      {required int outputIndex,
+      required bool isUpdate,
+      required List<int> allSigashes}) {
+    if (isSighashAll || isSighashAllAnyOneCanPay) return false;
+    if (isSighashNone || isSighashNoneAnyOneCanPay) return true;
+    if (isSighashSignle || isSighashSingleAnyOneCanPay) {
+      if (isUpdate) return outputIndex != inputIndex;
+      if (outputIndex + 1 >= allSigashes.length) {
+        return outputIndex != inputIndex;
+      }
+      final r = allSigashes.sublist(outputIndex + 1);
+      return outputIndex != inputIndex &&
+          !r.contains(BitcoinOpCodeConst.sighashSingle) &&
+          !r.contains(BitcoinOpCodeConst.sighashSingle |
+              BitcoinOpCodeConst.sighashAnyoneCanPay);
+    }
+    return true;
+  }
+
+  @override
+  operator ==(other) {
+    if (identical(this, other)) return true;
+    if (other is! PsbtInputSighashInfo) return false;
+    return inputIndex == other.inputIndex && sighashType == other.sighashType;
+  }
+
+  @override
+  int get hashCode =>
+      HashCodeGenerator.generateHashCode([inputIndex, sighashType]);
+}
+
+enum PsbtScriptKeyMode {
+  xOnly,
+  compressed,
+  uncompressed;
+
+  static PsbtScriptKeyMode fromKeyString(String key) {
+    final toBytes = BytesUtils.tryFromHexString(key);
+    if (toBytes != null) {
+      if (toBytes.length == EcdsaKeysConst.pointCoordByteLen) return xOnly;
+      if (toBytes.length == EcdsaKeysConst.pubKeyCompressedByteLen) {
+        return compressed;
+      }
+      if (toBytes.length == EcdsaKeysConst.pubKeyUncompressedByteLen) {
+        return uncompressed;
+      }
+    }
+    throw DartBitcoinPluginException(
+        "Invalid key format: '$key'. Expected a valid hex string of length "
+        "${EcdsaKeysConst.pointCoordByteLen}, ${EcdsaKeysConst.pubKeyCompressedByteLen}, "
+        "or ${EcdsaKeysConst.pubKeyUncompressedByteLen}.");
+  }
+}
+
+class PsbtScriptKeyInfo {
+  final int index;
+  final String key;
+  final PsbtScriptKeyMode mode;
+  const PsbtScriptKeyInfo(
+      {required this.index, required this.key, required this.mode});
+}
+
+class PsbtMusig2InputInfo {
+  final List<PsbtInputMuSig2ParticipantPublicKeys> publicKeys;
+  final List<PsbtInputMuSig2PublicNonce> nonces;
+  final List<PsbtInputMuSig2ParticipantPartialSignature> partialSigs;
+  PsbtMusig2InputInfo({
+    required List<PsbtInputMuSig2ParticipantPublicKeys> publicKeys,
+    required List<PsbtInputMuSig2PublicNonce> nonces,
+    required List<PsbtInputMuSig2ParticipantPartialSignature> partialSigs,
+  })  : publicKeys = publicKeys.immutable,
+        nonces = nonces.immutable,
+        partialSigs = partialSigs.immutable;
+
+  List<PsbtInputMuSig2PublicNonce> getScriptNonces(TaprootLeaf leafScript) {
+    return nonces
+        .where((e) =>
+            BytesUtils.bytesEqual(e.tapleafHash, leafScript.hash()) &&
+            PsbtUtils.keyInScript(
+                keyStr: e.plainPublicKey.toXOnlyHex(),
+                script: leafScript.script))
+        .toList();
+  }
+
+  List<PsbtInputMuSig2PublicNonce> getNonScriptNonces(List<int> xOnly) {
+    return nonces
+        .where((e) =>
+            e.tapleafHash == null &&
+            BytesUtils.bytesEqual(e.plainPublicKey.toXOnly(), xOnly))
+        .toList();
+  }
+
+  List<PsbtInputMuSig2ParticipantPartialSignature> getScriptSignatures(
+      TaprootLeaf leafScript) {
+    return partialSigs
+        .where((e) =>
+            BytesUtils.bytesEqual(e.tapleafHash, leafScript.hash()) &&
+            PsbtUtils.keyInScript(
+                keyStr: e.plainPublicKey.toXOnlyHex(),
+                script: leafScript.script))
+        .toList();
+  }
+
+  List<PsbtInputMuSig2ParticipantPartialSignature> getNonScriptSignatures(
+      List<int> internalKey) {
+    return partialSigs
+        .where((e) =>
+            e.tapleafHash == null &&
+            BytesUtils.bytesEqual(e.plainPublicKey.toXOnly(), internalKey))
+        .toList();
+  }
+
+  PsbtInputMuSig2ParticipantPublicKeys? getScriptPublicKey(
+      TaprootLeaf leafScript) {
+    return publicKeys.firstWhereNullable((e) => PsbtUtils.keyInScript(
+        keyStr: e.aggregatePubKey.toXOnlyHex(), script: leafScript.script));
+  }
+
+  PsbtInputMuSig2ParticipantPublicKeys? getNonceScriptPublicKey(
+      List<int> internalKey) {
+    return publicKeys.firstWhereNullable(
+        (e) => BytesUtils.bytesEqual(e.aggregatePubKey.toXOnly(), internalKey));
+  }
+
+  List<int> generateAggNonce(
+      {required List<int> xOnly,
+      required ECPublic aggPublicKey,
+      TaprootLeaf? leafScript}) {
+    final aggKey = publicKeys.firstWhere(
+      (e) => e.aggregatePubKey == aggPublicKey,
+      orElse: () => throw DartBitcoinPluginException(
+          "MuSig2 participant public keys not found: No matching aggregate public key and participant set found."),
+    );
+    List<PsbtInputMuSig2PublicNonce> nonces = [];
+    if (leafScript == null) {
+      nonces = getNonScriptNonces(xOnly);
+    } else {
+      nonces = getScriptNonces(leafScript);
+    }
+    List<PsbtInputMuSig2PublicNonce> validNonces = [];
+    for (final i in aggKey.pubKeys) {
+      final nonce = nonces.firstWhereNullable((e) => e.publicKey == i);
+      if (nonce == null) break;
+      validNonces.add(nonce);
+    }
+    if (validNonces.length != aggKey.pubKeys.length) {
+      throw DartBitcoinPluginException(
+          "Unable to create aggregate nonce: The number of available nonces (${validNonces.length}) does not match the number of MuSig2 participant public keys (${aggKey.pubKeys.length}).");
+    }
+    return MuSig2.nonceAgg(nonces.map((e) => e.publicNonce).toList());
+  }
+
+  PsbtInputMuSig2PublicNonce getMusigSignerNonce(
+      {required List<int> xOnly,
+      required ECPublic signerPublicKey,
+      TaprootLeaf? leafScript}) {
+    List<PsbtInputMuSig2PublicNonce> nonces = [];
+    if (leafScript == null) {
+      nonces = getNonScriptNonces(xOnly);
+    } else {
+      nonces = getScriptNonces(leafScript);
+    }
+    return nonces.firstWhere((e) => e.publicKey == signerPublicKey);
+  }
+}
+
+class PsbtInputLocktime {
+  final bool isBlockBased;
+  final int timelock;
+  const PsbtInputLocktime({required this.isBlockBased, required this.timelock});
+}
diff --git a/lib/src/psbt/psbt_builder/types/types.dart b/lib/src/psbt/psbt_builder/types/types.dart
new file mode 100644
index 0000000..5b826a6
--- /dev/null
+++ b/lib/src/psbt/psbt_builder/types/types.dart
@@ -0,0 +1,1141 @@
+import 'package:bitcoin_base/src/bitcoin/address/address.dart';
+import 'package:bitcoin_base/src/bitcoin/script/scripts.dart';
+import 'package:bitcoin_base/src/bitcoin/taproot/taproot.dart';
+import 'package:bitcoin_base/src/crypto/crypto.dart';
+import 'package:bitcoin_base/src/exception/exception.dart';
+import 'package:bitcoin_base/src/provider/models/models.dart';
+import 'package:bitcoin_base/src/psbt/psbt.dart';
+import 'package:bitcoin_base/src/psbt/types/types/types.dart';
+import 'package:blockchain_utils/blockchain_utils.dart';
+
+typedef ONBTCSIGNER = PsbtSignerResponse? Function(PsbtSignerParams);
+typedef ONBTCSIGNERASYNC<INPUT extends PsbtTransactionInput>
+    = Future<PsbtSignerResponse?> Function(PsbtSignerParams);
+typedef ONUPDATEPSBTINPUT<INPUT extends PsbtTransactionInput> = INPUT Function(
+    INPUT);
+typedef ONFINALIZEINPUT<INPUT extends PsbtTransactionInput>
+    = PsbtFinalizeResponse? Function(PsbtFinalizeParams params);
+typedef ONFINALIZEINPUTASYNC<INPUT extends PsbtTransactionInput>
+    = Future<PsbtFinalizeResponse>? Function(PsbtFinalizeParams);
+
+class PsbtTransactionInput {
+  final TxInput txInput;
+  final PsbtInputSigHash? sigHashType;
+
+  // Mutually exclusive UTXO data
+  final PsbtInputNonWitnessUtxo? nonWitnessUtxo;
+  final PsbtInputWitnessUtxo? witnessUtxo;
+
+  // Scripts (cannot mix P2SH and P2WSH)
+  final PsbtInputRedeemScript? redeemScript;
+  final PsbtInputWitnessScript? witnessScript;
+
+  // BIP32 Key Path
+  final List<PsbtInputBip32DerivationPath>? bip32derivationPath;
+
+  // Taproot (conditional)
+  final PsbtInputTaprootInternalKey? taprootInternalKey;
+  final List<PsbtInputTaprootLeafScript>? taprootLeafScript;
+  final PsbtInputTaprootKeySpendSignature? taprootKeySpendSignature;
+  final List<PsbtInputTaprootScriptSpendSignature>? taprootScriptSpendSignature;
+  final PsbtInputTaprootMerkleRoot? taprootMerkleRoot;
+  final List<PsbtInputTaprootKeyBip32DerivationPath>?
+      taprootKeyBip32DerivationPath;
+
+  // MuSig2 (Optional, for multisig Taproot)
+  final List<PsbtInputMuSig2ParticipantPublicKeys>? muSig2ParticipantPublicKeys;
+  final List<PsbtInputMuSig2PublicNonce>? muSig2PublicNonce;
+  final List<PsbtInputMuSig2ParticipantPartialSignature>?
+      muSig2ParticipantPartialSignature;
+
+  // Optional (hashes & commitments)
+  final PsbtInputPorCommitments? porCommitments;
+  final List<PsbtInputRipemd160>? ripemd160;
+  final List<PsbtInputSha256>? sha256;
+  final List<PsbtInputHash160>? hash160;
+  final List<PsbtInputHash256>? hash256;
+
+  // Proprietary Use
+  final List<PsbtInputProprietaryUseType>? proprietaryUseType;
+
+  final List<PsbtInputPartialSig>? partialSigs;
+  final PsbtInputFinalizedScriptSig? finalizedScriptSig;
+  final PsbtInputFinalizedScriptWitness? finalizedScriptWitness;
+
+  final PsbtInputSilentPaymentInputECDHShare? silentPaymentInputECDHShare;
+  final PsbtInputSilentPaymentInputDLEQProof? silentPaymentInputDLEQProof;
+
+  factory PsbtTransactionInput.fromUtxo(PsbtUtxo psbtUtxo) {
+    final utxo = psbtUtxo.utxo;
+    if (utxo.isP2tr) {
+      return PsbtTransactionInput.witnessV1(
+        outIndex: utxo.vout,
+        txId: utxo.txHash,
+        nonWitnessUtxo: psbtUtxo.tx,
+        amount: utxo.value,
+        xOnlyOrInternalPubKey: psbtUtxo.xOnlyOrInternalPubKey,
+        treeScript: psbtUtxo.treeScript,
+        scriptPubKey: psbtUtxo.scriptPubKey,
+        merkleRoot: psbtUtxo.merkleRoot,
+        merkleProof: psbtUtxo.merkleProof,
+        leafScript: psbtUtxo.leafScript,
+        muSig2ParticipantPublicKeys: psbtUtxo.muSig2ParticipantPublicKeys,
+        hash160: psbtUtxo.hash160,
+        hash256: psbtUtxo.hash256,
+        ripemd160: psbtUtxo.ripemd160,
+        sha256: psbtUtxo.sha256,
+      );
+    } else if (utxo.isSegwit) {
+      return PsbtTransactionInput.witnessV0(
+        outIndex: utxo.vout,
+        txId: utxo.txHash,
+        nonWitnessUtxo: psbtUtxo.tx,
+        amount: utxo.value,
+        witnessScript: psbtUtxo.p2wshWitnessScript,
+        scriptPubKey: psbtUtxo.scriptPubKey,
+        redeemScript: psbtUtxo.p2shRedeemScript,
+        hash160: psbtUtxo.hash160,
+        hash256: psbtUtxo.hash256,
+        ripemd160: psbtUtxo.ripemd160,
+        sha256: psbtUtxo.sha256,
+      );
+    } else {
+      return PsbtTransactionInput.legacy(
+        outIndex: utxo.vout,
+        txId: utxo.txHash,
+        nonWitnessUtxo: psbtUtxo.tx,
+        scriptPubKey: psbtUtxo.scriptPubKey,
+        amount: utxo.value,
+        redeemScript: psbtUtxo.p2shRedeemScript,
+        hash160: psbtUtxo.hash160,
+        hash256: psbtUtxo.hash256,
+        ripemd160: psbtUtxo.ripemd160,
+        sha256: psbtUtxo.sha256,
+      );
+    }
+  }
+
+  PsbtTransactionInput._(
+      {this.sigHashType,
+      this.nonWitnessUtxo,
+      this.witnessUtxo,
+      this.redeemScript,
+      this.witnessScript,
+      this.bip32derivationPath,
+      this.taprootInternalKey,
+      this.taprootLeafScript,
+      this.taprootKeySpendSignature,
+      this.taprootScriptSpendSignature,
+      this.taprootMerkleRoot,
+      this.taprootKeyBip32DerivationPath,
+      this.muSig2ParticipantPublicKeys,
+      this.muSig2PublicNonce,
+      this.muSig2ParticipantPartialSignature,
+      this.porCommitments,
+      this.ripemd160,
+      this.sha256,
+      this.hash160,
+      this.hash256,
+      this.proprietaryUseType,
+      this.partialSigs,
+      this.finalizedScriptSig,
+      this.finalizedScriptWitness,
+      required this.txInput,
+      this.silentPaymentInputDLEQProof,
+      this.silentPaymentInputECDHShare});
+  factory PsbtTransactionInput.legacy(
+      {required int outIndex,
+      required String txId,
+      List<int>? sequence,
+      Script? scriptPubKey,
+      Script? redeemScript,
+      BitcoinBaseAddress? address,
+      int? sigHashType,
+      BtcTransaction? nonWitnessUtxo,
+      BigInt? amount,
+      List<PsbtInputBip32DerivationPath>? bip32derivationPath,
+      PsbtInputPorCommitments? porCommitments,
+      List<PsbtInputRipemd160>? ripemd160,
+      List<PsbtInputSha256>? sha256,
+      List<PsbtInputHash160>? hash160,
+      List<PsbtInputHash256>? hash256,
+      List<PsbtInputProprietaryUseType>? proprietaryUseType,
+      List<PsbtInputPartialSig>? partialSigs,
+      PsbtInputFinalizedScriptSig? finalizedScriptSig}) {
+    scriptPubKey ??= address?.toScriptPubKey();
+    if (nonWitnessUtxo == null) {
+      throw DartBitcoinPluginException("Missing input non-witness UTXOs.");
+    }
+    nonWitnessUtxo = PsbtUtils.cleanUpAdnValidateNonUtxoWitness(
+        transaction: nonWitnessUtxo, outIndex: outIndex, txId: txId);
+
+    final output = nonWitnessUtxo.outputs[outIndex];
+    if (scriptPubKey != null && output.scriptPubKey != scriptPubKey) {
+      throw DartBitcoinPluginException(
+          "Mismatch detected: The provided scriptPubKey does not match the nonWitnessUtxo output scriptPubKey.");
+    }
+    final type = PsbtUtils.findScriptType(output.scriptPubKey);
+    if (type.isSegwit) {
+      throw DartBitcoinPluginException(
+          "Incorrect scriptPubKey. Use `addWitnessV0Input` instead of `addLegacyInput`.",
+          details: {"type": type.name});
+    }
+    if (type.isP2sh) {
+      if (redeemScript == null) {
+        throw DartBitcoinPluginException(
+            "redeemScript is required to spend P2SH scripts.",
+            details: {"script": scriptPubKey?.script.join(", ")});
+      }
+      P2shAddress addr;
+      if (type.isP2sh32) {
+        addr = P2shAddress.fromScript32(script: redeemScript);
+      } else {
+        addr = P2shAddress.fromScript(script: redeemScript);
+      }
+      if (addr.toScriptPubKey() != output.scriptPubKey) {
+        throw DartBitcoinPluginException("Incorrect redeem script.",
+            details: {"type": type.name});
+      }
+    }
+    return PsbtTransactionInput._(
+        txInput: TxInput(txId: txId, txIndex: outIndex, sequance: sequence),
+        sigHashType: sigHashType == null ? null : PsbtInputSigHash(sigHashType),
+        nonWitnessUtxo: PsbtInputNonWitnessUtxo(nonWitnessUtxo),
+        redeemScript:
+            redeemScript == null ? null : PsbtInputRedeemScript(redeemScript),
+        bip32derivationPath: bip32derivationPath,
+        porCommitments: porCommitments,
+        ripemd160: ripemd160,
+        sha256: sha256,
+        hash160: hash160,
+        hash256: hash256,
+        proprietaryUseType: proprietaryUseType,
+        partialSigs: partialSigs,
+        finalizedScriptSig: finalizedScriptSig);
+  }
+
+  /// **Factory method with validation**
+  factory PsbtTransactionInput.witnessV0({
+    required int outIndex,
+    required String txId,
+    List<int>? sequence,
+    BigInt? amount,
+    Script? scriptPubKey,
+    Script? redeemScript,
+    BitcoinBaseAddress? address,
+    int? sigHashType,
+    BtcTransaction? nonWitnessUtxo,
+    Script? witnessScript,
+    List<PsbtInputBip32DerivationPath>? bip32derivationPath,
+    List<PsbtInputMuSig2ParticipantPublicKeys>? muSig2ParticipantPublicKeys,
+    List<PsbtInputMuSig2PublicNonce>? muSig2PublicNonce,
+    List<PsbtInputMuSig2ParticipantPartialSignature>?
+        muSig2ParticipantPartialSignature,
+    PsbtInputPorCommitments? porCommitments,
+    List<PsbtInputRipemd160>? ripemd160,
+    List<PsbtInputSha256>? sha256,
+    List<PsbtInputHash160>? hash160,
+    List<PsbtInputHash256>? hash256,
+    List<PsbtInputProprietaryUseType>? proprietaryUseType,
+    List<PsbtInputPartialSig>? partialSigs,
+    PsbtInputFinalizedScriptSig? finalizedScriptSig,
+    PsbtInputFinalizedScriptWitness? finalizedScriptWitness,
+  }) {
+    if (nonWitnessUtxo == null) {
+      if (scriptPubKey == null || amount == null) {
+        throw DartBitcoinPluginException(
+            "either 'nonWitnessUtxo' or both scriptPubKey and amount required.");
+      }
+    }
+
+    if (nonWitnessUtxo != null) {
+      nonWitnessUtxo = PsbtUtils.cleanUpAdnValidateNonUtxoWitness(
+          transaction: nonWitnessUtxo, outIndex: outIndex, txId: txId);
+
+      final output = nonWitnessUtxo.outputs[outIndex];
+      if (scriptPubKey != null) {
+        if (scriptPubKey != output.scriptPubKey) {
+          throw DartBitcoinPluginException(
+              "Mismatch between scriptPubKey and nonWitnessUtxo output scriptPubKey.");
+        }
+      }
+      scriptPubKey ??= output.scriptPubKey;
+      amount ??= output.amount;
+      if (amount != output.amount) {
+        throw DartBitcoinPluginException(
+            "Mismatch between amount and nonWitnessUtxo output amount.");
+      }
+    }
+    final type = PsbtUtils.findScriptType(scriptPubKey!);
+    if (type.isP2sh) {
+      if (nonWitnessUtxo == null) {
+        throw DartBitcoinPluginException("Missing input non-witness UTXOs.");
+      }
+      if (redeemScript == null) {
+        throw DartBitcoinPluginException(
+            "RedeemScript required for type P2SH.");
+      }
+      final p2shAddress = P2shAddress.fromScript(script: redeemScript);
+      if (p2shAddress.toScriptPubKey() != scriptPubKey) {
+        throw DartBitcoinPluginException(
+            "Mismatched scriptPubKey: The provided scriptPubKey does not match the one derived from the RedeemScript.");
+      }
+      if (witnessScript != null) {
+        final addr = P2wshAddress.fromScript(script: witnessScript);
+        P2shAddress p2shAddress =
+            P2shAddress.fromScript(script: addr.toScriptPubKey());
+        if (p2shAddress.toScriptPubKey() != scriptPubKey) {
+          throw DartBitcoinPluginException(
+              "Mismatched scriptPubKey: The provided scriptPubKey does not match the one derived from the WitnessScript.");
+        }
+      }
+    } else if (type.isP2tr) {
+      throw DartBitcoinPluginException(
+          "Use addP2trInput instead addWitnessV0Input for p2tr scriptPubKey.");
+    } else if (!type.isSegwit) {
+      throw DartBitcoinPluginException(
+          "Invalid segwit scriptPubKey. type: ${type.name}");
+    } else {
+      if (redeemScript != null) {
+        throw DartBitcoinPluginException(
+            "RedeemScript cannot be used to spend P2WPKH.");
+      }
+    }
+    if (type == ScriptPubKeyType.p2wsh) {
+      if (witnessScript == null) {
+        throw DartBitcoinPluginException(
+            "WitnessScript is required for P2WSH scriptPubKey.");
+      }
+      final addr = P2wshAddress.fromScript(script: witnessScript);
+      if (addr.toScriptPubKey() != scriptPubKey) {
+        throw DartBitcoinPluginException(
+            "Mismatched scriptPubKey: The provided scriptPubKey does not match the one derived from the WitnessScript.");
+      }
+    } else if (!type.isP2sh && witnessScript != null) {
+      throw DartBitcoinPluginException(
+          "WitnessScript cannot be used to spend P2WPKH.");
+    }
+    return PsbtTransactionInput._(
+      txInput: TxInput(txId: txId, txIndex: outIndex, sequance: sequence),
+      sigHashType: sigHashType == null ? null : PsbtInputSigHash(sigHashType),
+      nonWitnessUtxo: nonWitnessUtxo == null
+          ? null
+          : PsbtInputNonWitnessUtxo(nonWitnessUtxo),
+      witnessUtxo:
+          PsbtInputWitnessUtxo(amount: amount!, scriptPubKey: scriptPubKey),
+      redeemScript:
+          redeemScript == null ? null : PsbtInputRedeemScript(redeemScript),
+      witnessScript:
+          witnessScript == null ? null : PsbtInputWitnessScript(witnessScript),
+      bip32derivationPath: bip32derivationPath,
+      muSig2ParticipantPublicKeys: muSig2ParticipantPublicKeys,
+      muSig2PublicNonce: muSig2PublicNonce,
+      muSig2ParticipantPartialSignature: muSig2ParticipantPartialSignature,
+      porCommitments: porCommitments,
+      ripemd160: ripemd160,
+      sha256: sha256,
+      hash160: hash160,
+      hash256: hash256,
+      proprietaryUseType: proprietaryUseType,
+      finalizedScriptSig: finalizedScriptSig,
+      partialSigs: partialSigs,
+      finalizedScriptWitness: finalizedScriptWitness,
+    );
+  }
+
+  /// **Factory method with validation**
+  factory PsbtTransactionInput.witnessV1({
+    required int outIndex,
+    required String txId,
+    int? sigHashType,
+    List<int>? sequence,
+    BtcTransaction? nonWitnessUtxo,
+    BigInt? amount,
+    Script? scriptPubKey,
+    TapLeafMerkleProof? merkleProof,
+    TaprootTree? treeScript,
+    TaprootLeaf? leafScript,
+    List<int>? xOnlyOrInternalPubKey,
+    List<int>? merkleRoot,
+    List<PsbtInputBip32DerivationPath>? bip32derivationPath,
+    PsbtInputTaprootKeySpendSignature? taprootKeySpendSignature,
+    List<PsbtInputTaprootScriptSpendSignature>? taprootScriptSpendSignature,
+    List<PsbtInputTaprootKeyBip32DerivationPath>? taprootKeyBip32DerivationPath,
+    List<PsbtInputMuSig2ParticipantPublicKeys>? muSig2ParticipantPublicKeys,
+    List<PsbtInputMuSig2PublicNonce>? muSig2PublicNonce,
+    List<PsbtInputMuSig2ParticipantPartialSignature>?
+        muSig2ParticipantPartialSignature,
+    PsbtInputPorCommitments? porCommitments,
+    List<PsbtInputRipemd160>? ripemd160,
+    List<PsbtInputSha256>? sha256,
+    List<PsbtInputHash160>? hash160,
+    List<PsbtInputHash256>? hash256,
+    List<PsbtInputProprietaryUseType>? proprietaryUseType,
+
+    ///
+    PsbtInputSilentPaymentInputECDHShare? silentPaymentInputECDHShare,
+    PsbtInputSilentPaymentInputDLEQProof? silentPaymentInputDLEQProof,
+  }) {
+    if (nonWitnessUtxo == null) {
+      if (scriptPubKey == null || amount == null) {
+        throw DartBitcoinPluginException(
+            "either 'nonWitnessUtxo' or both scriptPubKey and amount required.");
+      }
+    }
+    if (nonWitnessUtxo != null) {
+      nonWitnessUtxo = PsbtUtils.cleanUpAdnValidateNonUtxoWitness(
+          transaction: nonWitnessUtxo, outIndex: outIndex, txId: txId);
+      final output = nonWitnessUtxo.outputs[outIndex];
+      if (scriptPubKey != null) {
+        if (scriptPubKey != output.scriptPubKey) {
+          throw DartBitcoinPluginException(
+              "Mismatch between scriptPubKey and nonWitnessUtxo output scriptPubKey.");
+        }
+      }
+      scriptPubKey ??= output.scriptPubKey;
+      amount ??= output.amount;
+      if (amount != output.amount) {
+        throw DartBitcoinPluginException(
+            "Mismatch between amount and nonWitnessUtxo output amount.");
+      }
+    }
+
+    final type = PsbtUtils.findScriptType(scriptPubKey!);
+    if (!type.isP2tr) {
+      throw DartBitcoinPluginException(
+          "Invalid P2TR scriptPubKey detected: ${type.name}.");
+    }
+    xOnlyOrInternalPubKey ??= merkleProof?.controlBlock.xOnly;
+
+    if (xOnlyOrInternalPubKey == null) {
+      throw DartBitcoinPluginException(
+          "xOnlyOrInternalPubKey is required for spending Taproot UTXOs but was not found.");
+    }
+    xOnlyOrInternalPubKey = TaprootUtils.toXOnly(xOnlyOrInternalPubKey);
+    final isScriptPath = leafScript != null ||
+        treeScript != null ||
+        merkleProof != null ||
+        merkleRoot != null;
+    if (merkleRoot != null) {
+      final addr = P2trAddress.fromInternalKey(
+          internalKey: xOnlyOrInternalPubKey, merkleRoot: merkleRoot);
+      if (addr.toScriptPubKey() != scriptPubKey) {
+        throw DartBitcoinPluginException(
+            "Mismatch between scriptPubKey and the one derived from x-only key and merkle root.");
+      }
+    }
+    List<PsbtInputTaprootLeafScript>? leafScripts;
+    if (isScriptPath) {
+      if (merkleProof == null && treeScript == null) {
+        throw DartBitcoinPluginException(
+            "Script path spending requires merkleProof. Provide merkleProof or treeScript to generate all possible proofs.");
+      }
+      if (merkleRoot == null && treeScript == null) {
+        throw DartBitcoinPluginException(
+            "Script path spending requires merkleRoot. Provide merkleRoot or treeScript to generate one.");
+      }
+      merkleRoot ??= treeScript!.hash();
+      if (merkleProof == null && leafScript != null) {
+        merkleProof = TapLeafMerkleProof.generate(
+            xOnlyOrInternalPubKey: xOnlyOrInternalPubKey,
+            leafScript: leafScript,
+            scriptTree: treeScript!);
+      }
+      if (merkleProof != null) {
+        leafScripts = [
+          PsbtInputTaprootLeafScript(
+              controllBlock: merkleProof.controlBlock.toBytes(),
+              script: merkleProof.script.script,
+              leafVersion: merkleProof.script.leafVersion)
+        ];
+      } else {
+        final leafs = TaprootUtils.generateAllPossibleProofs(
+            xOnlyOrInternalPubKey: xOnlyOrInternalPubKey,
+            treeScript: treeScript!);
+        leafScripts = leafs
+            .map((e) => PsbtInputTaprootLeafScript(
+                controllBlock: e.controlBlock.toBytes(),
+                script: e.script.script,
+                leafVersion: e.script.leafVersion))
+            .toList();
+      }
+    }
+    return PsbtTransactionInput._(
+        txInput: TxInput(txId: txId, txIndex: outIndex, sequance: sequence),
+        witnessUtxo:
+            PsbtInputWitnessUtxo(amount: amount!, scriptPubKey: scriptPubKey),
+        bip32derivationPath: bip32derivationPath,
+        taprootInternalKey: PsbtInputTaprootInternalKey(xOnlyOrInternalPubKey),
+        taprootLeafScript: leafScripts,
+        taprootKeySpendSignature: taprootKeySpendSignature,
+        taprootScriptSpendSignature: taprootScriptSpendSignature,
+        taprootMerkleRoot:
+            merkleRoot == null ? null : PsbtInputTaprootMerkleRoot(merkleRoot),
+        taprootKeyBip32DerivationPath: taprootKeyBip32DerivationPath,
+        muSig2ParticipantPublicKeys: muSig2ParticipantPublicKeys,
+        muSig2PublicNonce: muSig2PublicNonce,
+        muSig2ParticipantPartialSignature: muSig2ParticipantPartialSignature,
+        porCommitments: porCommitments,
+        ripemd160: ripemd160,
+        sha256: sha256,
+        sigHashType: sigHashType == null ? null : PsbtInputSigHash(sigHashType),
+        hash160: hash160,
+        hash256: hash256,
+        proprietaryUseType: proprietaryUseType,
+        silentPaymentInputDLEQProof: silentPaymentInputDLEQProof,
+        silentPaymentInputECDHShare: silentPaymentInputECDHShare);
+  }
+  factory PsbtTransactionInput.generateFromInput({
+    required int index,
+    required PsbtInput input,
+    required TxInput txInput,
+  }) {
+    return PsbtTransactionInput._(
+      txInput: txInput,
+      bip32derivationPath:
+          input.getInputs(index, PsbtInputTypes.bip32DerivationPath),
+      hash160: input.getInputs(index, PsbtInputTypes.hash160),
+      hash256: input.getInputs(index, PsbtInputTypes.hash256),
+      muSig2ParticipantPartialSignature: input.getInputs(
+          index, PsbtInputTypes.muSig2ParticipantPartialSignature),
+      muSig2ParticipantPublicKeys:
+          input.getInputs(index, PsbtInputTypes.muSig2ParticipantPublicKeys),
+      muSig2PublicNonce:
+          input.getInputs(index, PsbtInputTypes.muSig2PublicNonce),
+      partialSigs: input.getInputs(index, PsbtInputTypes.partialSignature),
+      nonWitnessUtxo: input.getInput(index, PsbtInputTypes.nonWitnessUTXO),
+      porCommitments: input.getInput(index, PsbtInputTypes.porCommitments),
+      redeemScript: input.getInput(index, PsbtInputTypes.redeemScript),
+      ripemd160: input.getInputs(index, PsbtInputTypes.ripemd160),
+      sha256: input.getInputs(index, PsbtInputTypes.sha256),
+      proprietaryUseType:
+          input.getInputs(index, PsbtInputTypes.proprietaryUseType),
+      sigHashType: input.getInput(index, PsbtInputTypes.sighashType),
+      taprootInternalKey:
+          input.getInput(index, PsbtInputTypes.taprootInternalKey),
+      taprootKeyBip32DerivationPath:
+          input.getInputs(index, PsbtInputTypes.bip32DerivationPath),
+      taprootLeafScript:
+          input.getInputs(index, PsbtInputTypes.taprootLeafScript),
+      taprootScriptSpendSignature:
+          input.getInputs(index, PsbtInputTypes.taprootScriptSpentSignature),
+      witnessUtxo: input.getInput(index, PsbtInputTypes.witnessUTXO),
+      witnessScript: input.getInput(index, PsbtInputTypes.witnessScript),
+      taprootMerkleRoot:
+          input.getInput(index, PsbtInputTypes.taprootMerkleRoot),
+      taprootKeySpendSignature:
+          input.getInput(index, PsbtInputTypes.taprootKeySpentSignature),
+      finalizedScriptSig:
+          input.getInput(index, PsbtInputTypes.finalizedScriptSig),
+      finalizedScriptWitness:
+          input.getInput(index, PsbtInputTypes.finalizedWitness),
+    );
+  }
+
+  List<PsbtInputData> toPsbtInputs(PsbtVersion version) {
+    final List<PsbtInputData?> inputs = [
+      if (version == PsbtVersion.v2) ...[
+        PsbtInputPreviousTXID.fromHex(txInput.txId),
+        PsbtInputSpentOutputIndex(txInput.txIndex),
+        silentPaymentInputDLEQProof,
+        silentPaymentInputECDHShare,
+        PsbtUtils.getPsbtSequenceInputData(txInput),
+      ],
+      sigHashType,
+      nonWitnessUtxo,
+      witnessUtxo,
+      redeemScript,
+      witnessScript,
+      ...bip32derivationPath ?? [],
+      taprootInternalKey,
+      ...taprootLeafScript ?? [],
+      taprootKeySpendSignature,
+      ...taprootScriptSpendSignature ?? [],
+      taprootMerkleRoot,
+      ...taprootKeyBip32DerivationPath ?? [],
+      ...muSig2ParticipantPublicKeys ?? [],
+      ...muSig2PublicNonce ?? [],
+      ...muSig2ParticipantPartialSignature ?? [],
+      porCommitments,
+      ...ripemd160 ?? [],
+      ...sha256 ?? [],
+      ...hash160 ?? [],
+      ...hash256 ?? [],
+      ...proprietaryUseType ?? []
+    ];
+    return inputs.whereType<PsbtInputData>().toList();
+  }
+}
+
+class PsbtUtxo {
+  /// The UTXO (Unspent Transaction Output) information.
+  final BitcoinUtxo utxo;
+
+  /// The full transaction that created this UTXO, if available.
+  /// This is required for non-segwit inputs when signing.
+  final BtcTransaction? tx;
+
+  /// The scriptPubKey of the UTXO being spent.
+  /// This represents the locking script that restricts spending.
+  final Script scriptPubKey;
+
+  /// The redeem script for a P2SH (Pay-to-Script-Hash) UTXO.
+  /// This is required if the UTXO is wrapped in a P2SH script.
+  final Script? p2shRedeemScript;
+
+  /// The witness script for a P2WSH (Pay-to-Witness-Script-Hash) UTXO.
+  /// This is required if the UTXO is a SegWit v0 P2WSH output.
+  final Script? p2wshWitnessScript;
+
+  /// The merkle proof for a Taproot UTXO, proving the inclusion of the
+  /// spending script in the Taproot commitment.
+  final TapLeafMerkleProof? merkleProof;
+
+  /// The Taproot script tree containing the various spending conditions.
+  /// This is used in Taproot scripts where multiple spending conditions exist.
+  final TaprootTree? treeScript;
+
+  /// The specific Taproot script leaf being used for spending.
+  /// This is required when spending via a TapLeaf path.
+  final TaprootLeaf? leafScript;
+
+  /// The internal or x-only public key for Taproot UTXOs.
+  /// This is the key used in key-path spends or as part of script-path spends.
+  final List<int>? xOnlyOrInternalPubKey;
+
+  /// The Merkle root of the Taproot script tree, proving the structure of the tree.
+  /// Required for Taproot script-path spending.
+  final List<int>? merkleRoot;
+
+  /// The list of individual TapLeaf merkle proofs used in script-path spending.
+  /// Each proof shows how a leaf is part of the Taproot commitment.
+  final List<TapLeafMerkleProof>? leafScripts;
+  final List<ECPrivate> privateKeys;
+  final List<PsbtInputMuSig2ParticipantPublicKeys>? muSig2ParticipantPublicKeys;
+
+  final List<PsbtInputRipemd160>? ripemd160;
+  final List<PsbtInputSha256>? sha256;
+  final List<PsbtInputHash160>? hash160;
+  final List<PsbtInputHash256>? hash256;
+
+  const PsbtUtxo(
+      {required this.utxo,
+      required this.privateKeys,
+      this.tx,
+      required this.scriptPubKey,
+      this.xOnlyOrInternalPubKey,
+      this.p2shRedeemScript,
+      this.p2wshWitnessScript,
+      this.leafScripts,
+      this.merkleRoot,
+      this.leafScript,
+      this.merkleProof,
+      this.treeScript,
+      this.muSig2ParticipantPublicKeys,
+      this.ripemd160,
+      this.hash160,
+      this.hash256,
+      this.sha256});
+  factory PsbtUtxo.fromJson(Map<String, dynamic> json) {
+    return PsbtUtxo(
+        utxo: BitcoinUtxo.fromJson(json["utxo"]),
+        privateKeys: (json["privateKeys"] as List)
+            .map(
+              (e) => ECPrivate.fromHex(e),
+            )
+            .toList(),
+        tx: json["tx"] == null
+            ? null
+            : BtcTransaction.deserialize(BytesUtils.fromHexString(json["tx"])),
+        scriptPubKey: Script.fromJson(json["scriptpubkey"]),
+        p2shRedeemScript: json["p2sh_redeem_script"] == null
+            ? null
+            : Script.fromJson(json["p2sh_redeem_script"]),
+        p2wshWitnessScript: json["p2wsh_witness_script"] == null
+            ? null
+            : Script.fromJson(json["p2wsh_witness_script"]),
+        merkleProof: json["merkle_proof"] == null
+            ? null
+            : TapLeafMerkleProof.fromJson(json["merkle_proof"]),
+        treeScript: json["tree_script"] == null
+            ? null
+            : TaprootTree.fromJson(json["tree_script"]),
+        leafScript: json["leaf_script"] == null
+            ? null
+            : TaprootLeaf.fromJson(json["leaf_script"]),
+        xOnlyOrInternalPubKey: BytesUtils.tryFromHexString(json["xonly"]),
+        merkleRoot: BytesUtils.tryFromHexString(json["merkle_root"]),
+        leafScripts: (json["leaf_scripts"] as List?)
+            ?.map((e) => TapLeafMerkleProof.fromJson(e))
+            .toList());
+  }
+
+  Map<String, dynamic> toJson() {
+    return {
+      "utxo": utxo.toJson(),
+      "tx": tx?.toHex(),
+      "scriptpubkey": scriptPubKey.toJson(),
+      "p2sh_redeem_script": p2shRedeemScript?.toJson(),
+      "p2wsh_witness_script": p2wshWitnessScript?.toJson(),
+      "merkle_proof": merkleProof?.toJson(),
+      "tree_script": treeScript?.toJson(),
+      "leaf_script": leafScript?.toJson(),
+      "xonly": BytesUtils.tryToHexString(xOnlyOrInternalPubKey),
+      "merkle_root": BytesUtils.tryToHexString(merkleRoot),
+      "leaf_scripts": leafScripts?.map((e) => e.toJson()).toList(),
+      "privateKeys": privateKeys.map((e) => e.toHex()).toList()
+    };
+  }
+}
+
+class PsbtFinalizeParams {
+  /// The `scriptPubKey` of the input.
+  final Script scriptPubKey;
+
+  /// All related PSBT input data for this input.
+  final PsbtTransactionInput inputData;
+
+  /// The index of the input in the transaction.
+  final int index;
+
+  /// The Bitcoin address derived from `scriptPubKey`.
+  final BitcoinBaseAddress address;
+  const PsbtFinalizeParams(
+      {required this.index,
+      required this.inputData,
+      required this.scriptPubKey,
+      required this.address});
+}
+
+class PsbtFinalizeResponse {
+  /// If you are spending a custom script, you must provide an
+  /// to handle the finalization manually/
+  final PsbtFinalizeInput? finalizeInput;
+
+  /// The TapLeaf hash used when signing a Taproot script.
+  /// - Required if the input is a Tapscript with multiple leaf scripts.
+  /// - You must specify the correct leaf script to sign.
+  final List<int>? tapleafHash;
+  PsbtFinalizeResponse({
+    this.finalizeInput,
+    List<int>? tapleafHash,
+  }) : tapleafHash = tapleafHash?.asImmutableBytes;
+}
+
+/// Represents the finalized script signature and witness data for a PSBT input.
+///
+/// This class is used when finalizing a PSBT input, allowing the user to provide
+/// either a legacy/scriptSig-based signature or a SegWit/Taproot witness.
+class PsbtFinalizeInput {
+  final Script? scriptSig;
+  final TxWitnessInput? witness;
+  const PsbtFinalizeInput({this.scriptSig, this.witness});
+
+  List<PsbtInputData> toPsbtInput() {
+    return [
+      if (scriptSig != null) PsbtInputFinalizedScriptSig(scriptSig!),
+      if (witness != null) PsbtInputFinalizedScriptWitness(witness!),
+    ];
+  }
+}
+
+/// Represents a BIP32 or Taproot key derivation request in a PSBT transaction.
+/// This class combines `PsbtInputBip32Derivation` and `PsbtInputTaprootBip32Derivation`
+/// into a unified structure.
+class BipOrTaprootKeyDerivationRequest {
+  /// A compressed/uncompressed ECDSA public key (for BIP32 derivation),
+  /// OR an x-only Taproot public key (for Taproot derivation).
+  final List<int> pubKeyOrXonly;
+
+  /// A list of BIP32 key indexes representing the derivation path.
+  final List<Bip32KeyIndex> indexes;
+
+  /// The BIP32 parent fingerprint of the key.
+  final List<int> fingerprint;
+
+  /// A list of Taproot leaf hashes (only required for Taproot derivation).
+  final List<List<int>>? leavesHashes;
+  String get path {
+    return Bip32Path(elems: indexes).toString();
+  }
+
+  BipOrTaprootKeyDerivationRequest._(
+      {required List<int> pubKeyOrXonly,
+      required List<Bip32KeyIndex> indexes,
+      required List<int> fingerprint,
+      List<List<int>>? leavesHashes})
+      : pubKeyOrXonly = pubKeyOrXonly.asImmutableBytes,
+        indexes = indexes.immutable,
+        fingerprint = fingerprint.asImmutableBytes,
+        leavesHashes =
+            leavesHashes?.map((e) => e.asImmutableBytes).toImutableList;
+  factory BipOrTaprootKeyDerivationRequest(
+      {required List<int> pubKeyOrXonly,
+      required List<Bip32KeyIndex> indexes,
+      required List<int> fingerprint,
+      List<List<int>>? leavesHashes}) {
+    if (leavesHashes != null) {
+      if (pubKeyOrXonly.length != EcdsaKeysConst.pointCoordByteLen) {
+        throw DartBitcoinPluginException("Invalid Public key XOnly key length.",
+            details: {
+              "excpected": EcdsaKeysConst.pointCoordByteLen,
+              "length": pubKeyOrXonly.length
+            });
+      }
+    } else if (pubKeyOrXonly.length != EcdsaKeysConst.pubKeyCompressedByteLen &&
+        pubKeyOrXonly.length != EcdsaKeysConst.pubKeyUncompressedByteLen) {
+      throw DartBitcoinPluginException("Invalid Public key length.", details: {
+        "excpected": EcdsaKeysConst.pubKeyCompressedByteLen,
+        "length": pubKeyOrXonly.length
+      });
+    }
+    if (fingerprint.length != Bip32KeyDataConst.fingerprintByteLen) {
+      throw DartBitcoinPluginException("Invalid Fingerprint key length.",
+          details: {
+            "excpected": Bip32KeyDataConst.fingerprintByteLen,
+            "length": pubKeyOrXonly.length
+          });
+    }
+    return BipOrTaprootKeyDerivationRequest._(
+        pubKeyOrXonly: pubKeyOrXonly,
+        indexes: indexes,
+        fingerprint: fingerprint,
+        leavesHashes: leavesHashes);
+  }
+  Bip32Slip10Secp256k1 derive(Bip32Slip10Secp256k1 masterKey) {
+    if (masterKey.curveType != EllipticCurveTypes.secp256k1) {
+      throw DartBitcoinPluginException("Invalid master key curve type.");
+    }
+    Bip32Slip10Secp256k1 key = masterKey;
+    for (final i in indexes) {
+      key = key.childKey(i);
+    }
+    if (pubKeyOrXonly.length == EcdsaKeysConst.pointCoordByteLen) {
+      if (!BytesUtils.bytesEqual(pubKeyOrXonly,
+          key.publicKey.key.point.cast<ProjectiveECCPoint>().toXonly())) {
+        throw DartBitcoinPluginException(
+            "Mismatch between derived key public key (x-only) and expected x-only.");
+      }
+    } else if (IPublicKey.fromBytes(
+            pubKeyOrXonly, EllipticCurveTypes.secp256k1) !=
+        key.publicKey.key) {
+      throw DartBitcoinPluginException(
+          "Mismatch between derived key public key and expected public key.");
+    }
+    return key;
+  }
+}
+
+class PsbtSignerResponse {
+  /// A list of signers required to sign the input.
+  /// - If empty, the signing operation is rejected.
+  final List<PsbtBtcSigner> signers;
+
+  /// The SIGHASH flag used for signing.
+  /// - If `null`, the default is applied:
+  ///   - **Segwit/Legacy:** Uses `SIGHASH_ALL`
+  ///   - **Taproot:** Uses `SIGHASH_DEFAULT`
+  final int? sighash;
+
+  /// The TapLeaf hash used when signing a Taproot script.
+  /// - Required if the input is a Tapscript with multiple leaf scripts.
+  /// - You must specify the correct leaf script to sign.
+  final List<int>? tapleafHash;
+
+  PsbtSignerResponse({
+    required List<PsbtBtcSigner> signers,
+    List<int>? tapleafHash,
+    this.sighash,
+  })  : signers = signers.immutable,
+        tapleafHash = tapleafHash?.asImmutableBytes;
+}
+
+class PsbtSignerParams {
+  /// The `scriptPubKey` of the input.
+  final Script scriptPubKey;
+
+  /// All related PSBT input data for this input.
+  final PsbtTransactionInput inputData;
+
+  /// The index of the input in the transaction.
+  final int index;
+
+  /// The Bitcoin address derived from `scriptPubKey`.
+  final BitcoinBaseAddress address;
+
+  PsbtSignerParams({
+    required this.scriptPubKey,
+    required this.inputData,
+    required this.index,
+    required this.address,
+  });
+}
+
+class PsbtTransactionOutput {
+  List<PsbtOutputData> toPsbtOutput(PsbtVersion version) {
+    return [
+      if (version.isV2) ...[
+        PsbtOutputScript(scriptPubKey),
+        PsbtOutputAmount(amount),
+        silentPaymentData,
+        silentPaymentLabel
+      ],
+      if (redeemScript != null) PsbtOutputRedeemScript(redeemScript!),
+      if (witnessScript != null) PsbtOutputWitnessScript(witnessScript!),
+      ...bip32derivationPath ?? [],
+      if (taprootInternalKey != null)
+        PsbtOutputTaprootInternalKey(taprootInternalKey!),
+      ...taprootKeyBip32DerivationPath ?? [],
+      ...muSig2ParticipantPublicKeys ?? [],
+      ...proprietaryUseType ?? []
+      // if(taprootTree!= null) PsbtOutputTaprootTree(taprootTrees)
+    ].whereType<PsbtOutputData>().toList();
+  }
+
+  TxOutput toTxOutput() {
+    return TxOutput(amount: amount, scriptPubKey: scriptPubKey);
+  }
+
+  final Script scriptPubKey;
+  final BigInt amount;
+  final BitcoinBaseAddress address;
+  final Script? redeemScript;
+  final Script? witnessScript;
+  final List<PsbtOutputBip32DerivationPath>? bip32derivationPath;
+  final List<int>? taprootInternalKey;
+  final List<PsbtTapTree>? taprootTree;
+  final List<PsbtOutputTaprootKeyBip32DerivationPath>?
+      taprootKeyBip32DerivationPath;
+  final List<PsbtOutputMuSig2ParticipantPublicKeys>?
+      muSig2ParticipantPublicKeys;
+  final PsbtOutputBIP353DNSSECProof? proof;
+  final List<PsbtOutputProprietaryUseType>? proprietaryUseType;
+  final PsbtOutputSilentPaymentData? silentPaymentData;
+  final PsbtOutputSilentPaymentLabel? silentPaymentLabel;
+
+  factory PsbtTransactionOutput(
+      {required BigInt amount,
+      Script? scriptPubKey,
+      BitcoinBaseAddress? address}) {
+    scriptPubKey ??= address?.toScriptPubKey();
+    if (scriptPubKey == null) {
+      throw DartBitcoinPluginException(
+          "Either scriptPubKey or address must be provided.");
+    }
+    address ??= BitcoinScriptUtils.findAddressFromScriptPubKey(scriptPubKey);
+    if (address.toScriptPubKey() != scriptPubKey) {
+      throw DartBitcoinPluginException(
+          "scriptPubKey mismatch for provided address.");
+    }
+    return PsbtTransactionOutput._(
+        scriptPubKey: scriptPubKey, amount: amount, address: address);
+  }
+
+  PsbtTransactionOutput._(
+      {required this.scriptPubKey,
+      required this.amount,
+      required this.address,
+      this.redeemScript,
+      this.witnessScript,
+      this.bip32derivationPath,
+      this.taprootInternalKey,
+      this.taprootTree,
+      this.taprootKeyBip32DerivationPath,
+      this.muSig2ParticipantPublicKeys,
+      this.proof,
+      this.proprietaryUseType,
+      this.silentPaymentData,
+      this.silentPaymentLabel});
+
+  // Factory constructor for Legacy outputs (P2PKH, P2SH)
+  factory PsbtTransactionOutput.legacy({
+    required BigInt amount,
+    Script? scriptPubKey,
+    BitcoinBaseAddress? address,
+    Script? redeemScript,
+    List<PsbtOutputBip32DerivationPath>? bip32derivationPath,
+    PsbtOutputBIP353DNSSECProof? proof,
+    List<PsbtOutputProprietaryUseType>? proprietaryUseType,
+  }) {
+    scriptPubKey ??= address?.toScriptPubKey();
+    if (scriptPubKey == null) {
+      throw DartBitcoinPluginException(
+          "Either scriptPubKey or address must be provided.");
+    }
+    address ??= BitcoinScriptUtils.findAddressFromScriptPubKey(scriptPubKey);
+    if (address.toScriptPubKey() != scriptPubKey) {
+      throw DartBitcoinPluginException(
+          "scriptPubKey mismatch for provided address.");
+    }
+    if (redeemScript != null) {
+      final p2shAddress = P2shAddress.fromScript(script: redeemScript);
+      if (p2shAddress.toScriptPubKey() != scriptPubKey) {
+        throw DartBitcoinPluginException(
+            "scriptPubKey does not match redeemScript-derived script.");
+      }
+    }
+    if (amount.isNegative) {
+      throw DartBitcoinPluginException("Amount cannot be negative.");
+    }
+    if (address.type.isSegwit) {
+      throw DartBitcoinPluginException(
+          "Invalid legacy address. Use the WitnessV0 or WitnessV1 factory constructor instead.");
+    }
+
+    return PsbtTransactionOutput._(
+        scriptPubKey: scriptPubKey,
+        amount: amount,
+        redeemScript: redeemScript,
+        bip32derivationPath: bip32derivationPath,
+        proprietaryUseType: proprietaryUseType,
+        address: address,
+        proof: proof);
+  }
+
+  // Factory constructor for SegWit v0 outputs (P2WPKH, P2WSH, P2SH-P2WPKH, P2SH-P2WSH)
+  factory PsbtTransactionOutput.witnessV0({
+    required BigInt amount,
+    BitcoinBaseAddress? address,
+    Script? scriptPubKey,
+    Script? redeemScript,
+    Script? witnessScript,
+    List<PsbtOutputBip32DerivationPath>? bip32derivationPath,
+    List<PsbtOutputProprietaryUseType>? proprietaryUseType,
+    PsbtOutputBIP353DNSSECProof? proof,
+  }) {
+    scriptPubKey ??= address?.toScriptPubKey();
+    if (scriptPubKey == null) {
+      throw DartBitcoinPluginException(
+          "Either scriptPubKey or address must be provided.");
+    }
+    address ??= BitcoinScriptUtils.findAddressFromScriptPubKey(scriptPubKey);
+    if (address.toScriptPubKey() != scriptPubKey) {
+      throw DartBitcoinPluginException(
+          "scriptPubKey mismatch for provided address.");
+    }
+    if (amount.isNegative) {
+      throw DartBitcoinPluginException("Amount cannot be negative.");
+    }
+    if (witnessScript != null) {
+      final addr = P2wshAddress.fromScript(script: witnessScript);
+      if (redeemScript != null) {
+        if (addr.toScriptPubKey() != redeemScript) {
+          throw DartBitcoinPluginException(
+              "redeemScript does not match witnessScript-derived script.");
+        }
+      } else {
+        if (addr.toScriptPubKey() != scriptPubKey) {
+          throw DartBitcoinPluginException(
+              "scriptPubKey does not match witnessScript-derived script.");
+        }
+      }
+    }
+
+    if (redeemScript != null) {
+      final p2shAddress = P2shAddress.fromScript(script: redeemScript);
+      if (p2shAddress.toScriptPubKey() != scriptPubKey) {
+        throw DartBitcoinPluginException(
+            "scriptPubKey does not match redeemScript-derived address.");
+      }
+    }
+
+    if (address.type.isP2tr) {
+      throw DartBitcoinPluginException(
+          "Invalid Witness V0 address. Use the witnessV1 factory constructor instead.");
+    } else if (!address.type.isSegwit && !address.type.isP2sh) {
+      throw DartBitcoinPluginException(
+          "Invalid Witness V0 address. Use the legacy factory constructor instead.");
+    }
+    return PsbtTransactionOutput._(
+        scriptPubKey: scriptPubKey,
+        amount: amount,
+        redeemScript: redeemScript,
+        witnessScript: witnessScript,
+        bip32derivationPath: bip32derivationPath,
+        proprietaryUseType: proprietaryUseType,
+        address: address,
+        proof: proof);
+  }
+
+  // Factory constructor for SegWit v1 (Taproot) outputs
+  factory PsbtTransactionOutput.witnessV1({
+    Script? scriptPubKey,
+    BitcoinBaseAddress? address,
+    required BigInt amount,
+    List<int>? taprootInternalKey,
+    List<PsbtTapTree>? taprootTree,
+    List<PsbtOutputTaprootKeyBip32DerivationPath>?
+        taprootKeyBip32DerivationPath,
+    List<PsbtOutputMuSig2ParticipantPublicKeys>? muSig2ParticipantPublicKeys,
+    PsbtOutputBIP353DNSSECProof? proof,
+    List<PsbtOutputProprietaryUseType>? proprietaryUseType,
+    PsbtOutputSilentPaymentData? silentPaymentData,
+    PsbtOutputSilentPaymentLabel? silentPaymentLabel,
+  }) {
+    scriptPubKey ??= address?.toScriptPubKey();
+    if (scriptPubKey == null) {
+      throw DartBitcoinPluginException(
+          "Either scriptPubKey or address must be provided.");
+    }
+    address ??= BitcoinScriptUtils.findAddressFromScriptPubKey(scriptPubKey);
+    if (address.toScriptPubKey() != scriptPubKey) {
+      throw DartBitcoinPluginException(
+          "scriptPubKey mismatch for provided address.");
+    }
+    if (amount.isNegative) {
+      throw DartBitcoinPluginException("Amount cannot be negative.");
+    }
+    return PsbtTransactionOutput._(
+        scriptPubKey: scriptPubKey,
+        address: address,
+        amount: amount,
+        taprootInternalKey: taprootInternalKey,
+        taprootTree: taprootTree,
+        taprootKeyBip32DerivationPath: taprootKeyBip32DerivationPath,
+        muSig2ParticipantPublicKeys: muSig2ParticipantPublicKeys,
+        proof: proof,
+        proprietaryUseType: proprietaryUseType,
+        silentPaymentData: silentPaymentData,
+        silentPaymentLabel: silentPaymentLabel);
+  }
+
+  factory PsbtTransactionOutput.generateFromOutput(
+      {required PsbtOutput psbtOutput,
+      required TxOutput output,
+      required int index}) {
+    return PsbtTransactionOutput._(
+        scriptPubKey: output.scriptPubKey,
+        amount: output.amount,
+        address:
+            BitcoinScriptUtils.findAddressFromScriptPubKey(output.scriptPubKey),
+        bip32derivationPath:
+            psbtOutput.getOutputs(index, PsbtOutputTypes.bip32DerivationPath),
+        muSig2ParticipantPublicKeys: psbtOutput.getOutputs(
+            index, PsbtOutputTypes.muSig2ParticipantPublicKeys),
+        taprootKeyBip32DerivationPath: psbtOutput.getOutputs(
+            index, PsbtOutputTypes.taprootBip32Derivation),
+        proprietaryUseType:
+            psbtOutput.getOutputs(index, PsbtOutputTypes.proprietaryUseType),
+        proof: psbtOutput.getOutput(index, PsbtOutputTypes.bip353DNSSECProof),
+        redeemScript: psbtOutput
+            .getOutput<PsbtOutputRedeemScript>(
+                index, PsbtOutputTypes.redeemScript)
+            ?.redeemScript,
+        witnessScript: psbtOutput
+            .getOutput<PsbtOutputWitnessScript>(
+                index, PsbtOutputTypes.witnessScript)
+            ?.witnessScript,
+        silentPaymentData:
+            psbtOutput.getOutput(index, PsbtOutputTypes.silentPaymentData),
+        silentPaymentLabel:
+            psbtOutput.getOutput(index, PsbtOutputTypes.silentPaymentLabel),
+        taprootInternalKey: psbtOutput
+            .getOutput<PsbtOutputTaprootInternalKey>(
+                index, PsbtOutputTypes.taprootInternalKey)
+            ?.xOnlyPubKey,
+        taprootTree: psbtOutput
+            .getOutput<PsbtOutputTaprootTree>(
+                index, PsbtOutputTypes.taprootTree)
+            ?.taprootTrees);
+  }
+}
diff --git a/lib/src/psbt/psbt_builder/versiones/v1.dart b/lib/src/psbt/psbt_builder/versiones/v1.dart
new file mode 100644
index 0000000..b0542af
--- /dev/null
+++ b/lib/src/psbt/psbt_builder/versiones/v1.dart
@@ -0,0 +1,140 @@
+part of 'package:bitcoin_base/src/psbt/psbt_builder/builder.dart';
+
+class PsbtBuilderV0 extends PsbtBuilder {
+  PsbtBuilderV0._(Psbt psbt) : super._(psbt: psbt);
+
+  /// Creates a `PsbtBuilderV0` instance from an existing `Psbt` object.
+  factory PsbtBuilderV0(Psbt psbt) {
+    return PsbtBuilder.fromPsbt(psbt);
+  }
+
+  /// Creates a new `PsbtBuilderV0` instance with default values for the transaction locktime and version.
+  factory PsbtBuilderV0.create(
+      {List<int> txLocktime = BitcoinOpCodeConst.defaultTxLocktime,
+      List<int> txVersion = BitcoinOpCodeConst.defaultTxVersion}) {
+    final version = PsbtVersion.v0;
+    return PsbtBuilderV0._(Psbt(
+        global: PsbtGlobal(entries: [
+          PsbtGlobalPSBTVersionNumber(version),
+          PsbtGlobalUnsignedTransaction(
+              BtcTransaction(locktime: txLocktime, version: txVersion))
+        ], version: version),
+        input: PsbtInput(version: version),
+        output: PsbtOutput(version: version)));
+  }
+
+  BtcTransaction get _unsignedTx => _psbt.global.entries
+      .whereType<PsbtGlobalUnsignedTransaction>()
+      .first
+      .transaction;
+
+  @override
+  TxInput txInput(int index) {
+    final unsignedTx = _unsignedTx;
+    PsbtUtils.validateTxInputs(
+        psbInput: _psbt.input,
+        inputIndex: index,
+        inputsLength: unsignedTx.inputs.length);
+    return _unsignedTx.inputs[index];
+  }
+
+  @override
+  TxOutput txOutput(int index) {
+    final txOutputs = this.txOutputs();
+    PsbtUtils.validateTxOutputs(psbtOutput: _psbt.output, outputIndex: index);
+    return txOutputs[index];
+  }
+
+  @override
+  List<TxInput> txInputs() {
+    final unsignedTx = _unsignedTx;
+    return unsignedTx.inputs.clone();
+  }
+
+  @override
+  List<TxOutput> txOutputs() {
+    final unsignedTx = _unsignedTx;
+    return unsignedTx.outputs.clone();
+  }
+
+  @override
+  BtcTransaction buildUnsignedTransaction() {
+    return _unsignedTx;
+  }
+
+  @override
+  PsbtBuilderV0 clone() {
+    return PsbtBuilderV0._(_psbt.clone());
+  }
+
+  void _updateUnsignedTx(BtcTransaction transaction) {
+    _psbt.global.updateGlobals([PsbtGlobalUnsignedTransaction(transaction)]);
+  }
+
+  @override
+  void _addNewTxOutput(PsbtTransactionOutput output) {
+    super._addNewTxOutput(output);
+    _psbt.output.addOutputs(output.toPsbtOutput(psbtVersion));
+    BtcTransaction tx = _unsignedTx;
+    tx = tx.copyWith(outputs: [...tx.outputs, output.toTxOutput()]);
+    _updateUnsignedTx(tx);
+  }
+
+  @override
+  void _updateTxOutput(int index, PsbtTransactionOutput output) {
+    super._updateTxOutput(index, output);
+    _psbt.output.replaceOutput(index, output.toPsbtOutput(psbtVersion));
+    final txOutputs = this.txOutputs();
+    txOutputs[index] = output.toTxOutput();
+    BtcTransaction tx = _unsignedTx;
+    tx = tx.copyWith(outputs: txOutputs);
+    _updateUnsignedTx(tx);
+  }
+
+  @override
+  void _removeOutput(int index) {
+    super._removeOutput(index);
+    final outputs = txOutputs();
+    outputs.removeAt(index);
+    _psbt.output.removeOutput(index);
+    BtcTransaction tx = _unsignedTx;
+    tx = tx.copyWith(outputs: outputs);
+    _updateUnsignedTx(tx);
+  }
+
+  @override
+  void _updateTxInput(int index, PsbtTransactionInput input) {
+    super._updateTxInput(index, input);
+    BtcTransaction tx = _unsignedTx;
+    final List<TxInput> newInputs = List.generate(tx.inputs.length, (i) {
+      if (i == index) return input.txInput;
+      return tx.inputs[i];
+    });
+    final locktime = PsbtUtils.buildTransactionLocktime(inputs: newInputs);
+    tx = tx.copyWith(inputs: newInputs, locktime: locktime);
+    _updateUnsignedTx(tx);
+  }
+
+  @override
+  void _removeTxInput(int index) {
+    super._removeTxInput(index);
+    _psbt.input.removeInput(index);
+    final inputs = txInputs();
+    inputs.removeAt(index);
+    BtcTransaction tx = _unsignedTx;
+    final locktime = PsbtUtils.buildTransactionLocktime(inputs: inputs);
+    tx = tx.copyWith(inputs: inputs, locktime: locktime);
+    _updateUnsignedTx(tx);
+  }
+
+  @override
+  void _addNewTxInput(PsbtTransactionInput input) {
+    super._addNewTxInput(input);
+    _psbt.input.addInputs(input.toPsbtInputs(psbtVersion));
+    BtcTransaction tx = _unsignedTx;
+    final locktime = PsbtUtils.buildTransactionLocktime(
+        inputs: [...tx.inputs, input.txInput]);
+    tx = tx.copyWith(inputs: [...tx.inputs, input.txInput], locktime: locktime);
+    _updateUnsignedTx(tx);
+  }
+}
diff --git a/lib/src/psbt/psbt_builder/versiones/v2.dart b/lib/src/psbt/psbt_builder/versiones/v2.dart
new file mode 100644
index 0000000..a5378ea
--- /dev/null
+++ b/lib/src/psbt/psbt_builder/versiones/v2.dart
@@ -0,0 +1,182 @@
+part of 'package:bitcoin_base/src/psbt/psbt_builder/builder.dart';
+
+class PsbtBuilderV2 extends PsbtBuilder {
+  PsbtBuilderV2._(Psbt psbt) : super._(psbt: psbt);
+
+  /// Creates a `PsbtBuilderV0` instance from an existing `Psbt` object.
+  factory PsbtBuilderV2(Psbt psbt) {
+    return PsbtBuilder.fromPsbt(psbt);
+  }
+
+  /// Creates a new `PsbtBuilderV2` instance with default values for the transaction locktime and version.
+  factory PsbtBuilderV2.create(
+      {int transactionVesion = BitcoinOpCodeConst.defaultTxVersionNumber}) {
+    final PsbtVersion version = PsbtVersion.v2;
+    return PsbtBuilderV2._(Psbt(
+        global: PsbtGlobal(entries: [
+          PsbtGlobalPSBTVersionNumber(version),
+          PsbtGlobalTransactionVersion(transactionVesion),
+          PsbtGlobalOutputCount(0),
+          PsbtGlobalInputCount(0)
+        ], version: version),
+        input: PsbtInput(version: version),
+        output: PsbtOutput(version: version)));
+  }
+
+  @override
+  PsbtBuilderV2 clone() {
+    return PsbtBuilderV2._(_psbt.clone());
+  }
+
+  List<int> _buildInputSequence(int index) {
+    final sequence = _psbt.input.getInput<PsbtInputSequenceNumber>(
+        index, PsbtInputTypes.sequenceNumber);
+    final locktime = _psbt.input.getInput<PsbtInputRequiredTimeBasedLockTime>(
+        index, PsbtInputTypes.requiredTimeBasedLockTime);
+    final heightNumber = _psbt.input
+        .getInput<PsbtInputRequiredHeightBasedLockTime>(
+            index, PsbtInputTypes.requiredHeightBasedLockTime);
+    if (sequence == null && locktime == null && heightNumber == null) {
+      return BitcoinOpCodeConst.defaultTxSequence;
+    }
+    if (locktime != null && heightNumber != null) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT input $index: Only one locktime field (PSBT_IN_REQUIRED_TIME_LOCKTIME or PSBT_IN_REQUIRED_HEIGHT_LOCKTIME) can be set.");
+    }
+    if (sequence != null) {
+      final sequenceBytes = sequence.sequenceBytes();
+      if (locktime == null && heightNumber == null) {
+        return sequenceBytes;
+      } else if (BytesUtils.bytesEqual(
+          BitcoinOpCodeConst.defaultTxSequence, sequenceBytes)) {
+        if (locktime != null &&
+            BytesUtils.bytesEqual(BitcoinOpCodeConst.defaultTxSequence,
+                locktime.sequenceBytes())) {
+          return sequenceBytes;
+        }
+        throw DartBitcoinPluginException(
+            'Invalid PSBT input: Locktime is set, but sequence is 0xFFFFFFFF (disable locktime).');
+      }
+    }
+    return locktime?.sequenceBytes() ?? heightNumber!.sequenceBytes();
+  }
+
+  @override
+  void _addNewTxInput(PsbtTransactionInput input) {
+    super._addNewTxInput(input);
+    _psbt.input.addInputs(input.toPsbtInputs(psbtVersion));
+    _psbt.global.updateGlobals([PsbtGlobalInputCount(_psbt.input.length)]);
+  }
+
+  @override
+  TxInput txInput(int index) {
+    final txId = _psbt.input
+        .getInput<PsbtInputPreviousTXID>(index, PsbtInputTypes.previousTxId);
+    final txIndex = _psbt.input.getInput<PsbtInputSpentOutputIndex>(
+        index, PsbtInputTypes.spentOutputIndex);
+    if (txId == null) {
+      throw DartBitcoinPluginException(
+          'Invalid Psbt input $index: Missing required field: previous tx id (PSBT_IN_PREVIOUS_TXID)');
+    }
+    if (txIndex == null) {
+      throw DartBitcoinPluginException(
+          'Invalid Psbt input $index: Missing required field: spent output index (PSBT_IN_OUTPUT_INDEX)');
+    }
+    final sequence = _buildInputSequence(index);
+    return TxInput(
+        txId: BytesUtils.toHexString(txId.txId.reversed.toList()),
+        txIndex: txIndex.index,
+        sequance: sequence);
+  }
+
+  @override
+  void _updateTxInput(int index, PsbtTransactionInput input) {
+    super._updateTxInput(index, input);
+    _psbt.input.updateInputs(index, input.toPsbtInputs(psbtVersion));
+    _psbt.global.updateGlobals([PsbtGlobalInputCount(_psbt.input.length)]);
+  }
+
+  @override
+  void _removeTxInput(int index) {
+    super._removeTxInput(index);
+    _psbt.input.removeInput(index);
+    _psbt.global.updateGlobals([PsbtGlobalInputCount(_psbt.input.length)]);
+  }
+
+  @override
+  void _addNewTxOutput(PsbtTransactionOutput output) {
+    super._addNewTxOutput(output);
+    _psbt.output.addOutputs(output.toPsbtOutput(psbtVersion));
+    _psbt.global.updateGlobals([PsbtGlobalOutputCount(_psbt.output.length)]);
+  }
+
+  @override
+  void _updateTxOutput(int index, PsbtTransactionOutput output) {
+    super._updateTxOutput(index, output);
+    _psbt.output.replaceOutput(index, output.toPsbtOutput(psbtVersion));
+    _psbt.global.updateGlobals([PsbtGlobalOutputCount(_psbt.output.length)]);
+  }
+
+  @override
+  void _removeOutput(int index) {
+    super._removeOutput(index);
+    _psbt.output.removeOutput(index);
+    _psbt.global.updateGlobals([PsbtGlobalOutputCount(_psbt.output.length)]);
+  }
+
+  TxOutput _getOutput(int index) {
+    final amount =
+        _psbt.output.getOutput<PsbtOutputAmount>(index, PsbtOutputTypes.amount);
+    final script =
+        _psbt.output.getOutput<PsbtOutputScript>(index, PsbtOutputTypes.script);
+    if (amount == null) {
+      throw DartBitcoinPluginException(
+          'Invalid Psbt output $index: Missing required field: amount (PSBT_OUT_AMOUNT)');
+    }
+    if (script == null) {
+      throw DartBitcoinPluginException(
+          'Invalid Psbt output $index: Missing required field: output script (PSBT_OUT_SCRIPT)');
+    }
+    return TxOutput(amount: amount.amount, scriptPubKey: script.script);
+  }
+
+  @override
+  List<TxOutput> txOutputs() {
+    return List.generate(_psbt.output.length, (i) => _getOutput(i));
+  }
+
+  @override
+  BtcTransaction buildUnsignedTransaction() {
+    final txVersion = _psbt.global
+        .getGlobal<PsbtGlobalTransactionVersion>(PsbtGlobalTypes.version);
+    final locktimeFallBack = _psbt.global.getGlobal<PsbtGlobalFallbackLocktime>(
+        PsbtGlobalTypes.fallBackLockTime);
+    if (txVersion == null) {
+      throw DartBitcoinPluginException(
+          'Invalid Psbt global: Missing required field: Transaction Version (PSBT_GLOBAL_TX_VERSION)');
+    }
+    final inputs = txInputs();
+    return BtcTransaction(
+        inputs: inputs,
+        outputs: txOutputs(),
+        version: txVersion.versionBytes(),
+        locktime: PsbtUtils.buildTransactionLocktime(
+            inputs: inputs,
+            locktimeFallBack: locktimeFallBack?.locktimeBytes()));
+  }
+
+  @override
+  List<TxInput> txInputs() {
+    return List.generate(_psbt.input.length, (i) => txInput(i));
+  }
+
+  @override
+  TxOutput txOutput(int index) {
+    final txOutputs = this.txOutputs();
+    if (index >= txOutputs.length) {
+      throw DartBitcoinPluginException(
+          "Index out of bounds: PSBT output index exceeds transaction outputs.");
+    }
+    return txOutputs[index];
+  }
+}
diff --git a/lib/src/psbt/reader/byte_reader.dart b/lib/src/psbt/reader/byte_reader.dart
new file mode 100644
index 0000000..78412ab
--- /dev/null
+++ b/lib/src/psbt/reader/byte_reader.dart
@@ -0,0 +1,29 @@
+import 'package:blockchain_utils/blockchain_utils.dart';
+
+class PsbtByteReader {
+  final List<int> bytes;
+  PsbtByteReader(List<int> bytes) : bytes = bytes.immutable;
+  int _offset = 0;
+  int get offset => _offset;
+  int get length => bytes.length;
+  List<int> read(int length) {
+    final bytes = this.bytes.sublist(_offset, _offset + length);
+    _offset += length;
+    return bytes;
+  }
+
+  void skip(int length) {
+    assert(_offset + 1 <= bytes.length);
+    _offset += length;
+  }
+
+  int at() {
+    return bytes[_offset];
+  }
+
+  int readLength() {
+    final length = IntUtils.decodeVarint(bytes.sublist(_offset));
+    _offset += length.item2;
+    return length.item1;
+  }
+}
diff --git a/lib/src/psbt/signer/signer.dart b/lib/src/psbt/signer/signer.dart
new file mode 100644
index 0000000..2191100
--- /dev/null
+++ b/lib/src/psbt/signer/signer.dart
@@ -0,0 +1,133 @@
+import 'package:bitcoin_base/src/crypto/keypair/ec_private.dart';
+import 'package:bitcoin_base/src/crypto/keypair/ec_public.dart';
+import 'package:blockchain_utils/blockchain_utils.dart';
+
+abstract class PsbtBtcSigner<SIGNINGRESPONSE extends SignInputResponse,
+    DIGEST extends PsbtSignInputDigest> {
+  abstract final ECPublic signerPublicKey;
+  SIGNINGRESPONSE btcSignInput(DIGEST digest);
+  Future<SIGNINGRESPONSE> btcSignInputAsync(DIGEST digest);
+}
+
+abstract class PsbtBtcMusig2Signer
+    extends PsbtBtcSigner<SignInputResponse, PsbtMusig2SigningInputDigest> {
+  abstract final ECPublic aggPublicKey;
+  abstract final List<ECPublic> publicKeys;
+}
+
+abstract class PsbtSignInputDigest {
+  final List<int> digest;
+  final List<int>? tweak;
+  PsbtSignInputDigest({
+    required List<int> digest,
+    required List<int>? tweak,
+  })  : digest = digest.asImmutableBytes,
+        tweak = tweak?.asImmutableBytes;
+}
+
+class PsbtSigningInputDigest extends PsbtSignInputDigest {
+  final bool isTaproot;
+  final int sighash;
+  PsbtSigningInputDigest({
+    required super.digest,
+    super.tweak,
+    required this.sighash,
+    required this.isTaproot,
+  });
+}
+
+class PsbtMusig2SigningInputDigest extends PsbtSignInputDigest {
+  final List<int> aggNonce;
+  PsbtMusig2SigningInputDigest({
+    required super.digest,
+    required List<int> aggNonce,
+    super.tweak,
+  }) : aggNonce = aggNonce.asImmutableBytes;
+}
+
+class SignInputResponse extends PsbtSigningResponse {
+  SignInputResponse._(
+      {required super.signature, required super.signerPublicKey});
+  factory SignInputResponse(
+      {required List<int> signature, required ECPublic signerPublicKey}) {
+    return SignInputResponse._(
+        signature: signature, signerPublicKey: signerPublicKey);
+  }
+}
+
+abstract class PsbtSigningResponse {
+  final List<int> signature;
+  final ECPublic signerPublicKey;
+  PsbtSigningResponse({
+    required List<int> signature,
+    required this.signerPublicKey,
+  }) : signature = signature.asImmutableBytes;
+}
+
+class PsbtDefaultSigner
+    implements PsbtBtcSigner<SignInputResponse, PsbtSigningInputDigest> {
+  final ECPrivate privateKey;
+  PsbtDefaultSigner(this.privateKey);
+
+  @override
+  late final ECPublic signerPublicKey = privateKey.getPublic();
+
+  @override
+  SignInputResponse btcSignInput(PsbtSigningInputDigest digest) {
+    if (digest.isTaproot) {
+      return SignInputResponse(
+          signature:
+              privateKey.signBtcSchnorr(digest.digest, tweak: digest.tweak),
+          signerPublicKey: signerPublicKey);
+    }
+    final signature =
+        privateKey.signInput(digest.digest, sigHash: digest.sighash);
+    return SignInputResponse(
+        signature: BytesUtils.fromHexString(signature),
+        signerPublicKey: signerPublicKey);
+  }
+
+  @override
+  Future<SignInputResponse> btcSignInputAsync(
+      PsbtSigningInputDigest digest) async {
+    return btcSignInput(digest);
+  }
+}
+
+class PsbtMusig2DefaultSigner implements PsbtBtcMusig2Signer {
+  final ECPrivate privateKey;
+  @override
+  final ECPublic aggPublicKey;
+  @override
+  final List<ECPublic> publicKeys;
+  final MuSig2Nonce nonce;
+  PsbtMusig2DefaultSigner(
+      {required this.privateKey,
+      required this.aggPublicKey,
+      required this.publicKeys,
+      required this.nonce});
+
+  @override
+  late final ECPublic signerPublicKey = privateKey.getPublic();
+
+  @override
+  SignInputResponse btcSignInput(PsbtMusig2SigningInputDigest digest) {
+    final session = MuSig2Session(
+        aggnonce: digest.aggNonce,
+        publicKeys: publicKeys
+            .map((e) => e.toBytes(mode: PubKeyModes.compressed))
+            .toList(),
+        msg: digest.digest,
+        tweaks: [if (digest.tweak != null) MuSig2Tweak(tweak: digest.tweak!)]);
+    final signature = MuSig2.sign(
+        secnonce: nonce.secnonce, sk: privateKey.toBytes(), session: session);
+    return SignInputResponse._(
+        signature: signature, signerPublicKey: signerPublicKey);
+  }
+
+  @override
+  Future<SignInputResponse> btcSignInputAsync(
+      PsbtMusig2SigningInputDigest digest) async {
+    return btcSignInput(digest);
+  }
+}
diff --git a/lib/src/psbt/types/types.dart b/lib/src/psbt/types/types.dart
new file mode 100644
index 0000000..9336be6
--- /dev/null
+++ b/lib/src/psbt/types/types.dart
@@ -0,0 +1,5 @@
+export 'types/global.dart';
+export 'types/inputs.dart';
+export 'types/outputs.dart';
+export 'types/psbt.dart';
+export 'types/types.dart';
diff --git a/lib/src/psbt/types/types/global.dart b/lib/src/psbt/types/types/global.dart
new file mode 100644
index 0000000..6ef4704
--- /dev/null
+++ b/lib/src/psbt/types/types/global.dart
@@ -0,0 +1,787 @@
+import 'package:bitcoin_base/src/bitcoin/script/op_code/constant.dart';
+import 'package:bitcoin_base/src/bitcoin/script/script.dart';
+import 'package:bitcoin_base/src/bitcoin/script/transaction.dart';
+import 'package:bitcoin_base/src/psbt/types/types/psbt.dart';
+import 'dart:typed_data';
+import 'package:bitcoin_base/src/exception/exception.dart';
+import 'package:blockchain_utils/blockchain_utils.dart';
+
+/// PSBT GLOBAL TYPES
+enum PsbtGlobalTypes {
+  unsignedTx(0x00, "PSBT_GLOBAL_UNSIGNED_TX",
+      allowedVersion: PsbtVersion.v0, required: true),
+  xpub(0x01, "PSBT_GLOBAL_XPUB"),
+  version(0x02, "PSBT_GLOBAL_TX_VERSION",
+      allowedVersion: PsbtVersion.v2, required: true),
+  fallBackLockTime(0x03, "PSBT_GLOBAL_FALLBACK_LOCKTIME",
+      allowedVersion: PsbtVersion.v2),
+  inputCount(0x04, "PSBT_GLOBAL_INPUT_COUNT",
+      allowedVersion: PsbtVersion.v2, required: true),
+  outputCount(0x05, "PSBT_GLOBAL_OUTPUT_COUNT",
+      allowedVersion: PsbtVersion.v2, required: true),
+  txModifiable(0x06, "PSBT_GLOBAL_TX_MODIFIABLE",
+      allowedVersion: PsbtVersion.v2),
+  spEcdhShare(0x07, "PSBT_GLOBAL_SP_ECDH_SHARE",
+      allowedVersion: PsbtVersion.v2),
+  spDLEQ(0x08, "PSBT_GLOBAL_SP_DLEQ", allowedVersion: PsbtVersion.v2),
+  psbtVersion(0xFB, "PSBT_GLOBAL_VERSION"),
+  proprietary(0xFC, "PSBT_GLOBAL_PROPRIETARY"),
+  unknown(null, "PSBT_GLOBAL_UNKNOWN");
+
+  const PsbtGlobalTypes(this.flag, this.psbtName,
+      {this.allowedVersion, this.required = false});
+
+  final int? flag;
+  final String psbtName;
+  final bool required;
+  final PsbtVersion? allowedVersion;
+  static PsbtGlobalTypes find(int flag) {
+    final type = values.firstWhereNullable((e) => e.flag == flag);
+    if (type != null) return type;
+    return unknown;
+  }
+}
+
+/// Represents the global section of a PSBT (Partially Signed Bitcoin Transaction).
+class PsbtGlobal {
+  /// The list of global PSBT entries.
+  List<PsbtGlobalData> _entries;
+  List<PsbtGlobalData> get entries => _entries;
+
+  /// The PSBT version associated with this global section.
+  final PsbtVersion version;
+
+  PsbtGlobal._({List<PsbtGlobalData> entries = const [], required this.version})
+      : _entries = entries.immutable;
+
+  /// Constructs a [PsbtGlobal] instance with a given version and global entries.
+  ///
+  /// Throws a [DartBitcoinPluginException] if any of the following conditions are met:
+  /// - Duplicate entries are found.
+  /// - A global entry is not allowed for the specified PSBT version.
+  /// - A required global entry is missing for the PSBT version
+  factory PsbtGlobal(
+      {List<PsbtGlobalData> entries = const [], required PsbtVersion version}) {
+    final keys = entries.map((e) => e.keyPair.key).toList();
+    if (keys.toSet().length != keys.length) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT Global: Duplicate entry detected.");
+    }
+    for (final i in entries) {
+      if (i.type.allowedVersion == null) continue;
+      if (version != i.type.allowedVersion) {
+        throw DartBitcoinPluginException(
+            "Invalid PSBT Global: ${i.type.psbtName} is not allowed in PSBT version ${version.name}.");
+      }
+    }
+    final requiredFilds = PsbtGlobalTypes.values.where((e) =>
+        e.required &&
+        (e.allowedVersion == null || e.allowedVersion == version));
+    for (final i in requiredFilds) {
+      entries.firstWhere((e) => e.type == i,
+          orElse: () => throw DartBitcoinPluginException(
+              "Invalid PSBT global: Missing required field ${i.psbtName} for PSBT version ${version.name}."));
+    }
+    return PsbtGlobal._(version: version, entries: entries);
+  }
+
+  /// Creates a [PsbtGlobal] instance from a list of key pairs.
+  factory PsbtGlobal.fromKeyPairs(
+      {List<PsbtKeyPair> keypairs = const [], required PsbtVersion version}) {
+    final inputs = keypairs.map(PsbtGlobalData.deserialize).toList();
+    return PsbtGlobal(entries: inputs, version: version);
+  }
+
+  /// Converts the entries to a list of key pairs.
+  List<PsbtKeyPair> toKeyPairs() {
+    return _entries.map((e) => e.keyPair).toList();
+  }
+
+  /// Converts the entries to json.
+  Map<String, dynamic> toJson() {
+    return {"entries": entries.map((e) => e.toJson()).toList()};
+  }
+
+  /// Validates if the provided entries is not duplicate and allowed by the PSBT version.
+  void _itemsAllowed(List<PsbtGlobalData> items) {
+    final keys = items.map((e) => e.keyPair.key).toSet();
+    if (keys.length != items.length) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT Global: Duplicate entry detected.");
+    }
+    for (final i in items) {
+      if (i.type.allowedVersion == null) continue;
+      if (version != i.type.allowedVersion) {
+        throw DartBitcoinPluginException(
+            "Invalid PSBT Global: ${i.type.psbtName} is not allowed in PSBT version ${version.name}.");
+      }
+    }
+  }
+
+  /// Updates the entries with new data.
+  void updateGlobals(List<PsbtGlobalData> data) {
+    final entries = _entries.clone();
+    for (final i in data) {
+      entries.removeWhere((e) => e.type == i.type);
+      entries.add(i);
+    }
+    _itemsAllowed(entries);
+    _entries = entries.immutable;
+  }
+
+  /// Retrieves a single entry of a specified type.
+  T? getGlobal<T extends PsbtGlobalData>(PsbtGlobalTypes type) {
+    final data = _entries.where((e) => e.type == type);
+    if (data.isEmpty) return null;
+    if (data.length != 1) {
+      throw DartBitcoinPluginException(
+          "Multiple globals with type ${type.psbtName} found. Use 'getGlobals' to retrieve data for multiple globals");
+    }
+    return data.first.cast();
+  }
+
+  /// Retrieves all entries of a specified type.
+  List<T>? getGlobals<T extends PsbtGlobalData>(
+      int index, PsbtGlobalTypes type) {
+    final data = _entries.where((e) => e.type == type);
+    if (data.isEmpty) return null;
+    return data.toList().cast<T>();
+  }
+
+  /// Creates a deep copy of the [PsbtGlobal] instance.
+  PsbtGlobal clone() {
+    return PsbtGlobal(entries: entries.clone(), version: version);
+  }
+}
+
+abstract class PsbtGlobalData {
+  final PsbtGlobalTypes type;
+  final PsbtKeyPair keyPair;
+  const PsbtGlobalData({required this.type, required this.keyPair});
+  factory PsbtGlobalData.deserialize(PsbtKeyPair keypair) {
+    final type = PsbtGlobalTypes.find(keypair.key.type);
+    return switch (type) {
+      PsbtGlobalTypes.unsignedTx =>
+        PsbtGlobalUnsignedTransaction.deserialize(keypair),
+      PsbtGlobalTypes.xpub => PsbtGlobalExtendedPublicKey.deserialize(keypair),
+      PsbtGlobalTypes.version =>
+        PsbtGlobalTransactionVersion.deserialize(keypair),
+      PsbtGlobalTypes.fallBackLockTime =>
+        PsbtGlobalFallbackLocktime.deserialize(keypair),
+      PsbtGlobalTypes.inputCount => PsbtGlobalInputCount.deserialize(keypair),
+      PsbtGlobalTypes.outputCount => PsbtGlobalOutputCount.deserialize(keypair),
+      PsbtGlobalTypes.txModifiable =>
+        PsbtGlobalTransactionModifiableFlags.deserialize(keypair),
+      PsbtGlobalTypes.spEcdhShare =>
+        PsbtGlobalSilentPaymentGlobalECDHShare.deserialize(keypair),
+      PsbtGlobalTypes.spDLEQ =>
+        PsbtGlobalSilentPaymentGlobalDLEQProof.deserialize(keypair),
+      PsbtGlobalTypes.psbtVersion =>
+        PsbtGlobalPSBTVersionNumber.deserialize(keypair),
+      PsbtGlobalTypes.proprietary =>
+        PsbtGlobalProprietaryUseType.deserialize(keypair),
+      PsbtGlobalTypes.unknown => PsbtGlobalUnknow(keypair),
+    };
+  }
+  T cast<T extends PsbtGlobalData>() {
+    if (this is! T) {
+      throw DartBitcoinPluginException(
+          "Invalid cast: expected ${T.runtimeType}, but found $runtimeType.",
+          details: {"expected": "$T", "type": runtimeType.toString()});
+    }
+    return this as T;
+  }
+
+  Map<String, dynamic> toJson();
+
+  @override
+  String toString() {
+    return type.name;
+  }
+}
+
+class PsbtGlobalUnsignedTransaction extends PsbtGlobalData {
+  /// The transaction in network serialization. The scriptSigs and witnesses for each input must be empty.
+  /// The transaction must be in the old serialization format (without witnesses).
+  final BtcTransaction transaction;
+  PsbtGlobalUnsignedTransaction._(
+      {required this.transaction, required super.keyPair})
+      : super(type: PsbtGlobalTypes.unsignedTx);
+  factory PsbtGlobalUnsignedTransaction(BtcTransaction transaction) {
+    return PsbtGlobalUnsignedTransaction._(
+        transaction: transaction,
+        keyPair: PsbtKeyPair(
+            key: PsbtKey(PsbtGlobalTypes.unsignedTx.flag!),
+            value: PsbtValue(transaction.toBytes(allowWitness: false))));
+  }
+  factory PsbtGlobalUnsignedTransaction.deserialize(PsbtKeyPair keypair) {
+    if (keypair.key.type != PsbtGlobalTypes.unsignedTx.flag) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT Unsigned Transaction type flag");
+    }
+    if (keypair.key.extraData != null) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT Unsigned Transaction key data.");
+    }
+    try {
+      final transaction =
+          BtcTransaction.deserialize(keypair.value.data, allowWitness: false);
+      if (transaction.witnesses.isEmpty &&
+          transaction.inputs.every((e) => e.scriptSig == Script.empty)) {
+        return PsbtGlobalUnsignedTransaction._(
+            keyPair: keypair, transaction: transaction);
+      }
+    } catch (_) {}
+    throw DartBitcoinPluginException("Invalid PSBT Unsigned Transaction data.");
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    return {"type": type.name, "transaction": transaction.toJson()};
+  }
+}
+
+class PsbtGlobalExtendedPublicKey extends PsbtGlobalData {
+  /// The 78 byte serialized extended public key as defined by BIP 32.
+  /// Extended public keys are those that can be used to derive public keys used in the
+  /// inputs and outputs of this transaction. It should be the public key at the highest
+  /// hardened derivation index so that the unhardened child keys used in the transaction can be derived.
+  final List<int> xPub;
+
+  /// The master key fingerprint as defined by BIP 32 concatenated
+  /// with the derivation path of the public key. The derivation path
+  /// is represented as 32-bit little endian unsigned integer indexes
+  /// concatenated with each other. The number of 32 bit unsigned integer
+  /// indexes must match the depth provided in the extended public key.
+  final List<int> fingerprint;
+  final List<Bip32KeyIndex> indexes;
+  PsbtGlobalExtendedPublicKey._(
+      {required List<int> xPub,
+      required List<int> fingerprint,
+      required List<Bip32KeyIndex> indexes,
+      required super.keyPair})
+      : xPub = xPub.asImmutableBytes,
+        fingerprint = fingerprint.asImmutableBytes,
+        indexes = indexes.immutable,
+        super(type: PsbtGlobalTypes.xpub);
+  factory PsbtGlobalExtendedPublicKey({
+    required List<int> xPub,
+    required List<int> fingerprint,
+    required List<Bip32KeyIndex> indexes,
+  }) {
+    if (xPub.length == Bip32KeySerConst.serializedPubKeyByteLen &&
+        fingerprint.length == Bip32KeyDataConst.fingerprintByteLen) {
+      return PsbtGlobalExtendedPublicKey._(
+          xPub: xPub,
+          fingerprint: fingerprint,
+          indexes: indexes,
+          keyPair: () {
+            final List<int> indexesBytes = indexes
+                .map((e) => e.toBytes(Endian.little))
+                .expand((e) => e)
+                .toList();
+            return PsbtKeyPair(
+                key: PsbtKey(PsbtGlobalTypes.xpub.flag!, extraData: xPub),
+                value: PsbtValue([...fingerprint, ...indexesBytes]));
+          }());
+    }
+    throw DartBitcoinPluginException("Invalid PSBT Extended Public Key data.");
+  }
+  factory PsbtGlobalExtendedPublicKey.deserialize(PsbtKeyPair keypair) {
+    if (keypair.key.type != PsbtGlobalTypes.xpub.flag) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT Extended Public Key type flag");
+    }
+
+    try {
+      final List<int> fingerPrint =
+          keypair.value.data.sublist(0, Bip32KeyDataConst.fingerprintByteLen);
+      final indexesBytes =
+          keypair.value.data.sublist(Bip32KeyDataConst.fingerprintByteLen);
+      final indexCount =
+          indexesBytes.length ~/ Bip32KeyDataConst.keyIndexByteLen;
+      final bip32Indexes = List.generate(indexCount, (i) {
+        final offset = i * Bip32KeyDataConst.keyIndexByteLen;
+        return Bip32KeyIndex.fromBytes(indexesBytes.sublist(
+            offset, offset + Bip32KeyDataConst.keyIndexByteLen));
+      });
+      return PsbtGlobalExtendedPublicKey(
+          xPub: keypair.key.extraData ?? [],
+          fingerprint: fingerPrint,
+          indexes: bip32Indexes);
+    } catch (_) {}
+    throw DartBitcoinPluginException("Invalid PSBT Extended Public Key data.");
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    return {
+      "type": type.name,
+      "xPub": BytesUtils.toHexString(xPub),
+      "fingerprint": BytesUtils.toHexString(fingerprint),
+      "indexes": indexes.map((e) => e.index).toList()
+    };
+  }
+}
+
+class PsbtGlobalTransactionVersion extends PsbtGlobalData {
+  /// The 32-bit little endian signed integer representing the
+  /// version number of the transaction being created. Note that
+  /// this is not the same as the PSBT version number
+  /// specified by the PSBT_GLOBAL_VERSION field.
+  final int version;
+
+  PsbtGlobalTransactionVersion._({required int version, required super.keyPair})
+      : version = version.asUint32,
+        super(type: PsbtGlobalTypes.version);
+  factory PsbtGlobalTransactionVersion(int version) {
+    return PsbtGlobalTransactionVersion._(
+        version: version,
+        keyPair: PsbtKeyPair(
+            key: PsbtKey(PsbtGlobalTypes.version.flag!),
+            value: PsbtValue(IntUtils.toBytes(version,
+                length: BitcoinOpCodeConst.versionLengthInBytes,
+                byteOrder: Endian.little))));
+  }
+  factory PsbtGlobalTransactionVersion.deserialize(PsbtKeyPair keypair) {
+    if (keypair.key.type != PsbtGlobalTypes.version.flag) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT Transaction Version type flag");
+    }
+    if (keypair.key.extraData != null) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT Transaction Version key data.");
+    }
+    if (keypair.value.data.length == BitcoinOpCodeConst.versionLengthInBytes) {
+      try {
+        final int version =
+            IntUtils.fromBytes(keypair.value.data, byteOrder: Endian.little);
+        return PsbtGlobalTransactionVersion._(
+            version: version, keyPair: keypair);
+      } catch (_) {}
+    }
+
+    throw DartBitcoinPluginException("Invalid PSBT Transaction Version data.");
+  }
+
+  List<int> versionBytes() {
+    return IntUtils.toBytes(version,
+        length: BitcoinOpCodeConst.versionLengthInBytes,
+        byteOrder: Endian.little);
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    return {"type": type.name, "version": version};
+  }
+}
+
+class PsbtGlobalFallbackLocktime extends PsbtGlobalData {
+  /// The 32-bit little endian unsigned integer representing
+  /// the transaction locktime to use if no inputs specify a required locktime.
+  final int locktime;
+
+  PsbtGlobalFallbackLocktime._({
+    required int locktime,
+    required super.keyPair,
+  })  : locktime = locktime.asUint32,
+        super(type: PsbtGlobalTypes.fallBackLockTime);
+  factory PsbtGlobalFallbackLocktime(int locktime) {
+    return PsbtGlobalFallbackLocktime._(
+        locktime: locktime,
+        keyPair: PsbtKeyPair(
+            key: PsbtKey(PsbtGlobalTypes.fallBackLockTime.flag!),
+            value: PsbtValue(IntUtils.toBytes(locktime,
+                length: BitcoinOpCodeConst.locktimeLengthInBytes,
+                byteOrder: Endian.little))));
+  }
+  factory PsbtGlobalFallbackLocktime.deserialize(PsbtKeyPair keypair) {
+    if (keypair.key.type != PsbtGlobalTypes.fallBackLockTime.flag) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT Fallback Locktime type flag");
+    }
+    if (keypair.key.extraData != null) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT Fallback Locktime key data.");
+    }
+    if (keypair.value.data.length == BitcoinOpCodeConst.locktimeLengthInBytes) {
+      try {
+        final int locktime =
+            IntUtils.fromBytes(keypair.value.data, byteOrder: Endian.little);
+        return PsbtGlobalFallbackLocktime._(
+            locktime: locktime, keyPair: keypair);
+      } catch (_) {}
+    }
+
+    throw DartBitcoinPluginException("Invalid PSBT Fallback Locktime data.");
+  }
+
+  List<int> locktimeBytes() {
+    return IntUtils.toBytes(locktime,
+        length: BitcoinOpCodeConst.locktimeLengthInBytes,
+        byteOrder: Endian.little);
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    return {"type": type.name, "locktime": locktime};
+  }
+}
+
+class PsbtGlobalInputCount extends PsbtGlobalData {
+  /// Compact size unsigned integer representing the number of inputs in this PSBT.
+  final int count;
+  PsbtGlobalInputCount._({required int count, required super.keyPair})
+      : count = count.asUint32,
+        super(type: PsbtGlobalTypes.inputCount);
+  factory PsbtGlobalInputCount(int count) {
+    return PsbtGlobalInputCount._(
+        count: count,
+        keyPair: PsbtKeyPair(
+            key: PsbtKey(PsbtGlobalTypes.inputCount.flag!),
+            value: PsbtValue(IntUtils.encodeVarint(count))));
+  }
+  factory PsbtGlobalInputCount.deserialize(PsbtKeyPair keypair) {
+    if (keypair.key.type != PsbtGlobalTypes.inputCount.flag) {
+      throw DartBitcoinPluginException("Invalid PSBT Input Count type flag");
+    }
+    if (keypair.key.extraData != null) {
+      throw DartBitcoinPluginException("Invalid PSBT Input Count key data.");
+    }
+    try {
+      final int inputCount = IntUtils.decodeVarint(keypair.value.data).item1;
+      return PsbtGlobalInputCount._(count: inputCount, keyPair: keypair);
+    } catch (_) {}
+    throw DartBitcoinPluginException("Invalid PSBT Input Count data.");
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    return {"type": type.name, "count": count};
+  }
+}
+
+class PsbtGlobalOutputCount extends PsbtGlobalData {
+  /// Compact size unsigned integer representing the number of outputs in this PSBT.
+  final int count;
+  PsbtGlobalOutputCount._({required int count, required super.keyPair})
+      : count = count.asUint32,
+        super(type: PsbtGlobalTypes.outputCount);
+  factory PsbtGlobalOutputCount(int count) {
+    return PsbtGlobalOutputCount._(
+        count: count,
+        keyPair: PsbtKeyPair(
+            key: PsbtKey(PsbtGlobalTypes.outputCount.flag!),
+            value: PsbtValue(IntUtils.encodeVarint(count))));
+  }
+  factory PsbtGlobalOutputCount.deserialize(PsbtKeyPair keypair) {
+    if (keypair.key.type != PsbtGlobalTypes.outputCount.flag) {
+      throw DartBitcoinPluginException("Invalid PSBT Output Count type flag");
+    }
+    if (keypair.key.extraData != null) {
+      throw DartBitcoinPluginException("Invalid PSBT Output Count key data.");
+    }
+    try {
+      final int outputCount = IntUtils.decodeVarint(keypair.value.data).item1;
+      return PsbtGlobalOutputCount._(count: outputCount, keyPair: keypair);
+    } catch (_) {}
+    throw DartBitcoinPluginException("Invalid PSBT Output Count data.");
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    return {"type": type.name, "count": count};
+  }
+}
+
+class PsbtGlobalTransactionModifiableFlags extends PsbtGlobalData {
+  /// An 8 bit little endian unsigned integer as a bitfield for various transaction modification flags.
+  /// Bit 0 is the Inputs Modifiable Flag and indicates whether inputs can be modified.
+  /// Bit 1 is the Outputs Modifiable Flag and indicates whether outputs can be modified.
+  /// Bit 2 is the Has SIGHASH_SINGLE flag and indicates whether the transaction has a
+  /// SIGHASH_SINGLE signature who's input and output pairing must be preserved.
+  /// Bit 2 essentially indicates that the Constructor must iterate the inputs to determine whether and how to add an input.
+  final int flags;
+  PsbtGlobalTransactionModifiableFlags._(
+      {required int flags, required super.keyPair})
+      : flags = flags.asUint8,
+        super(type: PsbtGlobalTypes.txModifiable);
+  factory PsbtGlobalTransactionModifiableFlags(int flags) {
+    return PsbtGlobalTransactionModifiableFlags._(
+        flags: flags,
+        keyPair: PsbtKeyPair(
+            key: PsbtKey(PsbtGlobalTypes.txModifiable.flag!),
+            value: PsbtValue([flags])));
+  }
+  factory PsbtGlobalTransactionModifiableFlags.deserialize(
+      PsbtKeyPair keypair) {
+    if (keypair.key.type != PsbtGlobalTypes.txModifiable.flag) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT Transaction Modifiable Flags type flag");
+    }
+    if (keypair.key.extraData != null) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT Transaction Modifiable Flags key data.");
+    }
+    if (keypair.value.data.length == 1) {
+      return PsbtGlobalTransactionModifiableFlags._(
+          flags: keypair.value.data.first, keyPair: keypair);
+    }
+    throw DartBitcoinPluginException(
+        "Invalid PSBT Transaction Modifiable Flags data.");
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    return {"type": type.name, "flags": flags};
+  }
+}
+
+class PsbtGlobalSilentPaymentGlobalECDHShare extends PsbtGlobalData {
+  /// The scan key that this ECDH share is for.
+  final List<int> scanKey;
+
+  /// An ECDH share for a scan key. The ECDH shared is computed with a * B_scan,
+  /// where a is the sum of all private keys of all eligible inputs, and B_scan is the scan key of a recipient.
+  final List<int> share;
+
+  PsbtGlobalSilentPaymentGlobalECDHShare._({
+    required List<int> scanKey,
+    required List<int> share,
+    required super.keyPair,
+  })  : scanKey = scanKey.asImmutableBytes,
+        share = share.asImmutableBytes,
+        super(type: PsbtGlobalTypes.spEcdhShare);
+  factory PsbtGlobalSilentPaymentGlobalECDHShare(
+      {required List<int> scanKey, required List<int> share}) {
+    if (scanKey.length == EcdsaKeysConst.pubKeyCompressedByteLen &&
+        share.length == EcdsaKeysConst.pubKeyCompressedByteLen) {
+      return PsbtGlobalSilentPaymentGlobalECDHShare._(
+          scanKey: scanKey,
+          share: share,
+          keyPair: PsbtKeyPair(
+              key: PsbtKey(PsbtGlobalTypes.spEcdhShare.flag!,
+                  extraData: scanKey),
+              value: PsbtValue(share)));
+    }
+    throw DartBitcoinPluginException(
+        "Invalid PSBT Silent Payment Global ECDH Share data");
+  }
+  factory PsbtGlobalSilentPaymentGlobalECDHShare.deserialize(
+      PsbtKeyPair keypair) {
+    if (keypair.key.type != PsbtGlobalTypes.spEcdhShare.flag) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT Silent Payment Global ECDH Share type flag");
+    }
+    if (keypair.key.extraData?.length ==
+            EcdsaKeysConst.pubKeyCompressedByteLen &&
+        keypair.value.data.length == EcdsaKeysConst.pubKeyCompressedByteLen) {
+      return PsbtGlobalSilentPaymentGlobalECDHShare._(
+          scanKey: keypair.key.extraData ?? [],
+          share: keypair.value.data,
+          keyPair: keypair);
+    }
+    throw DartBitcoinPluginException(
+        "Invalid PSBT Silent Payment Global ECDH Share data.");
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    return {
+      "type": type.name,
+      "scanKey": BytesUtils.toHexString(scanKey),
+      "share": BytesUtils.toHexString(share),
+    };
+  }
+}
+
+class PsbtGlobalSilentPaymentGlobalDLEQProof extends PsbtGlobalData {
+  /// The scan key that this proof covers.
+  final List<int> scanKey;
+
+  /// A BIP374 DLEQ proof computed for the matching ECDH share.
+  final List<int> proof;
+
+  PsbtGlobalSilentPaymentGlobalDLEQProof._(
+      {required List<int> scanKey,
+      required List<int> proof,
+      required super.keyPair})
+      : scanKey = scanKey.asImmutableBytes,
+        proof = proof.asImmutableBytes,
+        super(type: PsbtGlobalTypes.spDLEQ);
+  factory PsbtGlobalSilentPaymentGlobalDLEQProof(
+      {required List<int> scanKey, required List<int> proof}) {
+    if (scanKey.length == EcdsaKeysConst.pubKeyCompressedByteLen &&
+        proof.length == QuickCrypto.sha512DeigestLength) {
+      return PsbtGlobalSilentPaymentGlobalDLEQProof._(
+          scanKey: scanKey,
+          proof: proof,
+          keyPair: PsbtKeyPair(
+              key: PsbtKey(PsbtGlobalTypes.spDLEQ.flag!, extraData: scanKey),
+              value: PsbtValue(proof)));
+    }
+    throw DartBitcoinPluginException(
+        "Invalid PSBT Silent Payment Global DLEQ Proof data");
+  }
+  factory PsbtGlobalSilentPaymentGlobalDLEQProof.deserialize(
+      PsbtKeyPair keypair) {
+    if (keypair.key.type != PsbtGlobalTypes.spDLEQ.flag) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT Silent Payment Global DLEQ Proof type flag");
+    }
+    if (keypair.key.extraData?.length ==
+            EcdsaKeysConst.pubKeyCompressedByteLen &&
+        keypair.value.data.length == QuickCrypto.sha512DeigestLength) {
+      return PsbtGlobalSilentPaymentGlobalDLEQProof._(
+          scanKey: keypair.key.extraData ?? [],
+          proof: keypair.value.data,
+          keyPair: keypair);
+    }
+    throw DartBitcoinPluginException(
+        "Invalid PSBT Silent Payment Global DLEQ Proof data.");
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    return {
+      "type": type.name,
+      "scanKey": BytesUtils.toHexString(scanKey),
+      "proof": BytesUtils.toHexString(proof),
+    };
+  }
+}
+
+class PsbtGlobalPSBTVersionNumber extends PsbtGlobalData {
+  /// The 32-bit little endian unsigned integer representing the version number of this PSBT.
+  /// If omitted, the version number is 0.
+  final PsbtVersion version;
+
+  factory PsbtGlobalPSBTVersionNumber(PsbtVersion version) {
+    return PsbtGlobalPSBTVersionNumber._(
+        version: version,
+        keyPair: PsbtKeyPair(
+            key: PsbtKey(PsbtGlobalTypes.psbtVersion.flag!),
+            value: PsbtValue(IntUtils.toBytes(version.version,
+                length: BitcoinOpCodeConst.versionLengthInBytes,
+                byteOrder: Endian.little))));
+  }
+  PsbtGlobalPSBTVersionNumber._({required this.version, required super.keyPair})
+      : super(type: PsbtGlobalTypes.psbtVersion);
+  factory PsbtGlobalPSBTVersionNumber.deserialize(PsbtKeyPair keypair) {
+    if (keypair.key.type != PsbtGlobalTypes.psbtVersion.flag) {
+      throw DartBitcoinPluginException("Invalid PSBT Version Number type flag");
+    }
+    if (keypair.key.extraData != null) {
+      throw DartBitcoinPluginException("Invalid PSBT Version Number key data.");
+    }
+    try {
+      if (keypair.value.data.length ==
+          BitcoinOpCodeConst.versionLengthInBytes) {
+        final int version =
+            IntUtils.fromBytes(keypair.value.data, byteOrder: Endian.little);
+        return PsbtGlobalPSBTVersionNumber._(
+            version: PsbtVersion.values.firstWhere(
+              (e) => e.version == version,
+              orElse: () => throw DartBitcoinPluginException(
+                  "Unsported PSBT Version $version"),
+            ),
+            keyPair: keypair);
+      }
+    } on DartBitcoinPluginException {
+      rethrow;
+    } catch (_) {}
+    throw DartBitcoinPluginException("Invalid PSBT Version Number data.");
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    return {"type": type.name, "version": version.version};
+  }
+}
+
+class PsbtGlobalProprietaryUseType extends PsbtGlobalData {
+  /// Compact size unsigned integer of the length of the identifier, followed by identifier prefix,
+  /// followed by a compact size unsigned integer subtype, followed by the key data itself.
+  final List<int> identifier;
+  final List<int> subkeydata;
+
+  /// Any value data as defined by the proprietary type user.
+  final List<int> data;
+
+  PsbtGlobalProprietaryUseType._({
+    required List<int> identifier,
+    required List<int> subkeydata,
+    required List<int> data,
+    required super.keyPair,
+  })  : identifier = identifier.asImmutableBytes,
+        subkeydata = subkeydata.asImmutableBytes,
+        data = data.asImmutableBytes,
+        super(type: PsbtGlobalTypes.proprietary);
+  factory PsbtGlobalProprietaryUseType({
+    required List<int> identifier,
+    required List<int> subkeydata,
+    required List<int> data,
+  }) {
+    return PsbtGlobalProprietaryUseType._(
+        identifier: identifier,
+        subkeydata: subkeydata,
+        data: data,
+        keyPair: PsbtKeyPair(
+            key: PsbtKey(PsbtGlobalTypes.proprietary.flag!, extraData: [
+              ...IntUtils.prependVarint(identifier),
+              ...IntUtils.prependVarint(subkeydata)
+            ]),
+            value: PsbtValue(data)));
+  }
+
+  factory PsbtGlobalProprietaryUseType.deserialize(PsbtKeyPair keypair) {
+    if (keypair.key.type != PsbtGlobalTypes.proprietary.flag) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT Proprietary Use Type type flag");
+    }
+    try {
+      final keyBytes = keypair.key.extraData!;
+      final identifierSize = IntUtils.decodeVarint(keyBytes);
+      final identifier = keyBytes.sublist(
+          identifierSize.item2, identifierSize.item1 + identifierSize.item2);
+      final subtypeOffset = identifierSize.item1 + identifierSize.item2;
+      final subkeydata = keyBytes.sublist(subtypeOffset);
+      return PsbtGlobalProprietaryUseType._(
+          identifier: identifier,
+          subkeydata: subkeydata,
+          data: keypair.value.data,
+          keyPair: keypair);
+    } catch (_) {}
+    throw DartBitcoinPluginException("Invalid PSBT Proprietary Use Type data");
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    return {
+      "type": type.name,
+      "identifier": BytesUtils.toHexString(identifier),
+      "subkeydata": BytesUtils.toHexString(subkeydata),
+      "data": BytesUtils.toHexString(data),
+    };
+  }
+}
+
+class PsbtGlobalUnknow extends PsbtGlobalData {
+  PsbtGlobalUnknow._(PsbtKeyPair keyPair)
+      : super(type: PsbtGlobalTypes.unknown, keyPair: keyPair);
+  factory PsbtGlobalUnknow(PsbtKeyPair keyPair) {
+    return PsbtGlobalUnknow._(keyPair);
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    return {
+      "type": type.name,
+      "key": {
+        "keyType": keyPair.key.type,
+        "keyData": BytesUtils.tryToHexString(keyPair.key.extraData)
+      },
+      "value": {"data": BytesUtils.toHexString(keyPair.value.data)},
+    };
+  }
+}
diff --git a/lib/src/psbt/types/types/inputs.dart b/lib/src/psbt/types/types/inputs.dart
new file mode 100644
index 0000000..aca7e75
--- /dev/null
+++ b/lib/src/psbt/types/types/inputs.dart
@@ -0,0 +1,2273 @@
+import 'dart:math';
+import 'dart:typed_data';
+import 'package:bitcoin_base/src/bitcoin/script/op_code/constant.dart';
+import 'package:bitcoin_base/src/bitcoin/script/script.dart';
+import 'package:bitcoin_base/src/bitcoin/script/transaction.dart';
+import 'package:bitcoin_base/src/bitcoin/script/witness.dart';
+import 'package:bitcoin_base/src/bitcoin/taproot/taproot.dart';
+import 'package:bitcoin_base/src/crypto/crypto.dart';
+import 'package:bitcoin_base/src/exception/exception.dart';
+import 'package:bitcoin_base/src/psbt/psbt_builder/types/types.dart';
+import 'package:bitcoin_base/src/psbt/types/types/psbt.dart';
+import 'package:blockchain_utils/blockchain_utils.dart';
+
+enum PsbtInputTypes {
+  nonWitnessUTXO(0x00, "PSBT_IN_NON_WITNESS_UTXO"),
+  witnessUTXO(0x01, "PSBT_IN_WITNESS_UTXO"),
+  partialSignature(0x02, "PSBT_IN_PARTIAL_SIG"),
+  sighashType(0x03, "PSBT_IN_SIGHASH_TYPE"),
+  redeemScript(0x04, "PSBT_IN_REDEEM_SCRIPT"),
+  witnessScript(0x05, "PSBT_IN_WITNESS_SCRIPT"),
+  bip32DerivationPath(0x06, "PSBT_IN_BIP32_DERIVATION"),
+  finalizedScriptSig(0x07, "PSBT_IN_FINAL_SCRIPTSIG"),
+  finalizedWitness(0x08, "PSBT_IN_FINAL_SCRIPTWITNESS"),
+  porCommitments(0x09, "PSBT_IN_POR_COMMITMENT"),
+  ripemd160(0x0a, "PSBT_IN_RIPEMD160"),
+  sha256(0x0b, "PSBT_IN_SHA256"),
+  hash160(0x0c, "PSBT_IN_HASH160"),
+  hash256(0x0d, "PSBT_IN_HASH256"),
+  previousTxId(0x0e, "PSBT_IN_PREVIOUS_TXID",
+      allowedVersion: PsbtVersion.v2, required: true),
+  spentOutputIndex(0x0f, "PSBT_IN_OUTPUT_INDEX",
+      allowedVersion: PsbtVersion.v2, required: true),
+  sequenceNumber(0x10, "PSBT_IN_SEQUENCE", allowedVersion: PsbtVersion.v2),
+  requiredTimeBasedLockTime(0x11, "PSBT_IN_REQUIRED_TIME_LOCKTIME",
+      allowedVersion: PsbtVersion.v2),
+  requiredHeightBasedLockTime(0x12, "PSBT_IN_REQUIRED_HEIGHT_LOCKTIME",
+      allowedVersion: PsbtVersion.v2),
+  taprootKeySpentSignature(0x13, "PSBT_IN_TAP_KEY_SIG"),
+  taprootScriptSpentSignature(0x14, "PSBT_IN_TAP_SCRIPT_SIG"),
+  taprootInternalKey(0x17, "PSBT_IN_TAP_INTERNAL_KEY"),
+  taprootMerkleRoot(0x18, "PSBT_IN_TAP_MERKLE_ROOT"),
+  taprootLeafScript(0x15, "PSBT_IN_TAP_LEAF_SCRIPT"),
+  taprootBip32Derivation(0x16, "PSBT_IN_TAP_BIP32_DERIVATION"),
+  muSig2ParticipantPublicKeys(0x1a, "PSBT_IN_MUSIG2_PARTICIPANT_PUBKEYS"),
+  muSig2PublicNonce(0x1b, "PSBT_IN_MUSIG2_PUB_NONCE"),
+  muSig2ParticipantPartialSignature(0x1c, "PSBT_IN_MUSIG2_PARTIAL_SIG"),
+  silentPaymentInputECDHShare(0x1d, "PSBT_IN_SP_ECDH_SHARE",
+      allowedVersion: PsbtVersion.v2),
+  silentPaymentInputDLEQProof(0x1e, "PSBT_IN_SP_DLEQ",
+      allowedVersion: PsbtVersion.v2),
+  proprietaryUseType(0xFC, "PSBT_IN_PROPRIETARY"),
+  unknown(null, "UNKNOWN");
+
+  const PsbtInputTypes(this.flag, this.psbtName,
+      {this.allowedVersion, this.required = false});
+  final String psbtName;
+  final bool required;
+  final PsbtVersion? allowedVersion;
+  final int? flag;
+  static PsbtInputTypes find(int flag) {
+    final type = values.firstWhereNullable((e) => e.flag == flag);
+    if (type != null) return type;
+    return unknown;
+  }
+}
+
+/// Represents the input section of a PSBT (Partially Signed Bitcoin Transaction).
+class PsbtInput {
+  /// The PSBT version associated with this input section.
+  final PsbtVersion version;
+
+  /// The list of input PSBT entries.
+  List<List<PsbtInputData>> _entries;
+  List<List<PsbtInputData>> get entries => _entries;
+  PsbtInput._(
+      {List<List<PsbtInputData>> entries = const [], required this.version})
+      : _entries = entries.map((e) => e.immutable).toImutableList;
+
+  /// Constructs a [PsbtInput] instance with a given version and input entries.
+  ///
+  /// Throws a [DartBitcoinPluginException] if any of the following conditions are met:
+  /// - Duplicate entries are found.
+  /// - A input entry is not allowed for the specified PSBT version.
+  /// - A required input entry is missing for the PSBT version
+  factory PsbtInput(
+      {List<List<PsbtInputData>> entries = const [],
+      required PsbtVersion version}) {
+    final requiredFilds = PsbtInputTypes.values.where((e) =>
+        e.required &&
+        (e.allowedVersion == null || e.allowedVersion == version));
+    for (final e in entries) {
+      final keys = e.map((e) => e.keyPair.key).toList();
+      if (keys.toSet().length != keys.length) {
+        throw DartBitcoinPluginException(
+            "Invalid PSBT Input: Duplicate entry detected.");
+      }
+      for (final i in e) {
+        if (i.type.allowedVersion == null) continue;
+        if (version != i.type.allowedVersion) {
+          throw DartBitcoinPluginException(
+              "Invalid PSBT Input: ${i.type.psbtName} is not allowed in PSBT version ${version.name}.");
+        }
+      }
+
+      for (final i in requiredFilds) {
+        e.firstWhere((e) => e.type == i,
+            orElse: () => throw DartBitcoinPluginException(
+                "Invalid PSBT Input: Missing required field ${i.psbtName} for PSBT version ${version.name}."));
+      }
+    }
+    return PsbtInput._(version: version, entries: entries);
+  }
+
+  /// Creates a [PsbtInput] instance from a list of key pairs.
+  factory PsbtInput.fromKeyPairs(
+      {List<List<PsbtKeyPair>> keypairs = const [],
+      required PsbtVersion version}) {
+    return PsbtInput(
+        entries: keypairs
+            .map((e) => e.map(PsbtInputData.deserialize).toList())
+            .toList(),
+        version: version);
+  }
+
+  int get length => _entries.length;
+
+  /// Validates if the provided entries is not duplicate and allowed by the PSBT version.
+  void _itemsAllowed(List<PsbtInputData> items) {
+    final keys = items.map((e) => e.keyPair.key).toSet();
+    if (keys.length != items.length) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT Input: Duplicate entry detected.");
+    }
+    for (final i in items) {
+      if (i.type.allowedVersion == null) continue;
+      if (version != i.type.allowedVersion) {
+        throw DartBitcoinPluginException(
+            "Invalid PSBT Input: ${i.type.psbtName} is not allowed in PSBT version ${version.name}.");
+      }
+    }
+  }
+
+  /// Adds new input to the PSBT.
+  void addInputs(List<PsbtInputData> inputs) {
+    _itemsAllowed(inputs);
+    _entries = [..._entries, inputs].toImutableList;
+  }
+
+  List<PsbtInputData> _validateIndex(int inputIndex) {
+    if (inputIndex >= _entries.length) {
+      throw DartBitcoinPluginException(
+          "Invalid input index: $inputIndex. The index exceeds the number of available entries.");
+    }
+    return _entries[inputIndex].clone();
+  }
+
+  /// Retrieves a single entry of a specified type.
+  T? getInput<T extends PsbtInputData>(int index, PsbtInputTypes type) {
+    final input = _validateIndex(index);
+    final data = input.where((e) => e.type == type);
+    if (data.isEmpty) return null;
+    if (data.length != 1) {
+      throw DartBitcoinPluginException(
+          "Multiple inputs with type '${type.name}' found. Use 'getInputs' to retrieve data for multiple globals");
+    }
+    return data.first.cast();
+  }
+
+  bool hasInput(int index, PsbtInputTypes type) {
+    final input = _validateIndex(index);
+    return input.any((e) => e.type == type);
+  }
+
+  /// Retrieves all entries of a specified type.
+  List<T>? getInputs<T extends PsbtInputData>(int index, PsbtInputTypes type) {
+    final input = _validateIndex(index);
+    final data = input.where((e) => e.type == type);
+
+    if (data.isEmpty) return null;
+    return data.toList().cast<T>();
+  }
+
+  /// Replaces the input at the specified [index]
+  void replaceInput(int index, List<PsbtInputData> inputs) {
+    _itemsAllowed(inputs);
+    final entries = _entries.clone();
+    _validateIndex(index);
+    entries[index] = inputs.toImutableList;
+    _entries = entries.toImutableList;
+  }
+
+  /// Updates the entries with new data.
+  void updateInputs(int index, List<PsbtInputData> inputs) {
+    _itemsAllowed(inputs);
+    final entries = _entries.clone();
+    final entry = _validateIndex(index);
+    for (final i in inputs) {
+      entry.removeWhere((e) => e.keyPair.key == i.keyPair.key);
+      entry.add(i);
+    }
+
+    entries[index] = entry.toImutableList;
+    _entries = entries.toImutableList;
+  }
+
+  /// remove the input data from given types at the specified [index]
+  void removeInputKeys(int index, List<PsbtInputTypes> types) {
+    final entry = _validateIndex(index);
+    final entries = _entries.clone();
+    entry.removeWhere((e) => types.contains(e.type));
+    entries[index] = entry.toImutableList;
+    _entries = entries.toImutableList;
+  }
+
+  /// Adds new input to the PSBT.
+  void addInput(PsbtInputData input) {
+    _itemsAllowed([input]);
+    _entries = [
+      ..._entries,
+      [input].toImutableList
+    ].toImutableList;
+  }
+
+  /// remove the input at the specified [index]
+  void removeInput(int index) {
+    _validateIndex(index);
+    final entries = _entries.clone();
+    entries.removeAt(index);
+    _entries = entries.immutable;
+  }
+
+  /// Converts the entries to json.
+  Map<String, dynamic> toJson() {
+    return {
+      "entries": entries.map((e) => e.map((e) => e.toJson()).toList()).toList()
+    };
+  }
+
+  /// Converts the entries to a list of key pairs.
+  List<List<PsbtKeyPair>> toKeyPairs() {
+    return _entries.map((e) => e.map((e) => e.keyPair).toList()).toList();
+  }
+
+  /// Creates a deep copy of the [PsbtInput] instance.
+  PsbtInput clone() {
+    return PsbtInput(
+        entries: entries.map((e) => e.clone()).toList(), version: version);
+  }
+
+  @override
+  String toString() {
+    return "inputs: ${_entries.join(", ")}";
+  }
+}
+
+abstract class PsbtInputData {
+  final PsbtInputTypes type;
+  final PsbtKeyPair keyPair;
+  int get flag => type.flag!;
+  PsbtInputData({required this.type, required this.keyPair});
+  factory PsbtInputData.deserialize(PsbtKeyPair keypair) {
+    final type = PsbtInputTypes.find(keypair.key.type);
+    return switch (type) {
+      PsbtInputTypes.nonWitnessUTXO =>
+        PsbtInputNonWitnessUtxo.deserialize(keypair),
+      PsbtInputTypes.witnessUTXO => PsbtInputWitnessUtxo.deserialize(keypair),
+      PsbtInputTypes.partialSignature =>
+        PsbtInputPartialSig.deserialize(keypair),
+      PsbtInputTypes.sighashType => PsbtInputSigHash.deserialize(keypair),
+      PsbtInputTypes.redeemScript => PsbtInputRedeemScript.deserialize(keypair),
+      PsbtInputTypes.witnessScript =>
+        PsbtInputWitnessScript.deserialize(keypair),
+      PsbtInputTypes.bip32DerivationPath =>
+        PsbtInputBip32DerivationPath.deserialize(keypair),
+      PsbtInputTypes.finalizedScriptSig =>
+        PsbtInputFinalizedScriptSig.deserialize(keypair),
+      PsbtInputTypes.finalizedWitness =>
+        PsbtInputFinalizedScriptWitness.deserialize(keypair),
+      PsbtInputTypes.porCommitments =>
+        PsbtInputPorCommitments.deserialize(keypair),
+      PsbtInputTypes.ripemd160 => PsbtInputRipemd160.deserialize(keypair),
+      PsbtInputTypes.sha256 => PsbtInputSha256.deserialize(keypair),
+      PsbtInputTypes.hash160 => PsbtInputHash160.deserialize(keypair),
+      PsbtInputTypes.hash256 => PsbtInputHash256.deserialize(keypair),
+      PsbtInputTypes.previousTxId => PsbtInputPreviousTXID.deserialize(keypair),
+      PsbtInputTypes.spentOutputIndex =>
+        PsbtInputSpentOutputIndex.deserialize(keypair),
+      PsbtInputTypes.sequenceNumber =>
+        PsbtInputSequenceNumber.deserialize(keypair),
+      PsbtInputTypes.requiredTimeBasedLockTime =>
+        PsbtInputRequiredTimeBasedLockTime.deserialize(keypair),
+      PsbtInputTypes.requiredHeightBasedLockTime =>
+        PsbtInputRequiredHeightBasedLockTime.deserialize(keypair),
+      PsbtInputTypes.taprootKeySpentSignature =>
+        PsbtInputTaprootKeySpendSignature.deserialize(keypair),
+      PsbtInputTypes.taprootScriptSpentSignature =>
+        PsbtInputTaprootScriptSpendSignature.deserialize(keypair),
+      PsbtInputTypes.taprootLeafScript =>
+        PsbtInputTaprootLeafScript.deserialize(keypair),
+      PsbtInputTypes.taprootBip32Derivation =>
+        PsbtInputTaprootKeyBip32DerivationPath.deserialize(keypair),
+      PsbtInputTypes.taprootInternalKey =>
+        PsbtInputTaprootInternalKey.deserialize(keypair),
+      PsbtInputTypes.taprootMerkleRoot =>
+        PsbtInputTaprootMerkleRoot.deserialize(keypair),
+      PsbtInputTypes.muSig2ParticipantPublicKeys =>
+        PsbtInputMuSig2ParticipantPublicKeys.deserialize(keypair),
+      PsbtInputTypes.muSig2PublicNonce =>
+        PsbtInputMuSig2PublicNonce.deserialize(keypair),
+      PsbtInputTypes.muSig2ParticipantPartialSignature =>
+        PsbtInputMuSig2ParticipantPartialSignature.deserialize(keypair),
+      PsbtInputTypes.silentPaymentInputECDHShare =>
+        PsbtInputSilentPaymentInputECDHShare.deserialize(keypair),
+      PsbtInputTypes.silentPaymentInputDLEQProof =>
+        PsbtInputSilentPaymentInputDLEQProof.deserialize(keypair),
+      PsbtInputTypes.proprietaryUseType =>
+        PsbtInputProprietaryUseType.deserialize(keypair),
+      PsbtInputTypes.unknown => PsbtInputUnknow(keypair),
+    };
+  }
+
+  T cast<T extends PsbtInputData>() {
+    if (this is! T) {
+      throw DartBitcoinPluginException(
+          "Invalid cast: expected ${T.runtimeType}, but found $runtimeType.",
+          details: {"expected": "$T", "type": runtimeType.toString()});
+    }
+    return this as T;
+  }
+
+  @override
+  String toString() {
+    return type.name;
+  }
+
+  Map<String, dynamic> toJson();
+}
+
+class PsbtInputNonWitnessUtxo extends PsbtInputData {
+  /// The transaction in network serialization format the current input spends from.
+  /// This should be present for inputs that spend non-segwit outputs and can be present
+  /// for inputs that spend segwit outputs. An input can have both PSBT_IN_NON_WITNESS_UTXO and PSBT_IN_WITNESS_UTXO.
+  final BtcTransaction transaction;
+  PsbtInputNonWitnessUtxo._({required this.transaction, required super.keyPair})
+      : super(type: PsbtInputTypes.nonWitnessUTXO);
+  PsbtInputNonWitnessUtxo(this.transaction)
+      : super(
+            type: PsbtInputTypes.nonWitnessUTXO,
+            keyPair: PsbtKeyPair(
+                key: PsbtKey(PsbtInputTypes.nonWitnessUTXO.flag!),
+                value: PsbtValue(transaction.toBytes())));
+  factory PsbtInputNonWitnessUtxo.deserialize(PsbtKeyPair keypair) {
+    if (keypair.key.type != PsbtInputTypes.nonWitnessUTXO.flag) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT Non-Witness UTXO type flag");
+    }
+    if (keypair.key.extraData != null) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT Non-Witness UTXO key data.");
+    }
+    try {
+      final transaction = BtcTransaction.deserialize(keypair.value.data);
+      return PsbtInputNonWitnessUtxo._(
+          transaction: transaction, keyPair: keypair);
+    } catch (_) {
+      throw DartBitcoinPluginException("Invalid PSBT Non-Witness UTXO data.");
+    }
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    return {
+      "type": type.name,
+      "transaction": transaction.toJson(),
+    };
+  }
+}
+
+class PsbtInputWitnessUtxo extends PsbtInputData {
+  /// The entire transaction output in network serialization which the current input spends from.
+  /// This should only be present for inputs which spend segwit outputs, including P2SH embedded ones.
+  /// An input can have both PSBT_IN_NON_WITNESS_UTXO and PSBT_IN_WITNESS_UTXO
+  final BigInt amount;
+  final Script scriptPubKey;
+  PsbtInputWitnessUtxo._(
+      {required BigInt amount,
+      required this.scriptPubKey,
+      required super.keyPair})
+      : amount = amount.asUint64,
+        super(type: PsbtInputTypes.witnessUTXO);
+  factory PsbtInputWitnessUtxo(
+      {required BigInt amount, required Script scriptPubKey}) {
+    return PsbtInputWitnessUtxo._(
+        amount: amount,
+        scriptPubKey: scriptPubKey,
+        keyPair: () {
+          final amountBytes =
+              BigintUtils.toBytes(amount, length: 8, order: Endian.little);
+          final scriptBytes = IntUtils.prependVarint(scriptPubKey.toBytes());
+          return PsbtKeyPair(
+              key: PsbtKey(PsbtInputTypes.witnessUTXO.flag!),
+              value: PsbtValue([...amountBytes, ...scriptBytes]));
+        }());
+  }
+
+  factory PsbtInputWitnessUtxo.deserialize(PsbtKeyPair keypair) {
+    if (keypair.key.type != PsbtInputTypes.witnessUTXO.flag) {
+      throw DartBitcoinPluginException("Invalid PSBT Witness UTXO type flag");
+    }
+    if (keypair.key.extraData != null) {
+      throw DartBitcoinPluginException("Invalid PSBT Witness UTXO key data.");
+    }
+    final bytes = keypair.value.data;
+    final amount =
+        BigintUtils.fromBytes(bytes.sublist(0, 8), byteOrder: Endian.little);
+    final scriptLength = IntUtils.decodeVarint(bytes.sublist(8));
+    final int offset = 8 + scriptLength.item2;
+    final int length = scriptLength.item1;
+    final script =
+        Script.deserialize(bytes: bytes.sublist(offset, offset + length));
+    return PsbtInputWitnessUtxo._(
+        amount: amount, scriptPubKey: script, keyPair: keypair);
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    return {
+      "type": type.name,
+      "amount": amount.toString(),
+      "scriptPubKey": scriptPubKey.toJson()
+    };
+  }
+}
+
+class PsbtInputPartialSig extends PsbtInputDataSignature {
+  /// The public key which corresponds to this signature.
+  final ECPublic publicKey;
+  final List<int> publicKeyBytes;
+
+  final PubKeyModes mode;
+
+  PsbtInputPartialSig._(
+      {required super.signature,
+      required this.publicKey,
+      required this.mode,
+      required super.keyPair,
+      required List<int> publicKeyBytes})
+      : publicKeyBytes = publicKeyBytes.asImmutableBytes,
+        super._(type: PsbtInputTypes.partialSignature);
+  factory PsbtInputPartialSig(
+      {required List<int> signature, required List<int> publicKey}) {
+    if (CryptoSignatureUtils.isValidBitcoinDERSignature(signature)) {
+      final pubKey = ECPublic.fromBytes(publicKey);
+      final mode = publicKey.length == EcdsaKeysConst.pubKeyCompressedByteLen
+          ? PubKeyModes.compressed
+          : PubKeyModes.uncompressed;
+      return PsbtInputPartialSig._(
+          signature: signature,
+          publicKey: pubKey,
+          publicKeyBytes: publicKey,
+          keyPair: PsbtKeyPair(
+              key: PsbtKey(PsbtInputTypes.partialSignature.flag!,
+                  extraData: pubKey.toBytes(mode: mode)),
+              value: PsbtValue(signature)),
+          mode: mode);
+    }
+    throw DartBitcoinPluginException("Invalid PSBT Partial Signature data.");
+  }
+
+  factory PsbtInputPartialSig.deserialize(PsbtKeyPair keypair) {
+    if (keypair.key.type != PsbtInputTypes.partialSignature.flag) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT Partial Signature type flag.");
+    }
+    if (CryptoSignatureUtils.isValidBitcoinDERSignature(keypair.value.data)) {
+      try {
+        final mode = keypair.key.extraData?.length ==
+                EcdsaKeysConst.pubKeyCompressedByteLen
+            ? PubKeyModes.compressed
+            : PubKeyModes.uncompressed;
+        return PsbtInputPartialSig._(
+            signature: keypair.value.data,
+            publicKey: ECPublic.fromBytes(keypair.key.extraData!),
+            publicKeyBytes: keypair.key.extraData!,
+            mode: mode,
+            keyPair: keypair);
+      } catch (_) {}
+    }
+    throw DartBitcoinPluginException("Invalid PSBT Partial Signature data.");
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    return {
+      "type": type.name,
+      "signature": BytesUtils.toHexString(signature),
+      "publicKey": publicKey.toHex(mode: mode)
+    };
+  }
+}
+
+class PsbtInputSigHash extends PsbtInputData {
+  /// The 32-bit unsigned integer specifying the sighash type to be used for this input.
+  /// Signatures for this input must use the sighash type, finalizers must fail to finalize
+  /// inputs which have signatures that do not match the specified sighash type.
+  /// Signers who cannot produce signatures with the sighash type must not provide a signature.
+  final int sighash;
+  PsbtInputSigHash._({required int sighash, required super.keyPair})
+      : sighash = sighash.asUint32,
+        super(type: PsbtInputTypes.sighashType);
+  factory PsbtInputSigHash(int sighash) {
+    return PsbtInputSigHash._(
+        sighash: sighash,
+        keyPair: () {
+          final sighashBytes = IntUtils.toBytes(sighash,
+              length: BitcoinOpCodeConst.sighashByteLength,
+              byteOrder: Endian.little);
+          return PsbtKeyPair(
+              key: PsbtKey(PsbtInputTypes.sighashType.flag!),
+              value: PsbtValue(sighashBytes));
+        }());
+  }
+  factory PsbtInputSigHash.deserialize(PsbtKeyPair keypair) {
+    if (keypair.key.type != PsbtInputTypes.sighashType.flag) {
+      throw DartBitcoinPluginException("Invalid PSBT sighash type flag");
+    }
+    if (keypair.key.extraData != null) {
+      throw DartBitcoinPluginException("Invalid PSBT sighash type key data.");
+    }
+
+    try {
+      if (keypair.value.data.length == BitcoinOpCodeConst.sighashByteLength) {
+        return PsbtInputSigHash._(
+            sighash:
+                IntUtils.fromBytes(keypair.value.data, byteOrder: Endian.little)
+                    .asUint32,
+            keyPair: keypair);
+      }
+    } catch (_) {}
+    throw DartBitcoinPluginException("Invalid PSBT sighash type data.");
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    return {"type": type.name, "sighash": sighash};
+  }
+}
+
+/// The redeemScript for this input if it has one.
+class PsbtInputRedeemScript extends PsbtInputData {
+  final Script redeemScript;
+  PsbtInputRedeemScript._({required this.redeemScript, required super.keyPair})
+      : super(type: PsbtInputTypes.redeemScript);
+  PsbtInputRedeemScript(this.redeemScript)
+      : super(
+            type: PsbtInputTypes.redeemScript,
+            keyPair: PsbtKeyPair(
+                key: PsbtKey(PsbtInputTypes.redeemScript.flag!),
+                value: PsbtValue(redeemScript.toBytes())));
+  factory PsbtInputRedeemScript.deserialize(PsbtKeyPair keypair) {
+    if (keypair.key.type != PsbtInputTypes.redeemScript.flag) {
+      throw DartBitcoinPluginException("Invalid PSBT Redeem Script type flag");
+    }
+    if (keypair.key.extraData != null) {
+      throw DartBitcoinPluginException("Invalid PSBT Redeem Script key data.");
+    }
+    Script redeemScript;
+    try {
+      redeemScript = Script.deserialize(bytes: keypair.value.data);
+    } catch (_) {
+      throw DartBitcoinPluginException("Invalid PSBT Redeem Script data.");
+    }
+    return PsbtInputRedeemScript._(
+        keyPair: keypair, redeemScript: redeemScript);
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    return {"type": type.name, "redeemScript": redeemScript.toJson()};
+  }
+}
+
+class PsbtInputWitnessScript extends PsbtInputData {
+  /// The witnessScript for this input if it has one.
+  final Script witnessScript;
+  PsbtInputWitnessScript._(
+      {required this.witnessScript, required super.keyPair})
+      : super(type: PsbtInputTypes.witnessScript);
+  PsbtInputWitnessScript(this.witnessScript)
+      : super(
+            type: PsbtInputTypes.witnessScript,
+            keyPair: PsbtKeyPair(
+                key: PsbtKey(PsbtInputTypes.witnessScript.flag!),
+                value: PsbtValue(witnessScript.toBytes())));
+  factory PsbtInputWitnessScript.deserialize(PsbtKeyPair keypair) {
+    if (keypair.key.type != PsbtInputTypes.witnessScript.flag) {
+      throw DartBitcoinPluginException("Invalid PSBT Witness Script type flag");
+    }
+    if (keypair.key.extraData != null) {
+      throw DartBitcoinPluginException("Invalid PSBT Witness Script key data.");
+    }
+    Script witnessScript;
+    try {
+      witnessScript = Script.deserialize(bytes: keypair.value.data);
+    } catch (_) {
+      throw DartBitcoinPluginException("Invalid PSBT Witness Script data.");
+    }
+    return PsbtInputWitnessScript._(
+        witnessScript: witnessScript, keyPair: keypair);
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    return {"type": type.name, "witnessScript": witnessScript.toJson()};
+  }
+}
+
+class PsbtInputBip32DerivationPath extends PsbtInputData {
+  /// The master key fingerprint as defined by BIP 32 concatenated with the derivation path of the public key.
+  /// The derivation path is represented as 32 bit unsigned integer indexes concatenated with each other.
+  /// Public keys are those that will be needed to sign this input.
+  final List<int> fingerprint;
+  final List<Bip32KeyIndex> indexes;
+
+  /// The public key
+  final List<int> publicKey;
+
+  String get path {
+    return Bip32Path(elems: indexes).toString();
+  }
+
+  BipOrTaprootKeyDerivationRequest toKeyDerivation() {
+    return BipOrTaprootKeyDerivationRequest(
+        pubKeyOrXonly: publicKey, indexes: indexes, fingerprint: fingerprint);
+  }
+
+  PsbtInputBip32DerivationPath._({
+    required List<int> fingerprint,
+    required List<Bip32KeyIndex> indexes,
+    required List<int> publicKey,
+    required super.keyPair,
+  })  : fingerprint = fingerprint.asImmutableBytes,
+        publicKey = publicKey.asImmutableBytes,
+        indexes = indexes.immutable,
+        super(type: PsbtInputTypes.bip32DerivationPath);
+  factory PsbtInputBip32DerivationPath({
+    required List<int> fingerprint,
+    required List<Bip32KeyIndex> indexes,
+    required List<int> publicKey,
+  }) {
+    if (fingerprint.length == Bip32KeyDataConst.fingerprintByteLen &&
+        Secp256k1PublicKeyEcdsa.isValidBytes(publicKey)) {
+      return PsbtInputBip32DerivationPath._(
+          fingerprint: fingerprint,
+          indexes: indexes,
+          publicKey: publicKey,
+          keyPair: () {
+            final List<int> indexesBytes = indexes
+                .map((e) => e.toBytes(Endian.little))
+                .expand((e) => e)
+                .toList();
+            return PsbtKeyPair(
+                key: PsbtKey(PsbtInputTypes.bip32DerivationPath.flag!,
+                    extraData: publicKey),
+                value: PsbtValue([...fingerprint, ...indexesBytes]));
+          }());
+    }
+    throw DartBitcoinPluginException(
+        "Invalid PSBT BIP 32 Derivation Path data.");
+  }
+
+  factory PsbtInputBip32DerivationPath.deserialize(PsbtKeyPair keypair) {
+    if (keypair.key.type != PsbtInputTypes.bip32DerivationPath.flag) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT BIP 32 Derivation Path type flag");
+    }
+    if (keypair.value.data.length < Bip32KeyDataConst.fingerprintByteLen ||
+        keypair.value.data.length % Bip32KeyDataConst.fingerprintByteLen != 0) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT BIP 32 Derivation Path fingerprint or bip32 index.");
+    }
+    final List<int> fingerPrint =
+        keypair.value.data.sublist(0, Bip32KeyDataConst.fingerprintByteLen);
+    final indexesBytes =
+        keypair.value.data.sublist(Bip32KeyDataConst.fingerprintByteLen);
+    final indexCount = indexesBytes.length ~/ Bip32KeyDataConst.keyIndexByteLen;
+    final List<Bip32KeyIndex> bip32Indexes;
+    try {
+      bip32Indexes = List.generate(indexCount, (i) {
+        final offset = i * Bip32KeyDataConst.keyIndexByteLen;
+        return Bip32KeyIndex.fromBytes(indexesBytes.sublist(
+            offset, offset + Bip32KeyDataConst.keyIndexByteLen));
+      });
+      if (fingerPrint.length == Bip32KeyDataConst.fingerprintByteLen &&
+          Secp256k1PublicKeyEcdsa.isValidBytes(keypair.key.extraData ?? [])) {
+        return PsbtInputBip32DerivationPath._(
+            fingerprint: fingerPrint,
+            indexes: bip32Indexes,
+            publicKey: keypair.key.extraData ?? [],
+            keyPair: keypair);
+      }
+    } catch (_) {}
+    throw DartBitcoinPluginException("Invalid BIP 32 Derivation Path indexes.");
+  }
+
+  factory PsbtInputBip32DerivationPath.fromBip32(
+      {required Bip32Slip10Secp256k1 masterKey, required String path}) {
+    final derive = masterKey.derivePath(path);
+    final indexes = Bip32PathParser.parse(path).elems;
+    return PsbtInputBip32DerivationPath(
+        fingerprint: derive.fingerPrint.toBytes(),
+        indexes: indexes,
+        publicKey: derive.publicKey.compressed);
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    return {
+      "type": type.name,
+      "fingerprint": BytesUtils.toHexString(fingerprint),
+      "indexes": indexes.map((e) => e.index).toList(),
+      "publicKey": BytesUtils.toHexString(publicKey)
+    };
+  }
+}
+
+class PsbtInputFinalizedScriptSig extends PsbtInputData {
+  /// The Finalized scriptSig contains a fully constructed scriptSig with signatures and any other scripts necessary
+  /// for the input to pass validation.
+  final Script finalizedScriptSig;
+  PsbtInputFinalizedScriptSig._(
+      {required this.finalizedScriptSig, required super.keyPair})
+      : super(type: PsbtInputTypes.finalizedScriptSig);
+  PsbtInputFinalizedScriptSig(this.finalizedScriptSig)
+      : super(
+            type: PsbtInputTypes.finalizedScriptSig,
+            keyPair: PsbtKeyPair(
+                key: PsbtKey(PsbtInputTypes.finalizedScriptSig.flag!),
+                value: PsbtValue(finalizedScriptSig.toBytes())));
+  factory PsbtInputFinalizedScriptSig.deserialize(PsbtKeyPair keypair) {
+    if (keypair.key.type != PsbtInputTypes.finalizedScriptSig.flag) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT Finalized scriptSig type flag");
+    }
+    if (keypair.key.extraData != null) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT Finalized scriptSig key data.");
+    }
+    try {
+      final finalizedScriptSig = Script.deserialize(bytes: keypair.value.data);
+      return PsbtInputFinalizedScriptSig._(
+          keyPair: keypair, finalizedScriptSig: finalizedScriptSig);
+    } catch (_) {}
+    throw DartBitcoinPluginException("Invalid PSBT Finalized scriptSig data.");
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    return {
+      "type": type.name,
+      "finalizedScriptSig": finalizedScriptSig.toJson()
+    };
+  }
+}
+
+class PsbtInputFinalizedScriptWitness extends PsbtInputData {
+  /// The Finalized scriptWitness contains a fully constructed scriptWitness with
+  /// signatures and any other scripts necessary for the input to pass validation.
+  final TxWitnessInput finalizedScriptWitness;
+  PsbtInputFinalizedScriptWitness._(
+      {required this.finalizedScriptWitness, required super.keyPair})
+      : super(type: PsbtInputTypes.finalizedWitness);
+  PsbtInputFinalizedScriptWitness(this.finalizedScriptWitness)
+      : super(
+            type: PsbtInputTypes.finalizedWitness,
+            keyPair: PsbtKeyPair(
+                key: PsbtKey(PsbtInputTypes.finalizedWitness.flag!),
+                value: PsbtValue(finalizedScriptWitness.toBytes())));
+  factory PsbtInputFinalizedScriptWitness.deserialize(PsbtKeyPair keypair) {
+    if (keypair.key.type != PsbtInputTypes.finalizedWitness.flag) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT Finalized scriptWitness type flag");
+    }
+    if (keypair.key.extraData != null) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT Finalized scriptWitness key data.");
+    }
+    try {
+      final finalizedScriptWitness =
+          TxWitnessInput.deserialize(keypair.value.data);
+      return PsbtInputFinalizedScriptWitness._(
+          finalizedScriptWitness: finalizedScriptWitness, keyPair: keypair);
+    } catch (_) {}
+    throw DartBitcoinPluginException(
+        "Invalid PSBT Finalized scriptWitness data.");
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    return {
+      "type": type.name,
+      "finalizedScriptWitness": finalizedScriptWitness.toJson()
+    };
+  }
+}
+
+/// The UTF-8 encoded commitment message string for the proof-of-reserves.
+/// See BIP 127 for more information.
+class PsbtInputPorCommitments extends PsbtInputData {
+  final String commitmentMessage;
+  PsbtInputPorCommitments._(
+      {required this.commitmentMessage, required super.keyPair})
+      : super(type: PsbtInputTypes.porCommitments);
+  PsbtInputPorCommitments(this.commitmentMessage)
+      : super(
+            type: PsbtInputTypes.porCommitments,
+            keyPair: PsbtKeyPair(
+                key: PsbtKey(PsbtInputTypes.porCommitments.flag!),
+                value: PsbtValue(StringUtils.encode(commitmentMessage))));
+  factory PsbtInputPorCommitments.deserialize(PsbtKeyPair keypair) {
+    if (keypair.key.type != PsbtInputTypes.porCommitments.flag) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT Proof-of-reserves commitment type flag");
+    }
+    if (keypair.key.extraData != null) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT Proof-of-reserves commitment key data.");
+    }
+    try {
+      final message = StringUtils.decode(keypair.value.data);
+      return PsbtInputPorCommitments._(
+          commitmentMessage: message, keyPair: keypair);
+    } catch (_) {}
+    throw DartBitcoinPluginException(
+        "Invalid PSBT Proof-of-reserves commitment data.");
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    return {"type": type.name, "commitmentMessage": commitmentMessage};
+  }
+}
+
+class PsbtInputRipemd160 extends PsbtInputData {
+  /// The hash preimage, encoded as a byte vector, which must equal the key when run through the RIPEMD160 algorithm
+  final List<int> preimage;
+
+  /// The resulting hash of the preimage
+  final List<int> hash;
+  String preImageHex() {
+    return BytesUtils.toHexString(preimage);
+  }
+
+  PsbtInputRipemd160._(
+      {required List<int> preimage,
+      required List<int> hash,
+      required super.keyPair})
+      : preimage = preimage.asImmutableBytes,
+        hash = hash.asImmutableBytes,
+        super(type: PsbtInputTypes.ripemd160);
+  factory PsbtInputRipemd160(
+      {required List<int> preimage, required List<int> hash}) {
+    if (hash.length == QuickCrypto.hash160DigestSize) {
+      return PsbtInputRipemd160._(
+          preimage: preimage,
+          hash: hash,
+          keyPair: PsbtKeyPair(
+              key: PsbtKey(PsbtInputTypes.ripemd160.flag!, extraData: hash),
+              value: PsbtValue(preimage)));
+    }
+    throw DartBitcoinPluginException("Invalid PSBT RIPEMD160 hash length.");
+  }
+  factory PsbtInputRipemd160.deserialize(PsbtKeyPair keypair) {
+    if (keypair.key.type != PsbtInputTypes.ripemd160.flag) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT RIPEMD160 preimage type flag");
+    }
+    if (keypair.key.extraData?.length == QuickCrypto.hash160DigestSize) {
+      return PsbtInputRipemd160._(
+          hash: keypair.key.extraData ?? [],
+          preimage: keypair.value.data,
+          keyPair: keypair);
+    }
+    throw DartBitcoinPluginException("Invalid PSBT RIPEMD160 preimage date");
+  }
+
+  factory PsbtInputRipemd160.fromPreImage(List<int> preimage) {
+    return PsbtInputRipemd160(
+        preimage: preimage, hash: QuickCrypto.ripemd160Hash(preimage));
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    return {
+      "type": type.name,
+      "preimage": BytesUtils.toHexString(preimage),
+      "hash": BytesUtils.toHexString(hash)
+    };
+  }
+}
+
+class PsbtInputSha256 extends PsbtInputData {
+  /// The hash preimage, encoded as a byte vector, which must equal the key when run through the SHA256 algorithm
+  final List<int> preimage;
+
+  /// The resulting hash of the preimage
+  final List<int> hash;
+
+  String preImageHex() {
+    return BytesUtils.toHexString(preimage);
+  }
+
+  PsbtInputSha256._({
+    required List<int> preimage,
+    required List<int> hash,
+    required super.keyPair,
+  })  : preimage = preimage.asImmutableBytes,
+        hash = hash.asImmutableBytes,
+        super(type: PsbtInputTypes.sha256);
+  factory PsbtInputSha256(
+      {required List<int> preimage, required List<int> hash}) {
+    if (hash.length == QuickCrypto.sha256DigestSize) {
+      return PsbtInputSha256._(
+          preimage: preimage,
+          hash: hash,
+          keyPair: PsbtKeyPair(
+              key: PsbtKey(PsbtInputTypes.sha256.flag!, extraData: hash),
+              value: PsbtValue(preimage)));
+    }
+    throw DartBitcoinPluginException(
+        "Invalid PSBT SHA256 preimage hash length.");
+  }
+  factory PsbtInputSha256.deserialize(PsbtKeyPair keypair) {
+    if (keypair.key.type != PsbtInputTypes.sha256.flag) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT SHA256 preimage type flag");
+    }
+    if (keypair.key.extraData?.length == QuickCrypto.sha256DigestSize) {
+      return PsbtInputSha256._(
+          hash: keypair.key.extraData!,
+          preimage: keypair.value.data,
+          keyPair: keypair);
+    }
+    throw DartBitcoinPluginException("Invalid PSBT SHA256 preimage data");
+  }
+  factory PsbtInputSha256.fromPreImage(List<int> preimage) {
+    return PsbtInputSha256(
+        preimage: preimage, hash: QuickCrypto.sha256Hash(preimage));
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    return {
+      "type": type.name,
+      "preimage": BytesUtils.toHexString(preimage),
+      "hash": BytesUtils.toHexString(hash)
+    };
+  }
+}
+
+class PsbtInputHash160 extends PsbtInputData {
+  /// The hash preimage, encoded as a byte vector, which must equal the key when run through the
+  ///  SHA256 algorithm followed by the RIPEMD160 algorithm
+  final List<int> preimage;
+
+  /// The resulting hash of the preimage
+  final List<int> hash;
+  String preImageHex() {
+    return BytesUtils.toHexString(preimage);
+  }
+
+  PsbtInputHash160._({
+    required List<int> preimage,
+    required List<int> hash,
+    required super.keyPair,
+  })  : preimage = preimage.asImmutableBytes,
+        hash = hash.asImmutableBytes,
+        super(type: PsbtInputTypes.hash160);
+  factory PsbtInputHash160(
+      {required List<int> preimage, required List<int> hash}) {
+    if (hash.length == QuickCrypto.hash160DigestSize) {
+      return PsbtInputHash160._(
+          preimage: preimage,
+          hash: hash,
+          keyPair: PsbtKeyPair(
+              key: PsbtKey(PsbtInputTypes.hash160.flag!, extraData: hash),
+              value: PsbtValue(preimage)));
+    }
+    throw DartBitcoinPluginException(
+        "Invalid PSBT HASH160 preimage hash length.");
+  }
+  factory PsbtInputHash160.deserialize(PsbtKeyPair keypair) {
+    if (keypair.key.type != PsbtInputTypes.hash160.flag) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT HASH160 preimage type flag");
+    }
+    if (keypair.key.extraData?.length == QuickCrypto.hash160DigestSize) {
+      return PsbtInputHash160._(
+          hash: keypair.key.extraData!,
+          preimage: keypair.value.data,
+          keyPair: keypair);
+    }
+
+    throw DartBitcoinPluginException("Invalid PSBT HASH160 preimage type flag");
+  }
+  factory PsbtInputHash160.fromPreImage(List<int> preimage) {
+    return PsbtInputHash160(
+        preimage: preimage, hash: QuickCrypto.hash160(preimage));
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    return {
+      "type": type.name,
+      "preimage": BytesUtils.toHexString(preimage),
+      "hash": BytesUtils.toHexString(hash)
+    };
+  }
+}
+
+class PsbtInputHash256 extends PsbtInputData {
+  /// The hash preimage, encoded as a byte vector, which must equal the key when run through the SHA256 algorithm twice
+  final List<int> preimage;
+
+  /// The resulting hash of the preimage
+  final List<int> hash;
+  String preImageHex() {
+    return BytesUtils.toHexString(preimage);
+  }
+
+  PsbtInputHash256._({
+    required List<int> preimage,
+    required List<int> hash,
+    required super.keyPair,
+  })  : preimage = preimage.asImmutableBytes,
+        hash = hash.asImmutableBytes,
+        super(type: PsbtInputTypes.hash256);
+  factory PsbtInputHash256(
+      {required List<int> preimage, required List<int> hash}) {
+    if (hash.length == QuickCrypto.sha256DigestSize) {
+      return PsbtInputHash256._(
+          preimage: preimage,
+          hash: hash,
+          keyPair: PsbtKeyPair(
+              key: PsbtKey(PsbtInputTypes.hash256.flag!, extraData: hash),
+              value: PsbtValue(preimage)));
+    }
+    throw DartBitcoinPluginException(
+        "Invalid PSBT HASH256 preimage hash length.");
+  }
+  factory PsbtInputHash256.deserialize(PsbtKeyPair keypair) {
+    if (keypair.key.type != PsbtInputTypes.hash256.flag) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT HASH256 preimage type flag");
+    }
+    if (keypair.key.extraData?.length == QuickCrypto.sha256DigestSize) {
+      return PsbtInputHash256._(
+          hash: keypair.key.extraData ?? [],
+          preimage: keypair.value.data,
+          keyPair: keypair);
+    }
+    throw DartBitcoinPluginException("Invalid PSBT HASH256 preimage data.");
+  }
+  factory PsbtInputHash256.fromPreImage(List<int> preimage) {
+    return PsbtInputHash256(
+        preimage: preimage, hash: QuickCrypto.sha256DoubleHash(preimage));
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    return {
+      "type": type.name,
+      "preimage": BytesUtils.toHexString(preimage),
+      "hash": BytesUtils.toHexString(hash)
+    };
+  }
+}
+
+class PsbtInputPreviousTXID extends PsbtInputData {
+  /// 32 byte txid of the previous transaction whose output at PSBT_IN_OUTPUT_INDEX is being spent.
+  final List<int> txId;
+  PsbtInputPreviousTXID._({
+    required List<int> txId,
+    required super.keyPair,
+  })  : txId = txId.asImmutableBytes,
+        super(type: PsbtInputTypes.previousTxId);
+  factory PsbtInputPreviousTXID(List<int> txId) {
+    if (txId.length == QuickCrypto.sha256DigestSize) {
+      return PsbtInputPreviousTXID._(
+          txId: txId,
+          keyPair: PsbtKeyPair(
+              key: PsbtKey(PsbtInputTypes.previousTxId.flag!),
+              value: PsbtValue(txId)));
+    }
+    throw DartBitcoinPluginException(
+        "Invalid PSBT Previous TXID transaction id bytes length.");
+  }
+  factory PsbtInputPreviousTXID.fromHex(String txId) {
+    return PsbtInputPreviousTXID(
+        BytesUtils.fromHexString(txId).reversed.toList());
+  }
+  factory PsbtInputPreviousTXID.deserialize(PsbtKeyPair keypair) {
+    if (keypair.key.type != PsbtInputTypes.previousTxId.flag) {
+      throw DartBitcoinPluginException("Invalid PSBT Previous TXID type flag");
+    }
+    if (keypair.key.extraData != null) {
+      throw DartBitcoinPluginException("Invalid PSBT Previous TXID key data.");
+    }
+    if (keypair.value.data.length == QuickCrypto.sha256DigestSize) {
+      return PsbtInputPreviousTXID._(
+          keyPair: keypair, txId: keypair.value.data);
+    }
+    throw DartBitcoinPluginException("Invalid PSBT Previous TXID key data.");
+  }
+
+  @override
+  operator ==(other) {
+    if (identical(this, other)) return true;
+    if (other is PsbtInputPreviousTXID &&
+        BytesUtils.bytesEqual(other.txId, txId)) {
+      return true;
+    }
+    return false;
+  }
+
+  String txIdHex() {
+    return BytesUtils.toHexString(txId.reversed.toList());
+  }
+
+  @override
+  int get hashCode => HashCodeGenerator.generateBytesHashCode(txId, [type]);
+  @override
+  Map<String, dynamic> toJson() {
+    return {"type": type.name, "txId": txIdHex()};
+  }
+}
+
+/// 32 bit little endian integer representing the index of
+/// the output being spent in the transaction with the txid of PSBT_IN_PREVIOUS_TXID.
+class PsbtInputSpentOutputIndex extends PsbtInputData {
+  final int index;
+  PsbtInputSpentOutputIndex._({required int index, required super.keyPair})
+      : index = index.asUint32,
+        super(type: PsbtInputTypes.spentOutputIndex);
+  factory PsbtInputSpentOutputIndex(int index) {
+    return PsbtInputSpentOutputIndex._(
+        index: index,
+        keyPair: () {
+          final indexBytes = IntUtils.toBytes(index,
+              length: BitcoinOpCodeConst.outputIndexBytesLength,
+              byteOrder: Endian.little);
+          return PsbtKeyPair(
+              key: PsbtKey(PsbtInputTypes.spentOutputIndex.flag!),
+              value: PsbtValue(indexBytes));
+        }());
+  }
+  factory PsbtInputSpentOutputIndex.deserialize(PsbtKeyPair keypair) {
+    if (keypair.key.type != PsbtInputTypes.spentOutputIndex.flag) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT Spent Output Index type flag");
+    }
+    if (keypair.key.extraData != null) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT Spent Output Index key data.");
+    }
+    try {
+      if (keypair.value.data.length ==
+          BitcoinOpCodeConst.outputIndexBytesLength) {
+        return PsbtInputSpentOutputIndex(
+            IntUtils.fromBytes(keypair.value.data, byteOrder: Endian.little)
+                .asUint32);
+      }
+    } catch (_) {}
+    throw DartBitcoinPluginException("Invalid PSBT Spent Output Index data.");
+  }
+
+  @override
+  operator ==(other) {
+    if (identical(this, other)) return true;
+    if (other is PsbtInputSpentOutputIndex && index == other.index) {
+      return true;
+    }
+    return false;
+  }
+
+  @override
+  int get hashCode => HashCodeGenerator.generateHashCode([index, type]);
+  @override
+  Map<String, dynamic> toJson() {
+    return {"type": type.name, "index": index};
+  }
+}
+
+class PsbtInputSequenceNumber extends PsbtInputData {
+  /// The 32 bit unsigned little endian integer for the sequence number of this input.
+  /// If omitted, the sequence number is assumed to be the final sequence number (0xffffffff).
+  final int sequence;
+  PsbtInputSequenceNumber._({required int sequence, required super.keyPair})
+      : sequence = sequence.asUint32,
+        super(type: PsbtInputTypes.sequenceNumber);
+  factory PsbtInputSequenceNumber(int sequence) {
+    return PsbtInputSequenceNumber._(
+        sequence: sequence,
+        keyPair: () {
+          final sequenceBytes = IntUtils.toBytes(sequence,
+              length: BitcoinOpCodeConst.sequenceLengthInBytes,
+              byteOrder: Endian.little);
+          return PsbtKeyPair(
+              key: PsbtKey(PsbtInputTypes.sequenceNumber.flag!),
+              value: PsbtValue(sequenceBytes));
+        }());
+  }
+  factory PsbtInputSequenceNumber.deserialize(PsbtKeyPair keypair) {
+    if (keypair.key.type != PsbtInputTypes.sequenceNumber.flag) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT Sequence Number type flag");
+    }
+    if (keypair.key.extraData != null) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT Sequence Number key data.");
+    }
+    try {
+      if (keypair.value.data.length ==
+          BitcoinOpCodeConst.sequenceLengthInBytes) {
+        return PsbtInputSequenceNumber(
+            IntUtils.fromBytes(keypair.value.data, byteOrder: Endian.little)
+                .asUint32);
+      }
+    } catch (_) {}
+    throw DartBitcoinPluginException("Invalid PSBT Sequence Number data.");
+  }
+
+  List<int> sequenceBytes() {
+    return IntUtils.toBytes(sequence,
+        length: BitcoinOpCodeConst.locktimeLengthInBytes,
+        byteOrder: Endian.little);
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    return {"type": type.name, "sequence": sequence};
+  }
+}
+
+class PsbtInputRequiredTimeBasedLockTime extends PsbtInputData {
+  /// endian uint locktime>	32 bit unsigned little endian integer greater than or equal to 500000000 representing
+  /// the minimum Unix timestamp that this input requires to be set as the transaction's lock time.
+  final int locktime;
+
+  PsbtInputRequiredTimeBasedLockTime._(
+      {required int locktime, required super.keyPair})
+      : locktime = locktime.asUint32,
+        super(type: PsbtInputTypes.requiredTimeBasedLockTime);
+  factory PsbtInputRequiredTimeBasedLockTime(int locktime) {
+    if (locktime < 500000000 || locktime > maxUint32) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT Required Time-based Locktime data.");
+    }
+    return PsbtInputRequiredTimeBasedLockTime._(
+        locktime: locktime,
+        keyPair: () {
+          final locktimeBytes = IntUtils.toBytes(locktime,
+              length: BitcoinOpCodeConst.locktimeLengthInBytes,
+              byteOrder: Endian.little);
+          return PsbtKeyPair(
+              key: PsbtKey(PsbtInputTypes.requiredTimeBasedLockTime.flag!),
+              value: PsbtValue(locktimeBytes));
+        }());
+  }
+  factory PsbtInputRequiredTimeBasedLockTime.deserialize(PsbtKeyPair keypair) {
+    if (keypair.key.type != PsbtInputTypes.requiredTimeBasedLockTime.flag) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT Required Time-based Locktime type flag");
+    }
+    if (keypair.key.extraData != null) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT Required Time-based Locktime key data.");
+    }
+    try {
+      if (keypair.value.data.length ==
+          BitcoinOpCodeConst.locktimeLengthInBytes) {
+        final locktime =
+            IntUtils.fromBytes(keypair.value.data, byteOrder: Endian.little)
+                .asUint32;
+        if (locktime < 500000000 || locktime > maxUint32) {
+          throw DartBitcoinPluginException(
+              "Invalid PSBT Required Time-based Locktime data.");
+        }
+        return PsbtInputRequiredTimeBasedLockTime._(
+            locktime: locktime, keyPair: keypair);
+      }
+    } catch (_) {}
+    throw DartBitcoinPluginException(
+        "Invalid PSBT Required Time-based Locktime data.");
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    return {"type": type.name, "locktime": locktime};
+  }
+
+  List<int> sequenceBytes() {
+    return IntUtils.toBytes(locktime,
+        length: BitcoinOpCodeConst.sequenceLengthInBytes,
+        byteOrder: Endian.little);
+  }
+}
+
+class PsbtInputRequiredHeightBasedLockTime extends PsbtInputData {
+  /// 32 bit unsigned little endian integer less than 500000000 representing the minimum
+  /// block height that this input requires to be set as the transaction's lock time.
+  final int height;
+
+  PsbtInputRequiredHeightBasedLockTime._(
+      {required int height, required super.keyPair})
+      : height = height.asUint32,
+        super(
+          type: PsbtInputTypes.requiredHeightBasedLockTime,
+        );
+  factory PsbtInputRequiredHeightBasedLockTime(int height) {
+    if (height.isNegative || height >= 500000000) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT Required Height-based Locktime data.");
+    }
+    return PsbtInputRequiredHeightBasedLockTime._(
+        height: height,
+        keyPair: () {
+          final locktimeBytes = IntUtils.toBytes(height,
+              length: BitcoinOpCodeConst.locktimeLengthInBytes,
+              byteOrder: Endian.little);
+          return PsbtKeyPair(
+              key: PsbtKey(PsbtInputTypes.requiredHeightBasedLockTime.flag!),
+              value: PsbtValue(locktimeBytes));
+        }());
+  }
+  factory PsbtInputRequiredHeightBasedLockTime.deserialize(
+      PsbtKeyPair keypair) {
+    if (keypair.key.type != PsbtInputTypes.requiredHeightBasedLockTime.flag) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT Required Height-based Locktime type flag");
+    }
+    if (keypair.key.extraData != null) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT Required Height-based Locktime key data.");
+    }
+    try {
+      if (keypair.value.data.length ==
+          BitcoinOpCodeConst.locktimeLengthInBytes) {
+        final height =
+            IntUtils.fromBytes(keypair.value.data, byteOrder: Endian.little)
+                .asUint32;
+        if (height.isNegative || height >= 500000000) {
+          throw DartBitcoinPluginException(
+              "Invalid PSBT Required Height-based Locktime data.");
+        }
+        return PsbtInputRequiredHeightBasedLockTime._(
+            height: height, keyPair: keypair);
+      }
+    } catch (_) {}
+    throw DartBitcoinPluginException(
+        "Invalid PSBT Required Height-based Locktime data.");
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    return {"type": type.name, "height": height};
+  }
+
+  List<int> sequenceBytes() {
+    return IntUtils.toBytes(height,
+        length: BitcoinOpCodeConst.locktimeLengthInBytes,
+        byteOrder: Endian.little);
+  }
+}
+
+abstract class PsbtInputDataSignature extends PsbtInputData {
+  final List<int> signature;
+  PsbtInputDataSignature._(
+      {required List<int> signature,
+      required super.type,
+      required super.keyPair})
+      : signature = signature.asImmutableBytes;
+  String signatureHex() {
+    return BytesUtils.toHexString(signature);
+  }
+}
+
+/// The 64 or 65 byte Schnorr signature for key path spending a Taproot output.
+/// Finalizers should remove this field after PSBT_IN_FINAL_SCRIPTWITNESS is constructed.
+class PsbtInputTaprootKeySpendSignature extends PsbtInputDataSignature {
+  PsbtInputTaprootKeySpendSignature._(
+      {required super.signature, required super.keyPair})
+      : super._(type: PsbtInputTypes.taprootKeySpentSignature);
+  factory PsbtInputTaprootKeySpendSignature(List<int> signature) {
+    if (!CryptoSignatureUtils.isValidSchnorrSignature(signature)) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT Taproot Key Spend Signature data.");
+    }
+    return PsbtInputTaprootKeySpendSignature._(
+        signature: signature,
+        keyPair: PsbtKeyPair(
+            key: PsbtKey(PsbtInputTypes.taprootKeySpentSignature.flag!),
+            value: PsbtValue(signature)));
+  }
+  factory PsbtInputTaprootKeySpendSignature.deserialize(PsbtKeyPair keypair) {
+    if (keypair.key.type != PsbtInputTypes.taprootKeySpentSignature.flag) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT Taproot Key Spend Signature type flag");
+    }
+    if (keypair.key.extraData != null) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT Taproot Key Spend Signature key data.");
+    }
+    if (!CryptoSignatureUtils.isValidSchnorrSignature(keypair.value.data)) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT Taproot Key Spend Signature data.");
+    }
+    return PsbtInputTaprootKeySpendSignature._(
+        signature: keypair.value.data, keyPair: keypair);
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    return {"type": type.name, "signature": BytesUtils.toHexString(signature)};
+  }
+}
+
+class PsbtInputTaprootScriptSpendSignature extends PsbtInputDataSignature {
+  /// A 32 byte X-only public key involved in a leaf script concatenated with the 32 byte hash of the leaf it is part of.
+  final List<int> xOnlyPubKey;
+  final List<int> leafHash;
+
+  late final String xOnlyPubKeyHex = BytesUtils.toHexString(xOnlyPubKey);
+
+  PsbtInputTaprootScriptSpendSignature._(
+      {required super.signature,
+      required List<int> xOnlyPubKey,
+      required List<int> leafHash,
+      required super.keyPair})
+      : xOnlyPubKey = xOnlyPubKey.asImmutableBytes,
+        leafHash = leafHash.asImmutableBytes,
+        super._(type: PsbtInputTypes.taprootScriptSpentSignature);
+  factory PsbtInputTaprootScriptSpendSignature(
+      {required List<int> signature,
+      required List<int> xOnlyPubKey,
+      required List<int> leafHash}) {
+    if (xOnlyPubKey.length != EcdsaKeysConst.pointCoordByteLen ||
+        leafHash.length != QuickCrypto.sha256DigestSize ||
+        !CryptoSignatureUtils.isValidSchnorrSignature(signature)) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT Taproot Script Spend Signature data.");
+    }
+    return PsbtInputTaprootScriptSpendSignature._(
+        signature: signature,
+        xOnlyPubKey: xOnlyPubKey,
+        leafHash: leafHash,
+        keyPair: PsbtKeyPair(
+            key: PsbtKey(PsbtInputTypes.taprootScriptSpentSignature.flag!,
+                extraData: [...xOnlyPubKey, ...leafHash]),
+            value: PsbtValue(signature)));
+  }
+  factory PsbtInputTaprootScriptSpendSignature.deserialize(
+      PsbtKeyPair keypair) {
+    if (keypair.key.type != PsbtInputTypes.taprootScriptSpentSignature.flag) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT Taproot Script Spend Signature type flag");
+    }
+    final signature = keypair.value.data;
+    if (keypair.key.extraData?.length == EcdsaKeysConst.pointCoordByteLen * 2 &&
+        CryptoSignatureUtils.isValidSchnorrSignature(signature)) {
+      final key = keypair.key.extraData!;
+      return PsbtInputTaprootScriptSpendSignature._(
+          xOnlyPubKey: key.sublist(0, EcdsaKeysConst.pointCoordByteLen),
+          leafHash: key.sublist(EcdsaKeysConst.pointCoordByteLen),
+          signature: signature,
+          keyPair: keypair);
+    }
+    throw DartBitcoinPluginException(
+        "Invalid PSBT Taproot Script Spend Signature data.");
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    return {
+      "type": type.name,
+      "signature": BytesUtils.toHexString(signature),
+      "xOnlyPubKey": BytesUtils.toHexString(xOnlyPubKey),
+      "leafHash": BytesUtils.toHexString(leafHash)
+    };
+  }
+}
+
+/// The script for this leaf as would be provided in the witness stack followed by the single byte leaf version. Note that the leaves included in this field should be those that the signers of this input are expected to be able to sign for.
+/// Finalizers should remove this field after PSBT_IN_FINAL_SCRIPTWITNESS is constructed.
+class PsbtInputTaprootLeafScript extends PsbtInputData {
+  /// The control block for this leaf as specified in BIP 341.
+  /// The control block contains the merkle tree path to this leaf.
+  final List<int> controllBlock;
+
+  /// The script for this leaf as would be provided in the witness stack followed by the single byte leaf version.
+  /// Note that the leaves included in this field should be those that the signers of this
+  /// input are expected to be able to sign for. Finalizers should remove this field after
+  /// PSBT_IN_FINAL_SCRIPTWITNESS is constructed.
+  final Script script;
+  final int leafVersion;
+
+  final TaprootLeaf leafScript;
+
+  late final String controllBlockHex = BytesUtils.toHexString(controllBlock);
+
+  PsbtInputTaprootLeafScript._({
+    required List<int> controllBlock,
+    required this.script,
+    required super.keyPair,
+    required int leafVersion,
+  })  : controllBlock = controllBlock.asImmutableBytes,
+        leafVersion = leafVersion.asUint8,
+        leafScript = TaprootLeaf(script: script, leafVersion: leafVersion),
+        super(type: PsbtInputTypes.taprootLeafScript);
+  factory PsbtInputTaprootLeafScript(
+      {required List<int> controllBlock,
+      required Script script,
+      required int leafVersion}) {
+    try {
+      return PsbtInputTaprootLeafScript._(
+          controllBlock:
+              TaprootControlBlock.deserialize(controllBlock).toBytes(),
+          script: script,
+          keyPair: PsbtKeyPair(
+              key: PsbtKey(PsbtInputTypes.taprootLeafScript.flag!,
+                  extraData: controllBlock),
+              value: PsbtValue([...script.toBytes(), leafVersion])),
+          leafVersion: leafVersion);
+    } catch (_) {}
+    throw DartBitcoinPluginException("Invalid PSBT Taproot Leaf Script key.");
+  }
+
+  factory PsbtInputTaprootLeafScript.deserialize(PsbtKeyPair keypair) {
+    if (keypair.key.type != PsbtInputTypes.taprootLeafScript.flag) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT Taproot Leaf Script type flag");
+    }
+    if (keypair.key.extraData == null) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT Taproot Leaf Script key data.");
+    }
+    try {
+      final script = Script.deserialize(
+          bytes: keypair.value.data.sublist(0, keypair.value.data.length - 1));
+      final version = keypair.value.data.last;
+      return PsbtInputTaprootLeafScript._(
+          controllBlock:
+              TaprootControlBlock.deserialize(keypair.key.extraData!).toBytes(),
+          script: script,
+          keyPair: keypair,
+          leafVersion: version);
+    } catch (_) {}
+    throw DartBitcoinPluginException("Invalid PSBT Taproot Leaf Script data.");
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    return {
+      "type": type.name,
+      "controllBlock": BytesUtils.toHexString(controllBlock),
+      "script": script.toJson(),
+      "leafVersion": leafVersion
+    };
+  }
+}
+
+class PsbtInputTaprootKeyBip32DerivationPath extends PsbtInputData {
+  /// A 32 byte X-only public key involved in this input. It may be the output key,
+  /// the internal key, or a key present in a leaf script.
+  final List<int> xOnlyPubKey;
+
+  /// A compact size unsigned integer representing the number of leaf hashes,
+  /// followed by a list of leaf hashes, followed by the 4 byte master key
+  /// fingerprint concatenated with the derivation path of the public key.
+  /// The derivation path is represented as 32-bit little endian unsigned integer indexes concatenated with each other.
+  /// Public keys are those needed to spend this output. The leaf hashes are of the leaves which involve this public key.
+  /// The internal key does not have leaf hashes, so can be indicated with a hashes len of 0.
+  /// Finalizers should remove this field after PSBT_IN_FINAL_SCRIPTWITNESS is constructed.
+  final List<List<int>> leavesHashes;
+  final List<int> fingerprint;
+  final List<Bip32KeyIndex> indexes;
+  String get path {
+    return Bip32Path(elems: indexes).toString();
+  }
+
+  BipOrTaprootKeyDerivationRequest toKeyRequest() {
+    return BipOrTaprootKeyDerivationRequest(
+        pubKeyOrXonly: xOnlyPubKey,
+        indexes: indexes,
+        fingerprint: fingerprint,
+        leavesHashes: leavesHashes);
+  }
+
+  PsbtInputTaprootKeyBip32DerivationPath._({
+    required List<int> xOnlyPubKey,
+    required List<List<int>> leavesHashes,
+    required List<int> fingerprint,
+    required List<Bip32KeyIndex> indexes,
+    required super.keyPair,
+  })  : leavesHashes =
+            leavesHashes.map((e) => e.asImmutableBytes).toImutableList,
+        fingerprint = fingerprint.asImmutableBytes,
+        indexes = indexes.immutable,
+        xOnlyPubKey = xOnlyPubKey.asImmutableBytes,
+        super(type: PsbtInputTypes.taprootBip32Derivation);
+  factory PsbtInputTaprootKeyBip32DerivationPath({
+    required List<int> xOnlyPubKey,
+    required List<List<int>> leavesHashes,
+    required List<int> fingerprint,
+    required List<Bip32KeyIndex> indexes,
+  }) {
+    if (fingerprint.length == Bip32KeyDataConst.fingerprintByteLen &&
+        xOnlyPubKey.length == QuickCrypto.sha256DigestSize &&
+        leavesHashes.every(
+            (element) => element.length == QuickCrypto.sha256DigestSize)) {
+      final encodeLenght = IntUtils.encodeVarint(leavesHashes.length);
+      return PsbtInputTaprootKeyBip32DerivationPath._(
+          xOnlyPubKey: xOnlyPubKey,
+          leavesHashes: leavesHashes,
+          fingerprint: fingerprint,
+          indexes: indexes,
+          keyPair: PsbtKeyPair(
+              key: PsbtKey(PsbtInputTypes.taprootBip32Derivation.flag!,
+                  extraData: xOnlyPubKey),
+              value: PsbtValue([
+                ...encodeLenght,
+                ...leavesHashes.expand((e) => e),
+                ...fingerprint,
+                ...indexes.map((e) => e.toBytes(Endian.little)).expand((e) => e)
+              ])));
+    }
+    throw DartBitcoinPluginException(
+        "Invalid Taproot Key BIP 32 Derivation Path data.");
+  }
+  factory PsbtInputTaprootKeyBip32DerivationPath.deserialize(
+      PsbtKeyPair keypair) {
+    if (keypair.key.type != PsbtInputTypes.taprootBip32Derivation.flag) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT Taproot Key BIP 32 Derivation Path type flag");
+    }
+    try {
+      final vlen = IntUtils.decodeVarint(keypair.value.data);
+      final int length = vlen.item1;
+      final data = keypair.value.data.sublist(vlen.item2);
+      final leavesHashes = List.generate(length, (i) {
+        final int offset = i * QuickCrypto.sha256DigestSize;
+        return data.sublist(offset, offset + QuickCrypto.sha256DigestSize);
+      });
+      final int fingerprintOffset =
+          leavesHashes.length * QuickCrypto.sha256DigestSize;
+      final List<int> fingerprint = data.sublist(fingerprintOffset,
+          fingerprintOffset + Bip32KeyDataConst.fingerprintByteLen);
+      final List<int> indexesBytes = data
+          .sublist(fingerprintOffset + Bip32KeyDataConst.fingerprintByteLen);
+      if (indexesBytes.length % Bip32KeyDataConst.keyIndexByteLen == 0) {
+        final inIndexesCount =
+            indexesBytes.length ~/ Bip32KeyDataConst.keyIndexByteLen;
+        final List<Bip32KeyIndex> indexes = List.generate(inIndexesCount, (i) {
+          final offset = i * Bip32KeyDataConst.keyIndexByteLen;
+          return Bip32KeyIndex.fromBytes(indexesBytes.sublist(
+              offset, offset + Bip32KeyDataConst.keyIndexByteLen));
+        });
+        if (fingerprint.length == Bip32KeyDataConst.fingerprintByteLen &&
+            keypair.key.extraData?.length == QuickCrypto.sha256DigestSize &&
+            leavesHashes.every(
+                (element) => element.length == QuickCrypto.sha256DigestSize)) {
+          return PsbtInputTaprootKeyBip32DerivationPath._(
+              xOnlyPubKey: keypair.key.extraData!,
+              leavesHashes: leavesHashes,
+              fingerprint: fingerprint,
+              indexes: indexes,
+              keyPair: keypair);
+        }
+      }
+    } catch (_) {}
+
+    throw DartBitcoinPluginException(
+        "Invalid Taproot Key BIP 32 Derivation Path data.");
+  }
+  factory PsbtInputTaprootKeyBip32DerivationPath.fromBip32(
+      {required Bip32Slip10Secp256k1 masterKey,
+      required String path,
+      required List<List<int>> leavesHashes}) {
+    final indexes = Bip32PathParser.parse(path).elems;
+    return PsbtInputTaprootKeyBip32DerivationPath(
+      fingerprint: masterKey.fingerPrint.toBytes(),
+      indexes: indexes,
+      leavesHashes: leavesHashes,
+      xOnlyPubKey:
+          masterKey.publicKey.point.cast<ProjectiveECCPoint>().toXonly(),
+    );
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    return {
+      "type": type.name,
+      "xOnlyPubKey": BytesUtils.toHexString(xOnlyPubKey),
+      "fingerprint": BytesUtils.toHexString(fingerprint),
+      "leavesHashes":
+          leavesHashes.map((e) => BytesUtils.toHexString(e)).toList(),
+      "indexes": indexes.map((e) => e.index).toList()
+    };
+  }
+}
+
+class PsbtInputTaprootInternalKey extends PsbtInputData {
+  /// The X-only pubkey used as the internal key in this output.
+  /// Finalizers should remove this field after PSBT_IN_FINAL_SCRIPTWITNESS is constructed.
+  final List<int> xOnlyPubKey;
+
+  PsbtInputTaprootInternalKey._({
+    required List<int> xOnlyPubKey,
+    required super.keyPair,
+  })  : xOnlyPubKey = xOnlyPubKey.asImmutableBytes,
+        super(type: PsbtInputTypes.taprootInternalKey);
+  factory PsbtInputTaprootInternalKey(List<int> xOnlyPubKey) {
+    if (xOnlyPubKey.length != QuickCrypto.sha256DigestSize) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT Taproot Internal Key data.");
+    }
+    return PsbtInputTaprootInternalKey._(
+        xOnlyPubKey: xOnlyPubKey,
+        keyPair: PsbtKeyPair(
+            key: PsbtKey(PsbtInputTypes.taprootInternalKey.flag!),
+            value: PsbtValue(xOnlyPubKey)));
+  }
+  factory PsbtInputTaprootInternalKey.deserialize(PsbtKeyPair keypair) {
+    if (keypair.key.type != PsbtInputTypes.taprootInternalKey.flag) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT Taproot Internal Key type flag");
+    }
+    if (keypair.key.extraData != null) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT Taproot Internal key key data.");
+    }
+    if (keypair.value.data.length != QuickCrypto.sha256DigestSize) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT Taproot Internal Key data.");
+    }
+    return PsbtInputTaprootInternalKey._(
+        xOnlyPubKey: keypair.value.data, keyPair: keypair);
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    return {
+      "type": type.name,
+      "xOnlyPubKey": BytesUtils.toHexString(xOnlyPubKey)
+    };
+  }
+}
+
+class PsbtInputTaprootMerkleRoot extends PsbtInputData {
+  /// The 32 byte Merkle root hash. Finalizers should remove this field after PSBT_IN_FINAL_SCRIPTWITNESS is constructed.
+  final List<int> hash;
+
+  PsbtInputTaprootMerkleRoot._({
+    required List<int> hash,
+    required super.keyPair,
+  })  : hash = hash.asImmutableBytes,
+        super(type: PsbtInputTypes.taprootMerkleRoot);
+  factory PsbtInputTaprootMerkleRoot(List<int> hash) {
+    if (hash.length != QuickCrypto.sha256DigestSize) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT Taproot Merkle Root data.");
+    }
+    return PsbtInputTaprootMerkleRoot._(
+        hash: hash,
+        keyPair: PsbtKeyPair(
+            key: PsbtKey(PsbtInputTypes.taprootMerkleRoot.flag!),
+            value: PsbtValue(hash)));
+  }
+  factory PsbtInputTaprootMerkleRoot.deserialize(PsbtKeyPair keypair) {
+    if (keypair.key.type != PsbtInputTypes.taprootMerkleRoot.flag) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT Taproot Merkle Root type flag");
+    }
+    if (keypair.key.extraData != null) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT Taproot Merkle Root key data.");
+    }
+    if (keypair.value.data.length != QuickCrypto.sha256DigestSize) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT Taproot Merkle Root data.");
+    }
+    return PsbtInputTaprootMerkleRoot._(
+        hash: keypair.value.data, keyPair: keypair);
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    return {"type": type.name, "hash": BytesUtils.toHexString(hash)};
+  }
+}
+
+class PsbtInputMuSig2ParticipantPublicKeys extends PsbtInputData {
+  /// The MuSig2 aggregate plain public key from the KeyAgg algorithm.
+  /// This key may or may not be in the script directly (as x-only).
+  /// It may instead be a parent public key from which the public keys in the script were derived.
+  final ECPublic aggregatePubKey;
+
+  /// A list of the compressed public keys of the participants in the
+  /// MuSig2 aggregate key in the order required for aggregation.
+  /// If sorting was done, then the keys must be in the sorted order.
+  final List<ECPublic> pubKeys;
+
+  PsbtInputMuSig2ParticipantPublicKeys._({
+    required this.aggregatePubKey,
+    required List<ECPublic> pubKeys,
+    required super.keyPair,
+  })  : pubKeys = pubKeys.toImutableList,
+        super(type: PsbtInputTypes.muSig2ParticipantPublicKeys);
+  factory PsbtInputMuSig2ParticipantPublicKeys(
+      {required ECPublic aggregatePubKey, required List<ECPublic> pubKeys}) {
+    return PsbtInputMuSig2ParticipantPublicKeys._(
+        aggregatePubKey: aggregatePubKey,
+        pubKeys: pubKeys,
+        keyPair: PsbtKeyPair(
+            key: PsbtKey(PsbtInputTypes.muSig2ParticipantPublicKeys.flag!,
+                extraData:
+                    aggregatePubKey.toBytes(mode: PubKeyModes.compressed)),
+            value: PsbtValue(pubKeys
+                .expand((e) => e.toBytes(mode: PubKeyModes.compressed))
+                .toList())));
+  }
+  factory PsbtInputMuSig2ParticipantPublicKeys.deserialize(
+      PsbtKeyPair keypair) {
+    if (keypair.key.type != PsbtInputTypes.muSig2ParticipantPublicKeys.flag) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT MuSig2 Participant Public Keys type flag");
+    }
+    if (keypair.key.extraData?.length ==
+        EcdsaKeysConst.pubKeyCompressedByteLen) {
+      try {
+        final pubKeysData = keypair.value.data;
+        if (pubKeysData.length % EcdsaKeysConst.pubKeyCompressedByteLen == 0) {
+          final pubkeysLength =
+              pubKeysData.length ~/ EcdsaKeysConst.pubKeyCompressedByteLen;
+          final List<ECPublic> pubKeys = [];
+          for (int i = 0; i < pubkeysLength; i++) {
+            final int offset = i * EcdsaKeysConst.pubKeyCompressedByteLen;
+            final key = pubKeysData
+                .sublist(
+                    offset, offset + EcdsaKeysConst.pubKeyCompressedByteLen)
+                .asImmutableBytes;
+            pubKeys.add(ECPublic.fromBytes(key));
+          }
+          return PsbtInputMuSig2ParticipantPublicKeys._(
+              aggregatePubKey: ECPublic.fromBytes(keypair.key.extraData!),
+              pubKeys: pubKeys,
+              keyPair: keypair);
+        }
+      } catch (_) {}
+    }
+    throw DartBitcoinPluginException(
+        "Invalid PSBT MuSig2 Participant Public Keys data");
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    return {
+      "type": type.name,
+      "aggregatePubKey": aggregatePubKey.toHex(),
+      "pubKeys": pubKeys.map((e) => e.toHex()).toList()
+    };
+  }
+}
+
+class PsbtInputMuSig2PublicNonce extends PsbtInputData {
+  /// The compressed public key of the participant providing this nonce,
+  /// followed by the plain public key the participant is providing the nonce for,
+  /// followed by the BIP 341 tapleaf hash of the Taproot leaf script that will be signed.
+  /// If the aggregate key is the taproot internal key or the taproot output key,
+  /// then the tapleaf hash must be omitted. The plain public key must be the key found in
+  /// the script and not the aggregate public key that it was derived from, if it was derived from an aggregate key.
+  final ECPublic publicKey;
+  final ECPublic plainPublicKey;
+  final List<int>? tapleafHash;
+
+  /// The public nonce produced by the NonceGen algorithm.
+  final List<int> publicNonce;
+
+  PsbtInputMuSig2PublicNonce._(
+      {required this.publicKey,
+      required this.plainPublicKey,
+      required List<int>? tapleafHash,
+      required List<int> publicNonce,
+      required super.keyPair})
+      : tapleafHash = tapleafHash?.asImmutableBytes,
+        publicNonce = publicNonce.asImmutableBytes,
+        super(type: PsbtInputTypes.muSig2PublicNonce);
+  factory PsbtInputMuSig2PublicNonce(
+      {required ECPublic publicKey,
+      required ECPublic plainPublicKey,
+      List<int>? tapleafHash,
+      required List<int> publicNonce}) {
+    if ((tapleafHash == null ||
+            tapleafHash.length == QuickCrypto.sha256DigestSize) &&
+        publicNonce.length == EcdsaKeysConst.pubKeyCompressedByteLen * 2) {
+      return PsbtInputMuSig2PublicNonce._(
+          publicKey: publicKey,
+          plainPublicKey: plainPublicKey,
+          tapleafHash: tapleafHash,
+          publicNonce: publicNonce,
+          keyPair: PsbtKeyPair(
+              key: PsbtKey(PsbtInputTypes.muSig2PublicNonce.flag!, extraData: [
+                ...publicKey.toBytes(mode: PubKeyModes.compressed),
+                ...plainPublicKey.toBytes(mode: PubKeyModes.compressed),
+                ...tapleafHash ?? []
+              ]),
+              value: PsbtValue(publicNonce)));
+    }
+    throw DartBitcoinPluginException("Invalid PSBT MuSig2 Public Nonce data");
+  }
+  factory PsbtInputMuSig2PublicNonce.deserialize(PsbtKeyPair keypair) {
+    if (keypair.key.type != PsbtInputTypes.muSig2PublicNonce.flag) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT MuSig2 Public Nonce type flag");
+    }
+    if (keypair.key.extraData?.length ==
+            (EcdsaKeysConst.pubKeyCompressedByteLen * 2) ||
+        keypair.key.extraData?.length ==
+                (EcdsaKeysConst.pubKeyCompressedByteLen * 2) +
+                    QuickCrypto.sha256DigestSize &&
+            keypair.value.data.length == 66) {
+      try {
+        final publicKey = keypair.key.extraData!
+            .sublist(0, EcdsaKeysConst.pubKeyCompressedByteLen);
+        final plainPublicKey = keypair.key.extraData!.sublist(
+            EcdsaKeysConst.pubKeyCompressedByteLen,
+            EcdsaKeysConst.pubKeyCompressedByteLen * 2);
+        final hash = keypair.key.extraData!.length ==
+                EcdsaKeysConst.pubKeyCompressedByteLen * 2
+            ? null
+            : keypair.key.extraData!
+                .sublist(EcdsaKeysConst.pubKeyCompressedByteLen * 2);
+        if (publicKey.length == EcdsaKeysConst.pubKeyCompressedByteLen &&
+            Secp256k1PublicKeyEcdsa.isValidBytes(publicKey) &&
+            plainPublicKey.length == EcdsaKeysConst.pubKeyCompressedByteLen &&
+            Secp256k1PublicKeyEcdsa.isValidBytes(plainPublicKey) &&
+            (hash == null || hash.length == QuickCrypto.sha256DigestSize) &&
+            keypair.value.data.length ==
+                EcdsaKeysConst.pubKeyCompressedByteLen * 2) {
+          return PsbtInputMuSig2PublicNonce._(
+              publicKey: ECPublic.fromBytes(publicKey),
+              plainPublicKey: ECPublic.fromBytes(plainPublicKey),
+              tapleafHash: hash,
+              publicNonce: keypair.value.data,
+              keyPair: keypair);
+        }
+      } catch (_) {}
+    }
+    throw DartBitcoinPluginException("Invalid PSBT MuSig2 Public Nonce data");
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    return {
+      "type": type.name,
+      "publicKey": publicKey.toHex(),
+      "plainPublicKey": plainPublicKey.toHex(),
+      "tapleafHash": BytesUtils.tryToHexString(tapleafHash),
+      "publicNonce": BytesUtils.toHexString(publicNonce)
+    };
+  }
+}
+
+class PsbtInputMuSig2ParticipantPartialSignature
+    extends PsbtInputDataSignature {
+  /// The compressed public key of the participant providing this partial signature,
+  /// followed by the plain public key the participant is providing the signature for,
+  /// followed by the BIP 341 tapleaf hash of the Taproot leaf script that will be signed.
+  /// If the aggregate key is the taproot internal key or the taproot output key, t
+  /// hen the tapleaf hash must be omitted. Note that the plain public key must be the key found in the script
+  /// and not the aggregate public key that it was derived from, if it was derived from an aggregate key.
+  final ECPublic publicKey;
+  final ECPublic plainPublicKey;
+  final List<int>? tapleafHash;
+
+  PsbtInputMuSig2ParticipantPartialSignature._(
+      {required this.publicKey,
+      required this.plainPublicKey,
+      required List<int>? tapleafHash,
+      required super.signature,
+      required super.keyPair})
+      : tapleafHash = tapleafHash?.asImmutableBytes,
+        super._(type: PsbtInputTypes.muSig2ParticipantPartialSignature);
+  factory PsbtInputMuSig2ParticipantPartialSignature(
+      {required ECPublic publicKey,
+      required ECPublic plainPublicKey,
+      required List<int>? tapleafHash,
+      required List<int> partialSignature}) {
+    if ((tapleafHash == null ||
+            tapleafHash.length == QuickCrypto.sha256DigestSize) &&
+        partialSignature.length == QuickCrypto.sha256DigestSize) {
+      return PsbtInputMuSig2ParticipantPartialSignature._(
+          publicKey: publicKey,
+          plainPublicKey: plainPublicKey,
+          tapleafHash: tapleafHash,
+          signature: partialSignature,
+          keyPair: PsbtKeyPair(
+              key: PsbtKey(
+                  PsbtInputTypes.muSig2ParticipantPartialSignature.flag!,
+                  extraData: [
+                    ...publicKey.toBytes(mode: PubKeyModes.compressed),
+                    ...plainPublicKey.toBytes(mode: PubKeyModes.compressed),
+                    ...tapleafHash ?? []
+                  ]),
+              value: PsbtValue(partialSignature)));
+    }
+    throw DartBitcoinPluginException(
+        "Invalid PSBT MuSig2 Participant Partial Signature data");
+  }
+  factory PsbtInputMuSig2ParticipantPartialSignature.deserialize(
+      PsbtKeyPair keypair) {
+    if (keypair.key.type !=
+        PsbtInputTypes.muSig2ParticipantPartialSignature.flag) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT MuSig2 Participant Partial Signature type flag");
+    }
+    if (keypair.key.extraData?.length ==
+            (EcdsaKeysConst.pubKeyCompressedByteLen * 2) ||
+        keypair.key.extraData?.length ==
+            (EcdsaKeysConst.pubKeyCompressedByteLen * 2) +
+                QuickCrypto.sha256DigestSize) {
+      try {
+        final publicKey = keypair.key.extraData!
+            .sublist(0, EcdsaKeysConst.pubKeyCompressedByteLen);
+        final plainPublicKey = keypair.key.extraData!.sublist(
+            EcdsaKeysConst.pubKeyCompressedByteLen,
+            EcdsaKeysConst.pubKeyCompressedByteLen * 2);
+        final hash = keypair.key.extraData!.length ==
+                EcdsaKeysConst.pubKeyCompressedByteLen * 2
+            ? null
+            : keypair.key.extraData!.sublist(66);
+        if (publicKey.length == EcdsaKeysConst.pubKeyCompressedByteLen &&
+            Secp256k1PublicKeyEcdsa.isValidBytes(publicKey) &&
+            plainPublicKey.length == EcdsaKeysConst.pubKeyCompressedByteLen &&
+            Secp256k1PublicKeyEcdsa.isValidBytes(plainPublicKey) &&
+            (hash == null || hash.length == QuickCrypto.sha256DigestSize) &&
+            keypair.value.data.length == QuickCrypto.sha256DigestSize) {
+          return PsbtInputMuSig2ParticipantPartialSignature._(
+              publicKey: ECPublic.fromBytes(publicKey),
+              plainPublicKey: ECPublic.fromBytes(plainPublicKey),
+              tapleafHash: hash,
+              signature: keypair.value.data,
+              keyPair: keypair);
+        }
+      } catch (_) {}
+    }
+    throw DartBitcoinPluginException(
+        "Invalid PSBT MuSig2 Participant Partial Signature data");
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    return {
+      "type": type.name,
+      "publicKey": publicKey.toHex(),
+      "plainPublicKey": plainPublicKey.toHex(),
+      "tapleafHash": BytesUtils.tryToHexString(tapleafHash),
+      "partialSignature": BytesUtils.toHexString(signature)
+    };
+  }
+}
+
+class PsbtInputSilentPaymentInputECDHShare extends PsbtInputData {
+  /// The scan key that this ECDH share is for.
+  final List<int> scanKey;
+
+  /// An ECDH share for a scan key. The ECDH shared is computed with a * B_scan,
+  /// where a is the private key of the corresponding prevout public key, and B_scan is the scan key of a recipient.
+  final List<int> share;
+
+  PsbtInputSilentPaymentInputECDHShare._({
+    required List<int> scanKey,
+    required List<int> share,
+    required super.keyPair,
+  })  : scanKey = scanKey.asImmutableBytes,
+        share = share.asImmutableBytes,
+        super(type: PsbtInputTypes.silentPaymentInputECDHShare);
+  factory PsbtInputSilentPaymentInputECDHShare(
+      {required List<int> scanKey, required List<int> share}) {
+    if (scanKey.length == EcdsaKeysConst.pubKeyCompressedByteLen &&
+        share.length == EcdsaKeysConst.pubKeyCompressedByteLen) {
+      return PsbtInputSilentPaymentInputECDHShare._(
+          scanKey: scanKey,
+          share: share,
+          keyPair: PsbtKeyPair(
+              key: PsbtKey(PsbtInputTypes.silentPaymentInputECDHShare.flag!,
+                  extraData: scanKey),
+              value: PsbtValue(share)));
+    }
+    throw DartBitcoinPluginException(
+        "Invalid PSBT Silent Payment Input ECDH Share data");
+  }
+  factory PsbtInputSilentPaymentInputECDHShare.deserialize(
+      PsbtKeyPair keypair) {
+    if (keypair.key.type != PsbtInputTypes.silentPaymentInputECDHShare.flag) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT Silent Payment Input ECDH Share type flag");
+    }
+    if (keypair.key.extraData?.length ==
+            EcdsaKeysConst.pubKeyCompressedByteLen &&
+        keypair.value.data.length == EcdsaKeysConst.pubKeyCompressedByteLen) {
+      return PsbtInputSilentPaymentInputECDHShare._(
+          scanKey: keypair.key.extraData ?? [],
+          share: keypair.value.data,
+          keyPair: keypair);
+    }
+    throw DartBitcoinPluginException(
+        "Invalid PSBT Silent Payment Input ECDH Share type");
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    return {
+      "type": type.name,
+      "scanKey": BytesUtils.toHexString(scanKey),
+      "share": BytesUtils.toHexString(share)
+    };
+  }
+}
+
+class PsbtInputSilentPaymentInputDLEQProof extends PsbtInputData {
+  /// The scan key that this proof covers.
+  final List<int> scanKey;
+
+  /// A BIP374 DLEQ proof computed for the matching ECDH share.
+  final List<int> proof;
+
+  PsbtInputSilentPaymentInputDLEQProof._({
+    required List<int> scanKey,
+    required List<int> proof,
+    required super.keyPair,
+  })  : scanKey = scanKey.asImmutableBytes,
+        proof = proof.asImmutableBytes,
+        super(type: PsbtInputTypes.silentPaymentInputDLEQProof);
+  factory PsbtInputSilentPaymentInputDLEQProof(
+      {required List<int> scanKey, required List<int> proof}) {
+    if (scanKey.length == EcdsaKeysConst.pubKeyCompressedByteLen &&
+        proof.length == QuickCrypto.sha512DeigestLength) {
+      return PsbtInputSilentPaymentInputDLEQProof._(
+          scanKey: scanKey,
+          proof: proof,
+          keyPair: PsbtKeyPair(
+              key: PsbtKey(PsbtInputTypes.silentPaymentInputDLEQProof.flag!,
+                  extraData: scanKey),
+              value: PsbtValue(proof)));
+    }
+    throw DartBitcoinPluginException(
+        "Invalid PSBT Silent Payment Input DLEQ Proof data");
+  }
+  factory PsbtInputSilentPaymentInputDLEQProof.deserialize(
+      PsbtKeyPair keypair) {
+    if (keypair.key.type != PsbtInputTypes.silentPaymentInputDLEQProof.flag) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT Silent Payment Input DLEQ Proof type flag");
+    }
+    if (keypair.key.extraData?.length ==
+            EcdsaKeysConst.pubKeyCompressedByteLen &&
+        keypair.value.data.length == QuickCrypto.sha512DeigestLength) {
+      return PsbtInputSilentPaymentInputDLEQProof._(
+          scanKey: keypair.key.extraData!,
+          proof: keypair.value.data,
+          keyPair: keypair);
+    }
+    throw DartBitcoinPluginException(
+        "Invalid PSBT Silent Payment Input DLEQ Proof data");
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    return {
+      "type": type.name,
+      "scanKey": BytesUtils.toHexString(scanKey),
+      "proof": BytesUtils.toHexString(proof)
+    };
+  }
+}
+
+class PsbtInputProprietaryUseType extends PsbtInputData {
+  /// Compact size unsigned integer of the length of the identifier, followed by identifier prefix, followed by a compact size unsigned integer subtype, followed by the key data itself.
+  final List<int> identifier;
+  final List<int> subkeydata;
+
+  /// Any value data as defined by the proprietary type user.
+  final List<int> data;
+
+  PsbtInputProprietaryUseType._({
+    required List<int> identifier,
+    required List<int> subkeydata,
+    required List<int> data,
+    required super.keyPair,
+  })  : identifier = identifier.asImmutableBytes,
+        subkeydata = subkeydata.asImmutableBytes,
+        data = data.asImmutableBytes,
+        super(type: PsbtInputTypes.proprietaryUseType);
+  factory PsbtInputProprietaryUseType({
+    required List<int> identifier,
+    required List<int> subkeydata,
+    required List<int> data,
+  }) {
+    final identifierBytes = IntUtils.prependVarint(identifier);
+    final subkeyData = IntUtils.prependVarint(subkeydata);
+    return PsbtInputProprietaryUseType._(
+        identifier: identifier,
+        subkeydata: subkeydata,
+        data: data,
+        keyPair: PsbtKeyPair(
+            key: PsbtKey(PsbtInputTypes.proprietaryUseType.flag!,
+                extraData: [...identifierBytes, ...subkeyData]),
+            value: PsbtValue(data)));
+  }
+  factory PsbtInputProprietaryUseType.deserialize(PsbtKeyPair keypair) {
+    if (keypair.key.type != PsbtInputTypes.proprietaryUseType.flag) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT Proprietary Use Type type flag");
+    }
+    try {
+      final keyBytes = keypair.key.extraData!;
+      final identifierSize = IntUtils.decodeVarint(keyBytes);
+      final identifier = keyBytes.sublist(
+          identifierSize.item2, identifierSize.item1 + identifierSize.item2);
+      final subtypeOffset = identifierSize.item1 + identifierSize.item2;
+      final subkeydata = keyBytes.sublist(subtypeOffset);
+      return PsbtInputProprietaryUseType._(
+          identifier: identifier,
+          subkeydata: subkeydata,
+          data: keypair.value.data,
+          keyPair: keypair);
+    } catch (_) {}
+    throw DartBitcoinPluginException("Invalid PSBT Proprietary Use Type data");
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    return {
+      "type": type.name,
+      "identifier": BytesUtils.toHexString(identifier),
+      "subkeydata": BytesUtils.toHexString(subkeydata),
+      "data": BytesUtils.toHexString(data),
+    };
+  }
+}
+
+class PsbtInputUnknow extends PsbtInputData {
+  PsbtInputUnknow._(PsbtKeyPair keyPair)
+      : super(type: PsbtInputTypes.unknown, keyPair: keyPair);
+  factory PsbtInputUnknow(PsbtKeyPair keyPair) {
+    return PsbtInputUnknow._(keyPair);
+  }
+  @override
+  int get flag => keyPair.key.type;
+
+  @override
+  Map<String, dynamic> toJson() {
+    return {
+      "type": type.name,
+      "key": {
+        "keyType": keyPair.key.type,
+        "keyData": BytesUtils.tryToHexString(keyPair.key.extraData)
+      },
+      "value": {"data": BytesUtils.toHexString(keyPair.value.data)},
+    };
+  }
+}
diff --git a/lib/src/psbt/types/types/outputs.dart b/lib/src/psbt/types/types/outputs.dart
new file mode 100644
index 0000000..b5db135
--- /dev/null
+++ b/lib/src/psbt/types/types/outputs.dart
@@ -0,0 +1,1041 @@
+import 'dart:typed_data';
+import 'package:bitcoin_base/src/bitcoin/script/script.dart';
+import 'package:bitcoin_base/src/bitcoin/taproot/taproot.dart';
+import 'package:bitcoin_base/src/exception/exception.dart';
+import 'package:bitcoin_base/src/psbt/psbt_builder/types/types.dart';
+import 'package:bitcoin_base/src/psbt/types/types/psbt.dart';
+import 'package:bitcoin_base/src/psbt/types/types/types.dart';
+import 'package:blockchain_utils/blockchain_utils.dart';
+
+enum PsbtOutputTypes {
+  redeemScript(0x00, "PSBT_OUT_REDEEM_SCRIPT"),
+  witnessScript(0x01, "PSBT_OUT_WITNESS_SCRIPT"),
+  bip32DerivationPath(0x02, "PSBT_OUT_BIP32_DERIVATION"),
+  amount(0x03, "PSBT_OUT_AMOUNT",
+      required: true, allowedVersion: PsbtVersion.v2),
+  script(0x04, "PSBT_OUT_SCRIPT",
+      required: true, allowedVersion: PsbtVersion.v2),
+  taprootInternalKey(0x05, "PSBT_OUT_TAP_INTERNAL_KEY"),
+  taprootTree(0x06, "PSBT_OUT_TAP_TREE"),
+  taprootBip32Derivation(0x07, "PSBT_OUT_TAP_BIP32_DERIVATION"),
+  muSig2ParticipantPublicKeys(0x08, "PSBT_OUT_MUSIG2_PARTICIPANT_PUBKEYS"),
+  silentPaymentData(0x09, "PSBT_OUT_SP_V0_INFO",
+      allowedVersion: PsbtVersion.v2),
+  silentPaymentLabel(0x0a, "PSBT_OUT_SP_V0_LABEL",
+      allowedVersion: PsbtVersion.v2),
+  bip353DNSSECProof(0x35, "PSBT_OUT_DNSSEC_PROOF"),
+  proprietaryUseType(0xFC, "PSBT_OUT_PROPRIETARY"),
+  unknown(null, "UNKNOWN");
+
+  const PsbtOutputTypes(this.flag, this.psbtName,
+      {this.allowedVersion, this.required = false});
+  final int? flag;
+  final String psbtName;
+  final bool required;
+  final PsbtVersion? allowedVersion;
+  static PsbtOutputTypes find(int flag) {
+    final type = values.firstWhereNullable((e) => e.flag == flag);
+    if (type != null) return type;
+    return unknown;
+  }
+}
+
+/// Represents the output section of a PSBT (Partially Signed Bitcoin Transaction).
+class PsbtOutput {
+  /// The PSBT version associated with this intput section.
+  final PsbtVersion version;
+
+  /// The list of output PSBT entries.
+  List<List<PsbtOutputData>> _entries;
+  List<List<PsbtOutputData>> get entries => _entries;
+  PsbtOutput._(
+      {List<List<PsbtOutputData>> entries = const [], required this.version})
+      : _entries = entries.map((e) => e.immutable).toImutableList;
+
+  /// Constructs a [PsbtOutput] instance with a given version and output entries.
+  ///
+  /// Throws a [DartBitcoinPluginException] if any of the following conditions are met:
+  /// - Duplicate entries are found.
+  /// - A output entry is not allowed for the specified PSBT version.
+  /// - A required output entry is missing for the PSBT version
+  factory PsbtOutput(
+      {List<List<PsbtOutputData>> entries = const [],
+      required PsbtVersion version}) {
+    final requiredFilds = PsbtOutputTypes.values.where((e) =>
+        e.required &&
+        (e.allowedVersion == null || e.allowedVersion == version));
+    for (final e in entries) {
+      final keys = e.map((e) => e.keyPair.key).toList();
+      if (keys.toSet().length != keys.length) {
+        throw DartBitcoinPluginException(
+            "Invalid PSBT Output: Duplicate entry detected.");
+      }
+      for (final i in e) {
+        if (i.type.allowedVersion == null) continue;
+        if (version != i.type.allowedVersion) {
+          throw DartBitcoinPluginException(
+              "Invalid PSBT Output: ${i.type.psbtName} is not allowed in PSBT version ${version.name}.");
+        }
+      }
+      for (final i in requiredFilds) {
+        e.firstWhere((e) => e.type == i,
+            orElse: () => throw DartBitcoinPluginException(
+                "Invalid PSBT Output: Missing required field ${i.psbtName} for PSBT version ${version.name}."));
+      }
+    }
+    return PsbtOutput._(version: version, entries: entries);
+  }
+
+  /// Validates if the provided entries is not duplicate and allowed by the PSBT version.
+  void _itemsAllowed(List<PsbtOutputData> items) {
+    final keys = items.map((e) => e.keyPair.key).toSet();
+    if (keys.length != items.length) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT Output: Duplicate entry detected.");
+    }
+    for (final i in items) {
+      if (i.type.allowedVersion == null) continue;
+      if (version != i.type.allowedVersion) {
+        throw DartBitcoinPluginException(
+            "Invalid PSBT Output: ${i.type.psbtName} is not allowed in PSBT version ${version.name}.");
+      }
+    }
+  }
+
+  /// Creates a [PsbtOutput] instance from a list of key pairs.
+  factory PsbtOutput.fromKeyPairs(
+      {List<List<PsbtKeyPair>> keypairs = const [],
+      required PsbtVersion version}) {
+    return PsbtOutput(
+        entries: keypairs
+            .map((e) => e.map(PsbtOutputData.deserialize).toList())
+            .toList(),
+        version: version);
+  }
+
+  /// Adds new output to the PSBT.
+  void addOutputs(List<PsbtOutputData> outputs) {
+    _itemsAllowed(outputs);
+    _entries = [..._entries, outputs].toImutableList;
+  }
+
+  /// Replaces the output at the specified [index]
+  void replaceOutput(int index, List<PsbtOutputData> outputs) {
+    _itemsAllowed(outputs);
+    final entries = _entries.clone();
+    _validateIndex(index);
+    entries[index] = outputs.toImutableList;
+    _entries = entries.toImutableList;
+  }
+
+  int get length => _entries.length;
+
+  List<PsbtOutputData> _validateIndex(int inputIndex) {
+    if (inputIndex >= _entries.length) {
+      throw DartBitcoinPluginException(
+          "Invalid output index: $inputIndex. The index exceeds the number of available entries.");
+    }
+    return _entries[inputIndex].clone();
+  }
+
+  /// Retrieves a single entry of a specified type.
+  T? getOutput<T extends PsbtOutputData>(int index, PsbtOutputTypes type) {
+    final input = _validateIndex(index);
+    final data = input.where((e) => e.type == type);
+    if (data.isEmpty) return null;
+    if (data.length != 1) {
+      throw DartBitcoinPluginException(
+          "Multiple inputs with type '${type.name}' found. Use 'getOutputs' to retrieve data for multiple outputs");
+    }
+    return data.first.cast();
+  }
+
+  /// Retrieves all entries of a specified type.
+  List<T>? getOutputs<T extends PsbtOutputData>(
+      int index, PsbtOutputTypes type) {
+    final input = _validateIndex(index);
+    final data = input.where((e) => e.type == type);
+    if (data.isEmpty) return null;
+    return data.toList().cast<T>();
+  }
+
+  /// remove the output at the specified [index]
+  void removeOutput(int index) {
+    _validateIndex(index);
+    final entries = _entries.clone();
+    entries.removeAt(index);
+    _entries = entries.immutable;
+  }
+
+  /// Converts the entries to a list of key pairs.
+  List<List<PsbtKeyPair>> toKeyPairs() {
+    return _entries.map((e) => e.map((e) => e.keyPair).toList()).toList();
+  }
+
+  /// Converts the entries to json.
+  Map<String, dynamic> toJson() {
+    return {
+      "entries": entries.map((e) => e.map((e) => e.toJson()).toList()).toList()
+    };
+  }
+
+  /// Creates a deep copy of the [PsbtOutput] instance.
+  PsbtOutput clone() {
+    return PsbtOutput(
+        version: version, entries: entries.map((e) => e.clone()).toList());
+  }
+}
+
+abstract class PsbtOutputData {
+  Map<String, dynamic> toJson();
+  final PsbtOutputTypes type;
+  final PsbtKeyPair keyPair;
+  const PsbtOutputData({required this.type, required this.keyPair});
+  factory PsbtOutputData.deserialize(PsbtKeyPair keypair) {
+    final type = PsbtOutputTypes.find(keypair.key.type);
+    return switch (type) {
+      PsbtOutputTypes.redeemScript =>
+        PsbtOutputRedeemScript.deserialize(keypair),
+      PsbtOutputTypes.witnessScript =>
+        PsbtOutputWitnessScript.deserialize(keypair),
+      PsbtOutputTypes.bip32DerivationPath =>
+        PsbtOutputBip32DerivationPath.deserialize(keypair),
+      PsbtOutputTypes.amount => PsbtOutputAmount.deserialize(keypair),
+      PsbtOutputTypes.script => PsbtOutputScript.deserialize(keypair),
+      PsbtOutputTypes.taprootInternalKey =>
+        PsbtOutputTaprootInternalKey.deserialize(keypair),
+      PsbtOutputTypes.taprootTree => PsbtOutputTaprootTree.deserialize(keypair),
+      PsbtOutputTypes.taprootBip32Derivation =>
+        PsbtOutputTaprootKeyBip32DerivationPath.deserialize(keypair),
+      PsbtOutputTypes.muSig2ParticipantPublicKeys =>
+        PsbtOutputMuSig2ParticipantPublicKeys.deserialize(keypair),
+      PsbtOutputTypes.silentPaymentData =>
+        PsbtOutputSilentPaymentData.deserialize(keypair),
+      PsbtOutputTypes.silentPaymentLabel =>
+        PsbtOutputSilentPaymentLabel.deserialize(keypair),
+      PsbtOutputTypes.bip353DNSSECProof =>
+        PsbtOutputBIP353DNSSECProof.deserialize(keypair),
+      PsbtOutputTypes.proprietaryUseType =>
+        PsbtOutputProprietaryUseType.deserialize(keypair),
+      PsbtOutputTypes.unknown => PsbtOutputUnknow(keypair),
+    };
+  }
+  T cast<T extends PsbtOutputData>() {
+    if (this is! T) {
+      throw DartBitcoinPluginException(
+          "Invalid cast: expected ${T.runtimeType}, but found $runtimeType.",
+          details: {"expected": "$T", "type": runtimeType.toString()});
+    }
+    return this as T;
+  }
+
+  @override
+  String toString() {
+    return type.name;
+  }
+}
+
+class PsbtOutputRedeemScript extends PsbtOutputData {
+  /// The redeemScript for this output if it has one.
+  final Script redeemScript;
+  PsbtOutputRedeemScript(this.redeemScript)
+      : super(
+            type: PsbtOutputTypes.redeemScript,
+            keyPair: PsbtKeyPair(
+                key: PsbtKey(PsbtOutputTypes.redeemScript.flag!),
+                value: PsbtValue(redeemScript.toBytes())));
+  PsbtOutputRedeemScript._({required this.redeemScript, required super.keyPair})
+      : super(type: PsbtOutputTypes.redeemScript);
+  factory PsbtOutputRedeemScript.deserialize(PsbtKeyPair keypair) {
+    if (keypair.key.type != PsbtOutputTypes.redeemScript.flag) {
+      throw DartBitcoinPluginException("Invalid PSBT Redeem Script type flag");
+    }
+    if (keypair.key.extraData != null) {
+      throw DartBitcoinPluginException("Invalid PSBT Redeem Script key data.");
+    }
+    try {
+      return PsbtOutputRedeemScript._(
+          redeemScript: Script.deserialize(bytes: keypair.value.data),
+          keyPair: keypair);
+    } catch (_) {
+      throw DartBitcoinPluginException("Invalid PSBT Redeem Script data.");
+    }
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    return {"type": type.name, "redeemScript": redeemScript.toJson()};
+  }
+}
+
+class PsbtOutputWitnessScript extends PsbtOutputData {
+  /// The witnessScript for this output if it has one.
+  final Script witnessScript;
+  PsbtOutputWitnessScript(this.witnessScript)
+      : super(
+            type: PsbtOutputTypes.witnessScript,
+            keyPair: PsbtKeyPair(
+                key: PsbtKey(PsbtOutputTypes.witnessScript.flag!),
+                value: PsbtValue(witnessScript.toBytes())));
+  PsbtOutputWitnessScript._(
+      {required this.witnessScript, required super.keyPair})
+      : super(type: PsbtOutputTypes.witnessScript);
+  factory PsbtOutputWitnessScript.deserialize(PsbtKeyPair keypair) {
+    if (keypair.key.type != PsbtOutputTypes.witnessScript.flag) {
+      throw DartBitcoinPluginException("Invalid PSBT Witness Script type flag");
+    }
+    if (keypair.key.extraData != null) {
+      throw DartBitcoinPluginException("Invalid PSBT Witness Script key data.");
+    }
+    try {
+      return PsbtOutputWitnessScript._(
+          witnessScript: Script.deserialize(bytes: keypair.value.data),
+          keyPair: keypair);
+    } catch (_) {
+      throw DartBitcoinPluginException("Invalid PSBT Witness  Script data.");
+    }
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    return {"type": type.name, "witnessScript": witnessScript.toJson()};
+  }
+}
+
+class PsbtOutputBip32DerivationPath extends PsbtOutputData {
+  /// The master key fingerprint concatenated with the derivation path of the public key.
+  /// The derivation path is represented as 32-bit little endian unsigned integer indexes
+  /// concatenated with each other. Public keys are those needed to spend this output.
+  final List<int> fingerprint;
+  final List<Bip32KeyIndex> indexes;
+
+  /// The public key
+  final List<int> publicKey;
+
+  PsbtOutputBip32DerivationPath._({
+    required List<int> fingerprint,
+    required List<Bip32KeyIndex> indexes,
+    required List<int> publicKey,
+    required super.keyPair,
+  })  : fingerprint = fingerprint.asImmutableBytes,
+        publicKey = publicKey.asImmutableBytes,
+        indexes = indexes.immutable,
+        super(type: PsbtOutputTypes.bip32DerivationPath);
+  factory PsbtOutputBip32DerivationPath(
+      {required List<int> fingerprint,
+      required List<Bip32KeyIndex> indexes,
+      required List<int> publicKey}) {
+    if (fingerprint.length == Bip32KeyDataConst.fingerprintByteLen &&
+        Secp256k1PublicKeyEcdsa.isValidBytes(publicKey)) {
+      return PsbtOutputBip32DerivationPath._(
+          fingerprint: fingerprint,
+          indexes: indexes,
+          publicKey: publicKey,
+          keyPair: PsbtKeyPair(
+              key: PsbtKey(PsbtOutputTypes.bip32DerivationPath.flag!,
+                  extraData: publicKey),
+              value: PsbtValue([
+                ...fingerprint,
+                ...indexes.map((e) => e.toBytes(Endian.little)).expand((e) => e)
+              ])));
+    }
+    throw DartBitcoinPluginException(
+        "Invalid PSBT bip32 derivation path data.");
+  }
+  factory PsbtOutputBip32DerivationPath.deserialize(PsbtKeyPair keypair) {
+    if (keypair.key.type != PsbtOutputTypes.bip32DerivationPath.flag) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT bip32 derivation path type flag");
+    }
+    if (keypair.key.extraData == null ||
+        !Secp256k1PublicKeyEcdsa.isValidBytes(keypair.key.extraData!)) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT bip32 derivation public key.");
+    }
+    if (keypair.value.data.length < Bip32KeyDataConst.fingerprintByteLen ||
+        keypair.value.data.length % Bip32KeyDataConst.keyIndexByteLen != 0) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT bip32 derivation fingerprint or bip32 index.");
+    }
+    final List<int> fingerPrint =
+        keypair.value.data.sublist(0, Bip32KeyDataConst.fingerprintByteLen);
+    final indexesBytes =
+        keypair.value.data.sublist(Bip32KeyDataConst.fingerprintByteLen);
+    final indexCount = indexesBytes.length ~/ Bip32KeyDataConst.keyIndexByteLen;
+    final List<Bip32KeyIndex> bip32Indexes;
+    try {
+      bip32Indexes = List.generate(indexCount, (i) {
+        final offset = i * Bip32KeyDataConst.keyIndexByteLen;
+        return Bip32KeyIndex.fromBytes(indexesBytes.sublist(
+            offset, offset + Bip32KeyDataConst.keyIndexByteLen));
+      });
+      if (fingerPrint.length == Bip32KeyDataConst.fingerprintByteLen &&
+          Secp256k1PublicKeyEcdsa.isValidBytes(keypair.key.extraData!)) {
+        return PsbtOutputBip32DerivationPath._(
+            fingerprint: fingerPrint,
+            indexes: bip32Indexes,
+            publicKey: keypair.key.extraData!,
+            keyPair: keypair);
+      }
+    } catch (_) {}
+    throw DartBitcoinPluginException("Invalid PSBT bip32 derivation indexes.");
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    return {
+      "type": type.name,
+      "fingerprint": BytesUtils.toHexString(fingerprint),
+      "indexes": indexes.map((e) => e.index).toList(),
+      "public_key": BytesUtils.toHexString(publicKey)
+    };
+  }
+}
+
+class PsbtOutputAmount extends PsbtOutputData {
+  /// 64 bit signed little endian integer representing the output's amount in satoshis.
+  final BigInt amount;
+  PsbtOutputAmount._({required BigInt amount, required super.keyPair})
+      : amount = amount.asInt64,
+        super(type: PsbtOutputTypes.amount);
+  factory PsbtOutputAmount(BigInt amount) {
+    return PsbtOutputAmount._(
+        amount: amount,
+        keyPair: PsbtKeyPair(
+            key: PsbtKey(PsbtOutputTypes.amount.flag!),
+            value: PsbtValue(
+                BigintUtils.toBytes(amount, length: 8, order: Endian.little))));
+  }
+  factory PsbtOutputAmount.deserialize(PsbtKeyPair keypair) {
+    if (keypair.key.type != PsbtOutputTypes.amount.flag) {
+      throw DartBitcoinPluginException("Invalid PSBT Output Amount type flag");
+    }
+    if (keypair.key.extraData != null) {
+      throw DartBitcoinPluginException("Invalid PSBT Output Amount key data.");
+    }
+    try {
+      if (keypair.value.data.length == 8) {
+        final amount = BigintUtils.fromBytes(keypair.value.data,
+            byteOrder: Endian.little, sign: true);
+        return PsbtOutputAmount._(amount: amount, keyPair: keypair);
+      }
+    } catch (_) {}
+    throw DartBitcoinPluginException("Invalid PSBT Output Amount data.");
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    return {"type": type.name, "amount": amount.toString()};
+  }
+}
+
+class PsbtOutputScript extends PsbtOutputData {
+  /// The script for this output, also known as the scriptPubKey. Must be omitted in PSBTv0.
+  /// Must be provided in PSBTv2 if not sending to a BIP352 silent payment address, otherwise may be omitted.
+  final Script script;
+  PsbtOutputScript._({required this.script, required super.keyPair})
+      : super(type: PsbtOutputTypes.script);
+  factory PsbtOutputScript(Script script) {
+    return PsbtOutputScript._(
+        script: script,
+        keyPair: PsbtKeyPair(
+            key: PsbtKey(PsbtOutputTypes.script.flag!),
+            value: PsbtValue(script.toBytes())));
+  }
+
+  factory PsbtOutputScript.deserialize(PsbtKeyPair keypair) {
+    if (keypair.key.type != PsbtOutputTypes.script.flag) {
+      throw DartBitcoinPluginException("Invalid PSBT Output Script type flag");
+    }
+    if (keypair.key.extraData != null) {
+      throw DartBitcoinPluginException("Invalid PSBT Output Script key data.");
+    }
+    try {
+      return PsbtOutputScript._(
+          script: Script.deserialize(bytes: keypair.value.data),
+          keyPair: keypair);
+    } catch (_) {
+      throw DartBitcoinPluginException("Invalid PSBT Output Script data.");
+    }
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    return {"type": type.name, "script": script.toJson()};
+  }
+}
+
+class PsbtOutputTaprootInternalKey extends PsbtOutputData {
+  /// The X-only pubkey used as the internal key in this output.
+  final List<int> xOnlyPubKey;
+  PsbtOutputTaprootInternalKey._(
+      {required List<int> xOnlyPubKey, required super.keyPair})
+      : xOnlyPubKey = xOnlyPubKey.asImmutableBytes,
+        super(type: PsbtOutputTypes.taprootInternalKey);
+  factory PsbtOutputTaprootInternalKey(List<int> xOnlyPubKey) {
+    if (xOnlyPubKey.length == EcdsaKeysConst.pointCoordByteLen) {
+      return PsbtOutputTaprootInternalKey._(
+          xOnlyPubKey: xOnlyPubKey,
+          keyPair: PsbtKeyPair(
+              key: PsbtKey(PsbtOutputTypes.taprootInternalKey.flag!),
+              value: PsbtValue(xOnlyPubKey)));
+    }
+    throw DartBitcoinPluginException("Invalid Taproot Internal Key data");
+  }
+
+  factory PsbtOutputTaprootInternalKey.deserialize(PsbtKeyPair keypair) {
+    if (keypair.key.type != PsbtOutputTypes.taprootInternalKey.flag) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT Taproot Internal Key type flag");
+    }
+    if (keypair.key.extraData != null) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT Taproot Internal Key data.");
+    }
+    try {
+      if (keypair.value.data.length == EcdsaKeysConst.pointCoordByteLen) {
+        return PsbtOutputTaprootInternalKey._(
+            xOnlyPubKey: keypair.value.data, keyPair: keypair);
+      }
+    } catch (_) {}
+    throw DartBitcoinPluginException("Invalid PSBT Taproot Internal Key data.");
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    return {
+      "type": type.name,
+      "xOnlyPubKey": BytesUtils.toHexString(xOnlyPubKey)
+    };
+  }
+}
+
+class PsbtOutputTaprootTree extends PsbtOutputData {
+  /// One or more tuples representing the depth, leaf version, and script for a leaf in the Taproot tree,
+  /// allowing the entire tree to be reconstructed. The tuples must be in depth first search
+  /// order so that the tree is correctly reconstructed. Each tuple is an 8-bit unsigned
+  /// integer representing the depth in the Taproot tree for this script, an 8-bit
+  /// unsigned integer representing the leaf version, the length of the script
+  /// as a compact size unsigned integer, and the script itself.
+  final List<PsbtTapTree> taprootTrees;
+  factory PsbtOutputTaprootTree(List<PsbtTapTree> taprootTrees) {
+    return PsbtOutputTaprootTree._(
+        taprootTrees: taprootTrees,
+        keyPair: PsbtKeyPair(
+            key: PsbtKey(PsbtOutputTypes.taprootTree.flag!),
+            value: PsbtValue(taprootTrees
+                .map((e) => e.serialize())
+                .expand((e) => e)
+                .toList())));
+  }
+  PsbtOutputTaprootTree._(
+      {required List<PsbtTapTree> taprootTrees, required super.keyPair})
+      : taprootTrees = taprootTrees.immutable,
+        super(type: PsbtOutputTypes.taprootTree);
+
+  factory PsbtOutputTaprootTree.deserialize(PsbtKeyPair keypair) {
+    if (keypair.key.type != PsbtOutputTypes.taprootTree.flag) {
+      throw DartBitcoinPluginException("Invalid PSBT Taproot Tree type flag");
+    }
+    if (keypair.key.extraData != null) {
+      throw DartBitcoinPluginException("Invalid PSBT Taproot Tree Key data.");
+    }
+    List<PsbtTapTree> taprootTrees = [];
+    try {
+      int offset = 0;
+      final data = keypair.value.data;
+      while (offset < data.length) {
+        final depth = data[offset++];
+        final leafVersion = data[offset++];
+        final scriptLength = IntUtils.decodeVarint(data.sublist(offset));
+        offset += scriptLength.item2;
+        final script = Script.deserialize(
+            bytes: data.sublist(offset, offset + scriptLength.item1));
+        final tree =
+            PsbtTapTree(depth: depth, leafVersion: leafVersion, script: script);
+        taprootTrees.add(tree);
+        offset += scriptLength.item1;
+      }
+      return PsbtOutputTaprootTree._(
+          taprootTrees: taprootTrees, keyPair: keypair);
+    } catch (_) {
+      throw DartBitcoinPluginException(
+          "Invalid Invalid PSBT Taproot Tree data.");
+    }
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    return {
+      "type": type.name,
+      "tree": taprootTrees.map((e) => e.toJson()).toList()
+    };
+  }
+}
+
+class PsbtOutputTaprootKeyBip32DerivationPath extends PsbtOutputData {
+  /// A 32 byte X-only public key involved in this input. It may be the output key,
+  /// the internal key, or a key present in a leaf script.
+  final List<int> xOnlyPubKey;
+
+  /// A compact size unsigned integer representing the number of leaf hashes,
+  /// followed by a list of leaf hashes, followed by the 4 byte master key
+  /// fingerprint concatenated with the derivation path of the public key.
+  /// The derivation path is represented as 32-bit little endian unsigned integer indexes concatenated with each other.
+  /// Public keys are those needed to spend this output. The leaf hashes are of the leaves which involve this public key.
+  /// The internal key does not have leaf hashes, so can be indicated with a hashes len of 0.
+  /// Finalizers should remove this field after PSBT_IN_FINAL_SCRIPTWITNESS is constructed.
+  final List<List<int>> leavesHashes;
+  final List<int> fingerprint;
+  final List<Bip32KeyIndex> derivationIndexes;
+
+  String get path {
+    return Bip32Path(elems: derivationIndexes).toString();
+  }
+
+  PsbtOutputTaprootKeyBip32DerivationPath._(
+      {required List<int> xOnlyPubKey,
+      required List<List<int>> leavesHashes,
+      required List<int> fingerprint,
+      required List<Bip32KeyIndex> derivationIndexes,
+      required super.keyPair})
+      : leavesHashes =
+            leavesHashes.map((e) => e.asImmutableBytes).toImutableList,
+        fingerprint = fingerprint.asImmutableBytes,
+        derivationIndexes = derivationIndexes.immutable,
+        xOnlyPubKey = xOnlyPubKey.asImmutableBytes,
+        super(type: PsbtOutputTypes.taprootBip32Derivation);
+  factory PsbtOutputTaprootKeyBip32DerivationPath(
+      {required List<int> xOnlyPubKey,
+      required List<List<int>> leavesHashes,
+      required List<int> fingerprint,
+      required List<Bip32KeyIndex> derivationIndexes}) {
+    if (fingerprint.length == Bip32KeyDataConst.fingerprintByteLen &&
+        xOnlyPubKey.length == EcdsaKeysConst.pointCoordByteLen &&
+        leavesHashes.every(
+            (element) => element.length == QuickCrypto.sha256DigestSize)) {
+      return PsbtOutputTaprootKeyBip32DerivationPath._(
+          xOnlyPubKey: xOnlyPubKey,
+          leavesHashes: leavesHashes,
+          fingerprint: fingerprint,
+          derivationIndexes: derivationIndexes,
+          keyPair: PsbtKeyPair(
+              key: PsbtKey(PsbtOutputTypes.taprootBip32Derivation.flag!,
+                  extraData: xOnlyPubKey),
+              value: PsbtValue([
+                ...IntUtils.encodeVarint(leavesHashes.length),
+                ...leavesHashes.expand((e) => e),
+                ...fingerprint,
+                ...derivationIndexes
+                    .map((e) => e.toBytes(Endian.little))
+                    .expand((e) => e)
+              ])));
+    }
+    throw DartBitcoinPluginException(
+        "Invalid Taproot Key BIP 32 Derivation Path key data.");
+  }
+  factory PsbtOutputTaprootKeyBip32DerivationPath.deserialize(
+      PsbtKeyPair keypair) {
+    if (keypair.key.type != PsbtOutputTypes.taprootBip32Derivation.flag) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT Taproot Key BIP 32 Derivation Path type flag");
+    }
+    if (keypair.key.extraData?.length != QuickCrypto.sha256DigestSize) {
+      throw DartBitcoinPluginException(
+          "Invalid Taproot Key BIP 32 Derivation Path key data.");
+    }
+
+    try {
+      final vlen = IntUtils.decodeVarint(keypair.value.data);
+      final int length = vlen.item1;
+      final data = keypair.value.data.sublist(vlen.item2);
+      final leavesHashes = List.generate(length, (i) {
+        final int offset = i * QuickCrypto.sha256DigestSize;
+        return data.sublist(offset, offset + QuickCrypto.sha256DigestSize);
+      });
+      final int fingerprintOffset =
+          leavesHashes.length * QuickCrypto.sha256DigestSize;
+      final List<int> fingerprint = data.sublist(fingerprintOffset,
+          fingerprintOffset + Bip32KeyDataConst.fingerprintByteLen);
+
+      final List<int> indexesBytes = data
+          .sublist(fingerprintOffset + Bip32KeyDataConst.fingerprintByteLen);
+      if (indexesBytes.length % Bip32KeyDataConst.keyIndexByteLen == 0) {
+        final inIndexesCount =
+            indexesBytes.length ~/ Bip32KeyDataConst.keyIndexByteLen;
+        final List<Bip32KeyIndex> indexes = List.generate(inIndexesCount, (i) {
+          final offset = i * Bip32KeyDataConst.keyIndexByteLen;
+          return Bip32KeyIndex.fromBytes(indexesBytes.sublist(
+              offset, offset + Bip32KeyDataConst.keyIndexByteLen));
+        });
+        if (fingerprint.length == Bip32KeyDataConst.fingerprintByteLen &&
+            keypair.key.extraData?.length == EcdsaKeysConst.pointCoordByteLen &&
+            leavesHashes.every(
+                (element) => element.length == QuickCrypto.sha256DigestSize)) {
+          return PsbtOutputTaprootKeyBip32DerivationPath._(
+              leavesHashes: leavesHashes,
+              fingerprint: fingerprint,
+              derivationIndexes: indexes,
+              xOnlyPubKey: keypair.key.extraData!,
+              keyPair: keypair);
+        }
+      }
+    } catch (_) {}
+
+    throw DartBitcoinPluginException(
+        "Invalid Taproot Key BIP 32 Derivation Path data.");
+  }
+
+  factory PsbtOutputTaprootKeyBip32DerivationPath.fromBip32(
+      {required Bip32Slip10Secp256k1 masterKey,
+      required String path,
+      TaprootTree? treeScript}) {
+    final derive = masterKey.derivePath(path);
+    final indexes = Bip32PathParser.parse(path).elems;
+    return PsbtOutputTaprootKeyBip32DerivationPath(
+      fingerprint: derive.fingerPrint.toBytes(),
+      derivationIndexes: indexes,
+      xOnlyPubKey: derive.publicKey.point.cast<ProjectiveECCPoint>().toXonly(),
+      leavesHashes: treeScript == null
+          ? []
+          : TaprootUtils.extractLeafs(treeScript).map((e) => e.hash()).toList(),
+    );
+  }
+  BipOrTaprootKeyDerivationRequest toKeyDerivation() {
+    return BipOrTaprootKeyDerivationRequest(
+        pubKeyOrXonly: xOnlyPubKey,
+        indexes: derivationIndexes,
+        fingerprint: fingerprint,
+        leavesHashes: leavesHashes);
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    return {
+      "type": type.name,
+      "xOnlyPubKey": BytesUtils.toHexString(xOnlyPubKey),
+      "leavesHashes":
+          leavesHashes.map((e) => BytesUtils.toHexString(e)).toList(),
+      "fingerprint": BytesUtils.toHexString(fingerprint),
+      "derivationIndexes": derivationIndexes.map((e) => e.index).toList()
+    };
+  }
+}
+
+class PsbtOutputMuSig2ParticipantPublicKeys extends PsbtOutputData {
+  /// The MuSig2 aggregate plain public key from the KeyAgg algorithm. This key may or may not be in the script directly.
+  /// It may instead be a parent public key from which the public keys in the script were derived.
+  final List<int> aggregatePubKey;
+
+  /// A list of the compressed public keys of the participants in the MuSig2 aggregate key in the order
+  /// required for aggregation. If sorting was done, then the keys must be in the sorted order.
+  final List<List<int>> pubKeys;
+  @override
+  Map<String, dynamic> toJson() {
+    return {
+      "type": type.name,
+      "aggregatePubKey": BytesUtils.toHexString(aggregatePubKey),
+      "pubKeys": pubKeys.map((e) => BytesUtils.toHexString(e)).toList()
+    };
+  }
+
+  PsbtOutputMuSig2ParticipantPublicKeys._(
+      {required List<int> aggregatePubKey,
+      required List<List<int>> pubKeys,
+      required super.keyPair})
+      : aggregatePubKey = aggregatePubKey.asImmutableBytes,
+        pubKeys = pubKeys.map((e) => e.asImmutableBytes).toImutableList,
+        super(type: PsbtOutputTypes.muSig2ParticipantPublicKeys);
+  factory PsbtOutputMuSig2ParticipantPublicKeys(
+      {required List<int> aggregatePubKey, required List<List<int>> pubKeys}) {
+    if (Secp256k1PublicKeyEcdsa.isValidBytes(aggregatePubKey) &&
+        pubKeys.every(Secp256k1PublicKeyEcdsa.isValidBytes)) {
+      return PsbtOutputMuSig2ParticipantPublicKeys._(
+          aggregatePubKey: aggregatePubKey,
+          pubKeys: pubKeys,
+          keyPair: PsbtKeyPair(
+              key: PsbtKey(PsbtOutputTypes.muSig2ParticipantPublicKeys.flag!,
+                  extraData: aggregatePubKey),
+              value: PsbtValue(pubKeys.expand((e) => e).toList())));
+    }
+    throw DartBitcoinPluginException(
+        "Invalid PSBT MuSig2 Participant Public Keys data");
+  }
+  factory PsbtOutputMuSig2ParticipantPublicKeys.deserialize(
+      PsbtKeyPair keypair) {
+    if (keypair.key.type != PsbtOutputTypes.muSig2ParticipantPublicKeys.flag) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT MuSig2 Participant Public Keys type flag");
+    }
+    if (keypair.key.extraData?.length ==
+        EcdsaKeysConst.pubKeyCompressedByteLen) {
+      try {
+        final pubKeysData = keypair.value.data;
+        if (pubKeysData.length % EcdsaKeysConst.pubKeyCompressedByteLen == 0) {
+          final pubkeysLength =
+              pubKeysData.length ~/ EcdsaKeysConst.pubKeyCompressedByteLen;
+          final List<List<int>> pubKeys = [];
+          for (int i = 0; i < pubkeysLength; i++) {
+            final int offset = i * EcdsaKeysConst.pubKeyCompressedByteLen;
+            final key = pubKeysData.sublist(
+                offset, offset + EcdsaKeysConst.pubKeyCompressedByteLen);
+            pubKeys.add(key);
+          }
+          if (Secp256k1PublicKeyEcdsa.isValidBytes(keypair.key.extraData!) &&
+              pubKeys.every(Secp256k1PublicKeyEcdsa.isValidBytes)) {
+            return PsbtOutputMuSig2ParticipantPublicKeys._(
+                aggregatePubKey: keypair.key.extraData!,
+                pubKeys: pubKeys,
+                keyPair: keypair);
+          }
+        }
+      } catch (_) {}
+    }
+    throw DartBitcoinPluginException(
+        "Invalid PSBT MuSig2 Participant Public Keys data");
+  }
+}
+
+class PsbtOutputSilentPaymentData extends PsbtOutputData {
+  /// The scan and spend public keys from the silent payments address.
+  final List<int> scanKey;
+  final List<int> spendKey;
+
+  PsbtOutputSilentPaymentData._(
+      {required List<int> scanKey,
+      required List<int> spendKey,
+      required super.keyPair})
+      : scanKey = scanKey.asImmutableBytes,
+        spendKey = spendKey.asImmutableBytes,
+        super(type: PsbtOutputTypes.silentPaymentData);
+  factory PsbtOutputSilentPaymentData(
+      {required List<int> scanKey, required List<int> spendKey}) {
+    if (scanKey.length == EcdsaKeysConst.pubKeyCompressedByteLen &&
+        spendKey.length == EcdsaKeysConst.pubKeyCompressedByteLen) {
+      return PsbtOutputSilentPaymentData._(
+          scanKey: scanKey,
+          spendKey: spendKey,
+          keyPair: PsbtKeyPair(
+              key: PsbtKey(PsbtOutputTypes.silentPaymentData.flag!),
+              value: PsbtValue([...scanKey, ...spendKey])));
+    }
+    throw DartBitcoinPluginException(
+        "Invalid PSBT Silent Payment Input ECDH Share data");
+  }
+  factory PsbtOutputSilentPaymentData.deserialize(PsbtKeyPair keypair) {
+    if (keypair.key.type != PsbtOutputTypes.silentPaymentData.flag) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT Silent Payment Data type flag");
+    }
+    if (keypair.key.extraData != null) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT Silent Payment Data key data.");
+    }
+    try {
+      if (keypair.value.data.length ==
+          (EcdsaKeysConst.pubKeyCompressedByteLen * 2)) {
+        return PsbtOutputSilentPaymentData._(
+            scanKey: keypair.value.data
+                .sublist(0, EcdsaKeysConst.pubKeyCompressedByteLen),
+            spendKey: keypair.value.data
+                .sublist(EcdsaKeysConst.pubKeyCompressedByteLen),
+            keyPair: keypair);
+      }
+    } catch (_) {}
+    throw DartBitcoinPluginException("Invalid PSBT Silent Payment Data data");
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    return {
+      "type": type.name,
+      "scanKey": BytesUtils.toHexString(scanKey),
+      "spendKey": BytesUtils.toHexString(spendKey)
+    };
+  }
+}
+
+class PsbtOutputSilentPaymentLabel extends PsbtOutputData {
+  /// The label to use to compute the spend key of the silent payments address to verify change.
+  final int label;
+  factory PsbtOutputSilentPaymentLabel(int label) {
+    return PsbtOutputSilentPaymentLabel._(
+        label: label,
+        keyPair: PsbtKeyPair(
+            key: PsbtKey(PsbtOutputTypes.silentPaymentLabel.flag!),
+            value: PsbtValue(
+                IntUtils.toBytes(label, length: 4, byteOrder: Endian.little))));
+  }
+  PsbtOutputSilentPaymentLabel._({required int label, required super.keyPair})
+      : label = label.asUint32,
+        super(type: PsbtOutputTypes.silentPaymentLabel);
+  factory PsbtOutputSilentPaymentLabel.deserialize(PsbtKeyPair keypair) {
+    if (keypair.key.type != PsbtOutputTypes.silentPaymentLabel.flag) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT Silent Payment Label type flag");
+    }
+    if (keypair.key.extraData != null) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT Silent Payment Label key data.");
+    }
+    try {
+      if (keypair.value.data.length == 4) {
+        final int label =
+            IntUtils.fromBytes(keypair.value.data, byteOrder: Endian.little);
+        return PsbtOutputSilentPaymentLabel._(label: label, keyPair: keypair);
+      }
+    } catch (_) {}
+    throw DartBitcoinPluginException("Invalid PSBT Silent Payment Label data");
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    return {"type": type.name, "label": label};
+  }
+}
+
+class PsbtOutputBIP353DNSSECProof extends PsbtOutputData {
+  /// A BIP 353 human-readable name (without the ₿ prefix), prefixed by a 1-byte length.
+  /// Followed by an RFC 9102 DNSSEC AuthenticationChain (i.e. a series of DNS
+  /// Resource Records in no particular order) providing a DNSSEC proof to a BIP 353 DNS TXT record.
+  final String name;
+  final List<int> proof;
+
+  PsbtOutputBIP353DNSSECProof._(
+      {required List<int> proof, required this.name, required super.keyPair})
+      : proof = proof.asImmutableBytes,
+        super(type: PsbtOutputTypes.bip353DNSSECProof);
+  factory PsbtOutputBIP353DNSSECProof(
+      {required List<int> proof, required String name}) {
+    final lenBytes = StringUtils.encode(name).length;
+    if (lenBytes > 255) {
+      throw DartBitcoinPluginException("The provided name is too large.");
+    }
+    return PsbtOutputBIP353DNSSECProof._(
+        proof: proof,
+        name: name,
+        keyPair: () {
+          final nameBytes = StringUtils.encode(name);
+          return PsbtKeyPair(
+              key: PsbtKey(PsbtOutputTypes.bip353DNSSECProof.flag!),
+              value: PsbtValue([nameBytes.length, ...nameBytes, ...proof]));
+        }());
+  }
+  factory PsbtOutputBIP353DNSSECProof.deserialize(PsbtKeyPair keypair) {
+    if (keypair.key.type != PsbtOutputTypes.bip353DNSSECProof.flag) {
+      throw DartBitcoinPluginException(
+          "Invalid BIP 353 DNSSEC proof type flag");
+    }
+    if (keypair.key.extraData != null) {
+      throw DartBitcoinPluginException(
+          "Invalid BIP 353 DNSSEC proof key data.");
+    }
+    try {
+      final int nameLength = keypair.value.data[0];
+      final name =
+          StringUtils.decode(keypair.value.data.sublist(1, nameLength));
+      final proof = keypair.value.data.sublist(1 + nameLength);
+      return PsbtOutputBIP353DNSSECProof._(
+          proof: proof, name: name, keyPair: keypair);
+    } on DartBitcoinPluginException {
+      rethrow;
+    } catch (_) {}
+    throw DartBitcoinPluginException("Invalid BIP 353 DNSSEC proof data");
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    return {
+      "type": type.name,
+      "name": name,
+      "proof": BytesUtils.toHexString(proof)
+    };
+  }
+}
+
+class PsbtOutputProprietaryUseType extends PsbtOutputData {
+  /// Compact size unsigned integer of the length of the identifier,
+  /// followed by identifier prefix, followed by a compact size unsigned
+  /// integer subtype, followed by the key data itself.
+  final List<int> identifier;
+  final List<int> subkeydata;
+
+  /// Any value data as defined by the proprietary type user.
+  final List<int> data;
+
+  @override
+  Map<String, dynamic> toJson() {
+    return {
+      "type": type.name,
+      "subkeydata": BytesUtils.toHexString(subkeydata),
+      "identifier": BytesUtils.toHexString(identifier),
+      "data": BytesUtils.toHexString(data),
+    };
+  }
+
+  factory PsbtOutputProprietaryUseType(
+      {required List<int> identifier,
+      required List<int> subkeydata,
+      required List<int> data}) {
+    return PsbtOutputProprietaryUseType._(
+        identifier: identifier,
+        subkeydata: subkeydata,
+        data: data,
+        keyPair: PsbtKeyPair(
+            key: PsbtKey(PsbtOutputTypes.proprietaryUseType.flag!, extraData: [
+              ...IntUtils.prependVarint(identifier),
+              ...IntUtils.prependVarint(subkeydata)
+            ]),
+            value: PsbtValue(data)));
+  }
+  PsbtOutputProprietaryUseType._(
+      {required List<int> identifier,
+      required List<int> subkeydata,
+      required List<int> data,
+      required super.keyPair})
+      : identifier = identifier.asImmutableBytes,
+        subkeydata = subkeydata.asImmutableBytes,
+        data = data.asImmutableBytes,
+        super(type: PsbtOutputTypes.proprietaryUseType);
+
+  factory PsbtOutputProprietaryUseType.deserialize(PsbtKeyPair keypair) {
+    if (keypair.key.type != PsbtOutputTypes.proprietaryUseType.flag) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT Proprietary Use Type type flag");
+    }
+    try {
+      final keyBytes = keypair.key.extraData!;
+      final identifierSize = IntUtils.decodeVarint(keyBytes);
+      final identifier = keyBytes.sublist(
+          identifierSize.item2, identifierSize.item1 + identifierSize.item2);
+      final subtypeOffset = identifierSize.item1 + identifierSize.item2;
+      final subkeydata = keyBytes.sublist(subtypeOffset);
+      return PsbtOutputProprietaryUseType._(
+          identifier: identifier,
+          subkeydata: subkeydata,
+          data: keypair.value.data,
+          keyPair: keypair);
+    } catch (_) {}
+    throw DartBitcoinPluginException("Invalid PSBT Proprietary Use Type data");
+  }
+}
+
+class PsbtOutputUnknow extends PsbtOutputData {
+  PsbtOutputUnknow._(PsbtKeyPair keyPair)
+      : super(type: PsbtOutputTypes.unknown, keyPair: keyPair);
+  factory PsbtOutputUnknow(PsbtKeyPair keyPair) {
+    return PsbtOutputUnknow._(keyPair);
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    return {
+      "type": type.name,
+      "key": {
+        "keyType": keyPair.key.type,
+        "keyData": BytesUtils.tryToHexString(keyPair.key.extraData)
+      },
+      "value": {"data": BytesUtils.toHexString(keyPair.value.data)},
+    };
+  }
+}
diff --git a/lib/src/psbt/types/types/psbt.dart b/lib/src/psbt/types/types/psbt.dart
new file mode 100644
index 0000000..97869bb
--- /dev/null
+++ b/lib/src/psbt/types/types/psbt.dart
@@ -0,0 +1,314 @@
+import 'package:bitcoin_base/src/bitcoin/script/transaction.dart';
+import 'package:bitcoin_base/src/exception/exception.dart';
+import 'package:bitcoin_base/src/psbt/types/types/global.dart';
+import 'package:bitcoin_base/src/psbt/types/types/inputs.dart';
+import 'package:bitcoin_base/src/psbt/types/types/outputs.dart';
+import 'package:bitcoin_base/src/psbt/reader/byte_reader.dart';
+import 'package:blockchain_utils/blockchain_utils.dart';
+
+const List<int> _magic = [0x70, 0x73, 0x62, 0x74];
+const int _seperator = 0x00;
+
+enum PsbtVersion {
+  v0("V0", 0),
+  v2("V2", 2);
+
+  bool get isV2 => this == v2;
+
+  final int version;
+  const PsbtVersion(this.name, this.version);
+  final String name;
+}
+
+class PsbtKey {
+  final int type;
+  final List<int>? extraData;
+
+  PsbtKey(int type, {List<int>? extraData})
+      : extraData = extraData?.asImmutableBytes,
+        type = type.asUint8;
+  factory PsbtKey._deserialize(List<int> bytes) {
+    if (bytes.isEmpty) {
+      throw DartBitcoinPluginException("Invalid PSBT key bytes length.");
+    }
+    final keyData = bytes.sublist(1);
+    return PsbtKey(bytes[0], extraData: keyData.isEmpty ? null : keyData);
+  }
+
+  List<int> serialize() {
+    List<int> bytes = [type, ...extraData ?? []];
+
+    return [...IntUtils.encodeVarint(bytes.length), ...bytes];
+  }
+
+  @override
+  bool operator ==(other) {
+    if (identical(this, other)) return true;
+    if (other is PsbtKey &&
+        other.type == type &&
+        BytesUtils.bytesEqual(extraData, other.extraData)) {
+      return true;
+    }
+    return false;
+  }
+
+  @override
+  int get hashCode => HashCodeGenerator.generateHashCode([extraData, type]);
+}
+
+class PsbtValue {
+  final List<int> data;
+  PsbtValue(List<int> data) : data = data.asImmutableBytes;
+  List<int> serialize() {
+    return [...IntUtils.encodeVarint(data.length), ...data];
+  }
+
+  @override
+  bool operator ==(other) {
+    if (identical(this, other)) return true;
+    if (other is PsbtValue && BytesUtils.bytesEqual(data, other.data)) {
+      return true;
+    }
+    return false;
+  }
+
+  @override
+  int get hashCode => HashCodeGenerator.generateBytesHashCode(data);
+}
+
+/// Represents a PSBT key-value pair
+class PsbtKeyPair {
+  final PsbtKey key;
+  final PsbtValue value;
+  const PsbtKeyPair({required this.key, required this.value});
+  factory PsbtKeyPair.deserialize(PsbtByteReader reader) {
+    final keyLength = reader.readLength();
+    final keyData = reader.read(keyLength);
+    final key = PsbtKey._deserialize(keyData);
+    final valueLength = reader.readLength();
+    final value = PsbtValue(reader.read(valueLength));
+    final keyPair = PsbtKeyPair(key: key, value: value);
+    return keyPair;
+  }
+  List<int> serialize() {
+    return [...key.serialize(), ...value.serialize()];
+  }
+
+  @override
+  bool operator ==(other) {
+    if (identical(this, other)) return true;
+    if (other is PsbtKeyPair && key == other.key && value == other.value) {
+      return true;
+    }
+    return false;
+  }
+
+  @override
+  int get hashCode => HashCodeGenerator.generateHashCode([key, value]);
+}
+
+/// Represents a full PSBT (Partially Signed Bitcoin Transaction)
+class Psbt {
+  final PsbtGlobal global;
+  final PsbtInput input;
+  final PsbtOutput output;
+  PsbtVersion get version => global.version;
+
+  const Psbt._({
+    required this.global,
+    required this.input,
+    required this.output,
+  });
+  factory Psbt({
+    required PsbtGlobal global,
+    required PsbtInput input,
+    required PsbtOutput output,
+  }) {
+    final version = global.version;
+    if (input.version != version) {
+      throw DartBitcoinPluginException(
+          "Missmatch version between PSBT global and input");
+    }
+    if (output.version != version) {
+      throw DartBitcoinPluginException(
+          "Missmatch version between PSBT global and output");
+    }
+    return Psbt._(global: global, input: input, output: output);
+  }
+  factory Psbt.fromHex(String hexBytes) {
+    final decode = BytesUtils.tryFromHexString(hexBytes);
+    if (decode == null) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT hex: Decoding failed or malformed input.");
+    }
+    return Psbt.deserialize(decode);
+  }
+
+  factory Psbt.fromBase64(String base64) {
+    final decode = StringUtils.tryEncode(base64, type: StringEncoding.base64);
+    if (decode == null) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT base64: Decoding failed or malformed input.");
+    }
+    return Psbt.deserialize(decode);
+  }
+
+  /// Deserializes a PSBT
+  factory Psbt.deserialize(List<int> bytes) {
+    try {
+      final reader = PsbtByteReader(bytes);
+      if (reader.length < 5 || !BytesUtils.bytesEqual(reader.read(4), _magic)) {
+        throw DartBitcoinPluginException("Invalid PSBT magic bytes.");
+      }
+      reader.skip(1);
+      List<PsbtKeyPair> global = [];
+      while (reader.at() != _seperator) {
+        final pair = PsbtKeyPair.deserialize(reader);
+        global.add(pair);
+      }
+      PsbtVersion psbtVersion = PsbtVersion.v0;
+      final psbtVersionKeyType = global.firstWhereNullable(
+          (e) => e.key.type == PsbtGlobalTypes.psbtVersion.flag);
+      if (psbtVersionKeyType != null) {
+        final v = PsbtGlobalPSBTVersionNumber.deserialize(psbtVersionKeyType);
+        psbtVersion = v.version;
+      }
+      int inputLength;
+      int outputLength;
+
+      switch (psbtVersion) {
+        case PsbtVersion.v0:
+          final unsignedTx = global.firstWhere(
+              (element) => element.key.type == PsbtGlobalTypes.unsignedTx.flag,
+              orElse: () => throw DartBitcoinPluginException(
+                  "PSBTv0 Global unsigned tx required."));
+          final btcTransaction =
+              BtcTransaction.deserialize(unsignedTx.value.data);
+          assert(BytesUtils.bytesEqual(
+              unsignedTx.value.data, btcTransaction.toBytes()));
+          inputLength = btcTransaction.inputs.length;
+          outputLength = btcTransaction.outputs.length;
+          break;
+        case PsbtVersion.v2:
+          final inputCount = global.firstWhere(
+              (e) => e.key.type == PsbtGlobalTypes.inputCount.flag,
+              orElse: () => throw DartBitcoinPluginException(
+                    "Invalid PSBT global: Missing required field ${PsbtGlobalTypes.inputCount.psbtName} for PSBT version ${psbtVersion.name}.",
+                  ));
+          final outputCount = global.firstWhere(
+              (e) => e.key.type == PsbtGlobalTypes.outputCount.flag,
+              orElse: () => throw DartBitcoinPluginException(
+                    "Invalid PSBT global: Missing required field ${PsbtGlobalTypes.outputCount.psbtName} for PSBT version ${psbtVersion.name}.",
+                  ));
+          inputLength = PsbtGlobalInputCount.deserialize(inputCount).count;
+          outputLength = PsbtGlobalOutputCount.deserialize(outputCount).count;
+          break;
+      }
+
+      reader.skip(1);
+      List<List<PsbtKeyPair>> inputs = [];
+      for (int i = 0; i < inputLength; i++) {
+        List<PsbtKeyPair> input = [];
+        while (reader.at() != _seperator) {
+          final pair = PsbtKeyPair.deserialize(reader);
+          input.add(pair);
+        }
+        reader.skip(1);
+        inputs.add(input);
+      }
+
+      List<List<PsbtKeyPair>> outputs = [];
+      for (int i = 0; i < outputLength; i++) {
+        List<PsbtKeyPair> output = [];
+        while (reader.at() != _seperator) {
+          final pair = PsbtKeyPair.deserialize(reader);
+          output.add(pair);
+        }
+        reader.skip(1);
+        outputs.add(output);
+      }
+
+      return Psbt(
+          global:
+              PsbtGlobal.fromKeyPairs(version: psbtVersion, keypairs: global),
+          input: PsbtInput.fromKeyPairs(keypairs: inputs, version: psbtVersion),
+          output:
+              PsbtOutput.fromKeyPairs(keypairs: outputs, version: psbtVersion));
+    } on DartBitcoinPluginException {
+      rethrow;
+    } catch (e) {
+      throw DartBitcoinPluginException(
+          "PSBT deserialization failed: Unable to parse the PSBT structure.",
+          details: {"error": e.toString()});
+    }
+  }
+
+  Psbt clone() {
+    return Psbt._(
+        global: global.clone(), input: input.clone(), output: output.clone());
+  }
+
+  String toHex() {
+    return BytesUtils.toHexString(serialize());
+  }
+
+  String toBase64() {
+    return StringUtils.decode(serialize(), type: StringEncoding.base64);
+  }
+
+  /// Serializes the full PSBT
+  List<int> serialize() {
+    List<int> bytes = [..._magic, 0xff];
+    final globalKeyPairs = global.toKeyPairs();
+    final inputKeyPairs = input.toKeyPairs();
+    final outputKeyPairs = output.toKeyPairs();
+    final globalKeys = globalKeyPairs.map((e) => e.key).toSet();
+    if (globalKeys.length != globalKeyPairs.length) {
+      throw DartBitcoinPluginException("Duplicate global entries found.");
+    }
+    final dupInputs = inputKeyPairs
+        .any((e) => e.map((e) => e.key).toSet().length != e.length);
+    if (dupInputs) {
+      throw DartBitcoinPluginException("Duplicate inputs entries found.");
+    }
+    final dupOutputs = outputKeyPairs
+        .any((e) => e.map((e) => e.key).toSet().length != e.length);
+    if (dupOutputs) {
+      throw DartBitcoinPluginException("Duplicate output entries found.");
+    }
+    for (final i in globalKeyPairs) {
+      bytes.addAll(i.serialize());
+    }
+    bytes.add(_seperator);
+    for (final i in inputKeyPairs) {
+      if (i.isEmpty) {
+        bytes.add(_seperator);
+        continue;
+      }
+      for (final e in i) {
+        bytes.addAll(e.serialize());
+      }
+      bytes.add(_seperator);
+    }
+
+    for (final i in outputKeyPairs) {
+      if (i.isEmpty) {
+        bytes.add(_seperator);
+        continue;
+      }
+      for (final e in i) {
+        bytes.addAll(e.serialize());
+      }
+      bytes.add(_seperator);
+    }
+    return bytes;
+  }
+
+  Map<String, dynamic> toJson() {
+    return {
+      "global": global.toJson(),
+      "input": input.toJson(),
+      "output": output.toJson()
+    };
+  }
+}
diff --git a/lib/src/psbt/types/types/types.dart b/lib/src/psbt/types/types/types.dart
new file mode 100644
index 0000000..1af335b
--- /dev/null
+++ b/lib/src/psbt/types/types/types.dart
@@ -0,0 +1,24 @@
+import 'package:bitcoin_base/src/bitcoin/script/script.dart';
+import 'package:blockchain_utils/blockchain_utils.dart';
+
+class PsbtTapTree {
+  final int depth;
+  final int leafVersion;
+  final Script script;
+  PsbtTapTree(
+      {required int depth, required int leafVersion, required this.script})
+      : depth = depth.asUint8,
+        leafVersion = leafVersion.asUint8;
+  List<int> serialize() {
+    final scriptBytes = IntUtils.prependVarint(script.toBytes());
+    return [depth, leafVersion, ...scriptBytes];
+  }
+
+  Map<String, dynamic> toJson() {
+    return {
+      "depth": depth,
+      "leafVersion": leafVersion,
+      "script": script.toJson()
+    };
+  }
+}
diff --git a/lib/src/psbt/utils/utils.dart b/lib/src/psbt/utils/utils.dart
new file mode 100644
index 0000000..a3fa82b
--- /dev/null
+++ b/lib/src/psbt/utils/utils.dart
@@ -0,0 +1,1111 @@
+import 'dart:typed_data';
+import 'package:bitcoin_base/src/bitcoin/address/address.dart';
+import 'package:bitcoin_base/src/bitcoin/script/scripts.dart';
+import 'package:bitcoin_base/src/crypto/crypto.dart';
+import 'package:bitcoin_base/src/exception/exception.dart';
+import 'package:bitcoin_base/src/provider/models/models.dart';
+import 'package:bitcoin_base/src/psbt/psbt_builder/types/internal_types.dart';
+import 'package:bitcoin_base/src/psbt/types/types/inputs.dart';
+import 'package:bitcoin_base/src/psbt/types/types/outputs.dart';
+import 'package:bitcoin_base/src/psbt/psbt_builder/types/types.dart';
+import 'package:bitcoin_base/src/psbt/types/types/psbt.dart';
+import 'package:blockchain_utils/blockchain_utils.dart';
+
+class PsbtUtils {
+  static PsbtInputInfo _getInputInfo(
+      {required Psbt psbt, required TxInput input, required int inputIndex}) {
+    PsbtTxType inputType = PsbtTxType.legacy;
+    bool isSegwit = false;
+    bool isP2tr = false;
+    Script? scriptPubKey;
+    Script? redeemScript;
+    Script? p2shRedeemScript;
+    BigInt? amount;
+    BitcoinBaseAddress? address;
+    final noneWitnessUtxo = psbt.input.getInput<PsbtInputNonWitnessUtxo>(
+        inputIndex, PsbtInputTypes.nonWitnessUTXO);
+    if (noneWitnessUtxo != null) {
+      if (input.txIndex >= noneWitnessUtxo.transaction.outputs.length) {
+        throw DartBitcoinPluginException(
+            "The provided non-Witness UTXO does not contain the given index.");
+      }
+      final output = noneWitnessUtxo.transaction.outputs[input.txIndex];
+      final type = findScriptType(output.scriptPubKey);
+      isSegwit = type.isSegwit;
+      scriptPubKey = output.scriptPubKey;
+      redeemScript = output.scriptPubKey;
+      amount = output.amount;
+    }
+    final witnessUtxo = psbt.input
+        .getInput<PsbtInputWitnessUtxo>(inputIndex, PsbtInputTypes.witnessUTXO);
+    final witnessScript = psbt.input.getInput<PsbtInputWitnessScript>(
+        inputIndex, PsbtInputTypes.witnessScript);
+    p2shRedeemScript = psbt.input
+        .getInput<PsbtInputRedeemScript>(
+            inputIndex, PsbtInputTypes.redeemScript)
+        ?.redeemScript;
+    final merkleRoot = psbt.input.getInput<PsbtInputTaprootMerkleRoot>(
+        inputIndex, PsbtInputTypes.taprootMerkleRoot);
+    final leavesScripts = psbt.input.getInputs<PsbtInputTaprootLeafScript>(
+        inputIndex, PsbtInputTypes.taprootLeafScript);
+    final internalPublicKey = psbt.input.getInput<PsbtInputTaprootInternalKey>(
+        inputIndex, PsbtInputTypes.taprootInternalKey);
+    isSegwit |= witnessUtxo != null;
+    isP2tr |= internalPublicKey != null;
+    if (isSegwit) {
+      if (witnessUtxo == null) {
+        throw DartBitcoinPluginException(
+            "WitnessUtxo required for spending witness utxos.");
+      }
+      inputType = isP2tr ? PsbtTxType.witnessV1 : PsbtTxType.witnessV0;
+
+      amount = witnessUtxo.amount;
+      scriptPubKey = witnessUtxo.scriptPubKey;
+      if (witnessScript != null) {
+        if (isP2tr) {
+          throw DartBitcoinPluginException(
+              "WitnessScript cannot be used in P2TR UTXOs.");
+        }
+        redeemScript = witnessScript.witnessScript;
+        address = P2wshAddress.fromScript(script: redeemScript);
+        if (p2shRedeemScript != null) {
+          address = P2shAddress.fromScript(script: address.toScriptPubKey());
+        }
+        if (address.toScriptPubKey() != scriptPubKey) {
+          throw DartBitcoinPluginException(
+              "ScriptPubKey does not match the one generated from witness script.");
+        }
+      } else {
+        if (!isP2tr) {
+          final type = findScriptType(p2shRedeemScript ?? scriptPubKey);
+          if (type == ScriptPubKeyType.p2wsh) {
+            throw DartBitcoinPluginException(
+                "Missing witness script for input $inputIndex.");
+          }
+          if (type != ScriptPubKeyType.p2wpkh) {
+            if (p2shRedeemScript != null) {
+              throw DartBitcoinPluginException(
+                  "Invalid Nested P2SH redeem script. ",
+                  details: {"script": p2shRedeemScript.toHex()});
+            }
+            throw DartBitcoinPluginException("Invalid witness scriptPubKey. ",
+                details: {"script": scriptPubKey.toHex()});
+          }
+          final redeem = p2shRedeemScript ?? scriptPubKey;
+          if (!BitcoinScriptUtils.isP2wpkh(redeem)) {
+            throw DartBitcoinPluginException("Invalid p2wpkh scriptPubKey.");
+          }
+          redeemScript = P2pkhAddress.fromHash160(addrHash: redeem.script[1])
+              .toScriptPubKey();
+        }
+      }
+    } else if (witnessScript != null ||
+        merkleRoot != null ||
+        internalPublicKey != null ||
+        leavesScripts != null) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT input: cannot have both legacy and witness fields.");
+    }
+
+    /// coinbase input
+    if (!isSegwit && noneWitnessUtxo == null) {
+      throw DartBitcoinPluginException("NonWintessUtxo missing.");
+    }
+    if (!isSegwit && p2shRedeemScript != null) {
+      redeemScript = p2shRedeemScript;
+      address = P2shAddress.fromScript(script: redeemScript);
+      if (address.toScriptPubKey() != scriptPubKey) {
+        throw DartBitcoinPluginException(
+            "ScriptPubKey does not match the one generated from p2sh redeem script.");
+      }
+    }
+
+    if (isP2tr) {
+      if (merkleRoot != null && leavesScripts == null) {
+        throw DartBitcoinPluginException(
+            "Witness v1 script-path spending requires leaf scripts.");
+      }
+      address = P2trAddress.fromInternalKey(
+          internalKey: internalPublicKey!.xOnlyPubKey,
+          merkleRoot: merkleRoot?.hash);
+      if (address.toScriptPubKey() != scriptPubKey) {
+        throw DartBitcoinPluginException(
+            "ScriptPubKey does not match the one generated from the internal key and Merkle root.");
+      }
+    } else if (isSegwit && (merkleRoot != null || leavesScripts != null)) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT input: merkleRoot and leaf scripts must not be provided for Witness v0.");
+    }
+    address ??= BitcoinScriptUtils.findAddressFromScriptPubKey(scriptPubKey!);
+    if (address.toScriptPubKey() != scriptPubKey) {
+      throw DartBitcoinPluginException(
+          "ScriptPubKey does not match the one generated.");
+    }
+    switch (inputType) {
+      case PsbtTxType.legacy:
+        return PsbtNonTaprootInputInfo.legacy(
+            redeemScript: redeemScript!,
+            index: inputIndex,
+            p2shRedeemScript: p2shRedeemScript,
+            scriptPubKey: scriptPubKey!,
+            amount: amount!,
+            address: address);
+      case PsbtTxType.witnessV0:
+        return PsbtNonTaprootInputInfo.v0(
+            redeemScript: redeemScript!,
+            index: inputIndex,
+            amount: witnessUtxo!.amount,
+            p2shRedeemScript: p2shRedeemScript,
+            scriptPubKey: scriptPubKey!,
+            witnessScript: witnessScript?.witnessScript,
+            address: address);
+      default:
+        final musigInfo = _getInputExistsMusi2Info(
+            psbt: psbt,
+            index: inputIndex,
+            type: inputType,
+            xOnly: internalPublicKey!,
+            scripts: leavesScripts);
+        return PsbtTaprootInputInfo(
+            scriptPubKey: scriptPubKey!,
+            amount: amount!,
+            index: inputIndex,
+            allScriptPubKeys: [],
+            allAmounts: [],
+            internalPublicKey: internalPublicKey,
+            merkleRoot: merkleRoot,
+            tapleafScripts: leavesScripts,
+            address: address,
+            musig2inputInfo: musigInfo);
+    }
+  }
+
+  static PsbtInputInfo getPsbtInputInfo(
+      {required Psbt psbt,
+      required int inputIndex,
+      required List<TxInput> txInputs}) {
+    validateTxInputs(
+        psbInput: psbt.input,
+        inputIndex: inputIndex,
+        inputsLength: txInputs.length);
+    final TxInput input = txInputs[inputIndex];
+    PsbtInputInfo inputParams =
+        _getInputInfo(psbt: psbt, input: input, inputIndex: inputIndex);
+    if (inputParams.type != PsbtTxType.witnessV1) return inputParams;
+    final v1Param = inputParams.cast<PsbtTaprootInputInfo>();
+    List<Script> scriptPubKeys = [];
+    List<BigInt> amounts = [];
+    for (int i = 0; i < psbt.input.length; i++) {
+      if (i == inputIndex) {
+        scriptPubKeys.add(v1Param.scriptPubKey);
+        amounts.add(v1Param.amount);
+        continue;
+      }
+      final TxInput input = txInputs[i];
+      final sciptPubKey =
+          getInputScriptPubKey(psbt: psbt, input: input, index: i);
+      final amount = getInputAmount(psbt: psbt, input: input, index: i);
+      scriptPubKeys.add(sciptPubKey);
+      amounts.add(amount);
+    }
+    return PsbtTaprootInputInfo(
+        index: v1Param.index,
+        amount: v1Param.amount,
+        scriptPubKey: v1Param.scriptPubKey,
+        allScriptPubKeys: scriptPubKeys,
+        allAmounts: amounts,
+        internalPublicKey: v1Param.internalPublicKey,
+        merkleRoot: v1Param.merkleRoot,
+        tapleafScripts: v1Param.tapleafScripts,
+        address: v1Param.address,
+        musig2inputInfo: v1Param.musig2inputInfo);
+  }
+
+  static BtcTransaction cleanUpAdnValidateNonUtxoWitness(
+      {required BtcTransaction transaction,
+      required int outIndex,
+      required String txId}) {
+    if (outIndex >= transaction.outputs.length) {
+      throw DartBitcoinPluginException(
+          "The provided non-Witness UTXO does not contain the given index.");
+    }
+    if (transaction.txId() != StringUtils.strip0x(txId.toLowerCase())) {
+      throw DartBitcoinPluginException(
+          "Transaction ID mismatch. Expected: ${transaction.txId()}, but got: ${StringUtils.strip0x(txId.toLowerCase())}");
+    }
+    return transaction;
+  }
+
+  static ScriptPubKeyType findScriptType(Script scriptPubKey) {
+    final type = BitcoinScriptUtils.findScriptType(scriptPubKey);
+    if (type == null) {
+      throw DartBitcoinPluginException(
+          "Unknown scriptPubKey. Unable to determine script type.",
+          details: {"script": scriptPubKey.toHex()});
+    }
+    return type;
+  }
+
+  static PsbtTxType getTxType(PsbtInput input) {
+    bool isSegwit = input.entries.any((e) => e.any((e) =>
+        e.type == PsbtInputTypes.witnessUTXO ||
+        e.type == PsbtInputTypes.finalizedWitness ||
+        e.type == PsbtInputTypes.witnessScript));
+    bool isP2tr = input.entries.any((e) => e.any((e) =>
+        e.type == PsbtInputTypes.taprootInternalKey ||
+        e.type == PsbtInputTypes.taprootMerkleRoot ||
+        e.type == PsbtInputTypes.taprootBip32Derivation));
+    if (isP2tr) return PsbtTxType.witnessV1;
+    if (isSegwit) return PsbtTxType.witnessV0;
+    return PsbtTxType.legacy;
+  }
+
+  static bool keyInScript(
+      {ECPublic? publicKey,
+      String? keyStr,
+      required Script script,
+      PsbtTxType? type}) {
+    return findSciptKeyInfo(
+            script: script, keyStr: keyStr, publicKey: publicKey, type: type) !=
+        null;
+  }
+
+  static PsbtScriptKeyInfo? findSciptKeyInfo(
+      {ECPublic? publicKey,
+      String? keyStr,
+      required Script script,
+      PsbtTxType? type}) {
+    if (keyStr != null) {
+      keyStr = StringUtils.strip0x(keyStr.toLowerCase());
+      int index = script.script.indexOf(keyStr);
+      if (!index.isNegative) {
+        return PsbtScriptKeyInfo(
+            index: index,
+            key: keyStr,
+            mode: PsbtScriptKeyMode.fromKeyString(keyStr));
+      }
+      return null;
+    }
+    if (publicKey == null) return null;
+    String key = publicKey.toHash160Hex();
+    int index = script.script.indexOf(key);
+    if (type == null || !type.isP2tr) {
+      if (!index.isNegative) {
+        return PsbtScriptKeyInfo(
+            index: index,
+            key: publicKey.toHex(),
+            mode: PsbtScriptKeyMode.compressed);
+      }
+      key = publicKey.toHex();
+      index = script.script.indexOf(key);
+      if (!index.isNegative) {
+        return PsbtScriptKeyInfo(
+            index: index, key: key, mode: PsbtScriptKeyMode.compressed);
+      }
+      if (type == null || !type.isSegwit) {
+        key = publicKey.toHex(mode: PubKeyModes.uncompressed);
+        index = script.script.indexOf(key);
+        if (!index.isNegative) {
+          return PsbtScriptKeyInfo(
+              index: index, key: key, mode: PsbtScriptKeyMode.uncompressed);
+        }
+        key = publicKey.toHash160Hex(mode: PubKeyModes.uncompressed);
+        index = script.script.indexOf(key);
+        if (!index.isNegative) {
+          return PsbtScriptKeyInfo(
+              index: index,
+              key: publicKey.toHex(mode: PubKeyModes.uncompressed),
+              mode: PsbtScriptKeyMode.uncompressed);
+        }
+      }
+    }
+    if (type == null || type.isP2tr) {
+      key = publicKey.toXOnlyHex();
+      index = script.script.indexOf(key);
+      if (!index.isNegative) {
+        return PsbtScriptKeyInfo(
+            index: index, key: key, mode: PsbtScriptKeyMode.xOnly);
+      }
+    }
+
+    return null;
+  }
+
+  static PsbtInputTaprootLeafScript findCorrectLeafScript(
+      {required List<PsbtInputTaprootLeafScript> tapLeafScripts,
+      required int index,
+      List<int>? tapleafHash}) {
+    if (tapleafHash == null) {
+      if (tapLeafScripts.length > 1) {
+        throw DartBitcoinPluginException(
+            "Multiple leaf scripts detected in input $index. A leaf hash is required to locate them.");
+      }
+      return tapLeafScripts.first;
+    }
+    return tapLeafScripts.firstWhere(
+      (e) => BytesUtils.bytesEqual(e.leafScript.hash(), tapleafHash),
+      orElse: () {
+        throw DartBitcoinPluginException(
+            "No matching Taproot leaf script found in input $index for the provided tapleaf ${BytesUtils.toHexString(tapleafHash)}.");
+      },
+    );
+  }
+
+  static Script getInputScriptPubKey(
+      {required Psbt psbt, required TxInput input, required int index}) {
+    final noneWitnessUtxo = psbt.input.getInput<PsbtInputNonWitnessUtxo>(
+        index, PsbtInputTypes.nonWitnessUTXO);
+    if (noneWitnessUtxo != null) {
+      if (input.txIndex >= noneWitnessUtxo.transaction.outputs.length) {
+        throw DartBitcoinPluginException(
+            "Invalid input $index. The provided non-Witness UTXO does not contain the given index.");
+      }
+      final output = noneWitnessUtxo.transaction.outputs[input.txIndex];
+      return output.scriptPubKey;
+    }
+    final witnessUtxo = psbt.input
+        .getInput<PsbtInputWitnessUtxo>(index, PsbtInputTypes.witnessUTXO);
+    if (witnessUtxo != null) {
+      return witnessUtxo.scriptPubKey;
+    }
+    throw DartBitcoinPluginException(
+        "Missing scriptPubKey for input at index $index.");
+  }
+
+  static BigInt getInputAmount(
+      {required Psbt psbt, required TxInput input, required int index}) {
+    final noneWitnessUtxo = psbt.input.getInput<PsbtInputNonWitnessUtxo>(
+        index, PsbtInputTypes.nonWitnessUTXO);
+    if (noneWitnessUtxo != null) {
+      if (input.txIndex >= noneWitnessUtxo.transaction.outputs.length) {
+        throw DartBitcoinPluginException(
+            "Invalid input $index. The provided non-Witness UTXO does not contain the given index.");
+      }
+      final output = noneWitnessUtxo.transaction.outputs[input.txIndex];
+      return output.amount;
+    }
+    final witnessUtxo = psbt.input
+        .getInput<PsbtInputWitnessUtxo>(index, PsbtInputTypes.witnessUTXO);
+    if (witnessUtxo != null) {
+      return witnessUtxo.amount;
+    }
+    throw DartBitcoinPluginException(
+        "Missing amount for input at index $index.");
+  }
+
+  static PsbtMusig2InputInfo? _getInputExistsMusi2Info(
+      {required Psbt psbt,
+      required int index,
+      required PsbtTxType type,
+      required PsbtInputTaprootInternalKey xOnly,
+      required List<PsbtInputTaprootLeafScript>? scripts}) {
+    if (!type.isP2tr) return null;
+    final pubKeys = psbt.input.getInputs<PsbtInputMuSig2ParticipantPublicKeys>(
+        index, PsbtInputTypes.muSig2ParticipantPublicKeys);
+    if (pubKeys == null) return null;
+    final nonces = psbt.input.getInputs<PsbtInputMuSig2PublicNonce>(
+        index, PsbtInputTypes.muSig2PublicNonce);
+    final signatures = psbt.input
+        .getInputs<PsbtInputMuSig2ParticipantPartialSignature>(
+            index, PsbtInputTypes.muSig2ParticipantPartialSignature);
+    return PsbtMusig2InputInfo(
+        publicKeys: pubKeys,
+        nonces: nonces ?? [],
+        partialSigs: signatures ?? []);
+  }
+
+  static List<String> _finalizeMultisigScript(
+      {required PsbtGeneratedTransactionDigest digest,
+      required MultiSignatureAddress multisig}) {
+    final currentScript =
+        digest.params.witnessScript ?? digest.params.p2shRedeemScript!;
+    final multisigSigners =
+        multisig.signers.map((e) => ECPublic.fromHex(e.publicKey)).toList();
+    final validSignatures = digest.getPartialSignatures(multisigSigners);
+    List<String> signatures = [];
+    final threshold = multisig.threshold;
+    for (int i = 0; i < multisig.signers.length; i++) {
+      if (signatures.length >= threshold) break;
+      final pubKey = multisigSigners[i];
+      final signer = multisig.signers[i];
+
+      final signature = validSignatures.firstWhereNullable((e) {
+        return e.publicKey == pubKey && e.mode == signer.keyType;
+      });
+      if (signature != null) {
+        for (int w = 0; w < signer.weight; w++) {
+          signatures.add(signature.signatureHex());
+          if (signatures.length >= threshold) break;
+        }
+      }
+    }
+    if (signatures.length < threshold) {
+      throw DartBitcoinPluginException(
+          "Missing multisig signatures: Required $threshold, but only ${signatures.length} provided.");
+    }
+    return [
+      if (BitcoinScriptUtils.hasOpCheckMultisig(currentScript)) '',
+      ...signatures,
+      digest.params.redeemScript.toHex()
+    ];
+  }
+
+  static List<String> _finalizeTaprootMultisigScript({
+    required P2trMultiSignatureAddress p2trMultisig,
+    required PsbtGeneratedTransactionDigest digest,
+  }) {
+    final leafScript = digest.leafScript!;
+    List<PsbtInputTaprootScriptSpendSignature> scriptSignatures =
+        digest.getTaprootScriptSignatures(
+            p2trMultisig.signers.map((e) => e.xOnly).toList());
+    scriptSignatures = () {
+      final sigs = scriptSignatures.map((e) {
+        final inScript = findSciptKeyInfo(
+            keyStr: e.xOnlyPubKeyHex, script: leafScript.script)!;
+        return (e, inScript);
+      }).toList()
+        ..sort((a, b) => b.$2.index.compareTo(a.$2.index));
+      return sigs.map((e) => e.$1).toList();
+    }();
+    List<String> signatures = [];
+    int someWeight = 0;
+    for (int i = 0; i < p2trMultisig.signers.length; i++) {
+      // if (signatures.length >= threshold) break;
+      final signer = p2trMultisig.signers[i];
+      final signature = scriptSignatures
+          .firstWhereNullable((e) => e.xOnlyPubKeyHex == signer.xOnly);
+      for (int w = 0; w < signer.weight; w++) {
+        if (someWeight >= p2trMultisig.threshold) {
+          signatures.add('');
+        } else {
+          signatures.add(signature?.signatureHex() ?? '');
+        }
+        if (signature != null) someWeight++;
+      }
+    }
+    if (someWeight < p2trMultisig.threshold) {
+      throw DartBitcoinPluginException(
+          "Missing P2TR multisig script signatures: Required ${p2trMultisig.threshold}, but only $someWeight provided.",
+          details: {"leafScript": leafScript.script.toString()});
+    }
+    return [
+      ...signatures.reversed,
+      leafScript.script.toHex(),
+      leafScript.controllBlockHex
+    ];
+  }
+
+  static PsbtFinalizeInput _userFinalizeInput(
+      {required PsbtFinalizeInput finalizeInput,
+      required PsbtInputInfo params,
+      required PsbtTxType txType}) {
+    TxWitnessInput? witness = finalizeInput.witness;
+    Script? scriptSig = finalizeInput.scriptSig;
+    if (params.type.isSegwit) {
+      if (witness == null) {
+        throw DartBitcoinPluginException(
+            "FinalizedScriptWitness required for witness UTXOs.");
+      }
+      if (params.p2shRedeemScript != null) {
+        if (scriptSig == null) {
+          throw DartBitcoinPluginException(
+              "P2SH redeemScript required for P2SH-Segwit UTXOS.");
+        }
+      } else if (scriptSig != null) {
+        throw DartBitcoinPluginException(
+            "FinalizedScriptSig does not required for legacy UTXOS.");
+      }
+    } else {
+      if (txType.isSegwit) {
+        witness ??= TxWitnessInput(stack: []);
+      }
+      if (scriptSig == null) {
+        throw DartBitcoinPluginException(
+            "FinalizedScriptSig required for legacy UTXOS.");
+      }
+    }
+    return PsbtFinalizeInput(witness: witness, scriptSig: scriptSig);
+  }
+
+  static List<String> _finalizeScriptSpent(
+      PsbtGeneratedTransactionDigest digest) {
+    final currentScript =
+        digest.params.witnessScript ?? digest.params.p2shRedeemScript!;
+    if (BitcoinScriptUtils.isP2wpkh(currentScript)) {
+      final signature = digest.getPartialSignature();
+      final scriptPubKey =
+          signature.publicKey.toP2wpkhInP2sh().toScriptPubKey();
+      if (scriptPubKey != digest.params.scriptPubKey) {
+        throw DartBitcoinPluginException(
+            'Mismatch P2WPKH-P2SH signer scriptPubKey.');
+      }
+      return [signature.signatureHex(), signature.publicKey.toHex()];
+    }
+
+    if (BitcoinScriptUtils.isP2pkh(currentScript)) {
+      final signature = digest.getPartialSignature();
+      final pubKey = findSciptKeyInfo(
+          publicKey: signature.publicKey, script: currentScript);
+      if (pubKey == null) {
+        throw DartBitcoinPluginException(
+            "Cannot find current signer key in signature.");
+      }
+      return [signature.signatureHex(), pubKey.key, currentScript.toHex()];
+    } else if (BitcoinScriptUtils.isP2pk(currentScript)) {
+      final signature = digest.getPartialSignature();
+      return [signature.signatureHex(), currentScript.toHex()];
+    }
+    final multisig = BitcoinScriptUtils.parseMultisigScript(currentScript);
+    if (multisig != null) {
+      return _finalizeMultisigScript(digest: digest, multisig: multisig);
+    }
+    if (currentScript.script.isEmpty) {
+      return [currentScript.toHex()];
+    }
+    if (BitcoinScriptUtils.isOpTrue(currentScript)) {
+      return [currentScript.toHex()];
+    }
+    if (BitcoinScriptUtils.isSha256(currentScript)) {
+      return [digest.getScriptSha256(currentScript), currentScript.toHex()];
+    }
+    if (BitcoinScriptUtils.isHash256(currentScript)) {
+      return [digest.getScriptHash256(currentScript), currentScript.toHex()];
+    }
+    if (BitcoinScriptUtils.isHash160(currentScript)) {
+      return [digest.getScriptHash160(currentScript), currentScript.toHex()];
+    }
+    if (BitcoinScriptUtils.isRipemd160(currentScript)) {
+      return [digest.getScriptRipemd160(currentScript), currentScript.toHex()];
+    }
+    if (BitcoinScriptUtils.isPubKeyOpCheckSig(currentScript)) {
+      final signature = digest.getPartialSignature();
+      final pubKey = findSciptKeyInfo(
+          publicKey: signature.publicKey, script: currentScript);
+      if (pubKey == null) {
+        throw DartBitcoinPluginException(
+            "Cannot find current signer public key in script.");
+      }
+      return [pubKey.key, currentScript.toHex()];
+    }
+    throw DartBitcoinPluginException(
+      "Unable to finalize custom script input at index ${digest.params.index}. Please use the onFinalizeCallback to complete the input finalization.",
+    );
+  }
+
+  static PsbtInputData? getReadyMusig2Signature(
+      PsbtGeneratedTransactionDigest digest) {
+    if (!digest.params.type.isP2tr) return null;
+    final taprootParams = digest.params.cast<PsbtTaprootInputInfo>();
+    final musig = taprootParams.musig2inputInfo;
+    final script = digest.leafScript;
+    final internalKey = taprootParams.internalPublicKey.xOnlyPubKey;
+    if (musig == null) return null;
+    final validSignatures = switch (script == null) {
+      true => musig.getNonScriptSignatures(internalKey),
+      false => musig.getScriptSignatures(script!.leafScript),
+    };
+    final validNonces = switch (script == null) {
+      true => musig.getNonScriptNonces(internalKey),
+      false => musig.getScriptNonces(script!.leafScript),
+    };
+    PsbtInputMuSig2ParticipantPublicKeys? key = switch (script == null) {
+      true => musig.getNonceScriptPublicKey(internalKey),
+      false => musig.getScriptPublicKey(script!.leafScript),
+    };
+    if (key == null ||
+        validNonces.length != validSignatures.length ||
+        validNonces.length != key.pubKeys.length) {
+      return null;
+    }
+    final tweak = digest.generateTaprootTweak();
+    List<int> signature = MuSig2.partialSigAgg(
+      signatures: validSignatures.map((e) => e.signature).toList(),
+      session: MuSig2Session(
+          tweaks: [if (tweak != null) MuSig2Tweak(tweak: tweak)],
+          aggnonce:
+              MuSig2.nonceAgg(validNonces.map((e) => e.publicNonce).toList()),
+          publicKeys: key.pubKeys
+              .map((e) => e.toBytes(mode: PubKeyModes.compressed))
+              .toList(),
+          msg: digest.digest),
+    );
+    signature = [
+      ...signature,
+      if (digest.sighashType != BitcoinOpCodeConst.sighashDefault)
+        digest.sighashType
+    ];
+    if (digest.leafScript != null) {
+      return PsbtInputTaprootScriptSpendSignature(
+          signature: signature,
+          xOnlyPubKey: validNonces.first.plainPublicKey.toXOnly(),
+          leafHash: digest.leafScript!.leafScript.hash());
+    }
+    return PsbtInputTaprootKeySpendSignature(signature);
+  }
+
+  static List<String> _finalizeTaprootScriptSpent(
+      {required PsbtGeneratedTransactionDigest digest,
+      required PsbtInput input}) {
+    PsbtInputTaprootLeafScript? leafScript = digest.leafScript;
+
+    if (leafScript == null) {
+      throw DartBitcoinPluginException(
+          "No tapleaf script found to finalize input at index ${digest.params.index}.",
+          details: {"scriptPubKey": digest.params.scriptPubKey.toString()});
+    }
+    final currentScript = leafScript.script;
+    final script = currentScript.toHex();
+    final controlBlock = leafScript.controllBlockHex;
+
+    if (BitcoinScriptUtils.hasAnyOpCheckSig(currentScript)) {
+      if (BitcoinScriptUtils.isXOnlyOpChecksig(currentScript)) {
+        final signature = digest
+            .getTaprootScriptSignature(currentScript.script[0].toString());
+        return [signature.signatureHex(), script, controlBlock];
+      }
+      final taprootMultisig =
+          BitcoinScriptUtils.isP2trMultiScript(leafScript.script);
+      if (taprootMultisig != null) {
+        return _finalizeTaprootMultisigScript(
+            p2trMultisig: taprootMultisig, digest: digest);
+      }
+    } else {
+      if (currentScript.script.isEmpty) {
+        return [currentScript.toHex(), script, controlBlock];
+      }
+      if (BitcoinScriptUtils.isOpTrue(currentScript)) {
+        return [currentScript.toHex(), script, controlBlock];
+      }
+      if (BitcoinScriptUtils.isSha256(currentScript)) {
+        return [digest.getScriptSha256(currentScript), script, controlBlock];
+      }
+      if (BitcoinScriptUtils.isHash256(currentScript)) {
+        return [digest.getScriptHash256(currentScript), script, controlBlock];
+      }
+      if (BitcoinScriptUtils.isHash160(currentScript)) {
+        return [digest.getScriptHash160(currentScript), script, controlBlock];
+      }
+      if (BitcoinScriptUtils.isRipemd160(currentScript)) {
+        return [digest.getScriptRipemd160(currentScript), script, controlBlock];
+      }
+    }
+    throw DartBitcoinPluginException(
+      "Unable to finalize custom script input at index ${digest.params.index}. Please use the onFinalizeCallback to complete the input finalization.",
+    );
+  }
+
+  static List<String> _finalizeNonScriptSpent(
+      {required PsbtGeneratedTransactionDigest digest,
+      required PsbtInput input}) {
+    final script = digest.params.scriptPubKey;
+    if (BitcoinScriptUtils.isP2tr(script)) {
+      return [digest.getTaprootKeyPathSignature()];
+    } else if (BitcoinScriptUtils.isP2pk(digest.params.scriptPubKey)) {
+      return [digest.getPartialSignature().signatureHex()];
+    } else if (BitcoinScriptUtils.isP2pkh(script) ||
+        BitcoinScriptUtils.isP2wpkh(script)) {
+      final sig = digest.getPartialSignature();
+      final pk = findSciptKeyInfo(publicKey: sig.publicKey, script: script);
+      if (pk == null) {
+        throw DartBitcoinPluginException(
+            "Signature public key does not match the scriptPubKey for input ${digest.params.index}.");
+      }
+      return [sig.signatureHex(), pk.key];
+    }
+    throw DartBitcoinPluginException(
+        "Unable to finalize custom script input at index ${digest.params.index}. Please use the onFinalizeCallback to complete the input finalization.",
+        details: {"scriptPubKey": digest.params.scriptPubKey.toString()});
+  }
+
+  static PsbtFinalizeInput finalizeInput(
+      {required Psbt psbt,
+      required int index,
+      required List<TxInput> txInputs,
+      required BtcTransaction unsignedTx,
+      PsbtFinalizeResponse? userFinalizedInput}) {
+    final txType = getTxType(psbt.input);
+    final params =
+        getPsbtInputInfo(psbt: psbt, inputIndex: index, txInputs: txInputs);
+    final digest = generateInputTransactionDigest(
+        index: index,
+        unsignedTx: unsignedTx,
+        params: params,
+        tapleafHash: userFinalizedInput?.tapleafHash,
+        input: psbt.input,
+        psbt: psbt);
+    if (userFinalizedInput?.finalizeInput != null) {
+      return _userFinalizeInput(
+          finalizeInput: userFinalizedInput!.finalizeInput!,
+          params: params,
+          txType: txType);
+    }
+    List<String> unlockScript = switch (params.isScriptSpending) {
+      false => _finalizeNonScriptSpent(digest: digest, input: psbt.input),
+      true => () {
+          if (params.type.isP2tr) {
+            return _finalizeTaprootScriptSpent(
+                digest: digest, input: psbt.input);
+          }
+          return _finalizeScriptSpent(digest);
+        }(),
+    };
+    if (txType.isLegacy) {
+      return PsbtFinalizeInput(scriptSig: Script(script: unlockScript));
+    }
+    if (params.isScriptSpending) {
+      if (params.type.isLegacy) {
+        return PsbtFinalizeInput(
+            scriptSig: Script(script: unlockScript),
+            witness: TxWitnessInput(stack: []));
+      }
+      return PsbtFinalizeInput(
+          witness: TxWitnessInput(stack: unlockScript),
+          scriptSig: params.p2shRedeemScript != null
+              ? Script(script: [params.p2shRedeemScript!.toHex()])
+              : null);
+    } else {
+      if (params.type.isLegacy) {
+        return PsbtFinalizeInput(
+            scriptSig: Script(script: unlockScript),
+            witness: TxWitnessInput(stack: []));
+      }
+      return PsbtFinalizeInput(witness: TxWitnessInput(stack: unlockScript));
+    }
+  }
+
+  static PsbtInputLocktime _toLocktime(int locktime) {
+    if (locktime.isNegative || locktime > maxUint32) {
+      throw DartBitcoinPluginException(
+          "Invalid integer provided as locktime: The locktime value must be a valid unsigned 32-bit integer.");
+    }
+    return PsbtInputLocktime(
+        isBlockBased: locktime < BitcoinOpCodeConst.minInputLocktime,
+        timelock: locktime);
+  }
+
+  static PsbtInputLocktime? getCurrentInputslocktime(
+      {required List<TxInput> inputs}) {
+    int? height;
+    int? timeLock;
+    for (final i in inputs) {
+      final lock = i.sequenceAsNumber();
+      if (lock == maxUint32) continue;
+      final locktime = _toLocktime(lock);
+      if (locktime.isBlockBased) {
+        height = IntUtils.max(locktime.timelock, height ?? 0);
+        continue;
+      }
+      timeLock = IntUtils.max(locktime.timelock, timeLock ?? 0);
+    }
+    if (height == null && timeLock == null) return null;
+    if (timeLock != null && height != null) {
+      throw DartBitcoinPluginException(
+          "Invalid Psbt input: Cannot mix height-based and time-based locktimes in a PSBT.");
+    }
+    return PsbtInputLocktime(
+        isBlockBased: height != null, timelock: timeLock ?? height!);
+  }
+
+  static List<int> buildTransactionLocktime(
+      {required List<TxInput> inputs, List<int>? locktimeFallBack}) {
+    final lock = getCurrentInputslocktime(inputs: inputs);
+    if (lock == null) {
+      return locktimeFallBack ?? BitcoinOpCodeConst.defaultTxLocktime;
+    }
+    return IntUtils.toBytes(lock.timelock,
+        length: BitcoinOpCodeConst.locktimeLengthInBytes,
+        byteOrder: Endian.little);
+  }
+
+  static int _validateAndGetSigHashType(
+      {required PsbtTxType inputType,
+      required PsbtInput input,
+      required int index,
+      int? sighashType}) {
+    final sighash =
+        input.getInput<PsbtInputSigHash>(index, PsbtInputTypes.sighashType);
+    if (sighashType != null) {
+      if (sighash == null) return sighashType;
+      if (sighashType != sighash.sighash) {
+        throw DartBitcoinPluginException(
+            "Input is marked with a different sighash type. Please update the input sighash type first.");
+      }
+      return sighashType;
+    }
+    if (sighash != null) return sighash.sighash;
+    if (inputType.isP2tr) return BitcoinOpCodeConst.sighashDefault;
+    return BitcoinOpCodeConst.sighashAll;
+  }
+
+  static PsbtGeneratedTransactionDigest generateInputTransactionDigest(
+      {required int index,
+      required BtcTransaction unsignedTx,
+      required PsbtInputInfo params,
+      required List<int>? tapleafHash,
+      required PsbtInput input,
+      required Psbt psbt,
+      int? sighashType}) {
+    sighashType = _validateAndGetSigHashType(
+        inputType: params.type,
+        index: index,
+        input: input,
+        sighashType: sighashType);
+    PsbtInputTaprootLeafScript? tapleafScript;
+    final digest = switch (params.type) {
+      PsbtTxType.legacy => () {
+          final legacyInput = params.cast<PsbtNonTaprootInputInfo>();
+          return unsignedTx.getTransactionDigest(
+              txInIndex: index,
+              script: legacyInput.redeemScript,
+              sighash: sighashType!);
+        }(),
+      PsbtTxType.witnessV0 => () {
+          final v0Input = params.cast<PsbtNonTaprootInputInfo>();
+          return unsignedTx.getTransactionSegwitDigit(
+              txInIndex: index,
+              script: v0Input.redeemScript,
+              sighash: sighashType!,
+              amount: params.amount);
+        }(),
+      PsbtTxType.witnessV1 => () {
+          final tapInput = params.cast<PsbtTaprootInputInfo>();
+          if (tapInput.tapleafScripts != null) {
+            tapleafScript = PsbtUtils.findCorrectLeafScript(
+                tapLeafScripts: tapInput.tapleafScripts!,
+                tapleafHash: tapleafHash,
+                index: index);
+          }
+          return unsignedTx.getTransactionTaprootDigset(
+              txIndex: index,
+              scriptPubKeys: tapInput.allScriptPubKeys,
+              sighash: sighashType!,
+              amounts: tapInput.allAmounts,
+              tapleafScript: tapleafScript?.leafScript);
+        }(),
+    };
+    return PsbtGeneratedTransactionDigest(
+        digest: digest,
+        sighashType: sighashType,
+        leafScript: tapleafScript,
+        params: params,
+        psbt: psbt);
+  }
+
+  static void validateNewInputLocktime(
+      {required List<TxInput> inputs, required TxInput newInput}) {
+    final inputSequence = newInput.sequenceAsNumber();
+    if (inputSequence == maxUint32) return;
+    final currentLocktime = getCurrentInputslocktime(inputs: inputs);
+    if (currentLocktime == null) return;
+    final locktime = _toLocktime(inputSequence);
+    if (currentLocktime.isBlockBased == locktime.isBlockBased) {
+      return;
+    }
+    throw DartBitcoinPluginException(
+        "Invalid Psbt input: Cannot mix height-based and time-based locktimes in a PSBT.");
+  }
+
+  static List<int> validateEcdsaSignature(
+      {required List<int> signature,
+      required int index,
+      required int expectedSighash}) {
+    if (!CryptoSignatureUtils.isValidBitcoinDERSignature(signature)) {
+      throw DartBitcoinPluginException(
+          "Invalid DER-encoded signature at input $index. Signature may be malformed or improperly formatted.");
+    }
+    if (signature.last != expectedSighash) {
+      throw DartBitcoinPluginException(
+          "Signature mismatch at input $index: Expected sighash $expectedSighash, but got ${signature.last}. The DER-encoded signature may be malformed or improperly formatted.");
+    }
+    return signature;
+  }
+
+  static List<int> validateMusigPartialSignature(
+      {required List<int> signature, required int index}) {
+    if (!MuSig2Utils.isValidPartialSignature(signature)) {
+      throw DartBitcoinPluginException(
+          "Invalid Musig2 Schnorr partial signature at input $index. Signature may be malformed or improperly formatted.");
+    }
+    return signature;
+  }
+
+  static List<int> validateSchnorrSignature(
+      {required List<int> signature,
+      required int index,
+      required int expectedSighash}) {
+    if (!CryptoSignatureUtils.isValidSchnorrSignature(signature)) {
+      throw DartBitcoinPluginException(
+          "Invalid Schnorr signature at input $index. Signature may be malformed or improperly formatted.");
+    }
+    if (signature.length == CryptoSignerConst.schnoorSginatureLength) {
+      if (expectedSighash == BitcoinOpCodeConst.sighashDefault) {
+        return signature;
+      }
+      return [...signature, expectedSighash];
+    }
+    if (signature.last != expectedSighash) {
+      throw DartBitcoinPluginException(
+          "Signature mismatch at input $index: Expected sighash $expectedSighash, but got ${signature.last}. The Schnorr signature may be malformed or improperly formatted.");
+    }
+    return signature;
+  }
+
+  static List<PsbtInputSighashInfo> getAllExistsSighashType(
+      PsbtInput psbtInput, PsbtTxType txType) {
+    List<PsbtInputSighashInfo> sighashInfos = [];
+    for (int i = 0; i < psbtInput.length; i++) {
+      final sighashType =
+          psbtInput.getInput<PsbtInputSigHash>(i, PsbtInputTypes.sighashType);
+      if (sighashType != null) {
+        sighashInfos.add(PsbtInputSighashInfo(
+            inputIndex: i, sighashType: sighashType.sighash));
+        continue;
+      }
+      final exitSignatures =
+          psbtInput.entries[i].whereType<PsbtInputDataSignature>().toList();
+      final finalizeScriptSig = psbtInput.getInput<PsbtInputFinalizedScriptSig>(
+          i, PsbtInputTypes.finalizedScriptSig);
+      final finalizeWitness =
+          psbtInput.getInput<PsbtInputFinalizedScriptWitness>(
+              i, PsbtInputTypes.finalizedWitness);
+      if (finalizeWitness != null ||
+          finalizeScriptSig != null ||
+          exitSignatures.isNotEmpty) {
+        sighashInfos.add(PsbtInputSighashInfo(
+            inputIndex: i,
+            sighashType: txType.isP2tr
+                ? BitcoinOpCodeConst.sighashDefault
+                : BitcoinOpCodeConst.sighashAll));
+      }
+    }
+    return sighashInfos;
+  }
+
+  static void validateCanAddOrUpdateOutput(
+      {required Psbt psbt, int? outputIndex, bool isUpdate = true}) {
+    final sighashes =
+        getAllExistsSighashType(psbt.input, getTxType(psbt.input));
+    for (final i in sighashes) {
+      if (!i.canModifyOutput(
+          outputIndex: outputIndex ?? -1,
+          isUpdate: isUpdate,
+          allSigashes: sighashes.map((e) => e.sighashType).toList())) {
+        throw DartBitcoinPluginException(
+            "Unable to modify output${outputIndex == null ? '' : ' $outputIndex'}. A signature with an unmodifiable sighash flag exists, preventing changes.");
+      }
+    }
+  }
+
+  static void validateTxInputs({
+    required PsbtInput psbInput,
+    required int inputIndex,
+    int? inputsLength,
+  }) {
+    if (inputIndex >= psbInput.length) {
+      throw DartBitcoinPluginException(
+          "Invalid input index: $inputIndex. The PSBT contains only ${psbInput.length} inputs.");
+    }
+    if (inputsLength != null && inputsLength != psbInput.length) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT: transaction inputs length does not match PSBT inputs length.");
+    }
+  }
+
+  static void validateTxOutputs(
+      {required PsbtOutput psbtOutput,
+      required int outputIndex,
+      List<TxOutput>? outputs}) {
+    if (outputIndex >= psbtOutput.length) {
+      throw DartBitcoinPluginException(
+          "Invalid output index: $outputIndex. The PSBT contains only ${psbtOutput.length} outputs.");
+    }
+    if (outputs != null && outputs.length != psbtOutput.length) {
+      throw DartBitcoinPluginException(
+          "Invalid PSBT: transaction outputs length does not match PSBT outputs length.");
+    }
+  }
+
+  static void validateCanAddOrUpdateInput(
+      {required Psbt psbt, int? inputIndex}) {
+    final sighashes =
+        getAllExistsSighashType(psbt.input, getTxType(psbt.input));
+    if (psbt.input.length == 1) return;
+    for (final i in sighashes) {
+      if (!i.canModifyInput(inputIndex ?? -1)) {
+        throw DartBitcoinPluginException(
+            "Unable to modify input${inputIndex == null ? '' : ' $inputIndex'}. A signature with an unmodifiable sighash flag exists, preventing changes.");
+      }
+    }
+  }
+
+  static bool finalized({required PsbtInput input, required int index}) {
+    bool alreadyFinalized =
+        input.hasInput(index, PsbtInputTypes.finalizedScriptSig);
+    return alreadyFinalized |=
+        input.hasInput(index, PsbtInputTypes.finalizedWitness);
+  }
+
+  static PsbtInputData getPsbtSequenceInputData(TxInput input) {
+    final sequenceNumber = input.sequenceAsNumber();
+    if (sequenceNumber == mask32) {
+      return PsbtInputSequenceNumber(sequenceNumber);
+    } else if (sequenceNumber < BitcoinOpCodeConst.minInputLocktime) {
+      return PsbtInputRequiredTimeBasedLockTime(sequenceNumber);
+    }
+    return PsbtInputRequiredHeightBasedLockTime(sequenceNumber);
+  }
+
+  static void validateAddMusig2PubKeyNonce(
+      {required int inputIndex,
+      required Psbt psbt,
+      required List<TxInput> txInputs,
+      required PsbtInputMuSig2PublicNonce pubKeyNonce}) {
+    final info = getPsbtInputInfo(
+        psbt: psbt, inputIndex: inputIndex, txInputs: txInputs);
+    if (!info.type.isP2tr) {
+      throw DartBitcoinPluginException(
+          "Invalid input type: MuSig2 requires a Taproot (P2TR) input, but a non-Taproot input was detected.");
+    }
+    final aggPubKeys = psbt.input
+        .getInputs<PsbtInputMuSig2ParticipantPublicKeys>(
+            inputIndex, PsbtInputTypes.muSig2ParticipantPublicKeys);
+    final nonces = psbt.input.getInputs<PsbtInputMuSig2PublicNonce>(
+        inputIndex, PsbtInputTypes.muSig2PublicNonce);
+    if (aggPubKeys == null) {
+      throw DartBitcoinPluginException(
+          "Missing MuSig2 participant public keys: PSBT input at index $inputIndex does not contain MuSig2 aggregated public keys.");
+    }
+    final taprootParams = info.cast<PsbtTaprootInputInfo>();
+    aggPubKeys.firstWhere(
+      (e) => e.pubKeys.contains(pubKeyNonce.publicKey),
+      orElse: () => throw DartBitcoinPluginException(
+          "Public key not found: The provided public key is not part of any MuSig2 participant set in the PSBT input at index $inputIndex."),
+    );
+    if (taprootParams.isKeyPath && pubKeyNonce.tapleafHash != null) {
+      throw DartBitcoinPluginException(
+          "Key-path spending does not use a tapleaf hash.");
+    }
+
+    if (taprootParams.isScriptSpending) {
+      if (pubKeyNonce.tapleafHash == null) {
+        throw DartBitcoinPluginException(
+            "Script-path spending requires a tapleaf hash.");
+      }
+      taprootParams.tapleafScripts!.firstWhere(
+        (e) =>
+            BytesUtils.bytesEqual(e.leafScript.hash(), pubKeyNonce.tapleafHash),
+        orElse: () => throw DartBitcoinPluginException(
+            "Taproot script not found: No tapleaf script matches the provided tapleaf hash."),
+      );
+    }
+
+    if (nonces != null &&
+        nonces.any((e) =>
+            e.plainPublicKey == pubKeyNonce.plainPublicKey &&
+            e.publicKey == pubKeyNonce.publicKey &&
+            BytesUtils.bytesEqual(e.tapleafHash, pubKeyNonce.tapleafHash))) {
+      throw DartBitcoinPluginException(
+          "Duplicate nonce detected: A nonce with the same public key and tapleaf hash already exists.");
+    }
+  }
+}
diff --git a/lib/src/transaction_builder/forked_transaction_builder.dart b/lib/src/transaction_builder/forked_transaction_builder.dart
index 50fb343..010f87a 100644
--- a/lib/src/transaction_builder/forked_transaction_builder.dart
+++ b/lib/src/transaction_builder/forked_transaction_builder.dart
@@ -1,5 +1,9 @@
-import 'package:bitcoin_base/bitcoin_base.dart';
+import 'package:bitcoin_base/src/bitcoin/address/address.dart';
+import 'package:bitcoin_base/src/bitcoin/script/scripts.dart';
 import 'package:bitcoin_base/src/exception/exception.dart';
+import 'package:bitcoin_base/src/models/network.dart';
+import 'package:bitcoin_base/src/provider/models/utxo_details.dart';
+import 'package:bitcoin_base/src/transaction_builder/builder.dart';
 import 'package:blockchain_utils/blockchain_utils.dart';
 
 /// A transaction builder specifically designed for the Bitcoin Cash (BCH) and Bitcoin SV (BSV) networks.
@@ -175,7 +179,7 @@ class ForkedTransactionBuilder implements BasedBitcoinTransacationBuilder {
       required UtxoWithAddress utox,
       required BtcTransaction transaction,
       int sighash =
-          BitcoinOpCodeConst.SIGHASH_ALL | BitcoinOpCodeConst.SIGHASH_FORKED}) {
+          BitcoinOpCodeConst.sighashAll | BitcoinOpCodeConst.sighashForked}) {
     return transaction.getTransactionSegwitDigit(
         txInIndex: input,
         script: scriptPubKeys,
@@ -256,8 +260,8 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
     }
     final inputs = sortedUtxos.map((e) => e.utxo.toInput()).toList();
     if (enableRBF && inputs.isNotEmpty) {
-      inputs[0] = inputs[0]
-          .copyWith(sequence: BitcoinOpCodeConst.REPLACE_BY_FEE_SEQUENCE);
+      inputs[0] =
+          inputs[0].copyWith(sequence: BitcoinOpCodeConst.replaceByFeeSequence);
     }
     return Tuple(List<TxInput>.unmodifiable(inputs),
         List<UtxoWithAddress>.unmodifiable(sortedUtxos));
@@ -466,13 +470,9 @@ be retrieved by anyone who examines the blockchain's history.
         sumOutputAmounts: sumOutputAmounts);
 
     /// create new transaction with inputs and outputs and isSegwit transaction or not
-    // BtcTransaction transaction = BtcTransaction.fromRaw(
-    //     "0200000001b8249c5a6cf8f24815377222e4c2bab32154151c367111134ef7ce11c651e4c600000000fd5b0300483045022100b4e774511598efbdf256aaa127f2104c5f25e29311936a75034857901c72fa180220232410ec31b9809b0293a7a2c8c0ade53ca4bdde064ac1baaa27d545678891b84147304402203014d1beaa73fc289d0201bff61a40d1e853103d624fb8520cc6b4afea00d3c10220643eed02e2830b7f751b7355a889e4ab4c02d01df0ca71621d4f5affe5cb3a5d41483045022100bf73bd48dcef332924c7578ff7a5b9d3817ecdb2ad2a4148f56069705365427c022044ce67ca87c3e1309ba43fcb3c23a3618ba0dbd44a802c22efab78b42b9a8e3e41483045022100a3d90b8f959850f9e2655b38e61a8e5323a363803bd62ab0560509e9cd675dae022064ba98f689c21f66e0839660bf15c7a0c44e0e65384d82996a4f3b73a55daef141473044022033128a7572b0bc7d22c6cd2080a882b7e03b15167b1d88b6405fa0131ab6254602207d960421e8a1a2e85431b6398a9af742fb492c967c3acac9fd38d82d7c54756e41483045022100c00232655b098d529deea53dcfffa5b25dc4a2015a52b1b587ae73c813a8d4a502201d100762ddb4779d1c484790a1b38cf369f634ee33541d8ec0ec45c2470141ba4147304402201503e2e7bab40cd5a083c0e03506ad1c260d17b821a142be2591e05fa5bdc86d02201d0280a2fc78a2af4bf7f1245bd8bf3384ada22098ba84645958ff1715655630414730440220090757399dc9f989ff1a7d998af385cd9490fe07c2c216b54967d4138067312a02204c3bb010902d72e90a1133cc8ae34cb629e139863f62ab259f25e5cac2125779414d13015821030f0fb9a244ad31a369ee02b7abfbbb0bfa3812b9a39ed93346d03d67d412d17721022f1b310f4c065331bc0d79ba4661bb9822d67d7c4a1b0a1892e1fd0cd23aa68d210299c2aa85d2b21a62f396907a802a58e521dafd5bddaccbd72786eea189bc4dc921021a7a569e91dbf60581509c7fc946d1003b60c7dee85299538db6353538d595742103a92c9b7cac68758de5783ed8e5123598e4ad137091e42987d3bad8a08e35bf3d21034f355bdcb7cc0af728ef3cceb9615d90684bb5b2ca5f859ab0f0b704075871aa21036360e856310ce5d294e8be33fc807077dc56ac80d95d9cd4ddbd21325eff73f721031d16453b3ab3132acb0a5bc16cc49690d819a585267a15cd5a064e2a0ad4059958ae0000000001f0780f000000000017a914e5d65da9624e4754827edb627fe31d4c75954a388700000000");
-    // transaction = transaction.copyWith(inputs: inputs);
-    final transaction =
-        BtcTransaction(inputs: inputs, outputs: outputs, hasSegwit: false);
+    final transaction = BtcTransaction(inputs: inputs, outputs: outputs);
     const sighash =
-        BitcoinOpCodeConst.SIGHASH_ALL | BitcoinOpCodeConst.SIGHASH_FORKED;
+        BitcoinOpCodeConst.sighashAll | BitcoinOpCodeConst.sighashForked;
 
     /// Well, now let's do what we want for each input
     for (var i = 0; i < inputs.length; i++) {
@@ -529,8 +529,7 @@ be retrieved by anyone who examines the blockchain's history.
           sign(digest, indexUtxo, indexUtxo.ownerDetails.publicKey!, sighash);
       _addScripts(input: inputs[i], signatures: [sig], utxo: indexUtxo);
     }
-    final ea = BtcTransaction.fromRaw(transaction.serialize());
-    assert(ea.serialize() == transaction.serialize(), transaction.serialize());
+
     return transaction;
   }
 
@@ -564,11 +563,10 @@ be retrieved by anyone who examines the blockchain's history.
         sumOutputAmounts: sumOutputAmounts);
 
     /// create new transaction with inputs and outputs and isSegwit transaction or not
-    final transaction =
-        BtcTransaction(inputs: inputs, outputs: outputs, hasSegwit: false);
+    final transaction = BtcTransaction(inputs: inputs, outputs: outputs);
 
     const sighash =
-        BitcoinOpCodeConst.SIGHASH_ALL | BitcoinOpCodeConst.SIGHASH_FORKED;
+        BitcoinOpCodeConst.sighashAll | BitcoinOpCodeConst.sighashForked;
 
     /// Well, now let's do what we want for each input
     for (var i = 0; i < inputs.length; i++) {
diff --git a/lib/src/transaction_builder/transaction_builder.dart b/lib/src/transaction_builder/transaction_builder.dart
index eef8846..36ffeac 100644
--- a/lib/src/transaction_builder/transaction_builder.dart
+++ b/lib/src/transaction_builder/transaction_builder.dart
@@ -1,5 +1,9 @@
-import 'package:bitcoin_base/bitcoin_base.dart';
+import 'package:bitcoin_base/src/bitcoin/address/address.dart';
+import 'package:bitcoin_base/src/bitcoin/script/scripts.dart';
 import 'package:bitcoin_base/src/exception/exception.dart';
+import 'package:bitcoin_base/src/models/network.dart';
+import 'package:bitcoin_base/src/provider/models/utxo_details.dart';
+import 'package:bitcoin_base/src/transaction_builder/builder.dart';
 import 'package:blockchain_utils/blockchain_utils.dart';
 
 /// A versatile transaction builder designed to support various plugin-supported networks
@@ -123,7 +127,7 @@ class BitcoinTransactionBuilder implements BasedBitcoinTransacationBuilder {
     final transaction = transactionBuilder
         .buildTransaction((trDigest, utxo, multiSigPublicKey, int sighash) {
       if (utxo.utxo.isP2tr) {
-        if (sighash != BitcoinOpCodeConst.TAPROOT_SIGHASH_ALL) {
+        if (sighash != BitcoinOpCodeConst.sighashDefault) {
           return '${fakeSchnorSignaturBytes}01';
         }
         return fakeSchnorSignaturBytes;
@@ -135,7 +139,7 @@ class BitcoinTransactionBuilder implements BasedBitcoinTransacationBuilder {
     /// Now we need the size of the transaction. If the transaction is a SegWit transaction,
     /// we use the getVSize method; otherwise, we use the getSize method to obtain the transaction size
     final size =
-        transaction.hasSegwit ? transaction.getVSize() : transaction.getSize();
+        transaction.hasWitness ? transaction.getVSize() : transaction.getSize();
 
     return size;
   }
@@ -312,8 +316,7 @@ class BitcoinTransactionBuilder implements BasedBitcoinTransacationBuilder {
       switch (utxo.utxo.scriptType) {
         case P2shAddressType.p2wshInP2sh:
           final script = Script.deserialize(
-              bytes: utxo.multiSigAddress.multiSigScript.toBytes(),
-              hasSegwit: true);
+              bytes: utxo.multiSigAddress.multiSigScript.toBytes());
           final p2wsh = P2wshAddress.fromScript(script: script);
           return [p2wsh.toScriptPubKey().toHex()];
         default:
@@ -398,8 +401,8 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
     }
     final inputs = sortedUtxos.map((e) => e.utxo.toInput()).toList();
     if (enableRBF && inputs.isNotEmpty) {
-      inputs[0] = inputs[0]
-          .copyWith(sequence: BitcoinOpCodeConst.REPLACE_BY_FEE_SEQUENCE);
+      inputs[0] =
+          inputs[0].copyWith(sequence: BitcoinOpCodeConst.replaceByFeeSequence);
     }
     return Tuple(List<TxInput>.unmodifiable(inputs),
         List<UtxoWithAddress>.unmodifiable(sortedUtxos));
@@ -486,8 +489,8 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
     }
 
     /// create new transaction with inputs and outputs and isSegwit transaction or not
-    var transaction =
-        BtcTransaction(inputs: inputs, outputs: outputs, hasSegwit: hasSegwit);
+    BtcTransaction transaction =
+        BtcTransaction(inputs: inputs, outputs: outputs);
 
     /// we define empty witnesses. maybe the transaction is segwit and We need this
     final witnesses = <TxWitnessInput>[];
@@ -511,8 +514,8 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
       final digest = _generateTransactionDigest(
           script, i, utxos[i], transaction, taprootAmounts, taprootScripts);
       final sighash = utxos[i].utxo.isP2tr
-          ? BitcoinOpCodeConst.TAPROOT_SIGHASH_ALL
-          : BitcoinOpCodeConst.SIGHASH_ALL;
+          ? BitcoinOpCodeConst.sighashDefault
+          : BitcoinOpCodeConst.sighashAll;
 
       /// handle multisig address
       if (utxos[i].isMultiSig()) {
@@ -649,8 +652,8 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
     }
 
     /// create new transaction with inputs and outputs and isSegwit transaction or not
-    var transaction =
-        BtcTransaction(inputs: inputs, outputs: outputs, hasSegwit: hasSegwit);
+    BtcTransaction transaction =
+        BtcTransaction(inputs: inputs, outputs: outputs);
 
     /// we define empty witnesses. maybe the transaction is segwit and We need this
     final witnesses = <TxWitnessInput>[];
@@ -674,8 +677,8 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
       final digest = _generateTransactionDigest(
           script, i, utxos[i], transaction, taprootAmounts, taprootScripts);
       final sighash = utxos[i].utxo.isP2tr
-          ? BitcoinOpCodeConst.TAPROOT_SIGHASH_ALL
-          : BitcoinOpCodeConst.SIGHASH_ALL;
+          ? BitcoinOpCodeConst.sighashDefault
+          : BitcoinOpCodeConst.sighashAll;
 
       /// handle multisig address
       if (utxos[i].isMultiSig()) {
@@ -765,9 +768,9 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
       input.scriptSig = Script(script: scriptSig);
 
       /// the concept of an "empty witness" is related to Segregated Witness (SegWit) transactions
-      ///  and the way transaction data is structured. When a transaction input is not associated
-      ///  with a SegWit UTXO, it still needs to be compatible with
-      ///  the SegWit transaction format. This is achieved through the use of an "empty witness."
+      /// and the way transaction data is structured. When a transaction input is not associated
+      /// with a SegWit UTXO, it still needs to be compatible with
+      /// the SegWit transaction format. This is achieved through the use of an "empty witness."
       if (hasSegwit) {
         witnesses.add(TxWitnessInput(stack: []));
       }
diff --git a/pubspec.yaml b/pubspec.yaml
index 45af41b..51a762a 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: bitcoin_base
 description: A versatile library for Bitcoin, Dogecoin, Litecoin, Dash, BSV, and BCH. Supports P2PKH, P2SH, P2WPKH, P2WSH, P2TR, with advanced creation, signing, and spending capabilities.
-version: 5.3.0
+version: 6.0.0
 homepage: "https://github.com/mrtnetwork/bitcoin_base"
 repository: "https://github.com/mrtnetwork/bitcoin_base"
 Author: mrhaydari.t@gmail.com
@@ -16,7 +16,7 @@ environment:
 
 
 dependencies:
-  blockchain_utils: ^4.2.0
+  blockchain_utils: ^4.3.0
   
   # blockchain_utils:
   #   path: ../../blockchain_utils
diff --git a/test/bitcoin_cash_token_encoding_test.dart b/test/bitcoin_cash_token_encoding_test.dart
index cf8ca80..a419f2e 100644
--- a/test/bitcoin_cash_token_encoding_test.dart
+++ b/test/bitcoin_cash_token_encoding_test.dart
@@ -758,7 +758,7 @@ void main() {
       final appendBytes = QuickCrypto.generateRandom(c * 2);
       final tokenBytes = BytesUtils.fromHexString(i['prefix']!);
       final combine = <int>[...tokenBytes, ...appendBytes];
-      final decode = CashToken.fromRaw(combine);
+      final decode = CashToken.deserialize(combine);
       final data = Map<String, dynamic>.from(i['data']);
       final amount = BigInt.parse(data['amount']);
       final nft =
diff --git a/test/deserialize_test.dart b/test/deserialize_test.dart
index e14d009..87e3774 100644
--- a/test/deserialize_test.dart
+++ b/test/deserialize_test.dart
@@ -1,4 +1,5 @@
 import 'package:bitcoin_base/src/bitcoin/script/transaction.dart';
+import 'package:blockchain_utils/utils/binary/utils.dart';
 import 'package:test/test.dart';
 
 void main() {
@@ -9,13 +10,13 @@ void _decodeTx() {
   test('decode transaction', () {
     const data =
         '020000000186389e3142effb82e00d38abc93ef856e543221ca6dd7d916760e0cda49f059300000000fd57030047304402204335c0185a9277c531315d0cd6c83bbe8d60d39f1b93864d9a4e67c8cccb400802207813732324a0cccf3989b4c56554bf06eaeea9175557525532926de939cfac3c414730440220515367fed3284a5469489c27fc7ea1915e7a07a939fb56d2188e5a27813b87690220578a491532d4bc84756fb489c2a5093b9f6884cfe852f2b469a89c7e35482ac0414730440220594f4cf6da2c88e430d1cc00d3b9b47b2936a9c4121be1c0e2e3b634e060c58202202c340707cc66aa27bd8fe40d9993751a0efa805b021f861fad460343b2826d4841473044022001c8e211117d20ecd3b3d7359e96485015303b4f55ba3039e40f1e035d867c2f02203c43c3e3f48a8215cb99a22b95d4d99defed9e385dbbacc4501c9c6fbc7db50141473044022000e95343e11b6765aa823c58c4fd1b78495b0a29f3fb428886ce858850827e6d02206bb967529a3289397e7c0482c063d872bc839306940b9e36e35457d840f2bfef4147304402200475c3a062644cf26269c91524cece25ff95cde8cbf52c7f180c1f7e45092fcf02207c4f4449aa69de7e8ae5825375825f5175462766e17bd1d7f96b5096f2d6ae004147304402201339113915d56209270d3be2c91ca0c04392db726a4909026924cce6236444310220476c5c6a8cdb6f973b62dad12b95a651269ad74cf767d5100d88ea98309ff9c4414730440220628dcdc3b1ed6e85d6df25c976fa09488b73e1d81f4ef80d02fcbfd852fd88a00220264ba1fc4fc6d92246f3a3511f76871954aee360c7e2e407dc317736fe910df6414d1301582102b509e03e5773ad6864d037eb1c8f9e9c39698bc5b59272d7f2156da2070d810f210369cc1b70ded5caf25b42b59ae13bdbee386e5dcaa0612a2a258dec02364040682103d850292f0e06a8e64c569a23cb310d192d4ad1b145c7050c6cb23bd9e8a4310421024fa5bd6af09db2740c39ec3e795eab200f091029b65d9013f7d3b52eb1cbc6e0210205a9f0be6d7f598c9a3b06cca6223705b49a43f5de5401eef93ee8c48ddf34b42103aaf256cb145aef9bea0bad969ca498108da7a3ad6da7cdeadcbcade2aa64fcea2103cb2ce8e4c87f7a6184abb30bf21cfb987634959f67bf20336d4208f4d7d62ac52103515a9b03688488850dd184e9229cb43634c1a39e2ccc5b8f2cf2c0a8cebb92e858aeffffffff0284030000000000001976a914e54b088d7f501604b1d85ed9d30f46b5db721ac288acc71c00000000000017a91492b98234f58410b0cea227d6e7e60ec08aa8547e8700000000';
-    final tx = BtcTransaction.fromRaw(data);
+    final tx = BtcTransaction.deserialize(BytesUtils.fromHexString(data));
     expect(tx.serialize(), data);
   });
   test('decode transaction 2', () {
     const data =
         '0200000000010b78c2ebf52b849090b70ba2bb3ec4a4447037ab41e56781f44f7cae3d82d356470000000000ffffffff78c2ebf52b849090b70ba2bb3ec4a4447037ab41e56781f44f7cae3d82d356470100000000ffffffff78c2ebf52b849090b70ba2bb3ec4a4447037ab41e56781f44f7cae3d82d3564702000000484730440220759a2beb31cbc0bfb30ad3cff3f3c84869b6549984ac8f5413bae19b0fed3aed022036718ddc6bbd7c7921d922fe90e7786ef67818208e268507dea99c782a578e1301ffffffff78c2ebf52b849090b70ba2bb3ec4a4447037ab41e56781f44f7cae3d82d356470300000000ffffffff78c2ebf52b849090b70ba2bb3ec4a4447037ab41e56781f44f7cae3d82d35647040000008a47304402202846a5ca5766a4ef0246e59cf11bfd0a182b5ce4fe366e43480df48efe92465f022005a47fdbefa0aa971d8804606362866bcf6d0c2bf8e4ecd0c31d04e7e28d4b7e0141042f1b310f4c065331bc0d79ba4661bb9822d67d7c4a1b0a1892e1fd0cd23aa68d2518d05511d46fc76b5bd2f94625b811df220f825786208cc5b5cca23de230ccffffffff78c2ebf52b849090b70ba2bb3ec4a4447037ab41e56781f44f7cae3d82d3564705000000a447304402203cdbff5392666f0d5bd364c9b83053e3b7508727102cba2f2110136359fd717402205069298f860fbd84f9b60466535c9ca226d92eaf9bf298c97df7f20b758248590141041a7a569e91dbf60581509c7fc946d1003b60c7dee85299538db6353538d59574b4e89d60c7d584d084632d296f125f165b4df8e061a49daeba51d36133d03e1a1976a914c880e94561d70cb61f2108deff2f1a6c10fff6a488acffffffff78c2ebf52b849090b70ba2bb3ec4a4447037ab41e56781f44f7cae3d82d3564706000000a447304402202e5f50e724c564dd1dde5cbad5ed87a803beb1b3f0a1401f3d5ee4a7e1ec9ed2022005efbc073f4862625923c68ac15a830b00f01a7e40fdebe7979528782a8c64180141041a7a569e91dbf60581509c7fc946d1003b60c7dee85299538db6353538d59574b4e89d60c7d584d084632d296f125f165b4df8e061a49daeba51d36133d03e1a1976a914c880e94561d70cb61f2108deff2f1a6c10fff6a488acffffffff78c2ebf52b849090b70ba2bb3ec4a4447037ab41e56781f44f7cae3d82d3564707000000232200209e7470b3013d2e9585f2009241f223beaefc8067f82a2a6f2dd87d74cb5969dbffffffff78c2ebf52b849090b70ba2bb3ec4a4447037ab41e56781f44f7cae3d82d35647080000008c473044022013608955698454f9eff9708cb98f2ff97d3a4d4ab9f8a80996d57a861ae712970220347ad5bca2e6773fb1fc817cd12bac451cfedae8f024e67e8fac905eaa2601370143410499c2aa85d2b21a62f396907a802a58e521dafd5bddaccbd72786eea189bc4dc9c40c3728b587c47395ce41a2afe84ee70016fafa39d3b54e66fc1f11aefda704acffffffff78c2ebf52b849090b70ba2bb3ec4a4447037ab41e56781f44f7cae3d82d3564709000000fd410400473044022062c412f612e08ed3cf5ce5aba3c8e556849a2ffdded9814525393bd4b61c76890220638557c4426a83012b0cf31fccd395c9a063f01942dcdadf5c86b174fceaffbe0147304402206bec40f5bb548e6f0e2c8b6ffe24d1173f60b1ebb0a870cef941e8499d34c9ae02204206d61ecdfd2aa0a300f91dafd9e7399f22bee9298d56d972e0d58e366977fe01473044022050f449a88e32850924a1d19ab9b82f676d2859ec38765d13b0a08902eb8bb95b02203c1bbc81ad3af940470cd100e4bf59bd92570d0dc8b76bf6196a90c8a528520a0147304402205e8e6937d25e139762ca57d4e4777e28bbd730cde2cd72d16b7f73eca04df84d022011141ef7b64b3b10ae9fc1c78c73453c1855ff997c05b2aed56ee24ee53a789f01473044022046c8000f5c97f5e8b388e6294db4ebd8cb45f4c58f844003ed571ee8b5965a6e02202f2880e91746bcf240a6cf1945de81016f6c46cb95265e67289611e1eaaffbd00147304402204610acecbda4763c3d7bcf3e656a1cdb1f0e6286dff755b36640c52d5153011b0220785bb66ff9e36d9de663379d520858d340c66845c3f9c7b4bfd4843bf6c2fc0f01473044022007c91bb30021f4b2d84ca5cc18458aeb6ee96d9d5881d09a37af845524d3ff10022068ffdca9828bc4648cdb954bd76436b373a3da07c376452325e52a01075e7b2201473044022007c91bb30021f4b2d84ca5cc18458aeb6ee96d9d5881d09a37af845524d3ff10022068ffdca9828bc4648cdb954bd76436b373a3da07c376452325e52a01075e7b2201473044022007c91bb30021f4b2d84ca5cc18458aeb6ee96d9d5881d09a37af845524d3ff10022068ffdca9828bc4648cdb954bd76436b373a3da07c376452325e52a01075e7b22014db5015941040f0fb9a244ad31a369ee02b7abfbbb0bfa3812b9a39ed93346d03d67d412d1777965c382f55222a9aed59cb8affc64bb5381f065eab9ef3baa57f2f0ac6bfae921022f1b310f4c065331bc0d79ba4661bb9822d67d7c4a1b0a1892e1fd0cd23aa68d210299c2aa85d2b21a62f396907a802a58e521dafd5bddaccbd72786eea189bc4dc921021a7a569e91dbf60581509c7fc946d1003b60c7dee85299538db6353538d595742103a92c9b7cac68758de5783ed8e5123598e4ad137091e42987d3bad8a08e35bf3d21034f355bdcb7cc0af728ef3cceb9615d90684bb5b2ca5f859ab0f0b704075871aa41046360e856310ce5d294e8be33fc807077dc56ac80d95d9cd4ddbd21325eff73f7eb1c2784a65901538479361e94c0a2597973adef0836a6a7eddf50b7997c88a341046360e856310ce5d294e8be33fc807077dc56ac80d95d9cd4ddbd21325eff73f7eb1c2784a65901538479361e94c0a2597973adef0836a6a7eddf50b7997c88a341046360e856310ce5d294e8be33fc807077dc56ac80d95d9cd4ddbd21325eff73f7eb1c2784a65901538479361e94c0a2597973adef0836a6a7eddf50b7997c88a359aeffffffff78c2ebf52b849090b70ba2bb3ec4a4447037ab41e56781f44f7cae3d82d356470a000000484730440220028b766844f8d4e5c28b2464605dfa79435c9203481976db468517ca96674b320220761f5687ce7d6067ba3cbe652e11b8495ac274b5ce0e7f1b8f59b2c34f007bf701ffffffff0be803000000000000160014b4bd9b543a615fe9b73ced34a9a38572ae18a395e8030000000000002200209e7470b3013d2e9585f2009241f223beaefc8067f82a2a6f2dd87d74cb5969dbe8030000000000004341040f0fb9a244ad31a369ee02b7abfbbb0bfa3812b9a39ed93346d03d67d412d1777965c382f55222a9aed59cb8affc64bb5381f065eab9ef3baa57f2f0ac6bfae9ace80300000000000022512039d1075e641ac7deda75bfbfa28aa5c65d7f39b1315e024f62e1064b1ec71d3ee8030000000000001976a914f9c4fccde68b163563e0d60842d1accd19c1207b88ace80300000000000017a91454db4f9a5c6f2de3110925e1f8cf42aeab807e6687e80300000000000017a91454db4f9a5c6f2de3110925e1f8cf42aeab807e6687e80300000000000017a914baf6af81b991265c3e3223f4649cf1b21afa73b987e80300000000000017a914c95d7440311017931c7adb20ab103e116e17ccbb87e80300000000000017a914d6215d5c57d6d65ae73eb0d8fe2ad7cfa07d441f879ba80000000000004341040f0fb9a244ad31a369ee02b7abfbbb0bfa3812b9a39ed93346d03d67d412d1777965c382f55222a9aed59cb8affc64bb5381f065eab9ef3baa57f2f0ac6bfae9ac02473044022044cd5a0eca8585d1dfb183dc12b37bfb41308244540d6a6ba449b6663f85f5e402206221b9980ecc54538e249a1c01972c6198c150945d12b6d124ebe523bd7bd2c30121021a7a569e91dbf60581509c7fc946d1003b60c7dee85299538db6353538d595740300473044022010b9f2310bc25214db7508df0107c8683c7c2f3eabb60aad2c35bed84d516159022059a643ad81a966716db06a2d707fefb234bffcac975ece1bc4b900239b50b7e501255121031d16453b3ab3132acb0a5bc16cc49690d819a585267a15cd5a064e2a0ad4059951ae000140daf8270bffc7a39c45114f5b180f5f82bc920803f3a612a4b517ce609e7e4ef30d8939102af08c9407f0cc4f9c63ffdda9914634dc59b1786d6d6b9d1b8a31960000000300473044022058f436dd9dc7d2966cd44a52989c972fb67e017d02e08723293fcfc4a3da3bff02200f8ff1bb6a95709ed5cfc47e9f567cba1fca8c9c10cd2db4f348152b3420361001255121031d16453b3ab3132acb0a5bc16cc49690d819a585267a15cd5a064e2a0ad4059951ae00000000000000';
-    final tx = BtcTransaction.fromRaw(data);
+    final tx = BtcTransaction.deserialize(BytesUtils.fromHexString(data));
     expect(tx.serialize(), data);
   });
 }
diff --git a/test/encode_decode_transaction_test.dart b/test/encode_decode_transaction_test.dart
index 70b8b52..2c7336c 100644
--- a/test/encode_decode_transaction_test.dart
+++ b/test/encode_decode_transaction_test.dart
@@ -1,4 +1,5 @@
 import 'package:bitcoin_base/bitcoin_base.dart';
+import 'package:blockchain_utils/utils/binary/utils.dart';
 import 'package:test/test.dart';
 
 void main() {
@@ -28,11 +29,11 @@ void main() {
           amount: BigInt.from(10067000),
           scriptPubKey: Script(
             script: [
-              'OP_DUP',
-              'OP_HASH160',
+              BitcoinOpcode.opDup,
+              BitcoinOpcode.opHash160,
               'b8d913342894ec7b066420952a618ec2a8269bc2',
-              'OP_EQUALVERIFY',
-              'OP_CHECKSIG'
+              BitcoinOpcode.opEqualVerify,
+              BitcoinOpcode.opCheckSig,
             ],
           )),
       TxOutput(
@@ -45,9 +46,9 @@ void main() {
           ),
           scriptPubKey: Script(
             script: [
-              'OP_HASH256',
+              BitcoinOpcode.opHash256,
               '1d12ffe8e85fdab36794cb09418982efdbd5c8cee5fbeb216ac43887ea4817b8',
-              'OP_EQUAL'
+              BitcoinOpcode.opEqual
             ],
           )),
       TxOutput(
@@ -60,17 +61,17 @@ void main() {
           ),
           scriptPubKey: Script(
             script: [
-              'OP_DUP',
-              'OP_HASH160',
+              BitcoinOpcode.opDup,
+              BitcoinOpcode.opHash160,
               'b8d913342894ec7b066420952a618ec2a8269bc2',
-              'OP_EQUALVERIFY',
-              'OP_CHECKSIG'
+              BitcoinOpcode.opEqualVerify,
+              BitcoinOpcode.opCheckSig,
             ],
           )),
     ]);
     const raw =
         '0200000002752fe41aa4b9e1fb0ada5f839dbcfc55ada77d1d3f8b7674ee1c41b7ea0baada000000006a47304402203795e2aa978afbbd676b36c0edd1a39478744d320c5e02dd6a39d154755a5a3e02205545a7765bae3db9b820b1db9be2f8955a8998fa92ac08b0d7416aa30a3cee42412103ac064f4489ff812c643471ed25b990e6be7212566c932b8680b900c8e6db0fd9ffffffff752fe41aa4b9e1fb0ada5f839dbcfc55ada77d1d3f8b7674ee1c41b7ea0baada020000006a473044022071b39d6aefdea7a7837310e5d78b1069ae82ed007991f8bca80bf3baf26340cc02200bc356be6e9f0019849b75b00322262a23ce179e7c0313207addfdbe596dabfd412103ac064f4489ff812c643471ed25b990e6be7212566c932b8680b900c8e6db0fd9ffffffff03389c9900000000001976a914b8d913342894ec7b066420952a618ec2a8269bc288ace80300000000000048ef3004f743948275861b117f29a9ba300295427025399145c6d2df9e52d473784e10fdd007aa201d12ffe8e85fdab36794cb09418982efdbd5c8cee5fbeb216ac43887ea4817b887e80300000000000044ef3004f743948275861b117f29a9ba300295427025399145c6d2df9e52d473784e10ff60f04fecc22b1a0b76a914b8d913342894ec7b066420952a618ec2a8269bc288ac00000000';
-    final tr = BtcTransaction.fromRaw(raw);
+    final tr = BtcTransaction.deserialize(BytesUtils.fromHexString(raw));
     expect(tx.toHex(), raw);
     expect(tr.toHex(), raw);
 
@@ -81,7 +82,8 @@ void main() {
     /// https://tbch4.loping.net/tx/caa91b0fea2843a99c3cd7375ac4d3102b6b74a25e52cd866ad7ecc486204f0d
     const encodedTr =
         '020000000252b6818f78bff46cbfdf3384875d3471f063f7c49f62658ffa22973c87649b5e000000006c473044022029198caf8776bcf9a8c3fcc79dbd4d3498cd938ba95962e5473fb77ad8d8a6510220265e7a0a14dca7bc1edb0a7bda4cd987f7893377b9cd9cfc9dbef97f85660bed41232103ac064f4489ff812c643471ed25b990e6be7212566c932b8680b900c8e6db0fd9acffffffff52b6818f78bff46cbfdf3384875d3471f063f7c49f62658ffa22973c87649b5e010000006c4730440220639b44bece1b3c2ed597c25497ee6f843ec2de033cb83292e0576b3f84cfc995022032713a60006d76c15bd0a6ddef758c06d61baa5f278bc993d98f03f69165d74741232103ac064f4489ff812c643471ed25b990e6be7212566c932b8680b900c8e6db0fd9acffffffff0510f699000000000023aa209f4ab972963cf18d86aa57fa875147f996916f06c28179f449cd14188818ba3187e80300000000000060efc4bf086c2c7bbb0405343873cf81b8b5d81d65126ce1bcddaa96591e79870d3f72156769746875622e636f6d2f6d72746e6574776f726bfe005a6202aa209f4ab972963cf18d86aa57fa875147f996916f06c28179f449cd14188818ba3187e80300000000000060efc4bf086c2c7bbb0405343873cf81b8b5d81d65126ce1bcddaa96591e79870d3f71156769746875622e636f6d2f6d72746e6574776f726bfe005a6202aa209f4ab972963cf18d86aa57fa875147f996916f06c28179f449cd14188818ba3187e80300000000000060efc4bf086c2c7bbb0405343873cf81b8b5d81d65126ce1bcddaa96591e79870d3f71156769746875622e636f6d2f6d72746e6574776f726bfe005a6202aa209f4ab972963cf18d86aa57fa875147f996916f06c28179f449cd14188818ba3187e80300000000000060efc4bf086c2c7bbb0405343873cf81b8b5d81d65126ce1bcddaa96591e79870d3f71156769746875622e636f6d2f6d72746e6574776f726bfe005a6202aa209f4ab972963cf18d86aa57fa875147f996916f06c28179f449cd14188818ba318700000000';
-    final decode = BtcTransaction.fromRaw(encodedTr);
+    final decode =
+        BtcTransaction.deserialize(BytesUtils.fromHexString(encodedTr));
     expect(decode.toHex(), encodedTr);
   });
 }
diff --git a/test/keys_test.dart b/test/keys_test.dart
index d25b067..eb985d2 100644
--- a/test/keys_test.dart
+++ b/test/keys_test.dart
@@ -128,8 +128,8 @@ void main() {
               .toAddress(mode: PublicKeyType.uncompressed)
               .toAddress(BitcoinNetwork.mainnet),
           unCompressedAddress);
-      expect(pub1.toBytes(whitPrefix: false), publicKeyBytes);
-      expect(pub1.toHash160(), pub1.toAddress().addressProgram);
+      expect(pub1.toBytes().sublist(1), publicKeyBytes);
+      expect(pub1.toHash160Hex(), pub1.toAddress().addressProgram);
     });
   });
 
@@ -181,7 +181,10 @@ void main() {
     final pub = priv.getPublic();
     const p2shaddress = '2NDkr9uD2MSY5em3rsjkff8fLZcJzCfY3W1';
     test('test create', () {
-      final script = Script(script: [pub.toHex(), 'OP_CHECKSIG']);
+      final script = Script(script: [
+        pub.toHex(),
+        BitcoinOpcode.opCheckSig,
+      ]);
       final addr = P2shAddress.fromScript(
           script: script, type: P2shAddressType.p2pkInP2sh);
       expect(addr.toAddress(BitcoinNetwork.testnet), p2shaddress);
@@ -221,7 +224,7 @@ void main() {
         'OP_1',
         prive.getPublic().toHex(),
         'OP_1',
-        'OP_CHECKMULTISIG'
+        BitcoinOpcode.opCheckMultiSig
       ]);
       final pw = P2wshAddress.fromScript(script: script);
       expect(pw.toAddress(BitcoinNetwork.testnet), correctP2wshAddress);
@@ -234,7 +237,7 @@ void main() {
         'OP_1',
         prive.getPublic().toHex(),
         'OP_1',
-        'OP_CHECKMULTISIG'
+        BitcoinOpcode.opCheckMultiSig
       ]);
       final pw = P2wshAddress.fromScript(script: script);
       final p2sh = P2shAddress.fromScript(
diff --git a/test/p2kh_tr_test.dart b/test/p2kh_tr_test.dart
index 208d4d1..eb45ad4 100644
--- a/test/p2kh_tr_test.dart
+++ b/test/p2kh_tr_test.dart
@@ -13,11 +13,11 @@ void main() {
     final txout = TxOutput(
         amount: BigInt.from(10000000),
         scriptPubKey: Script(script: [
-          'OP_DUP',
-          'OP_HASH160',
+          BitcoinOpcode.opDup,
+          BitcoinOpcode.opHash160,
           addr.addressProgram,
-          'OP_EQUALVERIFY',
-          'OP_CHECKSIG'
+          BitcoinOpcode.opEqualVerify,
+          BitcoinOpcode.opCheckSig,
         ]));
     final changeAddr = P2pkhAddress.fromAddress(
         address: 'mytmhndz4UbEMeoSZorXXrLpPfeoFUDzEp',
@@ -75,11 +75,11 @@ void main() {
     final sigTxout1 = TxOutput(
         amount: BigInt.from(9000000),
         scriptPubKey: Script(script: [
-          'OP_DUP',
-          'OP_HASH160',
+          BitcoinOpcode.opDup,
+          BitcoinOpcode.opHash160,
           sigToAddr1.addressProgram,
-          'OP_EQUALVERIFY',
-          'OP_CHECKSIG'
+          BitcoinOpcode.opEqualVerify,
+          BitcoinOpcode.opCheckSig,
         ]));
     final sigToAddr2 = P2pkhAddress.fromAddress(
         address: 'mmYNBho9BWQB2dSniP1NJvnPoj5EVWw89w',
@@ -87,11 +87,11 @@ void main() {
     final sigTxout2 = TxOutput(
         amount: BigInt.from(900000),
         scriptPubKey: Script(script: [
-          'OP_DUP',
-          'OP_HASH160',
+          BitcoinOpcode.opDup,
+          BitcoinOpcode.opHash160,
           sigToAddr2.addressProgram,
-          'OP_EQUALVERIFY',
-          'OP_CHECKSIG'
+          BitcoinOpcode.opEqualVerify,
+          BitcoinOpcode.opCheckSig,
         ]));
     const sigSighashSingleResult =
         '02000000010f798b60b145361aebb95cfcdedd29e6773b4b96778af33ed6f42a9e2b4c4676000000006a47304402202cfd7077fe8adfc5a65fb3953fa3482cad1413c28b53f12941c1082898d4935102201d393772c47f0699592268febb5b4f64dabe260f440d5d0f96dae5bc2b53e11e032102d82c9860e36f15d7b72aa59e29347f951277c21cd4d34822acdeeadbcff8a546ffffffff0240548900000000001976a914c3f8e5b0f8455a2b02c29c4488a550278209b66988aca0bb0d00000000001976a91442151d0c21442c2b038af0ad5ee64b9d6f4f4e4988ac00000000';
@@ -112,11 +112,11 @@ void main() {
       final digit = tx.getTransactionDigest(
           txInIndex: 0,
           script: Script(script: [
-            'OP_DUP',
-            'OP_HASH160',
+            BitcoinOpcode.opDup,
+            BitcoinOpcode.opHash160,
             fromAddr.addressProgram,
-            'OP_EQUALVERIFY',
-            'OP_CHECKSIG'
+            BitcoinOpcode.opEqualVerify,
+            BitcoinOpcode.opCheckSig,
           ]));
       final sig = sk.signInput(digit);
       txin.scriptSig = Script(script: [sig, sk.getPublic().toHex()]);
@@ -137,8 +137,8 @@ void main() {
       final digit = tx.getTransactionDigest(
           txInIndex: 0,
           script: fromAddr.toScriptPubKey(),
-          sighash: BitcoinOpCodeConst.SIGHASH_NONE);
-      final sig = sk.signInput(digit, sigHash: BitcoinOpCodeConst.SIGHASH_NONE);
+          sighash: BitcoinOpCodeConst.sighashNone);
+      final sig = sk.signInput(digit, sigHash: BitcoinOpCodeConst.sighashNone);
       txin.scriptSig = Script(script: [sig, sk.getPublic().toHex()]);
       expect(tx.serialize(), coreTxSignedLowSSignoneResult);
       expect(tx.txId(), coreTxSignedLowSSignoneTxid);
@@ -149,9 +149,9 @@ void main() {
       final digit = tx.getTransactionDigest(
           txInIndex: 0,
           script: sigFromAddr1.toScriptPubKey(),
-          sighash: BitcoinOpCodeConst.SIGHASH_SINGLE);
+          sighash: BitcoinOpCodeConst.sighashSingle);
       final sig =
-          sigSk1.signInput(digit, sigHash: BitcoinOpCodeConst.SIGHASH_SINGLE);
+          sigSk1.signInput(digit, sigHash: BitcoinOpCodeConst.sighashSingle);
       sigTxin1.scriptSig = Script(script: [sig, sigSk1.getPublic().toHex()]);
       expect(tx.serialize(), sigSighashSingleResult);
     });
@@ -161,15 +161,15 @@ void main() {
       final digit = tx.getTransactionDigest(
           txInIndex: 0,
           script: sigFromAddr1.toScriptPubKey(),
-          sighash: BitcoinOpCodeConst.SIGHASH_ALL);
+          sighash: BitcoinOpCodeConst.sighashAll);
       final sig =
-          sigSk1.signInput(digit, sigHash: BitcoinOpCodeConst.SIGHASH_ALL);
+          sigSk1.signInput(digit, sigHash: BitcoinOpCodeConst.sighashAll);
       final digit2 = tx.getTransactionDigest(
           txInIndex: 1,
           script: sigFromAddr2.toScriptPubKey(),
-          sighash: BitcoinOpCodeConst.SIGHASH_ALL);
+          sighash: BitcoinOpCodeConst.sighashAll);
       final sig2 =
-          sigSk2.signInput(digit2, sigHash: BitcoinOpCodeConst.SIGHASH_ALL);
+          sigSk2.signInput(digit2, sigHash: BitcoinOpCodeConst.sighashAll);
       sigTxin1.scriptSig = Script(script: [sig, sigSk1.getPublic().toHex()]);
       sigTxin2.scriptSig = Script(script: [sig2, sigSk2.getPublic().toHex()]);
       expect(tx.serialize(), signSighashAll2in2outResult);
@@ -180,15 +180,15 @@ void main() {
       final digit = tx.getTransactionDigest(
           txInIndex: 0,
           script: sigFromAddr1.toScriptPubKey(),
-          sighash: BitcoinOpCodeConst.SIGHASH_NONE);
+          sighash: BitcoinOpCodeConst.sighashNone);
       final sig =
-          sigSk1.signInput(digit, sigHash: BitcoinOpCodeConst.SIGHASH_NONE);
+          sigSk1.signInput(digit, sigHash: BitcoinOpCodeConst.sighashNone);
       final digit2 = tx.getTransactionDigest(
           txInIndex: 1,
           script: sigFromAddr2.toScriptPubKey(),
-          sighash: BitcoinOpCodeConst.SIGHASH_NONE);
+          sighash: BitcoinOpCodeConst.sighashNone);
       final sig2 =
-          sigSk2.signInput(digit2, sigHash: BitcoinOpCodeConst.SIGHASH_NONE);
+          sigSk2.signInput(digit2, sigHash: BitcoinOpCodeConst.sighashNone);
       sigTxin1.scriptSig = Script(script: [sig, sigSk1.getPublic().toHex()]);
       sigTxin2.scriptSig = Script(script: [sig2, sigSk2.getPublic().toHex()]);
       expect(tx.serialize(), signSighashNone2in2outResult);
@@ -199,21 +199,21 @@ void main() {
       final digit = tx.getTransactionDigest(
           txInIndex: 0,
           script: sigFromAddr1.toScriptPubKey(),
-          sighash: BitcoinOpCodeConst.SIGHASH_ALL |
-              BitcoinOpCodeConst.SIGHASH_ANYONECANPAY);
+          sighash: BitcoinOpCodeConst.sighashAll |
+              BitcoinOpCodeConst.sighashAnyoneCanPay);
 
       final sig = sigSk1.signInput(digit,
-          sigHash: BitcoinOpCodeConst.SIGHASH_ALL |
-              BitcoinOpCodeConst.SIGHASH_ANYONECANPAY);
+          sigHash: BitcoinOpCodeConst.sighashAll |
+              BitcoinOpCodeConst.sighashAnyoneCanPay);
 
       final digit2 = tx.getTransactionDigest(
           txInIndex: 1,
           script: sigFromAddr2.toScriptPubKey(),
-          sighash: BitcoinOpCodeConst.SIGHASH_SINGLE |
-              BitcoinOpCodeConst.SIGHASH_ANYONECANPAY);
+          sighash: BitcoinOpCodeConst.sighashSingle |
+              BitcoinOpCodeConst.sighashAnyoneCanPay);
       final sig2 = sigSk2.signInput(digit2,
-          sigHash: BitcoinOpCodeConst.SIGHASH_SINGLE |
-              BitcoinOpCodeConst.SIGHASH_ANYONECANPAY);
+          sigHash: BitcoinOpCodeConst.sighashSingle |
+              BitcoinOpCodeConst.sighashAnyoneCanPay);
       sigTxin1.scriptSig = Script(script: [sig, sigSk1.getPublic().toHex()]);
       sigTxin2.scriptSig = Script(script: [sig2, sigSk2.getPublic().toHex()]);
       expect(tx.serialize(), signSighashAllSingleAnyone2in2outResult);
diff --git a/test/p2sh_test.dart b/test/p2sh_test.dart
index 973ee67..122efe8 100644
--- a/test/p2sh_test.dart
+++ b/test/p2sh_test.dart
@@ -12,8 +12,10 @@ void main() {
     final p2pkSk = ECPrivate.fromWif(
         'cRvyLwCPLU88jsyj94L7iJjQX5C2f8koG4G2gevN4BeSGcEvfKe9',
         netVersion: BitcoinNetwork.testnet.wifNetVer);
-    final p2pkRedeemScript =
-        Script(script: [p2pkSk.getPublic().toHex(), 'OP_CHECKSIG']);
+    final p2pkRedeemScript = Script(script: [
+      p2pkSk.getPublic().toHex(),
+      BitcoinOpcode.opCheckSig,
+    ]);
     final txout = TxOutput(
         amount: BigInt.from(9000000),
         scriptPubKey: P2shAddress.fromScript(
@@ -36,8 +38,8 @@ void main() {
     final skCsvP2pkh = ECPrivate.fromWif(
         'cRvyLwCPLU88jsyj94L7iJjQX5C2f8koG4G2gevN4BeSGcEvfKe9',
         netVersion: BitcoinNetwork.testnet.wifNetVer);
-    final seq = Sequence(
-        seqType: BitcoinOpCodeConst.TYPE_RELATIVE_TIMELOCK, value: 200);
+    final seq =
+        Sequence(seqType: BitcoinOpCodeConst.typeRelativeTimelock, value: 200);
     final txinSeq = TxInput(
         txId:
             'f557c623e55f0affc696b742630770df2342c4aac395e0ed470923247bc51b95',
@@ -73,13 +75,13 @@ void main() {
     test('test3', () {
       final redeemScript = Script(script: [
         seq.forScript(),
-        'OP_CHECKSEQUENCEVERIFY',
-        'OP_DROP',
-        'OP_DUP',
-        'OP_HASH160',
-        skCsvP2pkh.getPublic().toHash160(),
-        'OP_EQUALVERIFY',
-        'OP_CHECKSIG'
+        BitcoinOpcode.opCheckSequenceVerify,
+        BitcoinOpcode.opDrop,
+        BitcoinOpcode.opDup,
+        BitcoinOpcode.opHash160,
+        skCsvP2pkh.getPublic().toHash160Hex(),
+        BitcoinOpcode.opEqualVerify,
+        BitcoinOpcode.opCheckSig,
       ]);
 
       final txout1 = TxOutput(
diff --git a/test/p2tr_test.dart b/test/p2tr_test.dart
index 844168c..5880a8d 100644
--- a/test/p2tr_test.dart
+++ b/test/p2tr_test.dart
@@ -1,6 +1,31 @@
 import 'package:bitcoin_base/bitcoin_base.dart';
 import 'package:test/test.dart';
 
+Map<Script, int> findAllLeafIndexes(List<dynamic> treeScripts) {
+  int index = 0; // Tracks current leaf index
+  Map<Script, int> leafIndexes = {}; // Stores script -> index mapping
+
+  void traverse(dynamic level) {
+    if (level is List) {
+      if (level.length == 1) {
+        traverse(level[0]); // Flatten single-element lists
+      } else if (level.length == 2) {
+        traverse(level[0]); // Left branch
+        traverse(level[1]); // Right branch
+      } else {
+        throw DartBitcoinPluginException(
+            "Invalid Merkle branch: A list must have at most 2 branches.");
+      }
+    } else if (level is Script) {
+      leafIndexes[level] = index; // Store script with its leaf index
+      index++; // Move to next index
+    }
+  }
+
+  traverse(treeScripts);
+  return leafIndexes;
+}
+
 void main() {
   group('TestCreateP2trWithSingleTapScript', () {
     late ECPrivate toPriv1;
@@ -35,17 +60,18 @@ void main() {
           'cSW2kQbqC9zkqagw8oTYKFTozKuZ214zd6CMTDs4V32cMfH3dgKa',
           netVersion: BitcoinNetwork.testnet.wifNetVer);
       pubkeyTrScript1 = privkeyTrScript1.getPublic();
-      trScriptP2pk1 =
-          Script(script: [pubkeyTrScript1.toXOnlyHex(), 'OP_CHECKSIG']);
+      trScriptP2pk1 = Script(script: [
+        pubkeyTrScript1.toXOnlyHex(),
+        BitcoinOpcode.opCheckSig,
+      ]);
       toTaprootScriptAddress1 =
           'tb1p0fcjs5l5xqdyvde5u7ut7sr0gzaxp4yya8mv06d2ygkeu82l65xs6k4uqr';
       fromPriv2 = ECPrivate.fromWif(
           'cT33CWKwcV8afBs5NYzeSzeSoGETtAB8izjDjMEuGqyqPoF7fbQR',
           netVersion: BitcoinNetwork.testnet.wifNetVer);
       fromPub2 = fromPriv2.getPublic();
-      fromAddress2 = fromPub2.toTaprootAddress(scripts: [
-        [trScriptP2pk1]
-      ]);
+      fromAddress2 = fromPub2.toTaprootAddress(
+          treeScript: TaprootLeaf(script: trScriptP2pk1));
       txIn2 = TxInput(
           txId:
               '3d4c9d73c4c65772e645ff26493590ae4913d9c37125b72398222a553b73fa66',
@@ -62,9 +88,8 @@ void main() {
 
     // 1-create address with single script spending path
     test('address_with_script_path', () {
-      final toAddress = toPub1.toTaprootAddress(scripts: [
-        [trScriptP2pk1]
-      ]);
+      final toAddress = toPub1.toTaprootAddress(
+          treeScript: TaprootLeaf(script: trScriptP2pk1));
 
       expect(
           toAddress.toAddress(BitcoinNetwork.testnet), toTaprootScriptAddress1);
@@ -72,25 +97,24 @@ void main() {
 
     // 2-spend taproot from key path (has single tapleaf script for spending)
     test('spend_key_path2', () {
-      var tx =
-          BtcTransaction(inputs: [txIn2], outputs: [txOut2], hasSegwit: true);
+      var tx = BtcTransaction(
+        inputs: [txIn2],
+        outputs: [txOut2],
+      );
 
-      const signHash = BitcoinOpCodeConst.TAPROOT_SIGHASH_ALL;
+      const signHash = BitcoinOpCodeConst.sighashDefault;
       final txDigit = tx.getTransactionTaprootDigset(
           txIndex: 0,
           scriptPubKeys: [scriptPubKey2],
           amounts: [BigInt.from(3500)],
           sighash: signHash);
       final signatur = fromPriv2.signTapRoot(txDigit,
-          tapScripts: [
-            [trScriptP2pk1]
-          ],
-          sighash: signHash);
+          treeScript: TaprootLeaf(script: trScriptP2pk1), sighash: signHash);
       tx = tx.copyWith(witnesses: [
         TxWitnessInput(stack: [signatur])
       ]);
       expect(tx.serialize(), signedTx2);
-      final decode = BtcTransaction.fromRaw(tx.serialize());
+      final decode = BtcTransaction.deserialize(tx.toBytes());
       expect(decode.serialize(), tx.serialize());
     });
 
@@ -99,26 +123,25 @@ void main() {
       var tx = BtcTransaction(
         outputs: [txOut2],
         inputs: [txIn2],
-        hasSegwit: true,
       );
       final digit = tx.getTransactionTaprootDigset(
         amounts: [BigInt.from(3500)],
         scriptPubKeys: [scriptPubKey2],
         txIndex: 0,
-        extFlags: 1,
-        script: trScriptP2pk1,
+        tapleafScript: TaprootLeaf(script: trScriptP2pk1),
       );
       final sig = privkeyTrScript1.signTapRoot(digit,
-          sighash: BitcoinOpCodeConst.TAPROOT_SIGHASH_ALL, tweak: false);
-      final controlBlock = ControlBlock(public: fromPub2);
+          sighash: BitcoinOpCodeConst.sighashDefault, tweak: false);
+      final controlBlock = TaprootControlBlock.generate(
+          xOnlyOrInternalPubKey: fromPub2.toXOnly(),
+          scriptTree: TaprootLeaf(script: trScriptP2pk1),
+          leafScript: TaprootLeaf(script: trScriptP2pk1));
 
       tx = tx.copyWith(witnesses: [
         TxWitnessInput(
             stack: [sig, trScriptP2pk1.toHex(), controlBlock.toHex()])
       ]);
       expect(tx.serialize(), signedTx3);
-      final decode = BtcTransaction.fromRaw(tx.serialize());
-      expect(decode.serialize(), tx.serialize());
     });
   });
 
@@ -127,24 +150,30 @@ void main() {
         'cSW2kQbqC9zkqagw8oTYKFTozKuZ214zd6CMTDs4V32cMfH3dgKa',
         netVersion: BitcoinNetwork.testnet.wifNetVer);
     late final pubkeyTrScriptA = privkeyTrScriptA.getPublic();
-    late final trScriptP2pkA =
-        Script(script: [pubkeyTrScriptA.toXOnlyHex(), 'OP_CHECKSIG']);
+    late final trScriptP2pkA = Script(script: [
+      pubkeyTrScriptA.toXOnlyHex(),
+      BitcoinOpcode.opCheckSig,
+    ]);
 
     late final privkeyTrScriptB = ECPrivate.fromWif(
         'cSv48xapaqy7fPs8VvoSnxNBNA2jpjcuURRqUENu3WVq6Eh4U3JU',
         netVersion: BitcoinNetwork.testnet.wifNetVer);
     late final pubkeyTrScriptB = privkeyTrScriptB.getPublic();
 
-    late final trScriptP2pkB =
-        Script(script: [pubkeyTrScriptB.toXOnlyHex(), 'OP_CHECKSIG']);
+    late final trScriptP2pkB = Script(script: [
+      pubkeyTrScriptB.toXOnlyHex(),
+      BitcoinOpcode.opCheckSig,
+    ]);
 
     late final fromPriv = ECPrivate.fromWif(
         'cT33CWKwcV8afBs5NYzeSzeSoGETtAB8izjDjMEuGqyqPoF7fbQR',
         netVersion: BitcoinNetwork.testnet.wifNetVer);
     late final fromPub = fromPriv.getPublic();
-    late final fromAddress = fromPub.toTaprootAddress(scripts: [
-      [trScriptP2pkA, trScriptP2pkB]
-    ]);
+    late final fromAddress = fromPub.toTaprootAddress(
+      treeScript: TaprootBranch(
+          a: TaprootLeaf(script: trScriptP2pkA),
+          b: TaprootLeaf(script: trScriptP2pkB)),
+    );
 
     late final txIn = TxInput(
         txId:
@@ -166,30 +195,45 @@ void main() {
 
     // 1-spend taproot from first script path (A) of two (A,B)
     test('test_spend_script_path_A_from_AB', () {
-      var tx =
-          BtcTransaction(inputs: [txIn], outputs: [txOut], hasSegwit: true);
+      var tx = BtcTransaction(
+        inputs: [txIn],
+        outputs: [txOut],
+      );
 
       final txDigit = tx.getTransactionTaprootDigset(
-          amounts: [BigInt.from(3500)],
-          scriptPubKeys: allUtxosScriptpubkeys,
-          txIndex: 0,
-          script: trScriptP2pkA,
-          extFlags: 1);
+        amounts: [BigInt.from(3500)],
+        scriptPubKeys: allUtxosScriptpubkeys,
+        txIndex: 0,
+        tapleafScript: TaprootLeaf(script: trScriptP2pkA),
+      );
 
       final sign = privkeyTrScriptA.signTapRoot(
         txDigit,
         tweak: false,
       );
-      final leafB = toTapleafTaggedHash(trScriptP2pkB.toBytes());
-
-      final controlBlock = ControlBlock(public: fromPub, scripts: leafB);
+      final controlBlock = TaprootControlBlock.generate(
+        xOnlyOrInternalPubKey: fromPub.toXOnly(),
+        scriptTree: TaprootBranch(
+            a: TaprootLeaf(script: trScriptP2pkA),
+            b: TaprootLeaf(script: trScriptP2pkB)),
+        leafScript: TaprootLeaf(script: trScriptP2pkA),
+        // treeScripts: [
+        //   [
+        //     TapLeafScript(script: trScriptP2pkA),
+        //     TapLeafScript(script: trScriptP2pkB)
+        //   ]
+        // ],
+        // leafScripts: [
+        //   [TapLeafScript(script: trScriptP2pkA)]
+        // ],
+      );
       tx = tx.copyWith(witnesses: [
         TxWitnessInput(
             stack: [sign, trScriptP2pkA.toHex(), controlBlock.toHex()])
       ]);
 
       expect(tx.serialize(), signedTx3);
-      final decode = BtcTransaction.fromRaw(tx.serialize());
+      final decode = BtcTransaction.deserialize(tx.toBytes());
       expect(decode.serialize(), tx.serialize());
     });
   });
@@ -200,31 +244,40 @@ void main() {
         'cSW2kQbqC9zkqagw8oTYKFTozKuZ214zd6CMTDs4V32cMfH3dgKa',
         netVersion: BitcoinNetwork.testnet.wifNetVer);
     final pubkeyTrScriptA = privkeyTrScriptA.getPublic();
-    final trScriptP2pkA =
-        Script(script: [pubkeyTrScriptA.toXOnlyHex(), 'OP_CHECKSIG']);
+    final trScriptP2pkA = Script(script: [
+      pubkeyTrScriptA.toXOnlyHex(),
+      BitcoinOpcode.opCheckSig,
+    ]);
 
     final privkeyTrScriptB = ECPrivate.fromWif(
         'cSv48xapaqy7fPs8VvoSnxNBNA2jpjcuURRqUENu3WVq6Eh4U3JU',
         netVersion: BitcoinNetwork.testnet.wifNetVer);
     final pubkeyTrScriptB = privkeyTrScriptB.getPublic();
-    final trScriptP2pkB =
-        Script(script: [pubkeyTrScriptB.toXOnlyHex(), 'OP_CHECKSIG']);
+    final trScriptP2pkB = Script(script: [
+      pubkeyTrScriptB.toXOnlyHex(),
+      BitcoinOpcode.opCheckSig,
+    ]);
 
     final privkeyTrScriptC = ECPrivate.fromWif(
         'cRkZPNnn3jdr64o3PDxNHG68eowDfuCdcyL6nVL4n3czvunuvryC',
         netVersion: BitcoinNetwork.testnet.wifNetVer);
     final pubkeyTrScriptC = privkeyTrScriptC.getPublic();
-    final trScriptP2pkC =
-        Script(script: [pubkeyTrScriptC.toXOnlyHex(), 'OP_CHECKSIG']);
+    final trScriptP2pkC = Script(script: [
+      pubkeyTrScriptC.toXOnlyHex(),
+      BitcoinOpcode.opCheckSig,
+    ]);
 
     final fromPriv = ECPrivate.fromWif(
         'cT33CWKwcV8afBs5NYzeSzeSoGETtAB8izjDjMEuGqyqPoF7fbQR',
         netVersion: BitcoinNetwork.testnet.wifNetVer);
     final fromPub = fromPriv.getPublic();
-    final fromAddress = fromPub.toTaprootAddress(scripts: [
-      [trScriptP2pkA, trScriptP2pkB],
-      [trScriptP2pkC]
-    ]);
+    final fromAddress = fromPub.toTaprootAddress(
+      treeScript: TaprootBranch(
+          a: TaprootBranch(
+              b: TaprootLeaf(script: trScriptP2pkA),
+              a: TaprootLeaf(script: trScriptP2pkB)),
+          b: TaprootLeaf(script: trScriptP2pkC)),
+    );
 
     final txIn = TxInput(
         txId:
@@ -249,27 +302,37 @@ void main() {
         '02000000000101d387dafa20087c38044f3cbc2e93e1e0141e64265d304d0d44b233f3d0018a9b0000000000ffffffff01b80b000000000000225120d4213cd57207f22a9e905302007b99b84491534729bd5f4065bdcb42ed10fcd50340644e392f5fd88d812bad30e73ff9900cdcf7f260ecbc862819542fd4683fa9879546613be4e2fc762203e45715df1a42c65497a63edce5f1dfe5caea5170273f2220e808f1396f12a253cf00efdf841e01c8376b616fb785c39595285c30f2817e71ac61c01036a7ed8d24eac9057e114f22342ebf20c16d37f0d25cfd2c900bf401ec09c9ed9f1b2b0090138e31e11a31c1aea790928b7ce89112a706e5caa703ff7e0ab928109f92c2781611bb5de791137cbd40a5482a4a23fd0ffe50ee4de9d5790dd100000000';
 
     test('test_spend_script_path_A_from_AB', () {
-      var tx =
-          BtcTransaction(inputs: [txIn], outputs: [txOut], hasSegwit: true);
+      var tx = BtcTransaction(
+        inputs: [txIn],
+        outputs: [txOut],
+      );
       final digit = tx.getTransactionTaprootDigset(
           txIndex: 0,
-          extFlags: 1,
           scriptPubKeys: allUtxosScriptPubkeys.map((e) => e).toList(),
-          script: trScriptP2pkB,
+          tapleafScript: TaprootLeaf(script: trScriptP2pkB),
           amounts: allAmounts.map((e) => e).toList());
       final sig = privkeyTrScriptB.signTapRoot(digit, tweak: false);
+      final controlBlock = TaprootControlBlock.generate(
+        xOnlyOrInternalPubKey: fromPub.toXOnly(),
+        scriptTree: TaprootBranch(
+            a: TaprootBranch(
+                a: TaprootLeaf(script: trScriptP2pkA),
+                b: TaprootLeaf(script: trScriptP2pkB)),
+            b: TaprootLeaf(script: trScriptP2pkC)),
+        leafScript: TaprootLeaf(script: trScriptP2pkB),
+        // leafScripts: [
+        //   [TapLeafScript(script: trScriptP2pkB)],
+        // ],
+      );
 
-      final leafA = toTapleafTaggedHash(trScriptP2pkA.toBytes());
-      final leafC = toTapleafTaggedHash(trScriptP2pkC.toBytes());
-      final controlBlock = ControlBlock(
-          public: fromPub, scripts: List<int>.from([...leafA, ...leafC]));
       tx = tx.copyWith(witnesses: [
         TxWitnessInput(
             stack: [sig, trScriptP2pkB.toHex(), controlBlock.toHex()])
       ]);
       expect(tx.serialize(), signedTx);
-      final decode = BtcTransaction.fromRaw(tx.serialize());
+      final decode = BtcTransaction.deserialize(tx.toBytes());
       expect(decode.serialize(), tx.serialize());
     });
   });
+  return;
 }
diff --git a/test/p2wpkh_test.dart b/test/p2wpkh_test.dart
index df0fe36..be0aad8 100644
--- a/test/p2wpkh_test.dart
+++ b/test/p2wpkh_test.dart
@@ -27,11 +27,11 @@ void main() {
     final txout2 = TxOutput(
         amount: BigInt.from(980000), scriptPubKey: p2pkhAddr.toScriptPubKey());
     final p2pkhRedeemScript = Script(script: [
-      'OP_DUP',
-      'OP_HASH160',
+      BitcoinOpcode.opDup,
+      BitcoinOpcode.opHash160,
       p2pkhAddr.addressProgram,
-      'OP_EQUALVERIFY',
-      'OP_CHECKSIG'
+      BitcoinOpcode.opEqualVerify,
+      BitcoinOpcode.opCheckSig,
     ]);
 
     final txinSpendP2pkh = TxInput(
@@ -140,8 +140,7 @@ void main() {
       expect(tx.serialize(), createSendToP2wpkhResult);
     });
     test('test_spend_p2wpkh', () {
-      var tx = BtcTransaction(
-          inputs: [txinSpend], outputs: [txout2], hasSegwit: true);
+      var tx = BtcTransaction(inputs: [txinSpend], outputs: [txout2]);
       final digit = tx.getTransactionSegwitDigit(
           txInIndex: 0, script: p2pkhRedeemScript, amount: txinSpendAmount);
       final sig = sk.signInput(digit);
@@ -152,9 +151,9 @@ void main() {
     });
     test('test_p2pkh_and_p2wpkh_to_p2pkh', () {
       var tx = BtcTransaction(
-          inputs: [txinSpendP2pkh, txinSpendP2wpkh],
-          outputs: [txout3],
-          hasSegwit: true);
+        inputs: [txinSpendP2pkh, txinSpendP2wpkh],
+        outputs: [txout3],
+      );
       final digit = tx.getTransactionDigest(
           txInIndex: 0, script: p2pkhAddr.toScriptPubKey());
       final sig = sk.signInput(digit);
@@ -171,14 +170,13 @@ void main() {
       expect(tx.serialize(), p2pkhAndP2wpkhToP2pkhResult);
     });
     test('test_signone_send', () {
-      var tx = BtcTransaction(
-          inputs: [txin1Signone], outputs: [txout1Signone], hasSegwit: true);
+      var tx = BtcTransaction(inputs: [txin1Signone], outputs: [txout1Signone]);
       final digit = tx.getTransactionSegwitDigit(
           txInIndex: 0,
           script: p2pkhRedeemScript,
           amount: txin1SignoneAmount,
-          sighash: BitcoinOpCodeConst.SIGHASH_NONE);
-      final sig = sk.signInput(digit, sigHash: BitcoinOpCodeConst.SIGHASH_NONE);
+          sighash: BitcoinOpCodeConst.sighashNone);
+      final sig = sk.signInput(digit, sigHash: BitcoinOpCodeConst.sighashNone);
       tx = tx.copyWith(witnesses: [
         TxWitnessInput(stack: [sig, sk.getPublic().toHex()])
       ]);
@@ -188,16 +186,16 @@ void main() {
     });
     test('test_sigsingle_send', () {
       var tx = BtcTransaction(
-          inputs: [txin1Sigsingle],
-          outputs: [txout1Sigsingle],
-          hasSegwit: true);
+        inputs: [txin1Sigsingle],
+        outputs: [txout1Sigsingle],
+      );
       final digit = tx.getTransactionSegwitDigit(
           txInIndex: 0,
           script: p2pkhRedeemScript,
           amount: txin1SigsingleAmount,
-          sighash: BitcoinOpCodeConst.SIGHASH_SINGLE);
+          sighash: BitcoinOpCodeConst.sighashSingle);
       final sig =
-          sk.signInput(digit, sigHash: BitcoinOpCodeConst.SIGHASH_SINGLE);
+          sk.signInput(digit, sigHash: BitcoinOpCodeConst.sighashSingle);
       tx = tx.copyWith(witnesses: [
         TxWitnessInput(stack: [sig, sk.getPublic().toHex()])
       ]);
@@ -207,27 +205,26 @@ void main() {
     });
     test('test_siganyonecanpay_all_send', () {
       var tx = BtcTransaction(
-          inputs: [txin1SiganyonecanpayAll],
-          outputs: [txout1SiganyonecanpayAll, txout2SiganyonecanpayAll],
-          hasSegwit: true);
+        inputs: [txin1SiganyonecanpayAll],
+        outputs: [txout1SiganyonecanpayAll, txout2SiganyonecanpayAll],
+      );
       final digit = tx.getTransactionSegwitDigit(
           txInIndex: 0,
           script: p2pkhRedeemScript,
           amount: txin1SiganyonecanpayAllAmount,
-          sighash: BitcoinOpCodeConst.SIGHASH_ALL |
-              BitcoinOpCodeConst.SIGHASH_ANYONECANPAY);
+          sighash: BitcoinOpCodeConst.sighashAll |
+              BitcoinOpCodeConst.sighashAnyoneCanPay);
       final sig = sk.signInput(digit,
-          sigHash: BitcoinOpCodeConst.SIGHASH_ALL |
-              BitcoinOpCodeConst.SIGHASH_ANYONECANPAY);
+          sigHash: BitcoinOpCodeConst.sighashAll |
+              BitcoinOpCodeConst.sighashAnyoneCanPay);
 
       tx = tx.copyWith(inputs: [...tx.inputs, txin2SiganyonecanpayAll]);
       final digit2 = tx.getTransactionSegwitDigit(
           txInIndex: 1,
           script: p2pkhRedeemScript,
           amount: txin2SiganyonecanpayAllAmount,
-          sighash: BitcoinOpCodeConst.SIGHASH_ALL);
-      final sig2 =
-          sk.signInput(digit2, sigHash: BitcoinOpCodeConst.SIGHASH_ALL);
+          sighash: BitcoinOpCodeConst.sighashAll);
+      final sig2 = sk.signInput(digit2, sigHash: BitcoinOpCodeConst.sighashAll);
       tx = tx.copyWith(witnesses: [
         TxWitnessInput(stack: [sig, sk.getPublic().toHex()]),
         TxWitnessInput(stack: [sig2, sk.getPublic().toHex()])
@@ -238,56 +235,55 @@ void main() {
 
     test('test_siganyonecanpay_none_send', () {
       var tx = BtcTransaction(
-          inputs: [txin1SiganyonecanpayNone],
-          outputs: [txout1SiganyonecanpayNone],
-          hasSegwit: true);
+        inputs: [txin1SiganyonecanpayNone],
+        outputs: [txout1SiganyonecanpayNone],
+      );
       final digit = tx.getTransactionSegwitDigit(
           txInIndex: 0,
           script: p2pkhRedeemScript,
           amount: txin1SiganyonecanpayNoneAmount,
-          sighash: BitcoinOpCodeConst.SIGHASH_NONE |
-              BitcoinOpCodeConst.SIGHASH_ANYONECANPAY);
+          sighash: BitcoinOpCodeConst.sighashNone |
+              BitcoinOpCodeConst.sighashAnyoneCanPay);
       final sig = sk.signInput(digit,
-          sigHash: BitcoinOpCodeConst.SIGHASH_NONE |
-              BitcoinOpCodeConst.SIGHASH_ANYONECANPAY);
+          sigHash: BitcoinOpCodeConst.sighashNone |
+              BitcoinOpCodeConst.sighashAnyoneCanPay);
       tx = tx.copyWith(inputs: [...tx.inputs, txin2SiganyonecanpayNone]);
       tx = tx.copyWith(outputs: [...tx.outputs, txout2SiganyonecanpayNone]);
       final digit2 = tx.getTransactionSegwitDigit(
           txInIndex: 1,
           script: p2pkhRedeemScript,
           amount: txin2SiganyonecanpayNoneAmount,
-          sighash: BitcoinOpCodeConst.SIGHASH_ALL);
-      final sig2 =
-          sk.signInput(digit2, sigHash: BitcoinOpCodeConst.SIGHASH_ALL);
+          sighash: BitcoinOpCodeConst.sighashAll);
+      final sig2 = sk.signInput(digit2, sigHash: BitcoinOpCodeConst.sighashAll);
       tx = tx.copyWith(witnesses: [
         TxWitnessInput(stack: [sig, sk.getPublic().toHex()]),
         TxWitnessInput(stack: [sig2, sk.getPublic().toHex()])
       ]);
       expect(tx.serialize(), testSiganyonecanpayNoneSendResult);
-      final fromRaw = BtcTransaction.fromRaw(tx.serialize());
-      expect(fromRaw.serialize(), tx.serialize());
+      final deserialize = BtcTransaction.deserialize(tx.toBytes());
+      expect(deserialize.serialize(), tx.serialize());
     });
     test('test_siganyonecanpay_single_send', () {
       var tx = BtcTransaction(
-          inputs: [txin1SiganyonecanpaySingle],
-          outputs: [txout1SiganyonecanpaySingle],
-          hasSegwit: true);
+        inputs: [txin1SiganyonecanpaySingle],
+        outputs: [txout1SiganyonecanpaySingle],
+      );
       final digit = tx.getTransactionSegwitDigit(
           txInIndex: 0,
           script: p2pkhRedeemScript,
           amount: txin1SiganyonecanpaySingleAmount,
-          sighash: BitcoinOpCodeConst.SIGHASH_SINGLE |
-              BitcoinOpCodeConst.SIGHASH_ANYONECANPAY);
+          sighash: BitcoinOpCodeConst.sighashSingle |
+              BitcoinOpCodeConst.sighashAnyoneCanPay);
       final sig = sk.signInput(digit,
-          sigHash: BitcoinOpCodeConst.SIGHASH_SINGLE |
-              BitcoinOpCodeConst.SIGHASH_ANYONECANPAY);
+          sigHash: BitcoinOpCodeConst.sighashSingle |
+              BitcoinOpCodeConst.sighashAnyoneCanPay);
       tx = tx.copyWith(witnesses: [
         TxWitnessInput(stack: [sig, sk.getPublic().toHex()])
       ]);
       tx = tx.copyWith(outputs: [...tx.outputs, txout2SiganyonecanpaySingle]);
       expect(tx.serialize(), testSiganyonecanpaySingleSendResult);
-      final fromRaw = BtcTransaction.fromRaw(tx.serialize());
-      expect(fromRaw.serialize(), tx.serialize());
+      final deserialize = BtcTransaction.deserialize(tx.toBytes());
+      expect(deserialize.serialize(), tx.serialize());
     });
   });
 }
diff --git a/test/p2wsh_test.dart b/test/p2wsh_test.dart
index d13b753..27229e5 100644
--- a/test/p2wsh_test.dart
+++ b/test/p2wsh_test.dart
@@ -11,11 +11,11 @@ void main() {
         netVersion: BitcoinNetwork.testnet.wifNetVer);
 
     final p2wshScript = Script(script: [
-      'OP_2',
+      BitcoinOpcode.op2,
       sk1.getPublic().toHex(),
       sk2.getPublic().toHex(),
-      'OP_2',
-      'OP_CHECKMULTISIG'
+      BitcoinOpcode.op2,
+      BitcoinOpcode.opCheckMultiSig
     ]);
 
     final p2wshAddr = P2wshAddress.fromScript(script: p2wshScript);
@@ -79,7 +79,9 @@ void main() {
     });
     test('test2', () {
       var tx = BtcTransaction(
-          inputs: [txinSpend], outputs: [txout2], hasSegwit: true);
+        inputs: [txinSpend],
+        outputs: [txout2],
+      );
       final digit1 = tx.getTransactionSegwitDigit(
           txInIndex: 0, script: p2wshRedeemScript, amount: txinSpendAmount);
       final sig1 = sk1.signInput(digit1);
@@ -93,9 +95,9 @@ void main() {
     });
     test('test3', () {
       var tx = BtcTransaction(
-          inputs: [txin1Multiple, txin2Multiple, txin3Multiple],
-          outputs: [output1Multiple, output2Multiple, output3Multiple],
-          hasSegwit: true);
+        inputs: [txin1Multiple, txin2Multiple, txin3Multiple],
+        outputs: [output1Multiple, output2Multiple, output3Multiple],
+      );
       final digit1 = tx.getTransactionDigest(
           txInIndex: 0, script: p2pkhAddr.toScriptPubKey());
       final sig1 = sk1.signInput(digit1);
diff --git a/test/psbt/bip_0174_test.dart b/test/psbt/bip_0174_test.dart
new file mode 100644
index 0000000..4acf124
--- /dev/null
+++ b/test/psbt/bip_0174_test.dart
@@ -0,0 +1,280 @@
+import 'package:bitcoin_base/bitcoin_base.dart';
+import 'package:blockchain_utils/utils/binary/utils.dart';
+import 'package:test/test.dart';
+
+/// https://github.com/bitcoin/bips/blob/master/bip-0174.mediawiki
+void main() {
+  group("BIP-174", () {
+    _invalidTest();
+    _test();
+  });
+}
+
+void _invalidTest() {
+  test(
+      "Case: PSBT with unsigned tx serialized with witness serialization format",
+      () {
+    const psbtData =
+        "70736274ff01007802000000000101268171371edff285e937adeea4b37b78000c0566cbb3ad64641713ca42171bf60000000000feffffff02d3dff505000000001976a914d0c59903c5bac2868760e90fd521a4665aa7652088ac00e1f5050000000017a9143545e6e33b832c47050f24d3eeb93c9c03948bc78700b32e1300000100fda5010100000000010289a3c71eab4d20e0371bbba4cc698fa295c9463afa2e397f8533ccb62f9567e50100000017160014be18d152a9b012039daf3da7de4f53349eecb985ffffffff86f8aa43a71dff1448893a530a7237ef6b4608bbb2dd2d0171e63aec6a4890b40100000017160014fe3e9ef1a745e974d902c4355943abcb34bd5353ffffffff0200c2eb0b000000001976a91485cff1097fd9e008bb34af709c62197b38978a4888ac72fef84e2c00000017a914339725ba21efd62ac753a9bcd067d6c7a6a39d05870247304402202712be22e0270f394f568311dc7ca9a68970b8025fdd3b240229f07f8a5f3a240220018b38d7dcd314e734c9276bd6fb40f673325bc4baa144c800d2f2f02db2765c012103d2e15674941bad4a996372cb87e1856d3652606d98562fe39c5e9e7e413f210502483045022100d12b852d85dcd961d2f5f4ab660654df6eedcc794c0c33ce5cc309ffb5fce58d022067338a8e0e1725c197fb1a88af59f51e44e4255b20167c8684031c05d1f2592a01210223b72beef0965d10be0778efecd61fcac6f79a4ea169393380734464f84f2ab300000000000000";
+    expect(
+        () => Psbt.fromHex(psbtData),
+        throwsA(isA<DartBitcoinPluginException>().having(
+            (p) => p.message,
+            'error message',
+            contains('Invalid PSBT Unsigned Transaction data.'))));
+  });
+  test("Case: PSBT with invalid output witnessScript typed key", () {
+    const psbtData =
+        "70736274ff0100730200000001301ae986e516a1ec8ac5b4bc6573d32f83b465e23ad76167d68b38e730b4dbdb0000000000ffffffff02747b01000000000017a91403aa17ae882b5d0d54b25d63104e4ffece7b9ea2876043993b0000000017a914b921b1ba6f722e4bfa83b6557a3139986a42ec8387000000000001011f00ca9a3b00000000160014d2d94b64ae08587eefc8eeb187c601e939f9037c00010016001462e9e982fff34dd8239610316b090cd2a3b747cb000100220020876bad832f1d168015ed41232a9ea65a1815d9ef13c0ef8759f64b5b2b278a6521010025512103b7ce23a01c5b4bf00a642537cdfabb315b668332867478ef51309d06d57f8a8751ae00";
+    expect(
+        () => Psbt.fromHex(psbtData),
+        throwsA(isA<DartBitcoinPluginException>().having(
+            (p) => p.message,
+            'error message',
+            contains('Invalid PSBT Witness Script key data.'))));
+  });
+  test("Case: PSBT with invalid output redeemScript typed key", () {
+    const psbtData =
+        "70736274ff0100730200000001301ae986e516a1ec8ac5b4bc6573d32f83b465e23ad76167d68b38e730b4dbdb0000000000ffffffff02747b01000000000017a91403aa17ae882b5d0d54b25d63104e4ffece7b9ea2876043993b0000000017a914b921b1ba6f722e4bfa83b6557a3139986a42ec8387000000000001011f00ca9a3b00000000160014d2d94b64ae08587eefc8eeb187c601e939f9037c0002000016001462e9e982fff34dd8239610316b090cd2a3b747cb000100220020876bad832f1d168015ed41232a9ea65a1815d9ef13c0ef8759f64b5b2b278a65010125512103b7ce23a01c5b4bf00a642537cdfabb315b668332867478ef51309d2bd57f8a8751ae00";
+    expect(
+        () => Psbt.fromHex(psbtData),
+        throwsA(isA<DartBitcoinPluginException>().having(
+            (p) => p.message,
+            'error message',
+            contains('Invalid PSBT Redeem Script key data.'))));
+  });
+  test("Case: PSBT with invalid input sighash type typed key", () {
+    const psbtData =
+        "70736274ff0100730200000001301ae986e516a1ec8ac5b4bc6573d32f83b465e23ad76167d68b38e730b4dbdb0000000000ffffffff02747b01000000000017a91403aa17ae882b5d0d54b25d63104e4ffece7b9ea2876043993b0000000017a914b921b1ba6f722e4bfa83b6557a3139986a42ec8387000000000001011f00ca9a3b00000000160014d2d94b64ae08587eefc8eeb187c601e939f9037c0203000100000000010016001462e9e982fff34dd8239610316b090cd2a3b747cb000100220020876bad832f1d168015ed41232a9ea65a1815d9ef13c0ef8759f64b5b2b278a65010125512103b7ce23a01c5b4bf00a642537cdfabb315b668332867478ef51309d2bd57f8a8751ae00";
+    expect(
+        () => Psbt.fromHex(psbtData),
+        throwsA(isA<DartBitcoinPluginException>().having((p) => p.message,
+            'error message', contains('Invalid PSBT sighash type key data.'))));
+  });
+  test(
+      "Case: PSBT with invalid pubkey in output BIP 32 derivation paths typed key",
+      () {
+    const psbtData =
+        "70736274ff01009a020000000258e87a21b56daf0c23be8e7070456c336f7cbaa5c8757924f545887bb2abdd750000000000ffffffff838d0427d0ec650a68aa46bb0b098aea4422c071b2ca78352a077959d07cea1d0100000000ffffffff0270aaf00800000000160014d85c2b71d0060b09c9886aeb815e50991dda124d00e1f5050000000016001400aea9a2e5f0f876a588df5546e8742d1d87008f00000000000100bb0200000001aad73931018bd25f84ae400b68848be09db706eac2ac18298babee71ab656f8b0000000048473044022058f6fc7c6a33e1b31548d481c826c015bd30135aad42cd67790dab66d2ad243b02204a1ced2604c6735b6393e5b41691dd78b00f0c5942fb9f751856faa938157dba01feffffff0280f0fa020000000017a9140fb9463421696b82c833af241c78c17ddbde493487d0f20a270100000017a91429ca74f8a08f81999428185c97b5d852e4063f6187650000000107da00473044022074018ad4180097b873323c0015720b3684cc8123891048e7dbcd9b55ad679c99022073d369b740e3eb53dcefa33823c8070514ca55a7dd9544f157c167913261118c01483045022100f61038b308dc1da865a34852746f015772934208c6d24454393cd99bdf2217770220056e675a675a6d0a02b85b14e5e29074d8a25a9b5760bea2816f661910a006ea01475221029583bf39ae0a609747ad199addd634fa6108559d6c5cd39b4c2183f1ab96e07f2102dab61ff49a14db6a7d02b0cd1fbb78fc4b18312b5b4e54dae4dba2fbfef536d752ae0001012000c2eb0b0000000017a914b7f5faf40e3d40a5a459b1db3535f2b72fa921e8870107232200208c2353173743b595dfb4a07b72ba8e42e3797da74e87fe7d9d7497e3b20289030108da0400473044022062eb7a556107a7c73f45ac4ab5a1dddf6f7075fb1275969a7f383efff784bcb202200c05dbb7470dbf2f08557dd356c7325c1ed30913e996cd3840945db12228da5f01473044022065f45ba5998b59a27ffe1a7bed016af1f1f90d54b3aa8f7450aa5f56a25103bd02207f724703ad1edb96680b284b56d4ffcb88f7fb759eabbe08aa30f29b851383d20147522103089dc10c7ac6db54f91329af617333db388cead0c231f723379d1b99030b02dc21023add904f3d6dcf59ddb906b0dee23529b7ffb9ed50e5e86151926860221f0e7352ae00210203a9a4c37f5996d3aa25dbac6b570af0650394492942460b354753ed9eeca58710d90c6a4f000000800000008004000080002202027f6399757d2eff55a136ad02c684b1838b6556e5f1b6b34282a94b6b5005109610d90c6a4f00000080000000800500008000";
+    expect(
+        () => Psbt.fromHex(psbtData),
+        throwsA(isA<DartBitcoinPluginException>().having(
+            (p) => p.message,
+            'error message',
+            contains('Invalid PSBT bip32 derivation public key'))));
+  });
+  test("Case: PSBT with invalid final script witness typed key", () {
+    const psbtData =
+        "70736274ff01009a020000000258e87a21b56daf0c23be8e7070456c336f7cbaa5c8757924f545887bb2abdd750000000000ffffffff838d0427d0ec650a68aa46bb0b098aea4422c071b2ca78352a077959d07cea1d0100000000ffffffff0270aaf00800000000160014d85c2b71d0060b09c9886aeb815e50991dda124d00e1f5050000000016001400aea9a2e5f0f876a588df5546e8742d1d87008f00000000000100bb0200000001aad73931018bd25f84ae400b68848be09db706eac2ac18298babee71ab656f8b0000000048473044022058f6fc7c6a33e1b31548d481c826c015bd30135aad42cd67790dab66d2ad243b02204a1ced2604c6735b6393e5b41691dd78b00f0c5942fb9f751856faa938157dba01feffffff0280f0fa020000000017a9140fb9463421696b82c833af241c78c17ddbde493487d0f20a270100000017a91429ca74f8a08f81999428185c97b5d852e4063f6187650000000107da00473044022074018ad4180097b873323c0015720b3684cc8123891048e7dbcd9b55ad679c99022073d369b740e3eb53dcefa33823c8070514ca55a7dd9544f157c167913261118c01483045022100f61038b308dc1da865a34852746f015772934208c6d24454393cd99bdf2217770220056e675a675a6d0a02b85b14e5e29074d8a25a9b5760bea2816f661910a006ea01475221029583bf39ae0a609747ad199addd634fa6108559d6c5cd39b4c2183f1ab96e07f2102dab61ff49a14db6a7d02b0cd1fbb78fc4b18312b5b4e54dae4dba2fbfef536d752ae0001012000c2eb0b0000000017a914b7f5faf40e3d40a5a459b1db3535f2b72fa921e8870107232200208c2353173743b595dfb4a07b72ba8e42e3797da74e87fe7d9d7497e3b2028903020800da0400473044022062eb7a556107a7c73f45ac4ab5a1dddf6f7075fb1275969a7f383efff784bcb202200c05dbb7470dbf2f08557dd356c7325c1ed30913e996cd3840945db12228da5f01473044022065f45ba5998b59a27ffe1a7bed016af1f1f90d54b3aa8f7450aa5f56a25103bd02207f724703ad1edb96680b284b56d4ffcb88f7fb759eabbe08aa30f29b851383d20147522103089dc10c7ac6db54f91329af617333db388cead0c231f723379d1b99030b02dc21023add904f3d6dcf59ddb906b0dee23529b7ffb9ed50e5e86151926860221f0e7352ae00220203a9a4c37f5996d3aa25dbac6b570af0650394492942460b354753ed9eeca5877110d90c6a4f000000800000008004000080002202027f6399757d2eff55a136ad02c684b1838b6556e5f1b6b34282a94b6b5005109610d90c6a4f00000080000000800500008000";
+    expect(
+        () => Psbt.fromHex(psbtData),
+        throwsA(isA<DartBitcoinPluginException>().having(
+            (p) => p.message,
+            'error message',
+            contains('Invalid PSBT Finalized scriptWitness key data'))));
+  });
+  test("Case: PSBT with invalid final scriptsig typed key", () {
+    const psbtData =
+        "70736274ff01009a020000000258e87a21b56daf0c23be8e7070456c336f7cbaa5c8757924f545887bb2abdd750000000000ffffffff838d0427d0ec650a68aa46bb0b098aea4422c071b2ca78352a077959d07cea1d0100000000ffffffff0270aaf00800000000160014d85c2b71d0060b09c9886aeb815e50991dda124d00e1f5050000000016001400aea9a2e5f0f876a588df5546e8742d1d87008f00000000000100bb0200000001aad73931018bd25f84ae400b68848be09db706eac2ac18298babee71ab656f8b0000000048473044022058f6fc7c6a33e1b31548d481c826c015bd30135aad42cd67790dab66d2ad243b02204a1ced2604c6735b6393e5b41691dd78b00f0c5942fb9f751856faa938157dba01feffffff0280f0fa020000000017a9140fb9463421696b82c833af241c78c17ddbde493487d0f20a270100000017a91429ca74f8a08f81999428185c97b5d852e4063f618765000000020700da00473044022074018ad4180097b873323c0015720b3684cc8123891048e7dbcd9b55ad679c99022073d369b740e3eb53dcefa33823c8070514ca55a7dd9544f157c167913261118c01483045022100f61038b308dc1da865a34852746f015772934208c6d24454393cd99bdf2217770220056e675a675a6d0a02b85b14e5e29074d8a25a9b5760bea2816f661910a006ea01475221029583bf39ae0a609747ad199addd634fa6108559d6c5cd39b4c2183f1ab96e07f2102dab61ff49a14db6a7d02b0cd1fbb78fc4b18312b5b4e54dae4dba2fbfef536d752ae0001012000c2eb0b0000000017a914b7f5faf40e3d40a5a459b1db3535f2b72fa921e8870107232200208c2353173743b595dfb4a07b72ba8e42e3797da74e87fe7d9d7497e3b20289030108da0400473044022062eb7a556107a7c73f45ac4ab5a1dddf6f7075fb1275969a7f383efff784bcb202200c05dbb7470dbf2f08557dd356c7325c1ed30913e996cd3840945db12228da5f01473044022065f45ba5998b59a27ffe1a7bed016af1f1f90d54b3aa8f7450aa5f56a25103bd02207f724703ad1edb96680b284b56d4ffcb88f7fb759eabbe08aa30f29b851383d20147522103089dc10c7ac6db54f91329af617333db388cead0c231f723379d1b99030b02dc21023add904f3d6dcf59ddb906b0dee23529b7ffb9ed50e5e86151926860221f0e7352ae00220203a9a4c37f5996d3aa25dbac6b570af0650394492942460b354753ed9eeca5877110d90c6a4f000000800000008004000080002202027f6399757d2eff55a136ad02c684b1838b6556e5f1b6b34282a94b6b5005109610d90c6a4f00000080000000800500008000";
+    expect(
+        () => Psbt.fromHex(psbtData),
+        throwsA(isA<DartBitcoinPluginException>().having(
+            (p) => p.message,
+            'error message',
+            contains('Invalid PSBT Finalized scriptSig key data'))));
+  });
+  test("Case: PSBT with invalid non-witness utxo typed key", () {
+    const psbtData =
+        "70736274ff01009a020000000258e87a21b56daf0c23be8e7070456c336f7cbaa5c8757924f545887bb2abdd750000000000ffffffff838d0427d0ec650a68aa46bb0b098aea4422c071b2ca78352a077959d07cea1d0100000000ffffffff0270aaf00800000000160014d85c2b71d0060b09c9886aeb815e50991dda124d00e1f5050000000016001400aea9a2e5f0f876a588df5546e8742d1d87008f0000000000020000bb0200000001aad73931018bd25f84ae400b68848be09db706eac2ac18298babee71ab656f8b0000000048473044022058f6fc7c6a33e1b31548d481c826c015bd30135aad42cd67790dab66d2ad243b02204a1ced2604c6735b6393e5b41691dd78b00f0c5942fb9f751856faa938157dba01feffffff0280f0fa020000000017a9140fb9463421696b82c833af241c78c17ddbde493487d0f20a270100000017a91429ca74f8a08f81999428185c97b5d852e4063f6187650000000107da00473044022074018ad4180097b873323c0015720b3684cc8123891048e7dbcd9b55ad679c99022073d369b740e3eb53dcefa33823c8070514ca55a7dd9544f157c167913261118c01483045022100f61038b308dc1da865a34852746f015772934208c6d24454393cd99bdf2217770220056e675a675a6d0a02b85b14e5e29074d8a25a9b5760bea2816f661910a006ea01475221029583bf39ae0a609747ad199addd634fa6108559d6c5cd39b4c2183f1ab96e07f2102dab61ff49a14db6a7d02b0cd1fbb78fc4b18312b5b4e54dae4dba2fbfef536d752ae0001012000c2eb0b0000000017a914b7f5faf40e3d40a5a459b1db3535f2b72fa921e8870107232200208c2353173743b595dfb4a07b72ba8e42e3797da74e87fe7d9d7497e3b20289030108da0400473044022062eb7a556107a7c73f45ac4ab5a1dddf6f7075fb1275969a7f383efff784bcb202200c05dbb7470dbf2f08557dd356c7325c1ed30913e996cd3840945db12228da5f01473044022065f45ba5998b59a27ffe1a7bed016af1f1f90d54b3aa8f7450aa5f56a25103bd02207f724703ad1edb96680b284b56d4ffcb88f7fb759eabbe08aa30f29b851383d20147522103089dc10c7ac6db54f91329af617333db388cead0c231f723379d1b99030b02dc21023add904f3d6dcf59ddb906b0dee23529b7ffb9ed50e5e86151926860221f0e7352ae00220203a9a4c37f5996d3aa25dbac6b570af0650394492942460b354753ed9eeca5877110d90c6a4f000000800000008004000080002202027f6399757d2eff55a136ad02c684b1838b6556e5f1b6b34282a94b6b5005109610d90c6a4f00000080000000800500008000";
+    expect(
+        () => Psbt.fromHex(psbtData),
+        throwsA(isA<DartBitcoinPluginException>().having(
+            (p) => p.message,
+            'error message',
+            contains('Invalid PSBT Non-Witness UTXO key data'))));
+  });
+  test(
+      "Case: PSBT with invalid pubkey in input BIP 32 derivation paths typed key",
+      () {
+    const psbtData =
+        "70736274ff0100550200000001279a2323a5dfb51fc45f220fa58b0fc13e1e3342792a85d7e36cd6333b5cbc390000000000ffffffff01a05aea0b000000001976a914ffe9c0061097cc3b636f2cb0460fa4fc427d2b4588ac0000000000010120955eea0b0000000017a9146345200f68d189e1adc0df1c4d16ea8f14c0dbeb87220203b1341ccba7683b6af4f1238cd6e97e7167d569fac47f1e48d47541844355bd4646304302200424b58effaaa694e1559ea5c93bbfd4a89064224055cdf070b6771469442d07021f5c8eb0fea6516d60b8acb33ad64ede60e8785bfb3aa94b99bdf86151db9a9a010104220020771fd18ad459666dd49f3d564e3dbc42f4c84774e360ada16816a8ed488d5681010547522103b1341ccba7683b6af4f1238cd6e97e7167d569fac47f1e48d47541844355bd462103de55d1e1dac805e3f8a58c1fbf9b94c02f3dbaafe127fefca4995f26f82083bd52ae210603b1341ccba7683b6af4f1238cd6e97e7167d569fac47f1e48d47541844355bd10b4a6ba67000000800000008004000080220603de55d1e1dac805e3f8a58c1fbf9b94c02f3dbaafe127fefca4995f26f82083bd10b4a6ba670000008000000080050000800000";
+    expect(
+        () => Psbt.fromHex(psbtData),
+        throwsA(isA<DartBitcoinPluginException>().having(
+            (p) => p.message,
+            'error message',
+            contains('Invalid BIP 32 Derivation Path indexes'))));
+  });
+  test("Case: PSBT with invalid witnessscript typed key", () {
+    const psbtData =
+        "70736274ff0100550200000001279a2323a5dfb51fc45f220fa58b0fc13e1e3342792a85d7e36cd6333b5cbc390000000000ffffffff01a05aea0b000000001976a914ffe9c0061097cc3b636f2cb0460fa4fc427d2b4588ac0000000000010120955eea0b0000000017a9146345200f68d189e1adc0df1c4d16ea8f14c0dbeb87220203b1341ccba7683b6af4f1238cd6e97e7167d569fac47f1e48d47541844355bd4646304302200424b58effaaa694e1559ea5c93bbfd4a89064224055cdf070b6771469442d07021f5c8eb0fea6516d60b8acb33ad64ede60e8785bfb3aa94b99bdf86151db9a9a010104220020771fd18ad459666dd49f3d564e3dbc42f4c84774e360ada16816a8ed488d568102050047522103b1341ccba7683b6af4f1238cd6e97e7167d569fac47f1e48d47541844355bd462103de55d1e1dac805e3f8a58c1fbf9b94c02f3dbaafe127fefca4995f26f82083bd52ae220603b1341ccba7683b6af4f1238cd6e97e7167d569fac47f1e48d47541844355bd4610b4a6ba67000000800000008004000080220603de55d1e1dac805e3f8a58c1fbf9b94c02f3dbaafe127fefca4995f26f82083bd10b4a6ba670000008000000080050000800000";
+    expect(
+        () => Psbt.fromHex(psbtData),
+        throwsA(isA<DartBitcoinPluginException>().having(
+            (p) => p.message,
+            'error message',
+            contains('Invalid PSBT Witness Script key data'))));
+  });
+  test("Case: PSBT with invalid redeemscript typed key", () {
+    const psbtData =
+        "70736274ff0100550200000001279a2323a5dfb51fc45f220fa58b0fc13e1e3342792a85d7e36cd6333b5cbc390000000000ffffffff01a05aea0b000000001976a914ffe9c0061097cc3b636f2cb0460fa4fc427d2b4588ac0000000000010120955eea0b0000000017a9146345200f68d189e1adc0df1c4d16ea8f14c0dbeb87220203b1341ccba7683b6af4f1238cd6e97e7167d569fac47f1e48d47541844355bd4646304302200424b58effaaa694e1559ea5c93bbfd4a89064224055cdf070b6771469442d07021f5c8eb0fea6516d60b8acb33ad64ede60e8785bfb3aa94b99bdf86151db9a9a01020400220020771fd18ad459666dd49f3d564e3dbc42f4c84774e360ada16816a8ed488d5681010547522103b1341ccba7683b6af4f1238cd6e97e7167d569fac47f1e48d47541844355bd462103de55d1e1dac805e3f8a58c1fbf9b94c02f3dbaafe127fefca4995f26f82083bd52ae220603b1341ccba7683b6af4f1238cd6e97e7167d569fac47f1e48d47541844355bd4610b4a6ba67000000800000008004000080220603de55d1e1dac805e3f8a58c1fbf9b94c02f3dbaafe127fefca4995f26f82083bd10b4a6ba670000008000000080050000800000";
+    expect(
+        () => Psbt.fromHex(psbtData),
+        throwsA(isA<DartBitcoinPluginException>().having((p) => p.message,
+            'error message', contains('Invalid PSBT Redeem Script key data'))));
+  });
+  test(
+      "Case: PSBT with invalid pubkey length for input partial signature typed key",
+      () {
+    const psbtData =
+        "70736274ff0100550200000001279a2323a5dfb51fc45f220fa58b0fc13e1e3342792a85d7e36cd6333b5cbc390000000000ffffffff01a05aea0b000000001976a914ffe9c0061097cc3b636f2cb0460fa4fc427d2b4588ac0000000000010120955eea0b0000000017a9146345200f68d189e1adc0df1c4d16ea8f14c0dbeb87210203b1341ccba7683b6af4f1238cd6e97e7167d569fac47f1e48d47541844355bd46304302200424b58effaaa694e1559ea5c93bbfd4a89064224055cdf070b6771469442d07021f5c8eb0fea6516d60b8acb33ad64ede60e8785bfb3aa94b99bdf86151db9a9a010104220020771fd18ad459666dd49f3d564e3dbc42f4c84774e360ada16816a8ed488d5681010547522103b1341ccba7683b6af4f1238cd6e97e7167d569fac47f1e48d47541844355bd462103de55d1e1dac805e3f8a58c1fbf9b94c02f3dbaafe127fefca4995f26f82083bd52ae220603b1341ccba7683b6af4f1238cd6e97e7167d569fac47f1e48d47541844355bd4610b4a6ba67000000800000008004000080220603de55d1e1dac805e3f8a58c1fbf9b94c02f3dbaafe127fefca4995f26f82083bd10b4a6ba670000008000000080050000800000";
+    expect(
+        () => Psbt.fromHex(psbtData),
+        throwsA(isA<DartBitcoinPluginException>().having((p) => p.message,
+            'error message', contains('Invalid PSBT Partial Signature data'))));
+  });
+  test("Case: PSBT with invalid input witness utxo typed key", () {
+    const psbtData =
+        "70736274ff0100550200000001279a2323a5dfb51fc45f220fa58b0fc13e1e3342792a85d7e36cd6333b5cbc390000000000ffffffff01a05aea0b000000001976a914ffe9c0061097cc3b636f2cb0460fa4fc427d2b4588ac000000000002010020955eea0b0000000017a9146345200f68d189e1adc0df1c4d16ea8f14c0dbeb87220203b1341ccba7683b6af4f1238cd6e97e7167d569fac47f1e48d47541844355bd4646304302200424b58effaaa694e1559ea5c93bbfd4a89064224055cdf070b6771469442d07021f5c8eb0fea6516d60b8acb33ad64ede60e8785bfb3aa94b99bdf86151db9a9a010104220020771fd18ad459666dd49f3d564e3dbc42f4c84774e360ada16816a8ed488d5681010547522103b1341ccba7683b6af4f1238cd6e97e7167d569fac47f1e48d47541844355bd462103de55d1e1dac805e3f8a58c1fbf9b94c02f3dbaafe127fefca4995f26f82083bd52ae220603b1341ccba7683b6af4f1238cd6e97e7167d569fac47f1e48d47541844355bd4610b4a6ba67000000800000008004000080220603de55d1e1dac805e3f8a58c1fbf9b94c02f3dbaafe127fefca4995f26f82083bd10b4a6ba670000008000000080050000800000";
+    expect(
+        () => Psbt.fromHex(psbtData),
+        throwsA(isA<DartBitcoinPluginException>().having((p) => p.message,
+            'error message', contains('Invalid PSBT Witness UTXO key data'))));
+  });
+  test("Case: PSBT with invalid global transaction typed key", () {
+    const psbtData =
+        "70736274ff020001550200000001279a2323a5dfb51fc45f220fa58b0fc13e1e3342792a85d7e36cd6333b5cbc390000000000ffffffff01a05aea0b000000001976a914ffe9c0061097cc3b636f2cb0460fa4fc427d2b4588ac0000000000010120955eea0b0000000017a9146345200f68d189e1adc0df1c4d16ea8f14c0dbeb87220203b1341ccba7683b6af4f1238cd6e97e7167d569fac47f1e48d47541844355bd4646304302200424b58effaaa694e1559ea5c93bbfd4a89064224055cdf070b6771469442d07021f5c8eb0fea6516d60b8acb33ad64ede60e8785bfb3aa94b99bdf86151db9a9a010104220020771fd18ad459666dd49f3d564e3dbc42f4c84774e360ada16816a8ed488d5681010547522103b1341ccba7683b6af4f1238cd6e97e7167d569fac47f1e48d47541844355bd462103de55d1e1dac805e3f8a58c1fbf9b94c02f3dbaafe127fefca4995f26f82083bd52ae220603b1341ccba7683b6af4f1238cd6e97e7167d569fac47f1e48d47541844355bd4610b4a6ba67000000800000008004000080220603de55d1e1dac805e3f8a58c1fbf9b94c02f3dbaafe127fefca4995f26f82083bd10b4a6ba670000008000000080050000800000";
+    expect(
+        () => Psbt.fromHex(psbtData),
+        throwsA(isA<DartBitcoinPluginException>().having(
+            (p) => p.message,
+            'error message',
+            contains('Invalid PSBT Unsigned Transaction key data'))));
+  });
+  test("Case: PSBT with duplicate keys in an input", () {
+    const psbtData =
+        "70736274ff0100750200000001268171371edff285e937adeea4b37b78000c0566cbb3ad64641713ca42171bf60000000000feffffff02d3dff505000000001976a914d0c59903c5bac2868760e90fd521a4665aa7652088ac00e1f5050000000017a9143545e6e33b832c47050f24d3eeb93c9c03948bc787b32e1300000100fda5010100000000010289a3c71eab4d20e0371bbba4cc698fa295c9463afa2e397f8533ccb62f9567e50100000017160014be18d152a9b012039daf3da7de4f53349eecb985ffffffff86f8aa43a71dff1448893a530a7237ef6b4608bbb2dd2d0171e63aec6a4890b40100000017160014fe3e9ef1a745e974d902c4355943abcb34bd5353ffffffff0200c2eb0b000000001976a91485cff1097fd9e008bb34af709c62197b38978a4888ac72fef84e2c00000017a914339725ba21efd62ac753a9bcd067d6c7a6a39d05870247304402202712be22e0270f394f568311dc7ca9a68970b8025fdd3b240229f07f8a5f3a240220018b38d7dcd314e734c9276bd6fb40f673325bc4baa144c800d2f2f02db2765c012103d2e15674941bad4a996372cb87e1856d3652606d98562fe39c5e9e7e413f210502483045022100d12b852d85dcd961d2f5f4ab660654df6eedcc794c0c33ce5cc309ffb5fce58d022067338a8e0e1725c197fb1a88af59f51e44e4255b20167c8684031c05d1f2592a01210223b72beef0965d10be0778efecd61fcac6f79a4ea169393380734464f84f2ab30000000001003f0200000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0000000000ffffffff010000000000000000036a010000000000000000";
+    expect(
+        () => Psbt.fromHex(psbtData),
+        throwsA(isA<DartBitcoinPluginException>().having(
+            (p) => p.message,
+            'error message',
+            contains('Invalid PSBT Input: Duplicate entry detected'))));
+  });
+  test(
+      "Case: PSBT where inputs and outputs are provided but without an unsigned tx",
+      () {
+    const psbtData =
+        "70736274ff000100fda5010100000000010289a3c71eab4d20e0371bbba4cc698fa295c9463afa2e397f8533ccb62f9567e50100000017160014be18d152a9b012039daf3da7de4f53349eecb985ffffffff86f8aa43a71dff1448893a530a7237ef6b4608bbb2dd2d0171e63aec6a4890b40100000017160014fe3e9ef1a745e974d902c4355943abcb34bd5353ffffffff0200c2eb0b000000001976a91485cff1097fd9e008bb34af709c62197b38978a4888ac72fef84e2c00000017a914339725ba21efd62ac753a9bcd067d6c7a6a39d05870247304402202712be22e0270f394f568311dc7ca9a68970b8025fdd3b240229f07f8a5f3a240220018b38d7dcd314e734c9276bd6fb40f673325bc4baa144c800d2f2f02db2765c012103d2e15674941bad4a996372cb87e1856d3652606d98562fe39c5e9e7e413f210502483045022100d12b852d85dcd961d2f5f4ab660654df6eedcc794c0c33ce5cc309ffb5fce58d022067338a8e0e1725c197fb1a88af59f51e44e4255b20167c8684031c05d1f2592a01210223b72beef0965d10be0778efecd61fcac6f79a4ea169393380734464f84f2ab30000000000";
+    expect(
+        () => Psbt.fromHex(psbtData),
+        throwsA(isA<DartBitcoinPluginException>().having((p) => p.message,
+            'error message', contains('PSBTv0 Global unsigned tx required'))));
+  });
+  test("Case: PSBT where one input has a filled scriptSig in the unsigned tx",
+      () {
+    const psbtData =
+        "70736274ff0100fd0a010200000002ab0949a08c5af7c49b8212f417e2f15ab3f5c33dcf153821a8139f877a5b7be4000000006a47304402204759661797c01b036b25928948686218347d89864b719e1f7fcf57d1e511658702205309eabf56aa4d8891ffd111fdf1336f3a29da866d7f8486d75546ceedaf93190121035cdc61fc7ba971c0b501a646a2a83b102cb43881217ca682dc86e2d73fa88292feffffffab0949a08c5af7c49b8212f417e2f15ab3f5c33dcf153821a8139f877a5b7be40100000000feffffff02603bea0b000000001976a914768a40bbd740cbe81d988e71de2a4d5c71396b1d88ac8e240000000000001976a9146f4620b553fa095e721b9ee0efe9fa039cca459788ac00000000000001012000e1f5050000000017a9143545e6e33b832c47050f24d3eeb93c9c03948bc787010416001485d13537f2e265405a34dbafa9e3dda01fb82308000000";
+    expect(
+        () => Psbt.fromHex(psbtData),
+        throwsA(isA<DartBitcoinPluginException>().having(
+            (p) => p.message,
+            'error message',
+            contains('Invalid PSBT Unsigned Transaction data'))));
+  });
+  test("Case: PSBT missing outputs", () {
+    const psbtData =
+        "70736274ff0100750200000001268171371edff285e937adeea4b37b78000c0566cbb3ad64641713ca42171bf60000000000feffffff02d3dff505000000001976a914d0c59903c5bac2868760e90fd521a4665aa7652088ac00e1f5050000000017a9143545e6e33b832c47050f24d3eeb93c9c03948bc787b32e1300000100fda5010100000000010289a3c71eab4d20e0371bbba4cc698fa295c9463afa2e397f8533ccb62f9567e50100000017160014be18d152a9b012039daf3da7de4f53349eecb985ffffffff86f8aa43a71dff1448893a530a7237ef6b4608bbb2dd2d0171e63aec6a4890b40100000017160014fe3e9ef1a745e974d902c4355943abcb34bd5353ffffffff0200c2eb0b000000001976a91485cff1097fd9e008bb34af709c62197b38978a4888ac72fef84e2c00000017a914339725ba21efd62ac753a9bcd067d6c7a6a39d05870247304402202712be22e0270f394f568311dc7ca9a68970b8025fdd3b240229f07f8a5f3a240220018b38d7dcd314e734c9276bd6fb40f673325bc4baa144c800d2f2f02db2765c012103d2e15674941bad4a996372cb87e1856d3652606d98562fe39c5e9e7e413f210502483045022100d12b852d85dcd961d2f5f4ab660654df6eedcc794c0c33ce5cc309ffb5fce58d022067338a8e0e1725c197fb1a88af59f51e44e4255b20167c8684031c05d1f2592a01210223b72beef0965d10be0778efecd61fcac6f79a4ea169393380734464f84f2ab30000000000";
+    expect(
+        () => Psbt.fromHex(psbtData),
+        throwsA(isA<DartBitcoinPluginException>().having((p) => p.message,
+            'error message', contains('PSBT deserialization failed'))));
+  });
+  test("Case: Network transaction, not PSBT format", () {
+    const psbtData =
+        "0200000001268171371edff285e937adeea4b37b78000c0566cbb3ad64641713ca42171bf6000000006a473044022070b2245123e6bf474d60c5b50c043d4c691a5d2435f09a34a7662a9dc251790a022001329ca9dacf280bdf30740ec0390422422c81cb45839457aeb76fc12edd95b3012102657d118d3357b8e0f4c2cd46db7b39f6d9c38d9a70abcb9b2de5dc8dbfe4ce31feffffff02d3dff505000000001976a914d0c59903c5bac2868760e90fd521a4665aa7652088ac00e1f5050000000017a9143545e6e33b832c47050f24d3eeb93c9c03948bc787b32e1300";
+    expect(
+        () => Psbt.fromHex(psbtData),
+        throwsA(isA<DartBitcoinPluginException>().having((p) => p.message,
+            'error message', contains('Invalid PSBT magic'))));
+  });
+}
+
+void _test() {
+  test("Case: PSBT with one P2PKH input. Outputs are empty", () {
+    const psbtData =
+        "70736274ff0100750200000001268171371edff285e937adeea4b37b78000c0566cbb3ad64641713ca42171bf60000000000feffffff02d3dff505000000001976a914d0c59903c5bac2868760e90fd521a4665aa7652088ac00e1f5050000000017a9143545e6e33b832c47050f24d3eeb93c9c03948bc787b32e1300000100fda5010100000000010289a3c71eab4d20e0371bbba4cc698fa295c9463afa2e397f8533ccb62f9567e50100000017160014be18d152a9b012039daf3da7de4f53349eecb985ffffffff86f8aa43a71dff1448893a530a7237ef6b4608bbb2dd2d0171e63aec6a4890b40100000017160014fe3e9ef1a745e974d902c4355943abcb34bd5353ffffffff0200c2eb0b000000001976a91485cff1097fd9e008bb34af709c62197b38978a4888ac72fef84e2c00000017a914339725ba21efd62ac753a9bcd067d6c7a6a39d05870247304402202712be22e0270f394f568311dc7ca9a68970b8025fdd3b240229f07f8a5f3a240220018b38d7dcd314e734c9276bd6fb40f673325bc4baa144c800d2f2f02db2765c012103d2e15674941bad4a996372cb87e1856d3652606d98562fe39c5e9e7e413f210502483045022100d12b852d85dcd961d2f5f4ab660654df6eedcc794c0c33ce5cc309ffb5fce58d022067338a8e0e1725c197fb1a88af59f51e44e4255b20167c8684031c05d1f2592a01210223b72beef0965d10be0778efecd61fcac6f79a4ea169393380734464f84f2ab300000000000000";
+    final psbt = Psbt.deserialize(BytesUtils.fromHexString(psbtData));
+    expect(psbt.toHex(), psbtData);
+    for (final i in psbt.output.entries) {
+      expect(i.isEmpty, true);
+    }
+  });
+  test(
+      "Case: PSBT with one P2PKH input and one P2SH-P2WPKH input. First input is signed and finalized. Outputs are empty",
+      () {
+    const psbtData =
+        "70736274ff0100a00200000002ab0949a08c5af7c49b8212f417e2f15ab3f5c33dcf153821a8139f877a5b7be40000000000feffffffab0949a08c5af7c49b8212f417e2f15ab3f5c33dcf153821a8139f877a5b7be40100000000feffffff02603bea0b000000001976a914768a40bbd740cbe81d988e71de2a4d5c71396b1d88ac8e240000000000001976a9146f4620b553fa095e721b9ee0efe9fa039cca459788ac000000000001076a47304402204759661797c01b036b25928948686218347d89864b719e1f7fcf57d1e511658702205309eabf56aa4d8891ffd111fdf1336f3a29da866d7f8486d75546ceedaf93190121035cdc61fc7ba971c0b501a646a2a83b102cb43881217ca682dc86e2d73fa882920001012000e1f5050000000017a9143545e6e33b832c47050f24d3eeb93c9c03948bc787010416001485d13537f2e265405a34dbafa9e3dda01fb82308000000";
+    final psbt = Psbt.deserialize(BytesUtils.fromHexString(psbtData));
+    expect(psbt.toHex(), psbtData);
+    for (final i in psbt.output.entries) {
+      expect(i.isEmpty, true);
+    }
+  });
+  test(
+      "Case: PSBT with one P2PKH input which has a non-final scriptSig and has a sighash type specified. Outputs are empty",
+      () {
+    const psbtData =
+        "70736274ff0100750200000001268171371edff285e937adeea4b37b78000c0566cbb3ad64641713ca42171bf60000000000feffffff02d3dff505000000001976a914d0c59903c5bac2868760e90fd521a4665aa7652088ac00e1f5050000000017a9143545e6e33b832c47050f24d3eeb93c9c03948bc787b32e1300000100fda5010100000000010289a3c71eab4d20e0371bbba4cc698fa295c9463afa2e397f8533ccb62f9567e50100000017160014be18d152a9b012039daf3da7de4f53349eecb985ffffffff86f8aa43a71dff1448893a530a7237ef6b4608bbb2dd2d0171e63aec6a4890b40100000017160014fe3e9ef1a745e974d902c4355943abcb34bd5353ffffffff0200c2eb0b000000001976a91485cff1097fd9e008bb34af709c62197b38978a4888ac72fef84e2c00000017a914339725ba21efd62ac753a9bcd067d6c7a6a39d05870247304402202712be22e0270f394f568311dc7ca9a68970b8025fdd3b240229f07f8a5f3a240220018b38d7dcd314e734c9276bd6fb40f673325bc4baa144c800d2f2f02db2765c012103d2e15674941bad4a996372cb87e1856d3652606d98562fe39c5e9e7e413f210502483045022100d12b852d85dcd961d2f5f4ab660654df6eedcc794c0c33ce5cc309ffb5fce58d022067338a8e0e1725c197fb1a88af59f51e44e4255b20167c8684031c05d1f2592a01210223b72beef0965d10be0778efecd61fcac6f79a4ea169393380734464f84f2ab30000000001030401000000000000";
+    final psbt = Psbt.deserialize(BytesUtils.fromHexString(psbtData));
+    expect(psbt.toHex(), psbtData);
+    for (final i in psbt.output.entries) {
+      expect(i.isEmpty, true);
+    }
+  });
+  test(
+      "Case: PSBT with one P2PKH input and one P2SH-P2WPKH input both with non-final scriptSigs. P2SH-P2WPKH input's redeemScript is available. Outputs filled.",
+      () {
+    const psbtData =
+        "70736274ff0100a00200000002ab0949a08c5af7c49b8212f417e2f15ab3f5c33dcf153821a8139f877a5b7be40000000000feffffffab0949a08c5af7c49b8212f417e2f15ab3f5c33dcf153821a8139f877a5b7be40100000000feffffff02603bea0b000000001976a914768a40bbd740cbe81d988e71de2a4d5c71396b1d88ac8e240000000000001976a9146f4620b553fa095e721b9ee0efe9fa039cca459788ac00000000000100df0200000001268171371edff285e937adeea4b37b78000c0566cbb3ad64641713ca42171bf6000000006a473044022070b2245123e6bf474d60c5b50c043d4c691a5d2435f09a34a7662a9dc251790a022001329ca9dacf280bdf30740ec0390422422c81cb45839457aeb76fc12edd95b3012102657d118d3357b8e0f4c2cd46db7b39f6d9c38d9a70abcb9b2de5dc8dbfe4ce31feffffff02d3dff505000000001976a914d0c59903c5bac2868760e90fd521a4665aa7652088ac00e1f5050000000017a9143545e6e33b832c47050f24d3eeb93c9c03948bc787b32e13000001012000e1f5050000000017a9143545e6e33b832c47050f24d3eeb93c9c03948bc787010416001485d13537f2e265405a34dbafa9e3dda01fb8230800220202ead596687ca806043edc3de116cdf29d5e9257c196cd055cf698c8d02bf24e9910b4a6ba670000008000000080020000800022020394f62be9df19952c5587768aeb7698061ad2c4a25c894f47d8c162b4d7213d0510b4a6ba6700000080010000800200008000";
+    final psbt = Psbt.deserialize(BytesUtils.fromHexString(psbtData));
+    expect(psbt.toHex(), psbtData);
+  });
+
+  test(
+      "Case: PSBT with one P2SH-P2WSH input of a 2-of-2 multisig, redeemScript, witnessScript, and keypaths are available. Contains one signature.",
+      () {
+    const psbtData =
+        "70736274ff0100550200000001279a2323a5dfb51fc45f220fa58b0fc13e1e3342792a85d7e36cd6333b5cbc390000000000ffffffff01a05aea0b000000001976a914ffe9c0061097cc3b636f2cb0460fa4fc427d2b4588ac0000000000010120955eea0b0000000017a9146345200f68d189e1adc0df1c4d16ea8f14c0dbeb87220203b1341ccba7683b6af4f1238cd6e97e7167d569fac47f1e48d47541844355bd4646304302200424b58effaaa694e1559ea5c93bbfd4a89064224055cdf070b6771469442d07021f5c8eb0fea6516d60b8acb33ad64ede60e8785bfb3aa94b99bdf86151db9a9a010104220020771fd18ad459666dd49f3d564e3dbc42f4c84774e360ada16816a8ed488d5681010547522103b1341ccba7683b6af4f1238cd6e97e7167d569fac47f1e48d47541844355bd462103de55d1e1dac805e3f8a58c1fbf9b94c02f3dbaafe127fefca4995f26f82083bd52ae220603b1341ccba7683b6af4f1238cd6e97e7167d569fac47f1e48d47541844355bd4610b4a6ba67000000800000008004000080220603de55d1e1dac805e3f8a58c1fbf9b94c02f3dbaafe127fefca4995f26f82083bd10b4a6ba670000008000000080050000800000";
+    final psbt = Psbt.deserialize(BytesUtils.fromHexString(psbtData));
+    expect(psbt.toHex(), psbtData);
+  });
+  test(
+      "Case: PSBT with one P2WSH input of a 2-of-2 multisig. witnessScript, keypaths, and global xpubs are available. Contains no signatures. Outputs filled.",
+      () {
+    const psbtData =
+        "70736274ff01005202000000019dfc6628c26c5899fe1bd3dc338665bfd55d7ada10f6220973df2d386dec12760100000000ffffffff01f03dcd1d000000001600147b3a00bfdc14d27795c2b74901d09da6ef133579000000004f01043587cf02da3fd0088000000097048b1ad0445b1ec8275517727c87b4e4ebc18a203ffa0f94c01566bd38e9000351b743887ee1d40dc32a6043724f2d6459b3b5a4d73daec8fbae0472f3bc43e20cd90c6a4fae000080000000804f01043587cf02da3fd00880000001b90452427139cd78c2cff2444be353cd58605e3e513285e528b407fae3f6173503d30a5e97c8adbc557dac2ad9a7e39c1722ebac69e668b6f2667cc1d671c83cab0cd90c6a4fae000080010000800001012b0065cd1d000000002200202c5486126c4978079a814e13715d65f36459e4d6ccaded266d0508645bafa6320105475221029da12cdb5b235692b91536afefe5c91c3ab9473d8e43b533836ab456299c88712103372b34234ed7cf9c1fea5d05d441557927be9542b162eb02e1ab2ce80224c00b52ae2206029da12cdb5b235692b91536afefe5c91c3ab9473d8e43b533836ab456299c887110d90c6a4fae0000800000008000000000220603372b34234ed7cf9c1fea5d05d441557927be9542b162eb02e1ab2ce80224c00b10d90c6a4fae0000800100008000000000002202039eff1f547a1d5f92dfa2ba7af6ac971a4bd03ba4a734b03156a256b8ad3a1ef910ede45cc500000080000000800100008000";
+    final psbt = Psbt.deserialize(BytesUtils.fromHexString(psbtData));
+    expect(psbt.toHex(), psbtData);
+  });
+
+  test("Case: PSBT with `PSBT_GLOBAL_XPUB`", () {
+    const psbtData =
+        "70736274ff01009d0100000002710ea76ab45c5cb6438e607e59cc037626981805ae9e0dfd9089012abb0be5350100000000ffffffff190994d6a8b3c8c82ccbcfb2fba4106aa06639b872a8d447465c0d42588d6d670000000000ffffffff0200e1f505000000001976a914b6bc2c0ee5655a843d79afedd0ccc3f7dd64340988ac605af405000000001600141188ef8e4ce0449eaac8fb141cbf5a1176e6a088000000004f010488b21e039e530cac800000003dbc8a5c9769f031b17e77fea1518603221a18fd18f2b9a54c6c8c1ac75cbc3502f230584b155d1c7f1cd45120a653c48d650b431b67c5b2c13f27d7142037c1691027569c503100008000000080000000800001011f00e1f5050000000016001433b982f91b28f160c920b4ab95e58ce50dda3a4a220203309680f33c7de38ea6a47cd4ecd66f1f5a49747c6ffb8808ed09039243e3ad5c47304402202d704ced830c56a909344bd742b6852dccd103e963bae92d38e75254d2bb424502202d86c437195df46c0ceda084f2a291c3da2d64070f76bf9b90b195e7ef28f77201220603309680f33c7de38ea6a47cd4ecd66f1f5a49747c6ffb8808ed09039243e3ad5c1827569c5031000080000000800000008000000000010000000001011f00e1f50500000000160014388fb944307eb77ef45197d0b0b245e079f011de220202c777161f73d0b7c72b9ee7bde650293d13f095bc7656ad1f525da5fd2e10b11047304402204cb1fb5f869c942e0e26100576125439179ae88dca8a9dc3ba08f7953988faa60220521f49ca791c27d70e273c9b14616985909361e25be274ea200d7e08827e514d01220602c777161f73d0b7c72b9ee7bde650293d13f095bc7656ad1f525da5fd2e10b1101827569c5031000080000000800000008000000000000000000000220202d20ca502ee289686d21815bd43a80637b0698e1fbcdbe4caed445f6c1a0a90ef1827569c50310000800000008000000080000000000400000000";
+    final psbt = Psbt.deserialize(BytesUtils.fromHexString(psbtData));
+    expect(psbt.toHex(), psbtData);
+  });
+
+  test("Case: PSBT with global unsigned tx that has 0 inputs and 0 outputs",
+      () {
+    const psbtData = "70736274ff01000a0000000000000000000000";
+    final psbt = Psbt.deserialize(BytesUtils.fromHexString(psbtData));
+    expect(psbt.toHex(), psbtData);
+  });
+  test("Case: PSBT with 0 inputs", () {
+    const psbtData =
+        "70736274ff01004c020000000002d3dff505000000001976a914d0c59903c5bac2868760e90fd521a4665aa7652088ac00e1f5050000000017a9143545e6e33b832c47050f24d3eeb93c9c03948bc787b32e1300000000";
+    final psbt = Psbt.deserialize(BytesUtils.fromHexString(psbtData));
+    expect(psbt.toHex(), psbtData);
+  });
+}
diff --git a/test/psbt/bip_0370_test.dart b/test/psbt/bip_0370_test.dart
new file mode 100644
index 0000000..3cb8a09
--- /dev/null
+++ b/test/psbt/bip_0370_test.dart
@@ -0,0 +1,332 @@
+import 'package:bitcoin_base/bitcoin_base.dart';
+import 'package:blockchain_utils/blockchain_utils.dart';
+import 'package:test/test.dart';
+
+/// https://github.com/bitcoin/bips/blob/master/bip-0370.mediawiki
+void main() {
+  group("BIP-0370", () {
+    _invalidTest();
+    _test();
+  });
+}
+
+void _invalidTest() {
+  test(
+      "Case: PSBTv2 with PSBT_IN_REQUIRED_HEIGHT_LOCKTIME greater than or equal to 500000000",
+      () {
+    const psbtData =
+        "70736274ff01020402000000010401010105010201fb0402000000000100520200000001c1aa256e214b96a1822f93de42bff3b5f3ff8d0519306e3515d7515a5e805b120000000000ffffffff0118c69a3b00000000160014b0a3af144208412693ca7d166852b52db0aef06e0000000001011f18c69a3b00000000160014b0a3af144208412693ca7d166852b52db0aef06e010e200b0ad921419c1c8719735d72dc739f9ea9e0638d1fe4c1eef0f9944084815fc8010f04000000000112040065cd1d00220202d601f84846a6755f776be00e3d9de8fb10acc935fb83c45fb0162d4cad5ab79218f69d873e540000800100008000000080000000002a0000000103080008af2f000000000104160014c430f64c4756da310dbd1a085572ef299926272c00220202e36fbff53dd534070cf8fd396614680f357a9b85db7340bf1cfa745d2ad7b34018f69d873e54000080010000800000008001000000640000000103088bbdeb0b0000000001041600144dd193ac964a56ac1b9e1cca8454fe2f474f851300";
+    expect(
+        () => Psbt.fromHex(psbtData),
+        throwsA(isA<DartBitcoinPluginException>().having(
+            (p) => p.message,
+            'error message',
+            contains('Invalid PSBT Required Height-based Locktime data'))));
+  });
+  test("Case: PSBTv2 with PSBT_IN_REQUIRED_TIME_LOCKTIME less than 500000000",
+      () {
+    const psbtData =
+        "70736274ff01020402000000010401010105010201fb0402000000000100520200000001c1aa256e214b96a1822f93de42bff3b5f3ff8d0519306e3515d7515a5e805b120000000000ffffffff0118c69a3b00000000160014b0a3af144208412693ca7d166852b52db0aef06e0000000001011f18c69a3b00000000160014b0a3af144208412693ca7d166852b52db0aef06e010e200b0ad921419c1c8719735d72dc739f9ea9e0638d1fe4c1eef0f9944084815fc8010f0400000000011104ff64cd1d00220202d601f84846a6755f776be00e3d9de8fb10acc935fb83c45fb0162d4cad5ab79218f69d873e540000800100008000000080000000002a0000000103080008af2f000000000104160014c430f64c4756da310dbd1a085572ef299926272c00220202e36fbff53dd534070cf8fd396614680f357a9b85db7340bf1cfa745d2ad7b34018f69d873e54000080010000800000008001000000640000000103088bbdeb0b0000000001041600144dd193ac964a56ac1b9e1cca8454fe2f474f851300";
+    expect(
+        () => Psbt.fromHex(psbtData),
+        throwsA(isA<DartBitcoinPluginException>().having(
+            (p) => p.message,
+            'error message',
+            contains('Invalid PSBT Required Time-based Locktime data'))));
+  });
+  test("Case: PSBTv2 missing PSBT_OUT_SCRIPT", () {
+    const psbtData =
+        "70736274ff0102040200000001030400000000010401010105010201fb0402000000000100520200000001c1aa256e214b96a1822f93de42bff3b5f3ff8d0519306e3515d7515a5e805b120000000000ffffffff0118c69a3b00000000160014b0a3af144208412693ca7d166852b52db0aef06e0000000001011f18c69a3b00000000160014b0a3af144208412693ca7d166852b52db0aef06e010e200b0ad921419c1c8719735d72dc739f9ea9e0638d1fe4c1eef0f9944084815fc8010f0400000000011004feffffff00220202d601f84846a6755f776be00e3d9de8fb10acc935fb83c45fb0162d4cad5ab79218f69d873e540000800100008000000080000000002a0000000103080008af2f0000000000220202e36fbff53dd534070cf8fd396614680f357a9b85db7340bf1cfa745d2ad7b34018f69d873e54000080010000800000008001000000640000000103088bbdeb0b0000000001041600144dd193ac964a56ac1b9e1cca8454fe2f474f851300";
+    expect(
+        () => Psbt.fromHex(psbtData),
+        throwsA(isA<DartBitcoinPluginException>().having(
+            (p) => p.message,
+            'error message',
+            contains(
+                'Invalid PSBT Output: Missing required field PSBT_OUT_SCRIPT'))));
+  });
+  test("Case: PSBTv2 missing PSBT_OUT_AMOUNT", () {
+    const psbtData =
+        "70736274ff0102040200000001030400000000010401010105010201fb0402000000000100520200000001c1aa256e214b96a1822f93de42bff3b5f3ff8d0519306e3515d7515a5e805b120000000000ffffffff0118c69a3b00000000160014b0a3af144208412693ca7d166852b52db0aef06e0000000001011f18c69a3b00000000160014b0a3af144208412693ca7d166852b52db0aef06e010e200b0ad921419c1c8719735d72dc739f9ea9e0638d1fe4c1eef0f9944084815fc8010f0400000000011004feffffff00220202d601f84846a6755f776be00e3d9de8fb10acc935fb83c45fb0162d4cad5ab79218f69d873e540000800100008000000080000000002a0000000104160014c430f64c4756da310dbd1a085572ef299926272c00220202e36fbff53dd534070cf8fd396614680f357a9b85db7340bf1cfa745d2ad7b34018f69d873e54000080010000800000008001000000640000000103088bbdeb0b0000000001041600144dd193ac964a56ac1b9e1cca8454fe2f474f851300";
+    expect(
+        () => Psbt.fromHex(psbtData),
+        throwsA(isA<DartBitcoinPluginException>().having(
+            (p) => p.message,
+            'error message',
+            contains(
+                'Invalid PSBT Output: Missing required field PSBT_OUT_AMOUNT'))));
+  });
+  test("Case: PSBTv2 missing PSBT_IN_OUTPUT_INDEX", () {
+    const psbtData =
+        "70736274ff0102040200000001030400000000010401010105010201fb0402000000000100520200000001c1aa256e214b96a1822f93de42bff3b5f3ff8d0519306e3515d7515a5e805b120000000000ffffffff0118c69a3b00000000160014b0a3af144208412693ca7d166852b52db0aef06e0000000001011f18c69a3b00000000160014b0a3af144208412693ca7d166852b52db0aef06e010e200b0ad921419c1c8719735d72dc739f9ea9e0638d1fe4c1eef0f9944084815fc8011004feffffff00220202d601f84846a6755f776be00e3d9de8fb10acc935fb83c45fb0162d4cad5ab79218f69d873e540000800100008000000080000000002a0000000103080008af2f000000000104160014c430f64c4756da310dbd1a085572ef299926272c00220202e36fbff53dd534070cf8fd396614680f357a9b85db7340bf1cfa745d2ad7b34018f69d873e54000080010000800000008001000000640000000103088bbdeb0b0000000001041600144dd193ac964a56ac1b9e1cca8454fe2f474f851300";
+    expect(
+        () => Psbt.fromHex(psbtData),
+        throwsA(isA<DartBitcoinPluginException>().having(
+            (p) => p.message,
+            'error message',
+            contains(
+                'Invalid PSBT Input: Missing required field PSBT_IN_OUTPUT_INDEX'))));
+  });
+  test("Case: PSBTv2 missing PSBT_IN_PREVIOUS_TXID", () {
+    const psbtData =
+        "70736274ff0102040200000001030400000000010401010105010201fb0402000000000100520200000001c1aa256e214b96a1822f93de42bff3b5f3ff8d0519306e3515d7515a5e805b120000000000ffffffff0118c69a3b00000000160014b0a3af144208412693ca7d166852b52db0aef06e0000000001011f18c69a3b00000000160014b0a3af144208412693ca7d166852b52db0aef06e010f0400000000011004feffffff00220202d601f84846a6755f776be00e3d9de8fb10acc935fb83c45fb0162d4cad5ab79218f69d873e540000800100008000000080000000002a0000000103080008af2f000000000104160014c430f64c4756da310dbd1a085572ef299926272c00220202e36fbff53dd534070cf8fd396614680f357a9b85db7340bf1cfa745d2ad7b34018f69d873e54000080010000800000008001000000640000000103088bbdeb0b0000000001041600144dd193ac964a56ac1b9e1cca8454fe2f474f851300";
+    expect(
+        () => Psbt.fromHex(psbtData),
+        throwsA(isA<DartBitcoinPluginException>().having(
+            (p) => p.message,
+            'error message',
+            contains(
+                'Invalid PSBT Input: Missing required field PSBT_IN_PREVIOUS_TXID'))));
+  });
+  test("Case: PSBTv2 missing PSBT_GLOBAL_OUTPUT_COUNT", () {
+    const psbtData =
+        "70736274ff01020402000000010304000000000104010101fb0402000000000100520200000001c1aa256e214b96a1822f93de42bff3b5f3ff8d0519306e3515d7515a5e805b120000000000ffffffff0118c69a3b00000000160014b0a3af144208412693ca7d166852b52db0aef06e0000000001011f18c69a3b00000000160014b0a3af144208412693ca7d166852b52db0aef06e010e200b0ad921419c1c8719735d72dc739f9ea9e0638d1fe4c1eef0f9944084815fc8010f0400000000011004feffffff00220202d601f84846a6755f776be00e3d9de8fb10acc935fb83c45fb0162d4cad5ab79218f69d873e540000800100008000000080000000002a0000000103080008af2f000000000104160014c430f64c4756da310dbd1a085572ef299926272c00220202e36fbff53dd534070cf8fd396614680f357a9b85db7340bf1cfa745d2ad7b34018f69d873e54000080010000800000008001000000640000000103088bbdeb0b0000000001041600144dd193ac964a56ac1b9e1cca8454fe2f474f851300";
+    expect(
+        () => Psbt.fromHex(psbtData),
+        throwsA(isA<DartBitcoinPluginException>().having(
+            (p) => p.message,
+            'error message',
+            contains(
+                'Invalid PSBT global: Missing required field PSBT_GLOBAL_OUTPUT_COUNT'))));
+  });
+  test("Case: PSBTv2 missing PSBT_GLOBAL_INPUT_COUNT", () {
+    const psbtData =
+        "70736274ff01020402000000010304000000000105010201fb0402000000000100520200000001c1aa256e214b96a1822f93de42bff3b5f3ff8d0519306e3515d7515a5e805b120000000000ffffffff0118c69a3b00000000160014b0a3af144208412693ca7d166852b52db0aef06e0000000001011f18c69a3b00000000160014b0a3af144208412693ca7d166852b52db0aef06e010e200b0ad921419c1c8719735d72dc739f9ea9e0638d1fe4c1eef0f9944084815fc8010f0400000000011004feffffff00220202d601f84846a6755f776be00e3d9de8fb10acc935fb83c45fb0162d4cad5ab79218f69d873e540000800100008000000080000000002a0000000103080008af2f000000000104160014c430f64c4756da310dbd1a085572ef299926272c00220202e36fbff53dd534070cf8fd396614680f357a9b85db7340bf1cfa745d2ad7b34018f69d873e54000080010000800000008001000000640000000103088bbdeb0b0000000001041600144dd193ac964a56ac1b9e1cca8454fe2f474f851300";
+    expect(
+        () => Psbt.fromHex(psbtData),
+        throwsA(isA<DartBitcoinPluginException>().having(
+            (p) => p.message,
+            'error message',
+            contains(
+                'Invalid PSBT global: Missing required field PSBT_GLOBAL_INPUT_COUNT'))));
+  });
+  test("Case: PSBTv0 but with PSBT_OUT_SCRIPT.", () {
+    const psbtData =
+        "70736274ff01007102000000010b0ad921419c1c8719735d72dc739f9ea9e0638d1fe4c1eef0f9944084815fc80000000000feffffff020008af2f00000000160014c430f64c4756da310dbd1a085572ef299926272c8bbdeb0b00000000160014a07dac8ab6ca942d379ed795f835ba71c9cc688500000000000100520200000001c1aa256e214b96a1822f93de42bff3b5f3ff8d0519306e3515d7515a5e805b120000000000ffffffff0118c69a3b00000000160014b0a3af144208412693ca7d166852b52db0aef06e0000000001011f18c69a3b00000000160014b0a3af144208412693ca7d166852b52db0aef06e01086b02473044022005275a485734e0ae1f3b971237586f0e72dc85833d278c0e474cd23112c0fa5e02206b048c83cebc3c41d0b93cc7da76185cedbd030d005b08018be2b98bbacbdf7b012103760dcca05f3997dc65b293060f7f29f1514c8c527048e12802b041d4fc340a2700220202d601f84846a6755f776be00e3d9de8fb10acc935fb83c45fb0162d4cad5ab79218f69d873e540000800100008000000080000000002a0000000104160014a07dac8ab6ca942d379ed795f835ba71c9cc6885002202036efe2c255621986553ba9d65c3ddc64165ca1436e05aa35a4c6eb02451cf796d18f69d873e540000800100008000000080010000006200000000";
+    expect(
+        () => Psbt.fromHex(psbtData),
+        throwsA(isA<DartBitcoinPluginException>().having(
+            (p) => p.message,
+            'error message',
+            contains('Invalid PSBT Output: PSBT_OUT_SCRIPT is not allowed'))));
+  });
+  test("Case: PSBTv0 but with PSBT_OUT_AMOUNT.", () {
+    const psbtData =
+        "70736274ff01007102000000010b0ad921419c1c8719735d72dc739f9ea9e0638d1fe4c1eef0f9944084815fc80000000000feffffff020008af2f00000000160014c430f64c4756da310dbd1a085572ef299926272c8bbdeb0b00000000160014a07dac8ab6ca942d379ed795f835ba71c9cc688500000000000100520200000001c1aa256e214b96a1822f93de42bff3b5f3ff8d0519306e3515d7515a5e805b120000000000ffffffff0118c69a3b00000000160014b0a3af144208412693ca7d166852b52db0aef06e0000000001011f18c69a3b00000000160014b0a3af144208412693ca7d166852b52db0aef06e01086b02473044022005275a485734e0ae1f3b971237586f0e72dc85833d278c0e474cd23112c0fa5e02206b048c83cebc3c41d0b93cc7da76185cedbd030d005b08018be2b98bbacbdf7b012103760dcca05f3997dc65b293060f7f29f1514c8c527048e12802b041d4fc340a2700220202d601f84846a6755f776be00e3d9de8fb10acc935fb83c45fb0162d4cad5ab79218f69d873e540000800100008000000080000000002a0000000103080008af2f00000000002202036efe2c255621986553ba9d65c3ddc64165ca1436e05aa35a4c6eb02451cf796d18f69d873e540000800100008000000080010000006200000000";
+    expect(
+        () => Psbt.fromHex(psbtData),
+        throwsA(isA<DartBitcoinPluginException>().having(
+            (p) => p.message,
+            'error message',
+            contains('Invalid PSBT Output: PSBT_OUT_AMOUNT is not allowed'))));
+  });
+  test("Case: PSBTv0 but with PSBT_IN_REQUIRED_HEIGHT_LOCKTIME.", () {
+    const psbtData =
+        "70736274ff01007102000000010b0ad921419c1c8719735d72dc739f9ea9e0638d1fe4c1eef0f9944084815fc80000000000feffffff020008af2f00000000160014c430f64c4756da310dbd1a085572ef299926272c8bbdeb0b00000000160014a07dac8ab6ca942d379ed795f835ba71c9cc688500000000000100520200000001c1aa256e214b96a1822f93de42bff3b5f3ff8d0519306e3515d7515a5e805b120000000000ffffffff0118c69a3b00000000160014b0a3af144208412693ca7d166852b52db0aef06e0000000001011f18c69a3b00000000160014b0a3af144208412693ca7d166852b52db0aef06e01086b02473044022005275a485734e0ae1f3b971237586f0e72dc85833d278c0e474cd23112c0fa5e02206b048c83cebc3c41d0b93cc7da76185cedbd030d005b08018be2b98bbacbdf7b012103760dcca05f3997dc65b293060f7f29f1514c8c527048e12802b041d4fc340a270112041027000000220202d601f84846a6755f776be00e3d9de8fb10acc935fb83c45fb0162d4cad5ab79218f69d873e540000800100008000000080000000002a000000002202036efe2c255621986553ba9d65c3ddc64165ca1436e05aa35a4c6eb02451cf796d18f69d873e540000800100008000000080010000006200000000";
+    expect(
+        () => Psbt.fromHex(psbtData),
+        throwsA(isA<DartBitcoinPluginException>().having(
+            (p) => p.message,
+            'error message',
+            contains(
+                'Invalid PSBT Input: PSBT_IN_REQUIRED_HEIGHT_LOCKTIME is not allowed'))));
+  });
+  test("Case: PSBTv0 but with PSBT_IN_REQUIRED_TIME_LOCKTIME.", () {
+    const psbtData =
+        "70736274ff01007102000000010b0ad921419c1c8719735d72dc739f9ea9e0638d1fe4c1eef0f9944084815fc80000000000feffffff020008af2f00000000160014c430f64c4756da310dbd1a085572ef299926272c8bbdeb0b00000000160014a07dac8ab6ca942d379ed795f835ba71c9cc688500000000000100520200000001c1aa256e214b96a1822f93de42bff3b5f3ff8d0519306e3515d7515a5e805b120000000000ffffffff0118c69a3b00000000160014b0a3af144208412693ca7d166852b52db0aef06e0000000001011f18c69a3b00000000160014b0a3af144208412693ca7d166852b52db0aef06e01086b02473044022005275a485734e0ae1f3b971237586f0e72dc85833d278c0e474cd23112c0fa5e02206b048c83cebc3c41d0b93cc7da76185cedbd030d005b08018be2b98bbacbdf7b012103760dcca05f3997dc65b293060f7f29f1514c8c527048e12802b041d4fc340a270111048c8dc46200220202d601f84846a6755f776be00e3d9de8fb10acc935fb83c45fb0162d4cad5ab79218f69d873e540000800100008000000080000000002a000000002202036efe2c255621986553ba9d65c3ddc64165ca1436e05aa35a4c6eb02451cf796d18f69d873e540000800100008000000080010000006200000000";
+    expect(
+        () => Psbt.fromHex(psbtData),
+        throwsA(isA<DartBitcoinPluginException>().having(
+            (p) => p.message,
+            'error message',
+            contains(
+                'Invalid PSBT Input: PSBT_IN_REQUIRED_TIME_LOCKTIME is not allowed'))));
+  });
+  test("Case: PSBTv0 but with PSBT_IN_SEQUENCE.", () {
+    const psbtData =
+        "70736274ff01007102000000010b0ad921419c1c8719735d72dc739f9ea9e0638d1fe4c1eef0f9944084815fc80000000000feffffff020008af2f00000000160014c430f64c4756da310dbd1a085572ef299926272c8bbdeb0b00000000160014a07dac8ab6ca942d379ed795f835ba71c9cc688500000000000100520200000001c1aa256e214b96a1822f93de42bff3b5f3ff8d0519306e3515d7515a5e805b120000000000ffffffff0118c69a3b00000000160014b0a3af144208412693ca7d166852b52db0aef06e0000000001011f18c69a3b00000000160014b0a3af144208412693ca7d166852b52db0aef06e01086b02473044022005275a485734e0ae1f3b971237586f0e72dc85833d278c0e474cd23112c0fa5e02206b048c83cebc3c41d0b93cc7da76185cedbd030d005b08018be2b98bbacbdf7b012103760dcca05f3997dc65b293060f7f29f1514c8c527048e12802b041d4fc340a27011004ffffffff00220202d601f84846a6755f776be00e3d9de8fb10acc935fb83c45fb0162d4cad5ab79218f69d873e540000800100008000000080000000002a000000002202036efe2c255621986553ba9d65c3ddc64165ca1436e05aa35a4c6eb02451cf796d18f69d873e540000800100008000000080010000006200000000";
+    expect(
+        () => Psbt.fromHex(psbtData),
+        throwsA(isA<DartBitcoinPluginException>().having(
+            (p) => p.message,
+            'error message',
+            contains('Invalid PSBT Input: PSBT_IN_SEQUENCE is not allowed'))));
+  });
+  test("Case: PSBTv0 but with PSBT_IN_OUTPUT_INDEX", () {
+    const psbtData =
+        "70736274ff01007102000000010b0ad921419c1c8719735d72dc739f9ea9e0638d1fe4c1eef0f9944084815fc80000000000feffffff020008af2f00000000160014c430f64c4756da310dbd1a085572ef299926272c8bbdeb0b00000000160014a07dac8ab6ca942d379ed795f835ba71c9cc688500000000000100520200000001c1aa256e214b96a1822f93de42bff3b5f3ff8d0519306e3515d7515a5e805b120000000000ffffffff0118c69a3b00000000160014b0a3af144208412693ca7d166852b52db0aef06e0000000001011f18c69a3b00000000160014b0a3af144208412693ca7d166852b52db0aef06e01086b02473044022005275a485734e0ae1f3b971237586f0e72dc85833d278c0e474cd23112c0fa5e02206b048c83cebc3c41d0b93cc7da76185cedbd030d005b08018be2b98bbacbdf7b012103760dcca05f3997dc65b293060f7f29f1514c8c527048e12802b041d4fc340a27010f040000000000220202d601f84846a6755f776be00e3d9de8fb10acc935fb83c45fb0162d4cad5ab79218f69d873e540000800100008000000080000000002a000000002202036efe2c255621986553ba9d65c3ddc64165ca1436e05aa35a4c6eb02451cf796d18f69d873e540000800100008000000080010000006200000000";
+    expect(
+        () => Psbt.fromHex(psbtData),
+        throwsA(isA<DartBitcoinPluginException>().having(
+            (p) => p.message,
+            'error message',
+            contains(
+                'Invalid PSBT Input: PSBT_IN_OUTPUT_INDEX is not allowed'))));
+  });
+  test("Case: PSBTv0 but with PSBT_IN_PREVIOUS_TXID.", () {
+    const psbtData =
+        "70736274ff01007102000000010b0ad921419c1c8719735d72dc739f9ea9e0638d1fe4c1eef0f9944084815fc80000000000feffffff020008af2f00000000160014c430f64c4756da310dbd1a085572ef299926272c8bbdeb0b00000000160014a07dac8ab6ca942d379ed795f835ba71c9cc688500000000000100520200000001c1aa256e214b96a1822f93de42bff3b5f3ff8d0519306e3515d7515a5e805b120000000000ffffffff0118c69a3b00000000160014b0a3af144208412693ca7d166852b52db0aef06e0000000001011f18c69a3b00000000160014b0a3af144208412693ca7d166852b52db0aef06e01086b02473044022005275a485734e0ae1f3b971237586f0e72dc85833d278c0e474cd23112c0fa5e02206b048c83cebc3c41d0b93cc7da76185cedbd030d005b08018be2b98bbacbdf7b012103760dcca05f3997dc65b293060f7f29f1514c8c527048e12802b041d4fc340a27010e200b0ad921419c1c8719735d72dc739f9ea9e0638d1fe4c1eef0f9944084815fc800220202d601f84846a6755f776be00e3d9de8fb10acc935fb83c45fb0162d4cad5ab79218f69d873e540000800100008000000080000000002a000000002202036efe2c255621986553ba9d65c3ddc64165ca1436e05aa35a4c6eb02451cf796d18f69d873e540000800100008000000080010000006200000000";
+    expect(
+        () => Psbt.fromHex(psbtData),
+        throwsA(isA<DartBitcoinPluginException>().having(
+            (p) => p.message,
+            'error message',
+            contains(
+                'Invalid PSBT Input: PSBT_IN_PREVIOUS_TXID is not allowed'))));
+  });
+  test("Case: PSBTv0 but with PSBT_GLOBAL_TX_MODIFIABLE.", () {
+    const psbtData =
+        "70736274ff01007102000000010b0ad921419c1c8719735d72dc739f9ea9e0638d1fe4c1eef0f9944084815fc80000000000feffffff020008af2f00000000160014c430f64c4756da310dbd1a085572ef299926272c8bbdeb0b00000000160014a07dac8ab6ca942d379ed795f835ba71c9cc68850000000001060100000100520200000001c1aa256e214b96a1822f93de42bff3b5f3ff8d0519306e3515d7515a5e805b120000000000ffffffff0118c69a3b00000000160014b0a3af144208412693ca7d166852b52db0aef06e0000000001011f18c69a3b00000000160014b0a3af144208412693ca7d166852b52db0aef06e01086b02473044022005275a485734e0ae1f3b971237586f0e72dc85833d278c0e474cd23112c0fa5e02206b048c83cebc3c41d0b93cc7da76185cedbd030d005b08018be2b98bbacbdf7b012103760dcca05f3997dc65b293060f7f29f1514c8c527048e12802b041d4fc340a2700220202d601f84846a6755f776be00e3d9de8fb10acc935fb83c45fb0162d4cad5ab79218f69d873e540000800100008000000080000000002a000000002202036efe2c255621986553ba9d65c3ddc64165ca1436e05aa35a4c6eb02451cf796d18f69d873e540000800100008000000080010000006200000000";
+    expect(
+        () => Psbt.fromHex(psbtData),
+        throwsA(isA<DartBitcoinPluginException>().having(
+            (p) => p.message,
+            'error message',
+            contains(
+                'Invalid PSBT Global: PSBT_GLOBAL_TX_MODIFIABLE is not allowed'))));
+  });
+  test("Case: PSBTv0 but with PSBT_GLOBAL_OUTPUT_COUNT.", () {
+    const psbtData =
+        "70736274ff01007102000000010b0ad921419c1c8719735d72dc739f9ea9e0638d1fe4c1eef0f9944084815fc80000000000feffffff020008af2f00000000160014c430f64c4756da310dbd1a085572ef299926272c8bbdeb0b00000000160014a07dac8ab6ca942d379ed795f835ba71c9cc68850000000001050102000100520200000001c1aa256e214b96a1822f93de42bff3b5f3ff8d0519306e3515d7515a5e805b120000000000ffffffff0118c69a3b00000000160014b0a3af144208412693ca7d166852b52db0aef06e0000000001011f18c69a3b00000000160014b0a3af144208412693ca7d166852b52db0aef06e01086b02473044022005275a485734e0ae1f3b971237586f0e72dc85833d278c0e474cd23112c0fa5e02206b048c83cebc3c41d0b93cc7da76185cedbd030d005b08018be2b98bbacbdf7b012103760dcca05f3997dc65b293060f7f29f1514c8c527048e12802b041d4fc340a2700220202d601f84846a6755f776be00e3d9de8fb10acc935fb83c45fb0162d4cad5ab79218f69d873e540000800100008000000080000000002a000000002202036efe2c255621986553ba9d65c3ddc64165ca1436e05aa35a4c6eb02451cf796d18f69d873e540000800100008000000080010000006200000000";
+    expect(
+        () => Psbt.fromHex(psbtData),
+        throwsA(isA<DartBitcoinPluginException>().having(
+            (p) => p.message,
+            'error message',
+            contains(
+                'Invalid PSBT Global: PSBT_GLOBAL_OUTPUT_COUNT is not allowed'))));
+  });
+  test("Case: PSBTv0 but with PSBT_GLOBAL_INPUT_COUNT.", () {
+    const psbtData =
+        "70736274ff01007102000000010b0ad921419c1c8719735d72dc739f9ea9e0638d1fe4c1eef0f9944084815fc80000000000feffffff020008af2f00000000160014c430f64c4756da310dbd1a085572ef299926272c8bbdeb0b00000000160014a07dac8ab6ca942d379ed795f835ba71c9cc68850000000001040102000100520200000001c1aa256e214b96a1822f93de42bff3b5f3ff8d0519306e3515d7515a5e805b120000000000ffffffff0118c69a3b00000000160014b0a3af144208412693ca7d166852b52db0aef06e0000000001011f18c69a3b00000000160014b0a3af144208412693ca7d166852b52db0aef06e01086b02473044022005275a485734e0ae1f3b971237586f0e72dc85833d278c0e474cd23112c0fa5e02206b048c83cebc3c41d0b93cc7da76185cedbd030d005b08018be2b98bbacbdf7b012103760dcca05f3997dc65b293060f7f29f1514c8c527048e12802b041d4fc340a2700220202d601f84846a6755f776be00e3d9de8fb10acc935fb83c45fb0162d4cad5ab79218f69d873e540000800100008000000080000000002a000000002202036efe2c255621986553ba9d65c3ddc64165ca1436e05aa35a4c6eb02451cf796d18f69d873e540000800100008000000080010000006200000000";
+    expect(
+        () => Psbt.fromHex(psbtData),
+        throwsA(isA<DartBitcoinPluginException>().having(
+            (p) => p.message,
+            'error message',
+            contains(
+                'Invalid PSBT Global: PSBT_GLOBAL_INPUT_COUNT is not allowed'))));
+  });
+  test("Case: PSBTv0 but with PSBT_GLOBAL_FALLBACK_LOCKTIME.", () {
+    const psbtData =
+        "70736274ff01007102000000010b0ad921419c1c8719735d72dc739f9ea9e0638d1fe4c1eef0f9944084815fc80000000000feffffff020008af2f00000000160014c430f64c4756da310dbd1a085572ef299926272c8bbdeb0b00000000160014a07dac8ab6ca942d379ed795f835ba71c9cc68850000000001030402000000000100520200000001c1aa256e214b96a1822f93de42bff3b5f3ff8d0519306e3515d7515a5e805b120000000000ffffffff0118c69a3b00000000160014b0a3af144208412693ca7d166852b52db0aef06e0000000001011f18c69a3b00000000160014b0a3af144208412693ca7d166852b52db0aef06e01086b02473044022005275a485734e0ae1f3b971237586f0e72dc85833d278c0e474cd23112c0fa5e02206b048c83cebc3c41d0b93cc7da76185cedbd030d005b08018be2b98bbacbdf7b012103760dcca05f3997dc65b293060f7f29f1514c8c527048e12802b041d4fc340a2700220202d601f84846a6755f776be00e3d9de8fb10acc935fb83c45fb0162d4cad5ab79218f69d873e540000800100008000000080000000002a000000002202036efe2c255621986553ba9d65c3ddc64165ca1436e05aa35a4c6eb02451cf796d18f69d873e540000800100008000000080010000006200000000";
+    expect(
+        () => Psbt.fromHex(psbtData),
+        throwsA(isA<DartBitcoinPluginException>().having(
+            (p) => p.message,
+            'error message',
+            contains(
+                'Invalid PSBT Global: PSBT_GLOBAL_FALLBACK_LOCKTIME is not allowed'))));
+  });
+  test("Case: PSBTv0 but with PSBT_GLOBAL_TX_VERSION", () {
+    const psbtData =
+        "70736274ff01007102000000010b0ad921419c1c8719735d72dc739f9ea9e0638d1fe4c1eef0f9944084815fc80000000000feffffff020008af2f00000000160014c430f64c4756da310dbd1a085572ef299926272c8bbdeb0b00000000160014a07dac8ab6ca942d379ed795f835ba71c9cc68850000000001020402000000000100520200000001c1aa256e214b96a1822f93de42bff3b5f3ff8d0519306e3515d7515a5e805b120000000000ffffffff0118c69a3b00000000160014b0a3af144208412693ca7d166852b52db0aef06e0000000001011f18c69a3b00000000160014b0a3af144208412693ca7d166852b52db0aef06e01086b02473044022005275a485734e0ae1f3b971237586f0e72dc85833d278c0e474cd23112c0fa5e02206b048c83cebc3c41d0b93cc7da76185cedbd030d005b08018be2b98bbacbdf7b012103760dcca05f3997dc65b293060f7f29f1514c8c527048e12802b041d4fc340a2700220202d601f84846a6755f776be00e3d9de8fb10acc935fb83c45fb0162d4cad5ab79218f69d873e540000800100008000000080000000002a000000002202036efe2c255621986553ba9d65c3ddc64165ca1436e05aa35a4c6eb02451cf796d18f69d873e540000800100008000000080010000006200000000";
+    expect(
+        () => Psbt.fromHex(psbtData),
+        throwsA(isA<DartBitcoinPluginException>().having(
+            (p) => p.message,
+            'error message',
+            contains(
+                'Invalid PSBT Global: PSBT_GLOBAL_TX_VERSION is not allowed'))));
+  });
+  test("Case: PSBTv0 but with PSBT_GLOBAL_VERSION set to 2", () {
+    const psbtData =
+        "70736274ff01007102000000010b0ad921419c1c8719735d72dc739f9ea9e0638d1fe4c1eef0f9944084815fc80000000000feffffff020008af2f00000000160014c430f64c4756da310dbd1a085572ef299926272c8bbdeb0b00000000160014a07dac8ab6ca942d379ed795f835ba71c9cc68850000000001fb0402000000000100520200000001c1aa256e214b96a1822f93de42bff3b5f3ff8d0519306e3515d7515a5e805b120000000000ffffffff0118c69a3b00000000160014b0a3af144208412693ca7d166852b52db0aef06e0000000001011f18c69a3b00000000160014b0a3af144208412693ca7d166852b52db0aef06e01086b02473044022005275a485734e0ae1f3b971237586f0e72dc85833d278c0e474cd23112c0fa5e02206b048c83cebc3c41d0b93cc7da76185cedbd030d005b08018be2b98bbacbdf7b012103760dcca05f3997dc65b293060f7f29f1514c8c527048e12802b041d4fc340a2700220202d601f84846a6755f776be00e3d9de8fb10acc935fb83c45fb0162d4cad5ab79218f69d873e540000800100008000000080000000002a000000002202036efe2c255621986553ba9d65c3ddc64165ca1436e05aa35a4c6eb02451cf796d18f69d873e540000800100008000000080010000006200000000";
+    expect(
+        () => Psbt.fromHex(psbtData),
+        throwsA(isA<DartBitcoinPluginException>().having(
+            (p) => p.message,
+            'error message',
+
+            /// detect as version 2 but missing required fields
+            contains(
+                'Invalid PSBT global: Missing required field PSBT_GLOBAL_INPUT_COUNT'))));
+  });
+}
+
+void _test() {
+  test("Case: 1 input, 2 output PSBTv2, required fields only", () {
+    const psbtData =
+        "70736274ff01020402000000010401010105010201fb040200000000010e200b0ad921419c1c8719735d72dc739f9ea9e0638d1fe4c1eef0f9944084815fc8010f0400000000000103080008af2f000000000104160014c430f64c4756da310dbd1a085572ef299926272c000103088bbdeb0b0000000001041600144dd193ac964a56ac1b9e1cca8454fe2f474f851300";
+    final psbt = Psbt.deserialize(BytesUtils.fromHexString(psbtData));
+    expect(psbt.toHex(), psbtData);
+  });
+  test("Case: Fallback locktime of 0", () {
+    const psbtData =
+        "70736274ff0102040200000001030400000000010401020105010101fb040200000000010e200f758dbfbd4da7c16c8a3309c3c81e1100f561ea646db5b01752c485e1bdde9f010f040100000000010e203a1b3b3c837d6489ea7a31d8e6c7dd503c001bef3e06958e7574808d68ca78a5010f0400000000000103084f9335770000000001041600140b1352cacd03cf6aa1b7f3c8d6388671b34a5e1100";
+    final psbt = Psbt.deserialize(BytesUtils.fromHexString(psbtData));
+    expect(psbt.toHex(), psbtData);
+  });
+
+  test("Case: Fallback locktime of 0", () {
+    const psbtData =
+        "70736274ff0102040200000001030400000000010401020105010101fb040200000000010e200f758dbfbd4da7c16c8a3309c3c81e1100f561ea646db5b01752c485e1bdde9f010f040100000000010e203a1b3b3c837d6489ea7a31d8e6c7dd503c001bef3e06958e7574808d68ca78a5010f0400000000000103084f9335770000000001041600140b1352cacd03cf6aa1b7f3c8d6388671b34a5e1100";
+    final psbt = Psbt.deserialize(BytesUtils.fromHexString(psbtData));
+    expect(psbt.toHex(), psbtData);
+  });
+  test(
+      "Case: Input 1 has PSBT_IN_REQUIRED_HEIGHT_LOCKTIME of 10000, Input 2 has no locktime fields",
+      () {
+    const psbtData =
+        "70736274ff0102040200000001030400000000010401020105010101fb040200000000010e200f758dbfbd4da7c16c8a3309c3c81e1100f561ea646db5b01752c485e1bdde9f010f04010000000112041027000000010e203a1b3b3c837d6489ea7a31d8e6c7dd503c001bef3e06958e7574808d68ca78a5010f0400000000000103084f9335770000000001041600140b1352cacd03cf6aa1b7f3c8d6388671b34a5e1100";
+    final psbt = Psbt.deserialize(BytesUtils.fromHexString(psbtData));
+    expect(psbt.toHex(), psbtData);
+  });
+  test(
+      "Case: Input 1 has PSBT_IN_REQUIRED_HEIGHT_LOCKTIME of 10000, Input 2 has PSBT_IN_REQUIRED_HEIGHT_LOCKTIME of 9000",
+      () {
+    const psbtData =
+        "70736274ff0102040200000001030400000000010401020105010101fb040200000000010e200f758dbfbd4da7c16c8a3309c3c81e1100f561ea646db5b01752c485e1bdde9f010f04010000000112041027000000010e203a1b3b3c837d6489ea7a31d8e6c7dd503c001bef3e06958e7574808d68ca78a5010f040000000001120428230000000103084f9335770000000001041600140b1352cacd03cf6aa1b7f3c8d6388671b34a5e1100";
+    final psbt = Psbt.deserialize(BytesUtils.fromHexString(psbtData));
+    expect(psbt.toHex(), psbtData);
+  });
+  test(
+      "Case: Input 1 has PSBT_IN_REQUIRED_HEIGHT_LOCKTIME of 10000, Input 2 has PSBT_IN_REQUIRED_HEIGHT_LOCKTIME of 9000 and PSBT_IN_REQUIRED_TIME_LOCKTIME of 1657048460",
+      () {
+    const psbtData =
+        "70736274ff0102040200000001030400000000010401020105010101fb040200000000010e200f758dbfbd4da7c16c8a3309c3c81e1100f561ea646db5b01752c485e1bdde9f010f04010000000112041027000000010e203a1b3b3c837d6489ea7a31d8e6c7dd503c001bef3e06958e7574808d68ca78a5010f04000000000111048c8dc46201120428230000000103084f9335770000000001041600140b1352cacd03cf6aa1b7f3c8d6388671b34a5e1100";
+    final psbt = Psbt.deserialize(BytesUtils.fromHexString(psbtData));
+    expect(psbt.toHex(), psbtData);
+  });
+  test(
+      "Case: Input 1 has PSBT_IN_REQUIRED_HEIGHT_LOCKTIME of 10000 and PSBT_IN_REQUIRED_TIME_LOCKTIME of 1657048459, Input 2 has PSBT_IN_REQUIRED_HEIGHT_LOCKTIME of 9000 and PSBT_IN_REQUIRED_TIME_LOCKTIME of 1657048460",
+      () {
+    const psbtData =
+        "70736274ff0102040200000001030400000000010401020105010101fb040200000000010e200f758dbfbd4da7c16c8a3309c3c81e1100f561ea646db5b01752c485e1bdde9f010f04010000000111048b8dc4620112041027000000010e203a1b3b3c837d6489ea7a31d8e6c7dd503c001bef3e06958e7574808d68ca78a5010f04000000000111048c8dc46201120428230000000103084f9335770000000001041600140b1352cacd03cf6aa1b7f3c8d6388671b34a5e1100";
+    final psbt = Psbt.deserialize(BytesUtils.fromHexString(psbtData));
+    expect(psbt.toHex(), psbtData);
+  });
+
+  test(
+      "Case: Input 1 has PSBT_IN_REQUIRED_TIME_LOCKTIME of 1657048459, Input 2 has PSBT_IN_REQUIRED_HEIGHT_LOCKTIME of 9000 and PSBT_IN_REQUIRED_TIME_LOCKTIME of 1657048460",
+      () {
+    const psbtData =
+        "70736274ff0102040200000001030400000000010401020105010101fb040200000000010e200f758dbfbd4da7c16c8a3309c3c81e1100f561ea646db5b01752c485e1bdde9f010f04010000000111048b8dc46200010e203a1b3b3c837d6489ea7a31d8e6c7dd503c001bef3e06958e7574808d68ca78a5010f04000000000111048c8dc46201120428230000000103084f9335770000000001041600140b1352cacd03cf6aa1b7f3c8d6388671b34a5e1100";
+    final psbt = Psbt.deserialize(BytesUtils.fromHexString(psbtData));
+    expect(psbt.toHex(), psbtData);
+  });
+  test(
+      "Case: Input 1 has PSBT_IN_REQUIRED_HEIGHT_LOCKTIME of 10000 and PSBT_IN_REQUIRED_TIME_LOCKTIME of 1657048459, Input 2 has PSBT_IN_REQUIRED_TIME_LOCKTIME of 1657048460",
+      () {
+    const psbtData =
+        "70736274ff0102040200000001030400000000010401020105010101fb040200000000010e200f758dbfbd4da7c16c8a3309c3c81e1100f561ea646db5b01752c485e1bdde9f010f04010000000111048b8dc4620112041027000000010e203a1b3b3c837d6489ea7a31d8e6c7dd503c001bef3e06958e7574808d68ca78a5010f04000000000111048c8dc462000103084f9335770000000001041600140b1352cacd03cf6aa1b7f3c8d6388671b34a5e1100";
+    final psbt = Psbt.deserialize(BytesUtils.fromHexString(psbtData));
+    expect(psbt.toHex(), psbtData);
+  });
+  test(
+      "Case: Input 1 has PSBT_IN_REQUIRED_HEIGHT_LOCKTIME of 10000 and PSBT_IN_REQUIRED_TIME_LOCKTIME of 1657048459, Input 2 has PSBT_IN_REQUIRED_TIME_LOCKTIME of 1657048460",
+      () {
+    const psbtData =
+        "70736274ff0102040200000001030400000000010401020105010101fb040200000000010e200f758dbfbd4da7c16c8a3309c3c81e1100f561ea646db5b01752c485e1bdde9f010f040100000000010e203a1b3b3c837d6489ea7a31d8e6c7dd503c001bef3e06958e7574808d68ca78a5010f04000000000111048c8dc462000103084f9335770000000001041600140b1352cacd03cf6aa1b7f3c8d6388671b34a5e1100";
+    final psbt = Psbt.deserialize(BytesUtils.fromHexString(psbtData));
+    expect(psbt.toHex(), psbtData);
+  });
+  test(
+      "Case: Input 1 has PSBT_IN_REQUIRED_HEIGHT_LOCKTIME of 10000, Input 2 has PSBT_IN_REQUIRED_TIME_LOCKTIME of 1657048460",
+      () {
+    const psbtData =
+        "70736274ff0102040200000001030400000000010401020105010101fb040200000000010e200f758dbfbd4da7c16c8a3309c3c81e1100f561ea646db5b01752c485e1bdde9f010f04010000000112041027000000010e203a1b3b3c837d6489ea7a31d8e6c7dd503c001bef3e06958e7574808d68ca78a5010f04000000000111048c8dc462000103084f9335770000000001041600140b1352cacd03cf6aa1b7f3c8d6388671b34a5e1100";
+    final psbt = Psbt.deserialize(BytesUtils.fromHexString(psbtData));
+    expect(psbt.toHex(), psbtData);
+  });
+}
diff --git a/test/psbt/bip_0371_test.dart b/test/psbt/bip_0371_test.dart
new file mode 100644
index 0000000..9135601
--- /dev/null
+++ b/test/psbt/bip_0371_test.dart
@@ -0,0 +1,168 @@
+import 'package:bitcoin_base/bitcoin_base.dart';
+import 'package:blockchain_utils/utils/utils.dart';
+import 'package:test/test.dart';
+
+/// https://github.com/bitcoin/bips/blob/master/bip-0371.mediawiki
+void main() {
+  group("BIP-0371", () {
+    _testInvalid();
+    _test();
+  });
+}
+
+void _test() {
+  test("bitcoin core finalized", () {
+    const psbt =
+        "cHNidP8BAP1cAQIAAAADxj8RdgFDtzDdfcqV1X98hO9kw5mmvprH+e40YpDERPcBAAAAAP3///861gKrCF1XQNU4kqbrqrmcLtU+Rigur+DR7xZbB0RatgEAAAAA/f///+yk8o8uR7yO28jNGwL6PPKutFOAYxJcNIMlqpD60i7DAQAAAAD9////BaCGAQAAAAAAIlEgimPuBhhCdQYrO4ZqEMQAzie6Qb3B13C/ueX4Ke2JzvcQJwAAAAAAACJRINw2pKJpPBvZ7/LceBDMjmc8c+wXdXAYpgOr+NFM8PKyECcAAAAAAAAiUSCNo28bw7B4Kk888EYwO0UPs2x6rCOtsRD+zOnuO6y48WZMAAAAAAAAIlEgZV6YZttlyJcTy0AAdbeNRNw7cVV8d7rlfJcH9aV8bdkQJwAAAAAAACJRIKLnidPDMiEbvroZh8qKrC2okpW77ZSJEUy/oeOOG7piAAAAAAABAHICAAAAAc7QqtnT2PYCJuOTOKhdefBErI+0rAKee5UAny1QQfZhAAAAAAD9////Aoa4cakdAAAAFgAUe0WEM9DAQyNCbviDZb1M/vFBrHVQwwAAAAAAABepFDMIZjlVPdB+lcAKr5IIatD0Dzd/hwAAAAABASBQwwAAAAAAABepFDMIZjlVPdB+lcAKr5IIatD0Dzd/hwEHFxYAFAHfjFcErFRhkgBrBxy95xMdV/GQAQhrAkcwRAIgObHjIugt09KnDA5D+l8+CUpTJxfd0cZPAR3SB8eNe6YCIF+5y6EIre5LEaN5T/1628yHxjiwfyl0pVJk+laaYf3yASECsNWM0bPsBEw+xVx6PS1LXdmv1yAe7p12SbCFaLoqsZUAAQBxAgAAAAHspPKPLke8jtvIzRsC+jzyrrRTgGMSXDSDJaqQ+tIuwwAAAAAA/f///wLg02OMFQAAABYAFHtFhDPQwEMjQm74g2W9TP7xQax1UMMAAAAAAAAWABTB00kCgBw+2HOJJst8mxIBH39qUgAAAAABAR9QwwAAAAAAABYAFMHTSQKAHD7Yc4kmy3ybEgEff2pSAQhrAkcwRAIgAvxb0XMjUWCtbuxY8MTCVvALk2DpRNZZO+ycrYmdTJsCIAdSyU5KpevQlW0pVl9523qDNTgz0xPozFjhwHyfre/0ASECpEHEHK86mziovdiDhJs5SSZZrx++e6KmR4OpBoG+snUAAQB9AgAAAAHUDN3g+ar6PY49uD2a/bTT2bF0QNkT4VBVtC7fZPPi9QAAAAAA/f///wJHs2SMFQAAABYAFHtFhDPQwEMjQm74g2W9TP7xQax1UMMAAAAAAAAiUSAqfxYJr8XN5TOxjQ75w4zmgk1V6vbfri9RTJAwxjN16QAAAAABAStQwwAAAAAAACJRICp/Fgmvxc3lM7GNDvnDjOaCTVXq9t+uL1FMkDDGM3XpAQhCAUAS8C+joMO9vNmwaHlqCUwP8gqOoBNJJ1oOIs1Qg6ctYeAqX+1doY7I6YeEAnHkdfNy8qzzxTb9MXhVFwxLAZ2QAAAAAAEFIDuFiGvpC3V86Up593ypycPH3pXB44VBqp0r2RPmktzlIQc7hYhr6Qt1fOlKefd8qcnDx96VweOFQaqdK9kT5pLc5RkAkCKrPVYAAIABAACAAAAAgAEAAAAAAAAAAAA=";
+
+    final builer = PsbtBuilder.fromBase64(
+        "cHNidP8BAP1cAQIAAAADxj8RdgFDtzDdfcqV1X98hO9kw5mmvprH+e40YpDERPcBAAAAAP3///861gKrCF1XQNU4kqbrqrmcLtU+Rigur+DR7xZbB0RatgEAAAAA/f///+yk8o8uR7yO28jNGwL6PPKutFOAYxJcNIMlqpD60i7DAQAAAAD9////BaCGAQAAAAAAIlEgimPuBhhCdQYrO4ZqEMQAzie6Qb3B13C/ueX4Ke2JzvcQJwAAAAAAACJRINw2pKJpPBvZ7/LceBDMjmc8c+wXdXAYpgOr+NFM8PKyECcAAAAAAAAiUSCNo28bw7B4Kk888EYwO0UPs2x6rCOtsRD+zOnuO6y48WZMAAAAAAAAIlEgZV6YZttlyJcTy0AAdbeNRNw7cVV8d7rlfJcH9aV8bdkQJwAAAAAAACJRIKLnidPDMiEbvroZh8qKrC2okpW77ZSJEUy/oeOOG7piAAAAAAABAHICAAAAAc7QqtnT2PYCJuOTOKhdefBErI+0rAKee5UAny1QQfZhAAAAAAD9////Aoa4cakdAAAAFgAUe0WEM9DAQyNCbviDZb1M/vFBrHVQwwAAAAAAABepFDMIZjlVPdB+lcAKr5IIatD0Dzd/hwAAAAABASBQwwAAAAAAABepFDMIZjlVPdB+lcAKr5IIatD0Dzd/hwEHFxYAFAHfjFcErFRhkgBrBxy95xMdV/GQAQhrAkcwRAIgObHjIugt09KnDA5D+l8+CUpTJxfd0cZPAR3SB8eNe6YCIF+5y6EIre5LEaN5T/1628yHxjiwfyl0pVJk+laaYf3yASECsNWM0bPsBEw+xVx6PS1LXdmv1yAe7p12SbCFaLoqsZUAAQBxAgAAAAHspPKPLke8jtvIzRsC+jzyrrRTgGMSXDSDJaqQ+tIuwwAAAAAA/f///wLg02OMFQAAABYAFHtFhDPQwEMjQm74g2W9TP7xQax1UMMAAAAAAAAWABTB00kCgBw+2HOJJst8mxIBH39qUgAAAAABAR9QwwAAAAAAABYAFMHTSQKAHD7Yc4kmy3ybEgEff2pSAQhrAkcwRAIgAvxb0XMjUWCtbuxY8MTCVvALk2DpRNZZO+ycrYmdTJsCIAdSyU5KpevQlW0pVl9523qDNTgz0xPozFjhwHyfre/0ASECpEHEHK86mziovdiDhJs5SSZZrx++e6KmR4OpBoG+snUAAQB9AgAAAAHUDN3g+ar6PY49uD2a/bTT2bF0QNkT4VBVtC7fZPPi9QAAAAAA/f///wJHs2SMFQAAABYAFHtFhDPQwEMjQm74g2W9TP7xQax1UMMAAAAAAAAiUSAqfxYJr8XN5TOxjQ75w4zmgk1V6vbfri9RTJAwxjN16QAAAAABAStQwwAAAAAAACJRICp/Fgmvxc3lM7GNDvnDjOaCTVXq9t+uL1FMkDDGM3XpAQhCAUAS8C+joMO9vNmwaHlqCUwP8gqOoBNJJ1oOIs1Qg6ctYeAqX+1doY7I6YeEAnHkdfNy8qzzxTb9MXhVFwxLAZ2QAAAAAAEFIDuFiGvpC3V86Up593ypycPH3pXB44VBqp0r2RPmktzlIQc7hYhr6Qt1fOlKefd8qcnDx96VweOFQaqdK9kT5pLc5RkAkCKrPVYAAIABAACAAAAAgAEAAAAAAAAAAAA=");
+    expect(psbt, builer.toBase64());
+  });
+  test(
+      "Case: PSBT with one P2TR key only input with internal key and its derivation path",
+      () {
+    const psbtData =
+        "70736274ff010052020000000127744ababf3027fe0d6cf23a96eee2efb188ef52301954585883e69b6624b2420000000000ffffffff0148e6052a01000000160014768e1eeb4cf420866033f80aceff0f9720744969000000000001012b00f2052a010000002251205a2c2cf5b52cf31f83ad2e8da63ff03183ecd8f609c7510ae8a48e03910a07572116fe349064c98d6e2a853fa3c9b12bd8b304a19c195c60efa7ee2393046d3fa2321900772b2da75600008001000080000000800100000000000000011720fe349064c98d6e2a853fa3c9b12bd8b304a19c195c60efa7ee2393046d3fa232002202036b772a6db74d8753c98a827958de6c78ab3312109f37d3e0304484242ece73d818772b2da7540000800100008000000080000000000000000000";
+    final psbt = Psbt.deserialize(BytesUtils.fromHexString(psbtData));
+    expect(psbt.toHex(), psbtData);
+  });
+  test(
+      "Case: PSBT with one P2TR key only input with internal key, its derivation path, and signature",
+      () {
+    const psbtData =
+        "70736274ff010052020000000127744ababf3027fe0d6cf23a96eee2efb188ef52301954585883e69b6624b2420000000000ffffffff0148e6052a01000000160014768e1eeb4cf420866033f80aceff0f9720744969000000000001012b00f2052a010000002251205a2c2cf5b52cf31f83ad2e8da63ff03183ecd8f609c7510ae8a48e03910a0757011340bb53ec917bad9d906af1ba87181c48b86ace5aae2b53605a725ca74625631476fc6f5baedaf4f2ee0f477f36f58f3970d5b8273b7e497b97af2e3f125c97af342116fe349064c98d6e2a853fa3c9b12bd8b304a19c195c60efa7ee2393046d3fa2321900772b2da75600008001000080000000800100000000000000011720fe349064c98d6e2a853fa3c9b12bd8b304a19c195c60efa7ee2393046d3fa232002202036b772a6db74d8753c98a827958de6c78ab3312109f37d3e0304484242ece73d818772b2da7540000800100008000000080000000000000000000";
+    final psbt = Psbt.deserialize(BytesUtils.fromHexString(psbtData));
+    expect(psbt.toHex(), psbtData);
+  });
+
+  test(
+      "Case: PSBT with one P2TR key only output with internal key and its derivation path",
+      () {
+    const psbtData =
+        "70736274ff01005e020000000127744ababf3027fe0d6cf23a96eee2efb188ef52301954585883e69b6624b2420000000000ffffffff0148e6052a0100000022512083698e458c6664e1595d75da2597de1e22ee97d798e706c4c0a4b5a9823cd743000000000001012b00f2052a010000002251205a2c2cf5b52cf31f83ad2e8da63ff03183ecd8f609c7510ae8a48e03910a07572116fe349064c98d6e2a853fa3c9b12bd8b304a19c195c60efa7ee2393046d3fa2321900772b2da75600008001000080000000800100000000000000011720fe349064c98d6e2a853fa3c9b12bd8b304a19c195c60efa7ee2393046d3fa232000105201124da7aec92ccd06c954562647f437b138b95721a84be2bf2276bbddab3e67121071124da7aec92ccd06c954562647f437b138b95721a84be2bf2276bbddab3e6711900772b2da7560000800100008000000080000000000500000000";
+    final psbt = Psbt.deserialize(BytesUtils.fromHexString(psbtData));
+    expect(psbt.toHex(), psbtData);
+  });
+
+  test(
+      "Case: PSBT with one P2TR script path only input with dummy internal key, scripts, derivation paths for keys in the scripts, and merkle root",
+      () {
+    const psbtData =
+        "70736274ff01005e02000000019bd48765230bf9a72e662001f972556e54f0c6f97feb56bcb5600d817f6995260100000000ffffffff0148e6052a0100000022512083698e458c6664e1595d75da2597de1e22ee97d798e706c4c0a4b5a9823cd743000000000001012b00f2052a01000000225120c2247efbfd92ac47f6f40b8d42d169175a19fa9fa10e4a25d7f35eb4dd85b6926215c150929b74c1a04954b78b4b6035e97a5e078a5a0f28ec96d547bfee9ace803ac06f7d62059e9497a1a4a267569d9876da60101aff38e3529b9b939ce7f91ae970115f2e490af7cc45c4f78511f36057ce5c5a5c56325a29fb44dfc203f356e1f823202cb13ac68248de806aa6a3659cf3c03eb6821d09c8114a4e868febde865bb6d2acc04215c150929b74c1a04954b78b4b6035e97a5e078a5a0f28ec96d547bfee9ace803ac097c6e6fea5ff714ff5724499990810e406e98aa10f5bf7e5f6784bc1d0a9a6ce23204320b0bf16f011b53ea7be615924aa7f27e5d29ad20ea1155d848676c3bad1b2acc06215c150929b74c1a04954b78b4b6035e97a5e078a5a0f28ec96d547bfee9ace803ac0cd970e15f53fc0c82f950fd560ffa919b76172be017368a89913af074f400b09115f2e490af7cc45c4f78511f36057ce5c5a5c56325a29fb44dfc203f356e1f82320fa0f7a3cef3b1d0c0a6ce7d26e17ada0b2e5c92d19efad48b41859cb8a451ca9acc021162cb13ac68248de806aa6a3659cf3c03eb6821d09c8114a4e868febde865bb6d23901cd970e15f53fc0c82f950fd560ffa919b76172be017368a89913af074f400b09772b2da7560000800100008002000080000000000000000021164320b0bf16f011b53ea7be615924aa7f27e5d29ad20ea1155d848676c3bad1b23901115f2e490af7cc45c4f78511f36057ce5c5a5c56325a29fb44dfc203f356e1f8772b2da75600008001000080010000800000000000000000211650929b74c1a04954b78b4b6035e97a5e078a5a0f28ec96d547bfee9ace803ac005007c461e5d2116fa0f7a3cef3b1d0c0a6ce7d26e17ada0b2e5c92d19efad48b41859cb8a451ca939016f7d62059e9497a1a4a267569d9876da60101aff38e3529b9b939ce7f91ae970772b2da7560000800100008003000080000000000000000001172050929b74c1a04954b78b4b6035e97a5e078a5a0f28ec96d547bfee9ace803ac0011820f0362e2f75a6f420a5bde3eb221d96ae6720cf25f81890c95b1d775acb515e65000105201124da7aec92ccd06c954562647f437b138b95721a84be2bf2276bbddab3e67121071124da7aec92ccd06c954562647f437b138b95721a84be2bf2276bbddab3e6711900772b2da7560000800100008000000080000000000500000000";
+    final psbt = Psbt.deserialize(BytesUtils.fromHexString(psbtData));
+    expect(psbt.toHex(), psbtData);
+  });
+  test(
+      "Case: PSBT with one P2TR script path only output with dummy internal key, taproot tree, and script key derivation paths",
+      () {
+    const psbtData =
+        "70736274ff01005e020000000127744ababf3027fe0d6cf23a96eee2efb188ef52301954585883e69b6624b2420000000000ffffffff0148e6052a010000002251200a8cbdc86de1ce1c0f9caeb22d6df7ced3683fe423e05d1e402a879341d6f6f5000000000001012b00f2052a010000002251205a2c2cf5b52cf31f83ad2e8da63ff03183ecd8f609c7510ae8a48e03910a07572116fe349064c98d6e2a853fa3c9b12bd8b304a19c195c60efa7ee2393046d3fa2321900772b2da75600008001000080000000800100000000000000011720fe349064c98d6e2a853fa3c9b12bd8b304a19c195c60efa7ee2393046d3fa2320001052050929b74c1a04954b78b4b6035e97a5e078a5a0f28ec96d547bfee9ace803ac001066f02c02220736e572900fe1252589a2143c8f3c79f71a0412d2353af755e9701c782694a02ac02c02220631c5f3b5832b8fbdebfb19704ceeb323c21f40f7a24f43d68ef0cc26b125969ac01c0222044faa49a0338de488c8dfffecdfb6f329f380bd566ef20c8df6d813eab1c4273ac210744faa49a0338de488c8dfffecdfb6f329f380bd566ef20c8df6d813eab1c42733901f06b798b92a10ed9a9d0bbfd3af173a53b1617da3a4159ca008216cd856b2e0e772b2da75600008001000080010000800000000003000000210750929b74c1a04954b78b4b6035e97a5e078a5a0f28ec96d547bfee9ace803ac005007c461e5d2107631c5f3b5832b8fbdebfb19704ceeb323c21f40f7a24f43d68ef0cc26b125969390118ace409889785e0ea70ceebb8e1ca892a7a78eaede0f2e296cf435961a8f4ca772b2da756000080010000800200008000000000030000002107736e572900fe1252589a2143c8f3c79f71a0412d2353af755e9701c782694a02390129a5b4915090162d759afd3fe0f93fa3326056d0b4088cb933cae7826cb8d82c772b2da7560000800100008003000080000000000300000000";
+    final psbt = Psbt.deserialize(BytesUtils.fromHexString(psbtData));
+    expect(psbt.toHex(), psbtData);
+  });
+  test(
+      "Case: PSBT with one P2TR script path only input with dummy internal key, scripts, script key derivation paths, merkle root, and script path",
+      () {
+    const psbtData =
+        "70736274ff01005e02000000019bd48765230bf9a72e662001f972556e54f0c6f97feb56bcb5600d817f6995260100000000ffffffff0148e6052a0100000022512083698e458c6664e1595d75da2597de1e22ee97d798e706c4c0a4b5a9823cd743000000000001012b00f2052a01000000225120c2247efbfd92ac47f6f40b8d42d169175a19fa9fa10e4a25d7f35eb4dd85b69241142cb13ac68248de806aa6a3659cf3c03eb6821d09c8114a4e868febde865bb6d2cd970e15f53fc0c82f950fd560ffa919b76172be017368a89913af074f400b0940bf818d9757d6ffeb538ba057fb4c1fc4e0f5ef186e765beb564791e02af5fd3d5e2551d4e34e33d86f276b82c99c79aed3f0395a081efcd2cc2c65dd7e693d7941144320b0bf16f011b53ea7be615924aa7f27e5d29ad20ea1155d848676c3bad1b2115f2e490af7cc45c4f78511f36057ce5c5a5c56325a29fb44dfc203f356e1f840e1f1ab6fabfa26b236f21833719dc1d428ab768d80f91f9988d8abef47bfb863bb1f2a529f768c15f00ce34ec283cdc07e88f8428be28f6ef64043c32911811a4114fa0f7a3cef3b1d0c0a6ce7d26e17ada0b2e5c92d19efad48b41859cb8a451ca96f7d62059e9497a1a4a267569d9876da60101aff38e3529b9b939ce7f91ae97040ec1f0379206461c83342285423326708ab031f0da4a253ee45aafa5b8c92034d8b605490f8cd13e00f989989b97e215faa36f12dee3693d2daccf3781c1757f66215c150929b74c1a04954b78b4b6035e97a5e078a5a0f28ec96d547bfee9ace803ac06f7d62059e9497a1a4a267569d9876da60101aff38e3529b9b939ce7f91ae970115f2e490af7cc45c4f78511f36057ce5c5a5c56325a29fb44dfc203f356e1f823202cb13ac68248de806aa6a3659cf3c03eb6821d09c8114a4e868febde865bb6d2acc04215c150929b74c1a04954b78b4b6035e97a5e078a5a0f28ec96d547bfee9ace803ac097c6e6fea5ff714ff5724499990810e406e98aa10f5bf7e5f6784bc1d0a9a6ce23204320b0bf16f011b53ea7be615924aa7f27e5d29ad20ea1155d848676c3bad1b2acc06215c150929b74c1a04954b78b4b6035e97a5e078a5a0f28ec96d547bfee9ace803ac0cd970e15f53fc0c82f950fd560ffa919b76172be017368a89913af074f400b09115f2e490af7cc45c4f78511f36057ce5c5a5c56325a29fb44dfc203f356e1f82320fa0f7a3cef3b1d0c0a6ce7d26e17ada0b2e5c92d19efad48b41859cb8a451ca9acc021162cb13ac68248de806aa6a3659cf3c03eb6821d09c8114a4e868febde865bb6d23901cd970e15f53fc0c82f950fd560ffa919b76172be017368a89913af074f400b09772b2da7560000800100008002000080000000000000000021164320b0bf16f011b53ea7be615924aa7f27e5d29ad20ea1155d848676c3bad1b23901115f2e490af7cc45c4f78511f36057ce5c5a5c56325a29fb44dfc203f356e1f8772b2da75600008001000080010000800000000000000000211650929b74c1a04954b78b4b6035e97a5e078a5a0f28ec96d547bfee9ace803ac005007c461e5d2116fa0f7a3cef3b1d0c0a6ce7d26e17ada0b2e5c92d19efad48b41859cb8a451ca939016f7d62059e9497a1a4a267569d9876da60101aff38e3529b9b939ce7f91ae970772b2da7560000800100008003000080000000000000000001172050929b74c1a04954b78b4b6035e97a5e078a5a0f28ec96d547bfee9ace803ac0011820f0362e2f75a6f420a5bde3eb221d96ae6720cf25f81890c95b1d775acb515e65000105201124da7aec92ccd06c954562647f437b138b95721a84be2bf2276bbddab3e67121071124da7aec92ccd06c954562647f437b138b95721a84be2bf2276bbddab3e6711900772b2da7560000800100008000000080000000000500000000";
+    final psbt = Psbt.deserialize(BytesUtils.fromHexString(psbtData));
+    expect(psbt.toHex(), psbtData);
+  });
+}
+
+void _testInvalid() {
+  test(
+      "Case: PSBT With PSBT_IN_TAP_LEAF_SCRIPT Control block that is too short",
+      () {
+    const psbtData =
+        "70736274ff01005e02000000019bd48765230bf9a72e662001f972556e54f0c6f97feb56bcb5600d817f6995260100000000ffffffff0148e6052a01000000225120030da4fce4f7db28c2cb2951631e003713856597fe963882cb500e68112cca63000000000001012b00f2052a01000000225120c2247efbfd92ac47f6f40b8d42d169175a19fa9fa10e4a25d7f35eb4dd85b6926115c150929b74c1a04954b78b4b6035e97a5e078a5a0f28ec96d547bfee9ace803ac06f7d62059e9497a1a4a267569d9876da60101aff38e3529b9b939ce7f91ae970115f2e490af7cc45c4f78511f36057ce5c5a5c56325a29fb44dfc203f356e123202cb13ac68248de806aa6a3659cf3c03eb6821d09c8114a4e868febde865bb6d2acc00000";
+    expect(
+        () => Psbt.fromHex(psbtData),
+        throwsA(isA<DartBitcoinPluginException>().having((p) => p.message,
+            'error message', contains('Invalid PSBT Taproot Leaf Script'))));
+  });
+  test("Case: PSBT With PSBT_IN_TAP_LEAF_SCRIPT Control block that is too long",
+      () {
+    const psbtData =
+        "70736274ff01005e02000000019bd48765230bf9a72e662001f972556e54f0c6f97feb56bcb5600d817f6995260100000000ffffffff0148e6052a01000000225120030da4fce4f7db28c2cb2951631e003713856597fe963882cb500e68112cca63000000000001012b00f2052a01000000225120c2247efbfd92ac47f6f40b8d42d169175a19fa9fa10e4a25d7f35eb4dd85b6926315c150929b74c1a04954b78b4b6035e97a5e078a5a0f28ec96d547bfee9ace803ac06f7d62059e9497a1a4a267569d9876da60101aff38e3529b9b939ce7f91ae970115f2e490af7cc45c4f78511f36057ce5c5a5c56325a29fb44dfc203f356e1f80023202cb13ac68248de806aa6a3659cf3c03eb6821d09c8114a4e868febde865bb6d2acc00000";
+    expect(
+        () => Psbt.fromHex(psbtData),
+        throwsA(isA<DartBitcoinPluginException>().having((p) => p.message,
+            'error message', contains('Invalid PSBT Taproot Leaf Script'))));
+  });
+  test("Case: PSBT With PSBT_IN_TAP_SCRIPT_SIG signature that is too long", () {
+    const psbtData =
+        "70736274ff01005e02000000019bd48765230bf9a72e662001f972556e54f0c6f97feb56bcb5600d817f6995260100000000ffffffff0148e6052a01000000225120030da4fce4f7db28c2cb2951631e003713856597fe963882cb500e68112cca63000000000001012b00f2052a01000000225120c2247efbfd92ac47f6f40b8d42d169175a19fa9fa10e4a25d7f35eb4dd85b69241142cb13ac68248de806aa6a3659cf3c03eb6821d09c8114a4e868febde865bb6d2cd970e15f53fc0c82f950fd560ffa919b76172be017368a89913af074f400b094289756aa3739ccc689ec0fcf3a360be32cc0b59b16e93a1e8bb4605726b2ca7a3ff706c4176649632b2cc68e1f912b8a578e3719ce7710885c7a966f49bcd43cb01010000";
+    expect(
+        () => Psbt.fromHex(psbtData),
+        throwsA(isA<DartBitcoinPluginException>().having(
+            (p) => p.message,
+            'error message',
+            contains('Invalid PSBT Taproot Script Spend Signature'))));
+  });
+  test(
+      "Case: PSBT With PSBT_IN_TAP_SCRIPT_SIG key that is too long (incorrectly serialized as compressed DER)",
+      () {
+    const psbtData =
+        "70736274ff01005e02000000019bd48765230bf9a72e662001f972556e54f0c6f97feb56bcb5600d817f6995260100000000ffffffff0148e6052a01000000225120030da4fce4f7db28c2cb2951631e003713856597fe963882cb500e68112cca63000000000001012b00f2052a01000000225120c2247efbfd92ac47f6f40b8d42d169175a19fa9fa10e4a25d7f35eb4dd85b6924214022cb13ac68248de806aa6a3659cf3c03eb6821d09c8114a4e868febde865bb6d2cd970e15f53fc0c82f950fd560ffa919b76172be017368a89913af074f400b094089756aa3739ccc689ec0fcf3a360be32cc0b59b16e93a1e8bb4605726b2ca7a3ff706c4176649632b2cc68e1f912b8a578e3719ce7710885c7a966f49bcd43cb0000";
+    expect(
+        () => Psbt.fromHex(psbtData),
+        throwsA(isA<DartBitcoinPluginException>().having(
+            (p) => p.message,
+            'error message',
+            contains('Invalid PSBT Taproot Script Spend Signature'))));
+  });
+  test(
+      "Case: PSBT With PSBT_OUT_TAP_INTERNAL_KEY key that is too long (incorrectly serialized as compressed DER)",
+      () {
+    const psbtData =
+        "70736274ff01007d020000000127744ababf3027fe0d6cf23a96eee2efb188ef52301954585883e69b6624b2420000000000ffffffff02887b0100000000001600142382871c7e8421a00093f754d91281e675874b9f606b042a010000002251205a2c2cf5b52cf31f83ad2e8da63ff03183ecd8f609c7510ae8a48e03910a0757000000000001012b00f2052a010000002251205a2c2cf5b52cf31f83ad2e8da63ff03183ecd8f609c7510ae8a48e03910a0757000001052102fe349064c98d6e2a853fa3c9b12bd8b304a19c195c60efa7ee2393046d3fa23200";
+    expect(
+        () => Psbt.fromHex(psbtData),
+        throwsA(isA<DartBitcoinPluginException>().having((p) => p.message,
+            'error message', contains('Invalid PSBT Taproot Internal Key'))));
+  });
+  test(
+      "Case: PSBT With PSBT_IN_TAP_BIP32_DERIVATION key that is too long (incorrectly serialized as compressed DER)",
+      () {
+    const psbtData =
+        "70736274ff010071020000000127744ababf3027fe0d6cf23a96eee2efb188ef52301954585883e69b6624b2420000000000ffffffff02787c01000000000016001483a7e34bd99ff03a4962ef8a1a101bb295461ece606b042a010000001600147ac369df1b20e033d6116623957b0ac49f3c52e8000000000001012b00f2052a010000002251205a2c2cf5b52cf31f83ad2e8da63ff03183ecd8f609c7510ae8a48e03910a0757221602fe349064c98d6e2a853fa3c9b12bd8b304a19c195c60efa7ee2393046d3fa2321900772b2da75600008001000080000000800100000000000000000000";
+    expect(
+        () => Psbt.fromHex(psbtData),
+        throwsA(isA<DartBitcoinPluginException>().having(
+            (p) => p.message,
+            'error message',
+            contains('Invalid Taproot Key BIP 32 Derivation Path'))));
+  });
+  test("Case: PSBT With PSBT_KEY_PATH_SIG signature that is too long", () {
+    const psbtData =
+        "70736274ff010071020000000127744ababf3027fe0d6cf23a96eee2efb188ef52301954585883e69b6624b2420000000000ffffffff02787c01000000000016001483a7e34bd99ff03a4962ef8a1a101bb295461ece606b042a010000001600147ac369df1b20e033d6116623957b0ac49f3c52e8000000000001012b00f2052a010000002251205a2c2cf5b52cf31f83ad2e8da63ff03183ecd8f609c7510ae8a48e03910a0757011342173bb3d36c074afb716fec6307a069a2e450b995f3c82785945ab8df0e24260dcd703b0cbf34de399184a9481ac2b3586db6601f026a77f7e4938481bc34751701aa000000";
+    expect(
+        () => Psbt.fromHex(psbtData),
+        throwsA(isA<DartBitcoinPluginException>().having(
+            (p) => p.message,
+            'error message',
+            contains('Invalid PSBT Taproot Key Spend Signature'))));
+  });
+  test("Case: PSBT With PSBT_KEY_PATH_SIG signature that is too short", () {
+    const psbtData =
+        "70736274ff010071020000000127744ababf3027fe0d6cf23a96eee2efb188ef52301954585883e69b6624b2420000000000ffffffff02787c01000000000016001483a7e34bd99ff03a4962ef8a1a101bb295461ece606b042a010000001600147ac369df1b20e033d6116623957b0ac49f3c52e8000000000001012b00f2052a010000002251205a2c2cf5b52cf31f83ad2e8da63ff03183ecd8f609c7510ae8a48e03910a075701133f173bb3d36c074afb716fec6307a069a2e450b995f3c82785945ab8df0e24260dcd703b0cbf34de399184a9481ac2b3586db6601f026a77f7e4938481bc3475000000";
+    expect(
+        () => Psbt.fromHex(psbtData),
+        throwsA(isA<DartBitcoinPluginException>().having(
+            (p) => p.message,
+            'error message',
+            contains('Invalid PSBT Taproot Key Spend Signature'))));
+  });
+  test(
+      "Case: PSBT With PSBT_IN_TAP_INTERNAL_KEY key that is too long (incorrectly serialized as compressed DER)",
+      () {
+    const psbtData =
+        "70736274ff010071020000000127744ababf3027fe0d6cf23a96eee2efb188ef52301954585883e69b6624b2420000000000ffffffff02787c01000000000016001483a7e34bd99ff03a4962ef8a1a101bb295461ece606b042a010000001600147ac369df1b20e033d6116623957b0ac49f3c52e8000000000001012b00f2052a010000002251205a2c2cf5b52cf31f83ad2e8da63ff03183ecd8f609c7510ae8a48e03910a075701172102fe349064c98d6e2a853fa3c9b12bd8b304a19c195c60efa7ee2393046d3fa232000000";
+    expect(
+        () => Psbt.fromHex(psbtData),
+        throwsA(isA<DartBitcoinPluginException>().having((p) => p.message,
+            'error message', contains('Invalid PSBT Taproot Internal Key'))));
+  });
+}
diff --git a/test/psbt/bip_0373_test.dart b/test/psbt/bip_0373_test.dart
new file mode 100644
index 0000000..981442c
--- /dev/null
+++ b/test/psbt/bip_0373_test.dart
@@ -0,0 +1,231 @@
+import 'package:bitcoin_base/bitcoin_base.dart';
+import 'package:test/test.dart';
+
+// https://github.com/bitcoin/bips/blob/master/bip-0373.mediawiki
+void main() {
+  group("BIP-0373", () {
+    _test();
+    _invalodTest();
+  });
+}
+
+void _invalodTest() {
+  test("Case: PSBT with invalid partial sig valuedata length", () {
+    final String psbtData =
+        "70736274ff01005202000000019a8b4a50796b9600990f7fe11dfa00bc70efd296048afc86719af0fb1fa919370100000000fdffffff0118ddf50500000000160014c9123e06e8d7f0966c5d1cd0f933002d4eb757cd000000000001012b00e1f5050000000022512056bdb481b4d67103f6d5dea8a9aafd3684a6a79b4a2e247799db8d4b1a86e1f841140b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d4b11fedaa63a0956501a7308c93b5637371e7613d9b8ade1783d49e26c06cfa2c402667d52f6cc07fe06db31b1a5f7efe81903f9cbeef40fa64dafca01d2cb1d56403bc7504898e55872557d16d2ca79bc55fef10973841a33ec032d884758c9fe62215c050929b74c1a04954b78b4b6035e97a5e078a5a0f28ec96d547bfee9ace803ac023200b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d4acc021160b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d42501b11fedaa63a0956501a7308c93b5637371e7613d9b8ade1783d49e26c06cfa2c2680dd6e2116346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd002501b11fedaa63a0956501a7308c93b5637371e7613d9b8ade1783d49e26c06cfa2c580b088721164fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c2501b11fedaa63a0956501a7308c93b5637371e7613d9b8ade1783d49e26c06cfa2cc3249a82211650929b74c1a04954b78b4b6035e97a5e078a5a0f28ec96d547bfee9ace803ac005007c461e5d2116f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f92501b11fedaa63a0956501a7308c93b5637371e7613d9b8ade1783d49e26c06cfa2c7dd6559201172050929b74c1a04954b78b4b6035e97a5e078a5a0f28ec96d547bfee9ace803ac0011820b11fedaa63a0956501a7308c93b5637371e7613d9b8ade1783d49e26c06cfa2c221a030b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d46302346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd00024fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c02f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f9631b02346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd00030b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d4b11fedaa63a0956501a7308c93b5637371e7613d9b8ade1783d49e26c06cfa2c4202d99e7c8719b3ad08566b0cb9c7d5eda3127c9e8119185b7d584d939b173915f50240df22aab78332cf0f25329d103dc0d2060a03742e9448026e736bcf3db98f3c631b024fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c030b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d4b11fedaa63a0956501a7308c93b5637371e7613d9b8ade1783d49e26c06cfa2c4202e702a7075226a0d9313a77e6db10b8e742d4cffdc948a0edc9b856c13b412e5403386a0298f308fb3099155772e45b2aa8e770f435bedfe2041d1cc4d3d37538c6631b02f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f9030b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d4b11fedaa63a0956501a7308c93b5637371e7613d9b8ade1783d49e26c06cfa2c4202b1d912d45d753ceed0954417ba982656d2aec53f8638bd6f297dae3b743d71b0032f424537d599d28f14d59fe0a11b82fea2aa226a2980ffdacad5fdab20f80683631c02346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd00030b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d4b11fedaa63a0956501a7308c93b5637371e7613d9b8ade1783d49e26c06cfa2c1fa78b70af8cffa4c50863aef515ac58a327cd58c55bad29a162e67d9c413322631c024fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c030b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d4b11fedaa63a0956501a7308c93b5637371e7613d9b8ade1783d49e26c06cfa2c201fa8b7e6741c21eb8d9b0f65269df9e423369fc390ad2e918420c57feb2a1b61631c02f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f9030b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d4b11fedaa63a0956501a7308c93b5637371e7613d9b8ade1783d49e26c06cfa2c20366c31ad65e533f6d2b45e5910f3f587543f8061918167bf5a818b13be5792a40000";
+    expect(
+        () => Psbt.fromHex(psbtData),
+        throwsA(isA<DartBitcoinPluginException>().having(
+            (p) => p.message,
+            'error message',
+            contains(
+                'Invalid PSBT MuSig2 Participant Partial Signature data'))));
+  });
+  test("Case: PSBT with an x-only participant pubkey in partial sig keydata",
+      () {
+    final String psbtData =
+        "70736274ff01005202000000019a8b4a50796b9600990f7fe11dfa00bc70efd296048afc86719af0fb1fa919370100000000fdffffff0118ddf50500000000160014c9123e06e8d7f0966c5d1cd0f933002d4eb757cd000000000001012b00e1f5050000000022512056bdb481b4d67103f6d5dea8a9aafd3684a6a79b4a2e247799db8d4b1a86e1f841140b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d4b11fedaa63a0956501a7308c93b5637371e7613d9b8ade1783d49e26c06cfa2c402667d52f6cc07fe06db31b1a5f7efe81903f9cbeef40fa64dafca01d2cb1d56403bc7504898e55872557d16d2ca79bc55fef10973841a33ec032d884758c9fe62215c050929b74c1a04954b78b4b6035e97a5e078a5a0f28ec96d547bfee9ace803ac023200b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d4acc021160b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d42501b11fedaa63a0956501a7308c93b5637371e7613d9b8ade1783d49e26c06cfa2c2680dd6e2116346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd002501b11fedaa63a0956501a7308c93b5637371e7613d9b8ade1783d49e26c06cfa2c580b088721164fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c2501b11fedaa63a0956501a7308c93b5637371e7613d9b8ade1783d49e26c06cfa2cc3249a82211650929b74c1a04954b78b4b6035e97a5e078a5a0f28ec96d547bfee9ace803ac005007c461e5d2116f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f92501b11fedaa63a0956501a7308c93b5637371e7613d9b8ade1783d49e26c06cfa2c7dd6559201172050929b74c1a04954b78b4b6035e97a5e078a5a0f28ec96d547bfee9ace803ac0011820b11fedaa63a0956501a7308c93b5637371e7613d9b8ade1783d49e26c06cfa2c221a030b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d46302346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd00024fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c02f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f9631b02346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd00030b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d4b11fedaa63a0956501a7308c93b5637371e7613d9b8ade1783d49e26c06cfa2c4202d99e7c8719b3ad08566b0cb9c7d5eda3127c9e8119185b7d584d939b173915f50240df22aab78332cf0f25329d103dc0d2060a03742e9448026e736bcf3db98f3c631b024fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c030b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d4b11fedaa63a0956501a7308c93b5637371e7613d9b8ade1783d49e26c06cfa2c4202e702a7075226a0d9313a77e6db10b8e742d4cffdc948a0edc9b856c13b412e5403386a0298f308fb3099155772e45b2aa8e770f435bedfe2041d1cc4d3d37538c6631b02f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f9030b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d4b11fedaa63a0956501a7308c93b5637371e7613d9b8ade1783d49e26c06cfa2c4202b1d912d45d753ceed0954417ba982656d2aec53f8638bd6f297dae3b743d71b0032f424537d599d28f14d59fe0a11b82fea2aa226a2980ffdacad5fdab20f80683621c346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd00030b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d4b11fedaa63a0956501a7308c93b5637371e7613d9b8ade1783d49e26c06cfa2c20ada78b70af8cffa4c50863aef515ac58a327cd58c55bad29a162e67d9c413322631c024fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c030b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d4b11fedaa63a0956501a7308c93b5637371e7613d9b8ade1783d49e26c06cfa2c201fa8b7e6741c21eb8d9b0f65269df9e423369fc390ad2e918420c57feb2a1b61631c02f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f9030b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d4b11fedaa63a0956501a7308c93b5637371e7613d9b8ade1783d49e26c06cfa2c20366c31ad65e533f6d2b45e5910f3f587543f8061918167bf5a818b13be5792a40000";
+    expect(
+        () => Psbt.fromHex(psbtData),
+        throwsA(isA<DartBitcoinPluginException>().having(
+            (p) => p.message,
+            'error message',
+            contains(
+                'Invalid PSBT MuSig2 Participant Partial Signature data'))));
+  });
+  test("PSBT with x-only aggregate pubkey in partial sig keydata", () {
+    final String psbtData =
+        "70736274ff01005202000000019a8b4a50796b9600990f7fe11dfa00bc70efd296048afc86719af0fb1fa919370100000000fdffffff0118ddf50500000000160014c9123e06e8d7f0966c5d1cd0f933002d4eb757cd000000000001012b00e1f5050000000022512056bdb481b4d67103f6d5dea8a9aafd3684a6a79b4a2e247799db8d4b1a86e1f841140b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d4b11fedaa63a0956501a7308c93b5637371e7613d9b8ade1783d49e26c06cfa2c402667d52f6cc07fe06db31b1a5f7efe81903f9cbeef40fa64dafca01d2cb1d56403bc7504898e55872557d16d2ca79bc55fef10973841a33ec032d884758c9fe62215c050929b74c1a04954b78b4b6035e97a5e078a5a0f28ec96d547bfee9ace803ac023200b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d4acc021160b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d42501b11fedaa63a0956501a7308c93b5637371e7613d9b8ade1783d49e26c06cfa2c2680dd6e2116346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd002501b11fedaa63a0956501a7308c93b5637371e7613d9b8ade1783d49e26c06cfa2c580b088721164fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c2501b11fedaa63a0956501a7308c93b5637371e7613d9b8ade1783d49e26c06cfa2cc3249a82211650929b74c1a04954b78b4b6035e97a5e078a5a0f28ec96d547bfee9ace803ac005007c461e5d2116f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f92501b11fedaa63a0956501a7308c93b5637371e7613d9b8ade1783d49e26c06cfa2c7dd6559201172050929b74c1a04954b78b4b6035e97a5e078a5a0f28ec96d547bfee9ace803ac0011820b11fedaa63a0956501a7308c93b5637371e7613d9b8ade1783d49e26c06cfa2c221a030b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d46302346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd00024fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c02f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f9631b02346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd00030b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d4b11fedaa63a0956501a7308c93b5637371e7613d9b8ade1783d49e26c06cfa2c4202d99e7c8719b3ad08566b0cb9c7d5eda3127c9e8119185b7d584d939b173915f50240df22aab78332cf0f25329d103dc0d2060a03742e9448026e736bcf3db98f3c631b024fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c030b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d4b11fedaa63a0956501a7308c93b5637371e7613d9b8ade1783d49e26c06cfa2c4202e702a7075226a0d9313a77e6db10b8e742d4cffdc948a0edc9b856c13b412e5403386a0298f308fb3099155772e45b2aa8e770f435bedfe2041d1cc4d3d37538c6631b02f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f9030b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d4b11fedaa63a0956501a7308c93b5637371e7613d9b8ade1783d49e26c06cfa2c4202b1d912d45d753ceed0954417ba982656d2aec53f8638bd6f297dae3b743d71b0032f424537d599d28f14d59fe0a11b82fea2aa226a2980ffdacad5fdab20f80683621c02346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd000b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d4b11fedaa63a0956501a7308c93b5637371e7613d9b8ade1783d49e26c06cfa2c20ada78b70af8cffa4c50863aef515ac58a327cd58c55bad29a162e67d9c413322631c024fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c030b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d4b11fedaa63a0956501a7308c93b5637371e7613d9b8ade1783d49e26c06cfa2c201fa8b7e6741c21eb8d9b0f65269df9e423369fc390ad2e918420c57feb2a1b61631c02f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f9030b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d4b11fedaa63a0956501a7308c93b5637371e7613d9b8ade1783d49e26c06cfa2c20366c31ad65e533f6d2b45e5910f3f587543f8061918167bf5a818b13be5792a40000";
+    expect(
+        () => Psbt.fromHex(psbtData),
+        throwsA(isA<DartBitcoinPluginException>().having(
+            (p) => p.message,
+            'error message',
+            contains(
+                'Invalid PSBT MuSig2 Participant Partial Signature data'))));
+  });
+  test("Case: PSBT with invalid public nonce valuedata length", () {
+    final String psbtData =
+        "70736274ff01005202000000015686dff400165f4e040a5855f658093472c9bcf8108b272a5d31f181f7b4ffb10100000000fdffffff0118ddf50500000000160014c9123e06e8d7f0966c5d1cd0f933002d4eb757cd000000000001012b00e1f505000000002251200b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d421160b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d405002680dd6e2116346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd000500580b088721164fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c0500c3249a822116f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f905007dd65592221a030b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d46302346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd00024fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c02f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f9431b02346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd00030b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d44102529b19d7879ccc04c915487f5f1341bc6858b0bc74e5036c643d37b53a4371b503b7f8afe3263fcb3ef2454fe16f3a6759c5600c78e637b8dfa0d83e85528820431b024fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c030b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d44203a81d973499e74f82d2b5ab13f1e69e9e11a5fdb40f5466ef672e6e4ceba0be7903499593767150394eece384d051c45b615c52dbe1c8eb3610d7b344b43b7dad6d431b02f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f9030b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d442033949dbff31b9d50251d8821e66cc5c97b7e3afd7d95bfdc77500fda8947f3ae0023f20e4f0bf0b76f0d40cd3abfe7ce373d6685bbd77b5fa28e7f49fb429d189b00000";
+    expect(
+        () => Psbt.fromHex(psbtData),
+        throwsA(isA<DartBitcoinPluginException>().having(
+            (p) => p.message,
+            'error message',
+            contains('Invalid PSBT MuSig2 Public Nonce data'))));
+  });
+  test("Case: PSBT with an x-only participant pubkey in public nonce keydata",
+      () {
+    final String psbtData =
+        "70736274ff01005202000000015686dff400165f4e040a5855f658093472c9bcf8108b272a5d31f181f7b4ffb10100000000fdffffff0118ddf50500000000160014c9123e06e8d7f0966c5d1cd0f933002d4eb757cd000000000001012b00e1f505000000002251200b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d421160b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d405002680dd6e2116346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd000500580b088721164fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c0500c3249a822116f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f905007dd65592221a030b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d46302346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd00024fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c02f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f9421b346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd00030b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d44202529b19d7879ccc04c915487f5f1341bc6858b0bc74e5036c643d37b53a4371b503b7f8afe3263fcb3ef2454fe16f3a6759c5600c78e637b8dfa0d83e8552882056431b024fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c030b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d44203a81d973499e74f82d2b5ab13f1e69e9e11a5fdb40f5466ef672e6e4ceba0be7903499593767150394eece384d051c45b615c52dbe1c8eb3610d7b344b43b7dad6d431b02f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f9030b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d442033949dbff31b9d50251d8821e66cc5c97b7e3afd7d95bfdc77500fda8947f3ae0023f20e4f0bf0b76f0d40cd3abfe7ce373d6685bbd77b5fa28e7f49fb429d189b00000";
+    expect(
+        () => Psbt.fromHex(psbtData),
+        throwsA(isA<DartBitcoinPluginException>().having(
+            (p) => p.message,
+            'error message',
+            contains('Invalid PSBT MuSig2 Public Nonce data'))));
+  });
+  test("Case: PSBT with x-only aggregate pubkey in public nonce keydata", () {
+    final String psbtData =
+        "70736274ff01005202000000015686dff400165f4e040a5855f658093472c9bcf8108b272a5d31f181f7b4ffb10100000000fdffffff0118ddf50500000000160014c9123e06e8d7f0966c5d1cd0f933002d4eb757cd000000000001012b00e1f505000000002251200b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d421160b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d405002680dd6e2116346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd000500580b088721164fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c0500c3249a822116f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f905007dd65592221a030b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d46302346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd00024fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c02f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f9421b02346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd000b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d44202529b19d7879ccc04c915487f5f1341bc6858b0bc74e5036c643d37b53a4371b503b7f8afe3263fcb3ef2454fe16f3a6759c5600c78e637b8dfa0d83e8552882056431b024fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c030b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d44203a81d973499e74f82d2b5ab13f1e69e9e11a5fdb40f5466ef672e6e4ceba0be7903499593767150394eece384d051c45b615c52dbe1c8eb3610d7b344b43b7dad6d431b02f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f9030b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d442033949dbff31b9d50251d8821e66cc5c97b7e3afd7d95bfdc77500fda8947f3ae0023f20e4f0bf0b76f0d40cd3abfe7ce373d6685bbd77b5fa28e7f49fb429d189b00000";
+    expect(
+        () => Psbt.fromHex(psbtData),
+        throwsA(isA<DartBitcoinPluginException>().having(
+            (p) => p.message,
+            'error message',
+            contains('Invalid PSBT MuSig2 Public Nonce data'))));
+  });
+  test("Case: PSBT with an x-only output participant pubkey", () {
+    final String psbtData =
+        "70736274ff01007d02000000012589e7767958ba154f9018cccf0dedea6147bb60cd1a194b6e3590a9965690d60000000000fdffffff0280969800000000002251202967d2d020a9795da72b51be4f3fca25bb0e57e91c5b3e7a81abfa7232a349420fc0927c00000000160014349c5d330278c3002a64f597d2b01aa3dc1bd903000000000001007d02000000019a8b4a50796b9600990f7fe11dfa00bc70efd296048afc86719af0fb1fa919370000000000fdffffff02895c2b7d00000000160014cfd98ba1027ea4ed4bd2ae1b348b6156a015037500e1f50500000000225120d0b226c6599f273874df8fe684ab6c3028081bee8a2cbed31a136f5865f6cfa4e100000001011f895c2b7d00000000160014cfd98ba1027ea4ed4bd2ae1b348b6156a0150375220602a66650f08bffa4f089eb22edcdbe7616645ff6cd180a36484d4bc81054595b7b18bfff44a3540000800100008000000080010000008a020000000105200b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d421070b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d405002680dd6e2107346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd000500580b088721074fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c0500c3249a822107f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f905007dd6559221080b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d46302346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd00024fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c02f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f900220203be4ae53d37cc075f40b30d6da4729d40adeeb983533af1616192bc76d5b2612a18bfff44a3540000800100008000000080010000008d02000000";
+    expect(
+        () => Psbt.fromHex(psbtData),
+        throwsA(isA<DartBitcoinPluginException>().having(
+            (p) => p.message,
+            'error message',
+            contains('Invalid PSBT MuSig2 Participant Public Keys data'))));
+  });
+  test(
+      "Case: PSBT with x-only aggregate pubkey in output participant pubkeys keydata",
+      () {
+    final String psbtData =
+        "70736274ff01007d02000000012589e7767958ba154f9018cccf0dedea6147bb60cd1a194b6e3590a9965690d60000000000fdffffff0280969800000000002251202967d2d020a9795da72b51be4f3fca25bb0e57e91c5b3e7a81abfa7232a349420fc0927c00000000160014349c5d330278c3002a64f597d2b01aa3dc1bd903000000000001007d02000000019a8b4a50796b9600990f7fe11dfa00bc70efd296048afc86719af0fb1fa919370000000000fdffffff02895c2b7d00000000160014cfd98ba1027ea4ed4bd2ae1b348b6156a015037500e1f50500000000225120d0b226c6599f273874df8fe684ab6c3028081bee8a2cbed31a136f5865f6cfa4e100000001011f895c2b7d00000000160014cfd98ba1027ea4ed4bd2ae1b348b6156a0150375220602a66650f08bffa4f089eb22edcdbe7616645ff6cd180a36484d4bc81054595b7b18bfff44a3540000800100008000000080010000008a020000000105200b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d421070b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d405002680dd6e2107346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd000500580b088721074fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c0500c3249a822107f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f905007dd6559221080b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d46302346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd00024fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c02f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f900220203be4ae53d37cc075f40b30d6da4729d40adeeb983533af1616192bc76d5b2612a18bfff44a3540000800100008000000080010000008d02000000";
+    expect(
+        () => Psbt.fromHex(psbtData),
+        throwsA(isA<DartBitcoinPluginException>().having(
+            (p) => p.message,
+            'error message',
+            contains('Invalid PSBT MuSig2 Participant Public Keys data'))));
+  });
+  test("Case: PSBT with an x-only input participant pubkey", () {
+    final String psbtData =
+        "70736274ff01005202000000015686dff400165f4e040a5855f658093472c9bcf8108b272a5d31f181f7b4ffb10100000000fdffffff0118ddf50500000000160014c9123e06e8d7f0966c5d1cd0f933002d4eb757cd000000000001012b00e1f505000000002251200b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d421160b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d405002680dd6e2116346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd000500580b088721164fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c0500c3249a822116f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f905007dd65592221a030b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d462346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd00024fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c02f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f90000";
+    expect(
+        () => Psbt.fromHex(psbtData),
+        throwsA(isA<DartBitcoinPluginException>().having(
+            (p) => p.message,
+            'error message',
+            contains('Invalid PSBT MuSig2 Participant Public Keys data'))));
+  });
+  test(
+      "Case: PSBT with x-only aggregate pubkey in input participant pubkeys keydata",
+      () {
+    final String psbtData =
+        "70736274ff01005202000000015686dff400165f4e040a5855f658093472c9bcf8108b272a5d31f181f7b4ffb10100000000fdffffff0118ddf50500000000160014c9123e06e8d7f0966c5d1cd0f933002d4eb757cd000000000001012b00e1f505000000002251200b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d421160b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d405002680dd6e2116346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd000500580b088721164fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c0500c3249a822116f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f905007dd65592211a0b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d46302346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd00024fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c02f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f90000";
+    expect(
+        () => Psbt.fromHex(psbtData),
+        throwsA(isA<DartBitcoinPluginException>().having(
+            (p) => p.message,
+            'error message',
+            contains('Invalid PSBT MuSig2 Participant Public Keys data'))));
+  });
+}
+
+void _test() {
+  group(
+      "Case: Spend of a Taproot output where the output key is a MuSig2 Aggregate Pubkey",
+      () {
+    test("With participant pubkeys only", () {
+      final String psbtData =
+          "70736274ff01005202000000015686dff400165f4e040a5855f658093472c9bcf8108b272a5d31f181f7b4ffb10100000000fdffffff0118ddf50500000000160014c9123e06e8d7f0966c5d1cd0f933002d4eb757cd000000000001012b00e1f505000000002251200b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d421160b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d405002680dd6e2116346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd000500580b088721164fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c0500c3249a822116f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f905007dd65592221a030b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d46302346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd00024fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c02f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f90000";
+      final Psbt psbt = Psbt.fromHex(psbtData);
+      expect(psbt.toHex(), psbtData);
+    });
+    test("With all pubnonces", () {
+      final String psbtData =
+          "70736274ff01005202000000015686dff400165f4e040a5855f658093472c9bcf8108b272a5d31f181f7b4ffb10100000000fdffffff0118ddf50500000000160014c9123e06e8d7f0966c5d1cd0f933002d4eb757cd000000000001012b00e1f505000000002251200b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d421160b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d405002680dd6e2116346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd000500580b088721164fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c0500c3249a822116f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f905007dd65592221a030b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d46302346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd00024fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c02f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f9431b02346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd00030b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d44202529b19d7879ccc04c915487f5f1341bc6858b0bc74e5036c643d37b53a4371b503b7f8afe3263fcb3ef2454fe16f3a6759c5600c78e637b8dfa0d83e8552882056431b024fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c030b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d44203a81d973499e74f82d2b5ab13f1e69e9e11a5fdb40f5466ef672e6e4ceba0be7903499593767150394eece384d051c45b615c52dbe1c8eb3610d7b344b43b7dad6d431b02f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f9030b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d442033949dbff31b9d50251d8821e66cc5c97b7e3afd7d95bfdc77500fda8947f3ae0023f20e4f0bf0b76f0d40cd3abfe7ce373d6685bbd77b5fa28e7f49fb429d189b00000";
+      final Psbt psbt = Psbt.fromHex(psbtData);
+      expect(psbt.toHex(), psbtData);
+    });
+    test("With all partial signatures", () {
+      final String psbtData =
+          "70736274ff01005202000000015686dff400165f4e040a5855f658093472c9bcf8108b272a5d31f181f7b4ffb10100000000fdffffff0118ddf50500000000160014c9123e06e8d7f0966c5d1cd0f933002d4eb757cd000000000001012b00e1f505000000002251200b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d421160b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d405002680dd6e2116346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd000500580b088721164fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c0500c3249a822116f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f905007dd65592221a030b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d46302346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd00024fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c02f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f9431b02346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd00030b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d44202529b19d7879ccc04c915487f5f1341bc6858b0bc74e5036c643d37b53a4371b503b7f8afe3263fcb3ef2454fe16f3a6759c5600c78e637b8dfa0d83e8552882056431b024fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c030b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d44203a81d973499e74f82d2b5ab13f1e69e9e11a5fdb40f5466ef672e6e4ceba0be7903499593767150394eece384d051c45b615c52dbe1c8eb3610d7b344b43b7dad6d431b02f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f9030b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d442033949dbff31b9d50251d8821e66cc5c97b7e3afd7d95bfdc77500fda8947f3ae0023f20e4f0bf0b76f0d40cd3abfe7ce373d6685bbd77b5fa28e7f49fb429d189b0431c02346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd00030b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d4200e57ca4ca0de1a3116d3fd6baf19d38572e47e8ff024e7efc39512751e54ed31431c024fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c030b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d4207254079cab166b0d50b54283fccb4aea15f776747a5d2a53d7da06239340dbcc431c02f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f9030b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d42001245e8861e62ac5bfc0008418fd057ce6b03c17b1d6b5c6980413c5c4e358970000";
+      final Psbt psbt = Psbt.fromHex(psbtData);
+      expect(psbt.toHex(), psbtData);
+    });
+  });
+  group(
+      "Case: Spend of a Taproot output where the internal key is a MuSig2 Aggregate Pubkey",
+      () {
+    test("With participant pubkeys only", () {
+      final String psbtData =
+          "70736274ff01005202000000015818a9cd644b369c306c7fb191ec014ff625e63c283f00f9d17a959fefa3e8f60000000000fdffffff0118ddf50500000000160014c9123e06e8d7f0966c5d1cd0f933002d4eb757cd000000000001012b00e1f505000000002251202967d2d020a9795da72b51be4f3fca25bb0e57e91c5b3e7a81abfa7232a3494221160b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d405002680dd6e2116346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd000500580b088721164fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c0500c3249a822116f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f905007dd655920117200b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d4221a030b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d46302346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd00024fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c02f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f90000";
+      final Psbt psbt = Psbt.fromHex(psbtData);
+      expect(psbt.toHex(), psbtData);
+    });
+    test("With all pubnonces", () {
+      final String psbtData =
+          "70736274ff01005202000000015818a9cd644b369c306c7fb191ec014ff625e63c283f00f9d17a959fefa3e8f60000000000fdffffff0118ddf50500000000160014c9123e06e8d7f0966c5d1cd0f933002d4eb757cd000000000001012b00e1f505000000002251202967d2d020a9795da72b51be4f3fca25bb0e57e91c5b3e7a81abfa7232a3494221160b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d405002680dd6e2116346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd000500580b088721164fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c0500c3249a822116f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f905007dd655920117200b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d4221a030b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d46302346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd00024fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c02f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f9431b02346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd00032967d2d020a9795da72b51be4f3fca25bb0e57e91c5b3e7a81abfa7232a349424203cc17485ca01c2ebb0eba1c80b3eadaf5ee9cc14629fa4f1071d19820e2d07fcc02adfcad45a68cfb67759c9849cdd579639e4d1867272b991a0363d1ca76283efc431b024fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c032967d2d020a9795da72b51be4f3fca25bb0e57e91c5b3e7a81abfa7232a349424202343bb8359c434f5f6a9d6b46f7573258fbfbb561bb5212cbf5850a82a9a02f7e0246e83221664427aca6d13c10809a2cb4b54dae9a7b2f5ab764213dd479a6a942431b02f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f9032967d2d020a9795da72b51be4f3fca25bb0e57e91c5b3e7a81abfa7232a3494242039dee4258b8dfe34460086ff1703209e478437c6ab0f598a2e6e809fd30a9ff3a03e06b4e04ec4de4f757c84d51acdaf6cb1ef4bccbfd8103703bc01a845dcf33650000";
+      final Psbt psbt = Psbt.fromHex(psbtData);
+      expect(psbt.toHex(), psbtData);
+    });
+    test("With all partial signatures", () {
+      final String psbtData =
+          "70736274ff01005202000000015818a9cd644b369c306c7fb191ec014ff625e63c283f00f9d17a959fefa3e8f60000000000fdffffff0118ddf50500000000160014c9123e06e8d7f0966c5d1cd0f933002d4eb757cd000000000001012b00e1f505000000002251202967d2d020a9795da72b51be4f3fca25bb0e57e91c5b3e7a81abfa7232a349420113402e89a7bdf9085c6438d15ddf1a86772a65222244276e9302ffdd9fa93b1c20ae58a6b11a6be98b151d8582daa84c10017c994d9235b13ec518a94782c67c40e221160b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d405002680dd6e2116346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd000500580b088721164fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c0500c3249a822116f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f905007dd655920117200b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d4221a030b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d46302346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd00024fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c02f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f9431b02346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd00032967d2d020a9795da72b51be4f3fca25bb0e57e91c5b3e7a81abfa7232a349424203cc17485ca01c2ebb0eba1c80b3eadaf5ee9cc14629fa4f1071d19820e2d07fcc02adfcad45a68cfb67759c9849cdd579639e4d1867272b991a0363d1ca76283efc431b024fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c032967d2d020a9795da72b51be4f3fca25bb0e57e91c5b3e7a81abfa7232a349424202343bb8359c434f5f6a9d6b46f7573258fbfbb561bb5212cbf5850a82a9a02f7e0246e83221664427aca6d13c10809a2cb4b54dae9a7b2f5ab764213dd479a6a942431b02f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f9032967d2d020a9795da72b51be4f3fca25bb0e57e91c5b3e7a81abfa7232a3494242039dee4258b8dfe34460086ff1703209e478437c6ab0f598a2e6e809fd30a9ff3a03e06b4e04ec4de4f757c84d51acdaf6cb1ef4bccbfd8103703bc01a845dcf3365431c02346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd00032967d2d020a9795da72b51be4f3fca25bb0e57e91c5b3e7a81abfa7232a3494220109ad32155722014ddca21ae3b8d3c3a93a6d0ab5c7e19d0c693d565c47c1626431c024fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c032967d2d020a9795da72b51be4f3fca25bb0e57e91c5b3e7a81abfa7232a349422035d5eecc404fa2a63644f30cf8af43fdbd829e5cd9c74707ca9b33a9134c756e431c02f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f9032967d2d020a9795da72b51be4f3fca25bb0e57e91c5b3e7a81abfa7232a3494220b9c855defd44676ff3fc5342adbc90c2dec15624eab55b1ff29765315603db6e0000";
+      final Psbt psbt = Psbt.fromHex(psbtData);
+      expect(psbt.toHex(), psbtData);
+    });
+  });
+  group(
+      "Case: Spend of a Taproot output where a key in a script is a MuSig2 Aggregate Pubkey",
+      () {
+    test("With participant pubkeys only", () {
+      final String psbtData =
+          "70736274ff01005202000000019a8b4a50796b9600990f7fe11dfa00bc70efd296048afc86719af0fb1fa919370100000000fdffffff0118ddf50500000000160014c9123e06e8d7f0966c5d1cd0f933002d4eb757cd000000000001012b00e1f5050000000022512056bdb481b4d67103f6d5dea8a9aafd3684a6a79b4a2e247799db8d4b1a86e1f82215c050929b74c1a04954b78b4b6035e97a5e078a5a0f28ec96d547bfee9ace803ac023200b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d4acc021160b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d42501b11fedaa63a0956501a7308c93b5637371e7613d9b8ade1783d49e26c06cfa2c2680dd6e2116346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd002501b11fedaa63a0956501a7308c93b5637371e7613d9b8ade1783d49e26c06cfa2c580b088721164fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c2501b11fedaa63a0956501a7308c93b5637371e7613d9b8ade1783d49e26c06cfa2cc3249a82211650929b74c1a04954b78b4b6035e97a5e078a5a0f28ec96d547bfee9ace803ac005007c461e5d2116f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f92501b11fedaa63a0956501a7308c93b5637371e7613d9b8ade1783d49e26c06cfa2c7dd6559201172050929b74c1a04954b78b4b6035e97a5e078a5a0f28ec96d547bfee9ace803ac0011820b11fedaa63a0956501a7308c93b5637371e7613d9b8ade1783d49e26c06cfa2c221a030b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d46302346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd00024fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c02f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f90000";
+      final Psbt psbt = Psbt.fromHex(psbtData);
+      expect(psbt.toHex(), psbtData);
+    });
+    test("With all pubnonces", () {
+      final String psbtData =
+          "70736274ff01005202000000019a8b4a50796b9600990f7fe11dfa00bc70efd296048afc86719af0fb1fa919370100000000fdffffff0118ddf50500000000160014c9123e06e8d7f0966c5d1cd0f933002d4eb757cd000000000001012b00e1f5050000000022512056bdb481b4d67103f6d5dea8a9aafd3684a6a79b4a2e247799db8d4b1a86e1f82215c050929b74c1a04954b78b4b6035e97a5e078a5a0f28ec96d547bfee9ace803ac023200b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d4acc021160b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d42501b11fedaa63a0956501a7308c93b5637371e7613d9b8ade1783d49e26c06cfa2c2680dd6e2116346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd002501b11fedaa63a0956501a7308c93b5637371e7613d9b8ade1783d49e26c06cfa2c580b088721164fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c2501b11fedaa63a0956501a7308c93b5637371e7613d9b8ade1783d49e26c06cfa2cc3249a82211650929b74c1a04954b78b4b6035e97a5e078a5a0f28ec96d547bfee9ace803ac005007c461e5d2116f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f92501b11fedaa63a0956501a7308c93b5637371e7613d9b8ade1783d49e26c06cfa2c7dd6559201172050929b74c1a04954b78b4b6035e97a5e078a5a0f28ec96d547bfee9ace803ac0011820b11fedaa63a0956501a7308c93b5637371e7613d9b8ade1783d49e26c06cfa2c221a030b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d46302346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd00024fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c02f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f9631b02346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd00030b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d4b11fedaa63a0956501a7308c93b5637371e7613d9b8ade1783d49e26c06cfa2c4202d99e7c8719b3ad08566b0cb9c7d5eda3127c9e8119185b7d584d939b173915f50240df22aab78332cf0f25329d103dc0d2060a03742e9448026e736bcf3db98f3c631b024fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c030b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d4b11fedaa63a0956501a7308c93b5637371e7613d9b8ade1783d49e26c06cfa2c4202e702a7075226a0d9313a77e6db10b8e742d4cffdc948a0edc9b856c13b412e5403386a0298f308fb3099155772e45b2aa8e770f435bedfe2041d1cc4d3d37538c6631b02f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f9030b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d4b11fedaa63a0956501a7308c93b5637371e7613d9b8ade1783d49e26c06cfa2c4202b1d912d45d753ceed0954417ba982656d2aec53f8638bd6f297dae3b743d71b0032f424537d599d28f14d59fe0a11b82fea2aa226a2980ffdacad5fdab20f806830000";
+      final Psbt psbt = Psbt.fromHex(psbtData);
+      expect(psbt.toHex(), psbtData);
+    });
+    test("With all partial signatures", () {
+      final String psbtData =
+          "70736274ff01005202000000019a8b4a50796b9600990f7fe11dfa00bc70efd296048afc86719af0fb1fa919370100000000fdffffff0118ddf50500000000160014c9123e06e8d7f0966c5d1cd0f933002d4eb757cd000000000001012b00e1f5050000000022512056bdb481b4d67103f6d5dea8a9aafd3684a6a79b4a2e247799db8d4b1a86e1f841140b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d4b11fedaa63a0956501a7308c93b5637371e7613d9b8ade1783d49e26c06cfa2c402667d52f6cc07fe06db31b1a5f7efe81903f9cbeef40fa64dafca01d2cb1d56403bc7504898e55872557d16d2ca79bc55fef10973841a33ec032d884758c9fe62215c050929b74c1a04954b78b4b6035e97a5e078a5a0f28ec96d547bfee9ace803ac023200b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d4acc021160b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d42501b11fedaa63a0956501a7308c93b5637371e7613d9b8ade1783d49e26c06cfa2c2680dd6e2116346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd002501b11fedaa63a0956501a7308c93b5637371e7613d9b8ade1783d49e26c06cfa2c580b088721164fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c2501b11fedaa63a0956501a7308c93b5637371e7613d9b8ade1783d49e26c06cfa2cc3249a82211650929b74c1a04954b78b4b6035e97a5e078a5a0f28ec96d547bfee9ace803ac005007c461e5d2116f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f92501b11fedaa63a0956501a7308c93b5637371e7613d9b8ade1783d49e26c06cfa2c7dd6559201172050929b74c1a04954b78b4b6035e97a5e078a5a0f28ec96d547bfee9ace803ac0011820b11fedaa63a0956501a7308c93b5637371e7613d9b8ade1783d49e26c06cfa2c221a030b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d46302346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd00024fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c02f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f9631b02346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd00030b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d4b11fedaa63a0956501a7308c93b5637371e7613d9b8ade1783d49e26c06cfa2c4202d99e7c8719b3ad08566b0cb9c7d5eda3127c9e8119185b7d584d939b173915f50240df22aab78332cf0f25329d103dc0d2060a03742e9448026e736bcf3db98f3c631b024fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c030b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d4b11fedaa63a0956501a7308c93b5637371e7613d9b8ade1783d49e26c06cfa2c4202e702a7075226a0d9313a77e6db10b8e742d4cffdc948a0edc9b856c13b412e5403386a0298f308fb3099155772e45b2aa8e770f435bedfe2041d1cc4d3d37538c6631b02f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f9030b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d4b11fedaa63a0956501a7308c93b5637371e7613d9b8ade1783d49e26c06cfa2c4202b1d912d45d753ceed0954417ba982656d2aec53f8638bd6f297dae3b743d71b0032f424537d599d28f14d59fe0a11b82fea2aa226a2980ffdacad5fdab20f80683631c02346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd00030b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d4b11fedaa63a0956501a7308c93b5637371e7613d9b8ade1783d49e26c06cfa2c20ada78b70af8cffa4c50863aef515ac58a327cd58c55bad29a162e67d9c413322631c024fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c030b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d4b11fedaa63a0956501a7308c93b5637371e7613d9b8ade1783d49e26c06cfa2c201fa8b7e6741c21eb8d9b0f65269df9e423369fc390ad2e918420c57feb2a1b61631c02f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f9030b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d4b11fedaa63a0956501a7308c93b5637371e7613d9b8ade1783d49e26c06cfa2c20366c31ad65e533f6d2b45e5910f3f587543f8061918167bf5a818b13be5792a40000";
+      final Psbt psbt = Psbt.fromHex(psbtData);
+      expect(psbt.toHex(), psbtData);
+    });
+  });
+
+  group(
+      "Case: Spend of a Taproot output where the internal key is derived from a MuSig2 Aggregate Pubkey",
+      () {
+    test("With participant pubkeys only", () {
+      final String psbtData =
+          "70736274ff01005202000000012589e7767958ba154f9018cccf0dedea6147bb60cd1a194b6e3590a9965690d60100000000fdffffff0118ddf50500000000160014c9123e06e8d7f0966c5d1cd0f933002d4eb757cd000000000001012b00e1f50500000000225120d0b226c6599f273874df8fe684ab6c3028081bee8a2cbed31a136f5865f6cfa42116346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd000500580b088721164fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c0500c3249a8221168dd96ab858b259c518218c014a46eb4e6ac899e51c675ef774fbb68a8799ce2f0d002680dd6e01000000020000002116f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f905007dd655920117208dd96ab858b259c518218c014a46eb4e6ac899e51c675ef774fbb68a8799ce2f221a030b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d46302346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd00024fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c02f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f90000";
+      final Psbt psbt = Psbt.fromHex(psbtData);
+      expect(psbt.toHex(), psbtData);
+    });
+    test("With all pubnonces", () {
+      final String psbtData =
+          "70736274ff01005202000000012589e7767958ba154f9018cccf0dedea6147bb60cd1a194b6e3590a9965690d60100000000fdffffff0118ddf50500000000160014c9123e06e8d7f0966c5d1cd0f933002d4eb757cd000000000001012b00e1f50500000000225120d0b226c6599f273874df8fe684ab6c3028081bee8a2cbed31a136f5865f6cfa42116346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd000500580b088721164fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c0500c3249a8221168dd96ab858b259c518218c014a46eb4e6ac899e51c675ef774fbb68a8799ce2f0d002680dd6e01000000020000002116f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f905007dd655920117208dd96ab858b259c518218c014a46eb4e6ac899e51c675ef774fbb68a8799ce2f221a030b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d46302346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd00024fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c02f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f9431b02346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd0002d0b226c6599f273874df8fe684ab6c3028081bee8a2cbed31a136f5865f6cfa442024eefc9fdd12be74746485c678b8268949cc9236e9fce82241395523af04262bf038c276e832aad4bfb9e90485162f574c8b2619df5bd19db8ffa2eb0059493bf1b431b024fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c02d0b226c6599f273874df8fe684ab6c3028081bee8a2cbed31a136f5865f6cfa44203a324a3f4221bfab2b6fa0786a7048f3345ce344f1458e151ba187b59aab498cb02a3638259ba4ccc46fe79d8d79a4d9e704ec0f7701b5e664d4d8733838af49196431b02f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f902d0b226c6599f273874df8fe684ab6c3028081bee8a2cbed31a136f5865f6cfa44202c12eb4ef8760321c072a51d8fb65c34ee8b452a14818557f61df061285a5809103a08e41b262942c6e5932fd1fb5d99236897989f6e912dc21476d2771874114930000";
+      final Psbt psbt = Psbt.fromHex(psbtData);
+      expect(psbt.toHex(), psbtData);
+    });
+    test("With all partial signatures", () {
+      final String psbtData =
+          "70736274ff01005202000000012589e7767958ba154f9018cccf0dedea6147bb60cd1a194b6e3590a9965690d60100000000fdffffff0118ddf50500000000160014c9123e06e8d7f0966c5d1cd0f933002d4eb757cd000000000001012b00e1f50500000000225120d0b226c6599f273874df8fe684ab6c3028081bee8a2cbed31a136f5865f6cfa40113409e39897ac2ffe27525dc460f8584fddd11fe9a97ce2e50c1489b8c1a4e92fcc07e48db63a1a4ccb9d297537d0c038838378bbf278de7aa1a128995d1625cc5cd2116346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd000500580b088721164fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c0500c3249a8221168dd96ab858b259c518218c014a46eb4e6ac899e51c675ef774fbb68a8799ce2f0d002680dd6e01000000020000002116f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f905007dd655920117208dd96ab858b259c518218c014a46eb4e6ac899e51c675ef774fbb68a8799ce2f221a030b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d46302346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd00024fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c02f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f9431b02346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd0002d0b226c6599f273874df8fe684ab6c3028081bee8a2cbed31a136f5865f6cfa442024eefc9fdd12be74746485c678b8268949cc9236e9fce82241395523af04262bf038c276e832aad4bfb9e90485162f574c8b2619df5bd19db8ffa2eb0059493bf1b431b024fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c02d0b226c6599f273874df8fe684ab6c3028081bee8a2cbed31a136f5865f6cfa44203a324a3f4221bfab2b6fa0786a7048f3345ce344f1458e151ba187b59aab498cb02a3638259ba4ccc46fe79d8d79a4d9e704ec0f7701b5e664d4d8733838af49196431b02f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f902d0b226c6599f273874df8fe684ab6c3028081bee8a2cbed31a136f5865f6cfa44202c12eb4ef8760321c072a51d8fb65c34ee8b452a14818557f61df061285a5809103a08e41b262942c6e5932fd1fb5d99236897989f6e912dc21476d277187411493431c02346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd0002d0b226c6599f273874df8fe684ab6c3028081bee8a2cbed31a136f5865f6cfa420657db286be14e80ece0dd84b4d17c4dc414c3e56bc8cef0827b061b4dd2c8f43431c024fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c02d0b226c6599f273874df8fe684ab6c3028081bee8a2cbed31a136f5865f6cfa420e78552fb4ce9b2d00e1ed0e2cb98e087199127477e8f1a1c681a00b9c4ce7098431c02f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f902d0b226c6599f273874df8fe684ab6c3028081bee8a2cbed31a136f5865f6cfa420cbcc95786a1c674d48d8ac52e322dd7c6eabac3bfc4be79b750de28df82e2f730000";
+      final Psbt psbt = Psbt.fromHex(psbtData);
+      expect(psbt.toHex(), psbtData);
+    });
+  });
+
+  test(
+      "Case: Receiving a Taproot output where the internal key is a MuSig2 Aggregate Pubkey",
+      () {
+    final String psbtData =
+        "70736274ff01007d02000000012589e7767958ba154f9018cccf0dedea6147bb60cd1a194b6e3590a9965690d60000000000fdffffff0280969800000000002251202967d2d020a9795da72b51be4f3fca25bb0e57e91c5b3e7a81abfa7232a349420fc0927c00000000160014349c5d330278c3002a64f597d2b01aa3dc1bd903000000000001007d02000000019a8b4a50796b9600990f7fe11dfa00bc70efd296048afc86719af0fb1fa919370000000000fdffffff02895c2b7d00000000160014cfd98ba1027ea4ed4bd2ae1b348b6156a015037500e1f50500000000225120d0b226c6599f273874df8fe684ab6c3028081bee8a2cbed31a136f5865f6cfa4e100000001011f895c2b7d00000000160014cfd98ba1027ea4ed4bd2ae1b348b6156a0150375220602a66650f08bffa4f089eb22edcdbe7616645ff6cd180a36484d4bc81054595b7b18bfff44a3540000800100008000000080010000008a020000000105200b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d421070b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d405002680dd6e2107346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd000500580b088721074fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c0500c3249a822107f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f905007dd655922208030b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d46302346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd00024fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c02f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f900220203be4ae53d37cc075f40b30d6da4729d40adeeb983533af1616192bc76d5b2612a18bfff44a3540000800100008000000080010000008d02000000";
+    final Psbt psbt = Psbt.fromHex(psbtData);
+    expect(psbt.toHex(), psbtData);
+  });
+  test(
+      "Case: Receiving a Taproot output where the internal key is derived from a MuSig2 Aggregate Pubkey",
+      () {
+    final String psbtData =
+        "70736274ff01007d0200000001f835a5ec8e4008f96f17407e13f0c34912c39d27620800fae02baf86b8a78e760000000000fdffffff028096980000000000225120d0b226c6599f273874df8fe684ab6c3028081bee8a2cbed31a136f5865f6cfa49e405d05000000001600149f94ac2db46420b95dc0db1cc8f4bec0bb9234d8000000000001005202000000015686dff400165f4e040a5855f658093472c9bcf8108b272a5d31f181f7b4ffb10100000000fdffffff0118ddf50500000000160014c9123e06e8d7f0966c5d1cd0f933002d4eb757cd0000000001011f18ddf50500000000160014c9123e06e8d7f0966c5d1cd0f933002d4eb757cd220603293c8d8dc47b712d7c13a5d0536b7f2e3193267e60f7e66e563939dbe507479c18bfff44a35400008001000080000000800000000097010000000105208dd96ab858b259c518218c014a46eb4e6ac899e51c675ef774fbb68a8799ce2f2107346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd000500580b088721074fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c0500c3249a8221078dd96ab858b259c518218c014a46eb4e6ac899e51c675ef774fbb68a8799ce2f0d002680dd6e01000000020000002107f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f905007dd655922208030b58e337aa4d3852a8c29387c42408d8cfbe3a613a5e397e0a9f01a5fb7107d46302346b99593357107c9d3459e9deba8d3eaf44e6636c85c7f853eb90ba52e8cd00024fafd65f8169186fc2bfdb2233c77e630d10be280a24c7165c09a27611775c2c02f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f900220202ce69de967622b1c82eb0a0f80ceb0573a0f768b02fdb047b13c171e79174fcce18bfff44a3540000800100008000000080010000008e02000000";
+    final Psbt psbt = Psbt.fromHex(psbtData);
+    expect(psbt.toHex(), psbtData);
+  });
+}
diff --git a/test/psbt/builder/psbt_builder_sighash_none_test.dart b/test/psbt/builder/psbt_builder_sighash_none_test.dart
new file mode 100644
index 0000000..4ff5551
--- /dev/null
+++ b/test/psbt/builder/psbt_builder_sighash_none_test.dart
@@ -0,0 +1,110 @@
+import 'package:bitcoin_base/bitcoin_base.dart';
+import 'package:blockchain_utils/blockchain_utils.dart';
+import 'package:test/test.dart';
+
+import 'utxos_vector.dart';
+
+void main() {
+  test("PSBTV0", () {
+    _test(PsbtBuilderV0.create());
+    _test(PsbtBuilderV2.create());
+  });
+}
+
+void _test(PsbtBuilder builder) {
+  final expandUtxos = utxos.expand((e) => e).toList();
+  final psbtUtxos = expandUtxos.map((e) => PsbtUtxo.fromJson(e)).toList();
+  builder.addUtxos(psbtUtxos);
+  final inputs = builder.txInputs();
+  expect(inputs.length, expandUtxos.length);
+
+  for (int i = 0; i < expandUtxos.length; i++) {
+    final input = inputs[i];
+    expect(input.txId, expandUtxos[i]["utxo"]["tx_hash"]);
+    expect(input.txIndex, expandUtxos[i]["utxo"]["vout"]);
+  }
+  final output = builder.txOutputs();
+  expect(output.length, 0);
+
+  /// sign all inputs with SIGHASH_NONE
+  builder.signAllInput(
+    (p0) {
+      final signers = (expandUtxos[p0.index]["privateKeys"] as List)
+          .map((e) => ECPrivate.fromHex(e))
+          .toList();
+      return PsbtSignerResponse(
+          signers: signers.map((e) => PsbtDefaultSigner(e)).toList(),
+          sighash: BitcoinOpCodeConst.sighashNone,
+          tapleafHash: BytesUtils.tryFromHexString(
+              expandUtxos[p0.index]["select_leaf"]));
+    },
+  );
+  expect(
+      () => builder.addInput(PsbtTransactionInput.legacy(
+          outIndex: 0,
+          txId: BytesUtils.toHexString(QuickCrypto.generateRandom()),
+          amount: BigInt.from(10000),
+          address: P2pkhAddress.fromAddress(
+              address: "modADgm9UHadfWLQVKeHapbHjETkwwY6zs",
+              network: BitcoinNetwork.testnet))),
+      throwsA(isA<DartBitcoinPluginException>().having((p0) => p0.message,
+          'error message', contains('Missing input non-witness UTXOs.'))));
+  final totalAmoumt =
+      psbtUtxos.fold<BigInt>(BigInt.zero, (p, c) => p + c.utxo.value);
+  final fee = BtcUtils.toSatoshi('0.0001');
+  final amount1 = BtcUtils.toSatoshi('0.001');
+  final amount2 = BtcUtils.toSatoshi('0.0011');
+  final amount3 = BtcUtils.toSatoshi('0.0012');
+  final change = totalAmoumt - amount1 - amount2 - amount3 - fee;
+  final r1 = P2trAddress.fromAddress(
+      address: "tb1pypcrdc24z5jahxus00kgp5rr3z5hy5ma0slanjskglx6c0nyxz8suncnq7",
+      network: BitcoinNetwork.testnet);
+  final r2 = P2shAddress.fromAddress(
+      address: "2ND8PB9RrfCaAcjfjP1Y6nAgFd9zWHYX4DN",
+      network: BitcoinNetwork.testnet);
+  final r3 = P2shAddress.fromAddress(
+      address: "2MuTei1oXmMKbmnDBCfKCtrbWDdbnriYZXm",
+      network: BitcoinNetwork.testnet);
+  final r4 = P2pkhAddress.fromAddress(
+      address: "modADgm9UHadfWLQVKeHapbHjETkwwY6zs",
+      network: BitcoinNetwork.testnet);
+  builder.addOutput(PsbtTransactionOutput(amount: amount1, address: r1));
+  builder.addOutput(PsbtTransactionOutput(amount: amount2, address: r2));
+  builder.addOutput(PsbtTransactionOutput(amount: amount3, address: r3));
+  builder.addOutput(PsbtTransactionOutput(amount: change, address: r4));
+  final outs = builder.txOutputs();
+  expect(outs.length, 4);
+  expect(outs[0].amount, amount1);
+  expect(outs[0].scriptPubKey, r1.toScriptPubKey());
+  expect(outs[1].amount, amount2);
+  expect(outs[1].scriptPubKey, r2.toScriptPubKey());
+  expect(outs[2].amount, amount3);
+  expect(outs[2].scriptPubKey, r3.toScriptPubKey());
+  expect(outs[3].amount, change);
+  expect(outs[3].scriptPubKey, r4.toScriptPubKey());
+  _partialSignSighashNone(builder.toBase64(), expandUtxos);
+}
+
+void _partialSignSighashNone(String psbt, List<Map<String, dynamic>> utxoes) {
+  final key14 = PsbtDefaultSigner(ECPrivate.fromHex(
+      "efd4d62709543c1bae8a22b44640856b48398b7d06f57958760a8695b9f5f171"));
+  final builder = PsbtBuilder.fromBase64(psbt);
+  builder.signInput(
+      signer: (params) => PsbtSignerResponse(signers: [key14]), index: 14);
+  final tx = builder.finalizeAll(
+    onFinalizeInput: (params) {
+      if (params.inputData.taprootLeafScript != null &&
+          params.inputData.taprootLeafScript!.length > 1) {
+        /// taproot script-path with multiple tapleaf script exists
+        /// in this case should we pass correct tapleaf.
+        return PsbtFinalizeResponse(
+            tapleafHash: BytesUtils.tryFromHexString(
+                utxoes[params.index]["select_leaf"]));
+      }
+      return null;
+    },
+  );
+
+  expect(tx.txId(),
+      "d95bf1d6a34dadcd458368f19c667f588b59b5c2217190433eb4c737575866c3");
+}
diff --git a/test/psbt/builder/psbt_builder_sighash_single_test.dart b/test/psbt/builder/psbt_builder_sighash_single_test.dart
new file mode 100644
index 0000000..728b343
--- /dev/null
+++ b/test/psbt/builder/psbt_builder_sighash_single_test.dart
@@ -0,0 +1,165 @@
+import 'package:bitcoin_base/bitcoin_base.dart';
+import 'package:blockchain_utils/blockchain_utils.dart';
+import 'package:test/test.dart';
+
+import 'utxos_vector.dart';
+
+void main() {
+  test("PSBT", () {
+    _test(PsbtBuilderV0.create());
+    _test(PsbtBuilderV2.create());
+  });
+}
+
+void _test(PsbtBuilder builder) {
+  final expandUtxos = utxos.expand((e) => e).toList();
+  final psbtUtxos = expandUtxos.map((e) => PsbtUtxo.fromJson(e)).toList();
+  builder.addUtxos(psbtUtxos);
+  final inputs = builder.txInputs();
+  expect(inputs.length, expandUtxos.length);
+
+  for (int i = 0; i < expandUtxos.length; i++) {
+    final input = inputs[i];
+    expect(input.txId, expandUtxos[i]["utxo"]["tx_hash"]);
+    expect(input.txIndex, expandUtxos[i]["utxo"]["vout"]);
+  }
+  final output = builder.txOutputs();
+  expect(output.length, 0);
+  final totalAmoumt =
+      psbtUtxos.fold<BigInt>(BigInt.zero, (p, c) => p + c.utxo.value);
+  final fee = BtcUtils.toSatoshi('0.0001');
+  final amount1 = BtcUtils.toSatoshi('0.001');
+  final amount2 = BtcUtils.toSatoshi('0.0011');
+  final amount3 = BtcUtils.toSatoshi('0.0012');
+  final change = totalAmoumt - amount1 - amount2 - amount3 - fee;
+
+  final r1 = P2trAddress.fromAddress(
+      address: "tb1pypcrdc24z5jahxus00kgp5rr3z5hy5ma0slanjskglx6c0nyxz8suncnq7",
+      network: BitcoinNetwork.testnet);
+  final r2 = P2shAddress.fromAddress(
+      address: "2ND8PB9RrfCaAcjfjP1Y6nAgFd9zWHYX4DN",
+      network: BitcoinNetwork.testnet);
+  final r3 = P2shAddress.fromAddress(
+      address: "2MuTei1oXmMKbmnDBCfKCtrbWDdbnriYZXm",
+      network: BitcoinNetwork.testnet);
+  final r4 = P2pkhAddress.fromAddress(
+      address: "modADgm9UHadfWLQVKeHapbHjETkwwY6zs",
+      network: BitcoinNetwork.testnet);
+  builder.addOutput(PsbtTransactionOutput(amount: amount1, address: r1));
+  builder.signInput(
+      signer: (params) {
+        expect(params.index, 0);
+        final utxo = utxos[params.index];
+        expect(utxo.length, 1);
+        expect(utxo[0]["address"],
+            params.address.toAddress(BitcoinNetwork.testnet));
+        final signers = (utxo[0]["privateKeys"] as List)
+            .map((e) => ECPrivate.fromHex(e))
+            .toList();
+        return PsbtSignerResponse(
+            signers: signers.map((e) => PsbtDefaultSigner(e)).toList(),
+            sighash: BitcoinOpCodeConst.sighashSingle,
+            tapleafHash: BytesUtils.tryFromHexString(utxo[0]["select_leaf"]));
+      },
+      index: 0);
+  builder.addOutput(PsbtTransactionOutput(amount: amount2, address: r2));
+  builder.signInput(
+      signer: (params) {
+        expect(params.index, 1);
+        final utxo = utxos[params.index];
+        expect(utxo.length, 2);
+        expect(utxo[0]["address"],
+            params.address.toAddress(BitcoinNetwork.testnet));
+        final signers = (utxo[0]["privateKeys"] as List)
+            .map((e) => ECPrivate.fromHex(e))
+            .toList();
+
+        /// taproot script-path with multiple tapleaf script exists
+        /// in this case should we pass correct tapleaf.
+        return PsbtSignerResponse(
+            signers: signers.map((e) => PsbtDefaultSigner(e)).toList(),
+            sighash: BitcoinOpCodeConst.sighashSingle,
+            tapleafHash: BytesUtils.tryFromHexString(utxo[0]["select_leaf"]));
+      },
+      index: 1);
+  builder.addOutput(PsbtTransactionOutput(amount: amount3, address: r3));
+  builder.signInput(
+      signer: (params) {
+        expect(params.index, 2);
+        final utxo = utxos[1];
+        expect(utxo.length, 2);
+        expect(utxo[1]["address"],
+            params.address.toAddress(BitcoinNetwork.testnet));
+        final signers = (utxo[1]["privateKeys"] as List)
+            .map((e) => ECPrivate.fromHex(e))
+            .toList();
+
+        /// taproot script-path with multiple tapleaf script exists
+        /// in this case should we pass correct tapleaf.
+        return PsbtSignerResponse(
+            signers: signers.map((e) => PsbtDefaultSigner(e)).toList(),
+            sighash: BitcoinOpCodeConst.sighashSingle,
+            tapleafHash: BytesUtils.tryFromHexString(utxo[1]["select_leaf"]));
+      },
+      index: 2);
+  builder.addOutput(PsbtTransactionOutput(amount: change, address: r4));
+
+  /// sign all inputs with SIGHASH_ALL
+  builder.signAllInput(
+    (p0) {
+      if (p0.inputData.partialSigs != null ||
+          p0.inputData.taprootScriptSpendSignature != null) {
+        return null;
+      }
+      final signers = (expandUtxos[p0.index]["privateKeys"] as List)
+          .map((e) => ECPrivate.fromHex(e))
+          .toList();
+      return PsbtSignerResponse(
+          signers: signers.map((e) => PsbtDefaultSigner(e)).toList(),
+          sighash: BitcoinOpCodeConst.sighashAll,
+          tapleafHash: BytesUtils.tryFromHexString(
+              expandUtxos[p0.index]["select_leaf"]));
+    },
+  );
+  expect(
+      () => builder.addInput(PsbtTransactionInput.legacy(
+          outIndex: 0,
+          txId: BytesUtils.toHexString(QuickCrypto.generateRandom()),
+          amount: BigInt.from(10000),
+          address: P2pkhAddress.fromAddress(
+              address: "modADgm9UHadfWLQVKeHapbHjETkwwY6zs",
+              network: BitcoinNetwork.testnet))),
+      throwsA(isA<DartBitcoinPluginException>().having((p0) => p0.message,
+          'error message', contains('Missing input non-witness UTXOs'))));
+  final key14 = PsbtDefaultSigner(ECPrivate.fromHex(
+      "efd4d62709543c1bae8a22b44640856b48398b7d06f57958760a8695b9f5f171"));
+  final newBuilder = PsbtBuilder.fromBase64(builder.toBase64());
+  newBuilder.signInput(
+      signer: (params) => PsbtSignerResponse(signers: [key14]), index: 14);
+  final tx = newBuilder.finalizeAll(
+    onFinalizeInput: (params) {
+      if (params.inputData.taprootLeafScript != null &&
+          params.inputData.taprootLeafScript!.length > 1) {
+        /// taproot script-path with multiple tapleaf script exists
+        /// in this case should we pass correct tapleaf.
+        return PsbtFinalizeResponse(
+            tapleafHash: BytesUtils.tryFromHexString(
+                expandUtxos[params.index]["select_leaf"]));
+      }
+      return null;
+    },
+  );
+  expect(tx.inputs.length, expandUtxos.length);
+  expect(tx.outputs.length, 4);
+  expect(tx.outputs[0].scriptPubKey, r1.toScriptPubKey());
+  expect(tx.outputs[1].scriptPubKey, r2.toScriptPubKey());
+  expect(tx.outputs[2].scriptPubKey, r3.toScriptPubKey());
+  expect(tx.outputs[3].scriptPubKey, r4.toScriptPubKey());
+  expect(tx.outputs[0].amount, amount1);
+  expect(tx.outputs[1].amount, amount2);
+  expect(tx.outputs[2].amount, amount3);
+  expect(tx.outputs[3].amount, change);
+  expect(tx.hasWitness, true);
+  expect(tx.serialize(),
+      "02000000000113410913729457adf83e83fd620761a2adc4d3d342f96e5f1a463cbd8d42a65c890100000000ffffffff24913db187292098b5a99d7a21aceae44fa529b1892a841d4d22b26a3e213d210100000000ffffffff9f3bc50478585408a73c292d6550772d7cd138d63b55f3cd473292210eb7c7370000000000ffffffff91228f25131bd03a1b8f5c1737312d9d5963378a0481117e1b53615b71e7c2090100000000ffffffff05d94483dd289d4e8ee43202e2859a6f963541c5c7b83a928fe2878d8b1f3cba0000000000ffffffff44cd6d65362a9e09b7a16b27a1413e16a3097524cedf9282dc539d3743838fb20100000000ffffffff585d7c8ebe83e172a2de1c9651229ac58dd0ab52a83b38fcb9fd5614f4dd87600100000000ffffffff91e6377bb8cc8f2dc2e74aa35d00cee90f54439adedb9e6a70e5b54df6c8b48f01000000fd0e020047304402201c0c70413c1f7aa7d85723ccdcd6a2d01aed5afb49bedfcf8f66c28f543963640220648a6b1a480268f2752c91895d26f52809875ba966eb761e7b64db8c2e93cbd20147304402205edb3b1fa9a99a220a923523bea1d84029c488a25dcb7465b0db69628470e2dc0220668adef2514c07433756e5bc5b5eb6ddf97e5476f8ff868ef0c4e032c09bfc420147304402205edb3b1fa9a99a220a923523bea1d84029c488a25dcb7465b0db69628470e2dc0220668adef2514c07433756e5bc5b5eb6ddf97e5476f8ff868ef0c4e032c09bfc420147304402205edb3b1fa9a99a220a923523bea1d84029c488a25dcb7465b0db69628470e2dc0220668adef2514c07433756e5bc5b5eb6ddf97e5476f8ff868ef0c4e032c09bfc42014ceb54210226733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d874104cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fe5690748be2d1358b2e4375bf6185416fa24db998d9501a165e3a2a577bc36494104cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fe5690748be2d1358b2e4375bf6185416fa24db998d9501a165e3a2a577bc36494104cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fe5690748be2d1358b2e4375bf6185416fa24db998d9501a165e3a2a577bc364954aeffffffffd7f59b462d2e266956e14826a16ad1585924eaee1f3e85d45a44947ec732f2cf01000000fd3c010047304402204eecd3ee698ba7f7dee1782d6c15bbf449dcda9e6c391a95a8597e5c2bd3a70602202879f95b47bfb0237eda5f2df0f0216270072e134d20116bc1cf2cf93fce4444014730440220056c84a7afc61d9eb60f4ea0018e48786669a68b84038033f743b9c77527e5c202205ad0b5ab865f9af383048cd64529637b115ec8e4f2fc6b6852f6e72bc6d6c530014ca952210226733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d874104cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fe5690748be2d1358b2e4375bf6185416fa24db998d9501a165e3a2a577bc36494104cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fe5690748be2d1358b2e4375bf6185416fa24db998d9501a165e3a2a577bc364953aeffffffffb4dd6c05b64baf220d42702d71a6023cc9a8ef38d7d3ccf523ecab92ee2b55a501000000020151ffffffff809cd4c4df13b7914968ea849e958e64f7d90735e515d1f314858d64e33f56bd01000000232200204ae81572f06e1b88fd5ced7a1a000945432e83e1551e6f721ee9c00b8cc33260ffffffffdfec4c78c7fc29a5a67a0aa8b6ab04db5914ccfdf78a891d6c0be477f7a6bf95000000006c4730440220717139bb42e376e94c28fcea63e2f6d746dad4f7b9af162145d8e4da8c7b5be302202858971660c85ccde274095d3874193f482aa604f4e122f477cd4b2dc46e7b450123210226733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d87acffffffffc59ff6d282bfb2308e9880129685d3b3cc8807211902103a5747e75a3a3215e50100000023220020640f8c50d23cdfb05deeeb989304ba8e2d270eda368c3b0c024191c3370467a9ffffffff6dcae52c906f44ed0d02329de0d8cd60f087bf2ba36fdd13927fda1da9e0f44c0100000000ffffffff8e09c938270e7102a804e5be2b9a89bc7ed36ce4e59e20848c8a2bc13835f2ea0100000000ffffffffdfec4c78c7fc29a5a67a0aa8b6ab04db5914ccfdf78a891d6c0be477f7a6bf95010000008447304402207494ecd0c531d3a8360b929920f5a11c48caee1c36261a01183c038aecf143cb0220318b91997cafdf8d3c15272f8b99aa51eba532adf76caa0d8b1d46685411caf4012103cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f1976a914b273443219d7f2652349caceecbb641cceb7b92288acffffffff0b76290e390e13a946e727ac2d78b0c9fc220969ebbb9ded97dbb3ae7736f95f010000001716001425761a501d439b764831e1a9c1b50c48c7cb2af1ffffffff96b1b1fade7027fc7a1c826e76b9408c142958d2bb8c7a9c3f1f94c70120eba1010000008c473044022077c0ac5efbd0ebf4c06adfbafbf14bdc2603687852da25b07b994c3e277c7905022055a1bc07a45dc20985ed16f228742ff9d6e486391575a46d31eef34db08b082e014341043a1a902bf14317faffae2568fdcbdc188d9455ae60a2dfbf5dc3b226d784497726f6523d1cd0da24863f8d943dd1fd3c7030efc2636d3238bec7d558c075ce7eacffffffffbeffc3e46f588727b7d4f7a060acc0f9a546752b04f2ed461d4cc539b217420a010000008a47304402200b3aeee45f74ee61fa7b44cd93c6bdd6c1e98cb274331aaf0376dcf442751faa022025f2b6ad67d251494a9e78854edb023541bbb60b353547407b4f4a8f8d421af70141045e6ae939f1e87542d2b43ba27dabfddee68bb03c0f8ea1893e1f09e2f50e256bba49f505c6292cb76bea21868164f1ce9187ff94d302ecb2ab209eea2bc9274effffffff04a086010000000000225120207036e1551525db9b907bec80d06388a972537d7c3fd9ca1647cdac3e64308fb0ad01000000000017a914da1745e9b549bd0bfa1a569971c77eba30cd5a4b87c0d401000000000017a9141849e0be5299d74ff8310a31ab6b93d9d98dad8087f8c83900000000001976a91458ed74ce76848830523000e26d27aa2f292bcce788ac07414f1d56e9312b37afd31dbdb6e63c06fca6fb8514c7aa9a1d59d95840614e8ba4a5103066993e6d64cef441899ee45e7ac5a939a27ac7b057e894effaa367f67b03414f1d56e9312b37afd31dbdb6e63c06fca6fb8514c7aa9a1d59d95840614e8ba4a5103066993e6d64cef441899ee45e7ac5a939a27ac7b057e894effaa367f67b0341d9bf64eddc45622a109b059ea087f1f35cda617cca082cbc2812e47ca5499980367158f01d7958b938e7e19e5afa56208ffa3871d967a88cf3e57b6923a08ace030000ac205e6ae939f1e87542d2b43ba27dabfddee68bb03c0f8ea1893e1f09e2f50e256bac203a1a902bf14317faffae2568fdcbdc188d9455ae60a2dfbf5dc3b226d7844977ba2026733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d87ba20cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fba20cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fba539c21c1af82536a8922025e345e6bd10f15061b22ff8d3dacc86dd6403c136d5b47f11e0441196b2b96a538e8f101f61d077b26a8d1696ad19649a346692e2710633f841c13131dd8a1b9d7339cb0956bae79ceeabefe557aec05d2a98dc8a0e557775905490341ae46e8c16b2e80253d23ac9dea2c5e303f937e7743aa144d2c95ed49cb9750d712db56f8369aab4d57088b259d2fe5b0c338028e19d83db367009b628b5cc806034620cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fac2026733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d87ba529c61c126733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d87e696fde00a8758def6d9648541848f44e36d9f823864c659f8f1f2bf3203c1c4d968d4f3d4ebada4fbe1211c2a276b48a0081d1e1a8391b86a1adacb8a85523d04414f104ae761e587a559ff48ba3d184f58cdda6c63f84dfd0a0e4fc0f4ad0669b3447cc736f0f100e4ffff1af8a3ea801afc4c3a000ac3fc8844387b6ef69f67900341586a2b47877a5f005f207bee74327066816f1d48881468834103323604d70d02fe92167de3ac6434b8dc89daa93315aa7bb8eaec4cc3cab3b540abfb03050535034620cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fac2026733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d87ba529c61c126733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d87e696fde00a8758def6d9648541848f44e36d9f823864c659f8f1f2bf3203c1c4d968d4f3d4ebada4fbe1211c2a276b48a0081d1e1a8391b86a1adacb8a85523d0441bc66661d4f06c88cc16a4c7d7b7dcc949cddcd2e7c81a31d7703ef35231cbf307166147f96b9bbf399a7fe30eda5d44864b45c06e5cce713934faeb4df759f0a0141bc66661d4f06c88cc16a4c7d7b7dcc949cddcd2e7c81a31d7703ef35231cbf307166147f96b9bbf399a7fe30eda5d44864b45c06e5cce713934faeb4df759f0a014620cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fac20cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fba529c21c126733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d870441328f374971614d9826fa4faf13ef41d70dc524e2a40b77b1429c8a7c1269c16db83e5637a8d49186d1e55ac7a986230baad191fb7a3f257f373808c3b6222e900141328f374971614d9826fa4faf13ef41d70dc524e2a40b77b1429c8a7c1269c16db83e5637a8d49186d1e55ac7a986230baad191fb7a3f257f373808c3b6222e90014620cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fac20cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fba529c21c126733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d870441c770cbee83f94443c4f3c0bfe50906da00511843b0c8f9f21143569f31ab51f8ecfcbf7df2aed1523c93b3590ac4c2212be4873ae8c325a8b7f2d78aaf6b4b320141c770cbee83f94443c4f3c0bfe50906da00511843b0c8f9f21143569f31ab51f8ecfcbf7df2aed1523c93b3590ac4c2212be4873ae8c325a8b7f2d78aaf6b4b32014620cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fac20cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fba529c21c126733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d87050047304402201da9ec0c6d31754213dd34bc827a55ede0b6504dbc469b5ff2226c65c6070f66022027f7f5b061b4376b4e6ddfb909c705662b543dfb579c8388ef73c838958a670e0147304402204ad1ceead0a2caa1c4496e0394852a1388920a24b133c1b11a82f1689c2031a10220014d6f1474acd3ea17e2d01ee911e2f91a81755b7d02e5dccc76e72cef63b1af0147304402204ad1ceead0a2caa1c4496e0394852a1388920a24b133c1b11a82f1689c2031a10220014d6f1474acd3ea17e2d01ee911e2f91a81755b7d02e5dccc76e72cef63b1af016953210226733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d872103cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f2103cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f53ae0000000101510003004730440220130acbcb1d91b66ece6c4e1092067eaafc7018517abad15d2ba157b93424f6a302202e94639c4aa11ac82cfd3d469afa825e7d116c7ca5a795388d945d847f9e646b0125512103cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f51ae01419e27486161463fb17cd71dfd2f463a8fea78a05e8e6e17c6feb794539a2fef2bec2088a560a1ff7a2d64c1110e6e69aba377bab8dbfa4308cf4453fffed3d44e010247304402203ea2fda5871f33389ecc88d5b1d283397d286d3d92f36d14e3dcfbab388ce851022079de1cbe0021e0e533285beb182fd68b817b40a3589f430fc555747fee17d6ab012103cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f00024730440220104bfbc220ff7c7634e502bbd1529326b1aa08f7ae8a591f65c38e7255f74551022073108e41a3151277485ffb04d3db848a6cd5912f539608de302eb88e2bbc2fa101210226733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d87000000000000");
+}
diff --git a/test/psbt/builder/psbt_builder_update_input_test.dart b/test/psbt/builder/psbt_builder_update_input_test.dart
new file mode 100644
index 0000000..e56e660
--- /dev/null
+++ b/test/psbt/builder/psbt_builder_update_input_test.dart
@@ -0,0 +1,142 @@
+import 'package:bitcoin_base/bitcoin_base.dart';
+import 'package:test/test.dart';
+import 'psbt_update_output_test.dart';
+import 'utxos_vector2.dart';
+
+void main() {
+  _test1();
+  _test();
+}
+
+void _test() {
+  void test_(PsbtBuilder builder, PsbtVersion version) {
+    final expandUtxos = utxosVector2.expand((e) => e).toList();
+    final psbtUtxos = expandUtxos.map((e) => PsbtUtxo.fromJson(e)).toList();
+    final amount1 = BtcUtils.toSatoshi('0.001');
+    final amount2 = BtcUtils.toSatoshi('0.0011');
+    final amount3 = BtcUtils.toSatoshi('0.0012');
+    builder.addUtxo(psbtUtxos[0]);
+    builder.addOutput(
+        PsbtTransactionOutput(amount: amount1, address: recipient1()));
+    expect(
+        () => builder.addUtxo(psbtUtxos[0]),
+        throwsA(isA<DartBitcoinPluginException>().having((p0) => p0.message,
+            'error message', contains('Duplicate input detected'))));
+    builder = signFinalize(
+        builder: builder,
+        index: 0,
+        utxos: expandUtxos,
+        sighash: BitcoinOpCodeConst.sighashSingleAnyOneCanPay);
+    builder.addUtxo(psbtUtxos[1]);
+    expect(
+        () => builder.updateOutput(
+            0, PsbtTransactionOutput(amount: amount2, address: recipient2())),
+        throwsA(isA<DartBitcoinPluginException>().having((p0) => p0.message,
+            'error message', contains('Unable to modify output'))));
+    builder.addOutput(
+        PsbtTransactionOutput(amount: amount2, address: recipient2()));
+    builder = signFinalize(
+        builder: builder,
+        index: 1,
+        utxos: expandUtxos,
+        sighash: BitcoinOpCodeConst.sighashNoneAnyOneCanPay);
+    builder.updateOutput(
+        1, PsbtTransactionOutput(amount: amount3, address: recipient3()));
+    expect(builder.txOutputs().length, 2);
+    expect(builder.txOutputs()[0].scriptPubKey, recipient1().toScriptPubKey());
+    expect(builder.txOutputs()[0].amount, amount1);
+    expect(builder.txOutputs()[1].scriptPubKey, recipient3().toScriptPubKey());
+    expect(builder.txOutputs()[1].amount, amount3);
+    builder.addUtxo(psbtUtxos[2]);
+    builder = signFinalize(
+        builder: builder,
+        index: 2,
+        utxos: expandUtxos,
+        sighash: BitcoinOpCodeConst.sighashAll);
+    expect(
+        () => builder.addOutput(
+            PsbtTransactionOutput(amount: amount2, address: recipient4())),
+        throwsA(isA<DartBitcoinPluginException>().having((p0) => p0.message,
+            'error message', contains('Unable to modify output'))));
+    expect(
+        () => builder.addUtxo(psbtUtxos[3]),
+        throwsA(isA<DartBitcoinPluginException>().having((p0) => p0.message,
+            'error message', contains('Unable to modify input'))));
+    expect(builder.txInputs().length, 3);
+    expect(builder.indexFinalized(0), true);
+    expect(builder.indexFinalized(1), true);
+    expect(builder.indexFinalized(2), true);
+    final tx = builder.finalizeAll();
+    expect(tx.serialize(),
+        "02000000000103cb518ff0d558dd716c3612204fbb2c6f152597ae2dc12da71961a4bc2cf41edd0000000000ffffffffcb518ff0d558dd716c3612204fbb2c6f152597ae2dc12da71961a4bc2cf41edd0100000000ffffffffcb518ff0d558dd716c3612204fbb2c6f152597ae2dc12da71961a4bc2cf41edd0200000000ffffffff02a086010000000000225120adf0c64c5b821de7bce3b840ce764edbb50adb61dbbe98caa3ffde6c612a71b0c0d401000000000017a9141849e0be5299d74ff8310a31ab6b93d9d98dad80870741b7267375cc52dbbab47f5ce818511c19b942f1b6d7800ee89a67aba8ab9da42ddc45675128c755f9519bf7cbbfd7a6f4f0aa2b7e91f7ccc34b6aef95be0452088341b7267375cc52dbbab47f5ce818511c19b942f1b6d7800ee89a67aba8ab9da42ddc45675128c755f9519bf7cbbfd7a6f4f0aa2b7e91f7ccc34b6aef95be04520883418c8a6fe46a6568667c363710cd57e1cec85f50160cf5d0d19a72b82b8c99420dbc3bbb9884f56d91ef54a0a9658f07e06bf83ae8c7efb599957f408da798539b830000ac205e6ae939f1e87542d2b43ba27dabfddee68bb03c0f8ea1893e1f09e2f50e256bac203a1a902bf14317faffae2568fdcbdc188d9455ae60a2dfbf5dc3b226d7844977ba2026733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d87ba20cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fba20cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fba539c21c1af82536a8922025e345e6bd10f15061b22ff8d3dacc86dd6403c136d5b47f11e0441bd0f97b640a9bbecc0b4cc8008d5cec04556eae7ac7d8e6b348d55947e659db021e99901f487c1e87fbcd2a90864c9c6a43fc2ce7bfd007eff74ad0e6019715d824162087df7de3018936968dda1a2627c6cfaf89ae512dd466a285a7bd6ee19a8faad661225d6b14b52b2a983791a6b11494ffaa6b287225bcdd37895a195ec8aaf824620cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fac2026733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d87ba529c61c126733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d87e696fde00a8758def6d9648541848f44e36d9f823864c659f8f1f2bf3203c1c4d968d4f3d4ebada4fbe1211c2a276b48a0081d1e1a8391b86a1adacb8a85523d0441565003500b20d4488c2e49c7d6de32aa4b3734cc30316be40fcd583e2ec4999265c37e3236854b9c3c72cf5b551417294c62cc89008ab8028d2e354753bd2ee00141565003500b20d4488c2e49c7d6de32aa4b3734cc30316be40fcd583e2ec4999265c37e3236854b9c3c72cf5b551417294c62cc89008ab8028d2e354753bd2ee0014620cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fac20cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fba529c21c126733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d8700000000");
+    expect(version, builder.psbtVersion);
+  }
+
+  test("description", () {
+    test_(PsbtBuilderV0.create(), PsbtVersion.v0);
+    test_(PsbtBuilderV2.create(), PsbtVersion.v2);
+  });
+}
+
+void _test1() {
+  test("description", () {
+    final expandUtxos = utxosVector2.expand((e) => e).toList();
+    final psbtUtxos = expandUtxos.map((e) => PsbtUtxo.fromJson(e)).toList();
+    PsbtBuilder builder = PsbtBuilderV0.create();
+    builder.addUtxo(psbtUtxos[0]);
+    expect(builder.txInputs().length, 1);
+    _expectInput(builder: builder, utxo: psbtUtxos[0], index: 0);
+    builder.updateInput(0, PsbtTransactionInput.fromUtxo(psbtUtxos[1]));
+    _expectInput(builder: builder, utxo: psbtUtxos[1], index: 0);
+    builder = signFinalize(
+        builder: builder,
+        index: 0,
+        utxos: expandUtxos,
+        sighash: BitcoinOpCodeConst.sighashAll);
+    builder.removeInput(0);
+    expect(builder.txInputs().length, 0);
+    expect(builder.txOutputs().length, 0);
+    expect(
+        () => builder.psbtInput(0),
+        throwsA(isA<DartBitcoinPluginException>().having((p0) => p0.message,
+            'error message', contains('Invalid input index'))));
+    builder.addUtxo(psbtUtxos[0]);
+    final amount2 = BtcUtils.toSatoshi('0.0011');
+    final amount3 = BtcUtils.toSatoshi('0.0012');
+    builder.addOutput(
+        PsbtTransactionOutput(amount: amount2, address: recipient1()));
+    builder.addOutput(
+        PsbtTransactionOutput(amount: amount3, address: recipient2()));
+    builder = signFinalize(
+        builder: builder,
+        index: 0,
+        utxos: expandUtxos,
+        sighash: BitcoinOpCodeConst.sighashNoneAnyOneCanPay);
+    builder.addUtxo(psbtUtxos[1]);
+    builder = signFinalize(
+        builder: builder,
+        index: 1,
+        utxos: expandUtxos,
+        sighash: BitcoinOpCodeConst.sighashNoneAnyOneCanPay);
+
+    builder.addUtxo(psbtUtxos[2]);
+
+    builder = signFinalize(
+        builder: builder,
+        index: 2,
+        utxos: expandUtxos,
+        sighash: BitcoinOpCodeConst.sighashAll);
+    final tx = builder.finalizeAll();
+    expect(tx.txId(),
+        "f9a4f122347356516a40f49ab5b14d71ae4f88ec82b285dff5835f9ec9dc3e2b");
+  });
+}
+
+void _expectInput(
+    {required PsbtBuilder builder,
+    required PsbtUtxo utxo,
+    required int index}) {
+  final txInputs = builder.txInputs();
+  expect(txInputs[index].txId, utxo.utxo.txHash);
+  expect(txInputs[index].txIndex, utxo.utxo.vout);
+}
diff --git a/test/psbt/builder/psbt_builder_v0_test.dart b/test/psbt/builder/psbt_builder_v0_test.dart
new file mode 100644
index 0000000..7fb79a0
--- /dev/null
+++ b/test/psbt/builder/psbt_builder_v0_test.dart
@@ -0,0 +1,285 @@
+import 'package:bitcoin_base/bitcoin_base.dart';
+import 'package:blockchain_utils/blockchain_utils.dart';
+import 'package:test/test.dart';
+
+void main() {
+  _test1();
+}
+
+void _addP2PkhInout(PsbtBuilder psbt) {
+  final address = P2pkhAddress.fromAddress(
+      address: "modADgm9UHadfWLQVKeHapbHjETkwwY6zs",
+      network: BitcoinNetwork.testnet);
+  psbt.addInput(PsbtTransactionInput.legacy(
+      txId: "0a4217b239c54c1d46edf2042b7546a5f9c0ac60a0f7d4b72787586fe4c3ffbe",
+      amount: BigInt.from(500000),
+      outIndex: 1,
+      nonWitnessUtxo: BtcTransaction.deserialize(BytesUtils.fromHexString(
+          "02000000000101ee63737203248a1e03e2bc03318e753a91ac988de2f4f5cdaaf0d5195b0a0ead0000000000fdffffff02ed0de508840100001600147b458433d0c04323426ef88365bd4cfef141ac7520a10700000000001976a91458ed74ce76848830523000e26d27aa2f292bcce788ac02473044022061165ee01f36822393c0705b4afd2b634929f2344f42674dc5299af4fa76a15c0220077dd5f8a746993c96b117c3ed6ed269a7d539c9d690422fc92e49f2185cd13b0121030db9616d96a7b7a8656191b340f77e905ee2885a09a7a1e80b9c8b64ec746fb300000000")),
+      scriptPubKey: address.toScriptPubKey(),
+      bip32derivationPath: [
+        PsbtInputBip32DerivationPath.fromBip32(
+            masterKey: getMasterKey(path: null), path: "m/86'/1'/0'/0/1034")
+      ]));
+}
+
+void _test1() {
+  test("PSBT", () {
+    void checkBuilder(PsbtBuilderV0 builder) {
+      final inputs = builder.txInputs();
+      expect(inputs.length, 1);
+      expect(inputs.first.txId,
+          "0a4217b239c54c1d46edf2042b7546a5f9c0ac60a0f7d4b72787586fe4c3ffbe");
+      expect(inputs.first.txIndex, 1);
+      final psbtInput = builder.psbtInput(0);
+      expect(psbtInput.taprootKeyBip32DerivationPath?.length, 1);
+      final key = psbtInput.bip32derivationPath![0];
+      expect(key.path, "m/86'/1'/0'/0/1034");
+      final privateKey = key.toKeyDerivation().derive(getMasterKey(path: null));
+      expect(privateKey.privateKey.toHex(),
+          "39d9f93498ab9c5e833b6e22493be2aaa8d4daabb141afac801fccbf1298cd05");
+      expect(privateKey.fingerPrint.toBytes(), key.fingerprint);
+      expect(privateKey.publicKey.compressed, key.publicKey);
+      final totalAmount = BigInt.from(500000);
+      final receipt1 = _getReceipt();
+      final receipt2 = _getReceipt2();
+      final rec1Amount = BtcUtils.toSatoshi("0.00002");
+      final fee = BtcUtils.toSatoshi("0.0001");
+      final changeAmount = totalAmount - (rec1Amount + fee);
+      final outputs = builder.txOutputs();
+      expect(outputs.length, 2);
+      expect(outputs[1].scriptPubKey, receipt1.toScriptPubKey());
+      expect(outputs[1].amount, changeAmount);
+      expect(outputs[0].scriptPubKey, receipt2.toScriptPubKey());
+      expect(outputs[0].amount, rec1Amount);
+    }
+
+    final builder = PsbtBuilderV0.create();
+    expect(builder.psbtVersion, PsbtVersion.v0);
+    _addP2PkhInout(builder);
+
+    final totalAmount = BigInt.from(500000);
+    final receipt1 = _getReceipt();
+    final receipt2 = _getReceipt2();
+    final rec1Amount = BtcUtils.toSatoshi("0.00002");
+    final fee = BtcUtils.toSatoshi("0.0001");
+    final changeAmount = totalAmount - (rec1Amount + fee);
+    builder.addOutput(
+        PsbtTransactionOutput(amount: rec1Amount, address: receipt2));
+    builder.addOutput(
+        PsbtTransactionOutput(amount: changeAmount, address: receipt1));
+    checkBuilder(builder);
+
+    /// invalid signer public key
+    expect(() {
+      return builder.signInput(
+          signer: (p0) {
+            return PsbtSignerResponse(signers: [
+              PsbtDefaultSigner(ECPrivate.fromHex(
+                  "33053373fe566dc4f77941a449c20dfa356221dfadec5e3d507c58279e0e1991"))
+            ]);
+          },
+          index: 0);
+    }, throwsA(isA<DartBitcoinPluginException>()));
+    expect(() {
+      final clone = PsbtBuilder.fromBase64(builder.toBase64());
+      final privateKey = ECPrivate.fromHex(
+          "39d9f93498ab9c5e833b6e22493be2aaa8d4daabb141afac801fccbf1298cd05");
+      clone.signInput(
+          signer: (p0) {
+            return PsbtSignerResponse(signers: [PsbtDefaultSigner(privateKey)]);
+          },
+          index: 0);
+      final finalize = clone.finalizeAll();
+      return finalize.serialize();
+    }(),
+        "0200000001beffc3e46f588727b7d4f7a060acc0f9a546752b04f2ed461d4cc539b217420a010000008a473044022058eec26fcc66609066963d4be2b5559b8863ed973fb50757a681d97ff11f0f98022052d63ce1fe1d372a09d0f1cd2389fccefdcf18f9380e168621d8809cbc1225790141045e6ae939f1e87542d2b43ba27dabfddee68bb03c0f8ea1893e1f09e2f50e256bba49f505c6292cb76bea21868164f1ce9187ff94d302ecb2ab209eea2bc9274effffffff02d00700000000000017a914e56a8afdd4489d018e28cdf5bc662aabeb3f0b8387407207000000000017a9144185f108a273961c1641b503ea1deda5fd4468868700000000");
+    _addP2shAddress(builder);
+  });
+}
+
+void _addP2shAddress(PsbtBuilder builder) {
+  final newBuilder = PsbtBuilder.fromBase64(builder.toBase64());
+  final p2shSigner = P2shAddress.fromAddress(
+      address: "2N3oneRSj5C4jUWsSFmAkY6FX45kW7tUUP5",
+      network: BitcoinNetwork.testnet);
+
+  /// missing p2sh redeemscript
+  expect(
+      () => newBuilder.addInput(PsbtTransactionInput.legacy(
+          outIndex: 1,
+          txId:
+              "a1eb2001c7941f3f9c7a8cbbd25829148c40b9766e821c7afc2770defab1b196",
+          amount: BigInt.from(500000),
+          scriptPubKey: p2shSigner.toScriptPubKey())),
+      throwsA(isA<DartBitcoinPluginException>()));
+
+  /// invalid p2sh redeemscript;
+  expect(
+      () => newBuilder.addInput(PsbtTransactionInput.legacy(
+          outIndex: 1,
+          redeemScript: Script(script: [
+            "26733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d87",
+            BitcoinOpcode.opCheckSig,
+          ]),
+          nonWitnessUtxo: BtcTransaction.deserialize(BytesUtils.fromHexString(
+              "02000000000101beffc3e46f588727b7d4f7a060acc0f9a546752b04f2ed461d4cc539b217420a0000000000fdffffff025f63dd08840100001600147b458433d0c04323426ef88365bd4cfef141ac7520a107000000000017a91473d9d46bdadd9cb20c68330385d21bbf457500f28702473044022055ffaa4dd3ddfe16a681a8cc07bce7c64aea0e955806fc4abc475e79e9dd1801022053cee4bf5366e32bdeb976fc654d65ca798dfebdb05f3118ceb8dda517616d6e0121030db9616d96a7b7a8656191b340f77e905ee2885a09a7a1e80b9c8b64ec746fb300000000")),
+          txId:
+              "a1eb2001c7941f3f9c7a8cbbd25829148c40b9766e821c7afc2770defab1b196",
+          amount: BigInt.from(500000),
+          scriptPubKey: p2shSigner.toScriptPubKey())),
+      throwsA(isA<DartBitcoinPluginException>()));
+  newBuilder.addInput(PsbtTransactionInput.legacy(
+      outIndex: 1,
+      redeemScript: Script(script: [
+        "043a1a902bf14317faffae2568fdcbdc188d9455ae60a2dfbf5dc3b226d784497726f6523d1cd0da24863f8d943dd1fd3c7030efc2636d3238bec7d558c075ce7e",
+        BitcoinOpcode.opCheckSig,
+      ]),
+      txId: "a1eb2001c7941f3f9c7a8cbbd25829148c40b9766e821c7afc2770defab1b196",
+      nonWitnessUtxo: BtcTransaction.deserialize(BytesUtils.fromHexString(
+          "02000000000101beffc3e46f588727b7d4f7a060acc0f9a546752b04f2ed461d4cc539b217420a0000000000fdffffff025f63dd08840100001600147b458433d0c04323426ef88365bd4cfef141ac7520a107000000000017a91473d9d46bdadd9cb20c68330385d21bbf457500f28702473044022055ffaa4dd3ddfe16a681a8cc07bce7c64aea0e955806fc4abc475e79e9dd1801022053cee4bf5366e32bdeb976fc654d65ca798dfebdb05f3118ceb8dda517616d6e0121030db9616d96a7b7a8656191b340f77e905ee2885a09a7a1e80b9c8b64ec746fb300000000")),
+      amount: BigInt.from(500000),
+      scriptPubKey: p2shSigner.toScriptPubKey()));
+  expect(newBuilder.txInputs().length, 2);
+  final inputs = newBuilder.txInputs();
+  expect(inputs.length, 2);
+
+  /// sign and verify txId
+  expect(() {
+    final clone = PsbtBuilder.fromBase64(newBuilder.toBase64());
+    final privateKey = ECPrivate.fromHex(
+        "39d9f93498ab9c5e833b6e22493be2aaa8d4daabb141afac801fccbf1298cd05");
+    clone.signInput(
+        signer: (p0) {
+          return PsbtSignerResponse(signers: [PsbtDefaultSigner(privateKey)]);
+        },
+        index: 0);
+
+    /// invalid signer private key
+    expect(
+        () => clone.signInput(
+            signer: (p0) {
+              return PsbtSignerResponse(
+                  signers: [PsbtDefaultSigner(privateKey)]);
+            },
+            index: 1),
+        throwsA(isA<DartBitcoinPluginException>()));
+    final p2shSigner = ECPrivate.fromHex(
+        "33053373fe566dc4f77941a449c20dfa356221dfadec5e3d507c58279e0e1991");
+    clone.signInput(
+        signer: (p0) {
+          return PsbtSignerResponse(signers: [PsbtDefaultSigner(p2shSigner)]);
+        },
+        index: 1);
+    clone.finalizeInput(0);
+    clone.finalizeInput(1);
+    return clone.finalizeAll().txId();
+  }(), "1860946eaed196fb865910c01205fc838601fad08df99fd125b86391fd107798");
+  expect(() {
+    final clone = PsbtBuilder.fromBase64(newBuilder.toBase64());
+    final privateKey = ECPrivate.fromHex(
+        "39d9f93498ab9c5e833b6e22493be2aaa8d4daabb141afac801fccbf1298cd05");
+    clone.signInput(
+        signer: (p0) {
+          return PsbtSignerResponse(signers: [PsbtDefaultSigner(privateKey)]);
+        },
+        index: 0);
+
+    /// reject adding output after exist signature sighash all
+    expect(() {
+      final clone = PsbtBuilder.fromBase64(newBuilder.toBase64());
+      final privateKey = ECPrivate.fromHex(
+          "39d9f93498ab9c5e833b6e22493be2aaa8d4daabb141afac801fccbf1298cd05");
+      clone.signInput(
+          signer: (p0) {
+            return PsbtSignerResponse(signers: [PsbtDefaultSigner(privateKey)]);
+          },
+          index: 0);
+      clone.addOutput(PsbtTransactionOutput(
+          amount: BigInt.from(10000), address: _getReceipt3()));
+    }, throwsA(isA<DartBitcoinPluginException>()));
+
+    /// success add wit sighash none
+    int successAddAfterSighashNone() {
+      final clone = PsbtBuilder.fromBase64(newBuilder.toBase64());
+      final privateKey = ECPrivate.fromHex(
+          "39d9f93498ab9c5e833b6e22493be2aaa8d4daabb141afac801fccbf1298cd05");
+      clone.signInput(
+          signer: (p0) {
+            return PsbtSignerResponse(
+              sighash: BitcoinOpCodeConst.sighashNone,
+              signers: [PsbtDefaultSigner(privateKey)],
+            );
+          },
+          index: 0);
+      clone.addOutput(PsbtTransactionOutput(
+          amount: BigInt.from(10000), address: _getReceipt3()));
+      return clone.txOutputs().length;
+    }
+
+    expect(successAddAfterSighashNone(), 3);
+
+    /// invalid signer private key
+    expect(
+        () => clone.signInput(
+            signer: (p0) {
+              return PsbtSignerResponse(
+                  signers: [PsbtDefaultSigner(privateKey)]);
+            },
+            index: 1),
+        throwsA(isA<DartBitcoinPluginException>()));
+    final p2shSigner = ECPrivate.fromHex(
+        "33053373fe566dc4f77941a449c20dfa356221dfadec5e3d507c58279e0e1991");
+    clone.signInput(
+        signer: (p0) {
+          return PsbtSignerResponse(signers: [PsbtDefaultSigner(p2shSigner)]);
+        },
+        index: 1);
+    clone.finalizeInput(0);
+    clone.finalizeInput(1);
+    return clone.finalizeAll().txId();
+  }(), "1860946eaed196fb865910c01205fc838601fad08df99fd125b86391fd107798");
+}
+
+Bip32Slip10Secp256k1 getMasterKey(
+    {String key =
+        "tprv8ZgxMBicQKsPdgBQV2Y9EVPSjAGhyZXArhwSzHwnV3FytzPRr8KCR8EKEpLeHbANAncgbc31a6QoXjBTARQiZ2h1Z2NgSCjFYeTqKpAN5Gc",
+    String? path = "m/86'/1'/0'/0/1"}) {
+  Bip32Slip10Secp256k1 masterKey = Bip32Slip10Secp256k1.fromExtendedKey(
+      key, Bip44Coins.bitcoinTestnet.conf.keyNetVer);
+  if (path == null) return masterKey;
+  return masterKey.derivePath(path) as Bip32Slip10Secp256k1;
+}
+
+ECPrivate getPrivateKeyFromMasterKey(
+    {String key =
+        "tprv8ZgxMBicQKsPdgBQV2Y9EVPSjAGhyZXArhwSzHwnV3FytzPRr8KCR8EKEpLeHbANAncgbc31a6QoXjBTARQiZ2h1Z2NgSCjFYeTqKpAN5Gc",
+    String? path = "m/86'/1'/0'/0/1"}) {
+  final bip = getMasterKey(key: key, path: path);
+  return ECPrivate.fromBytes(bip.privateKey.raw);
+}
+
+ECPublic getPublicKeyFromMasterKey(
+    {String key =
+        "tprv8ZgxMBicQKsPdgBQV2Y9EVPSjAGhyZXArhwSzHwnV3FytzPRr8KCR8EKEpLeHbANAncgbc31a6QoXjBTARQiZ2h1Z2NgSCjFYeTqKpAN5Gc",
+    String? path = "m/86'/1'/0'/0/1"}) {
+  return getPrivateKeyFromMasterKey(key: key, path: path).getPublic();
+}
+
+BitcoinBaseAddress _getReceipt() {
+  final acc = getMasterKey(path: "m/86'/1'/0'/0/1022");
+  final pk = ECPublic.fromBytes(acc.publicKey.compressed);
+  return pk.toP2wpkhInP2sh();
+}
+
+BitcoinBaseAddress _getReceipt2() {
+  final acc = getMasterKey(path: "m/86'/1'/0'/0/1025");
+  final pk = ECPublic.fromBytes(acc.publicKey.compressed);
+  return pk.toP2wshInP2sh();
+}
+
+BitcoinBaseAddress _getReceipt3() {
+  final acc = getMasterKey(path: "m/86'/1'/0'/0/1026");
+  final pk = ECPublic.fromBytes(acc.publicKey.compressed);
+  return pk.toAddress();
+}
diff --git a/test/psbt/builder/psbt_update_output_test.dart b/test/psbt/builder/psbt_update_output_test.dart
new file mode 100644
index 0000000..6f85441
--- /dev/null
+++ b/test/psbt/builder/psbt_update_output_test.dart
@@ -0,0 +1,276 @@
+import 'package:bitcoin_base/bitcoin_base.dart';
+import 'package:blockchain_utils/utils/binary/utils.dart';
+import 'package:test/test.dart';
+import 'psbt_builder_v0_test.dart';
+import 'utxos_vector2.dart';
+
+void main() {
+  _test2();
+  _test();
+}
+
+void _test() {
+  void test_(PsbtBuilder builder) {
+    final expandUtxos = utxosVector2.expand((e) => e).toList();
+    final psbtUtxos = expandUtxos.map((e) => PsbtUtxo.fromJson(e)).toList();
+    builder.addUtxos(psbtUtxos);
+    final inputs = builder.txInputs();
+    expect(inputs.length, 18);
+    final amount1 = BtcUtils.toSatoshi('0.001');
+    final amount2 = BtcUtils.toSatoshi('0.0011');
+    final amount3 = BtcUtils.toSatoshi('0.0012');
+    builder.addOutput(
+        PsbtTransactionOutput(amount: amount1, address: recipient1()));
+    builder.addOutput(
+        PsbtTransactionOutput(amount: amount2, address: recipient2()));
+    builder.addOutput(
+        PsbtTransactionOutput(amount: amount3, address: recipient3()));
+
+    /// sign input 1 signash signle
+    builder.signInput(
+        signer: (p0) {
+          final signers = (expandUtxos[0]["privateKeys"] as List)
+              .map((e) => ECPrivate.fromHex(e))
+              .toList();
+          return PsbtSignerResponse(
+              signers: signers.map((e) => PsbtDefaultSigner(e)).toList(),
+              sighash: BitcoinOpCodeConst.sighashSingle,
+              tapleafHash:
+                  BytesUtils.tryFromHexString(expandUtxos[0]["select_leaf"]));
+        },
+        index: 0);
+
+    /// must output 0 update beacuse we dont change script pubkey of receipment and just add some additional fields to output.
+    builder.updateOutput(
+        0,
+        PsbtTransactionOutput.witnessV1(
+            amount: amount1,
+            address: recipient1(),
+            taprootKeyBip32DerivationPath: [
+              PsbtOutputTaprootKeyBip32DerivationPath.fromBip32(
+                  masterKey: getMasterKey(path: null),
+                  path: "m/86'/1'/0'/0/1",
+                  treeScript: receipt1Script())
+            ]));
+
+    /// failed becuse of changing output 0 scriptPubKey
+    expect(
+        () => builder.updateOutput(
+            0, PsbtTransactionOutput(amount: amount1, address: recipient2())),
+        throwsA(isA<DartBitcoinPluginException>().having((p0) => p0.message,
+            'error message', contains('Unable to modify output'))));
+    final decode = PsbtBuilder.fromBase64(builder.toBase64());
+    final output = decode.psbtOutput(0);
+    expect(output.address, recipient1());
+    expect(output.scriptPubKey, recipient1().toScriptPubKey());
+    expect(output.amount, amount1);
+    expect(output.taprootKeyBip32DerivationPath?.length, 1);
+    final key = output.taprootKeyBip32DerivationPath![0];
+    expect(key.path, "m/86'/1'/0'/0/1");
+    final bip32 = key.toKeyDerivation().derive(getMasterKey(path: null));
+    expect(ECPublic.fromBip32(bip32.publicKey).toXOnly(), key.xOnlyPubKey);
+    final tx = signAll(
+        builder: decode,
+        start: 1,
+        utxos: utxosVector2.expand((e) => e).toList());
+    expect(tx.serialize(),
+        "02000000000112cb518ff0d558dd716c3612204fbb2c6f152597ae2dc12da71961a4bc2cf41edd0000000000ffffffffcb518ff0d558dd716c3612204fbb2c6f152597ae2dc12da71961a4bc2cf41edd0100000000ffffffffcb518ff0d558dd716c3612204fbb2c6f152597ae2dc12da71961a4bc2cf41edd0200000000ffffffffcb518ff0d558dd716c3612204fbb2c6f152597ae2dc12da71961a4bc2cf41edd0300000000ffffffffcb518ff0d558dd716c3612204fbb2c6f152597ae2dc12da71961a4bc2cf41edd04000000fd0e020047304402202d3750152b4b07fb29e8eb12a22b354743b1dc8050d5e70d8761a4aab907719f0220113c1df38506b392847245e2c2b136458675f107c210dd2d943b75a6e86e52bc0247304402207fd7bdb8785729b8f108dbc6ed5411d71bf45366e92ba69e8f33b8969247c323022008713a7e0baedf5dbd9c264644abcbb8d0fce5479039707a08aa39a9674d013b0247304402207fd7bdb8785729b8f108dbc6ed5411d71bf45366e92ba69e8f33b8969247c323022008713a7e0baedf5dbd9c264644abcbb8d0fce5479039707a08aa39a9674d013b0247304402207fd7bdb8785729b8f108dbc6ed5411d71bf45366e92ba69e8f33b8969247c323022008713a7e0baedf5dbd9c264644abcbb8d0fce5479039707a08aa39a9674d013b024ceb54210226733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d874104cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fe5690748be2d1358b2e4375bf6185416fa24db998d9501a165e3a2a577bc36494104cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fe5690748be2d1358b2e4375bf6185416fa24db998d9501a165e3a2a577bc36494104cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fe5690748be2d1358b2e4375bf6185416fa24db998d9501a165e3a2a577bc364954aeffffffffcb518ff0d558dd716c3612204fbb2c6f152597ae2dc12da71961a4bc2cf41edd05000000fd3c01004730440220657fd158a9954909dde886d77201f9b1d3d5a15a4f714de848731c5a5260348e02206e57fd77f9d6e15cc321012dfae5399a14052aa3fe25a0a819f0511a4e5fe60a02473044022004dfa64708a804edcf0c6475f27228437fa9575deda42d762318afe9b601eeb702207de93b2a509b8e559223a21dd9b0d45a7d8a82182dd90cbcef324a69b053d414024ca952210226733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d874104cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fe5690748be2d1358b2e4375bf6185416fa24db998d9501a165e3a2a577bc36494104cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fe5690748be2d1358b2e4375bf6185416fa24db998d9501a165e3a2a577bc364953aeffffffffcb518ff0d558dd716c3612204fbb2c6f152597ae2dc12da71961a4bc2cf41edd06000000020151ffffffffcb518ff0d558dd716c3612204fbb2c6f152597ae2dc12da71961a4bc2cf41edd07000000232200204ae81572f06e1b88fd5ced7a1a000945432e83e1551e6f721ee9c00b8cc33260ffffffffcb518ff0d558dd716c3612204fbb2c6f152597ae2dc12da71961a4bc2cf41edd080000006c4730440220770e91d320f9fc8907d8640c90698e474a300bbc4c6c6ce11b525a14af54872d02201ad64ec583c9a7717b3de4887957681d12f2daaa567495ae63af672e05c4d3290223210226733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d87acffffffff6251cd87d9e60941a02995fd6c17f7eb541eb6944fd4064ac308f749036bd7910000000023220020640f8c50d23cdfb05deeeb989304ba8e2d270eda368c3b0c024191c3370467a9ffffffffcb518ff0d558dd716c3612204fbb2c6f152597ae2dc12da71961a4bc2cf41edd0900000023220020640f8c50d23cdfb05deeeb989304ba8e2d270eda368c3b0c024191c3370467a9ffffffffcb518ff0d558dd716c3612204fbb2c6f152597ae2dc12da71961a4bc2cf41edd0a00000000ffffffffcb518ff0d558dd716c3612204fbb2c6f152597ae2dc12da71961a4bc2cf41edd0c00000000ffffffffcb518ff0d558dd716c3612204fbb2c6f152597ae2dc12da71961a4bc2cf41edd0d0000008447304402204cc480d90a8e1b0f0f3399e6e7da2f15e754c63786c574bde06c38b57570e7dc0220515944140cd51930ac213838b94d53ff8a44c698f4d82bb783a8c2e1ea76a6ae022103cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f1976a914b273443219d7f2652349caceecbb641cceb7b92288acffffffff6251cd87d9e60941a02995fd6c17f7eb541eb6944fd4064ac308f749036bd791010000001716001425761a501d439b764831e1a9c1b50c48c7cb2af1ffffffffcb518ff0d558dd716c3612204fbb2c6f152597ae2dc12da71961a4bc2cf41edd0e0000001716001425761a501d439b764831e1a9c1b50c48c7cb2af1ffffffffcb518ff0d558dd716c3612204fbb2c6f152597ae2dc12da71961a4bc2cf41edd0f0000008c47304402205ad0284476ab36b12e75e7c241127805da935f891f47577fa427098fc592b29502202406e1e1c4d1abf37ec5a840512521a662cbddb68cc8fd61876eaecc09c2811c024341043a1a902bf14317faffae2568fdcbdc188d9455ae60a2dfbf5dc3b226d784497726f6523d1cd0da24863f8d943dd1fd3c7030efc2636d3238bec7d558c075ce7eacffffffffcb518ff0d558dd716c3612204fbb2c6f152597ae2dc12da71961a4bc2cf41edd100000008a473044022006f8f52055b41e46197ed5af9ff857d0509a683c3abad5fa620a15597affe79902204a5b15d7a9a0d94afa446dbbace0580fb24692aaf87598e4c3569f1b0fdd4a000241045e6ae939f1e87542d2b43ba27dabfddee68bb03c0f8ea1893e1f09e2f50e256bba49f505c6292cb76bea21868164f1ce9187ff94d302ecb2ab209eea2bc9274effffffff03a086010000000000225120adf0c64c5b821de7bce3b840ce764edbb50adb61dbbe98caa3ffde6c612a71b0b0ad01000000000017a914da1745e9b549bd0bfa1a569971c77eba30cd5a4b87c0d401000000000017a9141849e0be5299d74ff8310a31ab6b93d9d98dad808707417e7aacd8db870da2f45c093c3b1352589c4f819aae03d6c3296b66b743dd62b3f5e1be27ff2223652c93657a7253a1fe227b3cc026fed7b89ffe212d9c9a9cda03417e7aacd8db870da2f45c093c3b1352589c4f819aae03d6c3296b66b743dd62b3f5e1be27ff2223652c93657a7253a1fe227b3cc026fed7b89ffe212d9c9a9cda0341ad15bc8ecf55865ca61e6a8a19cf2e1a735d12a77b52a162e28aa153f46945e869b479097c673d07c8bcb9e6677cb577da00329e65e019c54e2f9dfdc73997c5030000ac205e6ae939f1e87542d2b43ba27dabfddee68bb03c0f8ea1893e1f09e2f50e256bac203a1a902bf14317faffae2568fdcbdc188d9455ae60a2dfbf5dc3b226d7844977ba2026733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d87ba20cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fba20cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fba539c21c1af82536a8922025e345e6bd10f15061b22ff8d3dacc86dd6403c136d5b47f11e0441355599d2c13133b9e9913a51f3fcb42123d796816db4dcb7040dcfa4daad7ec37d9fd2ed7025296fdcea7624139568099170d2e5a38d2c04d7d2bf03e84763ac024145cc13aab47ef579f97c5832ffd414326667c3c6e9270d7d072ce85a2836392256754728c15d9682825ac8e2a6d86b51420d04b6ad5cd23703f7fcf791c206fe024620cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fac2026733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d87ba529c61c126733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d87e696fde00a8758def6d9648541848f44e36d9f823864c659f8f1f2bf3203c1c4d968d4f3d4ebada4fbe1211c2a276b48a0081d1e1a8391b86a1adacb8a85523d0441a28369836df0a096044106fb608592a28b0faa3b6d6c414e39fe5f73bac32c830f80ee31d8159e1226f3ed9a0977991cfe59f121cb85c2c54a93af5c92531ef80241a28369836df0a096044106fb608592a28b0faa3b6d6c414e39fe5f73bac32c830f80ee31d8159e1226f3ed9a0977991cfe59f121cb85c2c54a93af5c92531ef8024620cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fac20cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fba529c21c126733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d87050047304402203b8b7f7582861fcb0a123384fb27eed955211981cace15be5f23dcba91acc1ea0220069e22b95f0b3b8b84900fff3ee36c2023b7d666cea79ee6b2943c10f086b4af02473044022067aa8ae099bc506607e9003f1ac700e3d9e002850638b64deb1e348f3923062e02202a243956ca84fee515f5ea73d72e8ac13004ae9ea0ec2883e5e0304810b22f9d02473044022067aa8ae099bc506607e9003f1ac700e3d9e002850638b64deb1e348f3923062e02202a243956ca84fee515f5ea73d72e8ac13004ae9ea0ec2883e5e0304810b22f9d026953210226733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d872103cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f2103cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f53ae0000000101510003004730440220763676877907f84386c2d3395dc98326c88c64e9219a6261ae2ce8b8b232628d0220527c318d19c2e57ac063979bf7345f19aaf41d39bf4249537341ad7a753177690225512103cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f51ae0300473044022034ed3ac6b1bef3872b39f1f7a802f3538e4ded7493850cb31650d2ab9f99556602201f1a1c937cb13238a73aa18f1c4108651400fc7007b3941ca01671fb20d823540225512103cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f51ae0141d04695425cd344ea459fdc857490fa671b5b12c50a4c10efc5800fb3eb31322dbbfaba30e3695a314bbc0746643cb0776d682ea9e38bde4836d4ca2d511bd35e02024730440220721850489b542f24fcda6155faa5347286127afeeb25b160de53671674967944022058b73c7582a70698d4567a4c84ff06c8d4eaf3758c0c5f6525970f9a38f7448b022103cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f00024730440220203b0547e76224744d05fb94fd9f3f5b2b81055a223dd8dd07b1b2846df9f44b02206f607ffa6f3dba6d95c0f26963e2a169bafbe49c5bb145d1e6789bc7d77dfb6902210226733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d87024730440220211bb5644b9179618b33365e6ad396ee98626b81a55861983e8675ad5f87d14d022003d2a48cc13059bee9eba42f7992d452d2f95e7e2ab862ea46fe6595cd1fee9002210226733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d87000000000000");
+  }
+
+  test("PSBTV2", () {
+    test_(PsbtBuilderV0.create());
+    test_(PsbtBuilderV2.create());
+  });
+}
+
+BtcTransaction signAll(
+    {required PsbtBuilder builder,
+    required int start,
+    required List<Map<String, dynamic>> utxos}) {
+  PsbtBuilder bl = builder;
+  for (int i = start; i < utxos.length; i++) {
+    bl = PsbtBuilder.fromBase64(bl.toBase64());
+    bl.signInput(
+      index: i,
+      signer: (p0) {
+        final signers = (utxos[p0.index]["privateKeys"] as List)
+            .map((e) => ECPrivate.fromHex(e))
+            .toList();
+        return PsbtSignerResponse(
+            signers: signers.map((e) => PsbtDefaultSigner(e)).toList(),
+            sighash: BitcoinOpCodeConst.sighashNone,
+            tapleafHash:
+                BytesUtils.tryFromHexString(utxos[p0.index]["select_leaf"]));
+      },
+    );
+    bl.finalizeInput(
+      i,
+      onFinalizeInput: (params) {
+        return PsbtFinalizeResponse(
+            tapleafHash: BytesUtils.tryFromHexString(
+                utxos[params.index]["select_leaf"]));
+      },
+    );
+  }
+  return bl.finalizeAll();
+}
+
+PsbtBuilder signFinalize({
+  required PsbtBuilder builder,
+  required int index,
+  required List<Map<String, dynamic>> utxos,
+  required int sighash,
+}) {
+  sign(builder: builder, index: index, utxos: utxos, sighash: sighash);
+  builder.finalizeInput(
+    index,
+    onFinalizeInput: (params) {
+      return PsbtFinalizeResponse(
+          tapleafHash:
+              BytesUtils.tryFromHexString(utxos[params.index]["select_leaf"]));
+    },
+  );
+  return PsbtBuilder.fromBase64(builder.toBase64());
+}
+
+PsbtBuilder sign(
+    {required PsbtBuilder builder,
+    required int index,
+    required List<Map<String, dynamic>> utxos,
+    required int sighash}) {
+  builder.signInput(
+      signer: (p0) {
+        final signers = (utxos[p0.index]["privateKeys"] as List)
+            .map((e) => ECPrivate.fromHex(e))
+            .toList();
+        return PsbtSignerResponse(
+            signers: signers.map((e) => PsbtDefaultSigner(e)).toList(),
+            sighash: sighash,
+            tapleafHash:
+                BytesUtils.tryFromHexString(utxos[p0.index]["select_leaf"]));
+      },
+      index: index);
+  return PsbtBuilder.fromBase64(builder.toBase64());
+}
+
+void _test2() {
+  void test_(PsbtBuilder builder) {
+    final utxos = utxosVector2.expand((e) => e).toList();
+    final psbtUtxos = utxos.map((e) => PsbtUtxo.fromJson(e)).toList();
+    builder.addUtxos(psbtUtxos);
+    final inputs = builder.txInputs();
+    expect(inputs.length, 18);
+    final amount1 = BtcUtils.toSatoshi('0.001');
+    final amount2 = BtcUtils.toSatoshi('0.0011');
+    builder.addOutput(
+        PsbtTransactionOutput(amount: amount1, address: recipient1()));
+
+    sign(
+        builder: builder,
+        index: 0,
+        utxos: utxos,
+        sighash: BitcoinOpCodeConst.sighashSingle);
+
+    /// must output 0 update beacuse we dont change script pubkey of receipment and just add some additional fields to output.
+    builder.updateOutput(
+        0,
+        PsbtTransactionOutput.witnessV1(
+            amount: amount1,
+            address: recipient1(),
+            taprootKeyBip32DerivationPath: [
+              PsbtOutputTaprootKeyBip32DerivationPath.fromBip32(
+                  masterKey: getMasterKey(path: null),
+                  path: "m/86'/1'/0'/0/1",
+                  treeScript: receipt1Script())
+            ]));
+
+    /// failed becuse of changing output 0 scriptPubKey
+    expect(
+        () => builder.updateOutput(
+            0, PsbtTransactionOutput(amount: amount1, address: recipient2())),
+        throwsA(isA<DartBitcoinPluginException>().having((p0) => p0.message,
+            'error message', contains('Unable to modify output'))));
+    expect(
+        () => builder.removeOutput(0),
+        throwsA(isA<DartBitcoinPluginException>().having((p0) => p0.message,
+            'error message', contains('Unable to modify output'))));
+    expect(builder.txOutputs().length, 1);
+
+    sign(
+        builder: builder,
+        index: 1,
+        utxos: utxos,
+        sighash: BitcoinOpCodeConst.sighashNone);
+    builder.addOutput(
+        PsbtTransactionOutput(amount: amount2, address: recipient2()));
+    builder.updateOutput(
+        1, PsbtTransactionOutput(amount: amount2, address: recipient3()));
+    final outs = builder.txOutputs();
+    expect(outs.length, 2);
+    expect(outs[1].scriptPubKey, recipient3().toScriptPubKey());
+    expect(outs[1].amount, amount2);
+    sign(
+        builder: builder,
+        index: 2,
+        utxos: utxos,
+        sighash: BitcoinOpCodeConst.sighashAll);
+    expect(
+        () => builder.updateOutput(
+            0, PsbtTransactionOutput(amount: amount1, address: recipient2())),
+        throwsA(isA<DartBitcoinPluginException>().having((p0) => p0.message,
+            'error message', contains('Unable to modify output'))));
+    expect(
+        () => builder.addOutput(
+            PsbtTransactionOutput(amount: amount1, address: recipient2())),
+        throwsA(isA<DartBitcoinPluginException>().having((p0) => p0.message,
+            'error message', contains('Unable to modify output'))));
+    final r = signAll(builder: builder, start: 3, utxos: utxos);
+    expect(r.serialize(),
+        "02000000000112cb518ff0d558dd716c3612204fbb2c6f152597ae2dc12da71961a4bc2cf41edd0000000000ffffffffcb518ff0d558dd716c3612204fbb2c6f152597ae2dc12da71961a4bc2cf41edd0100000000ffffffffcb518ff0d558dd716c3612204fbb2c6f152597ae2dc12da71961a4bc2cf41edd0200000000ffffffffcb518ff0d558dd716c3612204fbb2c6f152597ae2dc12da71961a4bc2cf41edd0300000000ffffffffcb518ff0d558dd716c3612204fbb2c6f152597ae2dc12da71961a4bc2cf41edd04000000fd0e020047304402202d3750152b4b07fb29e8eb12a22b354743b1dc8050d5e70d8761a4aab907719f0220113c1df38506b392847245e2c2b136458675f107c210dd2d943b75a6e86e52bc0247304402207fd7bdb8785729b8f108dbc6ed5411d71bf45366e92ba69e8f33b8969247c323022008713a7e0baedf5dbd9c264644abcbb8d0fce5479039707a08aa39a9674d013b0247304402207fd7bdb8785729b8f108dbc6ed5411d71bf45366e92ba69e8f33b8969247c323022008713a7e0baedf5dbd9c264644abcbb8d0fce5479039707a08aa39a9674d013b0247304402207fd7bdb8785729b8f108dbc6ed5411d71bf45366e92ba69e8f33b8969247c323022008713a7e0baedf5dbd9c264644abcbb8d0fce5479039707a08aa39a9674d013b024ceb54210226733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d874104cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fe5690748be2d1358b2e4375bf6185416fa24db998d9501a165e3a2a577bc36494104cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fe5690748be2d1358b2e4375bf6185416fa24db998d9501a165e3a2a577bc36494104cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fe5690748be2d1358b2e4375bf6185416fa24db998d9501a165e3a2a577bc364954aeffffffffcb518ff0d558dd716c3612204fbb2c6f152597ae2dc12da71961a4bc2cf41edd05000000fd3c01004730440220657fd158a9954909dde886d77201f9b1d3d5a15a4f714de848731c5a5260348e02206e57fd77f9d6e15cc321012dfae5399a14052aa3fe25a0a819f0511a4e5fe60a02473044022004dfa64708a804edcf0c6475f27228437fa9575deda42d762318afe9b601eeb702207de93b2a509b8e559223a21dd9b0d45a7d8a82182dd90cbcef324a69b053d414024ca952210226733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d874104cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fe5690748be2d1358b2e4375bf6185416fa24db998d9501a165e3a2a577bc36494104cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fe5690748be2d1358b2e4375bf6185416fa24db998d9501a165e3a2a577bc364953aeffffffffcb518ff0d558dd716c3612204fbb2c6f152597ae2dc12da71961a4bc2cf41edd06000000020151ffffffffcb518ff0d558dd716c3612204fbb2c6f152597ae2dc12da71961a4bc2cf41edd07000000232200204ae81572f06e1b88fd5ced7a1a000945432e83e1551e6f721ee9c00b8cc33260ffffffffcb518ff0d558dd716c3612204fbb2c6f152597ae2dc12da71961a4bc2cf41edd080000006c4730440220770e91d320f9fc8907d8640c90698e474a300bbc4c6c6ce11b525a14af54872d02201ad64ec583c9a7717b3de4887957681d12f2daaa567495ae63af672e05c4d3290223210226733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d87acffffffff6251cd87d9e60941a02995fd6c17f7eb541eb6944fd4064ac308f749036bd7910000000023220020640f8c50d23cdfb05deeeb989304ba8e2d270eda368c3b0c024191c3370467a9ffffffffcb518ff0d558dd716c3612204fbb2c6f152597ae2dc12da71961a4bc2cf41edd0900000023220020640f8c50d23cdfb05deeeb989304ba8e2d270eda368c3b0c024191c3370467a9ffffffffcb518ff0d558dd716c3612204fbb2c6f152597ae2dc12da71961a4bc2cf41edd0a00000000ffffffffcb518ff0d558dd716c3612204fbb2c6f152597ae2dc12da71961a4bc2cf41edd0c00000000ffffffffcb518ff0d558dd716c3612204fbb2c6f152597ae2dc12da71961a4bc2cf41edd0d0000008447304402204cc480d90a8e1b0f0f3399e6e7da2f15e754c63786c574bde06c38b57570e7dc0220515944140cd51930ac213838b94d53ff8a44c698f4d82bb783a8c2e1ea76a6ae022103cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f1976a914b273443219d7f2652349caceecbb641cceb7b92288acffffffff6251cd87d9e60941a02995fd6c17f7eb541eb6944fd4064ac308f749036bd791010000001716001425761a501d439b764831e1a9c1b50c48c7cb2af1ffffffffcb518ff0d558dd716c3612204fbb2c6f152597ae2dc12da71961a4bc2cf41edd0e0000001716001425761a501d439b764831e1a9c1b50c48c7cb2af1ffffffffcb518ff0d558dd716c3612204fbb2c6f152597ae2dc12da71961a4bc2cf41edd0f0000008c47304402205ad0284476ab36b12e75e7c241127805da935f891f47577fa427098fc592b29502202406e1e1c4d1abf37ec5a840512521a662cbddb68cc8fd61876eaecc09c2811c024341043a1a902bf14317faffae2568fdcbdc188d9455ae60a2dfbf5dc3b226d784497726f6523d1cd0da24863f8d943dd1fd3c7030efc2636d3238bec7d558c075ce7eacffffffffcb518ff0d558dd716c3612204fbb2c6f152597ae2dc12da71961a4bc2cf41edd100000008a473044022006f8f52055b41e46197ed5af9ff857d0509a683c3abad5fa620a15597affe79902204a5b15d7a9a0d94afa446dbbace0580fb24692aaf87598e4c3569f1b0fdd4a000241045e6ae939f1e87542d2b43ba27dabfddee68bb03c0f8ea1893e1f09e2f50e256bba49f505c6292cb76bea21868164f1ce9187ff94d302ecb2ab209eea2bc9274effffffff02a086010000000000225120adf0c64c5b821de7bce3b840ce764edbb50adb61dbbe98caa3ffde6c612a71b0b0ad01000000000017a9141849e0be5299d74ff8310a31ab6b93d9d98dad808707417e7aacd8db870da2f45c093c3b1352589c4f819aae03d6c3296b66b743dd62b3f5e1be27ff2223652c93657a7253a1fe227b3cc026fed7b89ffe212d9c9a9cda03417e7aacd8db870da2f45c093c3b1352589c4f819aae03d6c3296b66b743dd62b3f5e1be27ff2223652c93657a7253a1fe227b3cc026fed7b89ffe212d9c9a9cda0341ad15bc8ecf55865ca61e6a8a19cf2e1a735d12a77b52a162e28aa153f46945e869b479097c673d07c8bcb9e6677cb577da00329e65e019c54e2f9dfdc73997c5030000ac205e6ae939f1e87542d2b43ba27dabfddee68bb03c0f8ea1893e1f09e2f50e256bac203a1a902bf14317faffae2568fdcbdc188d9455ae60a2dfbf5dc3b226d7844977ba2026733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d87ba20cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fba20cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fba539c21c1af82536a8922025e345e6bd10f15061b22ff8d3dacc86dd6403c136d5b47f11e0441355599d2c13133b9e9913a51f3fcb42123d796816db4dcb7040dcfa4daad7ec37d9fd2ed7025296fdcea7624139568099170d2e5a38d2c04d7d2bf03e84763ac024145cc13aab47ef579f97c5832ffd414326667c3c6e9270d7d072ce85a2836392256754728c15d9682825ac8e2a6d86b51420d04b6ad5cd23703f7fcf791c206fe024620cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fac2026733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d87ba529c61c126733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d87e696fde00a8758def6d9648541848f44e36d9f823864c659f8f1f2bf3203c1c4d968d4f3d4ebada4fbe1211c2a276b48a0081d1e1a8391b86a1adacb8a85523d0441f32b6f96c690fa29b9645da79aa74e6e798fb275e5f33caf12b7ac96dbf61b1f6356491c122462c3900c1b5069ea965fcd11ba8d717516228bd0381cd721c6ce0141f32b6f96c690fa29b9645da79aa74e6e798fb275e5f33caf12b7ac96dbf61b1f6356491c122462c3900c1b5069ea965fcd11ba8d717516228bd0381cd721c6ce014620cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fac20cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fba529c21c126733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d87050047304402203b8b7f7582861fcb0a123384fb27eed955211981cace15be5f23dcba91acc1ea0220069e22b95f0b3b8b84900fff3ee36c2023b7d666cea79ee6b2943c10f086b4af02473044022067aa8ae099bc506607e9003f1ac700e3d9e002850638b64deb1e348f3923062e02202a243956ca84fee515f5ea73d72e8ac13004ae9ea0ec2883e5e0304810b22f9d02473044022067aa8ae099bc506607e9003f1ac700e3d9e002850638b64deb1e348f3923062e02202a243956ca84fee515f5ea73d72e8ac13004ae9ea0ec2883e5e0304810b22f9d026953210226733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d872103cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f2103cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f53ae0000000101510003004730440220763676877907f84386c2d3395dc98326c88c64e9219a6261ae2ce8b8b232628d0220527c318d19c2e57ac063979bf7345f19aaf41d39bf4249537341ad7a753177690225512103cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f51ae0300473044022034ed3ac6b1bef3872b39f1f7a802f3538e4ded7493850cb31650d2ab9f99556602201f1a1c937cb13238a73aa18f1c4108651400fc7007b3941ca01671fb20d823540225512103cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f51ae0141d04695425cd344ea459fdc857490fa671b5b12c50a4c10efc5800fb3eb31322dbbfaba30e3695a314bbc0746643cb0776d682ea9e38bde4836d4ca2d511bd35e02024730440220721850489b542f24fcda6155faa5347286127afeeb25b160de53671674967944022058b73c7582a70698d4567a4c84ff06c8d4eaf3758c0c5f6525970f9a38f7448b022103cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f00024730440220203b0547e76224744d05fb94fd9f3f5b2b81055a223dd8dd07b1b2846df9f44b02206f607ffa6f3dba6d95c0f26963e2a169bafbe49c5bb145d1e6789bc7d77dfb6902210226733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d87024730440220211bb5644b9179618b33365e6ad396ee98626b81a55861983e8675ad5f87d14d022003d2a48cc13059bee9eba42f7992d452d2f95e7e2ab862ea46fe6595cd1fee9002210226733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d87000000000000");
+  }
+
+  test("description", () {
+    test_(PsbtBuilderV0.create());
+    test_(PsbtBuilderV2.create());
+  });
+}
+
+BitcoinBaseAddress recipient2() {
+  return P2shAddress.fromAddress(
+      address: "2ND8PB9RrfCaAcjfjP1Y6nAgFd9zWHYX4DN",
+      network: BitcoinNetwork.testnet);
+}
+
+BitcoinBaseAddress recipient3() {
+  return P2shAddress.fromAddress(
+      address: "2MuTei1oXmMKbmnDBCfKCtrbWDdbnriYZXm",
+      network: BitcoinNetwork.testnet);
+}
+
+BitcoinBaseAddress recipient4() {
+  return P2pkhAddress.fromAddress(
+      address: "modADgm9UHadfWLQVKeHapbHjETkwwY6zs",
+      network: BitcoinNetwork.testnet);
+}
+
+TaprootTree receipt1Script() {
+  final signerOne = getPublicKeyFromMasterKey(path: "m/86'/1'/0'/1/1");
+  final signerTwo = getPublicKeyFromMasterKey(path: "m/86'/1'/0'/1/2");
+  return TaprootBranch(
+      a: TaprootLeaf(
+          script: Script(script: [
+        signerOne.toXOnlyHex(),
+        BitcoinOpcode.opCheckSig,
+      ])),
+      b: TaprootLeaf(
+          script: Script(script: [
+        signerTwo.toXOnlyHex(),
+        BitcoinOpcode.opCheckSig,
+      ])));
+}
+
+BitcoinBaseAddress recipient1() {
+  final key = getMasterKey();
+  final publicKey = ECPublic.fromBip32(key.publicKey);
+  return P2trAddress.fromInternalKey(internalKey: publicKey.toXOnly());
+}
diff --git a/test/psbt/builder/utxos_vector.dart b/test/psbt/builder/utxos_vector.dart
new file mode 100644
index 0000000..db6c4d2
--- /dev/null
+++ b/test/psbt/builder/utxos_vector.dart
@@ -0,0 +1,980 @@
+import 'package:bitcoin_base/bitcoin_base.dart';
+
+const List<List<Map<String, dynamic>>> utxos = [
+  [
+    {
+      "utxo": {
+        "token": null,
+        "tx_hash":
+            "895ca6428dbd3c461a5f6ef942d3d3c4ada2610762fd833ef8ad579472130941",
+        "value": "500000",
+        "vout": 1,
+        "script_type": "P2TR",
+        "block_height": 74193
+      },
+      "tx":
+          "02000000000101907d7cfe2fdfcc665f029a2c57a9651317e0115e8e71f28b9bea2be1f7825d880000000000fdffffff02aa87398d150000001600147b458433d0c04323426ef88365bd4cfef141ac7520a1070000000000225120207036e1551525db9b907bec80d06388a972537d7c3fd9ca1647cdac3e64308f02473044022069d183774358ee46a31e25c452da041f03bc8d9331d0fb2ece210e533a35b0f702201e22e7487271765b0a11d3f6fc9c9c41e741922693437441a23e7cf5fbacbe3e0121030db9616d96a7b7a8656191b340f77e905ee2885a09a7a1e80b9c8b64ec746fb300000000",
+      "scriptpubkey": {
+        "script": [
+          "OP_1",
+          "207036e1551525db9b907bec80d06388a972537d7c3fd9ca1647cdac3e64308f"
+        ]
+      },
+      "p2sh_redeem_script": null,
+      "p2wsh_witness_script": null,
+      "merkle_proof": null,
+      "tree_script": {
+        "script": {
+          "script": [
+            "5e6ae939f1e87542d2b43ba27dabfddee68bb03c0f8ea1893e1f09e2f50e256b",
+            BitcoinOpcode.opCheckSig,
+            "3a1a902bf14317faffae2568fdcbdc188d9455ae60a2dfbf5dc3b226d7844977",
+            "OP_CHECKSIGADD",
+            "26733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d87",
+            "OP_CHECKSIGADD",
+            "cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f",
+            "OP_CHECKSIGADD",
+            "cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f",
+            "OP_CHECKSIGADD",
+            "OP_3",
+            "OP_NUMEQUAL"
+          ]
+        },
+        "leaf_version": 192
+      },
+      "leaf_script": null,
+      "xonly":
+          "af82536a8922025e345e6bd10f15061b22ff8d3dacc86dd6403c136d5b47f11e",
+      "merkle_root": null,
+      "leaf_scripts": null,
+      "privateKeys": [
+        "4c889b458ae4d09d51266ebb604396468412c2622a4283325f492325e85e9bf4",
+        "efd4d62709543c1bae8a22b44640856b48398b7d06f57958760a8695b9f5f171"
+      ],
+      "address":
+          "tb1pypcrdc24z5jahxus00kgp5rr3z5hy5ma0slanjskglx6c0nyxz8suncnq7"
+    }
+  ],
+  [
+    {
+      "utxo": {
+        "token": null,
+        "tx_hash":
+            "213d213e6ab2224d1d842a89b129a54fe4eaac217a9da9b598202987b13d9124",
+        "value": "100000",
+        "vout": 1,
+        "script_type": "P2TR",
+        "block_height": 73941
+      },
+      "tx":
+          "02000000015f924ebef69a6a0e8e9cae4bd7178d662453a8643c448061462e72ff6b2ba600010000006a4730440220390754c4504cd3e1e9bc98c25ed830b4088db0f2e004a33e2b77c9a3b82cbe41022014df61816c68cc06b5158fe39d17cfd7cca447024569c1393665b79f59b7de36012103a5ae93c0b09f2869b2a4e85a1a1318c86da70c48974f9ad28ce7a1876f1a927efdffffff02058f040000000000225120ebda7734544a9baab30347145df9175746b93607efce7de8f7491ee0ff3f521ca086010000000000225120e644163df7b4b9fba40275eda00ba1244039c19ef31958d64268d34fb986cd41b2200100",
+      "scriptpubkey": {
+        "script": [
+          "OP_1",
+          "e644163df7b4b9fba40275eda00ba1244039c19ef31958d64268d34fb986cd41"
+        ]
+      },
+      "p2sh_redeem_script": null,
+      "p2wsh_witness_script": null,
+      "merkle_proof": null,
+      "tree_script": {
+        "a": {
+          "a": {
+            "script": {
+              "script": [
+                "cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f",
+                BitcoinOpcode.opCheckSig,
+                "26733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d87",
+                "OP_CHECKSIGADD",
+                BitcoinOpcode.op2,
+                "OP_NUMEQUAL"
+              ]
+            },
+            "leaf_version": 192
+          },
+          "b": {
+            "script": {
+              "script": [
+                "cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f",
+                BitcoinOpcode.opCheckSig,
+              ]
+            },
+            "leaf_version": 192
+          }
+        },
+        "b": {
+          "a": {
+            "a": {
+              "a": {
+                "a": {
+                  "script": {
+                    "script": [
+                      "26733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d87",
+                      BitcoinOpcode.opCheckSig,
+                    ]
+                  },
+                  "leaf_version": 192
+                },
+                "b": {
+                  "script": {
+                    "script": [
+                      "cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f",
+                      BitcoinOpcode.opCheckSig,
+                    ]
+                  },
+                  "leaf_version": 192
+                }
+              },
+              "b": {
+                "script": {
+                  "script": [
+                    "6eb5f87f959b1aedbfe4943534bc062d25e356102ab5af7ecbf97a9ed1914768",
+                    BitcoinOpcode.opCheckSig,
+                  ]
+                },
+                "leaf_version": 192
+              }
+            },
+            "b": {
+              "script": {
+                "script": [
+                  "cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f",
+                  BitcoinOpcode.opCheckSig,
+                ]
+              },
+              "leaf_version": 192
+            }
+          },
+          "b": {
+            "script": {
+              "script": [
+                "cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f",
+                BitcoinOpcode.opCheckSig,
+              ]
+            },
+            "leaf_version": 192
+          }
+        }
+      },
+      "leaf_script": null,
+      "xonly":
+          "26733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d87",
+      "merkle_root": null,
+      "leaf_scripts": null,
+      "privateKeys": [
+        "efd4d62709543c1bae8a22b44640856b48398b7d06f57958760a8695b9f5f171",
+        "4c889b458ae4d09d51266ebb604396468412c2622a4283325f492325e85e9bf4"
+      ],
+      "address":
+          "tb1puezpv00hkjulhfqzwhk6qzapy3qrnsv77vv434jzdrf5lwvxe4qsjxzg4c",
+      "select_leaf":
+          "559a1507e6d2954d0c9699a0ed0e20035b37c136d33af7cde40f47dc8bfabadd"
+    },
+    {
+      "utxo": {
+        "token": null,
+        "tx_hash":
+            "37c7b70e21923247cdf3553bd638d17c2d7750652d293ca70854587804c53b9f",
+        "value": "100000",
+        "vout": 0,
+        "script_type": "P2TR",
+        "block_height": 73941
+      },
+      "tx":
+          "02000000014044af25b5a16d8fc2b119745e3d922a38d44df891bebc10d6f5b29853df94b9010000006a4730440220537fa17be875c2b478b355615860d3ffa2237f980762b0a3e5b4afad0e9763bd022012613430d6957b7e56171f0fdcd415112358eafcffb21721261591d2a640ef1d01210301740fade1da66713e00511d4353fce9c9c5b424db08d5447a6ed2b6c4f54b3ffdffffff02a086010000000000225120e644163df7b4b9fba40275eda00ba1244039c19ef31958d64268d34fb986cd41fa080600000000002251205865c2e389c2220db26ec1738514f4bf9392c1720d98cd70dab3657421d7e38fb2200100",
+      "scriptpubkey": {
+        "script": [
+          "OP_1",
+          "e644163df7b4b9fba40275eda00ba1244039c19ef31958d64268d34fb986cd41"
+        ]
+      },
+      "p2sh_redeem_script": null,
+      "p2wsh_witness_script": null,
+      "merkle_proof": null,
+      "tree_script": {
+        "a": {
+          "a": {
+            "script": {
+              "script": [
+                "cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f",
+                BitcoinOpcode.opCheckSig,
+                "26733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d87",
+                "OP_CHECKSIGADD",
+                BitcoinOpcode.op2,
+                "OP_NUMEQUAL"
+              ]
+            },
+            "leaf_version": 192
+          },
+          "b": {
+            "script": {
+              "script": [
+                "cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f",
+                BitcoinOpcode.opCheckSig,
+              ]
+            },
+            "leaf_version": 192
+          }
+        },
+        "b": {
+          "a": {
+            "a": {
+              "a": {
+                "a": {
+                  "script": {
+                    "script": [
+                      "26733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d87",
+                      BitcoinOpcode.opCheckSig,
+                    ]
+                  },
+                  "leaf_version": 192
+                },
+                "b": {
+                  "script": {
+                    "script": [
+                      "cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f",
+                      BitcoinOpcode.opCheckSig,
+                    ]
+                  },
+                  "leaf_version": 192
+                }
+              },
+              "b": {
+                "script": {
+                  "script": [
+                    "6eb5f87f959b1aedbfe4943534bc062d25e356102ab5af7ecbf97a9ed1914768",
+                    BitcoinOpcode.opCheckSig,
+                  ]
+                },
+                "leaf_version": 192
+              }
+            },
+            "b": {
+              "script": {
+                "script": [
+                  "cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f",
+                  BitcoinOpcode.opCheckSig,
+                ]
+              },
+              "leaf_version": 192
+            }
+          },
+          "b": {
+            "script": {
+              "script": [
+                "cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f",
+                BitcoinOpcode.opCheckSig,
+              ]
+            },
+            "leaf_version": 192
+          }
+        }
+      },
+      "leaf_script": null,
+      "xonly":
+          "26733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d87",
+      "merkle_root": null,
+      "leaf_scripts": null,
+      "privateKeys": [
+        "efd4d62709543c1bae8a22b44640856b48398b7d06f57958760a8695b9f5f171",
+        "4c889b458ae4d09d51266ebb604396468412c2622a4283325f492325e85e9bf4"
+      ],
+      "address":
+          "tb1puezpv00hkjulhfqzwhk6qzapy3qrnsv77vv434jzdrf5lwvxe4qsjxzg4c",
+      "select_leaf":
+          "559a1507e6d2954d0c9699a0ed0e20035b37c136d33af7cde40f47dc8bfabadd"
+    }
+  ],
+  [
+    {
+      "utxo": {
+        "token": null,
+        "tx_hash":
+            "09c2e7715b61531b7e1181048a3763599d2d3137175c8f1b3ad01b13258f2291",
+        "value": "500000",
+        "vout": 1,
+        "script_type": "P2TR",
+        "block_height": 73970
+      },
+      "tx":
+          "02000000000101b98386d1598e4f36fd8fb58ae8eb23146bcc8cc0c50061381048e09c9d122cd50000000000fdffffff02ae2c4cd0e80000001600147b458433d0c04323426ef88365bd4cfef141ac7520a10700000000002251202c3a5675ab3357f4aca556d5d88c19797ca99da232a9c880d10bffd1643890c002473044022073be70c23475b2ac9d578f23b1938422d955c8a9181f121fff43b8aac729b46402206068c85d72f9a618eacbd6f7cca09057172ab07c2d93d6a0be55712f9e2f53560121030db9616d96a7b7a8656191b340f77e905ee2885a09a7a1e80b9c8b64ec746fb300000000",
+      "scriptpubkey": {
+        "script": [
+          "OP_1",
+          "2c3a5675ab3357f4aca556d5d88c19797ca99da232a9c880d10bffd1643890c0"
+        ]
+      },
+      "p2sh_redeem_script": null,
+      "p2wsh_witness_script": null,
+      "merkle_proof": null,
+      "tree_script": {
+        "script": {
+          "script": [
+            "cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f",
+            BitcoinOpcode.opCheckSig,
+            "cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f",
+            "OP_CHECKSIGADD",
+            BitcoinOpcode.op2,
+            "OP_NUMEQUAL"
+          ]
+        },
+        "leaf_version": 192
+      },
+      "leaf_script": {
+        "script": {
+          "script": [
+            "cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f",
+            BitcoinOpcode.opCheckSig,
+            "cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f",
+            "OP_CHECKSIGADD",
+            BitcoinOpcode.op2,
+            "OP_NUMEQUAL"
+          ]
+        },
+        "leaf_version": 192
+      },
+      "xonly":
+          "26733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d87",
+      "merkle_root": null,
+      "leaf_scripts": null,
+      "privateKeys": [
+        "efd4d62709543c1bae8a22b44640856b48398b7d06f57958760a8695b9f5f171",
+        "efd4d62709543c1bae8a22b44640856b48398b7d06f57958760a8695b9f5f171"
+      ],
+      "address":
+          "tb1p9sa9vadtxdtlft992m2a3rqe0972n8dzx25u3qx3p0lazepcjrqqrn7u4k",
+      "select_leaf":
+          "fe708fdad31b49db5dfa0388b2322267000841c99a36e11e0658c4b12a9dddee"
+    },
+    {
+      "utxo": {
+        "token": null,
+        "tx_hash":
+            "ba3c1f8b8d87e28f923ab8c7c54135966f9a85e20232e48e4e9d28dd8344d905",
+        "value": "100000",
+        "vout": 0,
+        "script_type": "P2TR",
+        "block_height": 74002
+      },
+      "tx":
+          "0200000001cea7d4323dbd8ac4369411a514f0ec7d484a3e96a5b3c51feecc538410cbd38b010000006a47304402203a36642f354e4e7e232a3171f49e1e704ee604eeed9c7f16585301d751659aa102206cfe9ece169730f9b3334b638d80e3801c6febad7ea8db43f27e8b3d040919cc012102d270bf1972d25b81b857b0427055024912397d18c2a96d78b5cffbb52d271e2cfdffffff02a0860100000000002251202c3a5675ab3357f4aca556d5d88c19797ca99da232a9c880d10bffd1643890c08d190600000000002251208706409e487da472e33acc57d7f7446a53416f75b135d70c9ffe93e1e71472d000000000",
+      "scriptpubkey": {
+        "script": [
+          "OP_1",
+          "2c3a5675ab3357f4aca556d5d88c19797ca99da232a9c880d10bffd1643890c0"
+        ]
+      },
+      "p2sh_redeem_script": null,
+      "p2wsh_witness_script": null,
+      "merkle_proof": null,
+      "tree_script": {
+        "script": {
+          "script": [
+            "cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f",
+            BitcoinOpcode.opCheckSig,
+            "cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f",
+            "OP_CHECKSIGADD",
+            BitcoinOpcode.op2,
+            "OP_NUMEQUAL"
+          ]
+        },
+        "leaf_version": 192
+      },
+      "leaf_script": {
+        "script": {
+          "script": [
+            "cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f",
+            BitcoinOpcode.opCheckSig,
+            "cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f",
+            "OP_CHECKSIGADD",
+            BitcoinOpcode.op2,
+            "OP_NUMEQUAL"
+          ]
+        },
+        "leaf_version": 192
+      },
+      "xonly":
+          "26733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d87",
+      "merkle_root": null,
+      "leaf_scripts": null,
+      "privateKeys": [
+        "efd4d62709543c1bae8a22b44640856b48398b7d06f57958760a8695b9f5f171",
+        "efd4d62709543c1bae8a22b44640856b48398b7d06f57958760a8695b9f5f171"
+      ],
+      "address":
+          "tb1p9sa9vadtxdtlft992m2a3rqe0972n8dzx25u3qx3p0lazepcjrqqrn7u4k",
+      "select_leaf":
+          "fe708fdad31b49db5dfa0388b2322267000841c99a36e11e0658c4b12a9dddee"
+    },
+    {
+      "utxo": {
+        "token": null,
+        "tx_hash":
+            "b28f8343379d53dc8292dfce247509a3163e41a1276ba1b7099e2a36656dcd44",
+        "value": "100000",
+        "vout": 1,
+        "script_type": "P2TR",
+        "block_height": 74008
+      },
+      "tx":
+          "020000000001019f2b57886d73c6f7c2b6822f1d2dab60face68ca620dc75f765b83454114228501000000171600147b7bd741d4a1f56f926f1687c8cd88c0384d6418fdffffff02c4190600000000002251204b102237ca3642e45f07b31dedf563034b3f8ce951d55b11a09973f89024b271a0860100000000002251202c3a5675ab3357f4aca556d5d88c19797ca99da232a9c880d10bffd1643890c002473044022045f23929f054793314e3ac92826054d66efc0f249fce76a290706bc8be50b66302202c32db9dd418dc7220ef0ab1533acceb70e2de4e38c170d0d74a71aa773119ef012102c57ee6cffa68bd0beec6d9cb0dd99a10dbc8432232ad35f00a384f54b0c92fc300000000",
+      "scriptpubkey": {
+        "script": [
+          "OP_1",
+          "2c3a5675ab3357f4aca556d5d88c19797ca99da232a9c880d10bffd1643890c0"
+        ]
+      },
+      "p2sh_redeem_script": null,
+      "p2wsh_witness_script": null,
+      "merkle_proof": null,
+      "tree_script": {
+        "script": {
+          "script": [
+            "cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f",
+            BitcoinOpcode.opCheckSig,
+            "cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f",
+            "OP_CHECKSIGADD",
+            BitcoinOpcode.op2,
+            "OP_NUMEQUAL"
+          ]
+        },
+        "leaf_version": 192
+      },
+      "leaf_script": {
+        "script": {
+          "script": [
+            "cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f",
+            BitcoinOpcode.opCheckSig,
+            "cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f",
+            "OP_CHECKSIGADD",
+            BitcoinOpcode.op2,
+            "OP_NUMEQUAL"
+          ]
+        },
+        "leaf_version": 192
+      },
+      "xonly":
+          "26733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d87",
+      "merkle_root": null,
+      "leaf_scripts": null,
+      "privateKeys": [
+        "efd4d62709543c1bae8a22b44640856b48398b7d06f57958760a8695b9f5f171",
+        "efd4d62709543c1bae8a22b44640856b48398b7d06f57958760a8695b9f5f171"
+      ],
+      "address":
+          "tb1p9sa9vadtxdtlft992m2a3rqe0972n8dzx25u3qx3p0lazepcjrqqrn7u4k",
+      "select_leaf":
+          "fe708fdad31b49db5dfa0388b2322267000841c99a36e11e0658c4b12a9dddee"
+    }
+  ],
+  [
+    {
+      "utxo": {
+        "token": null,
+        "tx_hash":
+            "6087ddf41456fdb9fc383ba852abd08dc59a2251961cdea272e183be8e7c5d58",
+        "value": "5000",
+        "vout": 1,
+        "script_type": "P2WSH",
+        "block_height": 74187
+      },
+      "tx":
+          "0200000000010171d9293be83c1387560963351fda91d6ae195e6f45b570d9444444cbbb2b296c0000000000fdffffff02c17a508d150000001600147b458433d0c04323426ef88365bd4cfef141ac75881300000000000022002088c27bde97700a482464b4147fbed246b6ac8db5570b7725ca3a05f24619d83c0247304402207db4e3b9b4ff2112a748e04a5d2a11255ac515076661c1c490be033629b018f20220554b901dde5519ff3d82c975bef82dd79a96695bddb5db333b4b3d1742bc86500121030db9616d96a7b7a8656191b340f77e905ee2885a09a7a1e80b9c8b64ec746fb300000000",
+      "scriptpubkey": {
+        "script": [
+          "OP_0",
+          "88c27bde97700a482464b4147fbed246b6ac8db5570b7725ca3a05f24619d83c"
+        ]
+      },
+      "p2sh_redeem_script": null,
+      "p2wsh_witness_script": {
+        "script": [
+          "OP_3",
+          "0226733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d87",
+          "03cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f",
+          "03cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f",
+          "OP_3",
+          BitcoinOpcode.opCheckMultiSig
+        ]
+      },
+      "merkle_proof": null,
+      "tree_script": null,
+      "leaf_script": null,
+      "xonly": null,
+      "merkle_root": null,
+      "leaf_scripts": null,
+      "privateKeys": [
+        "efd4d62709543c1bae8a22b44640856b48398b7d06f57958760a8695b9f5f171",
+        "4c889b458ae4d09d51266ebb604396468412c2622a4283325f492325e85e9bf4",
+        "efd4d62709543c1bae8a22b44640856b48398b7d06f57958760a8695b9f5f171"
+      ],
+      "address":
+          "tb1q3rp8hh5hwq9ysfryks28l0kjg6m2erd42u9hwfw28gzly3semq7qnzrkrg"
+    }
+  ],
+  [
+    {
+      "utxo": {
+        "token": null,
+        "tx_hash":
+            "8fb4c8f64db5e5706a9edbde9a43540fe9ce005da34ae7c22d8fccb87b37e691",
+        "value": "5000",
+        "vout": 1,
+        "script_type": "P2SH/P2PKH",
+        "block_height": 74187
+      },
+      "tx":
+          "020000000001013ff2cc5702947986aa49cb6864c7e89e20159b79df61c2fc27eca195a707b4000000000000fdffffff02841322aa1d0000001600147b458433d0c04323426ef88365bd4cfef141ac75881300000000000017a91467c4cd3187dfe195e19cf87e17d3b95747961881870247304402201552abf391f4828fb78921ece55f89ad646ae3e9c6abc618d766ccfd5c35f35c022007f9e4ef0d62fc2f1e114a399a0a99bc9f610fe2bdeb1351039229e4f3d4a0e20121030db9616d96a7b7a8656191b340f77e905ee2885a09a7a1e80b9c8b64ec746fb300000000",
+      "scriptpubkey": {
+        "script": [
+          BitcoinOpcode.opHash160,
+          "67c4cd3187dfe195e19cf87e17d3b95747961881",
+          "OP_EQUAL"
+        ]
+      },
+      "p2sh_redeem_script": {
+        "script": [
+          "OP_4",
+          "0226733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d87",
+          "04cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fe5690748be2d1358b2e4375bf6185416fa24db998d9501a165e3a2a577bc3649",
+          "04cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fe5690748be2d1358b2e4375bf6185416fa24db998d9501a165e3a2a577bc3649",
+          "04cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fe5690748be2d1358b2e4375bf6185416fa24db998d9501a165e3a2a577bc3649",
+          "OP_4",
+          BitcoinOpcode.opCheckMultiSig
+        ]
+      },
+      "p2wsh_witness_script": null,
+      "merkle_proof": null,
+      "tree_script": null,
+      "leaf_script": null,
+      "xonly": null,
+      "merkle_root": null,
+      "leaf_scripts": null,
+      "privateKeys": [
+        "efd4d62709543c1bae8a22b44640856b48398b7d06f57958760a8695b9f5f171",
+        "4c889b458ae4d09d51266ebb604396468412c2622a4283325f492325e85e9bf4",
+        "efd4d62709543c1bae8a22b44640856b48398b7d06f57958760a8695b9f5f171"
+      ],
+      "address": "2N2huM42YZhWNEpyrChgedktkamNyCg5LD2"
+    }
+  ],
+  [
+    {
+      "utxo": {
+        "token": null,
+        "tx_hash":
+            "cff232c77e94445ad4853e1feeea245958d16aa12648e15669262e2d469bf5d7",
+        "value": "5000",
+        "vout": 1,
+        "script_type": "P2SH/P2PKH",
+        "block_height": 74188
+      },
+      "tx":
+          "02000000000101b27e1a96b87778ffc06043e3f0aa113df690aec38d76eaad9326a79a2996454e0000000000fdffffff027145d0cfe80000001600147b458433d0c04323426ef88365bd4cfef141ac75881300000000000017a914568e9d619f7d76c4f7f620cb243b75ea8a9248448702473044022048597e35b9eae2936239291488e8d9fb837a9ae219d2b4ad02893409caf02b5902201580e7e98941f329bc49d2832383be3195ce928008d33c28dd6b731a22fe26360121030db9616d96a7b7a8656191b340f77e905ee2885a09a7a1e80b9c8b64ec746fb300000000",
+      "scriptpubkey": {
+        "script": [
+          BitcoinOpcode.opHash160,
+          "568e9d619f7d76c4f7f620cb243b75ea8a924844",
+          "OP_EQUAL"
+        ]
+      },
+      "p2sh_redeem_script": {
+        "script": [
+          BitcoinOpcode.op2,
+          "0226733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d87",
+          "04cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fe5690748be2d1358b2e4375bf6185416fa24db998d9501a165e3a2a577bc3649",
+          "04cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fe5690748be2d1358b2e4375bf6185416fa24db998d9501a165e3a2a577bc3649",
+          "OP_3",
+          BitcoinOpcode.opCheckMultiSig
+        ]
+      },
+      "p2wsh_witness_script": null,
+      "merkle_proof": null,
+      "tree_script": null,
+      "leaf_script": null,
+      "xonly": null,
+      "merkle_root": null,
+      "leaf_scripts": null,
+      "privateKeys": [
+        "efd4d62709543c1bae8a22b44640856b48398b7d06f57958760a8695b9f5f171",
+        "4c889b458ae4d09d51266ebb604396468412c2622a4283325f492325e85e9bf4",
+        "efd4d62709543c1bae8a22b44640856b48398b7d06f57958760a8695b9f5f171"
+      ],
+      "address": "2N18twq4EiNgqCtKnvuCFN93Z9P9QHA4Mec"
+    }
+  ],
+  [
+    {
+      "utxo": {
+        "token": null,
+        "tx_hash":
+            "a5552bee92abec23f5ccd3d738efa8c93c02a6712d70420d22af4bb6056cddb4",
+        "value": "2000",
+        "vout": 1,
+        "script_type": "P2SH/P2PK",
+        "block_height": 74063
+      },
+      "tx":
+          "0200000001cc159379a07f4a6b3b499865f21a6a7e0ae9da6af3d7501986ebc2a513f6a53001000000020151ffffffff02d0070000000000002200204ae81572f06e1b88fd5ced7a1a000945432e83e1551e6f721ee9c00b8cc33260d00700000000000017a914da1745e9b549bd0bfa1a569971c77eba30cd5a4b8700000000",
+      "scriptpubkey": {
+        "script": [
+          BitcoinOpcode.opHash160,
+          "da1745e9b549bd0bfa1a569971c77eba30cd5a4b",
+          "OP_EQUAL"
+        ]
+      },
+      "p2sh_redeem_script": {
+        "script": ["OP_TRUE"]
+      },
+      "p2wsh_witness_script": null,
+      "merkle_proof": null,
+      "tree_script": null,
+      "leaf_script": null,
+      "xonly": null,
+      "merkle_root": null,
+      "leaf_scripts": null,
+      "privateKeys": [],
+      "address": "2ND8PB9RrfCaAcjfjP1Y6nAgFd9zWHYX4DN"
+    }
+  ],
+  [
+    {
+      "utxo": {
+        "token": null,
+        "tx_hash":
+            "bd563fe3648d8514f3d115e53507d9f7648e959e84ea684991b713dfc4d49c80",
+        "value": "5000",
+        "vout": 1,
+        "script_type": "P2SH/P2WSH",
+        "block_height": 74074
+      },
+      "tx":
+          "02000000000101cc159379a07f4a6b3b499865f21a6a7e0ae9da6af3d7501986ebc2a513f6a5300000000000fdffffff02c0360100000000001600147b458433d0c04323426ef88365bd4cfef141ac75881300000000000017a91472c44f957fc011d97e3406667dca5b1c930c4026870247304402200c3d3097d34e6a17cf81722a3cc9d05f0497e07dc794f965f99ad7582bbed05902205ef1ac871989e90d170c553358879a55c902ea378676399e67b9ba691d52aa620121030db9616d96a7b7a8656191b340f77e905ee2885a09a7a1e80b9c8b64ec746fb300000000",
+      "scriptpubkey": {
+        "script": [
+          BitcoinOpcode.opHash160,
+          "72c44f957fc011d97e3406667dca5b1c930c4026",
+          "OP_EQUAL"
+        ]
+      },
+      "p2sh_redeem_script": {
+        "script": [
+          "OP_0",
+          "4ae81572f06e1b88fd5ced7a1a000945432e83e1551e6f721ee9c00b8cc33260"
+        ]
+      },
+      "p2wsh_witness_script": {
+        "script": ["OP_TRUE"]
+      },
+      "merkle_proof": null,
+      "tree_script": null,
+      "leaf_script": null,
+      "xonly": null,
+      "merkle_root": null,
+      "leaf_scripts": null,
+      "privateKeys": [],
+      "address": "2N3i4C56DiqfpdcAJsAdZd2xYpCQMRAroye"
+    }
+  ],
+  [
+    {
+      "utxo": {
+        "token": null,
+        "tx_hash":
+            "95bfa6f777e40b6c1d898af7fdcc1459db04abb6a80a7aa6a529fcc7784cecdf",
+        "value": "100000",
+        "vout": 0,
+        "script_type": "P2SH/P2PK",
+        "block_height": 73823
+      },
+      "tx":
+          "02000000000103711e30714dcc4f591ca588f704302796e7caeaee971d9eece949ecece58139c60100000000ffffffff29c22de8f43dd9a3ca9746ccc75a88f6f9af1723c6ed77ee56198f4a9344e807010000006a47304402206f76483dd951a8af719ea4fc79ebadb84b8247dea6fef96f34f1c1fd941add7c022052f90ab3ed77202862907cb8ee5576519a5d4ec64ae014938f0adb8c5cb87f850121033a63a6e28d88b2521304ac445ab7b96e9e213b7443a66e7dfb7243a8efc3e3f7ffffffffdb5496bb029519cd43eec785826a71f62facc22d4df3fe2c8b129933a06b778c010000006a47304402201393210440c593c0254583d39e952f5de96ed62e6d5ac98e88f9740d45c5cf1c02205c928b40e9fc5e8d407abe4224e578e3fe8f039225f0ef176cd958bf274ddd020121033a63a6e28d88b2521304ac445ab7b96e9e213b7443a66e7dfb7243a8efc3e3f7ffffffff02a08601000000000017a9141849e0be5299d74ff8310a31ab6b93d9d98dad8087a08601000000000017a91477b7552b90584d3fb33ce53f2d28c5015fb3c408870247304402202f66e23c672bc2be71c96b040ff24a350cd99890858cb458608b3b481a7bbf1402200acd6156d4edc571ad63b8a438443e7bc8cee401368f4970f286ac825e6fb9a801210282e5edeaf54840126e9390549070d3f6f4dce19ef72b81a9eb019d43f5d3e83c000000000000",
+      "scriptpubkey": {
+        "script": [
+          BitcoinOpcode.opHash160,
+          "1849e0be5299d74ff8310a31ab6b93d9d98dad80",
+          "OP_EQUAL"
+        ]
+      },
+      "p2sh_redeem_script": {
+        "script": [
+          "0226733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d87",
+          BitcoinOpcode.opCheckSig,
+        ]
+      },
+      "p2wsh_witness_script": null,
+      "merkle_proof": null,
+      "tree_script": null,
+      "leaf_script": null,
+      "xonly": null,
+      "merkle_root": null,
+      "leaf_scripts": null,
+      "privateKeys": [
+        "4c889b458ae4d09d51266ebb604396468412c2622a4283325f492325e85e9bf4"
+      ],
+      "address": "2MuTei1oXmMKbmnDBCfKCtrbWDdbnriYZXm"
+    }
+  ],
+  [
+    {
+      "utxo": {
+        "token": null,
+        "tx_hash":
+            "e515323a5ae747573a100219210788ccb3d385961280988e30b2bf82d2f69fc5",
+        "value": "500000",
+        "vout": 1,
+        "script_type": "P2SH/P2WSH",
+        "block_height": 73823
+      },
+      "tx":
+          "02000000000101f44e19cb2c8ca6903c4e20dfb2f4f275d8ea2a451b981caab6ffcd2c86544dcd0000000000fdffffff025bdd5d09840100001600147b458433d0c04323426ef88365bd4cfef141ac7520a107000000000017a914e56a8afdd4489d018e28cdf5bc662aabeb3f0b838702473044022074e94367a4f1810c1431f50c71ec622c7fa3882e4444fa924167aa6d0817878d0220682d0b4e804d4103f743082ccad31d38cfb441c5c8ef4a798dc9ddb26f026b6d0121030db9616d96a7b7a8656191b340f77e905ee2885a09a7a1e80b9c8b64ec746fb300000000",
+      "scriptpubkey": {
+        "script": [
+          BitcoinOpcode.opHash160,
+          "e56a8afdd4489d018e28cdf5bc662aabeb3f0b83",
+          "OP_EQUAL"
+        ]
+      },
+      "p2sh_redeem_script": {
+        "script": [
+          "OP_0",
+          "640f8c50d23cdfb05deeeb989304ba8e2d270eda368c3b0c024191c3370467a9"
+        ]
+      },
+      "p2wsh_witness_script": {
+        "script": [
+          "OP_1",
+          "03cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f",
+          "OP_1",
+          BitcoinOpcode.opCheckMultiSig
+        ]
+      },
+      "merkle_proof": null,
+      "tree_script": null,
+      "leaf_script": null,
+      "xonly": null,
+      "merkle_root": null,
+      "leaf_scripts": null,
+      "privateKeys": [
+        "efd4d62709543c1bae8a22b44640856b48398b7d06f57958760a8695b9f5f171"
+      ],
+      "address": "2NEAGMwppAvbWbbuemzwFAf3HBj3WKDFk37"
+    }
+  ],
+  [
+    {
+      "utxo": {
+        "token": null,
+        "tx_hash":
+            "4cf4e0a91dda7f9213dd6fa32bbf87f060cdd8e09d32020ded446f902ce5ca6d",
+        "value": "500000",
+        "vout": 1,
+        "script_type": "P2TR",
+        "block_height": 73342
+      },
+      "tx":
+          "02000000000101ffbf52e6c9b811376d5f9d9f3651e9e46eaca2fbbd779b405192154acaf0684c0000000000fdffffff02b6aa71d2e80000001600147b458433d0c04323426ef88365bd4cfef141ac7520a1070000000000225120ebc2278b19d45e8ca50b0c67e7e71cb7771a616ec3f81924206337793e741d170247304402207a8cb90431ff34f4488595dc214401623ff9581daefd4b6c376ebd6a363992b00220540f79dda8fdc9a6529995eab81645ca0844fcb108825792ff115eb70c3d030b0121030db9616d96a7b7a8656191b340f77e905ee2885a09a7a1e80b9c8b64ec746fb300000000",
+      "scriptpubkey": {
+        "script": [
+          "OP_1",
+          "ebc2278b19d45e8ca50b0c67e7e71cb7771a616ec3f81924206337793e741d17"
+        ]
+      },
+      "p2sh_redeem_script": null,
+      "p2wsh_witness_script": null,
+      "merkle_proof": null,
+      "tree_script": null,
+      "leaf_script": null,
+      "xonly":
+          "16cc244510460759a0bc67467f733f5f136d031069791e8ae02833c0cbb8de67",
+      "merkle_root": null,
+      "leaf_scripts": null,
+      "privateKeys": [
+        "8e1a25ab6fde426a2197006ef50bad154e89401b9b13876fa8ae4ec017a94ef5"
+      ],
+      "address":
+          "tb1pa0pz0zce630gefgtp3n70ecukam35ctwc0upjfpqvvmhj0n5r5tsmn7q6a"
+    }
+  ],
+  [
+    {
+      "utxo": {
+        "token": null,
+        "tx_hash":
+            "eaf23538c12b8a8c84209ee5e46cd37ebc899a2bbee504a802710e2738c9098e",
+        "value": "5000",
+        "vout": 1,
+        "script_type": "P2WPKH",
+        "block_height": 73941
+      },
+      "tx":
+          "020000000001013d04977f523481ea2b7f4fed681f3b0e9c2b1d1d89713a5b57bdca4e40d92eaa0000000000fdffffff022ba885d0e80000001600147b458433d0c04323426ef88365bd4cfef141ac758813000000000000160014b273443219d7f2652349caceecbb641cceb7b922024730440220657612293f93e3f1961d0eaee36f82c25057843816450052b518d819c24b863602201b58d87e4d965ef4c3ef1ea7caea4058d521aa4db793edac2dc78ffc217891800121030db9616d96a7b7a8656191b340f77e905ee2885a09a7a1e80b9c8b64ec746fb300000000",
+      "scriptpubkey": {
+        "script": ["OP_0", "b273443219d7f2652349caceecbb641cceb7b922"]
+      },
+      "p2sh_redeem_script": null,
+      "p2wsh_witness_script": null,
+      "merkle_proof": null,
+      "tree_script": null,
+      "leaf_script": null,
+      "xonly": null,
+      "merkle_root": null,
+      "leaf_scripts": null,
+      "privateKeys": [],
+      "address": "tb1qkfe5gvse6lex2g6fet8wewmyrn8t0wfzdnn599"
+    }
+  ],
+  [
+    {
+      "utxo": {
+        "token": null,
+        "tx_hash":
+            "95bfa6f777e40b6c1d898af7fdcc1459db04abb6a80a7aa6a529fcc7784cecdf",
+        "value": "100000",
+        "vout": 1,
+        "script_type": "P2SH/P2PKH",
+        "block_height": 73823
+      },
+      "tx":
+          "02000000000103711e30714dcc4f591ca588f704302796e7caeaee971d9eece949ecece58139c60100000000ffffffff29c22de8f43dd9a3ca9746ccc75a88f6f9af1723c6ed77ee56198f4a9344e807010000006a47304402206f76483dd951a8af719ea4fc79ebadb84b8247dea6fef96f34f1c1fd941add7c022052f90ab3ed77202862907cb8ee5576519a5d4ec64ae014938f0adb8c5cb87f850121033a63a6e28d88b2521304ac445ab7b96e9e213b7443a66e7dfb7243a8efc3e3f7ffffffffdb5496bb029519cd43eec785826a71f62facc22d4df3fe2c8b129933a06b778c010000006a47304402201393210440c593c0254583d39e952f5de96ed62e6d5ac98e88f9740d45c5cf1c02205c928b40e9fc5e8d407abe4224e578e3fe8f039225f0ef176cd958bf274ddd020121033a63a6e28d88b2521304ac445ab7b96e9e213b7443a66e7dfb7243a8efc3e3f7ffffffff02a08601000000000017a9141849e0be5299d74ff8310a31ab6b93d9d98dad8087a08601000000000017a91477b7552b90584d3fb33ce53f2d28c5015fb3c408870247304402202f66e23c672bc2be71c96b040ff24a350cd99890858cb458608b3b481a7bbf1402200acd6156d4edc571ad63b8a438443e7bc8cee401368f4970f286ac825e6fb9a801210282e5edeaf54840126e9390549070d3f6f4dce19ef72b81a9eb019d43f5d3e83c000000000000",
+      "scriptpubkey": {
+        "script": [
+          BitcoinOpcode.opHash160,
+          "77b7552b90584d3fb33ce53f2d28c5015fb3c408",
+          "OP_EQUAL"
+        ]
+      },
+      "p2sh_redeem_script": {
+        "script": [
+          BitcoinOpcode.opDup,
+          BitcoinOpcode.opHash160,
+          "b273443219d7f2652349caceecbb641cceb7b922",
+          BitcoinOpcode.opEqualVerify,
+          BitcoinOpcode.opCheckSig,
+        ]
+      },
+      "p2wsh_witness_script": null,
+      "merkle_proof": null,
+      "tree_script": null,
+      "leaf_script": null,
+      "xonly": null,
+      "merkle_root": null,
+      "leaf_scripts": null,
+      "privateKeys": [
+        "efd4d62709543c1bae8a22b44640856b48398b7d06f57958760a8695b9f5f171"
+      ],
+      "address": "2N4AE2HpX5A2ZJxFSDb5gJSeg7FpxgJGHHj"
+    }
+  ],
+  [
+    {
+      "utxo": {
+        "token": null,
+        "tx_hash":
+            "5ff93677aeb3db97ed9dbbeb690922fcc9b0782dac27e746a9130e390e29760b",
+        "value": "500000",
+        "vout": 1,
+        "script_type": "P2SH/P2WPKH",
+        "block_height": 73823
+      },
+      "tx":
+          "02000000000101db5496bb029519cd43eec785826a71f62facc22d4df3fe2c8b129933a06b778c0000000000fdffffff02b5470eab1d0000001600147b458433d0c04323426ef88365bd4cfef141ac7520a107000000000017a9144185f108a273961c1641b503ea1deda5fd446886870247304402201959606b8cee8eca6184990766d723b049841580b8063065f8f925fe1f69575a02200fbcb9c517af1b83d88d60b18dd4bb560debc943dddd0c2ceb4aca638960a4750121030db9616d96a7b7a8656191b340f77e905ee2885a09a7a1e80b9c8b64ec746fb300000000",
+      "scriptpubkey": {
+        "script": [
+          BitcoinOpcode.opHash160,
+          "4185f108a273961c1641b503ea1deda5fd446886",
+          "OP_EQUAL"
+        ]
+      },
+      "p2sh_redeem_script": {
+        "script": ["OP_0", "25761a501d439b764831e1a9c1b50c48c7cb2af1"]
+      },
+      "p2wsh_witness_script": null,
+      "merkle_proof": null,
+      "tree_script": null,
+      "leaf_script": null,
+      "xonly": null,
+      "merkle_root": null,
+      "leaf_scripts": null,
+      "privateKeys": [
+        "4c889b458ae4d09d51266ebb604396468412c2622a4283325f492325e85e9bf4"
+      ],
+      "address": "2MyDgNB44xt7bMtJLq9rP7zGENh1pxXU48Z"
+    }
+  ],
+  [
+    {
+      "utxo": {
+        "token": null,
+        "tx_hash":
+            "a1eb2001c7941f3f9c7a8cbbd25829148c40b9766e821c7afc2770defab1b196",
+        "value": "500000",
+        "vout": 1,
+        "script_type": "P2SH/P2PK",
+        "block_height": 74166
+      },
+      "tx":
+          "02000000000101beffc3e46f588727b7d4f7a060acc0f9a546752b04f2ed461d4cc539b217420a0000000000fdffffff025f63dd08840100001600147b458433d0c04323426ef88365bd4cfef141ac7520a107000000000017a91473d9d46bdadd9cb20c68330385d21bbf457500f28702473044022055ffaa4dd3ddfe16a681a8cc07bce7c64aea0e955806fc4abc475e79e9dd1801022053cee4bf5366e32bdeb976fc654d65ca798dfebdb05f3118ceb8dda517616d6e0121030db9616d96a7b7a8656191b340f77e905ee2885a09a7a1e80b9c8b64ec746fb300000000",
+      "scriptpubkey": {
+        "script": [
+          BitcoinOpcode.opHash160,
+          "73d9d46bdadd9cb20c68330385d21bbf457500f2",
+          "OP_EQUAL"
+        ]
+      },
+      "p2sh_redeem_script": {
+        "script": [
+          "043a1a902bf14317faffae2568fdcbdc188d9455ae60a2dfbf5dc3b226d784497726f6523d1cd0da24863f8d943dd1fd3c7030efc2636d3238bec7d558c075ce7e",
+          BitcoinOpcode.opCheckSig,
+        ]
+      },
+      "p2wsh_witness_script": null,
+      "merkle_proof": null,
+      "tree_script": null,
+      "leaf_script": null,
+      "xonly": null,
+      "merkle_root": null,
+      "leaf_scripts": null,
+      "privateKeys": [
+        "33053373fe566dc4f77941a449c20dfa356221dfadec5e3d507c58279e0e1991"
+      ],
+      "address": "2N3oneRSj5C4jUWsSFmAkY6FX45kW7tUUP5"
+    }
+  ],
+  [
+    {
+      "utxo": {
+        "token": null,
+        "tx_hash":
+            "0a4217b239c54c1d46edf2042b7546a5f9c0ac60a0f7d4b72787586fe4c3ffbe",
+        "value": "500000",
+        "vout": 1,
+        "script_type": "P2PKH",
+        "block_height": 74166
+      },
+      "tx":
+          "02000000000101ee63737203248a1e03e2bc03318e753a91ac988de2f4f5cdaaf0d5195b0a0ead0000000000fdffffff02ed0de508840100001600147b458433d0c04323426ef88365bd4cfef141ac7520a10700000000001976a91458ed74ce76848830523000e26d27aa2f292bcce788ac02473044022061165ee01f36822393c0705b4afd2b634929f2344f42674dc5299af4fa76a15c0220077dd5f8a746993c96b117c3ed6ed269a7d539c9d690422fc92e49f2185cd13b0121030db9616d96a7b7a8656191b340f77e905ee2885a09a7a1e80b9c8b64ec746fb300000000",
+      "scriptpubkey": {
+        "script": [
+          BitcoinOpcode.opDup,
+          BitcoinOpcode.opHash160,
+          "58ed74ce76848830523000e26d27aa2f292bcce7",
+          BitcoinOpcode.opEqualVerify,
+          BitcoinOpcode.opCheckSig,
+        ]
+      },
+      "p2sh_redeem_script": null,
+      "p2wsh_witness_script": null,
+      "merkle_proof": null,
+      "tree_script": null,
+      "leaf_script": null,
+      "xonly": null,
+      "merkle_root": null,
+      "leaf_scripts": null,
+      "privateKeys": [
+        "39d9f93498ab9c5e833b6e22493be2aaa8d4daabb141afac801fccbf1298cd05"
+      ],
+      "address": "modADgm9UHadfWLQVKeHapbHjETkwwY6zs"
+    }
+  ]
+];
diff --git a/test/psbt/builder/utxos_vector2.dart b/test/psbt/builder/utxos_vector2.dart
new file mode 100644
index 0000000..5132f0e
--- /dev/null
+++ b/test/psbt/builder/utxos_vector2.dart
@@ -0,0 +1,718 @@
+import 'package:bitcoin_base/bitcoin_base.dart';
+
+const List<List<Map<String, dynamic>>> utxosVector2 = [
+  [
+    {
+      "utxo": {
+        "token": null,
+        "tx_hash":
+            "dd1ef42cbca46119a72dc12dae9725156f2cbb4f2012366c71dd58d5f08f51cb",
+        "value": "500000",
+        "vout": 0,
+        "script_type": "P2TR",
+        "block_height": 74422
+      },
+      "scriptpubkey": {
+        "script": [
+          "OP_1",
+          "207036e1551525db9b907bec80d06388a972537d7c3fd9ca1647cdac3e64308f"
+        ]
+      },
+      "tree_script": {
+        "script": {
+          "script": [
+            "5e6ae939f1e87542d2b43ba27dabfddee68bb03c0f8ea1893e1f09e2f50e256b",
+            BitcoinOpcode.opCheckSig,
+            "3a1a902bf14317faffae2568fdcbdc188d9455ae60a2dfbf5dc3b226d7844977",
+            "OP_CHECKSIGADD",
+            "26733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d87",
+            "OP_CHECKSIGADD",
+            "cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f",
+            "OP_CHECKSIGADD",
+            "cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f",
+            "OP_CHECKSIGADD",
+            "OP_3",
+            "OP_NUMEQUAL"
+          ]
+        },
+        "leaf_version": 192
+      },
+      "xonly":
+          "af82536a8922025e345e6bd10f15061b22ff8d3dacc86dd6403c136d5b47f11e",
+      "privateKeys": [
+        "4c889b458ae4d09d51266ebb604396468412c2622a4283325f492325e85e9bf4",
+        "efd4d62709543c1bae8a22b44640856b48398b7d06f57958760a8695b9f5f171"
+      ],
+      "address":
+          "tb1pypcrdc24z5jahxus00kgp5rr3z5hy5ma0slanjskglx6c0nyxz8suncnq7",
+      "tx":
+          "0200000000010844cd6d65362a9e09b7a16b27a1413e16a3097524cedf9282dc539d3743838fb20000000000fdffffff9f3bc50478585408a73c292d6550772d7cd138d63b55f3cd473292210eb7c7370100000000fdffffff7f525d8877aa651c3a76431fa3eb75bc2a2a595eebfb1fa0508e1edca39e56310100000000fdffffff11145a636d996ce48185eceaf75c7a0d26938016a73f5c595ad8159a32c350fa0000000000fdffffff24913db187292098b5a99d7a21aceae44fa529b1892a841d4d22b26a3e213d210000000000fdffffff6746955e0addba056e8a56fa0e185830ee29e7e811bc56761975badd761174a50100000000fdffffff04b203576bab19fd3ff7554c4735d0ab2fc7dba93e214c6ca584e7a766a7fe4d0100000000fdffffff1d1594ebe8e93e9064c1b6a66775bb55e8017e4e6b9ea279fc7635a291e0a70e0000000000fdffffff1120a1070000000000225120207036e1551525db9b907bec80d06388a972537d7c3fd9ca1647cdac3e64308f801a060000000000225120e644163df7b4b9fba40275eda00ba1244039c19ef31958d64268d34fb986cd41801a0600000000002251202c3a5675ab3357f4aca556d5d88c19797ca99da232a9c880d10bffd1643890c0e09304000000000022002088c27bde97700a482464b4147fbed246b6ac8db5570b7725ca3a05f24619d83ca08601000000000017a91467c4cd3187dfe195e19cf87e17d3b9574796188187a08601000000000017a914568e9d619f7d76c4f7f620cb243b75ea8a92484487c0d401000000000017a914da1745e9b549bd0bfa1a569971c77eba30cd5a4b87d0fb01000000000017a91472c44f957fc011d97e3406667dca5b1c930c402687e02202000000000017a9141849e0be5299d74ff8310a31ab6b93d9d98dad8087f04902000000000017a914e56a8afdd4489d018e28cdf5bc662aabeb3f0b838748e8010000000000225120ebc2278b19d45e8ca50b0c67e7e71cb7771a616ec3f81924206337793e741d178b166d0000000000225120cadb11f6bfd71096ce4cddfda25809bbf3bf11b66392c7162b83cefea7dcbe84b0ad010000000000160014b273443219d7f2652349caceecbb641cceb7b922d4ba02000000000017a91477b7552b90584d3fb33ce53f2d28c5015fb3c40887a08601000000000017a9144185f108a273961c1641b503ea1deda5fd44688687a08601000000000017a91473d9d46bdadd9cb20c68330385d21bbf457500f287a0860100000000001976a91458ed74ce76848830523000e26d27aa2f292bcce788ac0140ff3995422d436643e8f13856dbeea45b8e748172619e41c9b9fc6e916539bd8fc2a4f40f5f9f0142641045abc12f0947c41a372c8a4ef56fa243dfbd5873d4db0140ac9feb7ca0ec967f1a4c01bc82bce24cd92e0dd444c546a1846bbbeaeaad29dac70910f03e2120d71013636b7fa8d6d5b0fe3e05d7ada86616adadfe07a8057d01407ad36fe38395060cc18b2c86eb9fb73782a8952197208d5916ba26d6a4b7dc29469eeb8532702d60eaca5adbc457e2af9e2bd998c877887cbdaa756a1dd10c81014096366df6157b7588a8f9967bac2abd012d1e12217adcc75656dcb103ac2275f9969dfe98ad906247fa3cc60a3097eb99d653e11ebfb3788c54dd7919afa0f9fa014067703a5aeddc5bd53e95b98475a0219850bb7bb86712779961e2b007b37c7c08b2598b496f94697f4f04de30c35f8273d935421a7a4bd62fa2a29429c13595620140bc146e446b480832171fa146eace8464ac85927f0c05be39eca7ba7ed6b45c003417e8100f73af7e7ae552b19c83c2e84a61406f5c0d75fea8f18ef5141644e80140abc3ff99155e3d67110d34e3aff5855fd29cebe44b1b5009da082a2c476d2a2ec5dfbe9aadcd3efc47397e07b065e2b33b348e0e2e488fd643f814ab1ba1422f014051b4a3530e105717deabe4ce6f5534a2eca5c87583d324885c0fa7ba09c63fe408fef0277b149a83a10c788d052bbf727d06f5b26de753a6fb6ce954edd54d15b5220100"
+    }
+  ],
+  [
+    {
+      "utxo": {
+        "token": null,
+        "tx_hash":
+            "dd1ef42cbca46119a72dc12dae9725156f2cbb4f2012366c71dd58d5f08f51cb",
+        "value": "400000",
+        "vout": 1,
+        "script_type": "P2TR",
+        "block_height": 74422
+      },
+      "scriptpubkey": {
+        "script": [
+          "OP_1",
+          "e644163df7b4b9fba40275eda00ba1244039c19ef31958d64268d34fb986cd41"
+        ]
+      },
+      "tree_script": {
+        "a": {
+          "a": {
+            "script": {
+              "script": [
+                "cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f",
+                BitcoinOpcode.opCheckSig,
+                "26733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d87",
+                "OP_CHECKSIGADD",
+                BitcoinOpcode.op2,
+                "OP_NUMEQUAL"
+              ]
+            },
+            "leaf_version": 192
+          },
+          "b": {
+            "script": {
+              "script": [
+                "cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f",
+                BitcoinOpcode.opCheckSig,
+              ]
+            },
+            "leaf_version": 192
+          }
+        },
+        "b": {
+          "a": {
+            "a": {
+              "a": {
+                "a": {
+                  "script": {
+                    "script": [
+                      "26733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d87",
+                      BitcoinOpcode.opCheckSig,
+                    ]
+                  },
+                  "leaf_version": 192
+                },
+                "b": {
+                  "script": {
+                    "script": [
+                      "cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f",
+                      BitcoinOpcode.opCheckSig,
+                    ]
+                  },
+                  "leaf_version": 192
+                }
+              },
+              "b": {
+                "script": {
+                  "script": [
+                    "6eb5f87f959b1aedbfe4943534bc062d25e356102ab5af7ecbf97a9ed1914768",
+                    BitcoinOpcode.opCheckSig,
+                  ]
+                },
+                "leaf_version": 192
+              }
+            },
+            "b": {
+              "script": {
+                "script": [
+                  "cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f",
+                  BitcoinOpcode.opCheckSig,
+                ]
+              },
+              "leaf_version": 192
+            }
+          },
+          "b": {
+            "script": {
+              "script": [
+                "cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f",
+                BitcoinOpcode.opCheckSig,
+              ]
+            },
+            "leaf_version": 192
+          }
+        }
+      },
+      "leaf_script": {
+        "script": {
+          "script": [
+            "cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f",
+            BitcoinOpcode.opCheckSig,
+            "26733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d87",
+            "OP_CHECKSIGADD",
+            BitcoinOpcode.op2,
+            "OP_NUMEQUAL"
+          ]
+        },
+        "leaf_version": 192
+      },
+      "xonly":
+          "26733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d87",
+      "privateKeys": [
+        "efd4d62709543c1bae8a22b44640856b48398b7d06f57958760a8695b9f5f171",
+        "4c889b458ae4d09d51266ebb604396468412c2622a4283325f492325e85e9bf4"
+      ],
+      "address":
+          "tb1puezpv00hkjulhfqzwhk6qzapy3qrnsv77vv434jzdrf5lwvxe4qsjxzg4c",
+      "select_leaf":
+          "559a1507e6d2954d0c9699a0ed0e20035b37c136d33af7cde40f47dc8bfabadd",
+      "tx":
+          "0200000000010844cd6d65362a9e09b7a16b27a1413e16a3097524cedf9282dc539d3743838fb20000000000fdffffff9f3bc50478585408a73c292d6550772d7cd138d63b55f3cd473292210eb7c7370100000000fdffffff7f525d8877aa651c3a76431fa3eb75bc2a2a595eebfb1fa0508e1edca39e56310100000000fdffffff11145a636d996ce48185eceaf75c7a0d26938016a73f5c595ad8159a32c350fa0000000000fdffffff24913db187292098b5a99d7a21aceae44fa529b1892a841d4d22b26a3e213d210000000000fdffffff6746955e0addba056e8a56fa0e185830ee29e7e811bc56761975badd761174a50100000000fdffffff04b203576bab19fd3ff7554c4735d0ab2fc7dba93e214c6ca584e7a766a7fe4d0100000000fdffffff1d1594ebe8e93e9064c1b6a66775bb55e8017e4e6b9ea279fc7635a291e0a70e0000000000fdffffff1120a1070000000000225120207036e1551525db9b907bec80d06388a972537d7c3fd9ca1647cdac3e64308f801a060000000000225120e644163df7b4b9fba40275eda00ba1244039c19ef31958d64268d34fb986cd41801a0600000000002251202c3a5675ab3357f4aca556d5d88c19797ca99da232a9c880d10bffd1643890c0e09304000000000022002088c27bde97700a482464b4147fbed246b6ac8db5570b7725ca3a05f24619d83ca08601000000000017a91467c4cd3187dfe195e19cf87e17d3b9574796188187a08601000000000017a914568e9d619f7d76c4f7f620cb243b75ea8a92484487c0d401000000000017a914da1745e9b549bd0bfa1a569971c77eba30cd5a4b87d0fb01000000000017a91472c44f957fc011d97e3406667dca5b1c930c402687e02202000000000017a9141849e0be5299d74ff8310a31ab6b93d9d98dad8087f04902000000000017a914e56a8afdd4489d018e28cdf5bc662aabeb3f0b838748e8010000000000225120ebc2278b19d45e8ca50b0c67e7e71cb7771a616ec3f81924206337793e741d178b166d0000000000225120cadb11f6bfd71096ce4cddfda25809bbf3bf11b66392c7162b83cefea7dcbe84b0ad010000000000160014b273443219d7f2652349caceecbb641cceb7b922d4ba02000000000017a91477b7552b90584d3fb33ce53f2d28c5015fb3c40887a08601000000000017a9144185f108a273961c1641b503ea1deda5fd44688687a08601000000000017a91473d9d46bdadd9cb20c68330385d21bbf457500f287a0860100000000001976a91458ed74ce76848830523000e26d27aa2f292bcce788ac0140ff3995422d436643e8f13856dbeea45b8e748172619e41c9b9fc6e916539bd8fc2a4f40f5f9f0142641045abc12f0947c41a372c8a4ef56fa243dfbd5873d4db0140ac9feb7ca0ec967f1a4c01bc82bce24cd92e0dd444c546a1846bbbeaeaad29dac70910f03e2120d71013636b7fa8d6d5b0fe3e05d7ada86616adadfe07a8057d01407ad36fe38395060cc18b2c86eb9fb73782a8952197208d5916ba26d6a4b7dc29469eeb8532702d60eaca5adbc457e2af9e2bd998c877887cbdaa756a1dd10c81014096366df6157b7588a8f9967bac2abd012d1e12217adcc75656dcb103ac2275f9969dfe98ad906247fa3cc60a3097eb99d653e11ebfb3788c54dd7919afa0f9fa014067703a5aeddc5bd53e95b98475a0219850bb7bb86712779961e2b007b37c7c08b2598b496f94697f4f04de30c35f8273d935421a7a4bd62fa2a29429c13595620140bc146e446b480832171fa146eace8464ac85927f0c05be39eca7ba7ed6b45c003417e8100f73af7e7ae552b19c83c2e84a61406f5c0d75fea8f18ef5141644e80140abc3ff99155e3d67110d34e3aff5855fd29cebe44b1b5009da082a2c476d2a2ec5dfbe9aadcd3efc47397e07b065e2b33b348e0e2e488fd643f814ab1ba1422f014051b4a3530e105717deabe4ce6f5534a2eca5c87583d324885c0fa7ba09c63fe408fef0277b149a83a10c788d052bbf727d06f5b26de753a6fb6ce954edd54d15b5220100"
+    }
+  ],
+  [
+    {
+      "utxo": {
+        "token": null,
+        "tx_hash":
+            "dd1ef42cbca46119a72dc12dae9725156f2cbb4f2012366c71dd58d5f08f51cb",
+        "value": "400000",
+        "vout": 2,
+        "script_type": "P2TR",
+        "block_height": 74422
+      },
+      "scriptpubkey": {
+        "script": [
+          "OP_1",
+          "2c3a5675ab3357f4aca556d5d88c19797ca99da232a9c880d10bffd1643890c0"
+        ]
+      },
+      "tree_script": {
+        "script": {
+          "script": [
+            "cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f",
+            BitcoinOpcode.opCheckSig,
+            "cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f",
+            "OP_CHECKSIGADD",
+            BitcoinOpcode.op2,
+            "OP_NUMEQUAL"
+          ]
+        },
+        "leaf_version": 192
+      },
+      "leaf_script": {
+        "script": {
+          "script": [
+            "cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f",
+            BitcoinOpcode.opCheckSig,
+            "cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f",
+            "OP_CHECKSIGADD",
+            BitcoinOpcode.op2,
+            "OP_NUMEQUAL"
+          ]
+        },
+        "leaf_version": 192
+      },
+      "xonly":
+          "26733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d87",
+      "privateKeys": [
+        "efd4d62709543c1bae8a22b44640856b48398b7d06f57958760a8695b9f5f171",
+        "efd4d62709543c1bae8a22b44640856b48398b7d06f57958760a8695b9f5f171"
+      ],
+      "address":
+          "tb1p9sa9vadtxdtlft992m2a3rqe0972n8dzx25u3qx3p0lazepcjrqqrn7u4k",
+      "select_leaf":
+          "fe708fdad31b49db5dfa0388b2322267000841c99a36e11e0658c4b12a9dddee",
+      "tx":
+          "0200000000010844cd6d65362a9e09b7a16b27a1413e16a3097524cedf9282dc539d3743838fb20000000000fdffffff9f3bc50478585408a73c292d6550772d7cd138d63b55f3cd473292210eb7c7370100000000fdffffff7f525d8877aa651c3a76431fa3eb75bc2a2a595eebfb1fa0508e1edca39e56310100000000fdffffff11145a636d996ce48185eceaf75c7a0d26938016a73f5c595ad8159a32c350fa0000000000fdffffff24913db187292098b5a99d7a21aceae44fa529b1892a841d4d22b26a3e213d210000000000fdffffff6746955e0addba056e8a56fa0e185830ee29e7e811bc56761975badd761174a50100000000fdffffff04b203576bab19fd3ff7554c4735d0ab2fc7dba93e214c6ca584e7a766a7fe4d0100000000fdffffff1d1594ebe8e93e9064c1b6a66775bb55e8017e4e6b9ea279fc7635a291e0a70e0000000000fdffffff1120a1070000000000225120207036e1551525db9b907bec80d06388a972537d7c3fd9ca1647cdac3e64308f801a060000000000225120e644163df7b4b9fba40275eda00ba1244039c19ef31958d64268d34fb986cd41801a0600000000002251202c3a5675ab3357f4aca556d5d88c19797ca99da232a9c880d10bffd1643890c0e09304000000000022002088c27bde97700a482464b4147fbed246b6ac8db5570b7725ca3a05f24619d83ca08601000000000017a91467c4cd3187dfe195e19cf87e17d3b9574796188187a08601000000000017a914568e9d619f7d76c4f7f620cb243b75ea8a92484487c0d401000000000017a914da1745e9b549bd0bfa1a569971c77eba30cd5a4b87d0fb01000000000017a91472c44f957fc011d97e3406667dca5b1c930c402687e02202000000000017a9141849e0be5299d74ff8310a31ab6b93d9d98dad8087f04902000000000017a914e56a8afdd4489d018e28cdf5bc662aabeb3f0b838748e8010000000000225120ebc2278b19d45e8ca50b0c67e7e71cb7771a616ec3f81924206337793e741d178b166d0000000000225120cadb11f6bfd71096ce4cddfda25809bbf3bf11b66392c7162b83cefea7dcbe84b0ad010000000000160014b273443219d7f2652349caceecbb641cceb7b922d4ba02000000000017a91477b7552b90584d3fb33ce53f2d28c5015fb3c40887a08601000000000017a9144185f108a273961c1641b503ea1deda5fd44688687a08601000000000017a91473d9d46bdadd9cb20c68330385d21bbf457500f287a0860100000000001976a91458ed74ce76848830523000e26d27aa2f292bcce788ac0140ff3995422d436643e8f13856dbeea45b8e748172619e41c9b9fc6e916539bd8fc2a4f40f5f9f0142641045abc12f0947c41a372c8a4ef56fa243dfbd5873d4db0140ac9feb7ca0ec967f1a4c01bc82bce24cd92e0dd444c546a1846bbbeaeaad29dac70910f03e2120d71013636b7fa8d6d5b0fe3e05d7ada86616adadfe07a8057d01407ad36fe38395060cc18b2c86eb9fb73782a8952197208d5916ba26d6a4b7dc29469eeb8532702d60eaca5adbc457e2af9e2bd998c877887cbdaa756a1dd10c81014096366df6157b7588a8f9967bac2abd012d1e12217adcc75656dcb103ac2275f9969dfe98ad906247fa3cc60a3097eb99d653e11ebfb3788c54dd7919afa0f9fa014067703a5aeddc5bd53e95b98475a0219850bb7bb86712779961e2b007b37c7c08b2598b496f94697f4f04de30c35f8273d935421a7a4bd62fa2a29429c13595620140bc146e446b480832171fa146eace8464ac85927f0c05be39eca7ba7ed6b45c003417e8100f73af7e7ae552b19c83c2e84a61406f5c0d75fea8f18ef5141644e80140abc3ff99155e3d67110d34e3aff5855fd29cebe44b1b5009da082a2c476d2a2ec5dfbe9aadcd3efc47397e07b065e2b33b348e0e2e488fd643f814ab1ba1422f014051b4a3530e105717deabe4ce6f5534a2eca5c87583d324885c0fa7ba09c63fe408fef0277b149a83a10c788d052bbf727d06f5b26de753a6fb6ce954edd54d15b5220100"
+    }
+  ],
+  [
+    {
+      "utxo": {
+        "token": null,
+        "tx_hash":
+            "dd1ef42cbca46119a72dc12dae9725156f2cbb4f2012366c71dd58d5f08f51cb",
+        "value": "300000",
+        "vout": 3,
+        "script_type": "P2WSH",
+        "block_height": 74422
+      },
+      "scriptpubkey": {
+        "script": [
+          "OP_0",
+          "88c27bde97700a482464b4147fbed246b6ac8db5570b7725ca3a05f24619d83c"
+        ]
+      },
+      "p2wsh_witness_script": {
+        "script": [
+          "OP_3",
+          "0226733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d87",
+          "03cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f",
+          "03cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f",
+          "OP_3",
+          BitcoinOpcode.opCheckMultiSig
+        ]
+      },
+      "privateKeys": [
+        "efd4d62709543c1bae8a22b44640856b48398b7d06f57958760a8695b9f5f171",
+        "4c889b458ae4d09d51266ebb604396468412c2622a4283325f492325e85e9bf4",
+        "efd4d62709543c1bae8a22b44640856b48398b7d06f57958760a8695b9f5f171"
+      ],
+      "address":
+          "tb1q3rp8hh5hwq9ysfryks28l0kjg6m2erd42u9hwfw28gzly3semq7qnzrkrg",
+      "tx":
+          "0200000000010844cd6d65362a9e09b7a16b27a1413e16a3097524cedf9282dc539d3743838fb20000000000fdffffff9f3bc50478585408a73c292d6550772d7cd138d63b55f3cd473292210eb7c7370100000000fdffffff7f525d8877aa651c3a76431fa3eb75bc2a2a595eebfb1fa0508e1edca39e56310100000000fdffffff11145a636d996ce48185eceaf75c7a0d26938016a73f5c595ad8159a32c350fa0000000000fdffffff24913db187292098b5a99d7a21aceae44fa529b1892a841d4d22b26a3e213d210000000000fdffffff6746955e0addba056e8a56fa0e185830ee29e7e811bc56761975badd761174a50100000000fdffffff04b203576bab19fd3ff7554c4735d0ab2fc7dba93e214c6ca584e7a766a7fe4d0100000000fdffffff1d1594ebe8e93e9064c1b6a66775bb55e8017e4e6b9ea279fc7635a291e0a70e0000000000fdffffff1120a1070000000000225120207036e1551525db9b907bec80d06388a972537d7c3fd9ca1647cdac3e64308f801a060000000000225120e644163df7b4b9fba40275eda00ba1244039c19ef31958d64268d34fb986cd41801a0600000000002251202c3a5675ab3357f4aca556d5d88c19797ca99da232a9c880d10bffd1643890c0e09304000000000022002088c27bde97700a482464b4147fbed246b6ac8db5570b7725ca3a05f24619d83ca08601000000000017a91467c4cd3187dfe195e19cf87e17d3b9574796188187a08601000000000017a914568e9d619f7d76c4f7f620cb243b75ea8a92484487c0d401000000000017a914da1745e9b549bd0bfa1a569971c77eba30cd5a4b87d0fb01000000000017a91472c44f957fc011d97e3406667dca5b1c930c402687e02202000000000017a9141849e0be5299d74ff8310a31ab6b93d9d98dad8087f04902000000000017a914e56a8afdd4489d018e28cdf5bc662aabeb3f0b838748e8010000000000225120ebc2278b19d45e8ca50b0c67e7e71cb7771a616ec3f81924206337793e741d178b166d0000000000225120cadb11f6bfd71096ce4cddfda25809bbf3bf11b66392c7162b83cefea7dcbe84b0ad010000000000160014b273443219d7f2652349caceecbb641cceb7b922d4ba02000000000017a91477b7552b90584d3fb33ce53f2d28c5015fb3c40887a08601000000000017a9144185f108a273961c1641b503ea1deda5fd44688687a08601000000000017a91473d9d46bdadd9cb20c68330385d21bbf457500f287a0860100000000001976a91458ed74ce76848830523000e26d27aa2f292bcce788ac0140ff3995422d436643e8f13856dbeea45b8e748172619e41c9b9fc6e916539bd8fc2a4f40f5f9f0142641045abc12f0947c41a372c8a4ef56fa243dfbd5873d4db0140ac9feb7ca0ec967f1a4c01bc82bce24cd92e0dd444c546a1846bbbeaeaad29dac70910f03e2120d71013636b7fa8d6d5b0fe3e05d7ada86616adadfe07a8057d01407ad36fe38395060cc18b2c86eb9fb73782a8952197208d5916ba26d6a4b7dc29469eeb8532702d60eaca5adbc457e2af9e2bd998c877887cbdaa756a1dd10c81014096366df6157b7588a8f9967bac2abd012d1e12217adcc75656dcb103ac2275f9969dfe98ad906247fa3cc60a3097eb99d653e11ebfb3788c54dd7919afa0f9fa014067703a5aeddc5bd53e95b98475a0219850bb7bb86712779961e2b007b37c7c08b2598b496f94697f4f04de30c35f8273d935421a7a4bd62fa2a29429c13595620140bc146e446b480832171fa146eace8464ac85927f0c05be39eca7ba7ed6b45c003417e8100f73af7e7ae552b19c83c2e84a61406f5c0d75fea8f18ef5141644e80140abc3ff99155e3d67110d34e3aff5855fd29cebe44b1b5009da082a2c476d2a2ec5dfbe9aadcd3efc47397e07b065e2b33b348e0e2e488fd643f814ab1ba1422f014051b4a3530e105717deabe4ce6f5534a2eca5c87583d324885c0fa7ba09c63fe408fef0277b149a83a10c788d052bbf727d06f5b26de753a6fb6ce954edd54d15b5220100"
+    }
+  ],
+  [
+    {
+      "utxo": {
+        "token": null,
+        "tx_hash":
+            "dd1ef42cbca46119a72dc12dae9725156f2cbb4f2012366c71dd58d5f08f51cb",
+        "value": "100000",
+        "vout": 4,
+        "script_type": "P2SH/P2PKH",
+        "block_height": 74422
+      },
+      "scriptpubkey": {
+        "script": [
+          BitcoinOpcode.opHash160,
+          "67c4cd3187dfe195e19cf87e17d3b95747961881",
+          "OP_EQUAL"
+        ]
+      },
+      "p2sh_redeem_script": {
+        "script": [
+          "OP_4",
+          "0226733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d87",
+          "04cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fe5690748be2d1358b2e4375bf6185416fa24db998d9501a165e3a2a577bc3649",
+          "04cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fe5690748be2d1358b2e4375bf6185416fa24db998d9501a165e3a2a577bc3649",
+          "04cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fe5690748be2d1358b2e4375bf6185416fa24db998d9501a165e3a2a577bc3649",
+          "OP_4",
+          BitcoinOpcode.opCheckMultiSig
+        ]
+      },
+      "privateKeys": [
+        "efd4d62709543c1bae8a22b44640856b48398b7d06f57958760a8695b9f5f171",
+        "4c889b458ae4d09d51266ebb604396468412c2622a4283325f492325e85e9bf4",
+        "efd4d62709543c1bae8a22b44640856b48398b7d06f57958760a8695b9f5f171"
+      ],
+      "address": "2N2huM42YZhWNEpyrChgedktkamNyCg5LD2",
+      "tx":
+          "0200000000010844cd6d65362a9e09b7a16b27a1413e16a3097524cedf9282dc539d3743838fb20000000000fdffffff9f3bc50478585408a73c292d6550772d7cd138d63b55f3cd473292210eb7c7370100000000fdffffff7f525d8877aa651c3a76431fa3eb75bc2a2a595eebfb1fa0508e1edca39e56310100000000fdffffff11145a636d996ce48185eceaf75c7a0d26938016a73f5c595ad8159a32c350fa0000000000fdffffff24913db187292098b5a99d7a21aceae44fa529b1892a841d4d22b26a3e213d210000000000fdffffff6746955e0addba056e8a56fa0e185830ee29e7e811bc56761975badd761174a50100000000fdffffff04b203576bab19fd3ff7554c4735d0ab2fc7dba93e214c6ca584e7a766a7fe4d0100000000fdffffff1d1594ebe8e93e9064c1b6a66775bb55e8017e4e6b9ea279fc7635a291e0a70e0000000000fdffffff1120a1070000000000225120207036e1551525db9b907bec80d06388a972537d7c3fd9ca1647cdac3e64308f801a060000000000225120e644163df7b4b9fba40275eda00ba1244039c19ef31958d64268d34fb986cd41801a0600000000002251202c3a5675ab3357f4aca556d5d88c19797ca99da232a9c880d10bffd1643890c0e09304000000000022002088c27bde97700a482464b4147fbed246b6ac8db5570b7725ca3a05f24619d83ca08601000000000017a91467c4cd3187dfe195e19cf87e17d3b9574796188187a08601000000000017a914568e9d619f7d76c4f7f620cb243b75ea8a92484487c0d401000000000017a914da1745e9b549bd0bfa1a569971c77eba30cd5a4b87d0fb01000000000017a91472c44f957fc011d97e3406667dca5b1c930c402687e02202000000000017a9141849e0be5299d74ff8310a31ab6b93d9d98dad8087f04902000000000017a914e56a8afdd4489d018e28cdf5bc662aabeb3f0b838748e8010000000000225120ebc2278b19d45e8ca50b0c67e7e71cb7771a616ec3f81924206337793e741d178b166d0000000000225120cadb11f6bfd71096ce4cddfda25809bbf3bf11b66392c7162b83cefea7dcbe84b0ad010000000000160014b273443219d7f2652349caceecbb641cceb7b922d4ba02000000000017a91477b7552b90584d3fb33ce53f2d28c5015fb3c40887a08601000000000017a9144185f108a273961c1641b503ea1deda5fd44688687a08601000000000017a91473d9d46bdadd9cb20c68330385d21bbf457500f287a0860100000000001976a91458ed74ce76848830523000e26d27aa2f292bcce788ac0140ff3995422d436643e8f13856dbeea45b8e748172619e41c9b9fc6e916539bd8fc2a4f40f5f9f0142641045abc12f0947c41a372c8a4ef56fa243dfbd5873d4db0140ac9feb7ca0ec967f1a4c01bc82bce24cd92e0dd444c546a1846bbbeaeaad29dac70910f03e2120d71013636b7fa8d6d5b0fe3e05d7ada86616adadfe07a8057d01407ad36fe38395060cc18b2c86eb9fb73782a8952197208d5916ba26d6a4b7dc29469eeb8532702d60eaca5adbc457e2af9e2bd998c877887cbdaa756a1dd10c81014096366df6157b7588a8f9967bac2abd012d1e12217adcc75656dcb103ac2275f9969dfe98ad906247fa3cc60a3097eb99d653e11ebfb3788c54dd7919afa0f9fa014067703a5aeddc5bd53e95b98475a0219850bb7bb86712779961e2b007b37c7c08b2598b496f94697f4f04de30c35f8273d935421a7a4bd62fa2a29429c13595620140bc146e446b480832171fa146eace8464ac85927f0c05be39eca7ba7ed6b45c003417e8100f73af7e7ae552b19c83c2e84a61406f5c0d75fea8f18ef5141644e80140abc3ff99155e3d67110d34e3aff5855fd29cebe44b1b5009da082a2c476d2a2ec5dfbe9aadcd3efc47397e07b065e2b33b348e0e2e488fd643f814ab1ba1422f014051b4a3530e105717deabe4ce6f5534a2eca5c87583d324885c0fa7ba09c63fe408fef0277b149a83a10c788d052bbf727d06f5b26de753a6fb6ce954edd54d15b5220100"
+    }
+  ],
+  [
+    {
+      "utxo": {
+        "token": null,
+        "tx_hash":
+            "dd1ef42cbca46119a72dc12dae9725156f2cbb4f2012366c71dd58d5f08f51cb",
+        "value": "100000",
+        "vout": 5,
+        "script_type": "P2SH/P2PKH",
+        "block_height": 74422
+      },
+      "scriptpubkey": {
+        "script": [
+          BitcoinOpcode.opHash160,
+          "568e9d619f7d76c4f7f620cb243b75ea8a924844",
+          "OP_EQUAL"
+        ]
+      },
+      "p2sh_redeem_script": {
+        "script": [
+          BitcoinOpcode.op2,
+          "0226733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d87",
+          "04cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fe5690748be2d1358b2e4375bf6185416fa24db998d9501a165e3a2a577bc3649",
+          "04cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fe5690748be2d1358b2e4375bf6185416fa24db998d9501a165e3a2a577bc3649",
+          "OP_3",
+          BitcoinOpcode.opCheckMultiSig
+        ]
+      },
+      "privateKeys": [
+        "efd4d62709543c1bae8a22b44640856b48398b7d06f57958760a8695b9f5f171",
+        "4c889b458ae4d09d51266ebb604396468412c2622a4283325f492325e85e9bf4",
+        "efd4d62709543c1bae8a22b44640856b48398b7d06f57958760a8695b9f5f171"
+      ],
+      "address": "2N18twq4EiNgqCtKnvuCFN93Z9P9QHA4Mec",
+      "tx":
+          "0200000000010844cd6d65362a9e09b7a16b27a1413e16a3097524cedf9282dc539d3743838fb20000000000fdffffff9f3bc50478585408a73c292d6550772d7cd138d63b55f3cd473292210eb7c7370100000000fdffffff7f525d8877aa651c3a76431fa3eb75bc2a2a595eebfb1fa0508e1edca39e56310100000000fdffffff11145a636d996ce48185eceaf75c7a0d26938016a73f5c595ad8159a32c350fa0000000000fdffffff24913db187292098b5a99d7a21aceae44fa529b1892a841d4d22b26a3e213d210000000000fdffffff6746955e0addba056e8a56fa0e185830ee29e7e811bc56761975badd761174a50100000000fdffffff04b203576bab19fd3ff7554c4735d0ab2fc7dba93e214c6ca584e7a766a7fe4d0100000000fdffffff1d1594ebe8e93e9064c1b6a66775bb55e8017e4e6b9ea279fc7635a291e0a70e0000000000fdffffff1120a1070000000000225120207036e1551525db9b907bec80d06388a972537d7c3fd9ca1647cdac3e64308f801a060000000000225120e644163df7b4b9fba40275eda00ba1244039c19ef31958d64268d34fb986cd41801a0600000000002251202c3a5675ab3357f4aca556d5d88c19797ca99da232a9c880d10bffd1643890c0e09304000000000022002088c27bde97700a482464b4147fbed246b6ac8db5570b7725ca3a05f24619d83ca08601000000000017a91467c4cd3187dfe195e19cf87e17d3b9574796188187a08601000000000017a914568e9d619f7d76c4f7f620cb243b75ea8a92484487c0d401000000000017a914da1745e9b549bd0bfa1a569971c77eba30cd5a4b87d0fb01000000000017a91472c44f957fc011d97e3406667dca5b1c930c402687e02202000000000017a9141849e0be5299d74ff8310a31ab6b93d9d98dad8087f04902000000000017a914e56a8afdd4489d018e28cdf5bc662aabeb3f0b838748e8010000000000225120ebc2278b19d45e8ca50b0c67e7e71cb7771a616ec3f81924206337793e741d178b166d0000000000225120cadb11f6bfd71096ce4cddfda25809bbf3bf11b66392c7162b83cefea7dcbe84b0ad010000000000160014b273443219d7f2652349caceecbb641cceb7b922d4ba02000000000017a91477b7552b90584d3fb33ce53f2d28c5015fb3c40887a08601000000000017a9144185f108a273961c1641b503ea1deda5fd44688687a08601000000000017a91473d9d46bdadd9cb20c68330385d21bbf457500f287a0860100000000001976a91458ed74ce76848830523000e26d27aa2f292bcce788ac0140ff3995422d436643e8f13856dbeea45b8e748172619e41c9b9fc6e916539bd8fc2a4f40f5f9f0142641045abc12f0947c41a372c8a4ef56fa243dfbd5873d4db0140ac9feb7ca0ec967f1a4c01bc82bce24cd92e0dd444c546a1846bbbeaeaad29dac70910f03e2120d71013636b7fa8d6d5b0fe3e05d7ada86616adadfe07a8057d01407ad36fe38395060cc18b2c86eb9fb73782a8952197208d5916ba26d6a4b7dc29469eeb8532702d60eaca5adbc457e2af9e2bd998c877887cbdaa756a1dd10c81014096366df6157b7588a8f9967bac2abd012d1e12217adcc75656dcb103ac2275f9969dfe98ad906247fa3cc60a3097eb99d653e11ebfb3788c54dd7919afa0f9fa014067703a5aeddc5bd53e95b98475a0219850bb7bb86712779961e2b007b37c7c08b2598b496f94697f4f04de30c35f8273d935421a7a4bd62fa2a29429c13595620140bc146e446b480832171fa146eace8464ac85927f0c05be39eca7ba7ed6b45c003417e8100f73af7e7ae552b19c83c2e84a61406f5c0d75fea8f18ef5141644e80140abc3ff99155e3d67110d34e3aff5855fd29cebe44b1b5009da082a2c476d2a2ec5dfbe9aadcd3efc47397e07b065e2b33b348e0e2e488fd643f814ab1ba1422f014051b4a3530e105717deabe4ce6f5534a2eca5c87583d324885c0fa7ba09c63fe408fef0277b149a83a10c788d052bbf727d06f5b26de753a6fb6ce954edd54d15b5220100"
+    }
+  ],
+  [
+    {
+      "utxo": {
+        "token": null,
+        "tx_hash":
+            "dd1ef42cbca46119a72dc12dae9725156f2cbb4f2012366c71dd58d5f08f51cb",
+        "value": "120000",
+        "vout": 6,
+        "script_type": "P2SH/P2PK",
+        "block_height": 74422
+      },
+      "scriptpubkey": {
+        "script": [
+          BitcoinOpcode.opHash160,
+          "da1745e9b549bd0bfa1a569971c77eba30cd5a4b",
+          "OP_EQUAL"
+        ]
+      },
+      "p2sh_redeem_script": {
+        "script": ["OP_TRUE"]
+      },
+      "privateKeys": [],
+      "address": "2ND8PB9RrfCaAcjfjP1Y6nAgFd9zWHYX4DN",
+      "tx":
+          "0200000000010844cd6d65362a9e09b7a16b27a1413e16a3097524cedf9282dc539d3743838fb20000000000fdffffff9f3bc50478585408a73c292d6550772d7cd138d63b55f3cd473292210eb7c7370100000000fdffffff7f525d8877aa651c3a76431fa3eb75bc2a2a595eebfb1fa0508e1edca39e56310100000000fdffffff11145a636d996ce48185eceaf75c7a0d26938016a73f5c595ad8159a32c350fa0000000000fdffffff24913db187292098b5a99d7a21aceae44fa529b1892a841d4d22b26a3e213d210000000000fdffffff6746955e0addba056e8a56fa0e185830ee29e7e811bc56761975badd761174a50100000000fdffffff04b203576bab19fd3ff7554c4735d0ab2fc7dba93e214c6ca584e7a766a7fe4d0100000000fdffffff1d1594ebe8e93e9064c1b6a66775bb55e8017e4e6b9ea279fc7635a291e0a70e0000000000fdffffff1120a1070000000000225120207036e1551525db9b907bec80d06388a972537d7c3fd9ca1647cdac3e64308f801a060000000000225120e644163df7b4b9fba40275eda00ba1244039c19ef31958d64268d34fb986cd41801a0600000000002251202c3a5675ab3357f4aca556d5d88c19797ca99da232a9c880d10bffd1643890c0e09304000000000022002088c27bde97700a482464b4147fbed246b6ac8db5570b7725ca3a05f24619d83ca08601000000000017a91467c4cd3187dfe195e19cf87e17d3b9574796188187a08601000000000017a914568e9d619f7d76c4f7f620cb243b75ea8a92484487c0d401000000000017a914da1745e9b549bd0bfa1a569971c77eba30cd5a4b87d0fb01000000000017a91472c44f957fc011d97e3406667dca5b1c930c402687e02202000000000017a9141849e0be5299d74ff8310a31ab6b93d9d98dad8087f04902000000000017a914e56a8afdd4489d018e28cdf5bc662aabeb3f0b838748e8010000000000225120ebc2278b19d45e8ca50b0c67e7e71cb7771a616ec3f81924206337793e741d178b166d0000000000225120cadb11f6bfd71096ce4cddfda25809bbf3bf11b66392c7162b83cefea7dcbe84b0ad010000000000160014b273443219d7f2652349caceecbb641cceb7b922d4ba02000000000017a91477b7552b90584d3fb33ce53f2d28c5015fb3c40887a08601000000000017a9144185f108a273961c1641b503ea1deda5fd44688687a08601000000000017a91473d9d46bdadd9cb20c68330385d21bbf457500f287a0860100000000001976a91458ed74ce76848830523000e26d27aa2f292bcce788ac0140ff3995422d436643e8f13856dbeea45b8e748172619e41c9b9fc6e916539bd8fc2a4f40f5f9f0142641045abc12f0947c41a372c8a4ef56fa243dfbd5873d4db0140ac9feb7ca0ec967f1a4c01bc82bce24cd92e0dd444c546a1846bbbeaeaad29dac70910f03e2120d71013636b7fa8d6d5b0fe3e05d7ada86616adadfe07a8057d01407ad36fe38395060cc18b2c86eb9fb73782a8952197208d5916ba26d6a4b7dc29469eeb8532702d60eaca5adbc457e2af9e2bd998c877887cbdaa756a1dd10c81014096366df6157b7588a8f9967bac2abd012d1e12217adcc75656dcb103ac2275f9969dfe98ad906247fa3cc60a3097eb99d653e11ebfb3788c54dd7919afa0f9fa014067703a5aeddc5bd53e95b98475a0219850bb7bb86712779961e2b007b37c7c08b2598b496f94697f4f04de30c35f8273d935421a7a4bd62fa2a29429c13595620140bc146e446b480832171fa146eace8464ac85927f0c05be39eca7ba7ed6b45c003417e8100f73af7e7ae552b19c83c2e84a61406f5c0d75fea8f18ef5141644e80140abc3ff99155e3d67110d34e3aff5855fd29cebe44b1b5009da082a2c476d2a2ec5dfbe9aadcd3efc47397e07b065e2b33b348e0e2e488fd643f814ab1ba1422f014051b4a3530e105717deabe4ce6f5534a2eca5c87583d324885c0fa7ba09c63fe408fef0277b149a83a10c788d052bbf727d06f5b26de753a6fb6ce954edd54d15b5220100"
+    }
+  ],
+  [
+    {
+      "utxo": {
+        "token": null,
+        "tx_hash":
+            "dd1ef42cbca46119a72dc12dae9725156f2cbb4f2012366c71dd58d5f08f51cb",
+        "value": "130000",
+        "vout": 7,
+        "script_type": "P2SH/P2WSH",
+        "block_height": 74422
+      },
+      "scriptpubkey": {
+        "script": [
+          BitcoinOpcode.opHash160,
+          "72c44f957fc011d97e3406667dca5b1c930c4026",
+          "OP_EQUAL"
+        ]
+      },
+      "p2sh_redeem_script": {
+        "script": [
+          "OP_0",
+          "4ae81572f06e1b88fd5ced7a1a000945432e83e1551e6f721ee9c00b8cc33260"
+        ]
+      },
+      "p2wsh_witness_script": {
+        "script": ["OP_TRUE"]
+      },
+      "privateKeys": [],
+      "address": "2N3i4C56DiqfpdcAJsAdZd2xYpCQMRAroye",
+      "tx":
+          "0200000000010844cd6d65362a9e09b7a16b27a1413e16a3097524cedf9282dc539d3743838fb20000000000fdffffff9f3bc50478585408a73c292d6550772d7cd138d63b55f3cd473292210eb7c7370100000000fdffffff7f525d8877aa651c3a76431fa3eb75bc2a2a595eebfb1fa0508e1edca39e56310100000000fdffffff11145a636d996ce48185eceaf75c7a0d26938016a73f5c595ad8159a32c350fa0000000000fdffffff24913db187292098b5a99d7a21aceae44fa529b1892a841d4d22b26a3e213d210000000000fdffffff6746955e0addba056e8a56fa0e185830ee29e7e811bc56761975badd761174a50100000000fdffffff04b203576bab19fd3ff7554c4735d0ab2fc7dba93e214c6ca584e7a766a7fe4d0100000000fdffffff1d1594ebe8e93e9064c1b6a66775bb55e8017e4e6b9ea279fc7635a291e0a70e0000000000fdffffff1120a1070000000000225120207036e1551525db9b907bec80d06388a972537d7c3fd9ca1647cdac3e64308f801a060000000000225120e644163df7b4b9fba40275eda00ba1244039c19ef31958d64268d34fb986cd41801a0600000000002251202c3a5675ab3357f4aca556d5d88c19797ca99da232a9c880d10bffd1643890c0e09304000000000022002088c27bde97700a482464b4147fbed246b6ac8db5570b7725ca3a05f24619d83ca08601000000000017a91467c4cd3187dfe195e19cf87e17d3b9574796188187a08601000000000017a914568e9d619f7d76c4f7f620cb243b75ea8a92484487c0d401000000000017a914da1745e9b549bd0bfa1a569971c77eba30cd5a4b87d0fb01000000000017a91472c44f957fc011d97e3406667dca5b1c930c402687e02202000000000017a9141849e0be5299d74ff8310a31ab6b93d9d98dad8087f04902000000000017a914e56a8afdd4489d018e28cdf5bc662aabeb3f0b838748e8010000000000225120ebc2278b19d45e8ca50b0c67e7e71cb7771a616ec3f81924206337793e741d178b166d0000000000225120cadb11f6bfd71096ce4cddfda25809bbf3bf11b66392c7162b83cefea7dcbe84b0ad010000000000160014b273443219d7f2652349caceecbb641cceb7b922d4ba02000000000017a91477b7552b90584d3fb33ce53f2d28c5015fb3c40887a08601000000000017a9144185f108a273961c1641b503ea1deda5fd44688687a08601000000000017a91473d9d46bdadd9cb20c68330385d21bbf457500f287a0860100000000001976a91458ed74ce76848830523000e26d27aa2f292bcce788ac0140ff3995422d436643e8f13856dbeea45b8e748172619e41c9b9fc6e916539bd8fc2a4f40f5f9f0142641045abc12f0947c41a372c8a4ef56fa243dfbd5873d4db0140ac9feb7ca0ec967f1a4c01bc82bce24cd92e0dd444c546a1846bbbeaeaad29dac70910f03e2120d71013636b7fa8d6d5b0fe3e05d7ada86616adadfe07a8057d01407ad36fe38395060cc18b2c86eb9fb73782a8952197208d5916ba26d6a4b7dc29469eeb8532702d60eaca5adbc457e2af9e2bd998c877887cbdaa756a1dd10c81014096366df6157b7588a8f9967bac2abd012d1e12217adcc75656dcb103ac2275f9969dfe98ad906247fa3cc60a3097eb99d653e11ebfb3788c54dd7919afa0f9fa014067703a5aeddc5bd53e95b98475a0219850bb7bb86712779961e2b007b37c7c08b2598b496f94697f4f04de30c35f8273d935421a7a4bd62fa2a29429c13595620140bc146e446b480832171fa146eace8464ac85927f0c05be39eca7ba7ed6b45c003417e8100f73af7e7ae552b19c83c2e84a61406f5c0d75fea8f18ef5141644e80140abc3ff99155e3d67110d34e3aff5855fd29cebe44b1b5009da082a2c476d2a2ec5dfbe9aadcd3efc47397e07b065e2b33b348e0e2e488fd643f814ab1ba1422f014051b4a3530e105717deabe4ce6f5534a2eca5c87583d324885c0fa7ba09c63fe408fef0277b149a83a10c788d052bbf727d06f5b26de753a6fb6ce954edd54d15b5220100"
+    }
+  ],
+  [
+    {
+      "utxo": {
+        "token": null,
+        "tx_hash":
+            "dd1ef42cbca46119a72dc12dae9725156f2cbb4f2012366c71dd58d5f08f51cb",
+        "value": "140000",
+        "vout": 8,
+        "script_type": "P2SH/P2PK",
+        "block_height": 74422
+      },
+      "scriptpubkey": {
+        "script": [
+          BitcoinOpcode.opHash160,
+          "1849e0be5299d74ff8310a31ab6b93d9d98dad80",
+          "OP_EQUAL"
+        ]
+      },
+      "p2sh_redeem_script": {
+        "script": [
+          "0226733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d87",
+          BitcoinOpcode.opCheckSig,
+        ]
+      },
+      "privateKeys": [
+        "4c889b458ae4d09d51266ebb604396468412c2622a4283325f492325e85e9bf4"
+      ],
+      "address": "2MuTei1oXmMKbmnDBCfKCtrbWDdbnriYZXm",
+      "tx":
+          "0200000000010844cd6d65362a9e09b7a16b27a1413e16a3097524cedf9282dc539d3743838fb20000000000fdffffff9f3bc50478585408a73c292d6550772d7cd138d63b55f3cd473292210eb7c7370100000000fdffffff7f525d8877aa651c3a76431fa3eb75bc2a2a595eebfb1fa0508e1edca39e56310100000000fdffffff11145a636d996ce48185eceaf75c7a0d26938016a73f5c595ad8159a32c350fa0000000000fdffffff24913db187292098b5a99d7a21aceae44fa529b1892a841d4d22b26a3e213d210000000000fdffffff6746955e0addba056e8a56fa0e185830ee29e7e811bc56761975badd761174a50100000000fdffffff04b203576bab19fd3ff7554c4735d0ab2fc7dba93e214c6ca584e7a766a7fe4d0100000000fdffffff1d1594ebe8e93e9064c1b6a66775bb55e8017e4e6b9ea279fc7635a291e0a70e0000000000fdffffff1120a1070000000000225120207036e1551525db9b907bec80d06388a972537d7c3fd9ca1647cdac3e64308f801a060000000000225120e644163df7b4b9fba40275eda00ba1244039c19ef31958d64268d34fb986cd41801a0600000000002251202c3a5675ab3357f4aca556d5d88c19797ca99da232a9c880d10bffd1643890c0e09304000000000022002088c27bde97700a482464b4147fbed246b6ac8db5570b7725ca3a05f24619d83ca08601000000000017a91467c4cd3187dfe195e19cf87e17d3b9574796188187a08601000000000017a914568e9d619f7d76c4f7f620cb243b75ea8a92484487c0d401000000000017a914da1745e9b549bd0bfa1a569971c77eba30cd5a4b87d0fb01000000000017a91472c44f957fc011d97e3406667dca5b1c930c402687e02202000000000017a9141849e0be5299d74ff8310a31ab6b93d9d98dad8087f04902000000000017a914e56a8afdd4489d018e28cdf5bc662aabeb3f0b838748e8010000000000225120ebc2278b19d45e8ca50b0c67e7e71cb7771a616ec3f81924206337793e741d178b166d0000000000225120cadb11f6bfd71096ce4cddfda25809bbf3bf11b66392c7162b83cefea7dcbe84b0ad010000000000160014b273443219d7f2652349caceecbb641cceb7b922d4ba02000000000017a91477b7552b90584d3fb33ce53f2d28c5015fb3c40887a08601000000000017a9144185f108a273961c1641b503ea1deda5fd44688687a08601000000000017a91473d9d46bdadd9cb20c68330385d21bbf457500f287a0860100000000001976a91458ed74ce76848830523000e26d27aa2f292bcce788ac0140ff3995422d436643e8f13856dbeea45b8e748172619e41c9b9fc6e916539bd8fc2a4f40f5f9f0142641045abc12f0947c41a372c8a4ef56fa243dfbd5873d4db0140ac9feb7ca0ec967f1a4c01bc82bce24cd92e0dd444c546a1846bbbeaeaad29dac70910f03e2120d71013636b7fa8d6d5b0fe3e05d7ada86616adadfe07a8057d01407ad36fe38395060cc18b2c86eb9fb73782a8952197208d5916ba26d6a4b7dc29469eeb8532702d60eaca5adbc457e2af9e2bd998c877887cbdaa756a1dd10c81014096366df6157b7588a8f9967bac2abd012d1e12217adcc75656dcb103ac2275f9969dfe98ad906247fa3cc60a3097eb99d653e11ebfb3788c54dd7919afa0f9fa014067703a5aeddc5bd53e95b98475a0219850bb7bb86712779961e2b007b37c7c08b2598b496f94697f4f04de30c35f8273d935421a7a4bd62fa2a29429c13595620140bc146e446b480832171fa146eace8464ac85927f0c05be39eca7ba7ed6b45c003417e8100f73af7e7ae552b19c83c2e84a61406f5c0d75fea8f18ef5141644e80140abc3ff99155e3d67110d34e3aff5855fd29cebe44b1b5009da082a2c476d2a2ec5dfbe9aadcd3efc47397e07b065e2b33b348e0e2e488fd643f814ab1ba1422f014051b4a3530e105717deabe4ce6f5534a2eca5c87583d324885c0fa7ba09c63fe408fef0277b149a83a10c788d052bbf727d06f5b26de753a6fb6ce954edd54d15b5220100"
+    }
+  ],
+  [
+    {
+      "utxo": {
+        "token": null,
+        "tx_hash":
+            "91d76b0349f708c34a06d44f94b61e54ebf7176cfd9529a04109e6d987cd5162",
+        "value": "2000",
+        "vout": 0,
+        "script_type": "P2SH/P2WSH",
+        "block_height": 74380
+      },
+      "scriptpubkey": {
+        "script": [
+          BitcoinOpcode.opHash160,
+          "e56a8afdd4489d018e28cdf5bc662aabeb3f0b83",
+          "OP_EQUAL"
+        ]
+      },
+      "p2sh_redeem_script": {
+        "script": [
+          "OP_0",
+          "640f8c50d23cdfb05deeeb989304ba8e2d270eda368c3b0c024191c3370467a9"
+        ]
+      },
+      "p2wsh_witness_script": {
+        "script": [
+          "OP_1",
+          "03cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f",
+          "OP_1",
+          BitcoinOpcode.opCheckMultiSig
+        ]
+      },
+      "privateKeys": [
+        "efd4d62709543c1bae8a22b44640856b48398b7d06f57958760a8695b9f5f171"
+      ],
+      "address": "2NEAGMwppAvbWbbuemzwFAf3HBj3WKDFk37",
+      "tx":
+          "02000000000113410913729457adf83e83fd620761a2adc4d3d342f96e5f1a463cbd8d42a65c890100000000ffffffff24913db187292098b5a99d7a21aceae44fa529b1892a841d4d22b26a3e213d210100000000ffffffff9f3bc50478585408a73c292d6550772d7cd138d63b55f3cd473292210eb7c7370000000000ffffffff91228f25131bd03a1b8f5c1737312d9d5963378a0481117e1b53615b71e7c2090100000000ffffffff05d94483dd289d4e8ee43202e2859a6f963541c5c7b83a928fe2878d8b1f3cba0000000000ffffffff44cd6d65362a9e09b7a16b27a1413e16a3097524cedf9282dc539d3743838fb20100000000ffffffff585d7c8ebe83e172a2de1c9651229ac58dd0ab52a83b38fcb9fd5614f4dd87600100000000ffffffff91e6377bb8cc8f2dc2e74aa35d00cee90f54439adedb9e6a70e5b54df6c8b48f01000000fd0e020047304402201e9ecd402b448952de63b6f7615d538870732b622ee3fc83328aaadae8a2050b02202a72c524064ce336c903e39f56c0e6924779081d34dcff904fac7ebeb86a763701473044022061d58e0cdaf88415e15821dbd162beb88b51a9ca81461f1925b5decf783f336602205b9a7c04b2183d6b2b0bbc18d0b6a6e215dc07274a9783e3a6f16c6eae69361101473044022061d58e0cdaf88415e15821dbd162beb88b51a9ca81461f1925b5decf783f336602205b9a7c04b2183d6b2b0bbc18d0b6a6e215dc07274a9783e3a6f16c6eae69361101473044022061d58e0cdaf88415e15821dbd162beb88b51a9ca81461f1925b5decf783f336602205b9a7c04b2183d6b2b0bbc18d0b6a6e215dc07274a9783e3a6f16c6eae693611014ceb54210226733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d874104cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fe5690748be2d1358b2e4375bf6185416fa24db998d9501a165e3a2a577bc36494104cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fe5690748be2d1358b2e4375bf6185416fa24db998d9501a165e3a2a577bc36494104cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fe5690748be2d1358b2e4375bf6185416fa24db998d9501a165e3a2a577bc364954aeffffffffd7f59b462d2e266956e14826a16ad1585924eaee1f3e85d45a44947ec732f2cf01000000fd3c010047304402202986b468f6d80723c59364e9511bbf471d6c42f5e9f95a2768f1bc1395a3fd0e022070cce71fd90691c6f4c00439e9163ea87cc6b09ce25dd1c7245ee117e34cc5e30147304402200fe0bda4d2785723eb9b8bc58bfcc73c3590d9b7039f0f3ed66158f29e75fab202203504563ee684e77d553211da2ec0ff6f0f752102a459b210b75388884d3aa227014ca952210226733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d874104cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fe5690748be2d1358b2e4375bf6185416fa24db998d9501a165e3a2a577bc36494104cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fe5690748be2d1358b2e4375bf6185416fa24db998d9501a165e3a2a577bc364953aeffffffffb4dd6c05b64baf220d42702d71a6023cc9a8ef38d7d3ccf523ecab92ee2b55a501000000020151ffffffff809cd4c4df13b7914968ea849e958e64f7d90735e515d1f314858d64e33f56bd01000000232200204ae81572f06e1b88fd5ced7a1a000945432e83e1551e6f721ee9c00b8cc33260ffffffffdfec4c78c7fc29a5a67a0aa8b6ab04db5914ccfdf78a891d6c0be477f7a6bf95000000006c47304402202e40d855cf601efcb10feefd5554cf6b6c756fa955965e20adac94254791c04802200c4035f0145c2145566ec0527932c9c6128c63ae573dc7dbadbb11833f761fb80123210226733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d87acffffffffc59ff6d282bfb2308e9880129685d3b3cc8807211902103a5747e75a3a3215e50100000023220020640f8c50d23cdfb05deeeb989304ba8e2d270eda368c3b0c024191c3370467a9ffffffff6dcae52c906f44ed0d02329de0d8cd60f087bf2ba36fdd13927fda1da9e0f44c0100000000ffffffff8e09c938270e7102a804e5be2b9a89bc7ed36ce4e59e20848c8a2bc13835f2ea0100000000ffffffffdfec4c78c7fc29a5a67a0aa8b6ab04db5914ccfdf78a891d6c0be477f7a6bf950100000084473044022068059586ae6f0c9c0e9550de646b48c1dbb5556f37de75dade0f6fa35ebac48e0220055f968c92c23c2d566371c5f0aa672084ec900339445b8e4091d24049d57bee012103cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f1976a914b273443219d7f2652349caceecbb641cceb7b92288acffffffff0b76290e390e13a946e727ac2d78b0c9fc220969ebbb9ded97dbb3ae7736f95f010000001716001425761a501d439b764831e1a9c1b50c48c7cb2af1ffffffff96b1b1fade7027fc7a1c826e76b9408c142958d2bb8c7a9c3f1f94c70120eba1010000008c47304402206eddf63a46be218c1452a518e81c6fead6a1f6274de3ef371183ed4e5c6ebfdc02203691977f13d3471f572839b15ae8fe953f412b75f73d2a140d14a3321049aa6a014341043a1a902bf14317faffae2568fdcbdc188d9455ae60a2dfbf5dc3b226d784497726f6523d1cd0da24863f8d943dd1fd3c7030efc2636d3238bec7d558c075ce7eacffffffffbeffc3e46f588727b7d4f7a060acc0f9a546752b04f2ed461d4cc539b217420a010000008a473044022068504dcfa7455c91c753d668e52d8460e4177e45fe0c54aad0d29b76660619e902200d085806e5ced21ef8b39ae15a46599dcd658807391e33619358dc2fc4443f810141045e6ae939f1e87542d2b43ba27dabfddee68bb03c0f8ea1893e1f09e2f50e256bba49f505c6292cb76bea21868164f1ce9187ff94d302ecb2ab209eea2bc9274effffffff02d00700000000000017a914e56a8afdd4489d018e28cdf5bc662aabeb3f0b838738ca3e000000000017a9144185f108a273961c1641b503ea1deda5fd4468868707413fd9e2cf8308091845675207332c855ee9f6358e780cabb8e7e4863228796f7852770d78f7de3705440f0ce3691cf64352cf243cc3d992f8d771a11c1c53aa4202413fd9e2cf8308091845675207332c855ee9f6358e780cabb8e7e4863228796f7852770d78f7de3705440f0ce3691cf64352cf243cc3d992f8d771a11c1c53aa420241ee3ba25b274e3a8cfba0e7d3da720e17abc110b4dc11b2bb64fa6693456e511a853d97f7c9d0907150de888fcff864488f3aea3f8ace673065a913643b995551020000ac205e6ae939f1e87542d2b43ba27dabfddee68bb03c0f8ea1893e1f09e2f50e256bac203a1a902bf14317faffae2568fdcbdc188d9455ae60a2dfbf5dc3b226d7844977ba2026733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d87ba20cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fba20cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fba539c21c1af82536a8922025e345e6bd10f15061b22ff8d3dacc86dd6403c136d5b47f11e04414e2117ec043b1cea1372a15cdbd32bf16378510b16518bbd35bbcd3fe57e8a912b06aa4269c8f7de4b7642e292ecb1ef934c55a9fc61dd0fb3109ad94a4d715d0141a782b2682896d919cb707a05b2316635d3ebcdcd4457639d9b51dd885f881595750d53ee8187fb4b44903950d97dc67fc545a3f15b4caa482127791599e7bdcf014620cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fac2026733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d87ba529c61c126733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d87e696fde00a8758def6d9648541848f44e36d9f823864c659f8f1f2bf3203c1c4d968d4f3d4ebada4fbe1211c2a276b48a0081d1e1a8391b86a1adacb8a85523d0441992c0a8f2e3ab2389a27b243488a9286292cc76e020df355afa1c8c810f5ab662a6300b683da4fb6370c980ba966b0b5f0533db81184ac591072e19ff6257af40141b2d8c4ce2287f7083414f1cdc4d411d46a0a62a510d5c8891d2824546fa5c5563c12f6fca0aec730c1f836d69944f5fbcdd11acf14d302c46b69d36bdd2549f1014620cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fac2026733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d87ba529c61c126733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d87e696fde00a8758def6d9648541848f44e36d9f823864c659f8f1f2bf3203c1c4d968d4f3d4ebada4fbe1211c2a276b48a0081d1e1a8391b86a1adacb8a85523d0440a477939b3667f243afa641a626a2a01c5a3c0404dd20addc6423e6d33bdc8c88a6a3cd841b7205901c1da229a90a3840b61dbcfe0cffa24c86ce637c8786626540a477939b3667f243afa641a626a2a01c5a3c0404dd20addc6423e6d33bdc8c88a6a3cd841b7205901c1da229a90a3840b61dbcfe0cffa24c86ce637c878662654620cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fac20cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fba529c21c126733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d870440177ac6b57a8163ca83821d4a1f23d904cb5102929eb0308b128a22b2d39ccadba0fd1f1f12f93b70bb83394b37cb457f2bb8f201380286cdf08be3113296427040177ac6b57a8163ca83821d4a1f23d904cb5102929eb0308b128a22b2d39ccadba0fd1f1f12f93b70bb83394b37cb457f2bb8f201380286cdf08be311329642704620cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fac20cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fba529c21c126733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d870440328a6ce80fc7010ce0229bb8ab095008cfc62b0c04a887659e47a0161e5b193f4dd767770fd667ba02b27d95fbd0ecb8ab58506fca9b40b1c48244e7df6e6dc540328a6ce80fc7010ce0229bb8ab095008cfc62b0c04a887659e47a0161e5b193f4dd767770fd667ba02b27d95fbd0ecb8ab58506fca9b40b1c48244e7df6e6dc54620cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fac20cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fba529c21c126733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d870500473044022042f986d9f505378945d1e984a6b5b8fe4b741131b27b1af41527b0a91746c9c1022007bae06c860ab2915660ad7798e53cdc84ef426af873b4b872e1b13ec70129f70147304402203c3ec5877bf2431371346b372ccb04618dc805a7e4800c352f4f0a8076d1378e022052e6f197c0e606d9ae5b4070390301ee8f27322b0d8de694c6efed08c903550b0147304402203c3ec5877bf2431371346b372ccb04618dc805a7e4800c352f4f0a8076d1378e022052e6f197c0e606d9ae5b4070390301ee8f27322b0d8de694c6efed08c903550b016953210226733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d872103cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f2103cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f53ae0000000101510003004730440220195620992b1dce7c396fc491540b5bb92f091fa14500482bacf101304e0f7ee50220310520e903a691caf4b797f0b72f8ffc44810ea63bb029e884f9bfe7130555320125512103cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f51ae0140dfcf2521d6b165b11a478a75d03930e565ad8e61b1b630a92289fa2883ccfac8c417870dd056576116df32e9fa873217d6740633967fe7d2cbfb2ad6724bbab8024730440220633b91d338f978a867aa984d72ea8a50365134fb671ba3175b55552954be5588022009297ef5c77621aa4b8c9ee8a06dfc31b3bbfaef722b9568fc4be8c217606bdd012103cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f0002473044022069c86ced7332e775f84bce18b74c00ed53e932357d6356b691ec8874aa94715f02206bd3629eb5eab6cbbe9a967a698ab889fa3f15e06b34712f7f66b400087cc18501210226733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d87000000000000"
+    },
+    {
+      "utxo": {
+        "token": null,
+        "tx_hash":
+            "dd1ef42cbca46119a72dc12dae9725156f2cbb4f2012366c71dd58d5f08f51cb",
+        "value": "150000",
+        "vout": 9,
+        "script_type": "P2SH/P2WSH",
+        "block_height": 74422
+      },
+      "scriptpubkey": {
+        "script": [
+          BitcoinOpcode.opHash160,
+          "e56a8afdd4489d018e28cdf5bc662aabeb3f0b83",
+          "OP_EQUAL"
+        ]
+      },
+      "p2sh_redeem_script": {
+        "script": [
+          "OP_0",
+          "640f8c50d23cdfb05deeeb989304ba8e2d270eda368c3b0c024191c3370467a9"
+        ]
+      },
+      "p2wsh_witness_script": {
+        "script": [
+          "OP_1",
+          "03cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f",
+          "OP_1",
+          BitcoinOpcode.opCheckMultiSig
+        ]
+      },
+      "privateKeys": [
+        "efd4d62709543c1bae8a22b44640856b48398b7d06f57958760a8695b9f5f171"
+      ],
+      "address": "2NEAGMwppAvbWbbuemzwFAf3HBj3WKDFk37",
+      "tx":
+          "0200000000010844cd6d65362a9e09b7a16b27a1413e16a3097524cedf9282dc539d3743838fb20000000000fdffffff9f3bc50478585408a73c292d6550772d7cd138d63b55f3cd473292210eb7c7370100000000fdffffff7f525d8877aa651c3a76431fa3eb75bc2a2a595eebfb1fa0508e1edca39e56310100000000fdffffff11145a636d996ce48185eceaf75c7a0d26938016a73f5c595ad8159a32c350fa0000000000fdffffff24913db187292098b5a99d7a21aceae44fa529b1892a841d4d22b26a3e213d210000000000fdffffff6746955e0addba056e8a56fa0e185830ee29e7e811bc56761975badd761174a50100000000fdffffff04b203576bab19fd3ff7554c4735d0ab2fc7dba93e214c6ca584e7a766a7fe4d0100000000fdffffff1d1594ebe8e93e9064c1b6a66775bb55e8017e4e6b9ea279fc7635a291e0a70e0000000000fdffffff1120a1070000000000225120207036e1551525db9b907bec80d06388a972537d7c3fd9ca1647cdac3e64308f801a060000000000225120e644163df7b4b9fba40275eda00ba1244039c19ef31958d64268d34fb986cd41801a0600000000002251202c3a5675ab3357f4aca556d5d88c19797ca99da232a9c880d10bffd1643890c0e09304000000000022002088c27bde97700a482464b4147fbed246b6ac8db5570b7725ca3a05f24619d83ca08601000000000017a91467c4cd3187dfe195e19cf87e17d3b9574796188187a08601000000000017a914568e9d619f7d76c4f7f620cb243b75ea8a92484487c0d401000000000017a914da1745e9b549bd0bfa1a569971c77eba30cd5a4b87d0fb01000000000017a91472c44f957fc011d97e3406667dca5b1c930c402687e02202000000000017a9141849e0be5299d74ff8310a31ab6b93d9d98dad8087f04902000000000017a914e56a8afdd4489d018e28cdf5bc662aabeb3f0b838748e8010000000000225120ebc2278b19d45e8ca50b0c67e7e71cb7771a616ec3f81924206337793e741d178b166d0000000000225120cadb11f6bfd71096ce4cddfda25809bbf3bf11b66392c7162b83cefea7dcbe84b0ad010000000000160014b273443219d7f2652349caceecbb641cceb7b922d4ba02000000000017a91477b7552b90584d3fb33ce53f2d28c5015fb3c40887a08601000000000017a9144185f108a273961c1641b503ea1deda5fd44688687a08601000000000017a91473d9d46bdadd9cb20c68330385d21bbf457500f287a0860100000000001976a91458ed74ce76848830523000e26d27aa2f292bcce788ac0140ff3995422d436643e8f13856dbeea45b8e748172619e41c9b9fc6e916539bd8fc2a4f40f5f9f0142641045abc12f0947c41a372c8a4ef56fa243dfbd5873d4db0140ac9feb7ca0ec967f1a4c01bc82bce24cd92e0dd444c546a1846bbbeaeaad29dac70910f03e2120d71013636b7fa8d6d5b0fe3e05d7ada86616adadfe07a8057d01407ad36fe38395060cc18b2c86eb9fb73782a8952197208d5916ba26d6a4b7dc29469eeb8532702d60eaca5adbc457e2af9e2bd998c877887cbdaa756a1dd10c81014096366df6157b7588a8f9967bac2abd012d1e12217adcc75656dcb103ac2275f9969dfe98ad906247fa3cc60a3097eb99d653e11ebfb3788c54dd7919afa0f9fa014067703a5aeddc5bd53e95b98475a0219850bb7bb86712779961e2b007b37c7c08b2598b496f94697f4f04de30c35f8273d935421a7a4bd62fa2a29429c13595620140bc146e446b480832171fa146eace8464ac85927f0c05be39eca7ba7ed6b45c003417e8100f73af7e7ae552b19c83c2e84a61406f5c0d75fea8f18ef5141644e80140abc3ff99155e3d67110d34e3aff5855fd29cebe44b1b5009da082a2c476d2a2ec5dfbe9aadcd3efc47397e07b065e2b33b348e0e2e488fd643f814ab1ba1422f014051b4a3530e105717deabe4ce6f5534a2eca5c87583d324885c0fa7ba09c63fe408fef0277b149a83a10c788d052bbf727d06f5b26de753a6fb6ce954edd54d15b5220100"
+    }
+  ],
+  [
+    {
+      "utxo": {
+        "token": null,
+        "tx_hash":
+            "dd1ef42cbca46119a72dc12dae9725156f2cbb4f2012366c71dd58d5f08f51cb",
+        "value": "125000",
+        "vout": 10,
+        "script_type": "P2TR",
+        "block_height": 74422
+      },
+      "scriptpubkey": {
+        "script": [
+          "OP_1",
+          "ebc2278b19d45e8ca50b0c67e7e71cb7771a616ec3f81924206337793e741d17"
+        ]
+      },
+      "xonly":
+          "16cc244510460759a0bc67467f733f5f136d031069791e8ae02833c0cbb8de67",
+      "privateKeys": [
+        "8e1a25ab6fde426a2197006ef50bad154e89401b9b13876fa8ae4ec017a94ef5"
+      ],
+      "address":
+          "tb1pa0pz0zce630gefgtp3n70ecukam35ctwc0upjfpqvvmhj0n5r5tsmn7q6a",
+      "tx":
+          "0200000000010844cd6d65362a9e09b7a16b27a1413e16a3097524cedf9282dc539d3743838fb20000000000fdffffff9f3bc50478585408a73c292d6550772d7cd138d63b55f3cd473292210eb7c7370100000000fdffffff7f525d8877aa651c3a76431fa3eb75bc2a2a595eebfb1fa0508e1edca39e56310100000000fdffffff11145a636d996ce48185eceaf75c7a0d26938016a73f5c595ad8159a32c350fa0000000000fdffffff24913db187292098b5a99d7a21aceae44fa529b1892a841d4d22b26a3e213d210000000000fdffffff6746955e0addba056e8a56fa0e185830ee29e7e811bc56761975badd761174a50100000000fdffffff04b203576bab19fd3ff7554c4735d0ab2fc7dba93e214c6ca584e7a766a7fe4d0100000000fdffffff1d1594ebe8e93e9064c1b6a66775bb55e8017e4e6b9ea279fc7635a291e0a70e0000000000fdffffff1120a1070000000000225120207036e1551525db9b907bec80d06388a972537d7c3fd9ca1647cdac3e64308f801a060000000000225120e644163df7b4b9fba40275eda00ba1244039c19ef31958d64268d34fb986cd41801a0600000000002251202c3a5675ab3357f4aca556d5d88c19797ca99da232a9c880d10bffd1643890c0e09304000000000022002088c27bde97700a482464b4147fbed246b6ac8db5570b7725ca3a05f24619d83ca08601000000000017a91467c4cd3187dfe195e19cf87e17d3b9574796188187a08601000000000017a914568e9d619f7d76c4f7f620cb243b75ea8a92484487c0d401000000000017a914da1745e9b549bd0bfa1a569971c77eba30cd5a4b87d0fb01000000000017a91472c44f957fc011d97e3406667dca5b1c930c402687e02202000000000017a9141849e0be5299d74ff8310a31ab6b93d9d98dad8087f04902000000000017a914e56a8afdd4489d018e28cdf5bc662aabeb3f0b838748e8010000000000225120ebc2278b19d45e8ca50b0c67e7e71cb7771a616ec3f81924206337793e741d178b166d0000000000225120cadb11f6bfd71096ce4cddfda25809bbf3bf11b66392c7162b83cefea7dcbe84b0ad010000000000160014b273443219d7f2652349caceecbb641cceb7b922d4ba02000000000017a91477b7552b90584d3fb33ce53f2d28c5015fb3c40887a08601000000000017a9144185f108a273961c1641b503ea1deda5fd44688687a08601000000000017a91473d9d46bdadd9cb20c68330385d21bbf457500f287a0860100000000001976a91458ed74ce76848830523000e26d27aa2f292bcce788ac0140ff3995422d436643e8f13856dbeea45b8e748172619e41c9b9fc6e916539bd8fc2a4f40f5f9f0142641045abc12f0947c41a372c8a4ef56fa243dfbd5873d4db0140ac9feb7ca0ec967f1a4c01bc82bce24cd92e0dd444c546a1846bbbeaeaad29dac70910f03e2120d71013636b7fa8d6d5b0fe3e05d7ada86616adadfe07a8057d01407ad36fe38395060cc18b2c86eb9fb73782a8952197208d5916ba26d6a4b7dc29469eeb8532702d60eaca5adbc457e2af9e2bd998c877887cbdaa756a1dd10c81014096366df6157b7588a8f9967bac2abd012d1e12217adcc75656dcb103ac2275f9969dfe98ad906247fa3cc60a3097eb99d653e11ebfb3788c54dd7919afa0f9fa014067703a5aeddc5bd53e95b98475a0219850bb7bb86712779961e2b007b37c7c08b2598b496f94697f4f04de30c35f8273d935421a7a4bd62fa2a29429c13595620140bc146e446b480832171fa146eace8464ac85927f0c05be39eca7ba7ed6b45c003417e8100f73af7e7ae552b19c83c2e84a61406f5c0d75fea8f18ef5141644e80140abc3ff99155e3d67110d34e3aff5855fd29cebe44b1b5009da082a2c476d2a2ec5dfbe9aadcd3efc47397e07b065e2b33b348e0e2e488fd643f814ab1ba1422f014051b4a3530e105717deabe4ce6f5534a2eca5c87583d324885c0fa7ba09c63fe408fef0277b149a83a10c788d052bbf727d06f5b26de753a6fb6ce954edd54d15b5220100"
+    }
+  ],
+  [
+    {
+      "utxo": {
+        "token": null,
+        "tx_hash":
+            "dd1ef42cbca46119a72dc12dae9725156f2cbb4f2012366c71dd58d5f08f51cb",
+        "value": "110000",
+        "vout": 12,
+        "script_type": "P2WPKH",
+        "block_height": 74422
+      },
+      "scriptpubkey": {
+        "script": ["OP_0", "b273443219d7f2652349caceecbb641cceb7b922"]
+      },
+      "privateKeys": [
+        "efd4d62709543c1bae8a22b44640856b48398b7d06f57958760a8695b9f5f171"
+      ],
+      "address": "tb1qkfe5gvse6lex2g6fet8wewmyrn8t0wfzdnn599",
+      "tx":
+          "0200000000010844cd6d65362a9e09b7a16b27a1413e16a3097524cedf9282dc539d3743838fb20000000000fdffffff9f3bc50478585408a73c292d6550772d7cd138d63b55f3cd473292210eb7c7370100000000fdffffff7f525d8877aa651c3a76431fa3eb75bc2a2a595eebfb1fa0508e1edca39e56310100000000fdffffff11145a636d996ce48185eceaf75c7a0d26938016a73f5c595ad8159a32c350fa0000000000fdffffff24913db187292098b5a99d7a21aceae44fa529b1892a841d4d22b26a3e213d210000000000fdffffff6746955e0addba056e8a56fa0e185830ee29e7e811bc56761975badd761174a50100000000fdffffff04b203576bab19fd3ff7554c4735d0ab2fc7dba93e214c6ca584e7a766a7fe4d0100000000fdffffff1d1594ebe8e93e9064c1b6a66775bb55e8017e4e6b9ea279fc7635a291e0a70e0000000000fdffffff1120a1070000000000225120207036e1551525db9b907bec80d06388a972537d7c3fd9ca1647cdac3e64308f801a060000000000225120e644163df7b4b9fba40275eda00ba1244039c19ef31958d64268d34fb986cd41801a0600000000002251202c3a5675ab3357f4aca556d5d88c19797ca99da232a9c880d10bffd1643890c0e09304000000000022002088c27bde97700a482464b4147fbed246b6ac8db5570b7725ca3a05f24619d83ca08601000000000017a91467c4cd3187dfe195e19cf87e17d3b9574796188187a08601000000000017a914568e9d619f7d76c4f7f620cb243b75ea8a92484487c0d401000000000017a914da1745e9b549bd0bfa1a569971c77eba30cd5a4b87d0fb01000000000017a91472c44f957fc011d97e3406667dca5b1c930c402687e02202000000000017a9141849e0be5299d74ff8310a31ab6b93d9d98dad8087f04902000000000017a914e56a8afdd4489d018e28cdf5bc662aabeb3f0b838748e8010000000000225120ebc2278b19d45e8ca50b0c67e7e71cb7771a616ec3f81924206337793e741d178b166d0000000000225120cadb11f6bfd71096ce4cddfda25809bbf3bf11b66392c7162b83cefea7dcbe84b0ad010000000000160014b273443219d7f2652349caceecbb641cceb7b922d4ba02000000000017a91477b7552b90584d3fb33ce53f2d28c5015fb3c40887a08601000000000017a9144185f108a273961c1641b503ea1deda5fd44688687a08601000000000017a91473d9d46bdadd9cb20c68330385d21bbf457500f287a0860100000000001976a91458ed74ce76848830523000e26d27aa2f292bcce788ac0140ff3995422d436643e8f13856dbeea45b8e748172619e41c9b9fc6e916539bd8fc2a4f40f5f9f0142641045abc12f0947c41a372c8a4ef56fa243dfbd5873d4db0140ac9feb7ca0ec967f1a4c01bc82bce24cd92e0dd444c546a1846bbbeaeaad29dac70910f03e2120d71013636b7fa8d6d5b0fe3e05d7ada86616adadfe07a8057d01407ad36fe38395060cc18b2c86eb9fb73782a8952197208d5916ba26d6a4b7dc29469eeb8532702d60eaca5adbc457e2af9e2bd998c877887cbdaa756a1dd10c81014096366df6157b7588a8f9967bac2abd012d1e12217adcc75656dcb103ac2275f9969dfe98ad906247fa3cc60a3097eb99d653e11ebfb3788c54dd7919afa0f9fa014067703a5aeddc5bd53e95b98475a0219850bb7bb86712779961e2b007b37c7c08b2598b496f94697f4f04de30c35f8273d935421a7a4bd62fa2a29429c13595620140bc146e446b480832171fa146eace8464ac85927f0c05be39eca7ba7ed6b45c003417e8100f73af7e7ae552b19c83c2e84a61406f5c0d75fea8f18ef5141644e80140abc3ff99155e3d67110d34e3aff5855fd29cebe44b1b5009da082a2c476d2a2ec5dfbe9aadcd3efc47397e07b065e2b33b348e0e2e488fd643f814ab1ba1422f014051b4a3530e105717deabe4ce6f5534a2eca5c87583d324885c0fa7ba09c63fe408fef0277b149a83a10c788d052bbf727d06f5b26de753a6fb6ce954edd54d15b5220100"
+    }
+  ],
+  [
+    {
+      "utxo": {
+        "token": null,
+        "tx_hash":
+            "dd1ef42cbca46119a72dc12dae9725156f2cbb4f2012366c71dd58d5f08f51cb",
+        "value": "178900",
+        "vout": 13,
+        "script_type": "P2SH/P2PKH",
+        "block_height": 74422
+      },
+      "scriptpubkey": {
+        "script": [
+          BitcoinOpcode.opHash160,
+          "77b7552b90584d3fb33ce53f2d28c5015fb3c408",
+          "OP_EQUAL"
+        ]
+      },
+      "p2sh_redeem_script": {
+        "script": [
+          BitcoinOpcode.opDup,
+          BitcoinOpcode.opHash160,
+          "b273443219d7f2652349caceecbb641cceb7b922",
+          BitcoinOpcode.opEqualVerify,
+          BitcoinOpcode.opCheckSig,
+        ]
+      },
+      "privateKeys": [
+        "efd4d62709543c1bae8a22b44640856b48398b7d06f57958760a8695b9f5f171"
+      ],
+      "address": "2N4AE2HpX5A2ZJxFSDb5gJSeg7FpxgJGHHj",
+      "tx":
+          "0200000000010844cd6d65362a9e09b7a16b27a1413e16a3097524cedf9282dc539d3743838fb20000000000fdffffff9f3bc50478585408a73c292d6550772d7cd138d63b55f3cd473292210eb7c7370100000000fdffffff7f525d8877aa651c3a76431fa3eb75bc2a2a595eebfb1fa0508e1edca39e56310100000000fdffffff11145a636d996ce48185eceaf75c7a0d26938016a73f5c595ad8159a32c350fa0000000000fdffffff24913db187292098b5a99d7a21aceae44fa529b1892a841d4d22b26a3e213d210000000000fdffffff6746955e0addba056e8a56fa0e185830ee29e7e811bc56761975badd761174a50100000000fdffffff04b203576bab19fd3ff7554c4735d0ab2fc7dba93e214c6ca584e7a766a7fe4d0100000000fdffffff1d1594ebe8e93e9064c1b6a66775bb55e8017e4e6b9ea279fc7635a291e0a70e0000000000fdffffff1120a1070000000000225120207036e1551525db9b907bec80d06388a972537d7c3fd9ca1647cdac3e64308f801a060000000000225120e644163df7b4b9fba40275eda00ba1244039c19ef31958d64268d34fb986cd41801a0600000000002251202c3a5675ab3357f4aca556d5d88c19797ca99da232a9c880d10bffd1643890c0e09304000000000022002088c27bde97700a482464b4147fbed246b6ac8db5570b7725ca3a05f24619d83ca08601000000000017a91467c4cd3187dfe195e19cf87e17d3b9574796188187a08601000000000017a914568e9d619f7d76c4f7f620cb243b75ea8a92484487c0d401000000000017a914da1745e9b549bd0bfa1a569971c77eba30cd5a4b87d0fb01000000000017a91472c44f957fc011d97e3406667dca5b1c930c402687e02202000000000017a9141849e0be5299d74ff8310a31ab6b93d9d98dad8087f04902000000000017a914e56a8afdd4489d018e28cdf5bc662aabeb3f0b838748e8010000000000225120ebc2278b19d45e8ca50b0c67e7e71cb7771a616ec3f81924206337793e741d178b166d0000000000225120cadb11f6bfd71096ce4cddfda25809bbf3bf11b66392c7162b83cefea7dcbe84b0ad010000000000160014b273443219d7f2652349caceecbb641cceb7b922d4ba02000000000017a91477b7552b90584d3fb33ce53f2d28c5015fb3c40887a08601000000000017a9144185f108a273961c1641b503ea1deda5fd44688687a08601000000000017a91473d9d46bdadd9cb20c68330385d21bbf457500f287a0860100000000001976a91458ed74ce76848830523000e26d27aa2f292bcce788ac0140ff3995422d436643e8f13856dbeea45b8e748172619e41c9b9fc6e916539bd8fc2a4f40f5f9f0142641045abc12f0947c41a372c8a4ef56fa243dfbd5873d4db0140ac9feb7ca0ec967f1a4c01bc82bce24cd92e0dd444c546a1846bbbeaeaad29dac70910f03e2120d71013636b7fa8d6d5b0fe3e05d7ada86616adadfe07a8057d01407ad36fe38395060cc18b2c86eb9fb73782a8952197208d5916ba26d6a4b7dc29469eeb8532702d60eaca5adbc457e2af9e2bd998c877887cbdaa756a1dd10c81014096366df6157b7588a8f9967bac2abd012d1e12217adcc75656dcb103ac2275f9969dfe98ad906247fa3cc60a3097eb99d653e11ebfb3788c54dd7919afa0f9fa014067703a5aeddc5bd53e95b98475a0219850bb7bb86712779961e2b007b37c7c08b2598b496f94697f4f04de30c35f8273d935421a7a4bd62fa2a29429c13595620140bc146e446b480832171fa146eace8464ac85927f0c05be39eca7ba7ed6b45c003417e8100f73af7e7ae552b19c83c2e84a61406f5c0d75fea8f18ef5141644e80140abc3ff99155e3d67110d34e3aff5855fd29cebe44b1b5009da082a2c476d2a2ec5dfbe9aadcd3efc47397e07b065e2b33b348e0e2e488fd643f814ab1ba1422f014051b4a3530e105717deabe4ce6f5534a2eca5c87583d324885c0fa7ba09c63fe408fef0277b149a83a10c788d052bbf727d06f5b26de753a6fb6ce954edd54d15b5220100"
+    }
+  ],
+  [
+    {
+      "utxo": {
+        "token": null,
+        "tx_hash":
+            "91d76b0349f708c34a06d44f94b61e54ebf7176cfd9529a04109e6d987cd5162",
+        "value": "4115000",
+        "vout": 1,
+        "script_type": "P2SH/P2WPKH",
+        "block_height": 74380
+      },
+      "scriptpubkey": {
+        "script": [
+          BitcoinOpcode.opHash160,
+          "4185f108a273961c1641b503ea1deda5fd446886",
+          "OP_EQUAL"
+        ]
+      },
+      "p2sh_redeem_script": {
+        "script": ["OP_0", "25761a501d439b764831e1a9c1b50c48c7cb2af1"]
+      },
+      "privateKeys": [
+        "4c889b458ae4d09d51266ebb604396468412c2622a4283325f492325e85e9bf4"
+      ],
+      "address": "2MyDgNB44xt7bMtJLq9rP7zGENh1pxXU48Z",
+      "tx":
+          "02000000000113410913729457adf83e83fd620761a2adc4d3d342f96e5f1a463cbd8d42a65c890100000000ffffffff24913db187292098b5a99d7a21aceae44fa529b1892a841d4d22b26a3e213d210100000000ffffffff9f3bc50478585408a73c292d6550772d7cd138d63b55f3cd473292210eb7c7370000000000ffffffff91228f25131bd03a1b8f5c1737312d9d5963378a0481117e1b53615b71e7c2090100000000ffffffff05d94483dd289d4e8ee43202e2859a6f963541c5c7b83a928fe2878d8b1f3cba0000000000ffffffff44cd6d65362a9e09b7a16b27a1413e16a3097524cedf9282dc539d3743838fb20100000000ffffffff585d7c8ebe83e172a2de1c9651229ac58dd0ab52a83b38fcb9fd5614f4dd87600100000000ffffffff91e6377bb8cc8f2dc2e74aa35d00cee90f54439adedb9e6a70e5b54df6c8b48f01000000fd0e020047304402201e9ecd402b448952de63b6f7615d538870732b622ee3fc83328aaadae8a2050b02202a72c524064ce336c903e39f56c0e6924779081d34dcff904fac7ebeb86a763701473044022061d58e0cdaf88415e15821dbd162beb88b51a9ca81461f1925b5decf783f336602205b9a7c04b2183d6b2b0bbc18d0b6a6e215dc07274a9783e3a6f16c6eae69361101473044022061d58e0cdaf88415e15821dbd162beb88b51a9ca81461f1925b5decf783f336602205b9a7c04b2183d6b2b0bbc18d0b6a6e215dc07274a9783e3a6f16c6eae69361101473044022061d58e0cdaf88415e15821dbd162beb88b51a9ca81461f1925b5decf783f336602205b9a7c04b2183d6b2b0bbc18d0b6a6e215dc07274a9783e3a6f16c6eae693611014ceb54210226733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d874104cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fe5690748be2d1358b2e4375bf6185416fa24db998d9501a165e3a2a577bc36494104cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fe5690748be2d1358b2e4375bf6185416fa24db998d9501a165e3a2a577bc36494104cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fe5690748be2d1358b2e4375bf6185416fa24db998d9501a165e3a2a577bc364954aeffffffffd7f59b462d2e266956e14826a16ad1585924eaee1f3e85d45a44947ec732f2cf01000000fd3c010047304402202986b468f6d80723c59364e9511bbf471d6c42f5e9f95a2768f1bc1395a3fd0e022070cce71fd90691c6f4c00439e9163ea87cc6b09ce25dd1c7245ee117e34cc5e30147304402200fe0bda4d2785723eb9b8bc58bfcc73c3590d9b7039f0f3ed66158f29e75fab202203504563ee684e77d553211da2ec0ff6f0f752102a459b210b75388884d3aa227014ca952210226733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d874104cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fe5690748be2d1358b2e4375bf6185416fa24db998d9501a165e3a2a577bc36494104cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fe5690748be2d1358b2e4375bf6185416fa24db998d9501a165e3a2a577bc364953aeffffffffb4dd6c05b64baf220d42702d71a6023cc9a8ef38d7d3ccf523ecab92ee2b55a501000000020151ffffffff809cd4c4df13b7914968ea849e958e64f7d90735e515d1f314858d64e33f56bd01000000232200204ae81572f06e1b88fd5ced7a1a000945432e83e1551e6f721ee9c00b8cc33260ffffffffdfec4c78c7fc29a5a67a0aa8b6ab04db5914ccfdf78a891d6c0be477f7a6bf95000000006c47304402202e40d855cf601efcb10feefd5554cf6b6c756fa955965e20adac94254791c04802200c4035f0145c2145566ec0527932c9c6128c63ae573dc7dbadbb11833f761fb80123210226733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d87acffffffffc59ff6d282bfb2308e9880129685d3b3cc8807211902103a5747e75a3a3215e50100000023220020640f8c50d23cdfb05deeeb989304ba8e2d270eda368c3b0c024191c3370467a9ffffffff6dcae52c906f44ed0d02329de0d8cd60f087bf2ba36fdd13927fda1da9e0f44c0100000000ffffffff8e09c938270e7102a804e5be2b9a89bc7ed36ce4e59e20848c8a2bc13835f2ea0100000000ffffffffdfec4c78c7fc29a5a67a0aa8b6ab04db5914ccfdf78a891d6c0be477f7a6bf950100000084473044022068059586ae6f0c9c0e9550de646b48c1dbb5556f37de75dade0f6fa35ebac48e0220055f968c92c23c2d566371c5f0aa672084ec900339445b8e4091d24049d57bee012103cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f1976a914b273443219d7f2652349caceecbb641cceb7b92288acffffffff0b76290e390e13a946e727ac2d78b0c9fc220969ebbb9ded97dbb3ae7736f95f010000001716001425761a501d439b764831e1a9c1b50c48c7cb2af1ffffffff96b1b1fade7027fc7a1c826e76b9408c142958d2bb8c7a9c3f1f94c70120eba1010000008c47304402206eddf63a46be218c1452a518e81c6fead6a1f6274de3ef371183ed4e5c6ebfdc02203691977f13d3471f572839b15ae8fe953f412b75f73d2a140d14a3321049aa6a014341043a1a902bf14317faffae2568fdcbdc188d9455ae60a2dfbf5dc3b226d784497726f6523d1cd0da24863f8d943dd1fd3c7030efc2636d3238bec7d558c075ce7eacffffffffbeffc3e46f588727b7d4f7a060acc0f9a546752b04f2ed461d4cc539b217420a010000008a473044022068504dcfa7455c91c753d668e52d8460e4177e45fe0c54aad0d29b76660619e902200d085806e5ced21ef8b39ae15a46599dcd658807391e33619358dc2fc4443f810141045e6ae939f1e87542d2b43ba27dabfddee68bb03c0f8ea1893e1f09e2f50e256bba49f505c6292cb76bea21868164f1ce9187ff94d302ecb2ab209eea2bc9274effffffff02d00700000000000017a914e56a8afdd4489d018e28cdf5bc662aabeb3f0b838738ca3e000000000017a9144185f108a273961c1641b503ea1deda5fd4468868707413fd9e2cf8308091845675207332c855ee9f6358e780cabb8e7e4863228796f7852770d78f7de3705440f0ce3691cf64352cf243cc3d992f8d771a11c1c53aa4202413fd9e2cf8308091845675207332c855ee9f6358e780cabb8e7e4863228796f7852770d78f7de3705440f0ce3691cf64352cf243cc3d992f8d771a11c1c53aa420241ee3ba25b274e3a8cfba0e7d3da720e17abc110b4dc11b2bb64fa6693456e511a853d97f7c9d0907150de888fcff864488f3aea3f8ace673065a913643b995551020000ac205e6ae939f1e87542d2b43ba27dabfddee68bb03c0f8ea1893e1f09e2f50e256bac203a1a902bf14317faffae2568fdcbdc188d9455ae60a2dfbf5dc3b226d7844977ba2026733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d87ba20cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fba20cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fba539c21c1af82536a8922025e345e6bd10f15061b22ff8d3dacc86dd6403c136d5b47f11e04414e2117ec043b1cea1372a15cdbd32bf16378510b16518bbd35bbcd3fe57e8a912b06aa4269c8f7de4b7642e292ecb1ef934c55a9fc61dd0fb3109ad94a4d715d0141a782b2682896d919cb707a05b2316635d3ebcdcd4457639d9b51dd885f881595750d53ee8187fb4b44903950d97dc67fc545a3f15b4caa482127791599e7bdcf014620cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fac2026733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d87ba529c61c126733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d87e696fde00a8758def6d9648541848f44e36d9f823864c659f8f1f2bf3203c1c4d968d4f3d4ebada4fbe1211c2a276b48a0081d1e1a8391b86a1adacb8a85523d0441992c0a8f2e3ab2389a27b243488a9286292cc76e020df355afa1c8c810f5ab662a6300b683da4fb6370c980ba966b0b5f0533db81184ac591072e19ff6257af40141b2d8c4ce2287f7083414f1cdc4d411d46a0a62a510d5c8891d2824546fa5c5563c12f6fca0aec730c1f836d69944f5fbcdd11acf14d302c46b69d36bdd2549f1014620cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fac2026733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d87ba529c61c126733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d87e696fde00a8758def6d9648541848f44e36d9f823864c659f8f1f2bf3203c1c4d968d4f3d4ebada4fbe1211c2a276b48a0081d1e1a8391b86a1adacb8a85523d0440a477939b3667f243afa641a626a2a01c5a3c0404dd20addc6423e6d33bdc8c88a6a3cd841b7205901c1da229a90a3840b61dbcfe0cffa24c86ce637c8786626540a477939b3667f243afa641a626a2a01c5a3c0404dd20addc6423e6d33bdc8c88a6a3cd841b7205901c1da229a90a3840b61dbcfe0cffa24c86ce637c878662654620cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fac20cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fba529c21c126733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d870440177ac6b57a8163ca83821d4a1f23d904cb5102929eb0308b128a22b2d39ccadba0fd1f1f12f93b70bb83394b37cb457f2bb8f201380286cdf08be3113296427040177ac6b57a8163ca83821d4a1f23d904cb5102929eb0308b128a22b2d39ccadba0fd1f1f12f93b70bb83394b37cb457f2bb8f201380286cdf08be311329642704620cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fac20cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fba529c21c126733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d870440328a6ce80fc7010ce0229bb8ab095008cfc62b0c04a887659e47a0161e5b193f4dd767770fd667ba02b27d95fbd0ecb8ab58506fca9b40b1c48244e7df6e6dc540328a6ce80fc7010ce0229bb8ab095008cfc62b0c04a887659e47a0161e5b193f4dd767770fd667ba02b27d95fbd0ecb8ab58506fca9b40b1c48244e7df6e6dc54620cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fac20cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972fba529c21c126733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d870500473044022042f986d9f505378945d1e984a6b5b8fe4b741131b27b1af41527b0a91746c9c1022007bae06c860ab2915660ad7798e53cdc84ef426af873b4b872e1b13ec70129f70147304402203c3ec5877bf2431371346b372ccb04618dc805a7e4800c352f4f0a8076d1378e022052e6f197c0e606d9ae5b4070390301ee8f27322b0d8de694c6efed08c903550b0147304402203c3ec5877bf2431371346b372ccb04618dc805a7e4800c352f4f0a8076d1378e022052e6f197c0e606d9ae5b4070390301ee8f27322b0d8de694c6efed08c903550b016953210226733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d872103cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f2103cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f53ae0000000101510003004730440220195620992b1dce7c396fc491540b5bb92f091fa14500482bacf101304e0f7ee50220310520e903a691caf4b797f0b72f8ffc44810ea63bb029e884f9bfe7130555320125512103cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f51ae0140dfcf2521d6b165b11a478a75d03930e565ad8e61b1b630a92289fa2883ccfac8c417870dd056576116df32e9fa873217d6740633967fe7d2cbfb2ad6724bbab8024730440220633b91d338f978a867aa984d72ea8a50365134fb671ba3175b55552954be5588022009297ef5c77621aa4b8c9ee8a06dfc31b3bbfaef722b9568fc4be8c217606bdd012103cf65d59727afaa2a63a6dff145acc408a1d9e05f95f5ebc70e58f7342aa2972f0002473044022069c86ced7332e775f84bce18b74c00ed53e932357d6356b691ec8874aa94715f02206bd3629eb5eab6cbbe9a967a698ab889fa3f15e06b34712f7f66b400087cc18501210226733c182391e43d803292c4eb2403e059591fedc2203f2b590e8fd677214d87000000000000"
+    },
+    {
+      "utxo": {
+        "token": null,
+        "tx_hash":
+            "dd1ef42cbca46119a72dc12dae9725156f2cbb4f2012366c71dd58d5f08f51cb",
+        "value": "100000",
+        "vout": 14,
+        "script_type": "P2SH/P2WPKH",
+        "block_height": 74422
+      },
+      "scriptpubkey": {
+        "script": [
+          BitcoinOpcode.opHash160,
+          "4185f108a273961c1641b503ea1deda5fd446886",
+          "OP_EQUAL"
+        ]
+      },
+      "p2sh_redeem_script": {
+        "script": ["OP_0", "25761a501d439b764831e1a9c1b50c48c7cb2af1"]
+      },
+      "privateKeys": [
+        "4c889b458ae4d09d51266ebb604396468412c2622a4283325f492325e85e9bf4"
+      ],
+      "address": "2MyDgNB44xt7bMtJLq9rP7zGENh1pxXU48Z",
+      "tx":
+          "0200000000010844cd6d65362a9e09b7a16b27a1413e16a3097524cedf9282dc539d3743838fb20000000000fdffffff9f3bc50478585408a73c292d6550772d7cd138d63b55f3cd473292210eb7c7370100000000fdffffff7f525d8877aa651c3a76431fa3eb75bc2a2a595eebfb1fa0508e1edca39e56310100000000fdffffff11145a636d996ce48185eceaf75c7a0d26938016a73f5c595ad8159a32c350fa0000000000fdffffff24913db187292098b5a99d7a21aceae44fa529b1892a841d4d22b26a3e213d210000000000fdffffff6746955e0addba056e8a56fa0e185830ee29e7e811bc56761975badd761174a50100000000fdffffff04b203576bab19fd3ff7554c4735d0ab2fc7dba93e214c6ca584e7a766a7fe4d0100000000fdffffff1d1594ebe8e93e9064c1b6a66775bb55e8017e4e6b9ea279fc7635a291e0a70e0000000000fdffffff1120a1070000000000225120207036e1551525db9b907bec80d06388a972537d7c3fd9ca1647cdac3e64308f801a060000000000225120e644163df7b4b9fba40275eda00ba1244039c19ef31958d64268d34fb986cd41801a0600000000002251202c3a5675ab3357f4aca556d5d88c19797ca99da232a9c880d10bffd1643890c0e09304000000000022002088c27bde97700a482464b4147fbed246b6ac8db5570b7725ca3a05f24619d83ca08601000000000017a91467c4cd3187dfe195e19cf87e17d3b9574796188187a08601000000000017a914568e9d619f7d76c4f7f620cb243b75ea8a92484487c0d401000000000017a914da1745e9b549bd0bfa1a569971c77eba30cd5a4b87d0fb01000000000017a91472c44f957fc011d97e3406667dca5b1c930c402687e02202000000000017a9141849e0be5299d74ff8310a31ab6b93d9d98dad8087f04902000000000017a914e56a8afdd4489d018e28cdf5bc662aabeb3f0b838748e8010000000000225120ebc2278b19d45e8ca50b0c67e7e71cb7771a616ec3f81924206337793e741d178b166d0000000000225120cadb11f6bfd71096ce4cddfda25809bbf3bf11b66392c7162b83cefea7dcbe84b0ad010000000000160014b273443219d7f2652349caceecbb641cceb7b922d4ba02000000000017a91477b7552b90584d3fb33ce53f2d28c5015fb3c40887a08601000000000017a9144185f108a273961c1641b503ea1deda5fd44688687a08601000000000017a91473d9d46bdadd9cb20c68330385d21bbf457500f287a0860100000000001976a91458ed74ce76848830523000e26d27aa2f292bcce788ac0140ff3995422d436643e8f13856dbeea45b8e748172619e41c9b9fc6e916539bd8fc2a4f40f5f9f0142641045abc12f0947c41a372c8a4ef56fa243dfbd5873d4db0140ac9feb7ca0ec967f1a4c01bc82bce24cd92e0dd444c546a1846bbbeaeaad29dac70910f03e2120d71013636b7fa8d6d5b0fe3e05d7ada86616adadfe07a8057d01407ad36fe38395060cc18b2c86eb9fb73782a8952197208d5916ba26d6a4b7dc29469eeb8532702d60eaca5adbc457e2af9e2bd998c877887cbdaa756a1dd10c81014096366df6157b7588a8f9967bac2abd012d1e12217adcc75656dcb103ac2275f9969dfe98ad906247fa3cc60a3097eb99d653e11ebfb3788c54dd7919afa0f9fa014067703a5aeddc5bd53e95b98475a0219850bb7bb86712779961e2b007b37c7c08b2598b496f94697f4f04de30c35f8273d935421a7a4bd62fa2a29429c13595620140bc146e446b480832171fa146eace8464ac85927f0c05be39eca7ba7ed6b45c003417e8100f73af7e7ae552b19c83c2e84a61406f5c0d75fea8f18ef5141644e80140abc3ff99155e3d67110d34e3aff5855fd29cebe44b1b5009da082a2c476d2a2ec5dfbe9aadcd3efc47397e07b065e2b33b348e0e2e488fd643f814ab1ba1422f014051b4a3530e105717deabe4ce6f5534a2eca5c87583d324885c0fa7ba09c63fe408fef0277b149a83a10c788d052bbf727d06f5b26de753a6fb6ce954edd54d15b5220100"
+    }
+  ],
+  [
+    {
+      "utxo": {
+        "token": null,
+        "tx_hash":
+            "dd1ef42cbca46119a72dc12dae9725156f2cbb4f2012366c71dd58d5f08f51cb",
+        "value": "100000",
+        "vout": 15,
+        "script_type": "P2SH/P2PK",
+        "block_height": 74422
+      },
+      "scriptpubkey": {
+        "script": [
+          BitcoinOpcode.opHash160,
+          "73d9d46bdadd9cb20c68330385d21bbf457500f2",
+          "OP_EQUAL"
+        ]
+      },
+      "p2sh_redeem_script": {
+        "script": [
+          "043a1a902bf14317faffae2568fdcbdc188d9455ae60a2dfbf5dc3b226d784497726f6523d1cd0da24863f8d943dd1fd3c7030efc2636d3238bec7d558c075ce7e",
+          BitcoinOpcode.opCheckSig,
+        ]
+      },
+      "privateKeys": [
+        "33053373fe566dc4f77941a449c20dfa356221dfadec5e3d507c58279e0e1991"
+      ],
+      "address": "2N3oneRSj5C4jUWsSFmAkY6FX45kW7tUUP5",
+      "tx":
+          "0200000000010844cd6d65362a9e09b7a16b27a1413e16a3097524cedf9282dc539d3743838fb20000000000fdffffff9f3bc50478585408a73c292d6550772d7cd138d63b55f3cd473292210eb7c7370100000000fdffffff7f525d8877aa651c3a76431fa3eb75bc2a2a595eebfb1fa0508e1edca39e56310100000000fdffffff11145a636d996ce48185eceaf75c7a0d26938016a73f5c595ad8159a32c350fa0000000000fdffffff24913db187292098b5a99d7a21aceae44fa529b1892a841d4d22b26a3e213d210000000000fdffffff6746955e0addba056e8a56fa0e185830ee29e7e811bc56761975badd761174a50100000000fdffffff04b203576bab19fd3ff7554c4735d0ab2fc7dba93e214c6ca584e7a766a7fe4d0100000000fdffffff1d1594ebe8e93e9064c1b6a66775bb55e8017e4e6b9ea279fc7635a291e0a70e0000000000fdffffff1120a1070000000000225120207036e1551525db9b907bec80d06388a972537d7c3fd9ca1647cdac3e64308f801a060000000000225120e644163df7b4b9fba40275eda00ba1244039c19ef31958d64268d34fb986cd41801a0600000000002251202c3a5675ab3357f4aca556d5d88c19797ca99da232a9c880d10bffd1643890c0e09304000000000022002088c27bde97700a482464b4147fbed246b6ac8db5570b7725ca3a05f24619d83ca08601000000000017a91467c4cd3187dfe195e19cf87e17d3b9574796188187a08601000000000017a914568e9d619f7d76c4f7f620cb243b75ea8a92484487c0d401000000000017a914da1745e9b549bd0bfa1a569971c77eba30cd5a4b87d0fb01000000000017a91472c44f957fc011d97e3406667dca5b1c930c402687e02202000000000017a9141849e0be5299d74ff8310a31ab6b93d9d98dad8087f04902000000000017a914e56a8afdd4489d018e28cdf5bc662aabeb3f0b838748e8010000000000225120ebc2278b19d45e8ca50b0c67e7e71cb7771a616ec3f81924206337793e741d178b166d0000000000225120cadb11f6bfd71096ce4cddfda25809bbf3bf11b66392c7162b83cefea7dcbe84b0ad010000000000160014b273443219d7f2652349caceecbb641cceb7b922d4ba02000000000017a91477b7552b90584d3fb33ce53f2d28c5015fb3c40887a08601000000000017a9144185f108a273961c1641b503ea1deda5fd44688687a08601000000000017a91473d9d46bdadd9cb20c68330385d21bbf457500f287a0860100000000001976a91458ed74ce76848830523000e26d27aa2f292bcce788ac0140ff3995422d436643e8f13856dbeea45b8e748172619e41c9b9fc6e916539bd8fc2a4f40f5f9f0142641045abc12f0947c41a372c8a4ef56fa243dfbd5873d4db0140ac9feb7ca0ec967f1a4c01bc82bce24cd92e0dd444c546a1846bbbeaeaad29dac70910f03e2120d71013636b7fa8d6d5b0fe3e05d7ada86616adadfe07a8057d01407ad36fe38395060cc18b2c86eb9fb73782a8952197208d5916ba26d6a4b7dc29469eeb8532702d60eaca5adbc457e2af9e2bd998c877887cbdaa756a1dd10c81014096366df6157b7588a8f9967bac2abd012d1e12217adcc75656dcb103ac2275f9969dfe98ad906247fa3cc60a3097eb99d653e11ebfb3788c54dd7919afa0f9fa014067703a5aeddc5bd53e95b98475a0219850bb7bb86712779961e2b007b37c7c08b2598b496f94697f4f04de30c35f8273d935421a7a4bd62fa2a29429c13595620140bc146e446b480832171fa146eace8464ac85927f0c05be39eca7ba7ed6b45c003417e8100f73af7e7ae552b19c83c2e84a61406f5c0d75fea8f18ef5141644e80140abc3ff99155e3d67110d34e3aff5855fd29cebe44b1b5009da082a2c476d2a2ec5dfbe9aadcd3efc47397e07b065e2b33b348e0e2e488fd643f814ab1ba1422f014051b4a3530e105717deabe4ce6f5534a2eca5c87583d324885c0fa7ba09c63fe408fef0277b149a83a10c788d052bbf727d06f5b26de753a6fb6ce954edd54d15b5220100"
+    }
+  ],
+  [
+    {
+      "utxo": {
+        "token": null,
+        "tx_hash":
+            "dd1ef42cbca46119a72dc12dae9725156f2cbb4f2012366c71dd58d5f08f51cb",
+        "value": "100000",
+        "vout": 16,
+        "script_type": "P2PKH",
+        "block_height": 74422
+      },
+      "scriptpubkey": {
+        "script": [
+          BitcoinOpcode.opDup,
+          BitcoinOpcode.opHash160,
+          "58ed74ce76848830523000e26d27aa2f292bcce7",
+          BitcoinOpcode.opEqualVerify,
+          BitcoinOpcode.opCheckSig,
+        ]
+      },
+      "privateKeys": [
+        "39d9f93498ab9c5e833b6e22493be2aaa8d4daabb141afac801fccbf1298cd05"
+      ],
+      "address": "modADgm9UHadfWLQVKeHapbHjETkwwY6zs",
+      "tx":
+          "0200000000010844cd6d65362a9e09b7a16b27a1413e16a3097524cedf9282dc539d3743838fb20000000000fdffffff9f3bc50478585408a73c292d6550772d7cd138d63b55f3cd473292210eb7c7370100000000fdffffff7f525d8877aa651c3a76431fa3eb75bc2a2a595eebfb1fa0508e1edca39e56310100000000fdffffff11145a636d996ce48185eceaf75c7a0d26938016a73f5c595ad8159a32c350fa0000000000fdffffff24913db187292098b5a99d7a21aceae44fa529b1892a841d4d22b26a3e213d210000000000fdffffff6746955e0addba056e8a56fa0e185830ee29e7e811bc56761975badd761174a50100000000fdffffff04b203576bab19fd3ff7554c4735d0ab2fc7dba93e214c6ca584e7a766a7fe4d0100000000fdffffff1d1594ebe8e93e9064c1b6a66775bb55e8017e4e6b9ea279fc7635a291e0a70e0000000000fdffffff1120a1070000000000225120207036e1551525db9b907bec80d06388a972537d7c3fd9ca1647cdac3e64308f801a060000000000225120e644163df7b4b9fba40275eda00ba1244039c19ef31958d64268d34fb986cd41801a0600000000002251202c3a5675ab3357f4aca556d5d88c19797ca99da232a9c880d10bffd1643890c0e09304000000000022002088c27bde97700a482464b4147fbed246b6ac8db5570b7725ca3a05f24619d83ca08601000000000017a91467c4cd3187dfe195e19cf87e17d3b9574796188187a08601000000000017a914568e9d619f7d76c4f7f620cb243b75ea8a92484487c0d401000000000017a914da1745e9b549bd0bfa1a569971c77eba30cd5a4b87d0fb01000000000017a91472c44f957fc011d97e3406667dca5b1c930c402687e02202000000000017a9141849e0be5299d74ff8310a31ab6b93d9d98dad8087f04902000000000017a914e56a8afdd4489d018e28cdf5bc662aabeb3f0b838748e8010000000000225120ebc2278b19d45e8ca50b0c67e7e71cb7771a616ec3f81924206337793e741d178b166d0000000000225120cadb11f6bfd71096ce4cddfda25809bbf3bf11b66392c7162b83cefea7dcbe84b0ad010000000000160014b273443219d7f2652349caceecbb641cceb7b922d4ba02000000000017a91477b7552b90584d3fb33ce53f2d28c5015fb3c40887a08601000000000017a9144185f108a273961c1641b503ea1deda5fd44688687a08601000000000017a91473d9d46bdadd9cb20c68330385d21bbf457500f287a0860100000000001976a91458ed74ce76848830523000e26d27aa2f292bcce788ac0140ff3995422d436643e8f13856dbeea45b8e748172619e41c9b9fc6e916539bd8fc2a4f40f5f9f0142641045abc12f0947c41a372c8a4ef56fa243dfbd5873d4db0140ac9feb7ca0ec967f1a4c01bc82bce24cd92e0dd444c546a1846bbbeaeaad29dac70910f03e2120d71013636b7fa8d6d5b0fe3e05d7ada86616adadfe07a8057d01407ad36fe38395060cc18b2c86eb9fb73782a8952197208d5916ba26d6a4b7dc29469eeb8532702d60eaca5adbc457e2af9e2bd998c877887cbdaa756a1dd10c81014096366df6157b7588a8f9967bac2abd012d1e12217adcc75656dcb103ac2275f9969dfe98ad906247fa3cc60a3097eb99d653e11ebfb3788c54dd7919afa0f9fa014067703a5aeddc5bd53e95b98475a0219850bb7bb86712779961e2b007b37c7c08b2598b496f94697f4f04de30c35f8273d935421a7a4bd62fa2a29429c13595620140bc146e446b480832171fa146eace8464ac85927f0c05be39eca7ba7ed6b45c003417e8100f73af7e7ae552b19c83c2e84a61406f5c0d75fea8f18ef5141644e80140abc3ff99155e3d67110d34e3aff5855fd29cebe44b1b5009da082a2c476d2a2ec5dfbe9aadcd3efc47397e07b065e2b33b348e0e2e488fd643f814ab1ba1422f014051b4a3530e105717deabe4ce6f5534a2eca5c87583d324885c0fa7ba09c63fe408fef0277b149a83a10c788d052bbf727d06f5b26de753a6fb6ce954edd54d15b5220100"
+    }
+  ]
+];

From 2f3b17ab9103e0d07efcfda1b80704cdaa991df6 Mon Sep 17 00:00:00 2001
From: Mohsen <mrhaydari.t@gmail.com>
Date: Tue, 25 Mar 2025 19:37:10 +0330
Subject: [PATCH 56/62] Update README.md

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 24c5120..c432946 100644
--- a/README.md
+++ b/README.md
@@ -80,15 +80,15 @@ Using this package, you can create a Bitcoin transaction in two ways: either thr
   
 - P2SH(SEGWIT): A P2SH (Pay-to-Script-Hash) Segregated Witness (SegWit) address in Bitcoin combines the benefits of P2SH and SegWit technologies, allowing for enhanced transaction security, reduced fees, and improved scalability.
 
-### MuSig2 BIP-327: MuSig2 for BIP340-compatible Multi-Signatures
-  You can find the examples here.
+### MuSig2 (BIP-327):
+  Find example implementations [here](https://github.com/mrtnetwork/bitcoin_base/tree/main/example/lib/musig)
 
  - Sign/Verify: Supports signing and verifying multisignature transactions using MuSig2
  - NonceAgg: Aggregates nonces from multiple participants for secure signature generation.
  - KeyAgg: Combines multiple public keys into a single aggregated public key for efficient multisignature verification
 
 ### PSBT
-  You can find the examples here.
+  Find example implementations [here](https://github.com/mrtnetwork/bitcoin_base/tree/main/example/lib/psbt)
 
 - BIP-0174: Partially Signed Bitcoin Transaction Format
 - BIP-0370: PSBT Version 2

From 47386f226bf90c4a6055d02decdda0dcda675b1a Mon Sep 17 00:00:00 2001
From: Mohsen <mrhaydari.t@gmail.com>
Date: Tue, 25 Mar 2025 19:38:39 +0330
Subject: [PATCH 57/62] Update README.md

---
 README.md | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index c432946..9c16cf0 100644
--- a/README.md
+++ b/README.md
@@ -66,6 +66,23 @@ Using this package, you can create a Bitcoin transaction in two ways: either thr
 
 - BitcoinTransactionBuilder: Even with limited prior knowledge, you can utilize this class to send various types of transactions. Below, I've provided an example in which a transaction features 8 distinct input addresses with different types and private keys, as well as 10 different output addresses. Furthermore, additional examples have been prepared, which you can find in the [`example`](https://github.com/mrtnetwork/bitcoin_base/tree/main/example) folder.
 
+### PSBT
+  Find example implementations [here](https://github.com/mrtnetwork/bitcoin_base/tree/main/example/lib/psbt)
+
+- BIP-0174: Partially Signed Bitcoin Transaction Format
+- BIP-0370: PSBT Version 2
+- BIP-0371: Taproot Fields for PSBT
+- BIP-0373: MuSig2 PSBT Fields
+
+### MuSig2 (BIP-327):
+  Find example implementations [here](https://github.com/mrtnetwork/bitcoin_base/tree/main/example/lib/musig)
+
+ - Sign/Verify: Supports signing and verifying multisignature transactions using MuSig2
+ - NonceAgg: Aggregates nonces from multiple participants for secure signature generation.
+ - KeyAgg: Combines multiple public keys into a single aggregated public key for efficient multisignature verification
+
+
+
 ### Addresses
 
 - P2PKH A P2PKH (Pay-to-Public-Key-Hash) address in Bitcoin represents ownership of a cryptocurrency wallet by encoding a hashed public key
@@ -80,21 +97,6 @@ Using this package, you can create a Bitcoin transaction in two ways: either thr
   
 - P2SH(SEGWIT): A P2SH (Pay-to-Script-Hash) Segregated Witness (SegWit) address in Bitcoin combines the benefits of P2SH and SegWit technologies, allowing for enhanced transaction security, reduced fees, and improved scalability.
 
-### MuSig2 (BIP-327):
-  Find example implementations [here](https://github.com/mrtnetwork/bitcoin_base/tree/main/example/lib/musig)
-
- - Sign/Verify: Supports signing and verifying multisignature transactions using MuSig2
- - NonceAgg: Aggregates nonces from multiple participants for secure signature generation.
- - KeyAgg: Combines multiple public keys into a single aggregated public key for efficient multisignature verification
-
-### PSBT
-  Find example implementations [here](https://github.com/mrtnetwork/bitcoin_base/tree/main/example/lib/psbt)
-
-- BIP-0174: Partially Signed Bitcoin Transaction Format
-- BIP-0370: PSBT Version 2
-- BIP-0371: Taproot Fields for PSBT
-- BIP-0373: MuSig2 PSBT Fields
-
 ### Addresses specific to Bitcoin Cash
 
 - P2SH32: Pay to Script Hash 32

From 8343c880858cbace38c998284db4c7b595d6bf56 Mon Sep 17 00:00:00 2001
From: Mohsen <mrhaydari.t@gmail.com>
Date: Tue, 25 Mar 2025 20:38:24 +0330
Subject: [PATCH 58/62] remove junks

---
 .../musig/{musig_example_test.dart => musig_example.dart}  | 0
 example/test/methods.dart                                  | 7 +++----
 2 files changed, 3 insertions(+), 4 deletions(-)
 rename example/lib/musig/{musig_example_test.dart => musig_example.dart} (100%)

diff --git a/example/lib/musig/musig_example_test.dart b/example/lib/musig/musig_example.dart
similarity index 100%
rename from example/lib/musig/musig_example_test.dart
rename to example/lib/musig/musig_example.dart
diff --git a/example/test/methods.dart b/example/test/methods.dart
index dae8a97..0419595 100644
--- a/example/test/methods.dart
+++ b/example/test/methods.dart
@@ -15,11 +15,10 @@ Future<ElectrumProvider> getProvider(
 }
 
 Future<void> callBitcoinRpc(String method, [List<dynamic>? params]) async {
-  const rpcUser = 'mohsen';
-  const rpcPassword = 'mohsen';
-  const rpcUrl = 'http://127.0.0.1:48332/'; // Adjust for Testnet/Regtest
+  const rpcUser = 'n';
+  const rpcPassword = 'n';
+  const rpcUrl = 'http://127.0.0.1:48332/';
 
-  // Create the request payload
   final body = StringUtils.fromJson({
     "jsonrpc": "1.0",
     "id": "dart-client",

From 267cd41fed325daded8d4a6449911afe2ee15a91 Mon Sep 17 00:00:00 2001
From: Mohsen <mrhaydari.t@gmail.com>
Date: Fri, 28 Mar 2025 18:32:29 +0330
Subject: [PATCH 59/62] V6.1.0

- Fix der signature validation
---
 .gitignore                                    |   1 +
 CHANGELOG.md                                  |   4 +
 example/pubspec.lock                          |  11 +-
 example/pubspec.yaml                          |   6 +-
 example/test/methods.dart                     | 179 ----------
 example/test/musig_example_test.dart          | 217 ------------
 example/test/psbt_musig2_test.dart            |  77 -----
 example/test/testmusig_test.dart              |  82 -----
 lib/src/bitcoin/address/core.dart             |  21 ++
 lib/src/bitcoin/script/transaction.dart       |   1 +
 lib/src/bitcoin/script/utils.dart             |  46 +--
 lib/src/models/network.dart                   | 159 +++++----
 lib/src/provider/constant/constant.dart       |   2 +
 lib/src/provider/models/config.dart           |  15 +-
 .../models/mempool/mempol_models.dart         |   6 +-
 lib/src/provider/models/multisig_script.dart  |   2 +-
 lib/src/provider/models/utxo_details.dart     |   2 +-
 lib/src/provider/providers/explorer.dart      |  49 ++-
 .../psbt/psbt_builder/core/psbt_builder.dart  |   6 +
 lib/src/psbt/psbt_builder/impl/input.dart     |  10 +-
 lib/src/psbt/psbt_builder/impl/signer.dart    |   1 +
 .../psbt_builder/types/internal_types.dart    |  89 -----
 lib/src/psbt/psbt_builder/types/types.dart    | 308 +++++++++++-------
 lib/src/psbt/signer/signer.dart               |   2 +
 lib/src/psbt/types/types/inputs.dart          |   5 +-
 lib/src/psbt/utils/utils.dart                 |  74 ++++-
 lib/src/utils/btc_utils.dart                  |  22 +-
 pubspec.yaml                                  |   2 +-
 test/deserialize_test.dart                    |  94 ++++++
 .../psbt/builder/psbt_update_output_test.dart |   4 -
 30 files changed, 573 insertions(+), 924 deletions(-)
 delete mode 100644 example/test/methods.dart
 delete mode 100644 example/test/musig_example_test.dart
 delete mode 100644 example/test/psbt_musig2_test.dart
 delete mode 100644 example/test/testmusig_test.dart

diff --git a/.gitignore b/.gitignore
index 7613527..2bfb912 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,4 @@ migrate_working_dir/
 .packages
 build/
 *.zip
+/example/test
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7564311..7012651 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 6.1.0
+
+- Fix der signature validation.
+
 ## 6.0.0
 
 - Added support for BIP-327: MuSig2 for BIP340-compatible multi-signatures
diff --git a/example/pubspec.lock b/example/pubspec.lock
index 197f4ac..b6caa97 100644
--- a/example/pubspec.lock
+++ b/example/pubspec.lock
@@ -15,14 +15,15 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "5.3.0"
+    version: "6.0.0"
   blockchain_utils:
     dependency: "direct main"
     description:
-      path: "../../blockchain_utils"
-      relative: true
-    source: path
-    version: "4.2.0"
+      name: blockchain_utils
+      sha256: "2f0e9bed57e55a0bdb8dfa7471aab41d83c488f7865c0bb8a55ce67b4f87f486"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.3.0"
   boolean_selector:
     dependency: transitive
     description:
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
index 51fad58..30eb12e 100644
--- a/example/pubspec.yaml
+++ b/example/pubspec.yaml
@@ -37,9 +37,9 @@ dependencies:
   cupertino_icons: ^1.0.2
   bitcoin_base: 
     path: ../
-  blockchain_utils:
-    path: ../../../blockchain_utils
-  # blockchain_utils: ^4.2.0
+  # blockchain_utils:
+  #   path: ../../../blockchain_utils
+  blockchain_utils: ^4.3.0
   http: ^1.2.0
 
 dev_dependencies:
diff --git a/example/test/methods.dart b/example/test/methods.dart
deleted file mode 100644
index 0419595..0000000
--- a/example/test/methods.dart
+++ /dev/null
@@ -1,179 +0,0 @@
-// ignore_for_file: avoid_print
-
-import 'package:bitcoin_base/bitcoin_base.dart';
-import 'package:blockchain_utils/utils/binary/utils.dart';
-import 'package:blockchain_utils/utils/string/string.dart';
-import 'package:example/services_examples/electrum/electrum_ssl_service.dart';
-import 'testmusig_test.dart';
-import 'package:http/http.dart' as http;
-
-Future<ElectrumProvider> getProvider(
-    {String url = "testnet4-electrumx.wakiyamap.dev:51002"}) async {
-  final service = await ElectrumSSLService.connect(
-      "testnet4-electrumx.wakiyamap.dev:51002");
-  return ElectrumProvider(service);
-}
-
-Future<void> callBitcoinRpc(String method, [List<dynamic>? params]) async {
-  const rpcUser = 'n';
-  const rpcPassword = 'n';
-  const rpcUrl = 'http://127.0.0.1:48332/';
-
-  final body = StringUtils.fromJson({
-    "jsonrpc": "1.0",
-    "id": "dart-client",
-    "method": method,
-    "params": params ?? []
-  });
-
-  final headers = {
-    'Content-Type': 'application/json',
-    'Authorization':
-        'Basic ${StringUtils.decode(StringUtils.encode('$rpcUser:$rpcPassword'), type: StringEncoding.base64)}'
-  };
-
-  try {
-    final response =
-        await http.post(Uri.parse(rpcUrl), headers: headers, body: body);
-
-    if (response.statusCode == 200) {
-      print(response.body);
-    } else {
-      print('RPC Error: ${response.statusCode} ${response.body}');
-    }
-  } catch (e) {
-    print('Error: $e');
-  }
-}
-
-Future<void> listdescriptors() async {
-  await callBitcoinRpc("listdescriptors", [true]);
-}
-
-Future<void> testMempool(String digest) async {
-  await callBitcoinRpc("testmempoolaccept", [
-    [digest]
-  ]);
-}
-
-Future<void> sendTx(String digest) async {
-  await callBitcoinRpc("sendrawtransaction", [digest]);
-}
-
-class ElectrumUtxoWithTx {
-  final ElectrumUtxo utxo;
-  final BtcTransaction transaction;
-  final BitcoinBaseAddress address;
-  const ElectrumUtxoWithTx(
-      {required this.utxo, required this.transaction, required this.address});
-  factory ElectrumUtxoWithTx.fromJson(Map<String, dynamic> json) {
-    return ElectrumUtxoWithTx(
-        utxo: ElectrumUtxo.fromJson(json["utxo"]),
-        transaction: BtcTransaction.deserialize(
-            BytesUtils.fromHexString(json["transaction"])),
-        address:
-            BitcoinAddress(json["address"], network: BitcoinNetwork.testnet)
-                .baseAddress);
-  }
-
-  Map<String, dynamic> toJson() {
-    return {
-      "utxo": utxo.toJson(),
-      "transaction": transaction.toHex(),
-      "address": address.toAddress(BitcoinNetwork.testnet)
-    };
-  }
-}
-
-class PsbtUtxoRequest {
-  final BitcoinBaseAddress address;
-  final Script? p2shRedeemScript;
-  final Script? witnessScript;
-  final TapLeafMerkleProof? merkleProof;
-  final TaprootTree? treeScript;
-  final TaprootLeaf? leafScript;
-  final List<int>? xOnlyOrInternalPubKey;
-  final List<int>? merkleRoot;
-  final List<TapLeafMerkleProof>? leafScripts;
-  final List<ECPrivate> privateKeys;
-  final List<PsbtInputMuSig2ParticipantPublicKeys>? muSig2ParticipantPublicKeys;
-  final List<PsbtInputRipemd160>? ripemd160;
-  final List<PsbtInputSha256>? sha256;
-  final List<PsbtInputHash160>? hash160;
-  final List<PsbtInputHash256>? hash256;
-  const PsbtUtxoRequest(
-      {required this.address,
-      this.p2shRedeemScript,
-      this.witnessScript,
-      this.leafScript,
-      this.merkleProof,
-      this.treeScript,
-      this.xOnlyOrInternalPubKey,
-      this.merkleRoot,
-      this.leafScripts,
-      this.privateKeys = const [],
-      this.muSig2ParticipantPublicKeys,
-      this.ripemd160,
-      this.hash160,
-      this.hash256,
-      this.sha256});
-}
-
-Future<List<PsbtUtxo>> getPsbtUtxo(
-    {required List<PsbtUtxoRequest> addresses,
-    bool local = true,
-    List<Map<String, dynamic>>? data}) async {
-  final provider = await getProvider();
-
-  final utxos = await Future.wait(addresses.map((e) async {
-    return await provider.request(ElectrumRequestScriptHashListUnspent(
-        scriptHash: e.address.pubKeyHash()));
-  }));
-
-  final utxoss = List.generate(utxos.length, (i) async {
-    final request = addresses[i];
-    final accountUtxos = utxos[i];
-    final er = await Future.wait(accountUtxos
-        .map((e) => provider.request(ElectrumRequestGetRawTransaction(e.txId)))
-        .toList());
-    return List.generate(
-      accountUtxos.length,
-      (index) {
-        final r = PsbtUtxo(
-            utxo: accountUtxos[index].toUtxo(request.address.type),
-            p2shRedeemScript: request.p2shRedeemScript,
-            p2wshWitnessScript: request.witnessScript,
-            tx: er[index],
-            scriptPubKey: request.address.toScriptPubKey(),
-            leafScript: request.leafScript,
-            leafScripts: request.leafScripts,
-            merkleProof: request.merkleProof,
-            treeScript: request.treeScript,
-            merkleRoot: request.merkleRoot,
-            privateKeys: request.privateKeys,
-            xOnlyOrInternalPubKey: request.xOnlyOrInternalPubKey,
-            muSig2ParticipantPublicKeys: request.muSig2ParticipantPublicKeys,
-            hash160: request.hash160,
-            hash256: request.hash256,
-            ripemd160: request.ripemd160,
-            sha256: request.sha256);
-        // final toJs = r.toJson();
-        // toJs["address"] = request.address.toAddress(BitcoinNetwork.testnet);
-        // toJs["select_leaf"] = request.leafScript?.toHex();
-        // toJs.removeWhere((k, v) => v == null);
-        // return toJs;
-        return r;
-      },
-    );
-  });
-  final e = await Future.wait(utxoss);
-  // print(StringUtils.fromJson(utxoss));
-  // // return [];
-  return e.expand((e) => e).toList();
-}
-
-BitcoinBaseAddress getP2pkOutput() {
-  final acc = getKey(path: "m/86'/1'/0'/0/1022");
-  final pk = ECPublic.fromBytes(acc.publicKey.compressed);
-  return pk.toP2pkAddress();
-}
diff --git a/example/test/musig_example_test.dart b/example/test/musig_example_test.dart
deleted file mode 100644
index 96702a0..0000000
--- a/example/test/musig_example_test.dart
+++ /dev/null
@@ -1,217 +0,0 @@
-// ignore_for_file: unused_element
-
-import 'package:bitcoin_base/bitcoin_base.dart';
-import 'package:blockchain_utils/blockchain_utils.dart';
-
-import 'methods.dart';
-
-void main() async {
-  final key = _getPubKey();
-  final key2 = _getPubKey(path: "m/86'/1'/0'/0/2");
-  final key3 = _getPubKey(path: "m/86'/1'/0'/0/3");
-  final signer = Musig2Signer.generate([key, key2, key3]);
-
-  final treeScript = _generateScriptTree();
-  final address = _generateAddress();
-  final input = TxInput(
-      txId: '9bb72872594cb9b7a029f3daf0fe277dfbe5de3d52d4b55ba283cfa97b9310cc',
-      txIndex: 1);
-  final amount = BtcUtils.toSatoshi("0.00500000");
-  final rAmount = BtcUtils.toSatoshi("0.00010000");
-  final fee = BtcUtils.toSatoshi("0.00001");
-  final change = amount - (rAmount + fee);
-  final output = TxOutput(
-      amount: rAmount, scriptPubKey: signer.toAddress().toScriptPubKey());
-  final changeOutput =
-      TxOutput(amount: change, scriptPubKey: address.toScriptPubKey());
-  BtcTransaction transaction =
-      BtcTransaction(inputs: [input], outputs: [output, changeOutput]);
-  transaction = _spendWithKeyPath(
-      transaction: transaction,
-      existsUtxosScriptPubKeys: [address],
-      existsUtxosAmounts: [amount],
-      treeScript: treeScript);
-  await testMempool(transaction.serialize());
-}
-
-BtcTransaction _spendWithKeyPath(
-    {required BtcTransaction transaction,
-    required List<P2trAddress> existsUtxosScriptPubKeys,
-    required List<BigInt> existsUtxosAmounts,
-    required TaprootTree treeScript}) {
-  final key1 = _getPrivateKey(path: "m/86'/1'/0'/0/2");
-  final key2 = _getPrivateKey(path: "m/86'/1'/0'/0/3");
-  final key3 = _getPrivateKey(path: "m/86'/1'/0'/0/4");
-  final pk1 = key1.getPublic();
-  final pk2 = key2.getPublic();
-  final pk3 = key3.getPublic();
-  final signer =
-      Musig2Signer.generate([pk1, pk2, pk3], privateKeys: [key1, key2, key3]);
-  final digest = transaction
-      .getTransactionTaprootDigset(
-          txIndex: 0,
-          scriptPubKeys:
-              existsUtxosScriptPubKeys.map((e) => e.toScriptPubKey()).toList(),
-          amounts: existsUtxosAmounts)
-      .asImmutableBytes;
-
-  final signature = signer.fullSign(digest, treeScript: treeScript);
-  return transaction.copyWith(witnesses: [
-    TxWitnessInput(stack: [BytesUtils.toHexString(signature)])
-  ]);
-}
-
-BtcTransaction _spendWithLeafA(
-    {required BtcTransaction transaction,
-    required List<P2trAddress> existsUtxosScriptPubKeys,
-    required List<BigInt> existsUtxosAmounts,
-    required TaprootTree treeScript}) {
-  final internalKey = _getInternalPubKey();
-  final key1 = _getPrivateKey(path: "m/86'/1'/0'/0/2");
-  final key3 = _getPrivateKey(path: "m/86'/1'/0'/0/4");
-  final pk1 = key1.getPublic();
-  final pk3 = key3.getPublic();
-  final musigSigner = MuSig2.aggPublicKeys(
-      keys: [pk1.publicKey.compressed, pk3.publicKey.compressed]);
-  final tapleafScript1 = TaprootLeaf(
-      script: Script(script: [
-    BytesUtils.toHexString(musigSigner.publicKey.toXonly()),
-    BitcoinOpcode.opCheckSig
-  ]));
-  final digest = transaction
-      .getTransactionTaprootDigset(
-          txIndex: 0,
-          tapleafScript: tapleafScript1,
-          scriptPubKeys:
-              existsUtxosScriptPubKeys.map((e) => e.toScriptPubKey()).toList(),
-          amounts: existsUtxosAmounts)
-      .asImmutableBytes;
-  final nonce1 = MuSig2.nonceGenerate(
-      publicKey: pk1.toBytes(mode: PubKeyModes.compressed), msg: digest);
-  final nonce3 = MuSig2.nonceGenerate(
-      publicKey: pk3.toBytes(mode: PubKeyModes.compressed), msg: digest);
-  final aggNonce = MuSig2.nonceAgg([nonce1.pubnonce, nonce3.pubnonce]);
-  final session = MuSig2Session(
-      aggnonce: aggNonce,
-      publicKeys: [
-        pk1.toBytes(mode: PubKeyModes.compressed),
-        pk3.toBytes(mode: PubKeyModes.compressed)
-      ],
-      tweaks: [],
-      msg: digest);
-  final sig1 = MuSig2.sign(
-      secnonce: nonce1.secnonce, sk: key1.toBytes(), session: session);
-  final sig3 = MuSig2.sign(
-      secnonce: nonce3.secnonce, sk: key3.toBytes(), session: session);
-  final signature =
-      MuSig2.partialSigAgg(signatures: [sig1, sig3], session: session);
-  final controlBlock = TaprootControlBlock.generate(
-      xOnlyOrInternalPubKey: internalKey.toXOnly(),
-      leafScript: tapleafScript1,
-      scriptTree: treeScript);
-
-  return transaction.copyWith(witnesses: [
-    TxWitnessInput(stack: [
-      BytesUtils.toHexString(signature),
-      tapleafScript1.script.toHex(),
-      controlBlock.toHex()
-    ])
-  ]);
-}
-
-BtcTransaction _spendWithLeafC(
-    {required BtcTransaction transaction,
-    required List<P2trAddress> existsUtxosScriptPubKeys,
-    required List<BigInt> existsUtxosAmounts,
-    required TaprootTree treeScript}) {
-  final internalKey = _getInternalPubKey();
-  final key2 = _getPrivateKey(path: "m/86'/1'/0'/0/3");
-  final key1 = _getPrivateKey(path: "m/86'/1'/0'/0/2");
-  final pk1 = key1.getPublic();
-  final pk2 = key2.getPublic();
-  final leafC = TaprootLeaf(
-      script: Script(script: [
-    pk1.toXOnlyHex(),
-    BitcoinOpcode.opCheckSig,
-    pk2.toXOnlyHex(),
-    BitcoinOpcode.opCheckSigAdd,
-    2,
-    BitcoinOpcode.opNumEqual
-  ]));
-  final digest = transaction
-      .getTransactionTaprootDigset(
-          txIndex: 0,
-          tapleafScript: leafC,
-          scriptPubKeys:
-              existsUtxosScriptPubKeys.map((e) => e.toScriptPubKey()).toList(),
-          amounts: existsUtxosAmounts)
-      .asImmutableBytes;
-  final sig1 = key1.signTapRoot(digest, tweak: false);
-  final sig2 = key2.signTapRoot(digest, tweak: false);
-  final controlBlock = TaprootControlBlock.generate(
-      xOnlyOrInternalPubKey: internalKey.toXOnly(),
-      leafScript: leafC,
-      scriptTree: treeScript);
-
-  return transaction.copyWith(witnesses: [
-    TxWitnessInput(
-        stack: [sig2, sig1, leafC.script.toHex(), controlBlock.toHex()])
-  ]);
-}
-
-Bip32Slip10Secp256k1 _deriveKey(
-    {String key =
-        "tprv8ZgxMBicQKsPdgBQV2Y9EVPSjAGhyZXArhwSzHwnV3FytzPRr8KCR8EKEpLeHbANAncgbc31a6QoXjBTARQiZ2h1Z2NgSCjFYeTqKpAN5Gc",
-    String path = "m/86'/1'/0'/0/1"}) {
-  Bip32Slip10Secp256k1 secp = Bip32Slip10Secp256k1.fromExtendedKey(
-      key, Bip44Coins.bitcoinTestnet.conf.keyNetVer);
-  return secp.derivePath(path) as Bip32Slip10Secp256k1;
-}
-
-ECPublic _getPubKey({String path = "m/86'/1'/0'/0/1"}) {
-  return ECPublic.fromBytes(_deriveKey(path: path).publicKey.compressed);
-}
-
-ECPrivate _getPrivateKey({String path = "m/86'/1'/0'/0/1"}) {
-  return ECPrivate.fromBytes(_deriveKey(path: path).privateKey.raw);
-}
-
-TaprootBranch _generateScriptTree() {
-  final pk1 = _getPubKey(path: "m/86'/1'/0'/0/2");
-  final pk2 = _getPubKey(path: "m/86'/1'/0'/0/3");
-  final pk3 = _getPubKey(path: "m/86'/1'/0'/0/4");
-  final musigSigner = Musig2Signer.generate([pk1, pk3]);
-  final leaf1 = TaprootLeaf(
-      script: Script(script: [
-    BytesUtils.toHexString(musigSigner.aggPublicKey.toXOnly()),
-    BitcoinOpcode.opCheckSig
-  ]));
-  final leaf2 = TaprootLeaf(
-      script: Script(script: [pk3.toXOnlyHex(), BitcoinOpcode.opCheckSig]));
-
-  final leaf3 = TaprootLeaf(
-      script: Script(script: [
-    pk1.toXOnlyHex(),
-    BitcoinOpcode.opCheckSig,
-    pk2.toXOnlyHex(),
-    BitcoinOpcode.opCheckSigAdd,
-    2,
-    BitcoinOpcode.opNumEqual
-  ]));
-  return TaprootBranch(a: leaf3, b: TaprootBranch(a: leaf1, b: leaf2));
-}
-
-ECPublic _getInternalPubKey() {
-  final pk1 = _getPubKey(path: "m/86'/1'/0'/0/2");
-  final pk2 = _getPubKey(path: "m/86'/1'/0'/0/3");
-  final pk3 = _getPubKey(path: "m/86'/1'/0'/0/4");
-  final internalKey = Musig2Signer.generate([pk1, pk2, pk3]);
-
-  return internalKey.aggPublicKey;
-}
-
-P2trAddress _generateAddress() {
-  final internalKey = _getInternalPubKey();
-  return P2trAddress.fromInternalKey(
-      internalKey: internalKey.toXOnly(), treeScript: _generateScriptTree());
-}
diff --git a/example/test/psbt_musig2_test.dart b/example/test/psbt_musig2_test.dart
deleted file mode 100644
index f19b4fc..0000000
--- a/example/test/psbt_musig2_test.dart
+++ /dev/null
@@ -1,77 +0,0 @@
-import 'package:bitcoin_base/bitcoin_base.dart';
-import 'testmusig_test.dart';
-import 'methods.dart';
-
-ECPrivate getAccoutPrivateKey({String path = "m/86'/1'/0'/0/1"}) {
-  final key = getKey(path: path);
-  return ECPrivate.fromBytes(key.privateKey.raw);
-}
-
-void main() async {
-  final key = getAccoutPrivateKey();
-  final key2 = getAccoutPrivateKey(path: "m/86'/1'/0'/0/2");
-  final key3 = getAccoutPrivateKey(path: "m/86'/1'/0'/0/3");
-
-  /// 73609a5081514d4cb92190636db8a40ead4b12d6000d2e839b92f2cc3cfb3b92cda58dfd722201c41329322d94457938a15207660f8701322631583769803165
-  final aggpk = Musig2Signer.generate(
-      [key.getPublic(), key2.getPublic(), key3.getPublic()]);
-  final address =
-      P2trAddress.fromInternalKey(internalKey: aggpk.aggPublicKey.toXOnly());
-  final utxo = await getPsbtUtxo(addresses: [
-    PsbtUtxoRequest(
-        address: address,
-        xOnlyOrInternalPubKey: aggpk.aggPublicKey.toXOnly(),
-        muSig2ParticipantPublicKeys: [
-          PsbtInputMuSig2ParticipantPublicKeys(
-              aggregatePubKey: aggpk.aggPublicKey, pubKeys: aggpk.publicKeys)
-        ])
-  ]);
-  final psbt = PsbtBuilderV0.create();
-  psbt.addUtxos(utxo);
-  psbt.addOutput(PsbtTransactionOutput(
-      amount: BtcUtils.toSatoshi('0.00001'), address: address));
-  for (int i = 0; i < utxo.length; i++) {
-    final noncePub1 = aggpk.generateNonce(key.getPublic());
-    final noncePub2 = aggpk.generateNonce(key2.getPublic());
-    final noncePub3 = aggpk.generateNonce(key3.getPublic());
-    psbt.musig2AddPubKeyNonce(
-        i,
-        PsbtInputMuSig2PublicNonce(
-            publicKey: key.getPublic(),
-            plainPublicKey: aggpk.aggPublicKey,
-            publicNonce: noncePub1.pubnonce));
-    psbt.musig2AddPubKeyNonce(
-        i,
-        PsbtInputMuSig2PublicNonce(
-            publicKey: key2.getPublic(),
-            plainPublicKey: aggpk.aggPublicKey,
-            publicNonce: noncePub2.pubnonce));
-    psbt.musig2AddPubKeyNonce(
-        i,
-        PsbtInputMuSig2PublicNonce(
-            publicKey: key3.getPublic(),
-            plainPublicKey: aggpk.aggPublicKey,
-            publicNonce: noncePub3.pubnonce));
-    psbt.signInput(
-        signer: (p0) => PsbtSignerResponse(signers: [
-              PsbtMusig2DefaultSigner(
-                  privateKey: key,
-                  aggPublicKey: aggpk.aggPublicKey,
-                  publicKeys: aggpk.publicKeys,
-                  nonce: noncePub1),
-              PsbtMusig2DefaultSigner(
-                  privateKey: key2,
-                  aggPublicKey: aggpk.aggPublicKey,
-                  publicKeys: aggpk.publicKeys,
-                  nonce: noncePub2),
-              PsbtMusig2DefaultSigner(
-                  privateKey: key3,
-                  aggPublicKey: aggpk.aggPublicKey,
-                  publicKeys: aggpk.publicKeys,
-                  nonce: noncePub3),
-            ]),
-        index: i);
-  }
-  final tx = psbt.finalizeAll();
-  await testMempool(tx.serialize());
-}
diff --git a/example/test/testmusig_test.dart b/example/test/testmusig_test.dart
deleted file mode 100644
index c70456d..0000000
--- a/example/test/testmusig_test.dart
+++ /dev/null
@@ -1,82 +0,0 @@
-import 'package:bitcoin_base/bitcoin_base.dart';
-import 'package:blockchain_utils/blockchain_utils.dart';
-
-import 'methods.dart';
-
-/// "m/86'/1'/0'/0/1034"
-Bip32Slip10Secp256k1 getKey(
-    {String key =
-        "tprv8ZgxMBicQKsPdgBQV2Y9EVPSjAGhyZXArhwSzHwnV3FytzPRr8KCR8EKEpLeHbANAncgbc31a6QoXjBTARQiZ2h1Z2NgSCjFYeTqKpAN5Gc",
-    String path = "m/86'/1'/0'/0/1"}) {
-  Bip32Slip10Secp256k1 secp = Bip32Slip10Secp256k1.fromExtendedKey(
-      key, Bip44Coins.bitcoinTestnet.conf.keyNetVer);
-  return secp.derivePath(path) as Bip32Slip10Secp256k1;
-}
-
-void main() async {
-  final key = getKey();
-  final key2 = getKey(path: "m/86'/1'/0'/0/2");
-  final key3 = getKey(path: "m/86'/1'/0'/0/3");
-
-  final aggpk = MuSig2.aggPublicKeys(keys: [
-    key.publicKey.compressed,
-    key2.publicKey.compressed,
-    key3.publicKey.compressed
-  ]);
-
-  final pk = ECPublic.fromBytes(aggpk.toBytes());
-  final tweakPubKey = TaprootUtils.calculateTweek(aggpk.publicKey.toXonly());
-  final address =
-      P2trAddress.fromInternalKey(internalKey: aggpk.publicKey.toBytes());
-  // print(address.toAddress(BitcoinNetwork.testnet));
-  // return;
-  final input = TxInput(
-      txId: '7af6690448027f9a6ba99eb1b2c9f56a604d5d497e4135f65387a9a5aae39cb6',
-      txIndex: 1);
-  final amount = BtcUtils.toSatoshi("0.00500000");
-  final rAmount = BtcUtils.toSatoshi("0.00010000");
-  final fee =
-      (BigRational.from(500) * BigRational.parseDecimal("1.1")).toBigInt();
-  final change = amount - (rAmount + fee);
-  assert(!change.isNegative);
-  final output =
-      TxOutput(amount: rAmount, scriptPubKey: pk.toAddress().toScriptPubKey());
-  final changeOutput =
-      TxOutput(amount: change, scriptPubKey: address.toScriptPubKey());
-  BtcTransaction tx =
-      BtcTransaction(inputs: [input], outputs: [output, changeOutput]);
-  final digest = tx.getTransactionTaprootDigset(
-    txIndex: 0,
-    scriptPubKeys: [address.toScriptPubKey()],
-    amounts: [amount],
-  ).asImmutableBytes;
-  final nonce1 =
-      MuSig2.nonceGenerate(publicKey: key.publicKey.compressed, msg: digest);
-  final nonce2 =
-      MuSig2.nonceGenerate(publicKey: key2.publicKey.compressed, msg: digest);
-  final nonce3 =
-      MuSig2.nonceGenerate(publicKey: key3.publicKey.compressed, msg: digest);
-  final aggNonce =
-      MuSig2.nonceAgg([nonce1.pubnonce, nonce2.pubnonce, nonce3.pubnonce]);
-  final session = MuSig2Session(
-      aggnonce: aggNonce,
-      publicKeys: [
-        key.publicKey.compressed,
-        key2.publicKey.compressed,
-        key3.publicKey.compressed
-      ],
-      tweaks: [MuSig2Tweak(tweak: tweakPubKey)],
-      msg: digest);
-  final sig1 = MuSig2.sign(
-      secnonce: nonce1.secnonce, sk: key.privateKey.raw, session: session);
-  final sig2 = MuSig2.sign(
-      secnonce: nonce2.secnonce, sk: key2.privateKey.raw, session: session);
-  final sig3 = MuSig2.sign(
-      secnonce: nonce3.secnonce, sk: key3.privateKey.raw, session: session);
-  final signature =
-      MuSig2.partialSigAgg(signatures: [sig1, sig2, sig3], session: session);
-  tx = tx.copyWith(witnesses: [
-    TxWitnessInput(stack: [BytesUtils.toHexString(signature)])
-  ]);
-  await testMempool(tx.serialize());
-}
diff --git a/lib/src/bitcoin/address/core.dart b/lib/src/bitcoin/address/core.dart
index 93f2703..72b3231 100644
--- a/lib/src/bitcoin/address/core.dart
+++ b/lib/src/bitcoin/address/core.dart
@@ -54,6 +54,27 @@ abstract class BitcoinAddressType implements Enumerate {
 }
 
 abstract class BitcoinBaseAddress {
+  const BitcoinBaseAddress();
+  factory BitcoinBaseAddress.fromProgram(
+      {required String addressProgram, required BitcoinAddressType type}) {
+    if (type.isP2sh) {
+      return P2shAddress.fromHash160(
+          addrHash: addressProgram, type: type.cast());
+    }
+    return switch (type) {
+      PubKeyAddressType.p2pk => P2pkAddress(publicKey: addressProgram),
+      P2pkhAddressType.p2pkh ||
+      P2pkhAddressType.p2pkhwt =>
+        P2pkhAddress.fromHash160(addrHash: addressProgram, type: type.cast()),
+      SegwitAddressType.p2wpkh =>
+        P2wpkhAddress.fromProgram(program: addressProgram),
+      SegwitAddressType.p2wsh =>
+        P2wshAddress.fromProgram(program: addressProgram),
+      SegwitAddressType.p2tr =>
+        P2trAddress.fromProgram(program: addressProgram),
+      _ => throw DartBitcoinPluginException("Unsuported bitcoin address type."),
+    };
+  }
   BitcoinAddressType get type;
   String toAddress(BasedUtxoNetwork network);
   Script toScriptPubKey();
diff --git a/lib/src/bitcoin/script/transaction.dart b/lib/src/bitcoin/script/transaction.dart
index d889868..849e8de 100644
--- a/lib/src/bitcoin/script/transaction.dart
+++ b/lib/src/bitcoin/script/transaction.dart
@@ -215,6 +215,7 @@ class BtcTransaction {
     for (final txIn in inputs) {
       data.add(txIn.toBytes());
     }
+
     data.add(txOutCountBytes);
     for (final txOut in outputs) {
       data.add(txOut.toBytes());
diff --git a/lib/src/bitcoin/script/utils.dart b/lib/src/bitcoin/script/utils.dart
index 72f6ca6..19c673b 100644
--- a/lib/src/bitcoin/script/utils.dart
+++ b/lib/src/bitcoin/script/utils.dart
@@ -315,31 +315,37 @@ class BitcoinScriptUtils {
     }
   }
 
-  static BitcoinBaseAddress findAddressFromScriptPubKey(Script script) {
+  static BitcoinBaseAddress generateAddressFromScriptPubKey(Script script) {
+    BitcoinBaseAddress? address;
     if (BitcoinScriptUtils.isP2wpkh(script)) {
-      return P2wpkhAddress.fromProgram(program: script.script[1]);
-    }
-    if (BitcoinScriptUtils.isP2pkh(script)) {
-      return P2pkhAddress.fromHash160(addrHash: script.script[2]);
-    }
-    if (BitcoinScriptUtils.isP2pk(script)) {
-      return P2pkAddress(publicKey: script.script[0]);
-    }
-    if (BitcoinScriptUtils.isP2sh(script)) {
-      return P2shAddress.fromHash160(addrHash: script.script[1]);
-    }
-    if (BitcoinScriptUtils.isP2sh32(script)) {
-      return P2shAddress.fromHash160(
+      address = P2wpkhAddress.fromProgram(program: script.script[1]);
+    } else if (BitcoinScriptUtils.isP2pkh(script)) {
+      address = P2pkhAddress.fromHash160(addrHash: script.script[2]);
+    } else if (BitcoinScriptUtils.isP2pk(script)) {
+      address = P2pkAddress(publicKey: script.script[0]);
+    } else if (BitcoinScriptUtils.isP2sh(script)) {
+      address = P2shAddress.fromHash160(addrHash: script.script[1]);
+    } else if (BitcoinScriptUtils.isP2sh32(script)) {
+      address = P2shAddress.fromHash160(
           addrHash: script.script[1], type: P2shAddressType.p2pkInP2sh32);
+    } else if (BitcoinScriptUtils.isP2wsh(script)) {
+      address = P2wshAddress.fromProgram(program: script.script[1]);
+    } else if (BitcoinScriptUtils.isP2tr(script)) {
+      address = P2trAddress.fromProgram(program: script.script[1]);
     }
-    if (BitcoinScriptUtils.isP2wsh(script)) {
-      return P2wshAddress.fromProgram(program: script.script[1]);
+    if (address == null || address.toScriptPubKey() != script) {
+      throw DartBitcoinPluginException(
+          "Unknown scriptPubKey: Unable to generate a valid address.");
     }
-    if (BitcoinScriptUtils.isP2tr(script)) {
-      return P2trAddress.fromProgram(program: script.script[1]);
+    return address;
+  }
+
+  static BitcoinBaseAddress? tryGenerateAddressFromScriptPubKey(Script script) {
+    try {
+      return generateAddressFromScriptPubKey(script);
+    } catch (_) {
+      return null;
     }
-    throw DartBitcoinPluginException(
-        "Unable to create address. Unknow scriptPubKey ${script.script}");
   }
 
   static List<int> opPushData(List<int> dataBytes) {
diff --git a/lib/src/models/network.dart b/lib/src/models/network.dart
index 9b04633..4a863cf 100644
--- a/lib/src/models/network.dart
+++ b/lib/src/models/network.dart
@@ -21,7 +21,7 @@ abstract class BasedUtxoNetwork implements Enumerate {
   abstract final CoinConf conf;
 
   abstract final List<BitcoinAddressType> supportedAddress;
-
+  String get identifier;
   @override
   bool operator ==(other) {
     if (identical(other, this)) return true;
@@ -36,6 +36,7 @@ abstract class BasedUtxoNetwork implements Enumerate {
   static List<BasedUtxoNetwork> values = const [
     BitcoinNetwork.mainnet,
     BitcoinNetwork.testnet,
+    BitcoinNetwork.testnet4,
     LitecoinNetwork.mainnet,
     LitecoinNetwork.testnet,
     DashNetwork.mainnet,
@@ -52,7 +53,9 @@ abstract class BasedUtxoNetwork implements Enumerate {
   ];
 
   static BasedUtxoNetwork fromName(String name) {
-    return values.firstWhere((element) => element.value == name);
+    return values.firstWhere((element) => element.value == name,
+        orElse: () => throw DartBitcoinPluginException(
+            "No matching network found for the given name."));
   }
 
   List<BipCoins> get coins;
@@ -64,12 +67,12 @@ abstract class BasedUtxoNetwork implements Enumerate {
 /// Class representing a Bitcoin network, implementing the `BasedUtxoNetwork` abstract class.
 class BitcoinSVNetwork implements BasedUtxoNetwork {
   /// Mainnet configuration with associated `CoinConf`.
-  static const BitcoinSVNetwork mainnet =
-      BitcoinSVNetwork._('BitcoinSVMainnet', CoinsConf.bitcoinSvMainNet);
+  static const BitcoinSVNetwork mainnet = BitcoinSVNetwork._(
+      'BitcoinSVMainnet', CoinsConf.bitcoinSvMainNet, 'bitcoinsv:mainnet');
 
   /// Testnet configuration with associated `CoinConf`.
-  static const BitcoinSVNetwork testnet =
-      BitcoinSVNetwork._('BitcoinSVTestnet', CoinsConf.bitcoinSvTestNet);
+  static const BitcoinSVNetwork testnet = BitcoinSVNetwork._(
+      'BitcoinSVTestnet', CoinsConf.bitcoinSvTestNet, 'bitcoinsv:testnet');
 
   /// Overrides the `conf` property from `BasedUtxoNetwork` with the associated `CoinConf`.
   @override
@@ -79,7 +82,7 @@ class BitcoinSVNetwork implements BasedUtxoNetwork {
   final String value;
 
   /// Constructor for creating a Bitcoin network with a specific configuration.
-  const BitcoinSVNetwork._(this.value, this.conf);
+  const BitcoinSVNetwork._(this.value, this.conf, this.identifier);
 
   /// Retrieves the Wallet Import Format (WIF) version bytes from the associated `CoinConf`.
   @override
@@ -111,17 +114,24 @@ class BitcoinSVNetwork implements BasedUtxoNetwork {
     if (isMainnet) return [Bip44Coins.bitcoinSv];
     return [Bip44Coins.bitcoinSvTestnet];
   }
+
+  @override
+  final String identifier;
 }
 
 /// Class representing a Bitcoin network, implementing the `BasedUtxoNetwork` abstract class.
 class BitcoinNetwork implements BasedUtxoNetwork {
   /// Mainnet configuration with associated `CoinConf`.
-  static const BitcoinNetwork mainnet =
-      BitcoinNetwork._('bitcoinMainnet', CoinsConf.bitcoinMainNet);
+  static const BitcoinNetwork mainnet = BitcoinNetwork._(
+      'bitcoinMainnet', CoinsConf.bitcoinMainNet, 'bitcoin:mainnet');
 
   /// Testnet configuration with associated `CoinConf`.
-  static const BitcoinNetwork testnet =
-      BitcoinNetwork._('bitcoinTestnet', CoinsConf.bitcoinTestNet);
+  static const BitcoinNetwork testnet = BitcoinNetwork._(
+      'bitcoinTestnet', CoinsConf.bitcoinTestNet, 'bitcoin:testnet');
+
+  /// Testnet4 configuration with associated `CoinConf`.
+  static const BitcoinNetwork testnet4 = BitcoinNetwork._(
+      'bitcoinTestnet4', CoinsConf.bitcoinTestNet, 'bitcoin:testnet4');
 
   /// Overrides the `conf` property from `BasedUtxoNetwork` with the associated `CoinConf`.
   @override
@@ -131,7 +141,7 @@ class BitcoinNetwork implements BasedUtxoNetwork {
   final String value;
 
   /// Constructor for creating a Bitcoin network with a specific configuration.
-  const BitcoinNetwork._(this.value, this.conf);
+  const BitcoinNetwork._(this.value, this.conf, this.identifier);
 
   /// Retrieves the Wallet Import Format (WIF) version bytes from the associated `CoinConf`.
   @override
@@ -184,17 +194,20 @@ class BitcoinNetwork implements BasedUtxoNetwork {
       Bip86Coins.bitcoinTestnet,
     ];
   }
+
+  @override
+  final String identifier;
 }
 
 /// Class representing a Litecoin network, implementing the `BasedUtxoNetwork` abstract class.
 class LitecoinNetwork implements BasedUtxoNetwork {
   /// Mainnet configuration with associated `CoinConf`.
-  static const LitecoinNetwork mainnet =
-      LitecoinNetwork._('litecoinMainnet', CoinsConf.litecoinMainNet);
+  static const LitecoinNetwork mainnet = LitecoinNetwork._(
+      'litecoinMainnet', CoinsConf.litecoinMainNet, 'litecoin:mainnet');
 
   /// Testnet configuration with associated `CoinConf`.
-  static const LitecoinNetwork testnet =
-      LitecoinNetwork._('litecoinTestnet', CoinsConf.litecoinTestNet);
+  static const LitecoinNetwork testnet = LitecoinNetwork._(
+      'litecoinTestnet', CoinsConf.litecoinTestNet, 'litecoin:testnet');
 
   /// Overrides the `conf` property from `BasedUtxoNetwork` with the associated `CoinConf`.
   @override
@@ -203,7 +216,7 @@ class LitecoinNetwork implements BasedUtxoNetwork {
   final String value;
 
   /// Constructor for creating a Litecoin network with a specific configuration.
-  const LitecoinNetwork._(this.value, this.conf);
+  const LitecoinNetwork._(this.value, this.conf, this.identifier);
 
   /// Retrieves the Wallet Import Format (WIF) version bytes from the associated `CoinConf`.
   @override
@@ -249,24 +262,27 @@ class LitecoinNetwork implements BasedUtxoNetwork {
       Bip84Coins.litecoinTestnet
     ];
   }
+
+  @override
+  final String identifier;
 }
 
 /// Class representing a Dash network, implementing the `BasedUtxoNetwork` abstract class.
 class DashNetwork implements BasedUtxoNetwork {
   /// Mainnet configuration with associated `CoinConf`.
   static const DashNetwork mainnet =
-      DashNetwork._('dashMainnet', CoinsConf.dashMainNet);
+      DashNetwork._('dashMainnet', CoinsConf.dashMainNet, 'dash:mainnet');
 
   /// Testnet configuration with associated `CoinConf`.
   static const DashNetwork testnet =
-      DashNetwork._('dashTestnet', CoinsConf.dashTestNet);
+      DashNetwork._('dashTestnet', CoinsConf.dashTestNet, 'dash:testnet');
 
   /// Overrides the `conf` property from `BasedUtxoNetwork` with the associated `CoinConf`.
   @override
   final CoinConf conf;
 
   /// Constructor for creating a Dash network with a specific configuration.
-  const DashNetwork._(this.value, this.conf);
+  const DashNetwork._(this.value, this.conf, this.identifier);
 
   /// Retrieves the Wallet Import Format (WIF) version bytes from the associated `CoinConf`.
   @override
@@ -305,24 +321,27 @@ class DashNetwork implements BasedUtxoNetwork {
     if (isMainnet) return [Bip44Coins.dash, Bip49Coins.dash];
     return [Bip44Coins.dashTestnet, Bip49Coins.dashTestnet];
   }
+
+  @override
+  final String identifier;
 }
 
 /// Class representing a Dogecoin network, implementing the `BasedUtxoNetwork` abstract class.
 class DogecoinNetwork implements BasedUtxoNetwork {
   /// Mainnet configuration with associated `CoinConf`.
-  static const DogecoinNetwork mainnet =
-      DogecoinNetwork._('dogeMainnet', CoinsConf.dogecoinMainNet);
+  static const DogecoinNetwork mainnet = DogecoinNetwork._(
+      'dogeMainnet', CoinsConf.dogecoinMainNet, 'dogecoin:mainnet');
 
   /// Testnet configuration with associated `CoinConf`.
-  static const DogecoinNetwork testnet =
-      DogecoinNetwork._('dogeTestnet', CoinsConf.dogecoinTestNet);
+  static const DogecoinNetwork testnet = DogecoinNetwork._(
+      'dogeTestnet', CoinsConf.dogecoinTestNet, 'dogecoin:testnet');
 
   /// Overrides the `conf` property from `BasedUtxoNetwork` with the associated `CoinConf`.
   @override
   final CoinConf conf;
 
   /// Constructor for creating a Dogecoin network with a specific configuration.
-  const DogecoinNetwork._(this.value, this.conf);
+  const DogecoinNetwork._(this.value, this.conf, this.identifier);
 
   @override
   final String value;
@@ -361,24 +380,31 @@ class DogecoinNetwork implements BasedUtxoNetwork {
     if (isMainnet) return [Bip44Coins.dogecoin, Bip49Coins.dogecoin];
     return [Bip44Coins.dogecoinTestnet, Bip49Coins.dogecoinTestnet];
   }
+
+  @override
+  final String identifier;
 }
 
 /// Class representing a Bitcoin Cash network, implementing the `BasedUtxoNetwork` abstract class.
 class BitcoinCashNetwork implements BasedUtxoNetwork {
   /// Mainnet configuration with associated `CoinConf`.
-  static const BitcoinCashNetwork mainnet =
-      BitcoinCashNetwork._('bitcoinCashMainnet', CoinsConf.bitcoinCashMainNet);
+  static const BitcoinCashNetwork mainnet = BitcoinCashNetwork._(
+      'bitcoinCashMainnet',
+      CoinsConf.bitcoinCashMainNet,
+      'bitcoincash:mainnet');
 
   /// Testnet configuration with associated `CoinConf`.
-  static const BitcoinCashNetwork testnet =
-      BitcoinCashNetwork._('bitcoinCashTestnet', CoinsConf.bitcoinCashTestNet);
+  static const BitcoinCashNetwork testnet = BitcoinCashNetwork._(
+      'bitcoinCashTestnet',
+      CoinsConf.bitcoinCashTestNet,
+      'bitcoincash:testnet');
 
   /// Overrides the `conf` property from `BasedUtxoNetwork` with the associated `CoinConf`.
   @override
   final CoinConf conf;
 
   /// Constructor for creating a Bitcoin Cash network with a specific configuration.
-  const BitcoinCashNetwork._(this.value, this.conf);
+  const BitcoinCashNetwork._(this.value, this.conf, this.identifier);
   @override
   final String value;
 
@@ -438,20 +464,23 @@ class BitcoinCashNetwork implements BasedUtxoNetwork {
     if (isMainnet) return [Bip44Coins.bitcoinCash, Bip49Coins.bitcoinCash];
     return [Bip44Coins.bitcoinCashTestnet, Bip49Coins.bitcoinCashTestnet];
   }
+
+  @override
+  final String identifier;
 }
 
 /// Class representing a Dogecoin network, implementing the `BasedUtxoNetwork` abstract class.
 class PepeNetwork implements BasedUtxoNetwork {
   /// Mainnet configuration with associated `CoinConf`.
-  static const PepeNetwork mainnet =
-      PepeNetwork._('pepecoinMainnet', CoinsConf.pepeMainnet);
+  static const PepeNetwork mainnet = PepeNetwork._(
+      'pepecoinMainnet', CoinsConf.pepeMainnet, 'pepecoin:mainnet');
 
   /// Overrides the `conf` property from `BasedUtxoNetwork` with the associated `CoinConf`.
   @override
   final CoinConf conf;
 
   /// Constructor for creating a Dogecoin network with a specific configuration.
-  const PepeNetwork._(this.value, this.conf);
+  const PepeNetwork._(this.value, this.conf, this.identifier);
 
   @override
   final String value;
@@ -492,17 +521,24 @@ class PepeNetwork implements BasedUtxoNetwork {
     }
     return [Bip44Coins.pepecoinTestnet, Bip49Coins.pepecoinTestnet];
   }
+
+  @override
+  final String identifier;
 }
 
 /// Class representing a Electra Protocol network, implementing the `BasedUtxoNetwork` abstract class.
 class ElectraProtocolNetwork implements BasedUtxoNetwork {
   /// Mainnet configuration with associated `CoinConf`.
   static const ElectraProtocolNetwork mainnet = ElectraProtocolNetwork._(
-      'electraProtocolMainnet', CoinsConf.electraProtocolMainNet);
+      'electraProtocolMainnet',
+      CoinsConf.electraProtocolMainNet,
+      'electra:mainnet');
 
   /// Testnet configuration with associated `CoinConf`.
   static const ElectraProtocolNetwork testnet = ElectraProtocolNetwork._(
-      'electraProtocolTestnet', CoinsConf.electraProtocolTestNet);
+      'electraProtocolTestnet',
+      CoinsConf.electraProtocolTestNet,
+      'electra:testnet');
 
   /// Overrides the `conf` property from `BasedUtxoNetwork` with the associated `CoinConf`.
   @override
@@ -511,7 +547,7 @@ class ElectraProtocolNetwork implements BasedUtxoNetwork {
   final String value;
 
   /// Constructor for creating a Electra Protocol network with a specific configuration.
-  const ElectraProtocolNetwork._(this.value, this.conf);
+  const ElectraProtocolNetwork._(this.value, this.conf, this.identifier);
 
   /// Retrieves the Wallet Import Format (WIF) version bytes from the associated `CoinConf`.
   @override
@@ -561,56 +597,7 @@ class ElectraProtocolNetwork implements BasedUtxoNetwork {
       Bip84Coins.electraProtocolTestnet
     ];
   }
-}
-
-/// Class representing a Dogecoin network, implementing the `BasedUtxoNetwork` abstract class.
-class BonkcoinNetwork implements BasedUtxoNetwork {
-  /// Mainnet configuration with associated `CoinConf`.
-  static const BonkcoinNetwork mainnet =
-      BonkcoinNetwork._('bonkcoinMainnet', CoinsConf.dogecoinMainNet);
 
-  /// Overrides the `conf` property from `BasedUtxoNetwork` with the associated `CoinConf`.
-  @override
-  final CoinConf conf;
-
-  /// Constructor for creating a Dogecoin network with a specific configuration.
-  const BonkcoinNetwork._(this.value, this.conf);
-
-  @override
-  final String value;
-
-  /// Retrieves the Wallet Import Format (WIF) version bytes from the associated `CoinConf`.
   @override
-  List<int> get wifNetVer => conf.params.wifNetVer!;
-
-  /// Retrieves the Pay-to-Public-Key-Hash (P2PKH) version bytes from the associated `CoinConf`.
-  @override
-  List<int> get p2pkhNetVer => conf.params.p2pkhNetVer!;
-
-  /// Retrieves the Pay-to-Script-Hash (P2SH) version bytes from the associated `CoinConf`.
-  @override
-  List<int> get p2shNetVer => [25];
-
-  /// Retrieves the Human-Readable Part (HRP) for Pay-to-Witness-Public-Key-Hash (P2WPKH) addresses.
-  @override
-  String get p2wpkhHrp => throw const DartBitcoinPluginException(
-      'BonkcoinNetwork network does not support P2WPKH/P2WSH');
-
-  /// Checks if the current network is the mainnet.
-  @override
-  bool get isMainnet => this == BonkcoinNetwork.mainnet;
-
-  @override
-  final List<BitcoinAddressType> supportedAddress = const [
-    PubKeyAddressType.p2pk,
-    P2pkhAddressType.p2pkh,
-    P2shAddressType.p2pkhInP2sh,
-    P2shAddressType.p2pkInP2sh
-  ];
-
-  @override
-  List<BipCoins> get coins {
-    if (isMainnet) return [Bip44Coins.dogecoin, Bip49Coins.dogecoin];
-    return [Bip44Coins.dogecoinTestnet, Bip49Coins.dogecoinTestnet];
-  }
+  final String identifier;
 }
diff --git a/lib/src/provider/constant/constant.dart b/lib/src/provider/constant/constant.dart
index f10a9e0..3f8a240 100644
--- a/lib/src/provider/constant/constant.dart
+++ b/lib/src/provider/constant/constant.dart
@@ -2,6 +2,8 @@ class BtcApiConst {
   static const String blockCypherBaseURL =
       'https://api.blockcypher.com/v1/btc/test3';
   static const String mempoolBaseURL = 'https://mempool.space/testnet/api';
+  static const String mempoolTestnet4BaseURL =
+      'https://mempool.space/testnet4/api';
   static const String blockstreamBaseURL =
       'https://blockstream.info/testnet/api';
   static const String blockCypherMainBaseURL =
diff --git a/lib/src/provider/models/config.dart b/lib/src/provider/models/config.dart
index 6b3a01b..1ace97c 100644
--- a/lib/src/provider/models/config.dart
+++ b/lib/src/provider/models/config.dart
@@ -12,6 +12,7 @@ class APIConfig {
   final String sendTransaction;
   final String blockHeight;
   final APIType apiType;
+  final String rawTransaction;
   final BasedUtxoNetwork network;
 
   factory APIConfig.selectApi(APIType apiType, BasedUtxoNetwork network) {
@@ -37,6 +38,11 @@ class APIConfig {
     return baseUrl.replaceAll('###', transactionId);
   }
 
+  String getRawTransactionUrl(String transactionId) {
+    final baseUrl = rawTransaction;
+    return baseUrl.replaceAll('###', transactionId);
+  }
+
   String getTransactionsUrl(String address) {
     final baseUrl = transactions;
     return baseUrl.replaceAll('###', address);
@@ -75,6 +81,7 @@ class APIConfig {
             '$baseUrl/addrs/###/?unspentOnly=true&includeScript=true&limit=2000',
         feeRate: baseUrl,
         transaction: '$baseUrl/txs/###',
+        rawTransaction: '$baseUrl/txs/###',
         sendTransaction: '$baseUrl/txs/push',
         apiType: APIType.blockCypher,
         transactions: '$baseUrl/addrs/###/full?limit=200',
@@ -90,7 +97,9 @@ class APIConfig {
       case BitcoinNetwork.testnet:
         baseUrl ??= BtcApiConst.mempoolBaseURL;
         break;
-
+      case BitcoinNetwork.testnet4:
+        baseUrl ??= BtcApiConst.mempoolTestnet4BaseURL;
+        break;
       default:
         throw DartBitcoinPluginException(
             'mempool does not support ${network.conf.coinName.name}');
@@ -100,6 +109,7 @@ class APIConfig {
         url: '$baseUrl/address/###/utxo',
         feeRate: '$baseUrl/v1/fees/recommended',
         transaction: '$baseUrl/tx/###',
+        rawTransaction: '$baseUrl/tx/###/hex',
         sendTransaction: '$baseUrl/tx',
         apiType: APIType.mempool,
         transactions: '$baseUrl/address/###/txs',
@@ -115,5 +125,6 @@ class APIConfig {
       required this.sendTransaction,
       required this.apiType,
       required this.network,
-      required this.blockHeight});
+      required this.blockHeight,
+      required this.rawTransaction});
 }
diff --git a/lib/src/provider/models/mempool/mempol_models.dart b/lib/src/provider/models/mempool/mempol_models.dart
index 666dd24..d891541 100644
--- a/lib/src/provider/models/mempool/mempol_models.dart
+++ b/lib/src/provider/models/mempool/mempol_models.dart
@@ -140,10 +140,10 @@ class MempoolTransaction {
       txID: json['txid'],
       version: json['version'],
       locktime: json['locktime'],
-      vin:
-          List<MempoolVin>.from(json['vin'].map((x) => MempoolVin.fromJson(x))),
+      vin: List<MempoolVin>.from(
+          (json['vin'] as List).map((x) => MempoolVin.fromJson(x))),
       vout: List<MempoolVout>.from(
-          json['vout'].map((x) => MempoolVout.fromJson(x))),
+          (json['vout'] as List).map((x) => MempoolVout.fromJson(x))),
       size: json['size'],
       weight: json['weight'],
       fee: json['fee'],
diff --git a/lib/src/provider/models/multisig_script.dart b/lib/src/provider/models/multisig_script.dart
index d6410a2..bff9f50 100644
--- a/lib/src/provider/models/multisig_script.dart
+++ b/lib/src/provider/models/multisig_script.dart
@@ -26,7 +26,7 @@ class MultiSignatureSigner {
   /// specified public key and weight.
   factory MultiSignatureSigner(
       {required String publicKey, required int weight}) {
-    final pubkeyMode = BtcUtils.isCompressedPubKey(publicKey);
+    final pubkeyMode = BtcUtils.determinatePubKeyModeHex(publicKey);
 
     return MultiSignatureSigner._(
         ECPublic.fromHex(publicKey).toHex(mode: pubkeyMode),
diff --git a/lib/src/provider/models/utxo_details.dart b/lib/src/provider/models/utxo_details.dart
index b1d8093..79238c3 100644
--- a/lib/src/provider/models/utxo_details.dart
+++ b/lib/src/provider/models/utxo_details.dart
@@ -60,7 +60,7 @@ class UtxoWithAddress {
         utxo: utxo,
         ownerDetails: ownerDetails,
         keyType: ownerDetails.publicKey != null && !utxo.isSegwit
-            ? BtcUtils.isCompressedPubKey(ownerDetails.publicKey!)
+            ? BtcUtils.determinatePubKeyModeHex(ownerDetails.publicKey!)
             : PublicKeyType.compressed);
   }
 
diff --git a/lib/src/provider/providers/explorer.dart b/lib/src/provider/providers/explorer.dart
index c0cc0e6..bfdcfdc 100644
--- a/lib/src/provider/providers/explorer.dart
+++ b/lib/src/provider/providers/explorer.dart
@@ -1,7 +1,9 @@
 import 'dart:convert';
+import 'package:bitcoin_base/src/bitcoin/script/scripts.dart';
 import 'package:bitcoin_base/src/provider/models/models.dart';
 import 'package:bitcoin_base/src/provider/services/explorer.dart';
 import 'package:bitcoin_base/src/models/network.dart';
+import 'package:blockchain_utils/utils/binary/utils.dart';
 import 'package:blockchain_utils/utils/string/string.dart';
 
 class ApiProvider {
@@ -24,7 +26,16 @@ class ApiProvider {
 
   final Map<String, String> _header;
 
-  Future<T> _getRequest<T>(String url) async {
+  Future<T> _getRequest<T>(String url,
+      {Map<String, String> queryParameters = const {}}) async {
+    if (queryParameters.isNotEmpty) {
+      Uri uri = Uri.parse(url);
+      uri = uri.replace(queryParameters: {
+        ...uri.queryParameters,
+        ...queryParameters,
+      });
+      url = uri.normalizePath().toString();
+    }
     final response = await service.get<T>(url);
     return response;
   }
@@ -34,19 +45,6 @@ class ApiProvider {
     return response;
   }
 
-  Future<Map<String, dynamic>> testmempool(List<dynamic> params) async {
-    final data = <String, dynamic>{
-      'jsonrpc': '2.0',
-      'method': 'testmempoolaccept',
-      'id': DateTime.now().millisecondsSinceEpoch.toString(),
-      'params': params
-    };
-    final response = await _postRequest<Map<String, dynamic>>(
-        'https://btc.getblock.io/786c97b8-f53f-427b-80f7-9af7bd5bdb84/testnet/',
-        json.encode(data));
-    return response;
-  }
-
   Future<List<UtxoWithAddress>> getAccountUtxo(UtxoAddressDetails owner,
       {String Function(String)? tokenize}) async {
     final apiUrl = api.getUtxoUrl(owner.address.toAddress(api.network));
@@ -155,4 +153,27 @@ class ApiProvider {
   Future<String> genesis() async {
     return getBlockHeight(0);
   }
+
+  Future<BtcTransaction> getRawTransaction(String transactionId,
+      {String Function(String)? tokenize}) async {
+    final apiUrl = api.getRawTransactionUrl(transactionId);
+    final url = tokenize?.call(apiUrl) ?? apiUrl;
+
+    switch (api.apiType) {
+      case APIType.mempool:
+        final response = await _getRequest<String>(url);
+        final tx =
+            BtcTransaction.deserialize(BytesUtils.fromHexString(response));
+        assert(tx.serialize() == StringUtils.strip0x(response.toLowerCase()));
+        return tx;
+      default:
+        final response = await _getRequest<Map<String, dynamic>>(url,
+            queryParameters: {"includeHex": 'true'});
+        final tx = BtcTransaction.deserialize(
+            BytesUtils.fromHexString(response["hex"]));
+        assert(tx.serialize() ==
+            StringUtils.strip0x(response["hex"].toLowerCase()));
+        return tx;
+    }
+  }
 }
diff --git a/lib/src/psbt/psbt_builder/core/psbt_builder.dart b/lib/src/psbt/psbt_builder/core/psbt_builder.dart
index 2980db5..559ff69 100644
--- a/lib/src/psbt/psbt_builder/core/psbt_builder.dart
+++ b/lib/src/psbt/psbt_builder/core/psbt_builder.dart
@@ -82,6 +82,12 @@ abstract class PsbtBuilderImpl {
         _psbt.input.hasInput(index, PsbtInputTypes.finalizedWitness);
   }
 
+  /// Determines the current transaction type (Legacy, WitnessV0, or WitnessV1).
+  /// The transaction type can change when inputs are added or removed.
+  PsbtTxType txType() {
+    return PsbtUtils.getTxType(_psbt.input);
+  }
+
   /// Encodes the PSBT as a Base64 string.
   ///
   /// Returns a Base64-encoded representation of the PSBT.
diff --git a/lib/src/psbt/psbt_builder/impl/input.dart b/lib/src/psbt/psbt_builder/impl/input.dart
index 4b4351b..08f85e2 100644
--- a/lib/src/psbt/psbt_builder/impl/input.dart
+++ b/lib/src/psbt/psbt_builder/impl/input.dart
@@ -161,16 +161,8 @@ mixin PsbtInputImpl on PsbtBuilderImpl {
 
   PsbtFinalizeParams _generateFinalizeParams(
       {required int index, required List<TxInput> txInputs}) {
-    final scriptPubKey = PsbtUtils.getInputScriptPubKey(
-        psbt: _psbt, input: txInputs[index], index: index);
-    final address =
-        BitcoinScriptUtils.findAddressFromScriptPubKey(scriptPubKey);
     final inputData = psbtInput(index);
-    return PsbtFinalizeParams(
-        index: index,
-        inputData: inputData,
-        scriptPubKey: scriptPubKey,
-        address: address);
+    return PsbtFinalizeParams(index: index, inputData: inputData);
   }
 
   void _cleanFinalizedInput(int index) {
diff --git a/lib/src/psbt/psbt_builder/impl/signer.dart b/lib/src/psbt/psbt_builder/impl/signer.dart
index 36e29ed..1bc7a8c 100644
--- a/lib/src/psbt/psbt_builder/impl/signer.dart
+++ b/lib/src/psbt/psbt_builder/impl/signer.dart
@@ -146,6 +146,7 @@ mixin PsbtSignerImpl on PsbtBuilderImpl {
           await signer.btcSignInputAsync(digest.createRequest(signer));
       final psbtSignature = digest.createSignature(signature, signer);
       final sighash = digest.getPsbtSigHash();
+      print("come here ${sighash?.sighash}");
       _psbt.input
           .updateInputs(index, [psbtSignature, if (sighash != null) sighash]);
     }
diff --git a/lib/src/psbt/psbt_builder/types/internal_types.dart b/lib/src/psbt/psbt_builder/types/internal_types.dart
index 13a1a4f..93e6440 100644
--- a/lib/src/psbt/psbt_builder/types/internal_types.dart
+++ b/lib/src/psbt/psbt_builder/types/internal_types.dart
@@ -6,16 +6,6 @@ import 'package:bitcoin_base/src/exception/exception.dart';
 import 'package:bitcoin_base/src/psbt/psbt.dart';
 import 'package:blockchain_utils/blockchain_utils.dart';
 
-enum PsbtTxType {
-  legacy,
-  witnessV0,
-  witnessV1;
-
-  bool get isLegacy => this == legacy;
-  bool get isSegwit => this != legacy;
-  bool get isP2tr => this == witnessV1;
-}
-
 abstract class PsbtInputInfo {
   final PsbtTxType type;
   abstract final Script redeemScript;
@@ -472,85 +462,6 @@ class PsbtGeneratedTransactionDigest {
   }
 }
 
-class PsbtInputSighashInfo {
-  final int inputIndex;
-  final int sighashType;
-  const PsbtInputSighashInfo(
-      {required this.inputIndex, required this.sighashType});
-  bool get isSighashAll => sighashType == BitcoinOpCodeConst.sighashAll;
-  bool get isSighashSignle => sighashType == BitcoinOpCodeConst.sighashSingle;
-  bool get isSighashNone => sighashType == BitcoinOpCodeConst.sighashNone;
-  bool get isSighashAllAnyOneCanPay =>
-      sighashType == BitcoinOpCodeConst.sighashAllAnyOneCanPay;
-  bool get isSighashSingleAnyOneCanPay =>
-      sighashType == BitcoinOpCodeConst.sighashSingleAnyOneCanPay;
-  bool get isSighashNoneAnyOneCanPay =>
-      sighashType == BitcoinOpCodeConst.sighashNoneAnyOneCanPay;
-
-  @override
-  String toString() {
-    if (isSighashAll) {
-      return "SIGHASH_ALL";
-    }
-    if (isSighashAllAnyOneCanPay) {
-      return "SIGHASH_ALL_ANYONECANPAY";
-    }
-    if (isSighashSignle) {
-      return "SIGHASH_SINGLE";
-    }
-    if (isSighashSingleAnyOneCanPay) {
-      return "SIGHASH_SINGLE_ANYONECANPAY";
-    }
-    if (isSighashNone) {
-      return "SIGHASH_NONE";
-    }
-    if (isSighashNoneAnyOneCanPay) {
-      return "SIGHASH_NONE_ANYONECANPAY";
-    }
-    return "0x${sighashType.toRadixString(16)}";
-  }
-
-  bool canModifyInput(int inputIndex) {
-    if (isSighashAllAnyOneCanPay ||
-        isSighashSingleAnyOneCanPay ||
-        isSighashNoneAnyOneCanPay) {
-      return inputIndex != this.inputIndex;
-    }
-    return false;
-  }
-
-  bool canModifyOutput(
-      {required int outputIndex,
-      required bool isUpdate,
-      required List<int> allSigashes}) {
-    if (isSighashAll || isSighashAllAnyOneCanPay) return false;
-    if (isSighashNone || isSighashNoneAnyOneCanPay) return true;
-    if (isSighashSignle || isSighashSingleAnyOneCanPay) {
-      if (isUpdate) return outputIndex != inputIndex;
-      if (outputIndex + 1 >= allSigashes.length) {
-        return outputIndex != inputIndex;
-      }
-      final r = allSigashes.sublist(outputIndex + 1);
-      return outputIndex != inputIndex &&
-          !r.contains(BitcoinOpCodeConst.sighashSingle) &&
-          !r.contains(BitcoinOpCodeConst.sighashSingle |
-              BitcoinOpCodeConst.sighashAnyoneCanPay);
-    }
-    return true;
-  }
-
-  @override
-  operator ==(other) {
-    if (identical(this, other)) return true;
-    if (other is! PsbtInputSighashInfo) return false;
-    return inputIndex == other.inputIndex && sighashType == other.sighashType;
-  }
-
-  @override
-  int get hashCode =>
-      HashCodeGenerator.generateHashCode([inputIndex, sighashType]);
-}
-
 enum PsbtScriptKeyMode {
   xOnly,
   compressed,
diff --git a/lib/src/psbt/psbt_builder/types/types.dart b/lib/src/psbt/psbt_builder/types/types.dart
index 5b826a6..95fdf64 100644
--- a/lib/src/psbt/psbt_builder/types/types.dart
+++ b/lib/src/psbt/psbt_builder/types/types.dart
@@ -20,6 +20,9 @@ typedef ONFINALIZEINPUTASYNC<INPUT extends PsbtTransactionInput>
 
 class PsbtTransactionInput {
   final TxInput txInput;
+  final BitcoinBaseAddress address;
+  final Script scriptPubKey;
+
   final PsbtInputSigHash? sigHashType;
 
   // Mutually exclusive UTXO data
@@ -116,7 +119,10 @@ class PsbtTransactionInput {
   }
 
   PsbtTransactionInput._(
-      {this.sigHashType,
+      {required this.txInput,
+      required this.address,
+      required this.scriptPubKey,
+      this.sigHashType,
       this.nonWitnessUtxo,
       this.witnessUtxo,
       this.redeemScript,
@@ -140,7 +146,6 @@ class PsbtTransactionInput {
       this.partialSigs,
       this.finalizedScriptSig,
       this.finalizedScriptWitness,
-      required this.txInput,
       this.silentPaymentInputDLEQProof,
       this.silentPaymentInputECDHShare});
   factory PsbtTransactionInput.legacy(
@@ -197,6 +202,8 @@ class PsbtTransactionInput {
             details: {"type": type.name});
       }
     }
+    address ??=
+        BitcoinScriptUtils.generateAddressFromScriptPubKey(output.scriptPubKey);
     return PsbtTransactionInput._(
         txInput: TxInput(txId: txId, txIndex: outIndex, sequance: sequence),
         sigHashType: sigHashType == null ? null : PsbtInputSigHash(sigHashType),
@@ -211,7 +218,9 @@ class PsbtTransactionInput {
         hash256: hash256,
         proprietaryUseType: proprietaryUseType,
         partialSigs: partialSigs,
-        finalizedScriptSig: finalizedScriptSig);
+        finalizedScriptSig: finalizedScriptSig,
+        scriptPubKey: output.scriptPubKey,
+        address: address);
   }
 
   /// **Factory method with validation**
@@ -241,6 +250,7 @@ class PsbtTransactionInput {
     PsbtInputFinalizedScriptSig? finalizedScriptSig,
     PsbtInputFinalizedScriptWitness? finalizedScriptWitness,
   }) {
+    scriptPubKey ??= address?.toScriptPubKey();
     if (nonWitnessUtxo == null) {
       if (scriptPubKey == null || amount == null) {
         throw DartBitcoinPluginException(
@@ -315,38 +325,43 @@ class PsbtTransactionInput {
       throw DartBitcoinPluginException(
           "WitnessScript cannot be used to spend P2WPKH.");
     }
+    address ??=
+        BitcoinScriptUtils.generateAddressFromScriptPubKey(scriptPubKey);
     return PsbtTransactionInput._(
-      txInput: TxInput(txId: txId, txIndex: outIndex, sequance: sequence),
-      sigHashType: sigHashType == null ? null : PsbtInputSigHash(sigHashType),
-      nonWitnessUtxo: nonWitnessUtxo == null
-          ? null
-          : PsbtInputNonWitnessUtxo(nonWitnessUtxo),
-      witnessUtxo:
-          PsbtInputWitnessUtxo(amount: amount!, scriptPubKey: scriptPubKey),
-      redeemScript:
-          redeemScript == null ? null : PsbtInputRedeemScript(redeemScript),
-      witnessScript:
-          witnessScript == null ? null : PsbtInputWitnessScript(witnessScript),
-      bip32derivationPath: bip32derivationPath,
-      muSig2ParticipantPublicKeys: muSig2ParticipantPublicKeys,
-      muSig2PublicNonce: muSig2PublicNonce,
-      muSig2ParticipantPartialSignature: muSig2ParticipantPartialSignature,
-      porCommitments: porCommitments,
-      ripemd160: ripemd160,
-      sha256: sha256,
-      hash160: hash160,
-      hash256: hash256,
-      proprietaryUseType: proprietaryUseType,
-      finalizedScriptSig: finalizedScriptSig,
-      partialSigs: partialSigs,
-      finalizedScriptWitness: finalizedScriptWitness,
-    );
+        txInput: TxInput(txId: txId, txIndex: outIndex, sequance: sequence),
+        sigHashType: sigHashType == null ? null : PsbtInputSigHash(sigHashType),
+        nonWitnessUtxo: nonWitnessUtxo == null
+            ? null
+            : PsbtInputNonWitnessUtxo(nonWitnessUtxo),
+        witnessUtxo:
+            PsbtInputWitnessUtxo(amount: amount!, scriptPubKey: scriptPubKey),
+        redeemScript:
+            redeemScript == null ? null : PsbtInputRedeemScript(redeemScript),
+        witnessScript: witnessScript == null
+            ? null
+            : PsbtInputWitnessScript(witnessScript),
+        bip32derivationPath: bip32derivationPath,
+        muSig2ParticipantPublicKeys: muSig2ParticipantPublicKeys,
+        muSig2PublicNonce: muSig2PublicNonce,
+        muSig2ParticipantPartialSignature: muSig2ParticipantPartialSignature,
+        porCommitments: porCommitments,
+        ripemd160: ripemd160,
+        sha256: sha256,
+        hash160: hash160,
+        hash256: hash256,
+        proprietaryUseType: proprietaryUseType,
+        finalizedScriptSig: finalizedScriptSig,
+        partialSigs: partialSigs,
+        finalizedScriptWitness: finalizedScriptWitness,
+        scriptPubKey: scriptPubKey,
+        address: address);
   }
 
   /// **Factory method with validation**
   factory PsbtTransactionInput.witnessV1({
     required int outIndex,
     required String txId,
+    BitcoinBaseAddress? address,
     int? sigHashType,
     List<int>? sequence,
     BtcTransaction? nonWitnessUtxo,
@@ -371,11 +386,10 @@ class PsbtTransactionInput {
     List<PsbtInputHash160>? hash160,
     List<PsbtInputHash256>? hash256,
     List<PsbtInputProprietaryUseType>? proprietaryUseType,
-
-    ///
     PsbtInputSilentPaymentInputECDHShare? silentPaymentInputECDHShare,
     PsbtInputSilentPaymentInputDLEQProof? silentPaymentInputDLEQProof,
   }) {
+    scriptPubKey ??= address?.toScriptPubKey();
     if (nonWitnessUtxo == null) {
       if (scriptPubKey == null || amount == null) {
         throw DartBitcoinPluginException(
@@ -460,7 +474,10 @@ class PsbtTransactionInput {
             .toList();
       }
     }
+    address ??=
+        BitcoinScriptUtils.generateAddressFromScriptPubKey(scriptPubKey);
     return PsbtTransactionInput._(
+        scriptPubKey: scriptPubKey,
         txInput: TxInput(txId: txId, txIndex: outIndex, sequance: sequence),
         witnessUtxo:
             PsbtInputWitnessUtxo(amount: amount!, scriptPubKey: scriptPubKey),
@@ -483,53 +500,58 @@ class PsbtTransactionInput {
         hash256: hash256,
         proprietaryUseType: proprietaryUseType,
         silentPaymentInputDLEQProof: silentPaymentInputDLEQProof,
-        silentPaymentInputECDHShare: silentPaymentInputECDHShare);
+        silentPaymentInputECDHShare: silentPaymentInputECDHShare,
+        address: address);
   }
-  factory PsbtTransactionInput.generateFromInput({
-    required int index,
-    required PsbtInput input,
-    required TxInput txInput,
-  }) {
+  factory PsbtTransactionInput.generateFromInput(
+      {required int index,
+      required PsbtInput input,
+      required TxInput txInput}) {
+    final scriptPubKey = PsbtUtils.getInputScriptPubKey(
+        psbtInput: input, input: txInput, index: index);
+    final address =
+        BitcoinScriptUtils.generateAddressFromScriptPubKey(scriptPubKey);
     return PsbtTransactionInput._(
-      txInput: txInput,
-      bip32derivationPath:
-          input.getInputs(index, PsbtInputTypes.bip32DerivationPath),
-      hash160: input.getInputs(index, PsbtInputTypes.hash160),
-      hash256: input.getInputs(index, PsbtInputTypes.hash256),
-      muSig2ParticipantPartialSignature: input.getInputs(
-          index, PsbtInputTypes.muSig2ParticipantPartialSignature),
-      muSig2ParticipantPublicKeys:
-          input.getInputs(index, PsbtInputTypes.muSig2ParticipantPublicKeys),
-      muSig2PublicNonce:
-          input.getInputs(index, PsbtInputTypes.muSig2PublicNonce),
-      partialSigs: input.getInputs(index, PsbtInputTypes.partialSignature),
-      nonWitnessUtxo: input.getInput(index, PsbtInputTypes.nonWitnessUTXO),
-      porCommitments: input.getInput(index, PsbtInputTypes.porCommitments),
-      redeemScript: input.getInput(index, PsbtInputTypes.redeemScript),
-      ripemd160: input.getInputs(index, PsbtInputTypes.ripemd160),
-      sha256: input.getInputs(index, PsbtInputTypes.sha256),
-      proprietaryUseType:
-          input.getInputs(index, PsbtInputTypes.proprietaryUseType),
-      sigHashType: input.getInput(index, PsbtInputTypes.sighashType),
-      taprootInternalKey:
-          input.getInput(index, PsbtInputTypes.taprootInternalKey),
-      taprootKeyBip32DerivationPath:
-          input.getInputs(index, PsbtInputTypes.bip32DerivationPath),
-      taprootLeafScript:
-          input.getInputs(index, PsbtInputTypes.taprootLeafScript),
-      taprootScriptSpendSignature:
-          input.getInputs(index, PsbtInputTypes.taprootScriptSpentSignature),
-      witnessUtxo: input.getInput(index, PsbtInputTypes.witnessUTXO),
-      witnessScript: input.getInput(index, PsbtInputTypes.witnessScript),
-      taprootMerkleRoot:
-          input.getInput(index, PsbtInputTypes.taprootMerkleRoot),
-      taprootKeySpendSignature:
-          input.getInput(index, PsbtInputTypes.taprootKeySpentSignature),
-      finalizedScriptSig:
-          input.getInput(index, PsbtInputTypes.finalizedScriptSig),
-      finalizedScriptWitness:
-          input.getInput(index, PsbtInputTypes.finalizedWitness),
-    );
+        txInput: txInput,
+        bip32derivationPath:
+            input.getInputs(index, PsbtInputTypes.bip32DerivationPath),
+        hash160: input.getInputs(index, PsbtInputTypes.hash160),
+        hash256: input.getInputs(index, PsbtInputTypes.hash256),
+        muSig2ParticipantPartialSignature: input.getInputs(
+            index, PsbtInputTypes.muSig2ParticipantPartialSignature),
+        muSig2ParticipantPublicKeys:
+            input.getInputs(index, PsbtInputTypes.muSig2ParticipantPublicKeys),
+        muSig2PublicNonce:
+            input.getInputs(index, PsbtInputTypes.muSig2PublicNonce),
+        partialSigs: input.getInputs(index, PsbtInputTypes.partialSignature),
+        nonWitnessUtxo: input.getInput(index, PsbtInputTypes.nonWitnessUTXO),
+        porCommitments: input.getInput(index, PsbtInputTypes.porCommitments),
+        redeemScript: input.getInput(index, PsbtInputTypes.redeemScript),
+        ripemd160: input.getInputs(index, PsbtInputTypes.ripemd160),
+        sha256: input.getInputs(index, PsbtInputTypes.sha256),
+        proprietaryUseType:
+            input.getInputs(index, PsbtInputTypes.proprietaryUseType),
+        sigHashType: input.getInput(index, PsbtInputTypes.sighashType),
+        taprootInternalKey:
+            input.getInput(index, PsbtInputTypes.taprootInternalKey),
+        taprootKeyBip32DerivationPath:
+            input.getInputs(index, PsbtInputTypes.bip32DerivationPath),
+        taprootLeafScript:
+            input.getInputs(index, PsbtInputTypes.taprootLeafScript),
+        taprootScriptSpendSignature:
+            input.getInputs(index, PsbtInputTypes.taprootScriptSpentSignature),
+        witnessUtxo: input.getInput(index, PsbtInputTypes.witnessUTXO),
+        witnessScript: input.getInput(index, PsbtInputTypes.witnessScript),
+        taprootMerkleRoot:
+            input.getInput(index, PsbtInputTypes.taprootMerkleRoot),
+        taprootKeySpendSignature:
+            input.getInput(index, PsbtInputTypes.taprootKeySpentSignature),
+        finalizedScriptSig:
+            input.getInput(index, PsbtInputTypes.finalizedScriptSig),
+        finalizedScriptWitness:
+            input.getInput(index, PsbtInputTypes.finalizedWitness),
+        address: address,
+        scriptPubKey: scriptPubKey);
   }
 
   List<PsbtInputData> toPsbtInputs(PsbtVersion version) {
@@ -689,22 +711,19 @@ class PsbtUtxo {
 }
 
 class PsbtFinalizeParams {
-  /// The `scriptPubKey` of the input.
-  final Script scriptPubKey;
-
   /// All related PSBT input data for this input.
   final PsbtTransactionInput inputData;
 
   /// The index of the input in the transaction.
   final int index;
 
+  /// The `scriptPubKey` of the input.
+  Script get scriptPubKey => inputData.scriptPubKey;
+
   /// The Bitcoin address derived from `scriptPubKey`.
-  final BitcoinBaseAddress address;
-  const PsbtFinalizeParams(
-      {required this.index,
-      required this.inputData,
-      required this.scriptPubKey,
-      required this.address});
+  BitcoinBaseAddress get address => inputData.address;
+
+  const PsbtFinalizeParams({required this.index, required this.inputData});
 }
 
 class PsbtFinalizeResponse {
@@ -898,7 +917,7 @@ class PsbtTransactionOutput {
 
   final Script scriptPubKey;
   final BigInt amount;
-  final BitcoinBaseAddress address;
+  final BitcoinBaseAddress? address;
   final Script? redeemScript;
   final Script? witnessScript;
   final List<PsbtOutputBip32DerivationPath>? bip32derivationPath;
@@ -922,11 +941,8 @@ class PsbtTransactionOutput {
       throw DartBitcoinPluginException(
           "Either scriptPubKey or address must be provided.");
     }
-    address ??= BitcoinScriptUtils.findAddressFromScriptPubKey(scriptPubKey);
-    if (address.toScriptPubKey() != scriptPubKey) {
-      throw DartBitcoinPluginException(
-          "scriptPubKey mismatch for provided address.");
-    }
+    address ??=
+        BitcoinScriptUtils.generateAddressFromScriptPubKey(scriptPubKey);
     return PsbtTransactionOutput._(
         scriptPubKey: scriptPubKey, amount: amount, address: address);
   }
@@ -962,11 +978,8 @@ class PsbtTransactionOutput {
       throw DartBitcoinPluginException(
           "Either scriptPubKey or address must be provided.");
     }
-    address ??= BitcoinScriptUtils.findAddressFromScriptPubKey(scriptPubKey);
-    if (address.toScriptPubKey() != scriptPubKey) {
-      throw DartBitcoinPluginException(
-          "scriptPubKey mismatch for provided address.");
-    }
+    address ??=
+        BitcoinScriptUtils.tryGenerateAddressFromScriptPubKey(scriptPubKey);
     if (redeemScript != null) {
       final p2shAddress = P2shAddress.fromScript(script: redeemScript);
       if (p2shAddress.toScriptPubKey() != scriptPubKey) {
@@ -977,7 +990,7 @@ class PsbtTransactionOutput {
     if (amount.isNegative) {
       throw DartBitcoinPluginException("Amount cannot be negative.");
     }
-    if (address.type.isSegwit) {
+    if (address?.type.isSegwit ?? false) {
       throw DartBitcoinPluginException(
           "Invalid legacy address. Use the WitnessV0 or WitnessV1 factory constructor instead.");
     }
@@ -1008,11 +1021,8 @@ class PsbtTransactionOutput {
       throw DartBitcoinPluginException(
           "Either scriptPubKey or address must be provided.");
     }
-    address ??= BitcoinScriptUtils.findAddressFromScriptPubKey(scriptPubKey);
-    if (address.toScriptPubKey() != scriptPubKey) {
-      throw DartBitcoinPluginException(
-          "scriptPubKey mismatch for provided address.");
-    }
+    address ??=
+        BitcoinScriptUtils.tryGenerateAddressFromScriptPubKey(scriptPubKey);
     if (amount.isNegative) {
       throw DartBitcoinPluginException("Amount cannot be negative.");
     }
@@ -1038,14 +1048,16 @@ class PsbtTransactionOutput {
             "scriptPubKey does not match redeemScript-derived address.");
       }
     }
-
-    if (address.type.isP2tr) {
-      throw DartBitcoinPluginException(
-          "Invalid Witness V0 address. Use the witnessV1 factory constructor instead.");
-    } else if (!address.type.isSegwit && !address.type.isP2sh) {
-      throw DartBitcoinPluginException(
-          "Invalid Witness V0 address. Use the legacy factory constructor instead.");
+    if (address != null) {
+      if (address.type.isP2tr) {
+        throw DartBitcoinPluginException(
+            "Invalid Witness V0 address. Use the witnessV1 factory constructor instead.");
+      } else if (!address.type.isSegwit && !address.type.isP2sh) {
+        throw DartBitcoinPluginException(
+            "Invalid Witness V0 address. Use the legacy factory constructor instead.");
+      }
     }
+
     return PsbtTransactionOutput._(
         scriptPubKey: scriptPubKey,
         amount: amount,
@@ -1077,11 +1089,8 @@ class PsbtTransactionOutput {
       throw DartBitcoinPluginException(
           "Either scriptPubKey or address must be provided.");
     }
-    address ??= BitcoinScriptUtils.findAddressFromScriptPubKey(scriptPubKey);
-    if (address.toScriptPubKey() != scriptPubKey) {
-      throw DartBitcoinPluginException(
-          "scriptPubKey mismatch for provided address.");
-    }
+    address ??=
+        BitcoinScriptUtils.tryGenerateAddressFromScriptPubKey(scriptPubKey);
     if (amount.isNegative) {
       throw DartBitcoinPluginException("Amount cannot be negative.");
     }
@@ -1106,8 +1115,8 @@ class PsbtTransactionOutput {
     return PsbtTransactionOutput._(
         scriptPubKey: output.scriptPubKey,
         amount: output.amount,
-        address:
-            BitcoinScriptUtils.findAddressFromScriptPubKey(output.scriptPubKey),
+        address: BitcoinScriptUtils.tryGenerateAddressFromScriptPubKey(
+            output.scriptPubKey),
         bip32derivationPath:
             psbtOutput.getOutputs(index, PsbtOutputTypes.bip32DerivationPath),
         muSig2ParticipantPublicKeys: psbtOutput.getOutputs(
@@ -1139,3 +1148,72 @@ class PsbtTransactionOutput {
             ?.taprootTrees);
   }
 }
+
+enum PsbtTxType {
+  legacy,
+  witnessV0,
+  witnessV1;
+
+  bool get isLegacy => this == legacy;
+  bool get isSegwit => this != legacy;
+  bool get isP2tr => this == witnessV1;
+}
+
+class PsbtInputSighashInfo {
+  final int inputIndex;
+  final int sighashType;
+  PsbtInputSighashInfo({required this.inputIndex, required this.sighashType});
+  late final bool isSighashAll =
+      PsbtUtils.isSighash(sighashType, BitcoinOpCodeConst.sighashAll);
+  late final bool isSighashSingle =
+      PsbtUtils.isSighash(sighashType, BitcoinOpCodeConst.sighashSingle);
+  late final bool isSighashNone =
+      PsbtUtils.isSighash(sighashType, BitcoinOpCodeConst.sighashNone);
+  late final bool isAnyOneCanPay = PsbtUtils.isAnyoneCanPay(sighashType);
+
+  @override
+  String toString() {
+    if (isSighashAll) {
+      return "SIGHASH_ALL";
+    }
+    if (isSighashSingle) {
+      return "SIGHASH_SINGLE";
+    }
+    if (isSighashNone) {
+      return "SIGHASH_NONE";
+    }
+    return "0x${sighashType.toRadixString(16)}";
+  }
+
+  bool canModifyInput(int inputIndex) {
+    if (isAnyOneCanPay) {
+      return inputIndex != this.inputIndex;
+    }
+    return false;
+  }
+
+  bool canModifyOutput(
+      {required int outputIndex,
+      required bool isUpdate,
+      required List<PsbtInputSighashInfo> allSigashes}) {
+    if (isSighashAll) return false;
+    if (isSighashNone) return true;
+    if (isSighashSingle) {
+      if (isUpdate) return outputIndex != inputIndex;
+      final sighashes = allSigashes.where((e) => e.inputIndex > inputIndex);
+      return sighashes.every((e) => e.isSighashNone);
+    }
+    return true;
+  }
+
+  @override
+  operator ==(other) {
+    if (identical(this, other)) return true;
+    if (other is! PsbtInputSighashInfo) return false;
+    return inputIndex == other.inputIndex && sighashType == other.sighashType;
+  }
+
+  @override
+  int get hashCode =>
+      HashCodeGenerator.generateHashCode([inputIndex, sighashType]);
+}
diff --git a/lib/src/psbt/signer/signer.dart b/lib/src/psbt/signer/signer.dart
index 2191100..14e60c8 100644
--- a/lib/src/psbt/signer/signer.dart
+++ b/lib/src/psbt/signer/signer.dart
@@ -4,6 +4,7 @@ import 'package:blockchain_utils/blockchain_utils.dart';
 
 abstract class PsbtBtcSigner<SIGNINGRESPONSE extends SignInputResponse,
     DIGEST extends PsbtSignInputDigest> {
+  const PsbtBtcSigner();
   abstract final ECPublic signerPublicKey;
   SIGNINGRESPONSE btcSignInput(DIGEST digest);
   Future<SIGNINGRESPONSE> btcSignInputAsync(DIGEST digest);
@@ -11,6 +12,7 @@ abstract class PsbtBtcSigner<SIGNINGRESPONSE extends SignInputResponse,
 
 abstract class PsbtBtcMusig2Signer
     extends PsbtBtcSigner<SignInputResponse, PsbtMusig2SigningInputDigest> {
+  const PsbtBtcMusig2Signer();
   abstract final ECPublic aggPublicKey;
   abstract final List<ECPublic> publicKeys;
 }
diff --git a/lib/src/psbt/types/types/inputs.dart b/lib/src/psbt/types/types/inputs.dart
index aca7e75..24d84d0 100644
--- a/lib/src/psbt/types/types/inputs.dart
+++ b/lib/src/psbt/types/types/inputs.dart
@@ -9,6 +9,7 @@ import 'package:bitcoin_base/src/crypto/crypto.dart';
 import 'package:bitcoin_base/src/exception/exception.dart';
 import 'package:bitcoin_base/src/psbt/psbt_builder/types/types.dart';
 import 'package:bitcoin_base/src/psbt/types/types/psbt.dart';
+import 'package:bitcoin_base/src/psbt/utils/utils.dart';
 import 'package:blockchain_utils/blockchain_utils.dart';
 
 enum PsbtInputTypes {
@@ -449,7 +450,7 @@ class PsbtInputPartialSig extends PsbtInputDataSignature {
         super._(type: PsbtInputTypes.partialSignature);
   factory PsbtInputPartialSig(
       {required List<int> signature, required List<int> publicKey}) {
-    if (CryptoSignatureUtils.isValidBitcoinDERSignature(signature)) {
+    if (PsbtUtils.isValidBitcoinDERSignature(signature)) {
       final pubKey = ECPublic.fromBytes(publicKey);
       final mode = publicKey.length == EcdsaKeysConst.pubKeyCompressedByteLen
           ? PubKeyModes.compressed
@@ -472,7 +473,7 @@ class PsbtInputPartialSig extends PsbtInputDataSignature {
       throw DartBitcoinPluginException(
           "Invalid PSBT Partial Signature type flag.");
     }
-    if (CryptoSignatureUtils.isValidBitcoinDERSignature(keypair.value.data)) {
+    if (PsbtUtils.isValidBitcoinDERSignature(keypair.value.data)) {
       try {
         final mode = keypair.key.extraData?.length ==
                 EcdsaKeysConst.pubKeyCompressedByteLen
diff --git a/lib/src/psbt/utils/utils.dart b/lib/src/psbt/utils/utils.dart
index a3fa82b..9547733 100644
--- a/lib/src/psbt/utils/utils.dart
+++ b/lib/src/psbt/utils/utils.dart
@@ -136,11 +136,8 @@ class PsbtUtils {
       throw DartBitcoinPluginException(
           "Invalid PSBT input: merkleRoot and leaf scripts must not be provided for Witness v0.");
     }
-    address ??= BitcoinScriptUtils.findAddressFromScriptPubKey(scriptPubKey!);
-    if (address.toScriptPubKey() != scriptPubKey) {
-      throw DartBitcoinPluginException(
-          "ScriptPubKey does not match the one generated.");
-    }
+    address ??=
+        BitcoinScriptUtils.generateAddressFromScriptPubKey(scriptPubKey!);
     switch (inputType) {
       case PsbtTxType.legacy:
         return PsbtNonTaprootInputInfo.legacy(
@@ -203,7 +200,7 @@ class PsbtUtils {
       }
       final TxInput input = txInputs[i];
       final sciptPubKey =
-          getInputScriptPubKey(psbt: psbt, input: input, index: i);
+          getInputScriptPubKey(psbtInput: psbt.input, input: input, index: i);
       final amount = getInputAmount(psbt: psbt, input: input, index: i);
       scriptPubKeys.add(sciptPubKey);
       amounts.add(amount);
@@ -352,8 +349,10 @@ class PsbtUtils {
   }
 
   static Script getInputScriptPubKey(
-      {required Psbt psbt, required TxInput input, required int index}) {
-    final noneWitnessUtxo = psbt.input.getInput<PsbtInputNonWitnessUtxo>(
+      {required PsbtInput psbtInput,
+      required TxInput input,
+      required int index}) {
+    final noneWitnessUtxo = psbtInput.getInput<PsbtInputNonWitnessUtxo>(
         index, PsbtInputTypes.nonWitnessUTXO);
     if (noneWitnessUtxo != null) {
       if (input.txIndex >= noneWitnessUtxo.transaction.outputs.length) {
@@ -363,8 +362,8 @@ class PsbtUtils {
       final output = noneWitnessUtxo.transaction.outputs[input.txIndex];
       return output.scriptPubKey;
     }
-    final witnessUtxo = psbt.input
-        .getInput<PsbtInputWitnessUtxo>(index, PsbtInputTypes.witnessUTXO);
+    final witnessUtxo = psbtInput.getInput<PsbtInputWitnessUtxo>(
+        index, PsbtInputTypes.witnessUTXO);
     if (witnessUtxo != null) {
       return witnessUtxo.scriptPubKey;
     }
@@ -850,6 +849,7 @@ class PsbtUtils {
         index: index,
         input: input,
         sighashType: sighashType);
+
     PsbtInputTaprootLeafScript? tapleafScript;
     final digest = switch (params.type) {
       PsbtTxType.legacy => () {
@@ -905,11 +905,47 @@ class PsbtUtils {
         "Invalid Psbt input: Cannot mix height-based and time-based locktimes in a PSBT.");
   }
 
+  /// must be move to blockchain_utils package
+  static bool isValidBitcoinDERSignature(List<int> signature) {
+    if (signature.length < 9 || signature.length > 73) {
+      return false;
+    }
+    if (signature[0] != 0x30) {
+      return false;
+    }
+    if (signature[1] != signature.length - 3) {
+      return false;
+    }
+    int lenR = signature[3];
+    if (5 + lenR >= signature.length) {
+      return false;
+    }
+    int lenS = signature[5 + lenR];
+    if ((7 + lenR + lenS) != signature.length) {
+      return false;
+    }
+    if (signature[4] & 0x80 != 0) {
+      return false;
+    }
+    if (lenR > 1 && (signature[4] == 0x00) && (signature[5] & 0x80) == 0) {
+      return false;
+    }
+    if (signature[lenR + 4] != 0x02) return false;
+    if (lenS == 0) return false;
+    if ((signature[lenR + 6] & 0x80) != 0) return false;
+    if (lenS > 1 &&
+        (signature[lenR + 6] == 0x00) &&
+        (signature[lenR + 7] & 0x80) == 0) {
+      return false;
+    }
+    return true;
+  }
+
   static List<int> validateEcdsaSignature(
       {required List<int> signature,
       required int index,
       required int expectedSighash}) {
-    if (!CryptoSignatureUtils.isValidBitcoinDERSignature(signature)) {
+    if (!isValidBitcoinDERSignature(signature)) {
       throw DartBitcoinPluginException(
           "Invalid DER-encoded signature at input $index. Signature may be malformed or improperly formatted.");
     }
@@ -989,7 +1025,7 @@ class PsbtUtils {
       if (!i.canModifyOutput(
           outputIndex: outputIndex ?? -1,
           isUpdate: isUpdate,
-          allSigashes: sighashes.map((e) => e.sighashType).toList())) {
+          allSigashes: sighashes)) {
         throw DartBitcoinPluginException(
             "Unable to modify output${outputIndex == null ? '' : ' $outputIndex'}. A signature with an unmodifiable sighash flag exists, preventing changes.");
       }
@@ -1108,4 +1144,18 @@ class PsbtUtils {
           "Duplicate nonce detected: A nonce with the same public key and tapleaf hash already exists.");
     }
   }
+
+  static bool canChangeOutput(int sighashType) {
+    if (sighashType == BitcoinOpCodeConst.sighashDefault) return false;
+    if (isSighash(sighashType, BitcoinOpCodeConst.sighashAll)) return false;
+    return true;
+  }
+
+  static bool isSighash(int sighash, int type) {
+    return (sighash & 0x1F) == type;
+  }
+
+  static bool isAnyoneCanPay(int sighash) {
+    return (sighash & BitcoinOpCodeConst.sighashAnyoneCanPay) != 0;
+  }
 }
diff --git a/lib/src/utils/btc_utils.dart b/lib/src/utils/btc_utils.dart
index 8ca2909..afe34ec 100644
--- a/lib/src/utils/btc_utils.dart
+++ b/lib/src/utils/btc_utils.dart
@@ -1,11 +1,29 @@
 import 'package:bitcoin_base/src/crypto/keypair/ec_public.dart';
+import 'package:bitcoin_base/src/exception/exception.dart';
+import 'package:blockchain_utils/bip/ecc/keys/ecdsa_keys.dart';
 import 'package:blockchain_utils/utils/numbers/rational/big_rational.dart';
 import 'package:blockchain_utils/utils/string/string.dart';
 
 class BtcUtils {
-  static PublicKeyType isCompressedPubKey(String publicKey) {
+  static PublicKeyType determinatePubKeyModeHex(String publicKey) {
+    publicKey = StringUtils.strip0x(publicKey.toLowerCase());
+    if (publicKey.length != EcdsaKeysConst.pubKeyCompressedByteLen * 2 &&
+        publicKey.length != EcdsaKeysConst.pubKeyUncompressedByteLen * 2) {
+      throw DartBitcoinPluginException("Invalid Secp256k1 Publickey length.");
+    }
     final isCompressed =
-        StringUtils.strip0x(publicKey.toLowerCase()).length == 66;
+        publicKey.length == EcdsaKeysConst.pubKeyCompressedByteLen * 2;
+    if (isCompressed) return PublicKeyType.compressed;
+    return PublicKeyType.uncompressed;
+  }
+
+  static PublicKeyType determinatePubKeyMode(List<int> publicKey) {
+    if (publicKey.length != EcdsaKeysConst.pubKeyCompressedByteLen &&
+        publicKey.length != EcdsaKeysConst.pubKeyUncompressedByteLen) {
+      throw DartBitcoinPluginException("Invalid Secp256k1 Publickey length.");
+    }
+    final isCompressed =
+        publicKey.length == EcdsaKeysConst.pubKeyCompressedByteLen;
     if (isCompressed) return PublicKeyType.compressed;
     return PublicKeyType.uncompressed;
   }
diff --git a/pubspec.yaml b/pubspec.yaml
index 51a762a..ba7968b 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: bitcoin_base
 description: A versatile library for Bitcoin, Dogecoin, Litecoin, Dash, BSV, and BCH. Supports P2PKH, P2SH, P2WPKH, P2WSH, P2TR, with advanced creation, signing, and spending capabilities.
-version: 6.0.0
+version: 6.1.0
 homepage: "https://github.com/mrtnetwork/bitcoin_base"
 repository: "https://github.com/mrtnetwork/bitcoin_base"
 Author: mrhaydari.t@gmail.com
diff --git a/test/deserialize_test.dart b/test/deserialize_test.dart
index 87e3774..8594bf3 100644
--- a/test/deserialize_test.dart
+++ b/test/deserialize_test.dart
@@ -19,4 +19,98 @@ void _decodeTx() {
     final tx = BtcTransaction.deserialize(BytesUtils.fromHexString(data));
     expect(tx.serialize(), data);
   });
+
+  test('decode transaction v1', () {
+    const data =
+        '01000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0704ffff001d0104ffffffff0100f2052a0100000043410496b538e853519c726a2c91e61ec11600ae1390813a627c66fb8be7947be63c52da7589379515d4e0a604f8141781e62294721166bf621e73a82cbf2342c858eeac00000000';
+    final tx = BtcTransaction.deserialize(BytesUtils.fromHexString(data));
+    expect(tx.serialize(), data);
+  });
+
+  test('decode transaction v1', () {
+    const data =
+        '010000000001011f871dacf49f08de0b72b063cc404c75cbeefdcf7de2a5bafcbe9dcbb58eb87c0100000000ffffffff12178f0a000000000016001469f3d3f8d127c1e3c1db10d4faa3263a2e5303cb7ad23d0000000000160014dc6bf86354105de2fcd9868a2b0376d6731cb92fd8fe6c0400000000225120ad6714c44b802a2ccd6bbe667a5faade86c48201063672d32d9c5bb550c187caa3a00000000000001976a914fed6f9b52e720e3466f9467fe3e741d897ed3f6388ac012e0400000000001976a914cd2c4da5e41ca985b7b70f9640892d8ffd70220a88ace7980800000000001600141bf3e943e6b34ce90afd7ea4825340267857b2e98c4c05000000000017a914f783dd0ef788b9b9da08458e4196642fd51f03cf877873930300000000160014d05f26ec09388c9bc431140b3a011d5890a1ca0795351100000000001976a914c4e0a6b92a3586a091999b0065d7ce1cf72dd3d588ac93c20000000000001600141d4ca73811013b9800e1560f99a5e63787f445c2b15203000000000017a9143d5d7193067175f60c8c03f1624ba0c1a531722987cd64260c0000000016001437ddfc9925a2440c0248c5ce267ebd7c8eba7e9fa0fc7a0000000000160014b07d04c81ce60900a46281c11f43fa54318df7fd10920300000000001976a914352bdc1728d2e0ec44b287d983d4f45fa42b039e88ac6cfa0e000000000017a914011f646bec73c2ff7a3c6ea73b3e0212de81942e87c16803000000000017a9149d585b5e3a5c641f508af275a3f34a143636f23387e79d0900000000001600146878a6bbd9aa096da23d03bcd44ed39de954ca91c209b90000000000160014fac7320a37312597573662bc3ba5fb377ca1c8cf02483045022100d03519ced503a026dff6681429aba44551bdd1c489b79b6e247175d7b3d182ff0220642184bbc977504c394820f36cb2b18a8a7d8170f6c3f31f2003d2afcc3b8c67012102174ee672429ff94304321cdae1fc1e487edf658b34bd1d36da03761658a2bb0900000000';
+    final tx = BtcTransaction.deserialize(BytesUtils.fromHexString(data));
+    expect(tx.serialize(), data);
+  });
+  test('decode transaction v1', () {
+    const data =
+        '010000000001011f871dacf49f08de0b72b063cc404c75cbeefdcf7de2a5bafcbe9dcbb58eb87c0100000000ffffffff12178f0a000000000016001469f3d3f8d127c1e3c1db10d4faa3263a2e5303cb7ad23d0000000000160014dc6bf86354105de2fcd9868a2b0376d6731cb92fd8fe6c0400000000225120ad6714c44b802a2ccd6bbe667a5faade86c48201063672d32d9c5bb550c187caa3a00000000000001976a914fed6f9b52e720e3466f9467fe3e741d897ed3f6388ac012e0400000000001976a914cd2c4da5e41ca985b7b70f9640892d8ffd70220a88ace7980800000000001600141bf3e943e6b34ce90afd7ea4825340267857b2e98c4c05000000000017a914f783dd0ef788b9b9da08458e4196642fd51f03cf877873930300000000160014d05f26ec09388c9bc431140b3a011d5890a1ca0795351100000000001976a914c4e0a6b92a3586a091999b0065d7ce1cf72dd3d588ac93c20000000000001600141d4ca73811013b9800e1560f99a5e63787f445c2b15203000000000017a9143d5d7193067175f60c8c03f1624ba0c1a531722987cd64260c0000000016001437ddfc9925a2440c0248c5ce267ebd7c8eba7e9fa0fc7a0000000000160014b07d04c81ce60900a46281c11f43fa54318df7fd10920300000000001976a914352bdc1728d2e0ec44b287d983d4f45fa42b039e88ac6cfa0e000000000017a914011f646bec73c2ff7a3c6ea73b3e0212de81942e87c16803000000000017a9149d585b5e3a5c641f508af275a3f34a143636f23387e79d0900000000001600146878a6bbd9aa096da23d03bcd44ed39de954ca91c209b90000000000160014fac7320a37312597573662bc3ba5fb377ca1c8cf02483045022100d03519ced503a026dff6681429aba44551bdd1c489b79b6e247175d7b3d182ff0220642184bbc977504c394820f36cb2b18a8a7d8170f6c3f31f2003d2afcc3b8c67012102174ee672429ff94304321cdae1fc1e487edf658b34bd1d36da03761658a2bb0900000000';
+    final tx = BtcTransaction.deserialize(BytesUtils.fromHexString(data));
+    expect(tx.serialize(), data);
+  });
+  test('decode transaction v2', () {
+    const data =
+        '020000000001014d5d7cd2376971d2b70dc19f8007c2a92bc92d434aad78dccda6973156bc3bdd1100000000ffffffff020000000000000000286a262020202020202c7a7a7a7a71202020202020202c717a7a7a7a7a7a7a7a7a7a2c202020202020780e0100000000001600141cfed0b7e02b609216badd580ed363ce0e0bb4660247304402205a2cbd8815c94379cc5dd5fb5eae445d422e97fbf605291c1f8e40867c28efc5022078f1e9f5a6378d4f1bbd09c200eebac472dd582167d938872aa2f89ad54f6f9701210398cf668fe678cc6d8e2b20b5f574c9f398c7f031a1e91e9b85029e4cde597ad700000000';
+    final tx = BtcTransaction.deserialize(BytesUtils.fromHexString(data));
+    expect(tx.serialize(), data);
+  });
+
+  test('dogecoin tx', () {
+    const data =
+        '010000000d138cfa4dd9b6c016a26e80c0ee25c16bb39b69b30079007416e13f8b5c1d66f0000000006a47304402204bd620edf5b28eaf60f68d9218dee0693f1fb0ae9ed894df21874823981a014802203dc50222242ac5329a4dc808226b061fa73fc1cac8ed65ab1625809700a27cef0121034534c45b6d6b18fdeb0af72f321ee59b3ad673e72b492d2f074bc7fc802ad57bffffffff92ae2afb74d4ea6c3e3df0ddfe3a836fdd214f14a1fe61b7eba3b300208cdf37000000006b4830450221009f6864cff99c72deaa9100e616f022b9496c6a27f5ca0930ba0b94c85001311402202163081c5ebccdc1a310b22a33568b651785701d2c49f7f175cc6cda47eadc380121034534c45b6d6b18fdeb0af72f321ee59b3ad673e72b492d2f074bc7fc802ad57bffffffff8dbe84774e929adb73461262afba3fe03941827422d724455d9a6d26fff3d3d2010000006b483045022100c23945fca081e707590fc57596a0abdad1b6a47e96b77189fa2ee64b356c2656022058a30c92d76940aaba36a43e1e3629540c2b338dc9a26b0a372bdbd22e3ca48e0121034534c45b6d6b18fdeb0af72f321ee59b3ad673e72b492d2f074bc7fc802ad57bffffffff2ae485816b06a5145f382b23f9d8e133ac4c79b515b790fad96b1dd33d155eb9000000006b483045022100db7d4b2a174c1e1da1eaeb7f1d99a2b1a7eba7407b65506dd387b64d442a654e02201f0c0d8e4967a7364e60d52e834a95e49766b9ea2fded7cd4346e09b22c871210121034534c45b6d6b18fdeb0af72f321ee59b3ad673e72b492d2f074bc7fc802ad57bffffffff59a776796da2d053cab55dc390925ddd27734f047036b2423c2bc0406eebfe5a000000006a47304402203ecf46375800011835121ab06ce40b5073a7ae7307d45d4a47b1d1a0a1fe5628022026f2472bf2d32ff5e6ab161d151ce8a26ec98b16981b8f0ad74c6a690b5921ad0121034534c45b6d6b18fdeb0af72f321ee59b3ad673e72b492d2f074bc7fc802ad57bffffffffbabbe45c8b93d962156f605ced7e91cc850851aa767dcf73706038311032240a000000006b483045022100ef5af19455a68557c7381abcb4c240b9ec74bcba9ab68e58865464d582959c7702201030d5c7dd06b256bab762f8d71674aef00ea9bc224a1bd6c6ec681a399459c10121034534c45b6d6b18fdeb0af72f321ee59b3ad673e72b492d2f074bc7fc802ad57bffffffff655eb0881cfb97c4c2585c5efc1ca9c5fa8716da9f9d2a6ecdb14a8717481bd3000000006a473044022032354a6fe57420f1fee4d7fdb49e2e740347830dc148e7b9eb761d16886f161e022060b7b3e651aab836f0559d635993f3380e2d406a0a0eb1958f68003dc34509ae0121034534c45b6d6b18fdeb0af72f321ee59b3ad673e72b492d2f074bc7fc802ad57bffffffffda7ec3634031ab1115fe4659fe731d3d290f9806a4037ed210fb2d0831eebb82000000006b483045022100afc795b53b647650e3358ce1a1d39b3f509cfe48a9cfa4a67984cf860a1e449a02206f139fd581ea16d3480956f258567529c2f81ee78f28a8ff987f45a6f2eb32850121034534c45b6d6b18fdeb0af72f321ee59b3ad673e72b492d2f074bc7fc802ad57bffffffff953e0037d1d1017ea531f8bf9bfdcd5c466a89559a4e185d88736ced5d68ca80000000006a47304402207ca040f17c366fa9208ff6637af737b767e7b14fb3031c2b4e7368a1f494dfb40220562999aa9dc4db2c8512a088566240b8a8567ea9e5fdcf99474a790ea3bd15830121034534c45b6d6b18fdeb0af72f321ee59b3ad673e72b492d2f074bc7fc802ad57bffffffff7db0de12d3af887ae7c6190cf4eee02a94c5e1782fe424ce92d414b64114f579010000006b48304502210099dd1fda0def15d93566d23dc46602a67b1cee1d62f44a10956520abdb7cbdff022063f1b41f5d2d053b0b9640a3578c083ec51ceeb9b18f144d094c4a678ff329f40121034534c45b6d6b18fdeb0af72f321ee59b3ad673e72b492d2f074bc7fc802ad57bffffffff8dd8c4b8938aa615c09ef58bb6fd84a661296e47ebeb90c489bfdbcb3b37d496000000006b483045022100cfd319c796c7d730502467666a66c462d588584fee5ee84b43cb35a73787f2280220478e0634b1d0b996bac8974cbf3299778f0bf08adc0af5b53affe6a59bfbabdc0121034534c45b6d6b18fdeb0af72f321ee59b3ad673e72b492d2f074bc7fc802ad57bffffffff88fec19183b2d1ec7f308c8c5f24343b2073c32f069250a2634b7e67ea25c41d000000006b483045022100be7e59aa44977cdd6ff9caf895b6c70678d792f1c69a371ab3430ae359048880022014130c6e42d782221294b38fff886c8207fc3bc84cd8d20e904e7db5649999df0121034534c45b6d6b18fdeb0af72f321ee59b3ad673e72b492d2f074bc7fc802ad57bffffffffd49d5f3d30321b59a0fe4e61051a9426ab6740842bace935425b5bd4a511fc9e000000006a473044022020abfcb9805240471c7c2af6f9a4351f83946834082f65ae03ca909cfb32a31302203c9d646ae3f8f6261f0e20027111adf43382a957d294577e4cad2829d00000640121034534c45b6d6b18fdeb0af72f321ee59b3ad673e72b492d2f074bc7fc802ad57bffffffff026c0d1c144a0100001976a914012e159fa95dc1ef8ec568ee1ed1ff42cf63804888acf05e58e3bc1700001976a9140e3b95db0be4f3be8cf9805eec7640f51708596b88ac00000000';
+    final tx = BtcTransaction.deserialize(BytesUtils.fromHexString(data));
+    expect(tx.serialize(), data);
+  });
+
+  test('dogecoin tx', () {
+    const data =
+        '0100000003c60ef036fdabacbc899e4c6b25cfd895776119f18dddfdf2de351e4bcb78d87e000000006a47304402205c21b1bab103a0ceb245db53fd142853ea8d58a014c4761ce44c6c011158b3b102200c147f51019c0a3e3f0a1c9108dd424eee0bb47747e6df2a4f978ce01084d1a20121034583bd544ca6475ffa08337b61006dc58baa191dd34171a663d59840ca921520feffffff88151a9df595f2269e392cf554d453f4f9d1242aadaf64fc530cae25d52a6b39010000006b483045022100b3ac50ee9c5a950b4d75d6ea8f25966b46e1bcd66d7a11c5f7bf644ec55de18f0220234a8acd85d79ac3da2ecb2a30733ccf5cb92adb6cadb399b6158c16f436527e012103d5b3ad30e3c1fa8510911c350070cfb4ddce8b97874e8b318321224d8de21651fefffffffcd3fae65d095a1f1b2ff19270a310b62b7999a42c2731cb2a7b86a898b44d58030000006b483045022100ec3981eb8b6b8a04dce9f10eaa758323c33a601eeaf04f03d527449e3c9eb62c02201fc9fc3b3c4cfd9f0b864cc40b9bd28d0f623d3a6244bd022907251d6e74859801210300489fec872cf080ed88a4d4f461ca2751f90013a012770ea52c9a47a5e3f5c7feffffff02c708fc85030000001976a914a34d74643215879b6b6864e5c05160cbda197f4088ac1465e206000000001976a914a450c3040e7e253fb9443d2b9578de59d475a46288ac061b5600';
+    final tx = BtcTransaction.deserialize(BytesUtils.fromHexString(data));
+    expect(tx.serialize(), data);
+  });
+  test('litecoin tx', () {
+    const data =
+        '010000000150a425002379dfd83718474ca3d46efad63dc8bcbed20aca484e381230e1f896010000006b483045022100bdfc1647ba51b1ccb9d6945df4603b605c1a159bc518020bdd7297511b56a090022022835148bb399d087481d61ee236584c50a7da07077c561f5f193cf69fee27fa012102862ac97f69ddc423ed7261d2f6fe91384d365ed8e1405a98893db3cc86a253ebffffffff02fa7372000000000017a9148ca092e2ba513ec4bfb9a22f1d4c37c515e186e68739d09e01000000001976a914058cd1272c5cef87c1aa2d1a5ac8864cdcd8c56f88ac00000000';
+    final tx = BtcTransaction.deserialize(BytesUtils.fromHexString(data));
+    expect(tx.serialize(), data);
+  });
+
+  test('litecoin tx 2', () {
+    const data =
+        '02000000000101b6bbd3447513cab8062cd93cb4d6a74a87b38813a1f11da664788646687e4c880100000000fdffffff021a4c2e36000000001600149095aed28074d0861e807ea27bf79fa4076d8f57d076140400000000160014d6c63917e45c0ef4dfeab29ea581b7c6eb288bc3024730440220570199800473ca545c7eb19cbb3f0f26e9ac58971b3f495f03eeb25e27455cc302202c30ec2c953b4996d1ee2af87b7f24dd7a8f6a8ac0388b610a817c402599b7550121026d9e26471899e2f2d9acd6fc76c82329b58573687d6fbcd0677840c3ff4f67279fc72b00';
+    final tx = BtcTransaction.deserialize(BytesUtils.fromHexString(data));
+    expect(tx.serialize(), data);
+  });
+
+  test('dash tx', () {
+    const data =
+        '02000000067ec6789ca1437bfd229cd5e338a365bbb83c438cb25d3e1e56eb49c8a3469203050000006a47304402205771740351025d4465ac31e996dab359b818e146bd593186ef0bcc18a477f640022043d4f8a9648890a2d394a652d9372d8b109b75ea6f1b2a2285c3aba190d35ed9812102d52c46b94eeead777d624e97203110e5b9dd3b0c52032509228805dd527a1ccaffffffff02794de87868e74bb5dbcc6c0e1268efa054e257f5d3becb1691b87accc0814b2d0000006a473044022038f2ffd79668721983d6364a1ecf307393b224f17c9c7f32a181baa779902b830220481b6279fa713d633696eef57531c248a588168d272afe4cda746ba8cbf04ca5812103321be6dda0ec05b04e805fb444d08f79d4f9f4bb2dd424cd831cb5412b22b7d6ffffffff36568984b7948c483c82c77f36a486ad30f9f14b28e8b6b85ba9d29179003f68110000006b483045022100c09b8fa76375d4959ae54b087964a915e4b455906882cafc2ad0421409beb077022022b809ce0276964c463958298b42ef9d0bef6da37cd2b3be436fcca10ccbae13812103bb0972ca8d668467137af4f755a02c5092c02cd842a0d0210288042e91971c89ffffffffbb0e6a6f3cdc34e1505e4c859a338256cf56b92031b647a142c9ab7ba56d136b070000006a473044022038632f60d4456de01bcf16181c349db1e8e029e09f6382755a1cd154e3f4849d022066098478d641e8fc0b5f55a7603a175b90fc7a6c807e47ab5d80390227c2527a812103059f8e54c70ba3ed62dc7f990855073ab4e351a5c77030c229ec179e78d4e4d5ffffffff47a3bba1d13a32d00c6e8aa605be2ec650ededbeba0c59593d709323c670ef82030000006a47304402205d4c722eb5615fc7964e8342eb149a3bf91df65f710a4d6ba4c692263e1ee8700220730f5e081283c92e8ea9a741818e24602451d08743a3d9234fd5e867d7dcd504812103f214e07727f4960f0fcd00607d09740b90fdc3c321325590cd02e6325129a5aaffffffff139f25d2de7e5d70f6210c63d5aafa2e252d2ba7cc4edb8a793dc9b00bcad7c8030000006a473044022072abc5ba89862cd55abec975c4e59c04d59eda5a4f6b2fbf42ced7c554be98bf02206ad19698e81fea5b0de12b8b1f8195b2562d8988c2bf4ae33143a770bfc5ac2c812103aeb97d6a600daaa42c618da9bf81ec57f02f44b6c3189c699a63b4bfeae95a71ffffffff06e4969800000000001976a9142149692d05b5e3f41f848acda5f2b37c2aaac47888ace4969800000000001976a9145f36f030a224b07faf33f39200f4436d28d964a688ace4969800000000001976a91469edca14c80aee4cc2201a3bbc7f0b5ef4636e3d88ace4969800000000001976a9147cbe0e9eb6fad144961614848b628e6bb9549b3788ace4969800000000001976a914b3221850107422cbe5c8a9719f7cf6852116778b88ace4969800000000001976a914f35755bc08cd70b736d263cc64dd178dc8062e4e88ac00000000';
+    final tx = BtcTransaction.deserialize(BytesUtils.fromHexString(data));
+    expect(tx.serialize(), data);
+  });
+
+  test('dash tx 2', () {
+    const data =
+        '0200000008e6bb96ca66f9113d1e912ae8428c643775e80bbf2c42a66e3d0d7b0a0745e110000000006a4730440220627a2a95b41239ce18ed210e284d4b2f340bd04cbe4aefb46ac17d81fe633e8c022009d51a430462e1acd136f166e12023e6fe128da5d58c2a22747999b4930f3b9b8121030066e007a0c062395f2465fc7530464033d6bf06da4d31b7cab4528c78fb7e92ffffffff655ffbce984d7cdd5755956cf81c6cba943cd3f73096cdfccfb2c773a55f8a17050000006a47304402201dcb97a5e6bcd2b84c6b516f4ce822f0dbc56e7a7861c58c45e38911016296bb0220100792d21a272cc8f82cc5731c7b6d5d01ead82a7e86e7b8e56c3993d2ddca55812103bf143b5da4c72c710ab4faa03699ffcde664f702dcb9a233e7c4b2f2bc34df28ffffffff9e7313069e2354fa5ea83c9cadad39a3af6bb1fcce20288014045ced582ca32f050000006a47304402202f9bf53ba54b0c9a6fc51413f7fae2f807c77862fb732cefdf8126da75ea3cd90220469bd0613f1c608bb86d038fef5488b58c13d5bf315a7ea9f1013af55ac5aacf812102056bb71313ac1312ac06c37d9e122ac474d362f612f24efc2a2fcb5a2e7b14c9ffffffff02794de87868e74bb5dbcc6c0e1268efa054e257f5d3becb1691b87accc0814b040000006a47304402206613a22198b8d2da88d2130b4a9eda7b1d215c2d911d9e93fe7d09e287591b33022026db2b3e5fa08517b9e1298c55de6f82232515961206b834377158b5ed7582e2812102645d5fd97132ffc062fda0f2a5690dae75063e7822fcd8eecae4804beabc0311ffffffff3050c730cf10d18748a9814886e707b1c57a01e76447463ac0f36a5887bd6c850a0000006a47304402201337bbc74c8590db7dac559ce3ed35d9a1ff2c38ac9a02afe03d6805d8d2a5c8022016ae120c2549ec8f9ae17e70a7eab1acfb17964cdce9385de3952f22a95527e9812102c986ba3071adb0c4d25e217ee94c87cc1a5815e1d3a1066f751ab912695210bcffffffff3050c730cf10d18748a9814886e707b1c57a01e76447463ac0f36a5887bd6c850b0000006a47304402204595b722080bc7f25eeee7d51854daaf609813db0b87f80dfc581833a709509f02202b0f00d0423f016b5736f6a661c4cffb40d7afc17cf996722ca9a2b9205c167b812103df03592adc913ed3ce4fb0e141f75b038f57a83aef4a06c2c905bd14b271ad9affffffff5a856c1742a1405ddd0743b270b406d977d28632356ae66f71a51d8591ffa58f050000006a4730440220064b645f8412311faffcd35441b94c344be199385d0b47824708ed375f3dbf690220449ba172b0afdf57617ef2b4772cd31257d8f7b3e72477340016a0e391ce49088121025c40a587b2a7d11b0eb5cd5ad3fa5ddf5cf65315c92a492f193f5f08305793a5ffffffff8dca5a8ea7c2ec793023ad96f06ee9f138cd634ce50d352e3c2608f162c91ba9020000006a4730440220691e3c4f0225ef7bd7350ad21d4714754f7d6b1ddaac8dbad2b6860e9bf8c49b02200c4a31b450da238fb858188e3f123f0ad6ae81598dc731ec04750923cd081ab681210331778c0c3100b2496af4dc66672b0725c0a761d2cb78c0d020d70c9926be7bd6ffffffff08a1860100000000001976a9140c0fd22a69781721011509241fca1fad9cd4bea388aca1860100000000001976a914695e68c012a8761975575fce48830a908420e40a88aca1860100000000001976a9146ceaa83bdb3e97ad30838de6bfca5cafac4d3ff988aca1860100000000001976a91473eee8557895c3b7bd46aae904fc42a235fe9ce788aca1860100000000001976a914bc43911184a259081097ad6b5654b21379f9e0c388aca1860100000000001976a914cad640fd47e5ac874f6b04f8ca0b6eb32881be8c88aca1860100000000001976a914cb18799503fbe4d6e1048848f3b949416e1a78b688aca1860100000000001976a914f932d6a4cc4c9299e4bca2f758b3d9de97a9157788ac00000000';
+    final tx = BtcTransaction.deserialize(BytesUtils.fromHexString(data));
+    expect(tx.serialize(), data);
+  });
+
+  test('bitcoincash tx', () {
+    const data =
+        '01000000041904b4c85904f67047abc6e85704f6d01e9713cd06321533d77e5bda317c957201000000fdfe0000483045022100a12184aa60e74461cbbe7cf45fabae2be6ceae62ba2b0c5f9db20869442aa8e802205b988b94c77e35ce6a2f3cd7bfaf103e71835be380e538719b54a13567904ead41483045022100eae8ae369e43af4861dac31c776ac29146558be5aa4ad3f79066b9175429dfa202203515f0e5b87ceb4299a238c528a79d02e5afc364ab9869c34e0a501736da0544414c695221030f936f5aa4cc703cb6e58f74fa9822f4c02a3711d486f6659c898fced90d94802103704d85f33c05ab154ca17af039c4a0ec86c4ebbbceb6059cb213967af9a88284210332a19546459dbc0c0e0fdd666ac4660773dff7a87259b6f710397f645af1d63653aefffffffff94c6b88cc195d32612a3cfcd988e975a9d85e684a4994a4c146a302a91261d808000000fdfd0000483045022100e65d01c256046c0a3157c29d633a3f274cb8870c197ed83a57bb144035ba26ce02205b93697bea63856e042b13538a50a210193c24e564b3c5f0f0c499daeb1eac1841473044022001c5f43071070a2cf2df838816c2a03033e3f8f7ef7676739ca331c1b52dcb3102204b71b3eaaf419bf0394d6e7af2d69e0d453260ee2c42dfa883bf84eeceeb1a83414c695221036387540a911a4a9b5301747f95ac464569e433f89b543656249a91d6ba2331f52102770461d186bae94795a1a03e768e48c631bf330b33ff877e6301c304053238bd21022faf46f5453ddcb477b585008e740c663ed747a76d1b66d39a91f5aaa2d4bca253aeffffffff8d747a002b24313ec23a2e30ef9c242d7984735d082df95f55240deb265d110d01000000fdfd0000483045022100b80e84b5f2f4d23933a9a2cd86e3cd144c4acdc5b4672b220922d30d6509525702200eed3b90c90fe1fcf8218b0178e6e7a7e4822e95fe5ff6e50f3a42d808fd5abd41473044022048b69d1e9ab25811353575ce29007a3106afce53a53909f6d68c58f46935036302206abd28e1d489fae8d1b740d9aa6793197268bb60c6a5dd9f95930988ff388d87414c695221030f936f5aa4cc703cb6e58f74fa9822f4c02a3711d486f6659c898fced90d94802103704d85f33c05ab154ca17af039c4a0ec86c4ebbbceb6059cb213967af9a88284210332a19546459dbc0c0e0fdd666ac4660773dff7a87259b6f710397f645af1d63653aeffffffffc6f51b454354ef651defdb1b11423cef138af021936053861b6378e8e0ea4e5d00000000fdfd000047304402205d10dc9a1c2597da9ec3f09ae94a0f40155ffba761405d0736bb3d57857b0007022072096747ae9681537ab3435f4cf36323cb303444522b9ff76692e782ddc1ec7f41483045022100be6425b03866bd4f89c8ff3753646e438b8bf3c0c8c9c48e5bb6529208b3949302205ab25792a8bfede2ef696c12d23bfe435f19aaee60e12e8c04824d955be61058414c69522103178e8f0f888f72f46c2866c9f70c5c43d01d1e224d7f6606d4b6464d8980dd6021036a86f8ef4b99902bcabbed85009774632e59a2669642fef23f0db58ee58e267f210202e0615394ed2be02c2bc06237b82a4055414b3fca939e125230fbe8f42ba6a953aeffffffff02306e2e01000000001976a914bbffc1dd8a5ca4123107a53445eb27dab94ba99188ac2dd5c4040000000017a9145cb22d4e81d3ed41993d117c17308a69586951998700000000';
+    final tx = BtcTransaction.deserialize(BytesUtils.fromHexString(data));
+    expect(tx.serialize(), data);
+  });
+
+  test('bitcoincash tx 2', () {
+    const data =
+        '01000000018b2fc92143114a0637b66e315a7eb5c3cee66fc4b5dcdd46c17aea061317cb95000000006b483045022100c85588fd44178becaa66caa53b916f9c5e7e05a8c8b06e1277b59113af43995102204ec5a673403cf56878256d7d57d149fb5d4030d15c9f39f3efb4bbacd9a8750341210208c6b6d97ca3d625fba56b6460bdcceb3e06f5555c1184590b3339c0f5879be1ffffffff05e0609cba000000001976a91490f228539519931540f0e1de25dbc0093498c7a588acb3ebc100000000001976a914d50187c085db7ee76fdcf374773be65d91dfa5b788ac238f6400000000001976a914f7b20108496c168d589274b10c7c461db4008ad888ac16255200000000001976a914fdc30e2b3281bfe05ff7e2935a18a3cffb054a4188acbb652b00000000001976a9143f33cc9456e79bd74ab175b807c7a830f768d2df88ac00000000';
+    final tx = BtcTransaction.deserialize(BytesUtils.fromHexString(data));
+    expect(tx.serialize(), data);
+  });
+
+  test('bitcoincash tx 3 NFT', () {
+    const data =
+        '02000000027c4e8ce3897e23afd8fa5ba394efb2a5ba810da6cfe2351fb34798e31bd6dc9e0000000064413ee47f3531cbcae584e71992060c29b611062667834a242a5c9b508e76b2ecc1f8c03d87b8c6af1c97a9d3038eba3c440fdb9e2b4d42851cd997f0835318fc47612102bb2f64940415b2c6511d6290d2a8da06db708c2c1a8c19df0b3cecc338050b0700000000db43539e4474909c80ea4e0a7eb8bfff7be752f3a3da527428af3470d025011701000000fd6f0110414de5676a471000524710008280000040c63937fb49a950b2ddfddfd314772c883b90244d035340340fc35eb63a92eb60e6a50f3c744c4cdb40fd0e13caa88b2651c706830349f20cfd886d724b9f3c8c2102d09db08af1ff4e8453919cc866a4be427d7bfe18f2c05e5444c196fcf6fd2818004cf82103341a6fb68e883fb2c5ce0d0d186e9e09792839479bfb14adda2f498fc2dfaacf78009c635279827701219d54798277609dc0cf827701249dc0cf01147f785579a988557a5679567abb5479587f77547f75817c587f77547f7581a069c0ccc0c6a269c0cdc0c788c0d1c0ce88537a7ec0d28777776778519c6302e803c0ccc0c67b93a269c0cdc0c788c0d1c0ce88c0d2c0cf8777776778529c637b7cadc0cc022003a269c0cdc0c788c0d1c0ce88c0d2c0cf8777677c539dadc0cc022003a269c0cdc0c788c0d1c0ce88c0d2827701249dc0cf01147f75c0d201147f7b7b879169100000000000000000000000000000000087686868ffffffff02a0e99b00000000001976a9149ad0f528e1c26501c49f1186bb2f208038971ac488ac50711600000000006aef5059621a87a140da4d8f83e456630be833cc7d7664e43fbbf481da5c3dfcb6b06124763d932c30ca45715f9861dc205243f1520bfafa414de5676a4710005247100082800000aa2076fbc08f5ba4bd098f0c0da12a13d5b229b68c6d7e3cbd197c90ec01ae116ab98729230000';
+    final tx = BtcTransaction.deserialize(BytesUtils.fromHexString(data));
+    expect(tx.serialize(), data);
+  });
+  test('bitcoincash tx 4 NFT', () {
+    const data =
+        '0200000003bd9b073409d877028322f7286a4f4f0f6fd9213ae87f5dcb64fb575edf87f76400000000fd6c01004d680123aa20b758a71d99ea449f56cbdfb68516be858480fc320e8365b86917e8a7871b0f4387215059621a87a140da4d8f83e456630be833cc7d7664e43fbbf481da5c3dfcb6b0015279009c63c076009d51ce7b8851cf011c7f77547f758100cf816ea269785379cd5479c7885379d15479ce885379d2885279d35379d0a2695279cc02e8039da078d35279d0016493a29b69c452a06352d1008868c453a06376ce01207f7553d1008753d15279879b6953d200887568c454a1777777677b519dc076009d51ce7b88768bcf76011c7f77547f75815279cf8178a1697c01207f77817600a06952cc529553967c950400e1f5059652795393d3767ba169760164a2697603a08601a1695279cd5379c7885279d15379ce885279d27b8878d35279d05279949d78cc02e8039d7cce01207f7552d178885379827701149d52d2547a537a7e8852d3009d52cd7b8853cc02e8039d53d18853d2008854d10088c455a06355d1008868c456a168000000007c4e8ce3897e23afd8fa5ba394efb2a5ba810da6cfe2351fb34798e31bd6dc9e01000000fb514cf82103341a6fb68e883fb2c5ce0d0d186e9e09792839479bfb14adda2f498fc2dfaacf78009c635279827701219d54798277609dc0cf827701249dc0cf01147f785579a988557a5679567abb5479587f77547f75817c587f77547f7581a069c0ccc0c6a269c0cdc0c788c0d1c0ce88537a7ec0d28777776778519c6302e803c0ccc0c67b93a269c0cdc0c788c0d1c0ce88c0d2c0cf8777776778529c637b7cadc0cc022003a269c0cdc0c788c0d1c0ce88c0d2c0cf8777677c539dadc0cc022003a269c0cdc0c788c0d1c0ce88c0d2827701249dc0cf01147f75c0d201147f7b7b87916910000000000000000000000000000000008768686800000000bd9b073409d877028322f7286a4f4f0f6fd9213ae87f5dcb64fb575edf87f764020000006441fee8035fa13b02783daf398197af10ebb890820119fdddf0e6519039fb8b92e5e718c63da97a06fd4a0bebb3f6f5939d977b1a52d9185caa14512c2077a5bd4161210245496ebbf3d90fa94a395a3b6cc6852fbc621ee4147bbac0580a59d803cae8f80000000003e8030000000000004eef67bf363c2417af7fed5514fa1f489f845222f93d8a044a21b2706bba3c9146407203484710fe3ca1ae05aa20539be6c586e4f426a100e0bd56b3c0f765bea9d796e504f68f02ef992f26ac1487c0821700000000006aef5059621a87a140da4d8f83e456630be833cc7d7664e43fbbf481da5c3dfcb6b06124763d932c30ca45715f9861dc205243f1520bfafae94ae56760471000484710003f800000aa2076fbc08f5ba4bd098f0c0da12a13d5b229b68c6d7e3cbd197c90ec01ae116ab98758353900000000001976a914925e9bcecea0e9a129ede392a075da2ef03a22c188ac29230000';
+    final tx = BtcTransaction.deserialize(BytesUtils.fromHexString(data));
+    expect(tx.serialize(), data);
+  });
 }
diff --git a/test/psbt/builder/psbt_update_output_test.dart b/test/psbt/builder/psbt_update_output_test.dart
index 6f85441..0dda99d 100644
--- a/test/psbt/builder/psbt_update_output_test.dart
+++ b/test/psbt/builder/psbt_update_output_test.dart
@@ -190,10 +190,6 @@ void _test2() {
             0, PsbtTransactionOutput(amount: amount1, address: recipient2())),
         throwsA(isA<DartBitcoinPluginException>().having((p0) => p0.message,
             'error message', contains('Unable to modify output'))));
-    expect(
-        () => builder.removeOutput(0),
-        throwsA(isA<DartBitcoinPluginException>().having((p0) => p0.message,
-            'error message', contains('Unable to modify output'))));
     expect(builder.txOutputs().length, 1);
 
     sign(

From fca9a4bdfc9d71097167805f8a3be05aa95bdfd6 Mon Sep 17 00:00:00 2001
From: Rafael Saes <git@rafael.saes.dev>
Date: Thu, 10 Apr 2025 14:43:34 -0300
Subject: [PATCH 60/62] fix: UtxoWithAddress unnamed constructor

---
 lib/src/provider/models/utxo_details.dart | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/lib/src/provider/models/utxo_details.dart b/lib/src/provider/models/utxo_details.dart
index c199f74..9c7c847 100644
--- a/lib/src/provider/models/utxo_details.dart
+++ b/lib/src/provider/models/utxo_details.dart
@@ -51,15 +51,10 @@ class UtxoWithAddress {
   /// OwnerDetails is a UtxoAddressDetails instance containing information about the UTXO owner.
   final UtxoAddressDetails ownerDetails;
 
-  const UtxoWithAddress._({required this.utxo, required this.ownerDetails, required this.keyType});
-  factory UtxoWithAddress({required BitcoinUtxo utxo, required UtxoAddressDetails ownerDetails}) {
-    return UtxoWithAddress._(
-        utxo: utxo,
-        ownerDetails: ownerDetails,
-        keyType: ownerDetails.publicKey != null && !utxo.isSegwit
+  UtxoWithAddress({required this.utxo, required this.ownerDetails})
+      : keyType = ownerDetails.publicKey != null && !utxo.isSegwit
             ? BtcUtils.determinatePubKeyModeHex(ownerDetails.publicKey!)
-            : PublicKeyType.compressed);
-  }
+            : PublicKeyType.compressed;
 
   ECPublic public() {
     if (isMultiSig()) {

From 1a74961e9448d331a2d26099c616b8420a94681c Mon Sep 17 00:00:00 2001
From: Rafael Saes <git@rafael.saes.dev>
Date: Fri, 18 Apr 2025 08:41:29 -0300
Subject: [PATCH 61/62] feat: pass network to getDerivationFromType

---
 lib/src/bitcoin/address/derivations.dart | 19 +++++++++++++------
 lib/src/bitcoin/address/util.dart        | 21 ++++++++++++++++-----
 2 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/lib/src/bitcoin/address/derivations.dart b/lib/src/bitcoin/address/derivations.dart
index ee01a6c..44cfd00 100644
--- a/lib/src/bitcoin/address/derivations.dart
+++ b/lib/src/bitcoin/address/derivations.dart
@@ -54,20 +54,27 @@ enum BitcoinDerivationType { bip39, electrum }
 // Define constant paths
 abstract class BitcoinDerivationPaths {
   static const String ELECTRUM = "m/0'";
+  static const String NON_STANDARD = "m/0'";
+
+  // Legacy
   static const String BIP44 = "m/44'/0'/0'";
+  static const String BCH_BIP44 = "m/44'/145'/0'";
+
+  // Compatibility SegWit
   static const String BIP49 = "m/49'/0'/0'";
+
+  // Native SegWit
   static const String BIP84 = "m/84'/0'/0'";
+  static const String LITECOIN_BIP84 = "m/84'/2'/0'";
+
+  // Taproot
   static const String BIP86 = "m/86'/0'/0'";
-  static const String NON_STANDARD = "m/0'";
 
   static const String SILENT_PAYMENTS_SCAN = "m/352'/0'/0'/1'/0";
   static const String SILENT_PAYMENTS_SPEND = "m/352'/0'/0'/0'/0";
 
-  static const String LITECOIN = "m/84'/2'/0'";
   static const String LITECOIN_MWEB = "m/1000'";
 
-  static const String BCH = "m/44'/145'/0'";
-
   static const String SAMOURAI_BAD_BANK = "m/84'/0'/2147483644'";
   static const String SAMOURAI_WHIRLPOOL_PREMIX = "m/84'/0'/2147483645'";
   static const String SAMOURAI_WHIRLPOOL_POSTMIX = "m/84'/0'/2147483646'";
@@ -111,7 +118,7 @@ abstract class BitcoinDerivationInfos {
 
   static final BitcoinDerivationInfo LITECOIN = BitcoinDerivationInfo(
     derivationType: BitcoinDerivationType.bip39,
-    derivationPath: BitcoinDerivationPaths.LITECOIN,
+    derivationPath: BitcoinDerivationPaths.LITECOIN_BIP84,
     description: "Default Litecoin",
     scriptType: SegwitAddressType.p2wpkh,
   );
@@ -124,7 +131,7 @@ abstract class BitcoinDerivationInfos {
 
   static final BitcoinDerivationInfo BCH = BitcoinDerivationInfo(
     derivationType: BitcoinDerivationType.bip39,
-    derivationPath: BitcoinDerivationPaths.BCH,
+    derivationPath: BitcoinDerivationPaths.BCH_BIP44,
     description: "Bitcoin Cash (BCH) Default",
     scriptType: P2pkhAddressType.p2pkh,
   );
diff --git a/lib/src/bitcoin/address/util.dart b/lib/src/bitcoin/address/util.dart
index e52948f..2780c63 100644
--- a/lib/src/bitcoin/address/util.dart
+++ b/lib/src/bitcoin/address/util.dart
@@ -127,21 +127,32 @@ class BitcoinAddressUtils {
 
   static BitcoinDerivationInfo getDerivationFromType(
     BitcoinAddressType scriptType, {
+    required BasedUtxoNetwork network,
     bool? isElectrum = false,
   }) {
     switch (scriptType) {
       case P2pkhAddressType.p2pkh:
-        return BitcoinDerivationInfos.BIP44;
+        switch (network) {
+          case BitcoinCashNetwork.mainnet:
+            return BitcoinDerivationInfos.BCH;
+          default:
+            return BitcoinDerivationInfos.BIP44;
+        }
       case P2shAddressType.p2pkInP2sh:
       case P2shAddressType.p2pkhInP2sh:
       case P2shAddressType.p2wpkhInP2sh:
       case P2shAddressType.p2wshInP2sh:
         return BitcoinDerivationInfos.BIP49;
       case SegwitAddressType.p2wpkh:
-        if (isElectrum == true) {
-          return BitcoinDerivationInfos.ELECTRUM;
-        } else {
-          return BitcoinDerivationInfos.BIP84;
+        switch (network) {
+          case LitecoinNetwork.mainnet:
+            return BitcoinDerivationInfos.LITECOIN;
+          default:
+            if (isElectrum == true) {
+              return BitcoinDerivationInfos.ELECTRUM;
+            } else {
+              return BitcoinDerivationInfos.BIP84;
+            }
         }
       case SegwitAddressType.p2tr:
         return BitcoinDerivationInfos.BIP86;

From 29160733cbc4ef2c7b8c8fe9ed0297c9bffecfe2 Mon Sep 17 00:00:00 2001
From: Rafael Saes <git@rafael.saes.dev>
Date: Wed, 23 Apr 2025 07:04:52 -0300
Subject: [PATCH 62/62] feat: add p2sp to getDerivationFromType

---
 lib/src/bitcoin/address/util.dart | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/src/bitcoin/address/util.dart b/lib/src/bitcoin/address/util.dart
index 2780c63..a8db943 100644
--- a/lib/src/bitcoin/address/util.dart
+++ b/lib/src/bitcoin/address/util.dart
@@ -160,6 +160,8 @@ class BitcoinAddressUtils {
         return BitcoinDerivationInfos.BIP86;
       case SegwitAddressType.p2wsh:
         return BitcoinDerivationInfos.BIP84;
+      case SilentPaymentsAddresType.p2sp:
+        return BitcoinDerivationInfos.SILENT_PAYMENTS_SPEND;
       default:
         throw Exception("Derivation not available for $scriptType");
     }