aljaz/nutshell
1
0
Fork 0
mirror of https://github.com/aljazceru/nutshell.git synced 2026-01-04 09:24:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactor secret conditions (#350)

Browse Source 
* refactor spending conditions and add comments

* fix kind enum deserialization
This commit is contained in:
callebtc
2023-10-21 16:51:12 +02:00
committed by GitHub
parent 0490f20932
commit 48f732e9e7
8 changed files with 301 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cashu/wallet/p2pk.py
View File

@@ -49,12 +49,14 @@ class WalletP2PK(SupportsPrivateKey, SupportsDb):
tags["locktime"] = str(
int((datetime.now() + timedelta(seconds=locktime_seconds)).timestamp())
)
tags["sigflag"] = SigFlags.SIG_ALL if sig_all else SigFlags.SIG_INPUTS
tags["sigflag"] = (
SigFlags.SIG_ALL.value if sig_all else SigFlags.SIG_INPUTS.value
)
if n_sigs > 1:
tags["n_sigs"] = str(n_sigs)
logger.debug(f"After tags: {tags}")
return P2PKSecret(
kind=SecretKind.P2PK,
kind=SecretKind.P2PK.value,
data=pubkey,
tags=tags,
)
@@ -182,7 +184,9 @@ class WalletP2PK(SupportsPrivateKey, SupportsDb):
return proofs
logger.debug("Spending conditions detected.")
# P2PK signatures
if all([Secret.deserialize(p.secret).kind == SecretKind.P2PK for p in proofs]):
if all(
[Secret.deserialize(p.secret).kind == SecretKind.P2PK.value for p in proofs]
):
logger.debug("P2PK redemption detected.")
proofs = await self.add_p2pk_witnesses_to_proofs(proofs)