Skip to content

Commit 083650a

Browse files
committed
mod+itest: bump tapd version to fix multiple small issues
1 parent ddf711b commit 083650a

File tree

6 files changed

+19
-7
lines changed

6 files changed

+19
-7
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ require (
2020
github.com/lightninglabs/loop/swapserverrpc v1.0.8
2121
github.com/lightninglabs/pool v0.6.5-beta.0.20240604070222-e121aadb3289
2222
github.com/lightninglabs/pool/auctioneerrpc v1.1.2
23-
github.com/lightninglabs/taproot-assets v0.4.0-alpha.rc3
23+
github.com/lightninglabs/taproot-assets v0.4.0-rc4
2424
github.com/lightningnetwork/lnd v0.18.0-beta.rc4.0.20240712025014-90f997c908d0
2525
github.com/lightningnetwork/lnd/cert v1.2.2
2626
github.com/lightningnetwork/lnd/fn v1.1.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1175,8 +1175,8 @@ github.com/lightninglabs/pool/auctioneerrpc v1.1.2 h1:Dbg+9Z9jXnhimR27EN37foc4aB
11751175
github.com/lightninglabs/pool/auctioneerrpc v1.1.2/go.mod h1:1wKDzN2zEP8srOi0B9iySlEsPdoPhw6oo3Vbm1v4Mhw=
11761176
github.com/lightninglabs/protobuf-go-hex-display v1.30.0-hex-display h1:pRdza2wleRN1L2fJXd6ZoQ9ZegVFTAb2bOQfruJPKcY=
11771177
github.com/lightninglabs/protobuf-go-hex-display v1.30.0-hex-display/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
1178-
github.com/lightninglabs/taproot-assets v0.4.0-alpha.rc3 h1:Ovt4wMhCIqdw+uNwJaSfM/fWpn06n51b4rlIadAnL2g=
1179-
github.com/lightninglabs/taproot-assets v0.4.0-alpha.rc3/go.mod h1:oAiEnRj2sCbPHAURot+tmKbyDhIoxnvkmag0JqlF1bs=
1178+
github.com/lightninglabs/taproot-assets v0.4.0-rc4 h1:tl8gClGZBmLlkMxfDRVAdIhx+LyhThZCEjYBpuM37pc=
1179+
github.com/lightninglabs/taproot-assets v0.4.0-rc4/go.mod h1:oAiEnRj2sCbPHAURot+tmKbyDhIoxnvkmag0JqlF1bs=
11801180
github.com/lightningnetwork/lightning-onion v1.2.1-0.20230823005744-06182b1d7d2f h1:Pua7+5TcFEJXIIZ1I2YAUapmbcttmLj4TTi786bIi3s=
11811181
github.com/lightningnetwork/lightning-onion v1.2.1-0.20230823005744-06182b1d7d2f/go.mod h1:c0kvRShutpj3l6B9WtTsNTBUtjSmjZXbJd9ZBRQOSKI=
11821182
github.com/lightningnetwork/lnd v0.18.0-beta.rc4.0.20240712025014-90f997c908d0 h1:V+PoltFSxN5oijkErYe+QbnVz5WJjBsAzaMNRrhmz3Q=

itest/litd_custom_channels_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ var (
6565
"--taproot-assets.experimental.rfq.priceoracleaddress=" +
6666
"use_mock_price_oracle_service_promise_to_" +
6767
"not_use_on_mainnet",
68-
"--taproot-assets.experimental.rfq.mockoraclecentpersat=" +
68+
"--taproot-assets.experimental.rfq.mockoracleassetsperbtc=" +
6969
"5820600",
7070
"--taproot-assets.universerpccourier.skipinitdelay",
7171
"--taproot-assets.universerpccourier.backoffresetwait=100ms",

itest/litd_node.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,7 @@ func (cfg *LitNodeConfig) defaultLitdArgs() *litArgs {
219219
"enablerest": "",
220220
"restcors": "*",
221221
"lndconnectinterval": "200ms",
222+
"lnd.debuglevel": "trace,GRPC=error,PEER=info",
222223
}
223224
)
224225
for _, arg := range cfg.LitArgs {

subservers/taproot-assets.go

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@ import (
44
"context"
55
"strings"
66

7+
"github.com/btcsuite/btcd/chaincfg"
78
restProxy "github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
89
"github.com/lightninglabs/lndclient"
910
tap "github.com/lightninglabs/taproot-assets"
11+
"github.com/lightninglabs/taproot-assets/address"
1012
"github.com/lightninglabs/taproot-assets/perms"
1113
"github.com/lightninglabs/taproot-assets/tapcfg"
1214
"github.com/lightninglabs/taproot-assets/taprpc"
@@ -39,15 +41,23 @@ var _ SubServer = (*taprootAssetsSubServer)(nil)
3941

4042
// NewTaprootAssetsSubServer returns a new tap implementation of the SubServer
4143
// interface.
42-
func NewTaprootAssetsSubServer(cfg *tapcfg.Config,
44+
func NewTaprootAssetsSubServer(network string, cfg *tapcfg.Config,
4345
remoteCfg *RemoteDaemonConfig, remote, lndRemote bool) SubServer {
4446

4547
// Overwrite the tap daemon's user agent name, so it sends "litd"
4648
// instead of "tapd".
4749
tap.SetAgentName("litd")
4850

51+
// A quirk of the address package is that it requires the exact testnet
52+
// name, not the generic one...
53+
if network == "testnet" {
54+
network = chaincfg.TestNet3Params.Name
55+
}
56+
57+
chainCfg := address.ParamsForChain(network)
58+
4959
return &taprootAssetsSubServer{
50-
Server: tap.NewServer(nil),
60+
Server: tap.NewServer(&chainCfg, nil),
5161
cfg: cfg,
5262
remoteCfg: remoteCfg,
5363
remote: remote,

terminal.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1741,7 +1741,8 @@ func (g *LightningTerminal) initSubServers() {
17411741

17421742
g.subServerMgr.AddServer(
17431743
subservers.NewTaprootAssetsSubServer(
1744-
g.cfg.TaprootAssets, g.cfg.Remote.TaprootAssets,
1744+
g.cfg.Network, g.cfg.TaprootAssets,
1745+
g.cfg.Remote.TaprootAssets,
17451746
g.cfg.tapRemote, g.cfg.lndRemote,
17461747
), g.cfg.TaprootAssetsMode != ModeDisable,
17471748
)

0 commit comments

Comments
 (0)