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.

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

Port tweakfedpegscript from liquid-deamon #374

Merged
merged 1 commit into from
Jun 22, 2018

Conversation

mword
Copy link

@mword mword commented Jun 18, 2018

This is a port of the changes made in liquid-deamon to add tweakfedpegscript in rpc/misc.cpp.

@@ -168,6 +168,7 @@ def test_pegout(parent_chain_addr, sidechain):
bitcoindstart = bitcoin_bin_path+"/bitcoind -datadir="+bitcoin_datadir
subprocess.Popen(bitcoindstart.split(), stdout=subprocess.PIPE)


Copy link
Collaborator

Choose a reason for hiding this comment

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

unrelated line

Copy link
Author

Choose a reason for hiding this comment

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

Cleaned this up

/* Not shown in help */
{ "hidden", "setmocktime", &setmocktime, true, {"timestamp"}},
{ "hidden", "echo", &echo, true, {"arg0","arg1","arg2","arg3","arg4","arg5","arg6","arg7","arg8","arg9"}},
{ "hidden", "echojson", &echo, true, {"arg0","arg1","arg2","arg3","arg4","arg5","arg6","arg7","arg8","arg9"}},
{ "hidden", "echojson", &echo, true, {"arg0","arg1","arg2","arg3","arg4","arg5","arg6","arg7","arg8","arg9"}},
Copy link
Collaborator

Choose a reason for hiding this comment

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

unrelated space

Copy link
Author

Choose a reason for hiding this comment

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

Re-added the line that was removed: The space change was just to fix the column alignment in this line.

@instagibbs
Copy link
Collaborator

ACK otherwise

@jtimon
Copy link
Contributor

jtimon commented Jun 19, 2018

Perhaps it would be nice to wait for #362 ?
Otherwise #362 could be rebased on top of this.
My only point is that pegging.py and feature_2wp.py should be mirrored in tests until the latter fully replaces the former after adding a --custom-binary option or similar, to support testing with any bitcoin core version as parent chain (like pegging currently does).

@mword
Copy link
Author

mword commented Jun 20, 2018

@jtimon this is already implemented in liquid so when #362 is ported to liquid it will be rebased on top of this change there. Which is less confusing?

@instagibbs
Copy link
Collaborator

If I had to guess I'd say it would be simpler to merge this first and rebase the other PR, since it's still dependent on yet another PR.

@instagibbs
Copy link
Collaborator

Needs squash

Port tweakfedpegscript from liquid
@mword mword force-pushed the tweakfedpegscript branch from fc8f78b to 9bcfdd8 Compare June 21, 2018 20:15
@mword
Copy link
Author

mword commented Jun 21, 2018

@instagibbs Squashed (I hope)

@instagibbs
Copy link
Collaborator

ACK

@instagibbs instagibbs merged commit 9bcfdd8 into ElementsProject:elements-0.14.1 Jun 22, 2018
instagibbs added a commit that referenced this pull request Jun 22, 2018
9bcfdd8 Port tweakfedpegscript from liquid (Mike)
gwillen pushed a commit that referenced this pull request Jun 1, 2022
…-sort Peers table

986bf78 qt: Emit dataChanged signal to dynamically re-sort Peers table (Hennadii Stepanov)

Pull request description:

  [By default](https://doc.qt.io/qt-5/qsortfilterproxymodel.html#details), the `PeerTableSortProxy`
  > dynamically re-sorts ... data whenever the original model changes.

  That is not the case on master (8cdf917) as in ecbd911 (#164) no signals are emitted to notify about model changes.

  This PR uses a dedicated [`dataChanged`](https://doc.qt.io/qt-5/qabstractitemmodel.html#dataChanged) signal.

  Fixes #367.

  An alternative to #374.

ACKs for top commit:
  jarolrod:
    ACK 986bf78

Tree-SHA512: dcb92c2f9a2c632880429e9528007db426d2ad938c64dfa1f1538c03e4b62620df52ad7daf33b582976c67b472ff76bc0dae707049f4bbbd4941232cee9ce3d4
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.

3 participants