Skip to content

Commit 3875ec4

Browse files
committed
subservers: add new authmailbox sub server
1 parent 4a26cd2 commit 3875ec4

File tree

3 files changed

+9
-70
lines changed

3 files changed

+9
-70
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ require (
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
35-
github.com/lightninglabs/taproot-assets v0.6.1-0.20250717083859-c4bb5bc1cea5
36-
github.com/lightninglabs/taproot-assets/taprpc v1.0.9
35+
github.com/lightninglabs/taproot-assets v0.6.1-0.20250722113824-ed2c2f9d0267
36+
github.com/lightninglabs/taproot-assets/taprpc v1.0.10-0.20250722113824-ed2c2f9d0267
3737
github.com/lightningnetwork/lnd v0.19.2-beta.rc2
3838
github.com/lightningnetwork/lnd/cert v1.2.2
3939
github.com/lightningnetwork/lnd/clock v1.1.1

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -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-0.20250717083859-c4bb5bc1cea5 h1:6YzU56mAnpeJODG3R7WusLJr4rN9cfZC0AjsVJlgcto=
1176-
github.com/lightninglabs/taproot-assets v0.6.1-0.20250717083859-c4bb5bc1cea5/go.mod h1:MPaa1TBnjxU+pB3QaiL+5bhpjP9LM9m1sK8DhIttKV4=
1177-
github.com/lightninglabs/taproot-assets/taprpc v1.0.9 h1:Rr/B/6QURBwflA6LNFWuQCBOP5Xh3WbHQf/dNf8tA98=
1178-
github.com/lightninglabs/taproot-assets/taprpc v1.0.9/go.mod h1:c8gTEcKEUoUPVChgZNwqTL1hss7UWa5FDeObr8WBzQk=
1175+
github.com/lightninglabs/taproot-assets v0.6.1-0.20250722113824-ed2c2f9d0267 h1:mjlJJh1Ny9XUEwu3cMckAxzJdD5mpLHgygjjawaOIlM=
1176+
github.com/lightninglabs/taproot-assets v0.6.1-0.20250722113824-ed2c2f9d0267/go.mod h1:mIgx0p/GkMZeEjEm91vYQsH41YQBAgJl7TP6JcT+wgs=
1177+
github.com/lightninglabs/taproot-assets/taprpc v1.0.10-0.20250722113824-ed2c2f9d0267 h1:T3iBMRN2+S/5HpVxiw6psF3Iz/5ueYHWlb4NeCa3po8=
1178+
github.com/lightninglabs/taproot-assets/taprpc v1.0.10-0.20250722113824-ed2c2f9d0267/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.rc2 h1:vPIMjQr8SWZJHn/j3QSFct4AbCVa0WA7k0j0lHqFDAA=

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.RegisterWithGrpcServer(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.RegisterWithRestProxy(ctx, mux, dialOpts, endpoint)
197136
if err != nil {
198137
return err
199138
}

0 commit comments

Comments
 (0)