From 63b85b9100fc29ff3d010033ad1b3abf6381a9a2 Mon Sep 17 00:00:00 2001
From: andreasgriffin <andreasgriffin@proton.me>
Date: Fri, 7 Apr 2023 09:49:22 +0200
Subject: [PATCH] Add from_script method to Address type

---
 bdk-ffi/src/bdk.udl          |  3 +++
 bdk-ffi/src/lib.rs           |  7 +++++++
 bdk-python/tests/__init__.py |  0
 bdk-python/tests/test_bdk.py | 17 ++++++++++++++++-
 4 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 bdk-python/tests/__init__.py

diff --git a/bdk-ffi/src/bdk.udl b/bdk-ffi/src/bdk.udl
index c586dd2..032af86 100644
--- a/bdk-ffi/src/bdk.udl
+++ b/bdk-ffi/src/bdk.udl
@@ -446,6 +446,9 @@ interface Address {
   [Throws=BdkError]
   constructor(string address);
 
+  [Name=from_script, Throws=BdkError]
+  constructor(Script script, Network network);
+
   Payload payload();
 
   Network network();
diff --git a/bdk-ffi/src/lib.rs b/bdk-ffi/src/lib.rs
index 07c79cd..4c1e70b 100644
--- a/bdk-ffi/src/lib.rs
+++ b/bdk-ffi/src/lib.rs
@@ -364,6 +364,13 @@ impl Address {
             .map_err(|e| BdkError::Generic(e.to_string()))
     }
 
+    /// alternative constructor
+    fn from_script(script: Arc<Script>, network: Network) -> Result<Self, BdkError> {
+        BdkAddress::from_script(&script.script, network)
+            .map(|a| Address { address: a })
+            .map_err(|e| BdkError::Generic(e.to_string()))
+    }
+
     fn payload(&self) -> Payload {
         match &self.address.payload.clone() {
             BdkPayload::PubkeyHash(pubkey_hash) => Payload::PubkeyHash {
diff --git a/bdk-python/tests/__init__.py b/bdk-python/tests/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/bdk-python/tests/test_bdk.py b/bdk-python/tests/test_bdk.py
index 379f7f6..a5d2edd 100644
--- a/bdk-python/tests/test_bdk.py
+++ b/bdk-python/tests/test_bdk.py
@@ -43,6 +43,21 @@ class TestSimpleBip84Wallet(unittest.TestCase):
         # print(f"Balance is {balance.total} sat")
         assert balance.total > 0, "Balance is 0, send testnet coins to tb1qzg4mckdh50nwdm9hkzq06528rsu73hjxxzem3e"
 
-
+    def test_output_address_from_script_pubkey(self):
+        wallet = bdk.Wallet(
+            descriptor=descriptor,
+            change_descriptor=None,
+            network=bdk.Network.TESTNET,
+            database_config=db_config,
+        )
+        wallet.sync(blockchain, None)
+        first_tx = list(wallet.list_transactions(True))[0]
+        assert first_tx.txid == '35d3de8dd429ec4c9684168c1fbb9a4fb6db6f2ce89be214a024657a73ef4908'
+        
+        output1, output2 = list(first_tx.transaction.output())
+        
+        assert bdk.Address.from_script(output1.script_pubkey, bdk.Network.TESTNET).as_string() == 'tb1qw6ly2te8k9vy2mwj3g6gx82hj7hc8f5q3vry8t'
+        assert bdk.Address.from_script(output2.script_pubkey, bdk.Network.TESTNET).as_string() == 'tb1qzsvpnmme78yl60j7ldh9aqvhvxr4mz7mjpmh22'
+        
 if __name__ == '__main__':
     unittest.main()