Skip to content

Commit a573d71

Browse files
committed
mod+subservers: use taprpc module
1 parent aac3653 commit a573d71

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

go.mod

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ require (
2828
github.com/lightninglabs/pool v0.6.5-beta.0.20250305125211-4e860ec4e77f
2929
github.com/lightninglabs/pool/auctioneerrpc v1.1.3-0.20250305125211-4e860ec4e77f
3030
github.com/lightninglabs/pool/poolrpc v1.0.1-0.20250305125211-4e860ec4e77f
31-
github.com/lightninglabs/taproot-assets v0.5.2-0.20250501125658-7b383050ae89
31+
github.com/lightninglabs/taproot-assets v0.5.2-0.20250502070549-52257227c8f8
32+
github.com/lightninglabs/taproot-assets/taprpc v1.0.1
3233
github.com/lightningnetwork/lnd v0.19.0-beta.rc3
3334
github.com/lightningnetwork/lnd/cert v1.2.2
3435
github.com/lightningnetwork/lnd/clock v1.1.1

go.sum

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1171,8 +1171,10 @@ github.com/lightninglabs/pool/poolrpc v1.0.1-0.20250305125211-4e860ec4e77f h1:5p
11711171
github.com/lightninglabs/pool/poolrpc v1.0.1-0.20250305125211-4e860ec4e77f/go.mod h1:lGs2hSVZ+GFpdv3btaIl9icG5/gz7BBRfvmD2iqqNl0=
11721172
github.com/lightninglabs/protobuf-go-hex-display v1.34.2-hex-display h1:w7FM5LH9Z6CpKxl13mS48idsu6F+cEZf0lkyiV+Dq9g=
11731173
github.com/lightninglabs/protobuf-go-hex-display v1.34.2-hex-display/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
1174-
github.com/lightninglabs/taproot-assets v0.5.2-0.20250501125658-7b383050ae89 h1:7GvIZniLBZC2/kAJDJu9HFwpMY1I9pUehVwp2AvFSpE=
1175-
github.com/lightninglabs/taproot-assets v0.5.2-0.20250501125658-7b383050ae89/go.mod h1:wna/k7WVVj2GixVEDuhdremUo7hBwhfzHl11YGw9g/E=
1174+
github.com/lightninglabs/taproot-assets v0.5.2-0.20250502070549-52257227c8f8 h1:kYAHGZTfIXgH9wQHml5B916GlS0pe6tcNsroqzabSxI=
1175+
github.com/lightninglabs/taproot-assets v0.5.2-0.20250502070549-52257227c8f8/go.mod h1:OdeFcj2bnJf6aaYjBB5c8KdNI3aDaEMQpsSu2EqvMlw=
1176+
github.com/lightninglabs/taproot-assets/taprpc v1.0.1 h1:aSlCWdJkagx9xa8DqK/pzHYCtY7PokU6wASse3dWayc=
1177+
github.com/lightninglabs/taproot-assets/taprpc v1.0.1/go.mod h1:Ccq0t2GsXzOtC8qF0U1ux/yTF5HcBbVrhCb0tb/jObM=
11761178
github.com/lightningnetwork/lightning-onion v1.2.1-0.20240712235311-98bd56499dfb h1:yfM05S8DXKhuCBp5qSMZdtSwvJ+GFzl94KbXMNB1JDY=
11771179
github.com/lightningnetwork/lightning-onion v1.2.1-0.20240712235311-98bd56499dfb/go.mod h1:c0kvRShutpj3l6B9WtTsNTBUtjSmjZXbJd9ZBRQOSKI=
11781180
github.com/lightningnetwork/lnd v0.19.0-beta.rc3 h1:XWMlyZvBrp69AnQqrshLOOPZjOl4hFWR1RD4ceCXt9k=

subservers/taproot-assets.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
tap "github.com/lightninglabs/taproot-assets"
1111
"github.com/lightninglabs/taproot-assets/address"
1212
"github.com/lightninglabs/taproot-assets/fn"
13-
"github.com/lightninglabs/taproot-assets/perms"
1413
"github.com/lightninglabs/taproot-assets/tapcfg"
1514
"github.com/lightninglabs/taproot-assets/taprpc"
1615
"github.com/lightninglabs/taproot-assets/taprpc/assetwalletrpc"
@@ -224,7 +223,7 @@ func (t *taprootAssetsSubServer) MacPath() string {
224223
//
225224
// NOTE: this is part of the SubServer interface.
226225
func (t *taprootAssetsSubServer) Permissions() map[string][]bakery.Op {
227-
return perms.RequiredPermissions
226+
return taprpc.RequiredPermissions
228227
}
229228

230229
// WhiteListedURLs returns a map of all the sub-server's URLs that can be
@@ -248,7 +247,7 @@ func (t *taprootAssetsSubServer) WhiteListedURLs() map[string]struct{} {
248247
string(tap.UniversePublicAccessStatusWrite),
249248
)
250249

251-
return perms.MacaroonWhitelist(
250+
return taprpc.MacaroonWhitelist(
252251
publicUniRead || t.remote, publicUniWrite || t.remote,
253252
t.cfg.RpcConf.AllowPublicUniProofCourier || t.remote,
254253
t.cfg.RpcConf.AllowPublicStats || t.remote,

0 commit comments

Comments
 (0)