cleanup: remove openchannel rpc

2026-02-07 23:34:26 +01:00 · 2024-02-08 10:45:40 +01:00
parent a072e5c090
commit 31bf2a885a
13 changed files with 87 additions and 444 deletions
--- a/channel_opener_server.go
+++ b/channel_opener_server.go
@@ -11,7 +11,6 @@ import (
 	"github.com/breez/lspd/btceclegacy"
 	"github.com/breez/lspd/common"
 	"github.com/breez/lspd/interceptor"
-	"github.com/breez/lspd/lightning"
 	"github.com/breez/lspd/lsps0"
 	lspdrpc "github.com/breez/lspd/rpc"
 	ecies "github.com/ecies/go/v2"
@@ -19,7 +18,6 @@ import (

 	"github.com/btcsuite/btcd/btcec/v2"
 	"github.com/btcsuite/btcd/chaincfg/chainhash"
-	"github.com/btcsuite/btcd/wire"
 	"github.com/lightningnetwork/lnd/lnwire"
 )

@@ -169,50 +167,6 @@ func (s *channelOpenerServer) RegisterPayment(
 	return &lspdrpc.RegisterPaymentReply{}, nil
 }

-func (s *channelOpenerServer) OpenChannel(ctx context.Context, in *lspdrpc.OpenChannelRequest) (*lspdrpc.OpenChannelReply, error) {
-	node, _, err := lspdrpc.GetNode(ctx)
-	if err != nil {
-		return nil, err
-	}
-
-	r, err, _ := node.OpenChannelReqGroup.Do(in.Pubkey, func() (interface{}, error) {
-		pubkey, err := hex.DecodeString(in.Pubkey)
-		if err != nil {
-			return nil, err
-		}
-
-		channelCount, err := node.Client.GetNodeChannelCount(pubkey)
-		if err != nil {
-			return nil, err
-		}
-
-		var outPoint *wire.OutPoint
-		if channelCount == 0 {
-			outPoint, err = node.Client.OpenChannel(&lightning.OpenChannelRequest{
-				CapacitySat: node.NodeConfig.ChannelAmount,
-				Destination: pubkey,
-				TargetConf:  &node.NodeConfig.TargetConf,
-				MinHtlcMsat: node.NodeConfig.MinHtlcMsat,
-				IsPrivate:   node.NodeConfig.ChannelPrivate,
-			})
-
-			if err != nil {
-				log.Printf("Error in OpenChannel: %v", err)
-				return nil, err
-			}
-
-			log.Printf("Response from OpenChannel: (TX: %v)", outPoint.String())
-		}
-
-		return &lspdrpc.OpenChannelReply{TxHash: outPoint.Hash.String(), OutputIndex: outPoint.Index}, nil
-	})
-
-	if err != nil {
-		return nil, err
-	}
-	return r.(*lspdrpc.OpenChannelReply), err
-}
-
 func getSignedEncryptedData(n *common.Node, in *lspdrpc.Encrypted) (string, []byte, bool, error) {
 	usedEcies := true
 	signedBlob, err := ecies.Decrypt(n.EciesPrivateKey, in.Data)
--- a/cln/cln_client.go
+++ b/cln/cln_client.go
@@ -131,12 +131,7 @@ func (c *ClnClient) OpenChannel(req *lightning.OpenChannelRequest) (*wire.OutPoi
 		m := uint16(*req.MinConfs)
 		minConfs = &m
 	}
-	var minDepth *uint16
-	if req.IsZeroConf {
-		var d uint16 = 0
-		minDepth = &d
-	}
-
+	var minDepth uint16 = 0
 	var rate *glightning.FeeRate
 	if req.FeeSatPerVByte != nil {
 		rate = &glightning.FeeRate{
@@ -163,10 +158,10 @@ func (c *ClnClient) OpenChannel(req *lightning.OpenChannelRequest) (*wire.OutPoi
 		pubkey,
 		glightning.NewSat(int(req.CapacitySat)),
 		rate,
-		!req.IsPrivate,
+		false,
 		minConfs,
 		glightning.NewMsat(0),
-		minDepth,
+		&minDepth,
 		glightning.NewMsat(0),
 	)

@@ -233,30 +228,6 @@ func (c *ClnClient) GetChannel(peerID []byte, channelPoint wire.OutPoint) (*ligh
 	return nil, fmt.Errorf("no channel found")
 }

-func (c *ClnClient) GetNodeChannelCount(nodeID []byte) (int, error) {
-	client, err := c.getClient()
-	if err != nil {
-		return 0, err
-	}
-
-	pubkey := hex.EncodeToString(nodeID)
-	channels, err := client.GetPeerChannels(pubkey)
-	if err != nil {
-		log.Printf("CLN: client.GetPeer(%s) error: %v", pubkey, err)
-		return 0, err
-	}
-
-	count := 0
-	openPendingStatuses := append(OPEN_STATUSES, PENDING_STATUSES...)
-	for _, c := range channels {
-		if slices.Contains(openPendingStatuses, c.State) {
-			count++
-		}
-	}
-
-	return count, nil
-}
-
 func (c *ClnClient) GetClosedChannels(nodeID string, channelPoints map[string]uint64) (map[string]uint64, error) {
 	client, err := c.getClient()
 	if err != nil {
--- a/config/config.go
+++ b/config/config.go
@@ -35,19 +35,6 @@ type NodeConfig struct {
 	// running lspd.
 	PublicChannelAmount int64 `json:"publicChannelAmount,string,omitempty"`

-	// The capacity of opened channels through the OpenChannel rpc.
-	//
-	// Deprecated: This config option is part of the OpenChannel rpc, which is
-	// deprecated.
-	ChannelAmount uint64 `json:"channelAmount,string,omitempty"`
-
-	// Value indicating whether channels opened through the OpenChannel rpc
-	// should be private.
-	//
-	// Deprecated: This config option is part of the OpenChannel rpc, which is
-	// deprecated.
-	ChannelPrivate bool `json:"channelPrivate"`
-
 	// Number of blocks after which an opened channel is considered confirmed.
 	TargetConf uint32 `json:"targetConf,string"`

--- a/interceptor/intercept_handler.go
+++ b/interceptor/intercept_handler.go
@@ -375,8 +375,6 @@ func (i *Interceptor) openChannel(paymentHash, destination []byte, incomingAmoun
 		Destination:    destination,
 		CapacitySat:    uint64(capacity),
 		MinConfs:       i.config.MinConfs,
-		IsPrivate:      true,
-		IsZeroConf:     true,
 		FeeSatPerVByte: fee.SatPerVByte,
 		TargetConf:     fee.TargetConf,
 	})
--- a/itest/lspd_node.go
+++ b/itest/lspd_node.go
@@ -106,8 +106,6 @@ func newLspd(h *lntest.TestHarness, mem *mempoolApi, name string, nodeConfig *co
 		Tokens:                    []string{"hello"},
 		Host:                      "host:port",
 		PublicChannelAmount:       1000183,
-		ChannelAmount:             100000,
-		ChannelPrivate:            false,
 		TargetConf:                6,
 		MinConfs:                  &minConfs,
 		MinHtlcMsat:               600,
--- a/lightning/client.go
+++ b/lightning/client.go
@@ -20,9 +20,6 @@ type GetChannelResult struct {
 type OpenChannelRequest struct {
 	Destination    []byte
 	CapacitySat    uint64
-	MinHtlcMsat    uint64
-	IsPrivate      bool
-	IsZeroConf     bool
 	MinConfs       *uint32
 	FeeSatPerVByte *float64
 	TargetConf     *uint32
@@ -34,7 +31,6 @@ type Client interface {
 	OpenChannel(req *OpenChannelRequest) (*wire.OutPoint, error)
 	GetChannel(peerID []byte, channelPoint wire.OutPoint) (*GetChannelResult, error)
 	GetPeerId(scid *ShortChannelID) ([]byte, error)
-	GetNodeChannelCount(nodeID []byte) (int, error)
 	GetClosedChannels(nodeID string, channelPoints map[string]uint64) (map[string]uint64, error)
 	WaitOnline(peerID []byte, deadline time.Time) error
 	WaitChannelActive(peerID []byte, deadline time.Time) error
--- a/lnd/client.go
+++ b/lnd/client.go
@@ -249,9 +249,9 @@ func (c *LndClient) OpenChannel(req *lightning.OpenChannelRequest) (*wire.OutPoi
 		NodePubkey:         req.Destination,
 		LocalFundingAmount: int64(req.CapacitySat),
 		PushSat:            0,
-		Private:            req.IsPrivate,
+		Private:            true,
 		CommitmentType:     lnrpc.CommitmentType_ANCHORS,
-		ZeroConf:           req.IsZeroConf,
+		ZeroConf:           true,
 	}

 	if req.MinConfs != nil {
@@ -316,34 +316,6 @@ func (c *LndClient) GetChannel(peerID []byte, channelPoint wire.OutPoint) (*ligh
 	return nil, fmt.Errorf("no channel found")
 }

-func (c *LndClient) GetNodeChannelCount(nodeID []byte) (int, error) {
-	nodeIDStr := hex.EncodeToString(nodeID)
-	listResponse, err := c.client.ListChannels(context.Background(), &lnrpc.ListChannelsRequest{})
-	if err != nil {
-		return 0, err
-	}
-
-	pendingResponse, err := c.client.PendingChannels(context.Background(), &lnrpc.PendingChannelsRequest{})
-	if err != nil {
-		return 0, err
-	}
-
-	count := 0
-	for _, channel := range listResponse.Channels {
-		if channel.RemotePubkey == nodeIDStr {
-			count++
-		}
-	}
-
-	for _, p := range pendingResponse.PendingOpenChannels {
-		if p.Channel.RemoteNodePub == nodeIDStr {
-			count++
-		}
-	}
-
-	return count, nil
-}
-
 func (c *LndClient) GetClosedChannels(nodeID string, channelPoints map[string]uint64) (map[string]uint64, error) {
 	r := make(map[string]uint64)
 	if len(channelPoints) == 0 {
--- a/lsps2/intercept_handler.go
+++ b/lsps2/intercept_handler.go
@@ -439,8 +439,6 @@ func (i *Interceptor) ensureChannelOpen(payment *paymentState) {
 			Destination:    destination,
 			CapacitySat:    uint64(capacity),
 			MinConfs:       i.config.MinConfs,
-			IsPrivate:      true,
-			IsZeroConf:     true,
 			FeeSatPerVByte: fee.SatPerVByte,
 			TargetConf:     fee.TargetConf,
 		})
--- a/lsps2/mocks.go
+++ b/lsps2/mocks.go
@@ -138,9 +138,6 @@ func (c *mockLightningClient) GetChannel(peerID []byte, channelPoint wire.OutPoi
 func (c *mockLightningClient) GetPeerId(scid *lightning.ShortChannelID) ([]byte, error) {
 	return nil, ErrNotImplemented
 }
-func (c *mockLightningClient) GetNodeChannelCount(nodeID []byte) (int, error) {
-	return 0, ErrNotImplemented
-}
 func (c *mockLightningClient) GetClosedChannels(nodeID string, channelPoints map[string]uint64) (map[string]uint64, error) {
 	return nil, ErrNotImplemented
 }
--- a/rpc/lspd.md
+++ b/rpc/lspd.md
@@ -6,8 +6,6 @@
 - [lspd.proto](#lspd.proto)
    - [ChannelInformationReply](#lspd.ChannelInformationReply)
    - [ChannelInformationRequest](#lspd.ChannelInformationRequest)
-    - [OpenChannelReply](#lspd.OpenChannelReply)
-    - [OpenChannelRequest](#lspd.OpenChannelRequest)
    - [PaymentInformation](#lspd.PaymentInformation)
    - [RegisterPaymentReply](#lspd.RegisterPaymentReply)
    - [RegisterPaymentRequest](#lspd.RegisterPaymentRequest)
@@ -68,36 +66,6 @@



-<a name="lspd.OpenChannelReply"></a>
-
-### OpenChannelReply
-
-
-
-| Field | Type | Label | Description |
-| ----- | ---- | ----- | ----------- |
-| tx_hash | [string](#string) |  | The transaction hash |
-| output_index | [uint32](#uint32) |  | The output index |
-
-
-
-
-
-
-<a name="lspd.OpenChannelRequest"></a>
-
-### OpenChannelRequest
-
-
-
-| Field | Type | Label | Description |
-| ----- | ---- | ----- | ----------- |
-| pubkey | [string](#string) |  | The identity pubkey of the Lightning node |
-
-
-
-
-

 <a name="lspd.PaymentInformation"></a>

@@ -157,7 +125,6 @@
 | Method Name | Request Type | Response Type | Description |
 | ----------- | ------------ | ------------- | ------------|
 | ChannelInformation | [ChannelInformationRequest](#lspd.ChannelInformationRequest) | [ChannelInformationReply](#lspd.ChannelInformationReply) |  |
-| OpenChannel | [OpenChannelRequest](#lspd.OpenChannelRequest) | [OpenChannelReply](#lspd.OpenChannelReply) |  |
 | RegisterPayment | [RegisterPaymentRequest](#lspd.RegisterPaymentRequest) | [RegisterPaymentReply](#lspd.RegisterPaymentReply) |  |

 
--- a/rpc/lspd.pb.go
+++ b/rpc/lspd.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc        v4.25.2
 // source: lspd.proto

 package lspd
@@ -25,7 +25,7 @@ type ChannelInformationRequest struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields

-	/// The identity pubkey of the Lightning node
+	// / The identity pubkey of the Lightning node
 	Pubkey string `protobuf:"bytes,1,opt,name=pubkey,proto3" json:"pubkey,omitempty"`
 }

@@ -73,27 +73,27 @@ type ChannelInformationReply struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields

-	/// The name of of lsp
+	// / The name of of lsp
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-	/// The identity pubkey of the Lightning node
+	// / The identity pubkey of the Lightning node
 	Pubkey string `protobuf:"bytes,2,opt,name=pubkey,proto3" json:"pubkey,omitempty"`
-	/// The network location of the lightning node, e.g. `12.34.56.78:9012` or
-	/// `localhost:10011`
+	// / The network location of the lightning node, e.g. `12.34.56.78:9012` or
+	// / `localhost:10011`
 	Host string `protobuf:"bytes,3,opt,name=host,proto3" json:"host,omitempty"`
-	/// The channel capacity in satoshis
+	// / The channel capacity in satoshis
 	ChannelCapacity int64 `protobuf:"varint,4,opt,name=channel_capacity,proto3" json:"channel_capacity,omitempty"`
-	/// The target number of blocks that the funding transaction should be
-	/// confirmed by.
+	// / The target number of blocks that the funding transaction should be
+	// / confirmed by.
 	TargetConf int32 `protobuf:"varint,5,opt,name=target_conf,proto3" json:"target_conf,omitempty"`
-	/// The base fee charged regardless of the number of milli-satoshis sent.
+	// / The base fee charged regardless of the number of milli-satoshis sent.
 	BaseFeeMsat int64 `protobuf:"varint,6,opt,name=base_fee_msat,proto3" json:"base_fee_msat,omitempty"`
-	/// The effective fee rate in milli-satoshis. The precision of this value goes
-	/// up to 6 decimal places, so 1e-6.
+	// / The effective fee rate in milli-satoshis. The precision of this value goes
+	// / up to 6 decimal places, so 1e-6.
 	FeeRate float64 `protobuf:"fixed64,7,opt,name=fee_rate,proto3" json:"fee_rate,omitempty"`
-	/// The required timelock delta for HTLCs forwarded over the channel.
+	// / The required timelock delta for HTLCs forwarded over the channel.
 	TimeLockDelta uint32 `protobuf:"varint,8,opt,name=time_lock_delta,proto3" json:"time_lock_delta,omitempty"`
-	/// The minimum value in millisatoshi we will require for incoming HTLCs on
-	/// the channel.
+	// / The minimum value in millisatoshi we will require for incoming HTLCs on
+	// / the channel.
 	MinHtlcMsat int64 `protobuf:"varint,9,opt,name=min_htlc_msat,proto3" json:"min_htlc_msat,omitempty"`
 	// Deprecated: Do not use.
 	ChannelFeePermyriad int64  `protobuf:"varint,10,opt,name=channel_fee_permyriad,json=channelFeePermyriad,proto3" json:"channel_fee_permyriad,omitempty"`
@@ -328,111 +328,6 @@ func (x *OpeningFeeParams) GetPromise() string {
 	return ""
 }

-type OpenChannelRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	/// The identity pubkey of the Lightning node
-	Pubkey string `protobuf:"bytes,1,opt,name=pubkey,proto3" json:"pubkey,omitempty"`
-}
-
-func (x *OpenChannelRequest) Reset() {
-	*x = OpenChannelRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_lspd_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *OpenChannelRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*OpenChannelRequest) ProtoMessage() {}
-
-func (x *OpenChannelRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_lspd_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use OpenChannelRequest.ProtoReflect.Descriptor instead.
-func (*OpenChannelRequest) Descriptor() ([]byte, []int) {
-	return file_lspd_proto_rawDescGZIP(), []int{3}
-}
-
-func (x *OpenChannelRequest) GetPubkey() string {
-	if x != nil {
-		return x.Pubkey
-	}
-	return ""
-}
-
-type OpenChannelReply struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	/// The transaction hash
-	TxHash string `protobuf:"bytes,1,opt,name=tx_hash,proto3" json:"tx_hash,omitempty"`
-	/// The output index
-	OutputIndex uint32 `protobuf:"varint,2,opt,name=output_index,proto3" json:"output_index,omitempty"`
-}
-
-func (x *OpenChannelReply) Reset() {
-	*x = OpenChannelReply{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_lspd_proto_msgTypes[4]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *OpenChannelReply) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*OpenChannelReply) ProtoMessage() {}
-
-func (x *OpenChannelReply) ProtoReflect() protoreflect.Message {
-	mi := &file_lspd_proto_msgTypes[4]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use OpenChannelReply.ProtoReflect.Descriptor instead.
-func (*OpenChannelReply) Descriptor() ([]byte, []int) {
-	return file_lspd_proto_rawDescGZIP(), []int{4}
-}
-
-func (x *OpenChannelReply) GetTxHash() string {
-	if x != nil {
-		return x.TxHash
-	}
-	return ""
-}
-
-func (x *OpenChannelReply) GetOutputIndex() uint32 {
-	if x != nil {
-		return x.OutputIndex
-	}
-	return 0
-}
-
 type RegisterPaymentRequest struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -444,7 +339,7 @@ type RegisterPaymentRequest struct {
 func (x *RegisterPaymentRequest) Reset() {
 	*x = RegisterPaymentRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_lspd_proto_msgTypes[5]
+		mi := &file_lspd_proto_msgTypes[3]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -457,7 +352,7 @@ func (x *RegisterPaymentRequest) String() string {
 func (*RegisterPaymentRequest) ProtoMessage() {}

 func (x *RegisterPaymentRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_lspd_proto_msgTypes[5]
+	mi := &file_lspd_proto_msgTypes[3]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -470,7 +365,7 @@ func (x *RegisterPaymentRequest) ProtoReflect() protoreflect.Message {

 // Deprecated: Use RegisterPaymentRequest.ProtoReflect.Descriptor instead.
 func (*RegisterPaymentRequest) Descriptor() ([]byte, []int) {
-	return file_lspd_proto_rawDescGZIP(), []int{5}
+	return file_lspd_proto_rawDescGZIP(), []int{3}
 }

 func (x *RegisterPaymentRequest) GetBlob() []byte {
@@ -489,7 +384,7 @@ type RegisterPaymentReply struct {
 func (x *RegisterPaymentReply) Reset() {
 	*x = RegisterPaymentReply{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_lspd_proto_msgTypes[6]
+		mi := &file_lspd_proto_msgTypes[4]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -502,7 +397,7 @@ func (x *RegisterPaymentReply) String() string {
 func (*RegisterPaymentReply) ProtoMessage() {}

 func (x *RegisterPaymentReply) ProtoReflect() protoreflect.Message {
-	mi := &file_lspd_proto_msgTypes[6]
+	mi := &file_lspd_proto_msgTypes[4]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -515,7 +410,7 @@ func (x *RegisterPaymentReply) ProtoReflect() protoreflect.Message {

 // Deprecated: Use RegisterPaymentReply.ProtoReflect.Descriptor instead.
 func (*RegisterPaymentReply) Descriptor() ([]byte, []int) {
-	return file_lspd_proto_rawDescGZIP(), []int{6}
+	return file_lspd_proto_rawDescGZIP(), []int{4}
 }

 type PaymentInformation struct {
@@ -535,7 +430,7 @@ type PaymentInformation struct {
 func (x *PaymentInformation) Reset() {
 	*x = PaymentInformation{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_lspd_proto_msgTypes[7]
+		mi := &file_lspd_proto_msgTypes[5]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -548,7 +443,7 @@ func (x *PaymentInformation) String() string {
 func (*PaymentInformation) ProtoMessage() {}

 func (x *PaymentInformation) ProtoReflect() protoreflect.Message {
-	mi := &file_lspd_proto_msgTypes[7]
+	mi := &file_lspd_proto_msgTypes[5]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -561,7 +456,7 @@ func (x *PaymentInformation) ProtoReflect() protoreflect.Message {

 // Deprecated: Use PaymentInformation.ProtoReflect.Descriptor instead.
 func (*PaymentInformation) Descriptor() ([]byte, []int) {
-	return file_lspd_proto_rawDescGZIP(), []int{7}
+	return file_lspd_proto_rawDescGZIP(), []int{5}
 }

 func (x *PaymentInformation) GetPaymentHash() []byte {
@@ -624,7 +519,7 @@ type Encrypted struct {
 func (x *Encrypted) Reset() {
 	*x = Encrypted{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_lspd_proto_msgTypes[8]
+		mi := &file_lspd_proto_msgTypes[6]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -637,7 +532,7 @@ func (x *Encrypted) String() string {
 func (*Encrypted) ProtoMessage() {}

 func (x *Encrypted) ProtoReflect() protoreflect.Message {
-	mi := &file_lspd_proto_msgTypes[8]
+	mi := &file_lspd_proto_msgTypes[6]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -650,7 +545,7 @@ func (x *Encrypted) ProtoReflect() protoreflect.Message {

 // Deprecated: Use Encrypted.ProtoReflect.Descriptor instead.
 func (*Encrypted) Descriptor() ([]byte, []int) {
-	return file_lspd_proto_rawDescGZIP(), []int{8}
+	return file_lspd_proto_rawDescGZIP(), []int{6}
 }

 func (x *Encrypted) GetData() []byte {
@@ -673,7 +568,7 @@ type Signed struct {
 func (x *Signed) Reset() {
 	*x = Signed{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_lspd_proto_msgTypes[9]
+		mi := &file_lspd_proto_msgTypes[7]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -686,7 +581,7 @@ func (x *Signed) String() string {
 func (*Signed) ProtoMessage() {}

 func (x *Signed) ProtoReflect() protoreflect.Message {
-	mi := &file_lspd_proto_msgTypes[9]
+	mi := &file_lspd_proto_msgTypes[7]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -699,7 +594,7 @@ func (x *Signed) ProtoReflect() protoreflect.Message {

 // Deprecated: Use Signed.ProtoReflect.Descriptor instead.
 func (*Signed) Descriptor() ([]byte, []int) {
-	return file_lspd_proto_rawDescGZIP(), []int{9}
+	return file_lspd_proto_rawDescGZIP(), []int{7}
 }

 func (x *Signed) GetData() []byte {
@@ -736,7 +631,7 @@ type CheckChannelsRequest struct {
 func (x *CheckChannelsRequest) Reset() {
 	*x = CheckChannelsRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_lspd_proto_msgTypes[10]
+		mi := &file_lspd_proto_msgTypes[8]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -749,7 +644,7 @@ func (x *CheckChannelsRequest) String() string {
 func (*CheckChannelsRequest) ProtoMessage() {}

 func (x *CheckChannelsRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_lspd_proto_msgTypes[10]
+	mi := &file_lspd_proto_msgTypes[8]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -762,7 +657,7 @@ func (x *CheckChannelsRequest) ProtoReflect() protoreflect.Message {

 // Deprecated: Use CheckChannelsRequest.ProtoReflect.Descriptor instead.
 func (*CheckChannelsRequest) Descriptor() ([]byte, []int) {
-	return file_lspd_proto_rawDescGZIP(), []int{10}
+	return file_lspd_proto_rawDescGZIP(), []int{8}
 }

 func (x *CheckChannelsRequest) GetEncryptPubkey() []byte {
@@ -798,7 +693,7 @@ type CheckChannelsReply struct {
 func (x *CheckChannelsReply) Reset() {
 	*x = CheckChannelsReply{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_lspd_proto_msgTypes[11]
+		mi := &file_lspd_proto_msgTypes[9]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -811,7 +706,7 @@ func (x *CheckChannelsReply) String() string {
 func (*CheckChannelsReply) ProtoMessage() {}

 func (x *CheckChannelsReply) ProtoReflect() protoreflect.Message {
-	mi := &file_lspd_proto_msgTypes[11]
+	mi := &file_lspd_proto_msgTypes[9]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -824,7 +719,7 @@ func (x *CheckChannelsReply) ProtoReflect() protoreflect.Message {

 // Deprecated: Use CheckChannelsReply.ProtoReflect.Descriptor instead.
 func (*CheckChannelsReply) Descriptor() ([]byte, []int) {
-	return file_lspd_proto_rawDescGZIP(), []int{11}
+	return file_lspd_proto_rawDescGZIP(), []int{9}
 }

 func (x *CheckChannelsReply) GetNotFakeChannels() map[string]uint64 {
@@ -900,15 +795,7 @@ var file_lspd_proto_rawDesc = []byte{
 	0x6c, 0x61, 0x79, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x14, 0x6d, 0x61, 0x78, 0x43, 0x6c,
 	0x69, 0x65, 0x6e, 0x74, 0x54, 0x6f, 0x53, 0x65, 0x6c, 0x66, 0x44, 0x65, 0x6c, 0x61, 0x79, 0x12,
 	0x18, 0x0a, 0x07, 0x70, 0x72, 0x6f, 0x6d, 0x69, 0x73, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x07, 0x70, 0x72, 0x6f, 0x6d, 0x69, 0x73, 0x65, 0x22, 0x2c, 0x0a, 0x12, 0x4f, 0x70, 0x65,
-	0x6e, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12,
-	0x16, 0x0a, 0x06, 0x70, 0x75, 0x62, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x06, 0x70, 0x75, 0x62, 0x6b, 0x65, 0x79, 0x22, 0x50, 0x0a, 0x10, 0x4f, 0x70, 0x65, 0x6e, 0x43,
-	0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x18, 0x0a, 0x07, 0x74,
-	0x78, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x74, 0x78,
-	0x5f, 0x68, 0x61, 0x73, 0x68, 0x12, 0x22, 0x0a, 0x0c, 0x6f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x5f,
-	0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0c, 0x6f, 0x75, 0x74,
-	0x70, 0x75, 0x74, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x22, 0x2c, 0x0a, 0x16, 0x52, 0x65, 0x67,
+	0x52, 0x07, 0x70, 0x72, 0x6f, 0x6d, 0x69, 0x73, 0x65, 0x22, 0x2c, 0x0a, 0x16, 0x52, 0x65, 0x67,
 	0x69, 0x73, 0x74, 0x65, 0x72, 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75,
 	0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x62, 0x6c, 0x6f, 0x62, 0x18, 0x03, 0x20, 0x01, 0x28,
 	0x0c, 0x52, 0x04, 0x62, 0x6c, 0x6f, 0x62, 0x22, 0x16, 0x0a, 0x14, 0x52, 0x65, 0x67, 0x69, 0x73,
@@ -985,31 +872,26 @@ var file_lspd_proto_rawDesc = []byte{
 	0x73, 0x65, 0x64, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79,
 	0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b,
 	0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x04, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x32, 0xae, 0x02, 0x0a,
+	0x04, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x32, 0xeb, 0x01, 0x0a,
 	0x0d, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x4f, 0x70, 0x65, 0x6e, 0x65, 0x72, 0x12, 0x56,
 	0x0a, 0x12, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61,
 	0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1f, 0x2e, 0x6c, 0x73, 0x70, 0x64, 0x2e, 0x43, 0x68, 0x61, 0x6e,
 	0x6e, 0x65, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65,
 	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x6c, 0x73, 0x70, 0x64, 0x2e, 0x43, 0x68, 0x61,
 	0x6e, 0x6e, 0x65, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52,
-	0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x41, 0x0a, 0x0b, 0x4f, 0x70, 0x65, 0x6e, 0x43, 0x68,
-	0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x12, 0x18, 0x2e, 0x6c, 0x73, 0x70, 0x64, 0x2e, 0x4f, 0x70, 0x65,
-	0x6e, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
-	0x16, 0x2e, 0x6c, 0x73, 0x70, 0x64, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x43, 0x68, 0x61, 0x6e, 0x6e,
-	0x65, 0x6c, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x4d, 0x0a, 0x0f, 0x52, 0x65, 0x67,
-	0x69, 0x73, 0x74, 0x65, 0x72, 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x1c, 0x2e, 0x6c,
-	0x73, 0x70, 0x64, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x50, 0x61, 0x79, 0x6d,
-	0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1a, 0x2e, 0x6c, 0x73, 0x70,
-	0x64, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e,
-	0x74, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x33, 0x0a, 0x0d, 0x43, 0x68, 0x65, 0x63,
-	0x6b, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x73, 0x12, 0x0f, 0x2e, 0x6c, 0x73, 0x70, 0x64,
-	0x2e, 0x45, 0x6e, 0x63, 0x72, 0x79, 0x70, 0x74, 0x65, 0x64, 0x1a, 0x0f, 0x2e, 0x6c, 0x73, 0x70,
-	0x64, 0x2e, 0x45, 0x6e, 0x63, 0x72, 0x79, 0x70, 0x74, 0x65, 0x64, 0x22, 0x00, 0x42, 0x3a, 0x0a,
-	0x14, 0x69, 0x6f, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x6c, 0x73, 0x70, 0x64, 0x2e, 0x73, 0x65,
-	0x72, 0x76, 0x69, 0x63, 0x65, 0x42, 0x09, 0x4c, 0x73, 0x70, 0x64, 0x50, 0x72, 0x6f, 0x74, 0x6f,
-	0x50, 0x01, 0x5a, 0x15, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x62,
-	0x72, 0x65, 0x65, 0x7a, 0x2f, 0x6c, 0x73, 0x70, 0x64, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x33,
+	0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x4d, 0x0a, 0x0f, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74,
+	0x65, 0x72, 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x1c, 0x2e, 0x6c, 0x73, 0x70, 0x64,
+	0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1a, 0x2e, 0x6c, 0x73, 0x70, 0x64, 0x2e, 0x52,
+	0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65,
+	0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x33, 0x0a, 0x0d, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x43, 0x68,
+	0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x73, 0x12, 0x0f, 0x2e, 0x6c, 0x73, 0x70, 0x64, 0x2e, 0x45, 0x6e,
+	0x63, 0x72, 0x79, 0x70, 0x74, 0x65, 0x64, 0x1a, 0x0f, 0x2e, 0x6c, 0x73, 0x70, 0x64, 0x2e, 0x45,
+	0x6e, 0x63, 0x72, 0x79, 0x70, 0x74, 0x65, 0x64, 0x22, 0x00, 0x42, 0x3a, 0x0a, 0x14, 0x69, 0x6f,
+	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x6c, 0x73, 0x70, 0x64, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69,
+	0x63, 0x65, 0x42, 0x09, 0x4c, 0x73, 0x70, 0x64, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a,
+	0x15, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x62, 0x72, 0x65, 0x65,
+	0x7a, 0x2f, 0x6c, 0x73, 0x70, 0x64, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }

 var (
@@ -1024,42 +906,38 @@ func file_lspd_proto_rawDescGZIP() []byte {
 	return file_lspd_proto_rawDescData
 }

-var file_lspd_proto_msgTypes = make([]protoimpl.MessageInfo, 16)
+var file_lspd_proto_msgTypes = make([]protoimpl.MessageInfo, 14)
 var file_lspd_proto_goTypes = []interface{}{
 	(*ChannelInformationRequest)(nil), // 0: lspd.ChannelInformationRequest
 	(*ChannelInformationReply)(nil),   // 1: lspd.ChannelInformationReply
 	(*OpeningFeeParams)(nil),          // 2: lspd.OpeningFeeParams
-	(*OpenChannelRequest)(nil),        // 3: lspd.OpenChannelRequest
-	(*OpenChannelReply)(nil),          // 4: lspd.OpenChannelReply
-	(*RegisterPaymentRequest)(nil),    // 5: lspd.RegisterPaymentRequest
-	(*RegisterPaymentReply)(nil),      // 6: lspd.RegisterPaymentReply
-	(*PaymentInformation)(nil),        // 7: lspd.PaymentInformation
-	(*Encrypted)(nil),                 // 8: lspd.Encrypted
-	(*Signed)(nil),                    // 9: lspd.Signed
-	(*CheckChannelsRequest)(nil),      // 10: lspd.CheckChannelsRequest
-	(*CheckChannelsReply)(nil),        // 11: lspd.CheckChannelsReply
-	nil,                               // 12: lspd.CheckChannelsRequest.FakeChannelsEntry
-	nil,                               // 13: lspd.CheckChannelsRequest.WaitingCloseChannelsEntry
-	nil,                               // 14: lspd.CheckChannelsReply.NotFakeChannelsEntry
-	nil,                               // 15: lspd.CheckChannelsReply.ClosedChannelsEntry
+	(*RegisterPaymentRequest)(nil),    // 3: lspd.RegisterPaymentRequest
+	(*RegisterPaymentReply)(nil),      // 4: lspd.RegisterPaymentReply
+	(*PaymentInformation)(nil),        // 5: lspd.PaymentInformation
+	(*Encrypted)(nil),                 // 6: lspd.Encrypted
+	(*Signed)(nil),                    // 7: lspd.Signed
+	(*CheckChannelsRequest)(nil),      // 8: lspd.CheckChannelsRequest
+	(*CheckChannelsReply)(nil),        // 9: lspd.CheckChannelsReply
+	nil,                               // 10: lspd.CheckChannelsRequest.FakeChannelsEntry
+	nil,                               // 11: lspd.CheckChannelsRequest.WaitingCloseChannelsEntry
+	nil,                               // 12: lspd.CheckChannelsReply.NotFakeChannelsEntry
+	nil,                               // 13: lspd.CheckChannelsReply.ClosedChannelsEntry
 }
 var file_lspd_proto_depIdxs = []int32{
 	2,  // 0: lspd.ChannelInformationReply.opening_fee_params_menu:type_name -> lspd.OpeningFeeParams
 	2,  // 1: lspd.PaymentInformation.opening_fee_params:type_name -> lspd.OpeningFeeParams
-	12, // 2: lspd.CheckChannelsRequest.fake_channels:type_name -> lspd.CheckChannelsRequest.FakeChannelsEntry
-	13, // 3: lspd.CheckChannelsRequest.waiting_close_channels:type_name -> lspd.CheckChannelsRequest.WaitingCloseChannelsEntry
-	14, // 4: lspd.CheckChannelsReply.not_fake_channels:type_name -> lspd.CheckChannelsReply.NotFakeChannelsEntry
-	15, // 5: lspd.CheckChannelsReply.closed_channels:type_name -> lspd.CheckChannelsReply.ClosedChannelsEntry
+	10, // 2: lspd.CheckChannelsRequest.fake_channels:type_name -> lspd.CheckChannelsRequest.FakeChannelsEntry
+	11, // 3: lspd.CheckChannelsRequest.waiting_close_channels:type_name -> lspd.CheckChannelsRequest.WaitingCloseChannelsEntry
+	12, // 4: lspd.CheckChannelsReply.not_fake_channels:type_name -> lspd.CheckChannelsReply.NotFakeChannelsEntry
+	13, // 5: lspd.CheckChannelsReply.closed_channels:type_name -> lspd.CheckChannelsReply.ClosedChannelsEntry
 	0,  // 6: lspd.ChannelOpener.ChannelInformation:input_type -> lspd.ChannelInformationRequest
-	3,  // 7: lspd.ChannelOpener.OpenChannel:input_type -> lspd.OpenChannelRequest
-	5,  // 8: lspd.ChannelOpener.RegisterPayment:input_type -> lspd.RegisterPaymentRequest
-	8,  // 9: lspd.ChannelOpener.CheckChannels:input_type -> lspd.Encrypted
-	1,  // 10: lspd.ChannelOpener.ChannelInformation:output_type -> lspd.ChannelInformationReply
-	4,  // 11: lspd.ChannelOpener.OpenChannel:output_type -> lspd.OpenChannelReply
-	6,  // 12: lspd.ChannelOpener.RegisterPayment:output_type -> lspd.RegisterPaymentReply
-	8,  // 13: lspd.ChannelOpener.CheckChannels:output_type -> lspd.Encrypted
-	10, // [10:14] is the sub-list for method output_type
-	6,  // [6:10] is the sub-list for method input_type
+	3,  // 7: lspd.ChannelOpener.RegisterPayment:input_type -> lspd.RegisterPaymentRequest
+	6,  // 8: lspd.ChannelOpener.CheckChannels:input_type -> lspd.Encrypted
+	1,  // 9: lspd.ChannelOpener.ChannelInformation:output_type -> lspd.ChannelInformationReply
+	4,  // 10: lspd.ChannelOpener.RegisterPayment:output_type -> lspd.RegisterPaymentReply
+	6,  // 11: lspd.ChannelOpener.CheckChannels:output_type -> lspd.Encrypted
+	9,  // [9:12] is the sub-list for method output_type
+	6,  // [6:9] is the sub-list for method input_type
 	6,  // [6:6] is the sub-list for extension type_name
 	6,  // [6:6] is the sub-list for extension extendee
 	0,  // [0:6] is the sub-list for field type_name
@@ -1108,30 +986,6 @@ func file_lspd_proto_init() {
 			}
 		}
 		file_lspd_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*OpenChannelRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_lspd_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*OpenChannelReply); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_lspd_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*RegisterPaymentRequest); i {
 			case 0:
 				return &v.state
@@ -1143,7 +997,7 @@ func file_lspd_proto_init() {
 				return nil
 			}
 		}
-		file_lspd_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+		file_lspd_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*RegisterPaymentReply); i {
 			case 0:
 				return &v.state
@@ -1155,7 +1009,7 @@ func file_lspd_proto_init() {
 				return nil
 			}
 		}
-		file_lspd_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+		file_lspd_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*PaymentInformation); i {
 			case 0:
 				return &v.state
@@ -1167,7 +1021,7 @@ func file_lspd_proto_init() {
 				return nil
 			}
 		}
-		file_lspd_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+		file_lspd_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Encrypted); i {
 			case 0:
 				return &v.state
@@ -1179,7 +1033,7 @@ func file_lspd_proto_init() {
 				return nil
 			}
 		}
-		file_lspd_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
+		file_lspd_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Signed); i {
 			case 0:
 				return &v.state
@@ -1191,7 +1045,7 @@ func file_lspd_proto_init() {
 				return nil
 			}
 		}
-		file_lspd_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
+		file_lspd_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*CheckChannelsRequest); i {
 			case 0:
 				return &v.state
@@ -1203,7 +1057,7 @@ func file_lspd_proto_init() {
 				return nil
 			}
 		}
-		file_lspd_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
+		file_lspd_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*CheckChannelsReply); i {
 			case 0:
 				return &v.state
@@ -1222,7 +1076,7 @@ func file_lspd_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_lspd_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   16,
+			NumMessages:   14,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
--- a/rpc/lspd.proto
+++ b/rpc/lspd.proto
@@ -10,7 +10,6 @@ package lspd;
 service ChannelOpener {
  rpc ChannelInformation(ChannelInformationRequest)
      returns (ChannelInformationReply) {}
-  rpc OpenChannel(OpenChannelRequest) returns (OpenChannelReply) {}
  rpc RegisterPayment (RegisterPaymentRequest) returns (RegisterPaymentReply) {}
  rpc CheckChannels(Encrypted) returns (Encrypted) {}
 }
@@ -70,18 +69,6 @@ message OpeningFeeParams {
  string promise = 6;
 }

-message OpenChannelRequest {
-  /// The identity pubkey of the Lightning node
-  string pubkey = 1 [ json_name = "pubkey" ];
-}
-
-message OpenChannelReply {
-  /// The transaction hash
-  string tx_hash = 1 [ json_name = "tx_hash" ];
-  /// The output index
-  uint32 output_index = 2 [ json_name = "output_index"];
-}
-
 message RegisterPaymentRequest {
  bytes blob = 3;
 }
--- a/rpc/lspd_grpc.pb.go
+++ b/rpc/lspd_grpc.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-grpc v1.2.0
-// - protoc             v3.21.12
+// - protoc             v4.25.2
 // source: lspd.proto

 package lspd
@@ -23,7 +23,6 @@ const _ = grpc.SupportPackageIsVersion7
 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
 type ChannelOpenerClient interface {
 	ChannelInformation(ctx context.Context, in *ChannelInformationRequest, opts ...grpc.CallOption) (*ChannelInformationReply, error)
-	OpenChannel(ctx context.Context, in *OpenChannelRequest, opts ...grpc.CallOption) (*OpenChannelReply, error)
 	RegisterPayment(ctx context.Context, in *RegisterPaymentRequest, opts ...grpc.CallOption) (*RegisterPaymentReply, error)
 	CheckChannels(ctx context.Context, in *Encrypted, opts ...grpc.CallOption) (*Encrypted, error)
 }
@@ -45,15 +44,6 @@ func (c *channelOpenerClient) ChannelInformation(ctx context.Context, in *Channe
 	return out, nil
 }

-func (c *channelOpenerClient) OpenChannel(ctx context.Context, in *OpenChannelRequest, opts ...grpc.CallOption) (*OpenChannelReply, error) {
-	out := new(OpenChannelReply)
-	err := c.cc.Invoke(ctx, "/lspd.ChannelOpener/OpenChannel", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
 func (c *channelOpenerClient) RegisterPayment(ctx context.Context, in *RegisterPaymentRequest, opts ...grpc.CallOption) (*RegisterPaymentReply, error) {
 	out := new(RegisterPaymentReply)
 	err := c.cc.Invoke(ctx, "/lspd.ChannelOpener/RegisterPayment", in, out, opts...)
@@ -77,7 +67,6 @@ func (c *channelOpenerClient) CheckChannels(ctx context.Context, in *Encrypted,
 // for forward compatibility
 type ChannelOpenerServer interface {
 	ChannelInformation(context.Context, *ChannelInformationRequest) (*ChannelInformationReply, error)
-	OpenChannel(context.Context, *OpenChannelRequest) (*OpenChannelReply, error)
 	RegisterPayment(context.Context, *RegisterPaymentRequest) (*RegisterPaymentReply, error)
 	CheckChannels(context.Context, *Encrypted) (*Encrypted, error)
 	mustEmbedUnimplementedChannelOpenerServer()
@@ -90,9 +79,6 @@ type UnimplementedChannelOpenerServer struct {
 func (UnimplementedChannelOpenerServer) ChannelInformation(context.Context, *ChannelInformationRequest) (*ChannelInformationReply, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ChannelInformation not implemented")
 }
-func (UnimplementedChannelOpenerServer) OpenChannel(context.Context, *OpenChannelRequest) (*OpenChannelReply, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method OpenChannel not implemented")
-}
 func (UnimplementedChannelOpenerServer) RegisterPayment(context.Context, *RegisterPaymentRequest) (*RegisterPaymentReply, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method RegisterPayment not implemented")
 }
@@ -130,24 +116,6 @@ func _ChannelOpener_ChannelInformation_Handler(srv interface{}, ctx context.Cont
 	return interceptor(ctx, in, info, handler)
 }

-func _ChannelOpener_OpenChannel_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(OpenChannelRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ChannelOpenerServer).OpenChannel(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/lspd.ChannelOpener/OpenChannel",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ChannelOpenerServer).OpenChannel(ctx, req.(*OpenChannelRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
 func _ChannelOpener_RegisterPayment_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(RegisterPaymentRequest)
 	if err := dec(in); err != nil {
@@ -195,10 +163,6 @@ var ChannelOpener_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "ChannelInformation",
 			Handler:    _ChannelOpener_ChannelInformation_Handler,
 		},
-		{
-			MethodName: "OpenChannel",
-			Handler:    _ChannelOpener_OpenChannel_Handler,
-		},
 		{
 			MethodName: "RegisterPayment",
 			Handler:    _ChannelOpener_RegisterPayment_Handler,