Implement signer p2wsh-p2ms

Author: mohanson

example/regtest.py

@@ -13,6 +13,8 @@
     f'sh(wpkh({pub2.sec().hex()}))',
     f'wpkh({pub1.sec().hex()})',
     f'wpkh({pub2.sec().hex()})',
+    f'wsh(multi(2,{pub1.sec().hex()},{pub2.sec().hex()}))',
+    f'wsh(multi(2,{pub2.sec().hex()},{pub1.sec().hex()}))',
     f'tr({pub1.sec().hex()})',
     f'tr({pub2.sec().hex()})',
 ]:
@@ -25,5 +27,6 @@
 pabtc.rpc.generate_to_address(10, pabtc.core.Address.p2sh_p2ms(2, [pub1, pub2]))
 pabtc.rpc.generate_to_address(10, pabtc.core.Address.p2sh_p2wpkh(pub1.hash()))
 pabtc.rpc.generate_to_address(10, pabtc.core.Address.p2wpkh(pub1.hash()))
+pabtc.rpc.generate_to_address(10, pabtc.core.Address.p2wsh_p2ms(2, [pub1, pub2]))
 pabtc.rpc.generate_to_address(10, pabtc.core.Address.p2tr(pub1.tr(bytearray())))
 pabtc.rpc.generate_to_address(99, pabtc.core.Address.p2pkh(pub1.hash()))

pabtc/wallet.py

@@ -171,6 +171,7 @@ def json(self) -> typing.Dict:
             'prikey': [e.json() for e in self.prikey],
             'pubkey': [e.json() for e in self.pubkey],
             'redeem': self.redeem.hex(),
+            'redeem_hash': self.redeem_hash.hex(),
             'script': self.script.hex(),
             'addr': self.addr,
         }
@@ -240,6 +241,41 @@ def sign(self, tx: pabtc.core.Transaction) -> None:
             e.witness = [s, self.pubkey.sec()]
 
 
+class Signerp2wshp2ms(Signer):
+    def __init__(self, prikey: typing.List[pabtc.core.PriKey], pubkey: typing.List[pabtc.core.PubKey]) -> None:
+        self.prikey = prikey
+        self.pubkey = pubkey
+        self.redeem = pabtc.core.ScriptPubKey.p2ms(len(prikey), pubkey)
+        self.redeem_hash = pabtc.core.hashwsh(self.redeem)
+        self.script = pabtc.core.ScriptPubKey.p2wsh(self.redeem_hash)
+        self.addr = pabtc.core.Address.p2wsh(self.redeem_hash)
+
+    def __repr__(self) -> str:
+        return json.dumps(self.json())
+
+    def json(self) -> typing.Dict:
+        return {
+            'prikey': [e.json() for e in self.prikey],
+            'pubkey': [e.json() for e in self.pubkey],
+            'redeem': self.redeem.hex(),
+            'redeem_hash': self.redeem_hash.hex(),
+            'script': self.script.hex(),
+            'addr': self.addr,
+        }
+
+    def sign(self, tx: pabtc.core.Transaction) -> None:
+        for i, e in enumerate(tx.vin):
+            # The op_checkmultisig opcode has a bug where it pops one extra element off the stack than it needs to.
+            # This is why the witness includes an extra "dummy value" (00) before the signatures when using a p2ms as
+            # the Witness Script.
+            sig = [bytearray()]
+            for prikey in self.prikey:
+                s = prikey.sign_ecdsa_der(tx.digest_segwit_v0(i, pabtc.core.sighash_all, self.redeem))
+                s.append(pabtc.core.sighash_all)
+                sig.append(s)
+            e.witness = sig + [self.redeem]
+
+
 class Signerp2tr(Signer):
     def __init__(self, prikey: pabtc.core.PriKey, merkle: bytearray) -> None:
         self.prikey = prikey

test/test_wallet.py

@@ -12,6 +12,10 @@ def test_wallet_transfer():
         ),
         pabtc.wallet.Wallet(pabtc.wallet.Signerp2shp2wpkh(pabtc.core.PriKey(1))),
         pabtc.wallet.Wallet(pabtc.wallet.Signerp2wpkh(pabtc.core.PriKey(1))),
+        pabtc.wallet.Wallet(pabtc.wallet.Signerp2wshp2ms(
+            [pabtc.core.PriKey(e) for e in [1, 2]],
+            [pabtc.core.PriKey(e).pubkey() for e in [1, 2]]),
+        ),
         pabtc.wallet.Wallet(pabtc.wallet.Signerp2tr(pabtc.core.PriKey(1), bytearray())),
     ]
     mate_list = [
@@ -22,6 +26,10 @@ def test_wallet_transfer():
         ),
         pabtc.wallet.Wallet(pabtc.wallet.Signerp2shp2wpkh(pabtc.core.PriKey(2))),
         pabtc.wallet.Wallet(pabtc.wallet.Signerp2wpkh(pabtc.core.PriKey(2))),
+        pabtc.wallet.Wallet(pabtc.wallet.Signerp2wshp2ms(
+            [pabtc.core.PriKey(e) for e in [2, 1]],
+            [pabtc.core.PriKey(e).pubkey() for e in [2, 1]]),
+        ),
         pabtc.wallet.Wallet(pabtc.wallet.Signerp2tr(pabtc.core.PriKey(2), bytearray())),
     ]
     for user, mate in itertools.product(user_list, mate_list):