Skip to content

Commit b8780fa

Browse files
guggeroguggero
committed
mod+itest: update to latest tapd
1 parent 55f5682 commit b8780fa

File tree

4 files changed

+18
-77
lines changed

4 files changed

+18
-77
lines changed

‎go.mod‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ require (
2626
github.com/lightninglabs/lightning-terminal/litrpc v1.0.2
2727
github.com/lightninglabs/lightning-terminal/perms v1.0.1
2828
github.com/lightninglabs/lndclient v0.19.0-12
29-
github.com/lightninglabs/loop v0.31.2-beta
29+
github.com/lightninglabs/loop v0.31.2-beta.0.20250724051925-36c5d6cee7d3
3030
github.com/lightninglabs/loop/looprpc v1.0.8
3131
github.com/lightninglabs/loop/swapserverrpc v1.0.15
3232
github.com/lightninglabs/pool v0.6.6-beta
3333
github.com/lightninglabs/pool/auctioneerrpc v1.1.3
3434
github.com/lightninglabs/pool/poolrpc v1.0.1
3535
github.com/lightninglabs/taproot-assets v0.6.1
36-
github.com/lightninglabs/taproot-assets/taprpc v1.0.8-0.20250716163904-2ef55ba74036
36+
github.com/lightninglabs/taproot-assets/taprpc v1.0.10-0.20250725201706-0e736bb0d7b1
3737
github.com/lightningnetwork/lnd v0.19.2-beta
3838
github.com/lightningnetwork/lnd/cert v1.2.2
3939
github.com/lightningnetwork/lnd/clock v1.1.1
@@ -248,6 +248,4 @@ replace google.golang.org/protobuf => github.com/lightninglabs/protobuf-go-hex-d
248248
// automatically, so we need to add it manually.
249249
replace github.com/golang-migrate/migrate/v4 => github.com/lightninglabs/migrate/v4 v4.18.2-9023d66a-fork-pr-2
250250

251-
// tapd wants v0.19.0-12, but loop can't handle that yet. So we'll just use the
252-
// previous version for now.
253-
replace github.com/lightninglabs/lndclient => github.com/lightninglabs/lndclient v0.19.0-11
251+
replace github.com/lightninglabs/taproot-assets => github.com/lightninglabs/taproot-assets v0.6.1-0.20250725201706-0e736bb0d7b1

‎go.sum‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1150,10 +1150,10 @@ github.com/lightninglabs/lightning-node-connect/hashmailrpc v1.0.3 h1:NuDp6Z+QNM
11501150
github.com/lightninglabs/lightning-node-connect/hashmailrpc v1.0.3/go.mod h1:bDnEKRN1u13NFBuy/C+bFLhxA5bfd3clT25y76QY0AM=
11511151
github.com/lightninglabs/lightning-node-connect/mailbox v1.0.1 h1:RWmohykp3n/DTMWY8b18RNTEcLDf+KT/AZHKYdOObkM=
11521152
github.com/lightninglabs/lightning-node-connect/mailbox v1.0.1/go.mod h1:NYtNexZE9gO1eOeegTxmIW9fqanl7eZ9cOrE9yewSAk=
1153-
github.com/lightninglabs/lndclient v0.19.0-11 h1:/WwowlNff19lb7DXzq3c6L4nRMvwBZjbjLOy1/u4a5Y=
1154-
github.com/lightninglabs/lndclient v0.19.0-11/go.mod h1:cicoJY1AwZuRVXGD8Knp50TRT7TGBmw1k37uPQsGQiw=
1155-
github.com/lightninglabs/loop v0.31.2-beta h1:lm5t5FqDpSfQCxoz/vTvXpylxSgU+gvJJIbfJiKeyUk=
1156-
github.com/lightninglabs/loop v0.31.2-beta/go.mod h1:xnPKuZmLusNERwzz15RZ7mpQ8xuSqqh3g8Qw/PRyiRE=
1153+
github.com/lightninglabs/lndclient v0.19.0-12 h1:aSIKfnvnHKiyFWppUGHJG5fn8VoF5WG5Lx958ksLmqs=
1154+
github.com/lightninglabs/lndclient v0.19.0-12/go.mod h1:cicoJY1AwZuRVXGD8Knp50TRT7TGBmw1k37uPQsGQiw=
1155+
github.com/lightninglabs/loop v0.31.2-beta.0.20250724051925-36c5d6cee7d3 h1:N+p1pdmVG9STFZ0PIc+qzJ2einOyNzFy6KEjPmT7HAY=
1156+
github.com/lightninglabs/loop v0.31.2-beta.0.20250724051925-36c5d6cee7d3/go.mod h1:7DLIgIyg0Z9uQAjEUr0qNQ3v3IFPCDsJxIttHOxhcvA=
11571157
github.com/lightninglabs/loop/looprpc v1.0.8 h1:OFmJNLjem6fLuH1YUO+3G6QA1wmjAd0zyhvdHONOBDs=
11581158
github.com/lightninglabs/loop/looprpc v1.0.8/go.mod h1:c7WykKQZ3PspCMVvv2kr9o4l3bgJBEBVv0SOoBOjPOw=
11591159
github.com/lightninglabs/loop/swapserverrpc v1.0.15 h1:vEZBF65Lv0T7MPydCRxHSIlEJzHBkZ4I8FtSD6OJK88=
@@ -1172,10 +1172,10 @@ github.com/lightninglabs/pool/poolrpc v1.0.1 h1:XbNx28TYwEj/PVsnnF9TnveVCMCYfS1v
11721172
github.com/lightninglabs/pool/poolrpc v1.0.1/go.mod h1:836icifg/SBnZbiae0v3jeRRzCrT6LWo32SqCS/JiGk=
11731173
github.com/lightninglabs/protobuf-go-hex-display v1.34.2-hex-display h1:w7FM5LH9Z6CpKxl13mS48idsu6F+cEZf0lkyiV+Dq9g=
11741174
github.com/lightninglabs/protobuf-go-hex-display v1.34.2-hex-display/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
1175-
github.com/lightninglabs/taproot-assets v0.6.1 h1:98XCk7nvAridyE67uct0NDVpyY1evpIdvPQpeNElskM=
1176-
github.com/lightninglabs/taproot-assets v0.6.1/go.mod h1:rF+GwuUVuDVUejAHsUCml4Nru9xnl7A4YZQfR4qLMzY=
1177-
github.com/lightninglabs/taproot-assets/taprpc v1.0.8-0.20250716163904-2ef55ba74036 h1:ZUQrEmdZa72RieBKI/NiUQJGAnh6R6Pq6FoXh+VCOJQ=
1178-
github.com/lightninglabs/taproot-assets/taprpc v1.0.8-0.20250716163904-2ef55ba74036/go.mod h1:vOM2Ap2wYhEZjiJU7bNNg+e5tDxkvRAuyXwf/KQ4tgo=
1175+
github.com/lightninglabs/taproot-assets v0.6.1-0.20250725201706-0e736bb0d7b1 h1:lm/PJTGwTPk7kRInRdGiUbaKqpNQlV+9OTXpBUiFb9E=
1176+
github.com/lightninglabs/taproot-assets v0.6.1-0.20250725201706-0e736bb0d7b1/go.mod h1:mIgx0p/GkMZeEjEm91vYQsH41YQBAgJl7TP6JcT+wgs=
1177+
github.com/lightninglabs/taproot-assets/taprpc v1.0.10-0.20250725201706-0e736bb0d7b1 h1:V9x07euSL3wR9JxPUOhrsAVmC6pg4o3y7N5GsHLVoP0=
1178+
github.com/lightninglabs/taproot-assets/taprpc v1.0.10-0.20250725201706-0e736bb0d7b1/go.mod h1:c8gTEcKEUoUPVChgZNwqTL1hss7UWa5FDeObr8WBzQk=
11791179
github.com/lightningnetwork/lightning-onion v1.2.1-0.20240712235311-98bd56499dfb h1:yfM05S8DXKhuCBp5qSMZdtSwvJ+GFzl94KbXMNB1JDY=
11801180
github.com/lightningnetwork/lightning-onion v1.2.1-0.20240712235311-98bd56499dfb/go.mod h1:c0kvRShutpj3l6B9WtTsNTBUtjSmjZXbJd9ZBRQOSKI=
11811181
github.com/lightningnetwork/lnd v0.19.2-beta h1:3SKVrKYFY4IJLlrMf7cDzZcBeT+MxjI9Xy6YpY+EEX4=

‎itest/assets_test.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import (
2727
"github.com/lightninglabs/taproot-assets/tapfreighter"
2828
"github.com/lightninglabs/taproot-assets/taprpc"
2929
"github.com/lightninglabs/taproot-assets/taprpc/assetwalletrpc"
30+
"github.com/lightninglabs/taproot-assets/taprpc/authmailboxrpc"
3031
"github.com/lightninglabs/taproot-assets/taprpc/mintrpc"
3132
"github.com/lightninglabs/taproot-assets/taprpc/rfqrpc"
3233
tchrpc "github.com/lightninglabs/taproot-assets/taprpc/tapchannelrpc"
@@ -2548,6 +2549,7 @@ type tapClient struct {
25482549
rfqrpc.RfqClient
25492550
tchrpc.TaprootAssetChannelsClient
25502551
universerpc.UniverseClient
2552+
authmailboxrpc.MailboxClient
25512553
}
25522554

25532555
func newTapClient(t *testing.T, node *HarnessNode) *tapClient {
@@ -2578,6 +2580,7 @@ func newTapClient(t *testing.T, node *HarnessNode) *tapClient {
25782580
rfqClient := rfqrpc.NewRfqClient(rawConn)
25792581
tchClient := tchrpc.NewTaprootAssetChannelsClient(rawConn)
25802582
universeClient := universerpc.NewUniverseClient(rawConn)
2583+
mboxClient := authmailboxrpc.NewMailboxClient(rawConn)
25812584

25822585
return &tapClient{
25832586
node: node,
@@ -2588,6 +2591,7 @@ func newTapClient(t *testing.T, node *HarnessNode) *tapClient {
25882591
RfqClient: rfqClient,
25892592
TaprootAssetChannelsClient: tchClient,
25902593
UniverseClient: universeClient,
2594+
MailboxClient: mboxClient,
25912595
}
25922596
}
25932597

‎subservers/taproot-assets.go‎

Lines changed: 3 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,6 @@ import (
1212
"github.com/lightninglabs/taproot-assets/fn"
1313
"github.com/lightninglabs/taproot-assets/tapcfg"
1414
"github.com/lightninglabs/taproot-assets/taprpc"
15-
"github.com/lightninglabs/taproot-assets/taprpc/assetwalletrpc"
16-
"github.com/lightninglabs/taproot-assets/taprpc/mintrpc"
17-
"github.com/lightninglabs/taproot-assets/taprpc/rfqrpc"
18-
tchrpc "github.com/lightninglabs/taproot-assets/taprpc/tapchannelrpc"
19-
"github.com/lightninglabs/taproot-assets/taprpc/universerpc"
2015
"github.com/lightningnetwork/lnd/lnrpc"
2116
"google.golang.org/grpc"
2217
"gopkg.in/macaroon-bakery.v2/bakery"
@@ -57,7 +52,7 @@ func NewTaprootAssetsSubServer(network string, cfg *tapcfg.Config,
5752
chainCfg := address.ParamsForChain(network)
5853

5954
return &taprootAssetsSubServer{
60-
Server: tap.NewServer(&chainCfg, nil),
55+
Server: tap.NewServer(&chainCfg),
6156
cfg: cfg,
6257
remoteCfg: remoteCfg,
6358
remote: remote,
@@ -126,12 +121,7 @@ func (t *taprootAssetsSubServer) Start(_ lnrpc.LightningClient,
126121
func (t *taprootAssetsSubServer) RegisterGrpcService(
127122
registrar grpc.ServiceRegistrar) {
128123

129-
taprpc.RegisterTaprootAssetsServer(registrar, t)
130-
mintrpc.RegisterMintServer(registrar, t)
131-
assetwalletrpc.RegisterAssetWalletServer(registrar, t)
132-
rfqrpc.RegisterRfqServer(registrar, t)
133-
tchrpc.RegisterTaprootAssetChannelsServer(registrar, t)
134-
universerpc.RegisterUniverseServer(registrar, t)
124+
t.Server.RegisterGrpcService(registrar)
135125
}
136126

137127
// RegisterRestService registers the sub-server's REST handlers with the given
@@ -142,58 +132,7 @@ func (t *taprootAssetsSubServer) RegisterRestService(ctx context.Context,
142132
mux *restProxy.ServeMux, endpoint string,
143133
dialOpts []grpc.DialOption) error {
144134

145-
err := taprpc.RegisterTaprootAssetsHandlerFromEndpoint(
146-
ctx, mux, endpoint, dialOpts,
147-
)
148-
if err != nil {
149-
return err
150-
}
151-
152-
err = mintrpc.RegisterMintHandlerFromEndpoint(
153-
ctx, mux, endpoint, dialOpts,
154-
)
155-
if err != nil {
156-
return err
157-
}
158-
159-
err = assetwalletrpc.RegisterAssetWalletHandlerFromEndpoint(
160-
ctx, mux, endpoint, dialOpts,
161-
)
162-
if err != nil {
163-
return err
164-
}
165-
166-
err = rfqrpc.RegisterRfqHandlerFromEndpoint(
167-
ctx, mux, endpoint, dialOpts,
168-
)
169-
if err != nil {
170-
return err
171-
}
172-
173-
err = tchrpc.RegisterTaprootAssetChannelsHandlerFromEndpoint(
174-
ctx, mux, endpoint, dialOpts,
175-
)
176-
if err != nil {
177-
return err
178-
}
179-
180-
err = rfqrpc.RegisterRfqHandlerFromEndpoint(
181-
ctx, mux, endpoint, dialOpts,
182-
)
183-
if err != nil {
184-
return err
185-
}
186-
187-
err = tchrpc.RegisterTaprootAssetChannelsHandlerFromEndpoint(
188-
ctx, mux, endpoint, dialOpts,
189-
)
190-
if err != nil {
191-
return err
192-
}
193-
194-
err = universerpc.RegisterUniverseHandlerFromEndpoint(
195-
ctx, mux, endpoint, dialOpts,
196-
)
135+
err := t.Server.RegisterRestService(ctx, mux, endpoint, dialOpts)
197136
if err != nil {
198137
return err
199138
}

0 commit comments

Comments
 (0)