Fix merging of global unknown data in PSBTs
ClosedPublic
Actions

Authored by deadalnix on Nov 17 2019, 17:46.

Details

Reviewers

Group Reviewers

Restricted Project

Commits

rSTAGING6baa2c0642de: Fix merging of global unknown data in PSBTs
rABC6baa2c0642de: Fix merging of global unknown data in PSBTs

Summary

Actually merge the global unknown key-value pairs.

Add a test for merging unknown key-value pairs.

This is a partial backport of Core PR13721 : https://github.com/bitcoin/bitcoin/pull/13721/commits/fad231ad41e12b7047deb64220942ca8cb8357bc

Depends on D4456

Test Plan

make check
./test/functional/test_runner.py

Diff Detail

Repository

rABC Bitcoin ABC

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

deadalnix created this revision.Nov 17 2019, 17:46

Herald added a reviewer: Restricted Project. · View Herald TranscriptNov 17 2019, 17:46

Build Bitcoin-ABC / Diffs / Diff Testing started.

Build Bitcoin-ABC / Diffs / Diff Testing passed.

Harbormaster completed remote builds in B8138: Diff 14164.Nov 17 2019, 17:58

Fabien accepted this revision.Nov 18 2019, 08:44

This revision is now accepted and ready to land.Nov 18 2019, 08:44

Closed by commit rABC6baa2c0642de: Fix merging of global unknown data in PSBTs (authored by Andrew Chow <achow101-github@achow101.com>, committed by deadalnix). · Explain WhyNov 18 2019, 13:36

This revision was automatically updated to reflect the committed changes.

deadalnix added a commit: rABC6baa2c0642de: Fix merging of global unknown data in PSBTs.

deadalnix added a commit: rSTAGING6baa2c0642de: Fix merging of global unknown data in PSBTs.Apr 7 2020, 21:42

Revision Contents
Changeset List

Path

Size

src/

script/

sign.cpp

1 line

test/

functional/

data/

rpc_psbt.json

7 lines

Diff 14175

View Options

src/script/sign.cpp