Skip to content

bug: should use txidCollateral to calculate confirmations#1188

Merged
schinzelh merged 1 commit into
dashpay:v0.12.0.xfrom
UdjinM6:fixConf2
Dec 21, 2016
Merged

bug: should use txidCollateral to calculate confirmations#1188
schinzelh merged 1 commit into
dashpay:v0.12.0.xfrom
UdjinM6:fixConf2

Conversation

@UdjinM6
Copy link
Copy Markdown

@UdjinM6 UdjinM6 commented Dec 4, 2016

No description provided.

@UdjinM6
Copy link
Copy Markdown
Author

UdjinM6 commented Dec 5, 2016

note: all Travis jobs failed because of mismatching (?) dependencies, build should not fail because of the code changes

@schinzelh
Copy link
Copy Markdown

schinzelh commented Dec 5, 2016

Yeah, it's may be related to the Travis changes they did a month ago - I guess we'll need to backport #1133

edit: It seems to be a download error though...

@schinzelh
Copy link
Copy Markdown

Restarting the builds, seems to work now

@schinzelh
Copy link
Copy Markdown

Turned out it was deprecated download paths, fixed with #1219

Copy link
Copy Markdown

@schinzelh schinzelh 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
Copy link
Copy Markdown
Author

UdjinM6 commented Dec 21, 2016

rebased to make sure only win64 fails as in #1219

@schinzelh
Copy link
Copy Markdown

The failing Win64 may be related to bitcoin#7891

@UdjinM6
Copy link
Copy Markdown
Author

UdjinM6 commented Dec 21, 2016

rebased on top of #1220 , waiting for travis...

@schinzelh schinzelh merged commit 637a93c into dashpay:v0.12.0.x Dec 21, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants