Skip to content

UTXO selection cleanups and preps - #3821

Merged
cdecker merged 6 commits into
ElementsProject:masterfrom
rustyrussell:guilt/utxo-selection-cleanup
Jul 8, 2020
Merged

UTXO selection cleanups and preps#3821
cdecker merged 6 commits into
ElementsProject:masterfrom
rustyrussell:guilt/utxo-selection-cleanup

Conversation

@rustyrussell

@rustyrussell rustyrussell commented Jul 7, 2020

Copy link
Copy Markdown
Contributor

These are the simple reorgs and a fix, to expose more JSON routines to plugins. They should be non-controversial.

@rustyrussell rustyrussell added this to the v0.9.0 milestone Jul 7, 2020
@rustyrussell
rustyrussell requested a review from cdecker as a code owner July 7, 2020 07:36
@ZmnSCPxj ZmnSCPxj mentioned this pull request Jul 7, 2020
Closed
@cdecker

cdecker commented Jul 7, 2020

Copy link
Copy Markdown
Member

Just a minor issue with the inclusion order in feerate.c, otherwise LGTM 👍

bitcoin/feerate.c:1: includes out of order
#include <bitcoin/feerate.h>
#include <stdlib.h>
#include <limits.h>
VERSUS
#include <bitcoin/feerate.h>
#include <limits.h>
#include <stdlib.h>
Makefile:303: recipe for target 'check-src-include-order/bitcoin/feerate.c' failed

@cdecker

cdecker commented Jul 7, 2020

Copy link
Copy Markdown
Member

Notice that 4be1543 was clashing with #3823, which both do the same. The commit just needs to be removed and the merge conflict should disappear :-)

@rustyrussell
bitcoin/feerate: new exposure for feerate parsing outside lightningd.
e66096b 
This exposes the numeric part of param_feerate() as param_feerate_val().

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
@rustyrussell
param_feerate: parse numbers correctly.
0041eef 
If you used feerate=750, instead of feerate="750" it didn't work, since the
token is not a string.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Changelog-Fixed: JSON RPC: `withdraw` and `txprepare` `feerate` can be a JSON number.
@rustyrussell
listfunds: add scriptpubkey if it's known.
e8423c4 
(Which it is, since 0.7.3).

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Changelog-Added: JSON: `listfunds` now has a 'scriptpubkey' field.
@rustyrussell
common/json_tok: expose routines to parse addresses.
946b579 
These are currently inside lightningd.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
@rustyrussell
change_amount: routine to determine if change output is worthwhile.
8314471 
This can be used by plugins which create their own txs.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
@rustyrussell
common/json_tok: expose param_txid.
93e273f 
Move it out of lightningd/ so plugins can use it.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
@rustyrussell
rustyrussell force-pushed the guilt/utxo-selection-cleanup branch from 2190858 to 93e273f Compare July 7, 2020 20:51
@rustyrussell rustyrussell mentioned this pull request Jul 8, 2020
Merged
@cdecker

cdecker commented Jul 8, 2020

Copy link
Copy Markdown
Member

ACK 93e273f

@cdecker
cdecker merged commit 869fa08 into ElementsProject:master Jul 8, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@cdecker cdecker Awaiting requested review from cdecker

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

v0.9.0

Development

Successfully merging this pull request may close these issues.

2 participants

@rustyrussell @cdecker