implement-payjoin

cw_bitcoin/lib/address_from_output.dart

@@ -2,22 +2,36 @@ import 'package:bitcoin_base/bitcoin_base.dart';
 
 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:
-    }
+    return addressFromScript(script, network).toAddress(network);
   } catch (_) {}
 
   return '';
 }
+
+BitcoinBaseAddress addressFromScript(Script script,
+    [BasedUtxoNetwork network = BitcoinNetwork.mainnet]) {
+  final addressType = script.getAddressType();
+  if (addressType == null) {
+    throw ArgumentError("Invalid script");
+  }
+
+  switch (addressType) {
+    case P2pkhAddressType.p2pkh:
+      return P2pkhAddress.fromScriptPubkey(
+          script: script, network: BitcoinNetwork.mainnet);
+    case P2shAddressType.p2pkhInP2sh:
+      return P2shAddress.fromScriptPubkey(
+          script: script, network: BitcoinNetwork.mainnet);
+    case SegwitAddresType.p2wpkh:
+      return P2wpkhAddress.fromScriptPubkey(
+          script: script, network: BitcoinNetwork.mainnet);
+    case SegwitAddresType.p2wsh:
+      return P2wshAddress.fromScriptPubkey(
+          script: script, network: BitcoinNetwork.mainnet);
+    case SegwitAddresType.p2tr:
+      return P2trAddress.fromScriptPubkey(
+          script: script, network: BitcoinNetwork.mainnet);
+  }
+
+  throw ArgumentError("Invalid script");
+}

cw_bitcoin/lib/bitcoin_transaction_credentials.dart

@@ -3,11 +3,17 @@ import 'package:cw_core/output_info.dart';
 import 'package:cw_core/unspent_coin_type.dart';
 
 class BitcoinTransactionCredentials {
-  BitcoinTransactionCredentials(this.outputs,
-      {required this.priority, this.feeRate, this.coinTypeToSpendFrom = UnspentCoinType.any});
+  BitcoinTransactionCredentials(
+    this.outputs, {
+    required this.priority,
+    this.feeRate,
+    this.coinTypeToSpendFrom = UnspentCoinType.any,
+    this.payjoinUri,
+  });
 
   final List<OutputInfo> outputs;
   final BitcoinTransactionPriority? priority;
   final int? feeRate;
   final UnspentCoinType coinTypeToSpendFrom;
+  final String? payjoinUri;
 }