Skip to content
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

Ripemd160 fix #8

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Ripemd160 fix #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6b3bf76
changes from 0.2.81
Aug 17, 2022
beede63
fix missing ripemd160 in openssl by creating a new one in this repo
Aug 17, 2022
b1be92c
fix curve order returning in mpz type by casting to int
Aug 17, 2022
73ce5a9
add __init__.py to utils
Aug 17, 2022
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
232 changes: 116 additions & 116 deletions btcpy/lib/opcodes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,122 +1,122 @@
class OpCodeConverter(object):

opcodes = [('OP_0', 0),
('OP_PUSHDATA1', 76),
('OP_PUSHDATA2', 77),
('OP_PUSHDATA4', 78),
('OP_1NEGATE', 79),
('OP_RESERVED', 80),
('OP_1', 81),
('OP_2', 82),
('OP_3', 83),
('OP_4', 84),
('OP_5', 85),
('OP_6', 86),
('OP_7', 87),
('OP_8', 88),
('OP_9', 89),
('OP_10', 90),
('OP_11', 91),
('OP_12', 92),
('OP_13', 93),
('OP_14', 94),
('OP_15', 95),
('OP_16', 96),
('OP_NOP', 97),
('OP_VER', 98),
('OP_IF', 99),
('OP_NOTIF', 100),
('OP_VERIF', 101),
('OP_VERNOTIF', 102),
('OP_ELSE', 103),
('OP_ENDIF', 104),
('OP_VERIFY', 105),
('OP_RETURN', 106),
('OP_TOALTSTACK', 107),
('OP_FROMALTSTACK', 108),
('OP_2DROP', 109),
('OP_2DUP', 110),
('OP_3DUP', 111),
('OP_2OVER', 112),
('OP_2ROT', 113),
('OP_2SWAP', 114),
('OP_IFDUP', 115),
('OP_DEPTH', 116),
('OP_DROP', 117),
('OP_DUP', 118),
('OP_NIP', 119),
('OP_OVER', 120),
('OP_PICK', 121),
('OP_ROLL', 122),
('OP_ROT', 123),
('OP_SWAP', 124),
('OP_TUCK', 125),
('OP_CAT', 126),
('OP_SUBSTR', 127),
('OP_LEFT', 128),
('OP_RIGHT', 129),
('OP_SIZE', 130),
('OP_INVERT', 131),
('OP_AND', 132),
('OP_OR', 133),
('OP_XOR', 134),
('OP_EQUAL', 135),
('OP_EQUALVERIFY', 136),
('OP_RESERVED1', 137),
('OP_RESERVED2', 138),
('OP_1ADD', 139),
('OP_1SUB', 140),
('OP_2MUL', 141),
('OP_2DIV', 142),
('OP_NEGATE', 143),
('OP_ABS', 144),
('OP_NOT', 145),
('OP_0NOTEQUAL', 146),
('OP_ADD', 147),
('OP_SUB', 148),
('OP_MUL', 149),
('OP_DIV', 150),
('OP_MOD', 151),
('OP_LSHIFT', 152),
('OP_RSHIFT', 153),
('OP_BOOLAND', 154),
('OP_BOOLOR', 155),
('OP_NUMEQUAL', 156),
('OP_NUMEQUALVERIFY', 157),
('OP_NUMNOTEQUAL', 158),
('OP_LESSTHAN', 159),
('OP_GREATERTHAN', 160),
('OP_LESSTHANOREQUAL', 161),
('OP_GREATERTHANOREQUAL', 162),
('OP_MIN', 163),
('OP_MAX', 164),
('OP_WITHIN', 165),
('OP_RIPEMD160', 166),
('OP_SHA1', 167),
('OP_SHA256', 168),
('OP_HASH160', 169),
('OP_HASH256', 170),
('OP_CODESEPARATOR', 171),
('OP_CHECKSIG', 172),
('OP_CHECKSIGVERIFY', 173),
('OP_CHECKMULTISIG', 174),
('OP_CHECKMULTISIGVERIFY', 175),
('OP_NOP1', 176),
('OP_NOP2', 177),
('OP_CHECKLOCKTIMEVERIFY', 177),
('OP_NOP3', 178),
('OP_CHECKSEQUENCEVERIFY', 178),
('OP_NOP4', 179),
('OP_NOP5', 180),
('OP_NOP6', 181),
('OP_NOP7', 182),
('OP_NOP8', 183),
('OP_NOP9', 184),
('OP_NOP10', 185),
('OP_NULLDATA', 252),
('OP_PUBKEYHASH', 253),
('OP_PUBKEY', 254),
('OP_INVALIDOPCODE', 255), ]
('OP_PUSHDATA1', 76),
('OP_PUSHDATA2', 77),
('OP_PUSHDATA4', 78),
('OP_1NEGATE', 79),
('OP_RESERVED', 80),
('OP_1', 81),
('OP_2', 82),
('OP_3', 83),
('OP_4', 84),
('OP_5', 85),
('OP_6', 86),
('OP_7', 87),
('OP_8', 88),
('OP_9', 89),
('OP_10', 90),
('OP_11', 91),
('OP_12', 92),
('OP_13', 93),
('OP_14', 94),
('OP_15', 95),
('OP_16', 96),
('OP_NOP', 97),
('OP_VER', 98),
('OP_IF', 99),
('OP_NOTIF', 100),
('OP_VERIF', 101),
('OP_VERNOTIF', 102),
('OP_ELSE', 103),
('OP_ENDIF', 104),
('OP_VERIFY', 105),
('OP_RETURN', 106),
('OP_TOALTSTACK', 107),
('OP_FROMALTSTACK', 108),
('OP_2DROP', 109),
('OP_2DUP', 110),
('OP_3DUP', 111),
('OP_2OVER', 112),
('OP_2ROT', 113),
('OP_2SWAP', 114),
('OP_IFDUP', 115),
('OP_DEPTH', 116),
('OP_DROP', 117),
('OP_DUP', 118),
('OP_NIP', 119),
('OP_OVER', 120),
('OP_PICK', 121),
('OP_ROLL', 122),
('OP_ROT', 123),
('OP_SWAP', 124),
('OP_TUCK', 125),
('OP_CAT', 126),
('OP_SUBSTR', 127),
('OP_LEFT', 128),
('OP_RIGHT', 129),
('OP_SIZE', 130),
('OP_INVERT', 131),
('OP_AND', 132),
('OP_OR', 133),
('OP_XOR', 134),
('OP_EQUAL', 135),
('OP_EQUALVERIFY', 136),
('OP_RESERVED1', 137),
('OP_RESERVED2', 138),
('OP_1ADD', 139),
('OP_1SUB', 140),
('OP_2MUL', 141),
('OP_2DIV', 142),
('OP_NEGATE', 143),
('OP_ABS', 144),
('OP_NOT', 145),
('OP_0NOTEQUAL', 146),
('OP_ADD', 147),
('OP_SUB', 148),
('OP_MUL', 149),
('OP_DIV', 150),
('OP_MOD', 151),
('OP_LSHIFT', 152),
('OP_RSHIFT', 153),
('OP_BOOLAND', 154),
('OP_BOOLOR', 155),
('OP_NUMEQUAL', 156),
('OP_NUMEQUALVERIFY', 157),
('OP_NUMNOTEQUAL', 158),
('OP_LESSTHAN', 159),
('OP_GREATERTHAN', 160),
('OP_LESSTHANOREQUAL', 161),
('OP_GREATERTHANOREQUAL', 162),
('OP_MIN', 163),
('OP_MAX', 164),
('OP_WITHIN', 165),
('OP_RIPEMD160', 166),
('OP_SHA1', 167),
('OP_SHA256', 168),
('OP_HASH160', 169),
('OP_HASH256', 170),
('OP_CODESEPARATOR', 171),
('OP_CHECKSIG', 172),
('OP_CHECKSIGVERIFY', 173),
('OP_CHECKMULTISIG', 174),
('OP_CHECKMULTISIGVERIFY', 175),
('OP_NOP1', 176),
('OP_NOP2', 177),
('OP_CHECKLOCKTIMEVERIFY', 177),
('OP_NOP3', 178),
('OP_CHECKSEQUENCEVERIFY', 178),
('OP_NOP4', 179),
('OP_NOP5', 180),
('OP_NOP6', 181),
('OP_NOP7', 182),
('OP_NOP8', 183),
('OP_NOP9', 184),
('OP_NOP10', 185),
('OP_NULLDATA', 252),
('OP_PUBKEYHASH', 253),
('OP_PUBKEY', 254),
('OP_INVALIDOPCODE', 255), ]

_opcode_to_int_dict = {op: num for op, num in opcodes}
_int_to_opcode_dict = dict({num: op for op, num in opcodes})
Expand Down
6 changes: 3 additions & 3 deletions btcpy/structs/crypto.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
from functools import partial
from abc import ABCMeta

from btcpy.utils.py_ripemd160 import ripemd160
from ..lib.base58 import b58decode_check, b58encode_check
from ..lib.types import HexSerializable
from .address import Address, SegWitAddress
Expand Down Expand Up @@ -197,9 +198,8 @@ def hash(self):
import hashlib
original = self.uncompressed if self.type == 'uncompressed' else self.compressed
sha = hashlib.sha256(original).digest()
ripe = hashlib.new('ripemd160')
ripe.update(sha)
return bytearray(ripe.digest())
ripe = ripemd160(sha)
return bytearray(ripe)

def serialize(self):
return self.uncompressed if self.type == 'uncompressed' else self.compressed
Expand Down
Loading