Skip to content

Commit 33bc532

Browse files
guggeroguggero
committed
mod+subservers: use taprpc module
1 parent 7e0b198 commit 33bc532

File tree

8 files changed

+52
-1108
lines changed

8 files changed

+52
-1108
lines changed

‎cmd/litcli/ln.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import (
1212
"github.com/lightninglabs/taproot-assets/asset"
1313
"github.com/lightninglabs/taproot-assets/rfq"
1414
"github.com/lightninglabs/taproot-assets/rfqmath"
15+
"github.com/lightninglabs/taproot-assets/rpcutils"
1516
"github.com/lightninglabs/taproot-assets/taprpc"
16-
"github.com/lightninglabs/taproot-assets/taprpc/rfqrpc"
1717
tchrpc "github.com/lightninglabs/taproot-assets/taprpc/tapchannelrpc"
1818
"github.com/lightningnetwork/lnd/cmd/commands"
1919
"github.com/lightningnetwork/lnd/lnrpc"
@@ -218,7 +218,7 @@ func (w *resultStreamWrapper) Recv() (*lnrpc.Payment, error) {
218218
case *tchrpc.SendPaymentResponse_AcceptedSellOrder:
219219
quote := r.AcceptedSellOrder
220220
rpcRate := quote.BidAssetRate
221-
rate, err := rfqrpc.UnmarshalFixedPoint(rpcRate)
221+
rate, err := rpcutils.UnmarshalRfqFixedPoint(rpcRate)
222222
if err != nil {
223223
return nil, fmt.Errorf("unable to unmarshal fixed "+
224224
"point: %w", err)

‎go.mod‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,14 @@ require (
2222
github.com/lightninglabs/lightning-terminal/autopilotserverrpc v0.0.2
2323
github.com/lightninglabs/lightning-terminal/litrpc v1.0.1
2424
github.com/lightninglabs/lndclient v0.19.0-4
25-
github.com/lightninglabs/loop v0.31.0-beta.0.20250425065236-7e81916829d9
26-
github.com/lightninglabs/loop/looprpc v1.0.6
27-
github.com/lightninglabs/loop/swapserverrpc v1.0.13
25+
github.com/lightninglabs/loop v0.31.0-beta.0.20250502080242-8ef7584f9f56
26+
github.com/lightninglabs/loop/looprpc v1.0.7
27+
github.com/lightninglabs/loop/swapserverrpc v1.0.14
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
@@ -49,7 +50,7 @@ require (
4950
golang.org/x/sync v0.12.0
5051
google.golang.org/grpc v1.65.0
5152
google.golang.org/protobuf v1.34.2
52-
gopkg.in/macaroon-bakery.v2 v2.1.0
53+
gopkg.in/macaroon-bakery.v2 v2.3.0
5354
gopkg.in/macaroon.v2 v2.1.0
5455
modernc.org/sqlite v1.34.5
5556
)
@@ -97,6 +98,7 @@ require (
9798
github.com/fortytw2/leaktest v1.3.0 // indirect
9899
github.com/go-logr/logr v1.4.2 // indirect
99100
github.com/go-logr/stdr v1.2.2 // indirect
101+
github.com/go-macaroon-bakery/macaroonpb v1.0.0 // indirect
100102
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
101103
github.com/goccy/go-yaml v1.15.23 // indirect
102104
github.com/gogo/protobuf v1.3.2 // indirect
@@ -130,7 +132,6 @@ require (
130132
github.com/jonboulle/clockwork v0.2.2 // indirect
131133
github.com/jrick/logrotate v1.1.2 // indirect
132134
github.com/json-iterator/go v1.1.12 // indirect
133-
github.com/juju/loggo v1.0.0 // indirect
134135
github.com/kkdai/bstream v1.0.0 // indirect
135136
github.com/klauspost/compress v1.17.9 // indirect
136137
github.com/klauspost/cpuid/v2 v2.2.7 // indirect

‎go.sum‎

Lines changed: 30 additions & 1088 deletions
Large diffs are not rendered by default.

‎itest/assets_test.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323
"github.com/lightninglabs/taproot-assets/rfq"
2424
"github.com/lightninglabs/taproot-assets/rfqmath"
2525
"github.com/lightninglabs/taproot-assets/rfqmsg"
26+
"github.com/lightninglabs/taproot-assets/rpcutils"
2627
"github.com/lightninglabs/taproot-assets/tapfreighter"
2728
"github.com/lightninglabs/taproot-assets/taprpc"
2829
"github.com/lightninglabs/taproot-assets/taprpc/assetwalletrpc"
@@ -1396,7 +1397,7 @@ func payInvoiceWithAssets(t *testing.T, payer, rfqPeer *HarnessNode,
13961397
require.Equal(t, peerPubKey, rfqPeer.PubKeyStr)
13971398

13981399
rpcRate := acceptedQuote.BidAssetRate
1399-
rate, err := rfqrpc.UnmarshalFixedPoint(rpcRate)
1400+
rate, err := rpcutils.UnmarshalRfqFixedPoint(rpcRate)
14001401
require.NoError(t, err)
14011402

14021403
rateVal = *rate
@@ -1504,7 +1505,7 @@ func createAssetInvoice(t *testing.T, dstRfqPeer, dst *HarnessNode,
15041505
require.NoError(t, err)
15051506

15061507
rpcRate := resp.AcceptedBuyQuote.AskAssetRate
1507-
rate, err := rfqrpc.UnmarshalFixedPoint(rpcRate)
1508+
rate, err := rpcutils.UnmarshalRfqFixedPoint(rpcRate)
15081509
require.NoError(t, err)
15091510

15101511
t.Logf("Got quote for %v asset units per BTC", rate)
@@ -1694,7 +1695,7 @@ func createAssetHodlInvoice(t *testing.T, dstRfqPeer, dst *HarnessNode,
16941695
require.NoError(t, err)
16951696

16961697
rpcRate := resp.AcceptedBuyQuote.AskAssetRate
1697-
rate, err := rfqrpc.UnmarshalFixedPoint(rpcRate)
1698+
rate, err := rpcutils.UnmarshalRfqFixedPoint(rpcRate)
16981699
require.NoError(t, err)
16991700

17001701
assetUnits := rfqmath.NewBigIntFixedPoint(assetAmount, 0)

‎itest/litd_custom_channels_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import (
1818
"github.com/lightninglabs/taproot-assets/proof"
1919
"github.com/lightninglabs/taproot-assets/rfqmath"
2020
"github.com/lightninglabs/taproot-assets/rfqmsg"
21+
"github.com/lightninglabs/taproot-assets/rpcutils"
2122
"github.com/lightninglabs/taproot-assets/taprpc"
2223
"github.com/lightninglabs/taproot-assets/taprpc/mintrpc"
2324
oraclerpc "github.com/lightninglabs/taproot-assets/taprpc/priceoraclerpc"
@@ -4173,7 +4174,7 @@ func testCustomChannelsForwardBandwidth(ctx context.Context,
41734174

41744175
// We calculate the milli-satoshi amount one below the equivalent of a
41754176
// single asset unit.
4176-
rate, err := oraclerpc.UnmarshalFixedPoint(&oraclerpc.FixedPoint{
4177+
rate, err := rpcutils.UnmarshalFixedPoint(&oraclerpc.FixedPoint{
41774178
Coefficient: quote.AcceptedQuote.AskAssetRate.Coefficient,
41784179
Scale: quote.AcceptedQuote.AskAssetRate.Scale,
41794180
})

‎itest/oracle_test.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212
"github.com/lightninglabs/taproot-assets/asset"
1313
"github.com/lightninglabs/taproot-assets/rfqmath"
1414
"github.com/lightninglabs/taproot-assets/rfqmsg"
15+
"github.com/lightninglabs/taproot-assets/rpcutils"
1516
oraclerpc "github.com/lightninglabs/taproot-assets/taprpc/priceoraclerpc"
1617
"github.com/lightningnetwork/lnd/cert"
1718
"github.com/stretchr/testify/require"
@@ -114,15 +115,15 @@ func (o *oracleHarness) getAssetRates(id asset.ID,
114115
}
115116

116117
// Marshal subject asset rate to RPC format.
117-
rpcSubjectAssetToBtcRate, err := oraclerpc.MarshalBigIntFixedPoint(
118+
rpcSubjectAssetToBtcRate, err := rpcutils.MarshalBigIntFixedPoint(
118119
subjectAssetRate,
119120
)
120121
if err != nil {
121122
return oraclerpc.AssetRates{}, err
122123
}
123124

124125
// Marshal payment asset rate to RPC format.
125-
rpcPaymentAssetToBtcRate, err := oraclerpc.MarshalBigIntFixedPoint(
126+
rpcPaymentAssetToBtcRate, err := rpcutils.MarshalBigIntFixedPoint(
126127
rfqmsg.MilliSatPerBtc,
127128
)
128129
if err != nil {
@@ -168,7 +169,7 @@ func (o *oracleHarness) QueryAssetRates(_ context.Context,
168169

169170
// Ensure that the payment asset is BTC. We only support BTC as the
170171
// payment asset in this example.
171-
if !oraclerpc.IsAssetBtc(req.PaymentAsset) {
172+
if !rpcutils.IsAssetBtc(req.PaymentAsset) {
172173
log.Infof("Payment asset is not BTC: %v", req.PaymentAsset)
173174

174175
return &oraclerpc.QueryAssetRatesResponse{

‎subservers/loop.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
"github.com/lightninglabs/lndclient"
88
"github.com/lightninglabs/loop"
99
"github.com/lightninglabs/loop/loopd"
10-
"github.com/lightninglabs/loop/loopd/perms"
1110
"github.com/lightninglabs/loop/looprpc"
1211
"github.com/lightninglabs/taproot-assets/fn"
1312
"github.com/lightningnetwork/lnd/lnrpc"
@@ -127,7 +126,7 @@ func (l *loopSubServer) MacPath() string {
127126
//
128127
// NOTE: this is part of the SubServer interface.
129128
func (l *loopSubServer) Permissions() map[string][]bakery.Op {
130-
return perms.RequiredPermissions
129+
return looprpc.RequiredPermissions
131130
}
132131

133132
// WhiteListedURLs returns a map of all the sub-server's URLs that can be

‎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)