addpsbtoutput: New onchain command for PSBT output and splice_out tests by ddustin · Pull Request #6676 · ElementsProject/lightning

ddustin · 2023-09-13T23:21:04Z

Note: This now depends on PR #6677

New addpsbtoutput command for creating a PSBT that can receive funds to the on-chain wallet.

ddustin · 2023-09-19T18:09:10Z

You need to write a separate set of tests for recvpsbt (is that a good name? addpsbtoutput?). It must test the case where we create, and simply enhance, a PSBT.

I'm leaning toward newoutput to stay in theme with the existing newaddr. How does that sound?

Updated this PR with newoutput and other fixes -- it should be ready to go once when it passes CI.

rustyrussell

Just bikeshedding the name now...

rustyrussell · 2023-09-20T01:57:28Z

        }
        return self.call("fundpsbt", payload)

+    def newoutput(self, satoshi, initialpsbt=None, locktime=None):


Really needs a psbt in here somewhere!

psbtaddoutput?

Also, commit name is now wrong!

Whoops I read that as addpsbtoutput and changed the name to that 🤦. I kinda like it though -- what do you think?

rustyrussell · 2023-09-21T04:05:09Z

Looks like you returned success when you meant to return an error:

FAILED tests/test_splicing.py::test_invalid_splice - jsonschema.exceptions.ValidationError: Additional properties are not allowed ('error', 'message' were unexpected)

Failed validating 'additionalProperties' in schema:
    {'$schema': 'http://json-schema.org/draft-07/schema#',
     'added': 'v23.08',
     'additionalProperties': False,
     'properties': {'commitments_secured': {'description': 'whether or not '
                                                           'the '
                                                           'commitments '
                                                           'were secured',
                                            'type': 'boolean'},
                    'psbt': {'description': 'the (incomplete) PSBT of the '
                                            'splice transaction',
                             'type': 'string'}},
     'required': ['psbt', 'commitments_secured'],
     'type': 'object'}

On instance:
    {'error': 'You provided 1000000000msat but committed to '
              '1100000000msat.',
     'message': 'Splice funding too low'}

ddustin · 2023-09-21T14:34:23Z

Looks like you returned success when you meant to return an error:

FAILED tests/test_splicing.py::test_invalid_splice - jsonschema.exceptions.ValidationError: Additional properties are not allowed ('error', 'message' were unexpected)

Failed validating 'additionalProperties' in schema:
    {'$schema': 'http://json-schema.org/draft-07/schema#',
     'added': 'v23.08',
     'additionalProperties': False,
     'properties': {'commitments_secured': {'description': 'whether or not '
                                                           'the '
                                                           'commitments '
                                                           'were secured',
                                            'type': 'boolean'},
                    'psbt': {'description': 'the (incomplete) PSBT of the '
                                            'splice transaction',
                             'type': 'string'}},
     'required': ['psbt', 'commitments_secured'],
     'type': 'object'}

On instance:
    {'error': 'You provided 1000000000msat but committed to '
              '1100000000msat.',
     'message': 'Splice funding too low'}

Whoops, should be fixed now

rustyrussell

One v. minor change: the version number it was added in...

rustyrussell · 2023-10-02T04:49:48Z

Trivial rebase on master for CI...

Ack 10e1224

Also added splice_out tests that use the new PSBT command. ChangeLog-Added: New `addpsbtoutput` command for creating a PSBT that can receive funds to the on-chain wallet.

vincenzopalazzo · 2023-10-03T08:09:48Z

+	}
+	else if(locktime) {


Suggested change

}

else if(locktime) {

} else if (locktime) {

FYI just a minor nit

vincenzopalazzo

ACK f1dfec4

ddustin added this to the v23.08 Point Releases milestone Sep 13, 2023

ddustin requested a review from cdecker as a code owner September 13, 2023 23:21

ddustin force-pushed the ddustin/recvpsbt branch 4 times, most recently from 1910afc to 94c7e83 Compare September 14, 2023 00:06

rustyrussell reviewed Sep 14, 2023

View reviewed changes

Comment thread doc/schemas/recvpsbt.schema.json Outdated

Comment thread contrib/pyln-client/pyln/client/lightning.py Outdated

Comment thread tests/test_splicing.py Outdated

ddustin force-pushed the ddustin/recvpsbt branch 4 times, most recently from dbec2b6 to 524de4a Compare September 14, 2023 20:42

jgriffiths reviewed Sep 18, 2023

View reviewed changes

Comment thread doc/lightning-recvpsbt.7.md Outdated

ddustin force-pushed the ddustin/recvpsbt branch 2 times, most recently from 1a6f5c2 to ce2a618 Compare September 19, 2023 18:10

jgriffiths reviewed Sep 19, 2023

View reviewed changes

Comment thread wallet/reservation.c

ddustin requested a review from rustyrussell September 19, 2023 21:12

rustyrussell approved these changes Sep 20, 2023

View reviewed changes

rustyrussell modified the milestones: v23.08 Point Releases, v23.11 Sep 20, 2023

ddustin force-pushed the ddustin/recvpsbt branch 2 times, most recently from db6d23e to eb156b4 Compare September 21, 2023 02:31

ddustin changed the title ~~recvpsbt: New onchain command for PSBT output~~ addpsbtoutput: New onchain command for PSBT output Sep 21, 2023

ddustin force-pushed the ddustin/recvpsbt branch from eb156b4 to 9075d8d Compare September 21, 2023 02:31

ddustin mentioned this pull request Sep 21, 2023

Splice-out Regression and Restart Fixes #6677

Merged

ddustin changed the title ~~addpsbtoutput: New onchain command for PSBT output~~ addpsbtoutput: New onchain command for PSBT output and splice_out tests Sep 21, 2023

ddustin force-pushed the ddustin/recvpsbt branch from 9075d8d to 8fc0c0b Compare September 21, 2023 02:34

ddustin force-pushed the ddustin/recvpsbt branch from 8fc0c0b to 080d133 Compare September 21, 2023 14:32

ddustin force-pushed the ddustin/recvpsbt branch from 080d133 to 7562044 Compare September 21, 2023 14:38

rustyrussell requested changes Sep 25, 2023

View reviewed changes

Comment thread doc/schemas/addpsbtoutput.schema.json Outdated

ddustin force-pushed the ddustin/recvpsbt branch 2 times, most recently from 9986a7e to 68e3445 Compare September 27, 2023 14:56

rustyrussell force-pushed the ddustin/recvpsbt branch from 68e3445 to 10e1224 Compare October 2, 2023 04:50

rustyrussell approved these changes Oct 2, 2023

View reviewed changes

addpsbtoutput: New onchain command for PSBT output

f1dfec4

Also added splice_out tests that use the new PSBT command. ChangeLog-Added: New `addpsbtoutput` command for creating a PSBT that can receive funds to the on-chain wallet.

rustyrussell force-pushed the ddustin/recvpsbt branch from 10e1224 to f1dfec4 Compare October 2, 2023 04:51

vincenzopalazzo reviewed Oct 3, 2023

View reviewed changes

vincenzopalazzo approved these changes Oct 3, 2023

View reviewed changes

vincenzopalazzo merged commit bc9333a into ElementsProject:master Oct 3, 2023

Uh oh!

Conversation

ddustin commented Sep 13, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ddustin commented Sep 19, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

rustyrussell left a comment

Choose a reason for hiding this comment

Uh oh!

rustyrussell Sep 20, 2023

Choose a reason for hiding this comment

Uh oh!

rustyrussell Sep 20, 2023

Choose a reason for hiding this comment

Uh oh!

ddustin Sep 21, 2023

Choose a reason for hiding this comment

Uh oh!

Uh oh!

rustyrussell commented Sep 21, 2023

Uh oh!

ddustin commented Sep 21, 2023

Uh oh!

rustyrussell left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

rustyrussell commented Oct 2, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

vincenzopalazzo Oct 3, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

vincenzopalazzo left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

ddustin commented Sep 13, 2023 •

edited

Loading

ddustin commented Sep 19, 2023 •

edited

Loading

rustyrussell commented Oct 2, 2023 •

edited

Loading

vincenzopalazzo Oct 3, 2023 •

edited

Loading