RanchiMall/pyflo
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix parse and decode invalid OP_RETURN script

Browse Source
This commit is contained in:
4tochka 2019-04-01 21:22:44 +03:00
parent a560fd3440
commit 9f39599182
1 changed files with 42 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
pybtc/functions/script.py
View File

@ -75,8 +75,9 @@ def parse_script(script, segwit=True):
if script[1] == l - 2: if script[1] == l - 2:
return {"nType": 3, "type": "NULL_DATA", "reqSigs": 0, "data": script[2:]} return {"nType": 3, "type": "NULL_DATA", "reqSigs": 0, "data": script[2:]}
elif script[1] == OPCODE["OP_PUSHDATA1"]: elif script[1] == OPCODE["OP_PUSHDATA1"]:
if script[2] == l - 3 and script[2] <= 80: if l > 2:
return {"nType": 3, "type": "NULL_DATA", "reqSigs": 0, "data": script[3:]} if script[2] == l - 3 and script[2] <= 80:
return {"nType": 3, "type": "NULL_DATA", "reqSigs": 0, "data": script[3:]}
return {"nType": 8, "type": "NULL_DATA_NON_STANDARD", "reqSigs": 0, "script": script} return {"nType": 8, "type": "NULL_DATA_NON_STANDARD", "reqSigs": 0, "script": script}
if script[0] >= 81 and script[0] <= 96: if script[0] >= 81 and script[0] <= 96:
if script[-1] == 174: if script[-1] == 174:
@ -183,43 +184,48 @@ def decode_script(script, asm=False):
s = 0 s = 0
result = [] result = []
append = result.append append = result.append
while l - s > 0: try:
if script[s] < 0x4c and script[s]: while l - s > 0:
if asm: if script[s] < 0x4c and script[s]:
append(script[s + 1:s + 1 + script[s]].hex()) if asm:
else: append(script[s + 1:s + 1 + script[s]].hex())
append('[%s]' % script[s]) else:
s += script[s] + 1 append('[%s]' % script[s])
continue s += script[s] + 1
continue
if script[s] == OPCODE["OP_PUSHDATA1"]: if script[s] == OPCODE["OP_PUSHDATA1"]:
ld = script[s + 1] if asm:
if asm: ld = script[s + 1]
append(script[s + 1:s + 1 + ld].hex()) append(script[s + 1:s + 1 + ld].hex())
else:
append(RAW_OPCODE[script[s]])
ld = script[s + 1]
append('[%s]' % ld)
s += 1 + script[s + 1] + 1
elif script[s] == OPCODE["OP_PUSHDATA2"]:
if asm:
ld = unpack('<H', script[s + 1: s + 3])[0]
append(script[s + 1:s + 1 + ld].hex())
else:
ld = unpack('<H', script[s + 1: s + 3])[0]
append(RAW_OPCODE[script[s]])
append('[%s]' % ld)
s += 2 + 1 + ld
elif script[s] == OPCODE["OP_PUSHDATA4"]:
if asm:
ld = unpack('<L', script[s + 1: s + 5])[0]
append(script[s + 1:s + 1 + ld].hex())
else:
ld = unpack('<L', script[s + 1: s + 5])[0]
append(RAW_OPCODE[script[s]])
append('[%s]' % ld)
s += 5 + 1 + ld
else: else:
append(RAW_OPCODE[script[s]]) append(RAW_OPCODE[script[s]])
append('[%s]' % ld) s += 1
s += 1 + script[s + 1] + 1 except:
elif script[s] == OPCODE["OP_PUSHDATA2"]: append("[SCRIPT_DECODE_FAILED]")
ld = unpack('<H', script[s + 1: s + 3])[0]
if asm:
append(script[s + 1:s + 1 + ld].hex())
else:
append(RAW_OPCODE[script[s]])
append('[%s]' % ld)
s += 2 + 1 + ld
elif script[s] == OPCODE["OP_PUSHDATA4"]:
ld = unpack('<L', script[s + 1: s + 5])[0]
if asm:
append(script[s + 1:s + 1 + ld].hex())
else:
append(RAW_OPCODE[script[s]])
append('[%s]' % ld)
s += 5 + 1 + ld
else:
append(RAW_OPCODE[script[s]])
s += 1
return ' '.join(result) return ' '.join(result)