Skip to content

Commit

Permalink
Last update for 0.17.0
Browse files Browse the repository at this point in the history
  • Loading branch information
herrvendil committed Oct 7, 2023
1 parent 9bfb539 commit 888190d
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 5 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.gradle
build
.idea
.idea
bin
8 changes: 7 additions & 1 deletion src/main/proto/lightning.api.proto
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* This file is fetched from https://github.com/lightningnetwork/lnd/blob/master/lnrpc/rpc.proto
* And is distributed under LNDs MIT License.
* LND (7ceb46d) tag : Downloaded 2023-09-22
* LND (d94ae3f) tag : Downloaded 2023-10-07
*/
syntax = "proto3";

Expand All @@ -10,6 +10,7 @@ package lnrpc;
option java_package = "org.lightningj.lnd.proto";
option go_package = "github.com/lightningnetwork/lnd/lnrpc";


/*
* Comments in this file will be directly parsed into the API
* Documentation as descriptions of the associated method, message, or field.
Expand Down Expand Up @@ -2459,6 +2460,11 @@ message ChanPointShim {
the value is less than 500,000, or as an absolute height otherwise.
*/
uint32 thaw_height = 6;

/*
Indicates that the funding output is using a MuSig2 multi-sig output.
*/
bool musig2 = 7;
}

message PsbtShim {
Expand Down
8 changes: 5 additions & 3 deletions src/test/groovy/org/lightningj/lnd/wrapper/MessageSpec.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class MessageSpec extends Specification {

def "Verify that toJsonAsString returns json in string format"(){
expect:
genOpenChannelRequest().toJsonAsString(false) == '{"satPerVbyte":0,"nodePubkey":"","nodePubkeyString":"02ad1fddad0c572ec3e886cbea31bbafa30b5f7e745da7e936ed9d1471116cdc02","localFundingAmount":40000,"pushSat":25000,"targetConf":0,"satPerByte":0,"private":false,"minHtlcMsat":0,"remoteCsvDelay":0,"minConfs":0,"spendUnconfirmed":false,"closeAddress":"","fundingShim":{"chanPointShim":{"amt":0,"chanPoint":{"fundingTxidBytes":"","fundingTxidStr":"","outputIndex":0},"localKey":{"rawKeyBytes":"","keyLoc":{"keyFamily":0,"keyIndex":0}},"remoteKey":"","pendingChanId":"","thawHeight":0},"psbtShim":{"pendingChanId":"","basePsbt":"","noPublish":false}},"remoteMaxValueInFlightMsat":0,"remoteMaxHtlcs":0,"maxLocalCsv":0,"commitmentType":"UNKNOWN_COMMITMENT_TYPE","zeroConf":false,"scidAlias":false,"baseFee":0,"feeRate":0,"useBaseFee":false,"useFeeRate":false,"remoteChanReserveSat":0,"fundMax":false,"memo":"","outpoints":[]}'
genOpenChannelRequest().toJsonAsString(false) == '{"satPerVbyte":0,"nodePubkey":"","nodePubkeyString":"02ad1fddad0c572ec3e886cbea31bbafa30b5f7e745da7e936ed9d1471116cdc02","localFundingAmount":40000,"pushSat":25000,"targetConf":0,"satPerByte":0,"private":false,"minHtlcMsat":0,"remoteCsvDelay":0,"minConfs":0,"spendUnconfirmed":false,"closeAddress":"","fundingShim":{"chanPointShim":{"amt":0,"chanPoint":{"fundingTxidBytes":"","fundingTxidStr":"","outputIndex":0},"localKey":{"rawKeyBytes":"","keyLoc":{"keyFamily":0,"keyIndex":0}},"remoteKey":"","pendingChanId":"","thawHeight":0,"musig2":false},"psbtShim":{"pendingChanId":"","basePsbt":"","noPublish":false}},"remoteMaxValueInFlightMsat":0,"remoteMaxHtlcs":0,"maxLocalCsv":0,"commitmentType":"UNKNOWN_COMMITMENT_TYPE","zeroConf":false,"scidAlias":false,"baseFee":0,"feeRate":0,"useBaseFee":false,"useFeeRate":false,"remoteChanReserveSat":0,"fundMax":false,"memo":"","outpoints":[]}'
genOpenChannelRequest().toJsonAsString(true) == """
{
"satPerVbyte": 0,
Expand Down Expand Up @@ -93,7 +93,8 @@ class MessageSpec extends Specification {
},
"remoteKey": "",
"pendingChanId": "",
"thawHeight": 0
"thawHeight": 0,
"musig2": false
},
"psbtShim": {
"pendingChanId": "",
Expand Down Expand Up @@ -167,7 +168,8 @@ class MessageSpec extends Specification {
},
"remoteKey": "",
"pendingChanId": "",
"thawHeight": 0
"thawHeight": 0,
"musig2": false
},
"psbtShim": {
"pendingChanId": "",
Expand Down

0 comments on commit 888190d

Please sign in to comment.