Merge 68ca8677e0 into merged_master (Bitcoin PR bitcoin/bitcoin#23716)

This commit is contained in:
Byron Hambly 2023-06-06 10:11:17 +00:00
commit 1413ea774b
2 changed files with 133 additions and 2 deletions

View file

@ -8,7 +8,6 @@ This file is modified from python-bitcoinlib.
"""
from collections import namedtuple
import hashlib
import struct
import unittest
from typing import List, Dict
@ -29,6 +28,8 @@ from .messages import (
uint256_from_str,
)
from .ripemd160 import ripemd160
MAX_SCRIPT_ELEMENT_SIZE = 520
LOCKTIME_THRESHOLD = 500000000
ANNEX_TAG = 0x50
@ -36,7 +37,7 @@ ANNEX_TAG = 0x50
LEAF_VERSION_TAPSCRIPT = 0xc4
def hash160(s):
return hashlib.new('ripemd160', sha256(s)).digest()
return ripemd160(sha256(s))
def bn2vch(v):
"""Convert number to bitcoin-specific little endian format."""