multi: Implement peer premium rate deletion

Add a new RPC and CLI command to delete peer-specific premium rates.
Ensure default rate usage once the per-peer rate is removed.

Author: YusukeShimizu

clightning/clightning.go

@@ -51,6 +51,7 @@ var methods = []peerswaprpcMethod{
 	&SetPremiumRate{},
 	&GetDefaultPremiumRate{},
 	&SetDefaultPremiumRate{},
+	&DeletePremiumRate{},
 }
 
 var devmethods = []peerswaprpcMethod{}

clightning/clightning_commands.go

@@ -1153,7 +1153,11 @@ func (c *GetPremiumRate) Call() (jrpc2.Result, error) {
 	if err != nil {
 		return nil, fmt.Errorf("error getting premium rate: %v", err)
 	}
-	return e.PremiumRatePPM().Value(), nil
+	return &peerswaprpc.PremiumRate{
+		Asset:          peerswaprpc.ToAssetType(e.Asset()),
+		Operation:      peerswaprpc.ToOperationType(e.Operation()),
+		PremiumRatePpm: e.PremiumRatePPM().Value(),
+	}, nil
 }
 
 func (c *GetPremiumRate) Get(client *ClightningClient) jrpc2.ServerMethod {
@@ -1201,7 +1205,11 @@ func (c *SetPremiumRate) Call() (jrpc2.Result, error) {
 	if err != nil {
 		return nil, fmt.Errorf("error setting premium rate: %v", err)
 	}
-	return rate, nil
+	return &peerswaprpc.PremiumRate{
+		Asset:          peerswaprpc.ToAssetType(rate.Asset()),
+		Operation:      peerswaprpc.ToOperationType(rate.Operation()),
+		PremiumRatePpm: rate.PremiumRatePPM().Value(),
+	}, nil
 }
 
 func (c *SetPremiumRate) Get(client *ClightningClient) jrpc2.ServerMethod {
@@ -1218,6 +1226,54 @@ func (c SetPremiumRate) LongDescription() string {
 	return c.Description()
 }
 
+type DeletePremiumRate struct {
+	PeerID    string            `json:"peer_id"`
+	Asset     string            `json:"asset"`
+	Operation string            `json:"operation"`
+	cl        *ClightningClient `json:"-"`
+}
+
+func (c *DeletePremiumRate) Name() string {
+	return "peerswap-deletepremiumrate"
+}
+
+func (c *DeletePremiumRate) New() interface{} {
+	return &DeletePremiumRate{
+		cl: c.cl,
+	}
+}
+
+func (c *DeletePremiumRate) Call() (jrpc2.Result, error) {
+	if !c.cl.isReady {
+		return nil, ErrWaitingForReady
+	}
+	err := c.cl.ps.DeleteRate(c.PeerID, toPremiumAssetType(c.Asset),
+		toPremiumOperationType(c.Operation))
+	if err != nil {
+		return nil, fmt.Errorf("error deleting premium rate: %v", err)
+	}
+
+	return &peerswaprpc.PremiumRate{
+		Asset:          peerswaprpc.ToAssetType(toPremiumAssetType(c.Asset)),
+		Operation:      peerswaprpc.ToOperationType(toPremiumOperationType(c.Operation)),
+		PremiumRatePpm: 0,
+	}, nil
+}
+
+func (c *DeletePremiumRate) Get(client *ClightningClient) jrpc2.ServerMethod {
+	return &DeletePremiumRate{
+		cl: client,
+	}
+}
+
+func (c DeletePremiumRate) Description() string {
+	return "Delete the premium rate for a peer"
+}
+
+func (c DeletePremiumRate) LongDescription() string {
+	return c.Description()
+}
+
 type SetDefaultPremiumRate struct {
 	Asset          string            `json:"asset"`
 	Operation      string            `json:"operation"`
@@ -1248,7 +1304,11 @@ func (c *SetDefaultPremiumRate) Call() (jrpc2.Result, error) {
 	if err != nil {
 		return nil, fmt.Errorf("error setting default premium rate: %v", err)
 	}
-	return rate, nil
+	return &peerswaprpc.PremiumRate{
+		Asset:          peerswaprpc.ToAssetType(rate.Asset()),
+		Operation:      peerswaprpc.ToOperationType(rate.Operation()),
+		PremiumRatePpm: rate.PremiumRatePPM().Value(),
+	}, nil
 }
 
 func (c *SetDefaultPremiumRate) Get(client *ClightningClient) jrpc2.ServerMethod {
@@ -1290,7 +1350,11 @@ func (c *GetDefaultPremiumRate) Call() (jrpc2.Result, error) {
 	if err != nil {
 		return nil, fmt.Errorf("error getting default premium rate: %v", err)
 	}
-	return rate.PremiumRatePPM().Value(), nil
+	return &peerswaprpc.PremiumRate{
+		Asset:          peerswaprpc.ToAssetType(rate.Asset()),
+		Operation:      peerswaprpc.ToOperationType(rate.Operation()),
+		PremiumRatePpm: rate.PremiumRatePPM().Value(),
+	}, nil
 }
 
 func (c *GetDefaultPremiumRate) Get(client *ClightningClient) jrpc2.ServerMethod {

cmd/peerswaplnd/pscli/main.go

@@ -33,7 +33,7 @@ func main() {
 		liquidGetBalanceCommand, liquidGetAddressCommand, liquidSendToAddressCommand,
 		stopCommand, listActiveSwapsCommand, allowSwapRequestsCommand, addPeerCommand, removePeerCommand,
 		addSusPeerCommand, removeSusPeerCommand, getDefaultPremiumRateCommand, updateDefaultPremiumRateCommand,
-		getPeerPremiumRateCommand, updatePremiumRateCommand,
+		getPeerPremiumRateCommand, updatePremiumRateCommand, deletePeerPremiumRateCommand,
 	}
 	app.Version = fmt.Sprintf("commit: %s", GitCommit)
 	err := app.Run(os.Args)
@@ -245,6 +245,16 @@ var (
 		},
 		Action: updateDefaultPremiumRate,
 	}
+	deletePeerPremiumRateCommand = cli.Command{
+		Name:  "deletepeerpremiumrate",
+		Usage: "Delete the premium rate for a specific peer, asset, and operation",
+		Flags: []cli.Flag{
+			nodeIdFlag,
+			assetFlag,
+			operationFlag,
+		},
+		Action: deletePeerPremiumRate,
+	}
 	getPeerPremiumRateCommand = cli.Command{
 		Name:  "getpeerpremiumrate",
 		Usage: "Get the premium rate for a specific peer, asset, and operation",
@@ -627,6 +637,25 @@ func updatePremiumRate(ctx *cli.Context) error {
 	return nil
 }
 
+func deletePeerPremiumRate(ctx *cli.Context) error {
+	client, cleanup, err := getClient(ctx)
+	if err != nil {
+		return err
+	}
+	defer cleanup()
+
+	res, err := client.DeletePremiumRate(context.Background(), &peerswaprpc.DeletePremiumRateRequest{
+		NodeId:    ctx.String(nodeIdFlag.Name),
+		Asset:     peerswaprpc.AssetType(peerswaprpc.AssetType_value[strings.ToUpper(ctx.String(assetFlag.Name))]),
+		Operation: peerswaprpc.OperationType(peerswaprpc.OperationType_value[strings.ToUpper(ctx.String(operationFlag.Name))]),
+	})
+	if err != nil {
+		return err
+	}
+	printRespJSON(res)
+	return nil
+}
+
 func getClient(ctx *cli.Context) (peerswaprpc.PeerSwapClient, func(), error) {
 	rpcServer := ctx.GlobalString("rpchost")
 

docs/usage.md

@@ -155,6 +155,20 @@ For LND:
 pscli updatepremiumrate --node_id [node_id] --asset [BTC|LBTC] --operation [SWAP_IN|SWAP_OUT] --rate [premium_rate_ppm]
 ```
 
+### Delete Peer-Specific Premium Rate
+
+To delete the premium rate for a specific peer, use the following command:
+
+For CLN:
+```
+lightning-cli peerswap-deletepremiumrate [peer_id] [BTC|LBTC] [SWAP_IN|SWAP_OUT]
+```
+
+For LND:
+```bash
+pscli deletepeerpremiumrate --node_id [node_id] --asset [BTC|LBTC] --operation [SWAP_IN|SWAP_OUT]
+```
+
 ## Misc
 
 `listpeers` - A command that returns peers that support the PeerSwap protocol. It also gives statistics about received and sent swaps to a peer.