Skip to content

Commit c2a3aaa

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

File tree

8 files changed

+25
-144
lines changed

8 files changed

+25
-144
lines changed

app/src/types/generated/lnd_pb.d.ts

Lines changed: 0 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/src/types/generated/lnd_pb.js

Lines changed: 3 additions & 56 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/src/util/tests/sampleData.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -281,11 +281,12 @@ export const lndChannelEvent: Required<LND.ChannelEventUpdate.AsObject> = {
281281
fundingTxidStr: '',
282282
outputIndex: outIndex,
283283
},
284-
channelFundingTimeout: {
285-
fundingTxidBytes: txIdBytes,
286-
fundingTxidStr: '',
287-
outputIndex: outIndex,
288-
},
284+
// TODO(guggero): Uncomment when we move from lnd 0.19.2-beta.rc2 to final.
285+
// channelFundingTimeout: {
286+
// fundingTxidBytes: txIdBytes,
287+
// fundingTxidStr: '',
288+
// outputIndex: outIndex,
289+
// },
289290
};
290291

291292
export const lndTransaction: LND.Transaction.AsObject = {

go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ 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
36-
github.com/lightninglabs/taproot-assets/taprpc v1.0.8-0.20250716163904-2ef55ba74036
37-
github.com/lightningnetwork/lnd v0.19.2-beta
35+
github.com/lightninglabs/taproot-assets v0.6.1-0.20250722114424-2401542ec320
36+
github.com/lightninglabs/taproot-assets/taprpc v1.0.10-0.20250722114424-2401542ec320
37+
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
4040
github.com/lightningnetwork/lnd/fn v1.2.3

go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1172,14 +1172,14 @@ 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.20250722114424-2401542ec320 h1:bfgezJzykT8nfisBO62XKOH4zkaAAgoJ+hRaILjjgoU=
1176+
github.com/lightninglabs/taproot-assets v0.6.1-0.20250722114424-2401542ec320/go.mod h1:mIgx0p/GkMZeEjEm91vYQsH41YQBAgJl7TP6JcT+wgs=
1177+
github.com/lightninglabs/taproot-assets/taprpc v1.0.10-0.20250722114424-2401542ec320 h1:NgiIZHEHDEYDlMDqcnBmHmQzCGk3ZO3rFFk+gJ5ROkM=
1178+
github.com/lightninglabs/taproot-assets/taprpc v1.0.10-0.20250722114424-2401542ec320/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=
1181-
github.com/lightningnetwork/lnd v0.19.2-beta h1:3SKVrKYFY4IJLlrMf7cDzZcBeT+MxjI9Xy6YpY+EEX4=
1182-
github.com/lightningnetwork/lnd v0.19.2-beta/go.mod h1:+yKUfIGKKYRHGewgzQ6xi0S26DIfBiMv1zCdB3m6YxA=
1181+
github.com/lightningnetwork/lnd v0.19.2-beta.rc2 h1:vPIMjQr8SWZJHn/j3QSFct4AbCVa0WA7k0j0lHqFDAA=
1182+
github.com/lightningnetwork/lnd v0.19.2-beta.rc2/go.mod h1:+yKUfIGKKYRHGewgzQ6xi0S26DIfBiMv1zCdB3m6YxA=
11831183
github.com/lightningnetwork/lnd/cert v1.2.2 h1:71YK6hogeJtxSxw2teq3eGeuy4rHGKcFf0d0Uy4qBjI=
11841184
github.com/lightningnetwork/lnd/cert v1.2.2/go.mod h1:jQmFn/Ez4zhDgq2hnYSw8r35bqGVxViXhX6Cd7HXM6U=
11851185
github.com/lightningnetwork/lnd/clock v1.1.1 h1:OfR3/zcJd2RhH0RU+zX/77c0ZiOnIMsDIBjgjWdZgA0=

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

proto/lnd.proto

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2980,7 +2980,6 @@ message ChannelEventUpdate {
29802980
ChannelPoint inactive_channel = 4;
29812981
PendingUpdate pending_open_channel = 6;
29822982
ChannelPoint fully_resolved_channel = 7;
2983-
ChannelPoint channel_funding_timeout = 8;
29842983
}
29852984

29862985
enum UpdateType {
@@ -2990,7 +2989,6 @@ message ChannelEventUpdate {
29902989
INACTIVE_CHANNEL = 3;
29912990
PENDING_OPEN_CHANNEL = 4;
29922991
FULLY_RESOLVED_CHANNEL = 5;
2993-
CHANNEL_FUNDING_TIMEOUT = 6;
29942992
}
29952993

29962994
UpdateType type = 5;

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)