looprpc: add asset id to liquidity request

Author: sputn1ck

cmd/loop/liquidity.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/lightninglabs/loop/liquidity"
 	"github.com/lightninglabs/loop/looprpc"
+	"github.com/lightninglabs/loop/swap"
 	"github.com/lightningnetwork/lnd/routing/route"
 	"github.com/urfave/cli"
 	"google.golang.org/grpc/codes"
@@ -106,7 +107,7 @@ func setRule(ctx *cli.Context) error {
 	// We need to set the full set of current parameters every time we call
 	// SetParameters. To allow users to set only individual fields on the
 	// cli, we lookup our current params, then update individual values.
-	params, err := client.GetLiquidityParams(
+	paramsResponse, err := client.GetLiquidityParams(
 		context.Background(), &looprpc.GetLiquidityParamsRequest{},
 	)
 	if err != nil {
@@ -120,6 +121,12 @@ func setRule(ctx *cli.Context) error {
 		otherRules  []*looprpc.LiquidityRule
 	)
 
+	// We're only interested in the btc rules for now.
+	params, ok := paramsResponse.Rules[swap.DefaultBtcAssetID]
+	if !ok {
+		return errors.New("no rules set for BTC")
+	}
+
 	// Run through our current set of rules and check whether we have a rule
 	// currently set for this channel or peer. We also track a slice
 	// containing all of the rules we currently have set for other channels,
@@ -160,6 +167,7 @@ func setRule(ctx *cli.Context) error {
 			context.Background(),
 			&looprpc.SetLiquidityParamsRequest{
 				Parameters: params,
+				AssetId:    swap.DefaultBtcAssetID,
 			},
 		)
 		return err
@@ -216,6 +224,7 @@ func setRule(ctx *cli.Context) error {
 		context.Background(),
 		&looprpc.SetLiquidityParamsRequest{
 			Parameters: params,
+			AssetId:    swap.DefaultBtcAssetID,
 		},
 	)
 
@@ -364,13 +373,19 @@ func setParams(ctx *cli.Context) error {
 	// We need to set the full set of current parameters every time we call
 	// SetParameters. To allow users to set only individual fields on the
 	// cli, we lookup our current params, then update individual values.
-	params, err := client.GetLiquidityParams(
+	paramsResponse, err := client.GetLiquidityParams(
 		context.Background(), &looprpc.GetLiquidityParamsRequest{},
 	)
 	if err != nil {
 		return err
 	}
 
+	// We're only interested in the btc rules for now.
+	params, ok := paramsResponse.Rules[swap.DefaultBtcAssetID]
+	if !ok {
+		return errors.New("no rules set for BTC")
+	}
+
 	var flagSet, categoriesSet, feePercentSet bool
 
 	// Update our existing parameters with the values provided by cli flags.
@@ -556,6 +571,7 @@ func setParams(ctx *cli.Context) error {
 	_, err = client.SetLiquidityParams(
 		context.Background(), &looprpc.SetLiquidityParamsRequest{
 			Parameters: params,
+			AssetId:    swap.DefaultBtcAssetID,
 		},
 	)
 

loopd/swapclient_server.go

@@ -1224,8 +1224,8 @@ func (s *swapClientServer) GetInfo(ctx context.Context,
 
 // GetLiquidityParams gets our current liquidity manager's parameters.
 func (s *swapClientServer) GetLiquidityParams(_ context.Context,
-	_ *looprpc.GetLiquidityParamsRequest) (*looprpc.LiquidityParameters,
-	error) {
+	_ *looprpc.GetLiquidityParamsRequest) (
+	*looprpc.GetLiquidityParamsResponse, error) {
 
 	cfg := s.liquidityMgr.GetParameters()
 
@@ -1234,7 +1234,11 @@ func (s *swapClientServer) GetLiquidityParams(_ context.Context,
 		return nil, err
 	}
 
-	return rpcCfg, nil
+	return &looprpc.GetLiquidityParamsResponse{
+		Rules: map[string]*looprpc.LiquidityParameters{
+			swap.DefaultBtcAssetID: rpcCfg,
+		},
+	}, nil
 }
 
 // SetLiquidityParams attempts to set our current liquidity manager's