Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 9 additions & 1 deletion src/psbt.c
Original file line number Diff line number Diff line change
Expand Up @@ -2877,7 +2877,9 @@ int wally_psbt_from_bytes(const unsigned char *bytes, size_t len,
}

if (ret == WALLY_OK && (*output)->version == PSBT_2) {
if ((*output)->tx_version < 2)
if ((*output)->tx)
ret = WALLY_EINVAL; /* v2 cannot have a tx, even when parsing loosely */
else if ((*output)->tx_version < 2)
ret = WALLY_EINVAL; /* Tx version must be >= 2 */
else {
struct wally_psbt tmp;
Expand Down Expand Up @@ -3960,6 +3962,9 @@ static int psbt_combine(struct wally_psbt *psbt, const struct wally_psbt *src,
#ifdef BUILD_ELEMENTS
if (ret == WALLY_OK && is_pset) {
psbt->pset_modifiable_flags |= src->pset_modifiable_flags;
if (mem_is_zero(psbt->genesis_blockhash, sizeof(psbt->genesis_blockhash)))
memcpy(psbt->genesis_blockhash, src->genesis_blockhash,
sizeof(psbt->genesis_blockhash));
ret = wally_map_combine(&psbt->global_scalars, &src->global_scalars);
}
#endif /* BUILD_ELEMENTS */
Expand Down Expand Up @@ -4320,6 +4325,9 @@ int wally_psbt_set_version(struct wally_psbt *psbt,
if (!psbt_is_valid(psbt) || flags || (version != PSBT_0 && version != PSBT_2))
return WALLY_EINVAL;

if (psbt->version == PSBT_0 && version == PSBT_2 && !psbt->tx)
return WALLY_EINVAL; /* Nothing to upgrade from */

if (psbt->version == version)
return WALLY_OK; /* No-op */

Expand Down
67 changes: 67 additions & 0 deletions src/test/test_psbt.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,73 @@ def test_invalid(self):
for case in JSON['invalid']:
wally_psbt_free(self.parse_base64(case['psbt'], WALLY_EINVAL))

def test_v2_global_tx_loose(self):
"""A v2 PSBT cannot hold a global tx, even when parsing loosely"""
FLAG_LOOSE = 0x2 # WALLY_PSBT_PARSE_FLAG_LOOSE
version = '01fb0402000000'
tx = '0200000001' + '11' * 32 + '0000000000ffffffff01' + '00' * 8 + '015100000000'
global_tx = '0100' + '%02x' % (len(tx) // 2) + tx

def parse(globals_hex):
buf, buf_len = make_cbuffer('70736274ff' + globals_hex + '00')
psbt = pointer(wally_psbt())
ret = wally_psbt_from_bytes(buf, buf_len, FLAG_LOOSE, psbt)
if ret == WALLY_OK:
wally_psbt_free(psbt)
return ret

self.assertEqual(parse(version), WALLY_OK)
# The tx is refused wherever it appears relative to the version
self.assertEqual(parse(global_tx + version), WALLY_EINVAL)
self.assertEqual(parse(version + global_tx), WALLY_EINVAL)

def test_set_version_without_tx(self):
"""A v0 PSBT with no global tx cannot be upgraded to v2"""
FLAG_LOOSE = 0x2 # WALLY_PSBT_PARSE_FLAG_LOOSE
empty = pointer(wally_psbt())
self.assertEqual(wally_psbt_init_alloc(0, 0, 0, 0, 0, empty), WALLY_OK)
buf, buf_len = make_cbuffer('70736274ff00')
loose = pointer(wally_psbt())
self.assertEqual(wally_psbt_from_bytes(buf, buf_len, FLAG_LOOSE, loose),
WALLY_OK)
for psbt in [empty, loose]:
self.assertEqual(wally_psbt_set_version(psbt, 0, 0), WALLY_OK)
self.assertEqual(wally_psbt_set_version(psbt, 0, 2), WALLY_EINVAL)
self.assertEqual(wally_psbt_get_version(psbt), (WALLY_OK, 0))
wally_psbt_free(psbt)

def test_pset_genesis_blockhash(self):
"""Cloning or combining a PSET keeps its genesis blockhash"""
if not wally_is_elements_build()[1]:
self.skipTest('Requires an elements build')
genesis, genesis_len = make_cbuffer('77' * 32)
out, out_len = make_cbuffer('00' * 32)

def get_genesis(psbt):
ret, written = wally_psbt_get_global_genesis_blockhash(psbt, out, out_len)
self.assertEqual(ret, WALLY_OK)
return bytes(out[:written])

src, empty, clone = [pointer(wally_psbt()) for _ in range(3)]
for psbt in [src, empty]:
self.assertEqual(wally_psbt_init_alloc(2, 0, 0, 0, INIT_PSET, psbt), WALLY_OK)
self.assertEqual(wally_psbt_set_global_genesis_blockhash(src, genesis, genesis_len),
WALLY_OK)
self.assertEqual(wally_psbt_clone_alloc(src, 0, clone), WALLY_OK)
self.assertEqual(get_genesis(clone), bytes(genesis))
self.assertEqual(self.to_base64(clone), self.to_base64(src))
# Combining fills in a missing hash and keeps an existing one
self.assertEqual(get_genesis(empty), b'')
self.assertEqual(wally_psbt_combine(empty, src), WALLY_OK)
self.assertEqual(get_genesis(empty), bytes(genesis))
other, other_len = make_cbuffer('88' * 32)
self.assertEqual(wally_psbt_set_global_genesis_blockhash(src, other, other_len),
WALLY_OK)
self.assertEqual(wally_psbt_combine(empty, src), WALLY_OK)
self.assertEqual(get_genesis(empty), bytes(genesis))
for psbt in [src, empty, clone]:
wally_psbt_free(psbt)

def test_valid(self):
"""Test deserializing and roundtripping valid PSBTs"""
buf, buf_len = make_cbuffer('00' * 4096)
Expand Down