Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Basic support for version 2 transactions. #16

Merged
merged 1 commit into from
Jan 5, 2019
Merged

Basic support for version 2 transactions. #16

merged 1 commit into from
Jan 5, 2019

Conversation

oscarguindzberg
Copy link

Cherry pick bitcoinj@850f219

@oscarguindzberg oscarguindzberg force-pushed the bisq-version2-tx-support branch from ae6ad20 to 0dd10e4 Compare December 13, 2018 19:33
@oscarguindzberg oscarguindzberg mentioned this pull request Dec 13, 2018
Merged
sqrrm
sqrrm suggested changes Dec 13, 2018
View reviewed changes
core/src/main/java/org/bitcoinj/core/TransactionInput.java
* <a href="https://github.com/bitcoin/bips/blob/master/bip-0068.mediawiki">relative lock-time</a> enabled.
*/
public boolean hasRelativeLockTime() {
return (sequence & SEQUENCE_LOCKTIME_DISABLE_FLAG) == 0;
Copy link
Member

Choose a reason for hiding this comment

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

SEQUENCE_LOCKTIME_DISABLE_FLAG is not defined, was included in another commit with the same desciption in bitcoinj, 9e7cb1c

Copy link
Author

Choose a reason for hiding this comment

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

fixed.

@oscarguindzberg oscarguindzberg force-pushed the bisq-version2-tx-support branch from 0dd10e4 to e54f3eb Compare December 14, 2018 19:49
sqrrm
sqrrm approved these changes Dec 19, 2018
View reviewed changes
Copy link
Member

@sqrrm sqrrm left a comment

Choose a reason for hiding this comment

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

utACK

The changes now look fine, but since I'm no expert on bitcoinj it would be good if someone else also takes a look.

I also couldn't get it to compile, quite annoying. Perhaps due to java8, which I thought I enabled but there might be something I missed.

ManfredKarrer
ManfredKarrer approved these changes Dec 19, 2018
View reviewed changes
Copy link

@ManfredKarrer ManfredKarrer left a comment

Choose a reason for hiding this comment

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

utACK

@oscarguindzberg
Copy link
Author

@sqrrm See #17 regarding the jdk8/jdk10 issue when compiling bitcoinj.

@oscarguindzberg
Copy link
Author

I just noticed the same fix is already ported to bitcoinj v0.14.7 bitcoinj@9e7cb1c
I am working on a bisq's bitcoinj rebase from v0.14.7 so the fix would eventually get in.

@sqrrm sqrrm mentioned this pull request Dec 29, 2018
Closed
@oscarguindzberg oscarguindzberg mentioned this pull request Dec 31, 2018
Closed
@ManfredKarrer ManfredKarrer merged commit 34ac9a9 into bisq-network:bisq_0.14.4.1 Jan 5, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ManfredKarrer ManfredKarrer ManfredKarrer approved these changes

@sqrrm sqrrm sqrrm approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@oscarguindzberg @ManfredKarrer @sqrrm