GlcoinCore/lightning-terminal
1
0
Fork 0
mirror of https://github.com/lightninglabs/lightning-terminal.git synced 2026-08-13 12:33:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

mod+itest: update to latest tapd

Browse source
This commit is contained in:
Oliver Gugger 2025-06-24 10:57:35 +02:00 • committed by George Tsagkarelis
parent 40d3bdb935
commit 8a4625acdb
No known key found for this signature in database
GPG key ID: E08DEA9B12B66AF6
4 changed files with 18 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

8
go.mod
View file

@ -26,14 +26,14 @@ require (
github.com/lightninglabs/lightning-terminal/litrpc v1.0.2
github.com/lightninglabs/lightning-terminal/perms v1.0.1
github.com/lightninglabs/lndclient v0.19.0-12
github.com/lightninglabs/loop v0.31.2-beta
github.com/lightninglabs/loop v0.31.2-beta.0.20250724051925-36c5d6cee7d3
github.com/lightninglabs/loop/looprpc v1.0.8
github.com/lightninglabs/loop/swapserverrpc v1.0.15
github.com/lightninglabs/pool v0.6.6-beta
github.com/lightninglabs/pool/auctioneerrpc v1.1.3
github.com/lightninglabs/pool/poolrpc v1.0.1
github.com/lightninglabs/taproot-assets v0.6.1
github.com/lightninglabs/taproot-assets/taprpc v1.0.8-0.20250716163904-2ef55ba74036
github.com/lightninglabs/taproot-assets/taprpc v1.0.10-0.20250725201706-0e736bb0d7b1
github.com/lightningnetwork/lnd v0.19.3-beta
github.com/lightningnetwork/lnd/cert v1.2.2
github.com/lightningnetwork/lnd/clock v1.1.1
@ -248,6 +248,4 @@ replace google.golang.org/protobuf => github.com/lightninglabs/protobuf-go-hex-d
// automatically, so we need to add it manually.
replace github.com/golang-migrate/migrate/v4 => github.com/lightninglabs/migrate/v4 v4.18.2-9023d66a-fork-pr-2
// tapd wants v0.19.0-12, but loop can't handle that yet. So we'll just use the
// previous version for now.
replace github.com/lightninglabs/lndclient => github.com/lightninglabs/lndclient v0.19.0-11
replace github.com/lightninglabs/taproot-assets => github.com/lightninglabs/taproot-assets v0.6.1-0.20250725201706-0e736bb0d7b1

16
go.sum
View file

@ -1150,10 +1150,10 @@ github.com/lightninglabs/lightning-node-connect/hashmailrpc v1.0.3 h1:NuDp6Z+QNM
github.com/lightninglabs/lightning-node-connect/hashmailrpc v1.0.3/go.mod h1:bDnEKRN1u13NFBuy/C+bFLhxA5bfd3clT25y76QY0AM=
github.com/lightninglabs/lightning-node-connect/mailbox v1.0.1 h1:RWmohykp3n/DTMWY8b18RNTEcLDf+KT/AZHKYdOObkM=
github.com/lightninglabs/lightning-node-connect/mailbox v1.0.1/go.mod h1:NYtNexZE9gO1eOeegTxmIW9fqanl7eZ9cOrE9yewSAk=
github.com/lightninglabs/lndclient v0.19.0-11 h1:/WwowlNff19lb7DXzq3c6L4nRMvwBZjbjLOy1/u4a5Y=
github.com/lightninglabs/lndclient v0.19.0-11/go.mod h1:cicoJY1AwZuRVXGD8Knp50TRT7TGBmw1k37uPQsGQiw=
github.com/lightninglabs/loop v0.31.2-beta h1:lm5t5FqDpSfQCxoz/vTvXpylxSgU+gvJJIbfJiKeyUk=
github.com/lightninglabs/loop v0.31.2-beta/go.mod h1:xnPKuZmLusNERwzz15RZ7mpQ8xuSqqh3g8Qw/PRyiRE=
github.com/lightninglabs/lndclient v0.19.0-12 h1:aSIKfnvnHKiyFWppUGHJG5fn8VoF5WG5Lx958ksLmqs=
github.com/lightninglabs/lndclient v0.19.0-12/go.mod h1:cicoJY1AwZuRVXGD8Knp50TRT7TGBmw1k37uPQsGQiw=
github.com/lightninglabs/loop v0.31.2-beta.0.20250724051925-36c5d6cee7d3 h1:N+p1pdmVG9STFZ0PIc+qzJ2einOyNzFy6KEjPmT7HAY=
github.com/lightninglabs/loop v0.31.2-beta.0.20250724051925-36c5d6cee7d3/go.mod h1:7DLIgIyg0Z9uQAjEUr0qNQ3v3IFPCDsJxIttHOxhcvA=
github.com/lightninglabs/loop/looprpc v1.0.8 h1:OFmJNLjem6fLuH1YUO+3G6QA1wmjAd0zyhvdHONOBDs=
github.com/lightninglabs/loop/looprpc v1.0.8/go.mod h1:c7WykKQZ3PspCMVvv2kr9o4l3bgJBEBVv0SOoBOjPOw=
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
github.com/lightninglabs/pool/poolrpc v1.0.1/go.mod h1:836icifg/SBnZbiae0v3jeRRzCrT6LWo32SqCS/JiGk=
github.com/lightninglabs/protobuf-go-hex-display v1.34.2-hex-display h1:w7FM5LH9Z6CpKxl13mS48idsu6F+cEZf0lkyiV+Dq9g=
github.com/lightninglabs/protobuf-go-hex-display v1.34.2-hex-display/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
github.com/lightninglabs/taproot-assets v0.6.1 h1:98XCk7nvAridyE67uct0NDVpyY1evpIdvPQpeNElskM=
github.com/lightninglabs/taproot-assets v0.6.1/go.mod h1:rF+GwuUVuDVUejAHsUCml4Nru9xnl7A4YZQfR4qLMzY=
github.com/lightninglabs/taproot-assets/taprpc v1.0.8-0.20250716163904-2ef55ba74036 h1:ZUQrEmdZa72RieBKI/NiUQJGAnh6R6Pq6FoXh+VCOJQ=
github.com/lightninglabs/taproot-assets/taprpc v1.0.8-0.20250716163904-2ef55ba74036/go.mod h1:vOM2Ap2wYhEZjiJU7bNNg+e5tDxkvRAuyXwf/KQ4tgo=
github.com/lightninglabs/taproot-assets v0.6.1-0.20250725201706-0e736bb0d7b1 h1:lm/PJTGwTPk7kRInRdGiUbaKqpNQlV+9OTXpBUiFb9E=
github.com/lightninglabs/taproot-assets v0.6.1-0.20250725201706-0e736bb0d7b1/go.mod h1:mIgx0p/GkMZeEjEm91vYQsH41YQBAgJl7TP6JcT+wgs=
github.com/lightninglabs/taproot-assets/taprpc v1.0.10-0.20250725201706-0e736bb0d7b1 h1:V9x07euSL3wR9JxPUOhrsAVmC6pg4o3y7N5GsHLVoP0=
github.com/lightninglabs/taproot-assets/taprpc v1.0.10-0.20250725201706-0e736bb0d7b1/go.mod h1:c8gTEcKEUoUPVChgZNwqTL1hss7UWa5FDeObr8WBzQk=
github.com/lightningnetwork/lightning-onion v1.2.1-0.20240712235311-98bd56499dfb h1:yfM05S8DXKhuCBp5qSMZdtSwvJ+GFzl94KbXMNB1JDY=
github.com/lightningnetwork/lightning-onion v1.2.1-0.20240712235311-98bd56499dfb/go.mod h1:c0kvRShutpj3l6B9WtTsNTBUtjSmjZXbJd9ZBRQOSKI=
github.com/lightningnetwork/lnd v0.19.3-beta h1:sBOIn+0ZIkvEJh05VPJRSOOhWbJn2EoGtyUAaq/Fgk8=

4
itest/assets_test.go
View file

@ -27,6 +27,7 @@ import (
"github.com/lightninglabs/taproot-assets/tapfreighter"
"github.com/lightninglabs/taproot-assets/taprpc"
"github.com/lightninglabs/taproot-assets/taprpc/assetwalletrpc"
"github.com/lightninglabs/taproot-assets/taprpc/authmailboxrpc"
"github.com/lightninglabs/taproot-assets/taprpc/mintrpc"
"github.com/lightninglabs/taproot-assets/taprpc/rfqrpc"
tchrpc "github.com/lightninglabs/taproot-assets/taprpc/tapchannelrpc"
@ -2548,6 +2549,7 @@ type tapClient struct {
rfqrpc.RfqClient
tchrpc.TaprootAssetChannelsClient
universerpc.UniverseClient
authmailboxrpc.MailboxClient
}
func newTapClient(t *testing.T, node *HarnessNode) *tapClient {
@ -2578,6 +2580,7 @@ func newTapClient(t *testing.T, node *HarnessNode) *tapClient {
rfqClient := rfqrpc.NewRfqClient(rawConn)
tchClient := tchrpc.NewTaprootAssetChannelsClient(rawConn)
universeClient := universerpc.NewUniverseClient(rawConn)
mboxClient := authmailboxrpc.NewMailboxClient(rawConn)
return &tapClient{
node: node,
@ -2588,6 +2591,7 @@ func newTapClient(t *testing.T, node *HarnessNode) *tapClient {
RfqClient: rfqClient,
TaprootAssetChannelsClient: tchClient,
UniverseClient: universeClient,
MailboxClient: mboxClient,
}
}

67
subservers/taproot-assets.go
View file

@ -12,11 +12,6 @@ import (
"github.com/lightninglabs/taproot-assets/fn"
"github.com/lightninglabs/taproot-assets/tapcfg"
"github.com/lightninglabs/taproot-assets/taprpc"
"github.com/lightninglabs/taproot-assets/taprpc/assetwalletrpc"
"github.com/lightninglabs/taproot-assets/taprpc/mintrpc"
"github.com/lightninglabs/taproot-assets/taprpc/rfqrpc"
tchrpc "github.com/lightninglabs/taproot-assets/taprpc/tapchannelrpc"
"github.com/lightninglabs/taproot-assets/taprpc/universerpc"
"github.com/lightningnetwork/lnd/lnrpc"
"google.golang.org/grpc"
"gopkg.in/macaroon-bakery.v2/bakery"
@ -57,7 +52,7 @@ func NewTaprootAssetsSubServer(network string, cfg *tapcfg.Config,
chainCfg := address.ParamsForChain(network)
return &taprootAssetsSubServer{
Server: tap.NewServer(&chainCfg, nil),
Server: tap.NewServer(&chainCfg),
cfg: cfg,
remoteCfg: remoteCfg,
remote: remote,
@ -126,12 +121,7 @@ func (t *taprootAssetsSubServer) Start(_ lnrpc.LightningClient,
func (t *taprootAssetsSubServer) RegisterGrpcService(
registrar grpc.ServiceRegistrar) {
taprpc.RegisterTaprootAssetsServer(registrar, t)
mintrpc.RegisterMintServer(registrar, t)
assetwalletrpc.RegisterAssetWalletServer(registrar, t)
rfqrpc.RegisterRfqServer(registrar, t)
tchrpc.RegisterTaprootAssetChannelsServer(registrar, t)
universerpc.RegisterUniverseServer(registrar, t)
t.Server.RegisterGrpcService(registrar)
}
// RegisterRestService registers the sub-server's REST handlers with the given
@ -142,58 +132,7 @@ func (t *taprootAssetsSubServer) RegisterRestService(ctx context.Context,
mux *restProxy.ServeMux, endpoint string,
dialOpts []grpc.DialOption) error {
err := taprpc.RegisterTaprootAssetsHandlerFromEndpoint(
ctx, mux, endpoint, dialOpts,
)
if err != nil {
return err
}
err = mintrpc.RegisterMintHandlerFromEndpoint(
ctx, mux, endpoint, dialOpts,
)
if err != nil {
return err
}
err = assetwalletrpc.RegisterAssetWalletHandlerFromEndpoint(
ctx, mux, endpoint, dialOpts,
)
if err != nil {
return err
}
err = rfqrpc.RegisterRfqHandlerFromEndpoint(
ctx, mux, endpoint, dialOpts,
)
if err != nil {
return err
}
err = tchrpc.RegisterTaprootAssetChannelsHandlerFromEndpoint(
ctx, mux, endpoint, dialOpts,
)
if err != nil {
return err
}
err = rfqrpc.RegisterRfqHandlerFromEndpoint(
ctx, mux, endpoint, dialOpts,
)
if err != nil {
return err
}
err = tchrpc.RegisterTaprootAssetChannelsHandlerFromEndpoint(
ctx, mux, endpoint, dialOpts,
)
if err != nil {
return err
}
err = universerpc.RegisterUniverseHandlerFromEndpoint(
ctx, mux, endpoint, dialOpts,
)
err := t.Server.RegisterRestService(ctx, mux, endpoint, dialOpts)
if err != nil {
return err
}