Skip to content

BIP352: complete type annotations on bitcoin_utils class methods #2160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
omipheo wants to merge 1 commit into
base: master
Choose a base branch
from
+18 −11
Open

BIP352: complete type annotations on bitcoin_utils class methods #2160

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 18 additions & 11 deletions bip-0352/bitcoin_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from io import BytesIO
from ripemd160 import ripemd160
from secp256k1lab.secp256k1 import Scalar
from typing import List, Union
from typing import List, Optional, Union


def from_hex(hex_string: str) -> BytesIO:
Expand Down Expand Up @@ -65,25 +65,32 @@ def deser_string_vector(f: BytesIO) -> List[bytes]:
class COutPoint:
__slots__ = ("hash", "n",)

def __init__(self, hash=b"", n=0,):
def __init__(self, hash: bytes = b"", n: int = 0) -> None:
self.hash = hash
self.n = n

def serialize(self):
def serialize(self) -> bytes:
r = b""
r += self.hash
r += struct.pack("<I", self.n)
return r

def deserialize(self, f):
def deserialize(self, f: BytesIO) -> None:
self.hash = f.read(32)
self.n = struct.unpack("<I", f.read(4))[0]


class VinInfo:
__slots__ = ("outpoint", "scriptSig", "txinwitness", "prevout", "private_key")

def __init__(self, outpoint=None, scriptSig=b"", txinwitness=None, prevout=b"", private_key=None):
def __init__(
self,
outpoint: Optional["COutPoint"] = None,
scriptSig: bytes = b"",
txinwitness: Optional["CTxInWitness"] = None,
prevout: bytes = b"",
private_key: Optional[Scalar] = None,
) -> None:
if outpoint is None:
self.outpoint = COutPoint()
else:
Expand All @@ -103,11 +110,11 @@ def __init__(self, outpoint=None, scriptSig=b"", txinwitness=None, prevout=b"",
class CScriptWitness:
__slots__ = ("stack",)

def __init__(self):
def __init__(self) -> None:
# stack is a vector of strings
self.stack = []
self.stack: List[bytes] = []

def is_null(self):
def is_null(self) -> bool:
if self.stack:
return False
return True
Expand All @@ -116,14 +123,14 @@ def is_null(self):
class CTxInWitness:
__slots__ = ("scriptWitness",)

def __init__(self):
def __init__(self) -> None:
self.scriptWitness = CScriptWitness()

def deserialize(self, f: BytesIO):
def deserialize(self, f: BytesIO) -> "CTxInWitness":
self.scriptWitness.stack = deser_string_vector(f)
return self

def is_null(self):
def is_null(self) -> bool:
return self.scriptWitness.is_null()


Expand Down