Skip to content

Backport 8824#2968

Merged
UdjinM6 merged 5 commits intodashpay:developfrom
PastaPastaPasta:backport-8824
Jun 11, 2019
Merged

Backport 8824#2968
UdjinM6 merged 5 commits intodashpay:developfrom
PastaPastaPasta:backport-8824

Conversation

@PastaPastaPasta
Copy link
Member

I feel like the vsize lines are useless, but might result in conflicts if we remove them

@UdjinM6 UdjinM6 added the RPC Some notable changes to RPC params/behaviour/descriptions label Jun 6, 2019
0ff9320 refactor TxToJSON() and ScriptPubKeyToJSON() (jonnynewbs)

Tree-SHA512: caf7d590829e221522edd5b1ab8ce67b53a2c6986d3bbe8477eab420b1007bf60f885ed0a25ba9587e468c00768360ddc31db37847e862858573eaed5ed8b0d6
@PastaPastaPasta
Copy link
Member Author

PastaPastaPasta commented Jun 9, 2019

rebased and ffed to trigger tests

also, removed vsize which seems to have been causing tests to fail

@UdjinM6
Copy link

UdjinM6 commented Jun 9, 2019

Yep, vsize was one of the issues. Pls see https://github.com/UdjinM6/dash/commits/pr2968 for more fixes (Travis: https://travis-ci.org/UdjinM6/dash/builds/543161061).

@PastaPastaPasta
Copy link
Member Author

Looks good, cherry-picked

Copy link

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK

@UdjinM6 UdjinM6 added this to the 14.1 milestone Jun 10, 2019
@UdjinM6 UdjinM6 requested a review from codablock June 10, 2019 12:19
Copy link

@codablock codablock left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK

@UdjinM6 UdjinM6 merged commit 56d1d13 into dashpay:develop Jun 11, 2019
@PastaPastaPasta PastaPastaPasta deleted the backport-8824 branch June 11, 2019 11:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

RPC Some notable changes to RPC params/behaviour/descriptions

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants