From dc9712fbba8d13c6a9503afacd314efd6a2cf080 Mon Sep 17 00:00:00 2001 From: Oliver Gugger Date: Mon, 22 Jul 2024 13:48:23 +0200 Subject: [PATCH 1/2] tapcli: add --show_leased flag to assets list subcommand --- cmd/tapcli/assets.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cmd/tapcli/assets.go b/cmd/tapcli/assets.go index c549ee73c..dfca9ba92 100644 --- a/cmd/tapcli/assets.go +++ b/cmd/tapcli/assets.go @@ -47,6 +47,7 @@ var ( assetGroupedAssetName = "grouped_asset" assetShowWitnessName = "show_witness" assetShowSpentName = "show_spent" + assetShowLeasedName = "show_leased" assetShowUnconfMintsName = "show_unconfirmed_mints" assetGroupKeyName = "group_key" assetGroupAnchorName = "group_anchor" @@ -555,6 +556,10 @@ var listAssetsCommand = cli.Command{ Name: assetShowSpentName, Usage: "include fully spent assets in the list", }, + cli.BoolFlag{ + Name: assetShowLeasedName, + Usage: "include leased assets in the list", + }, cli.BoolFlag{ Name: assetShowUnconfMintsName, Usage: "include freshly minted and not yet confirmed " + @@ -574,6 +579,7 @@ func listAssets(ctx *cli.Context) error { resp, err := client.ListAssets(ctxc, &taprpc.ListAssetRequest{ WithWitness: ctx.Bool(assetShowWitnessName), IncludeSpent: ctx.Bool(assetShowSpentName), + IncludeLeased: ctx.Bool(assetShowLeasedName), IncludeUnconfirmedMints: ctx.Bool(assetShowUnconfMintsName), }) if err != nil { From 6b46c59618e4889f8485a9e29a8f03f58fd4174b Mon Sep 17 00:00:00 2001 From: Oliver Gugger Date: Mon, 22 Jul 2024 13:52:28 +0200 Subject: [PATCH 2/2] tapchannel: add more context to funding ACK error --- tapchannel/aux_funding_controller.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tapchannel/aux_funding_controller.go b/tapchannel/aux_funding_controller.go index 398c45ea5..5be7b63d8 100644 --- a/tapchannel/aux_funding_controller.go +++ b/tapchannel/aux_funding_controller.go @@ -1126,8 +1126,9 @@ func (f *FundingController) completeChannelFunding(ctx context.Context, case <-fundingState.fundingFinalizedSignal: case <-time.After(ackTimeout): - return nil, fmt.Errorf("didn't receive funding ack after %v", - ackTimeout) + return nil, fmt.Errorf("didn't receive funding ack after %v: "+ + "remote node didn't respond in time or doesn't "+ + "support Taproot Asset Channels", ackTimeout) case <-f.Quit: }