Merge pull request #231 from YusukeShimizu/shared-serialization

Use the peerswaprpc proto file for shared serialization

Author: grubles

clightning/clightning_commands.go

@@ -57,7 +57,7 @@ func (g *LiquidGetAddress) Call() (jrpc2.Result, error) {
 		return nil, err
 	}
 	log.Infof("[Wallet] Getting lbtc address %s", res)
-	return &GetAddressResponse{LiquidAddress: res}, nil
+	return &peerswaprpc.GetAddressResponse{Address: res}, nil
 }
 
 func (g *LiquidGetAddress) Description() string {
@@ -74,10 +74,6 @@ func (g *LiquidGetAddress) Get(client *ClightningClient) jrpc2.ServerMethod {
 	}
 }
 
-type GetAddressResponse struct {
-	LiquidAddress string `json:"lbtc_address"`
-}
-
 // GetBalance returns the liquid balance
 type LiquidGetBalance struct {
 	cl *ClightningClient
@@ -105,8 +101,8 @@ func (g *LiquidGetBalance) Call() (jrpc2.Result, error) {
 	if err != nil {
 		return nil, err
 	}
-	return &GetBalanceResponse{
-		res,
+	return &peerswaprpc.GetBalanceResponse{
+		SatAmount: res,
 	}, nil
 }
 
@@ -124,10 +120,6 @@ func (g *LiquidGetBalance) Get(client *ClightningClient) jrpc2.ServerMethod {
 	}
 }
 
-type GetBalanceResponse struct {
-	LiquidBalance uint64 `json:"lbtc_balance_sat"`
-}
-
 // LiquidSendToAddress sends
 type LiquidSendToAddress struct {
 	Address   string `json:"address"`
@@ -170,11 +162,7 @@ func (s *LiquidSendToAddress) Call() (jrpc2.Result, error) {
 		log.Infof("Error sending to address %v", err)
 		return nil, err
 	}
-	return &SendToAddressResponse{TxId: res}, nil
-}
-
-type SendToAddressResponse struct {
-	TxId string `json:"txid"`
+	return &peerswaprpc.SendToAddressResponse{TxId: res}, nil
 }
 
 func (s *LiquidSendToAddress) Description() string {
@@ -580,7 +568,7 @@ func (l *ListPeers) Call() (jrpc2.Result, error) {
 		return nil, err
 	}
 
-	peerSwappers := []*PeerSwapPeer{}
+	peerSwappers := []*peerswaprpc.PeerSwapPeer{}
 	for _, peer := range peers {
 		if p, ok := polls[peer.Id]; ok {
 			swaps, err := l.cl.swaps.ListSwapsByPeer(peer.Id)
@@ -616,42 +604,66 @@ func (l *ListPeers) Call() (jrpc2.Result, error) {
 				}
 			}
 
-			peerSwapPeer := &PeerSwapPeer{
+			peerSwapPeer := &peerswaprpc.PeerSwapPeer{
 				NodeId:          peer.Id,
 				SwapsAllowed:    p.PeerAllowed,
 				SupportedAssets: p.Assets,
-				AsSender: &SwapStats{
+				AsSender: &peerswaprpc.SwapStats{
 					SwapsOut: SenderSwapsOut,
 					SwapsIn:  SenderSwapsIn,
 					SatsOut:  SenderSatsOut,
 					SatsIn:   SenderSatsIn,
 				},
-				AsReceiver: &SwapStats{
+				AsReceiver: &peerswaprpc.SwapStats{
 					SwapsOut: ReceiverSwapsOut,
 					SwapsIn:  ReceiverSwapsIn,
 					SatsOut:  ReceiverSatsOut,
 					SatsIn:   ReceiverSatsIn,
 				},
 				PaidFee: paidFees,
-				PeerPremium: &Premium{
-					BTCSwapInPremiumRatePPM:   p.BTCSwapInPremiumRatePPM,
-					BTCSwapOutPremiumRatePPM:  p.BTCSwapOutPremiumRatePPM,
-					LBTCSwapInPremiumRatePPM:  p.LBTCSwapInPremiumRatePPM,
-					LBTCSwapOutPremiumRatePPM: p.LBTCSwapOutPremiumRatePPM,
+				PeerPremium: &peerswaprpc.PeerPremium{
+					NodeId: peer.Id,
+					Rates: []*peerswaprpc.PremiumRate{
+						{
+							Asset:          peerswaprpc.AssetType_BTC,
+							Operation:      peerswaprpc.OperationType_SWAP_IN,
+							PremiumRatePpm: p.BTCSwapInPremiumRatePPM,
+						},
+						{
+							Asset:          peerswaprpc.AssetType_BTC,
+							Operation:      peerswaprpc.OperationType_SWAP_OUT,
+							PremiumRatePpm: p.BTCSwapOutPremiumRatePPM,
+						},
+						{
+							Asset:          peerswaprpc.AssetType_LBTC,
+							Operation:      peerswaprpc.OperationType_SWAP_IN,
+							PremiumRatePpm: p.LBTCSwapInPremiumRatePPM,
+						},
+						{
+							Asset:          peerswaprpc.AssetType_LBTC,
+							Operation:      peerswaprpc.OperationType_SWAP_OUT,
+							PremiumRatePpm: p.LBTCSwapOutPremiumRatePPM,
+						},
+					},
 				},
 			}
 			channels, err := l.cl.glightning.ListChannelsBySource(peer.Id)
 			if err != nil {
 				return nil, err
 			}
-			peerSwapPeerChannels := []*PeerSwapPeerChannel{}
+			peerSwapPeerChannels := []*peerswaprpc.PeerSwapPeerChannel{}
 			for _, channel := range channels {
 				if c, ok := fundingChannels[channel.ShortChannelId]; ok {
-					peerSwapPeerChannels = append(peerSwapPeerChannels, &PeerSwapPeerChannel{
-						ChannelId:     c.ShortChannelId,
-						LocalBalance:  c.OurAmountMilliSatoshi.MSat() / 1000,
-						RemoteBalance: (c.AmountMilliSatoshi.MSat() - c.OurAmountMilliSatoshi.MSat()) / 1000,
-						State:         c.State,
+					scid, err := peerswaprpc.NewScidFromString(c.ShortChannelId)
+					if err != nil {
+						return nil, err
+					}
+					peerSwapPeerChannels = append(peerSwapPeerChannels, &peerswaprpc.PeerSwapPeerChannel{
+						ChannelId:      scid.ToUint64(),
+						ShortChannelId: c.ShortChannelId,
+						LocalBalance:   c.OurAmountMilliSatoshi.MSat() / 1000,
+						RemoteBalance:  (c.AmountMilliSatoshi.MSat() - c.OurAmountMilliSatoshi.MSat()) / 1000,
+						Active:         channelActive(c.State),
 					})
 				}
 			}
@@ -663,6 +675,10 @@ func (l *ListPeers) Call() (jrpc2.Result, error) {
 	return peerSwappers, nil
 }
 
+func channelActive(state string) bool {
+	return state == "CHANNELD_NORMAL"
+}
+
 type GetSwap struct {
 	SwapId string `json:"swap_id"`
 	cl     *ClightningClient