Merge branch 'main' into chore/backport

.github/workflows/publish.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - 'main'
+      - 'base/consumer-chain-support'
     tags:
       - '*'
 

CHANGELOG.md

@@ -37,9 +37,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
 ## Unreleased
 
+## v0.8.0
+
 ### Misc Improvements
 
+* [#97](https://github.com/babylonlabs-io/finality-provider/pull/97) Bump Babylon version to v0.13.0
+* [#90](https://github.com/babylonlabs-io/finality-provider/pull/90) CLI edit finality provider
 * [#91](https://github.com/babylonlabs-io/finality-provider/pull/91) Go releaser setup
   and move changelog reminder out
-
 * [#87](https://github.com/babylonlabs-io/finality-provider/pull/87) Rename config ChainName to ChainType
+* [#86](https://github.com/babylonlabs-io/finality-provider/pull/86) Remove running multiple fp instances support

clientcontroller/babylon.go

@@ -3,6 +3,8 @@ package clientcontroller
 import (
 	"context"
 	"fmt"
+	"github.com/babylonlabs-io/finality-provider/finality-provider/proto"
+	"strings"
 	"time"
 
 	sdkErr "cosmossdk.io/errors"
@@ -13,6 +15,8 @@ import (
 	btclctypes "github.com/babylonlabs-io/babylon/x/btclightclient/types"
 	btcstakingtypes "github.com/babylonlabs-io/babylon/x/btcstaking/types"
 	finalitytypes "github.com/babylonlabs-io/babylon/x/finality/types"
+	fpcfg "github.com/babylonlabs-io/finality-provider/finality-provider/config"
+	"github.com/babylonlabs-io/finality-provider/types"
 	"github.com/btcsuite/btcd/btcec/v2"
 	"github.com/btcsuite/btcd/btcec/v2/schnorr"
 	"github.com/btcsuite/btcd/btcutil"
@@ -23,9 +27,7 @@ import (
 	sttypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 	"github.com/cosmos/relayer/v2/relayer/provider"
 	"go.uber.org/zap"
-
-	fpcfg "github.com/babylonlabs-io/finality-provider/finality-provider/config"
-	"github.com/babylonlabs-io/finality-provider/types"
+	protobuf "google.golang.org/protobuf/proto"
 )
 
 var _ ClientController = &BabylonController{}
@@ -510,6 +512,70 @@ func (bc *BabylonController) QueryFinalityProviders() ([]*btcstakingtypes.Finali
 	return fps, nil
 }
 
+func (bc *BabylonController) QueryFinalityProvider(fpPk *btcec.PublicKey) (*btcstakingtypes.QueryFinalityProviderResponse, error) {
+	fpPubKey := bbntypes.NewBIP340PubKeyFromBTCPK(fpPk)
+	res, err := bc.bbnClient.QueryClient.FinalityProvider(fpPubKey.MarshalHex())
+	if err != nil {
+		return nil, fmt.Errorf("failed to query the finality provider %s: %v", fpPubKey.MarshalHex(), err)
+	}
+
+	return res, nil
+}
+
+func (bc *BabylonController) EditFinalityProvider(fpPk *btcec.PublicKey,
+	rate *sdkmath.LegacyDec, description []byte) (*btcstakingtypes.MsgEditFinalityProvider, error) {
+	var reqDesc proto.Description
+	if err := protobuf.Unmarshal(description, &reqDesc); err != nil {
+		return nil, err
+	}
+	fpPubKey := bbntypes.NewBIP340PubKeyFromBTCPK(fpPk)
+
+	fpRes, err := bc.QueryFinalityProvider(fpPk)
+	if err != nil {
+		return nil, err
+	}
+
+	if !strings.EqualFold(fpRes.FinalityProvider.Addr, bc.mustGetTxSigner()) {
+		return nil, fmt.Errorf("the signer does not correspond to the finality provider's "+
+			"Babylon address, expected %s got %s", bc.mustGetTxSigner(), fpRes.FinalityProvider.Addr)
+	}
+
+	getValueOrDefault := func(reqValue, defaultValue string) string {
+		if reqValue != "" {
+			return reqValue
+		}
+		return defaultValue
+	}
+
+	resDesc := fpRes.FinalityProvider.Description
+
+	desc := &sttypes.Description{
+		Moniker:         getValueOrDefault(reqDesc.Moniker, resDesc.Moniker),
+		Identity:        getValueOrDefault(reqDesc.Identity, resDesc.Identity),
+		Website:         getValueOrDefault(reqDesc.Website, resDesc.Website),
+		SecurityContact: getValueOrDefault(reqDesc.SecurityContact, resDesc.SecurityContact),
+		Details:         getValueOrDefault(reqDesc.Details, resDesc.Details),
+	}
+
+	msg := &btcstakingtypes.MsgEditFinalityProvider{
+		Addr:        bc.mustGetTxSigner(),
+		BtcPk:       fpPubKey.MustMarshal(),
+		Description: desc,
+		Commission:  fpRes.FinalityProvider.Commission,
+	}
+
+	if rate != nil {
+		msg.Commission = rate
+	}
+
+	_, err = bc.reliablySendMsg(msg, emptyErrs, emptyErrs)
+	if err != nil {
+		return nil, fmt.Errorf("failed to query the finality provider %s: %v", fpPk.SerializeCompressed(), err)
+	}
+
+	return msg, nil
+}
+
 func (bc *BabylonController) QueryBtcLightClientTip() (*btclctypes.BTCHeaderInfoResponse, error) {
 	res, err := bc.bbnClient.QueryClient.BTCHeaderChainTip()
 	if err != nil {

clientcontroller/interface.go

@@ -1,9 +1,9 @@
 package clientcontroller
 
 import (
-	"fmt"
-
 	"cosmossdk.io/math"
+	"fmt"
+	btcstakingtypes "github.com/babylonlabs-io/babylon/x/btcstaking/types"
 	"github.com/btcsuite/btcd/btcec/v2"
 	"github.com/btcsuite/btcd/btcec/v2/schnorr"
 	"github.com/btcsuite/btcd/chaincfg"
@@ -49,6 +49,9 @@ type ClientController interface {
 	// QueryFinalityProviderSlashedOrJailed queries if the finality provider is slashed or jailed
 	QueryFinalityProviderSlashedOrJailed(fpPk *btcec.PublicKey) (slashed bool, jailed bool, err error)
 
+	// EditFinalityProvider edits description and commission of a finality provider
+	EditFinalityProvider(fpPk *btcec.PublicKey, commission *math.LegacyDec, description []byte) (*btcstakingtypes.MsgEditFinalityProvider, error)
+
 	// QueryLatestFinalizedBlocks returns the latest finalized blocks
 	QueryLatestFinalizedBlocks(count uint64) ([]*types.BlockInfo, error)
 

finality-provider/cmd/fpd/daemon/daemon_commands.go

@@ -5,20 +5,20 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
+	"github.com/babylonlabs-io/finality-provider/finality-provider/proto"
 	"strconv"
 
 	"cosmossdk.io/math"
 	"github.com/babylonlabs-io/babylon/types"
 	bbntypes "github.com/babylonlabs-io/babylon/types"
+	fpcmd "github.com/babylonlabs-io/finality-provider/finality-provider/cmd"
+	fpcfg "github.com/babylonlabs-io/finality-provider/finality-provider/config"
+	dc "github.com/babylonlabs-io/finality-provider/finality-provider/service/client"
 	"github.com/cosmos/cosmos-sdk/client"
 	sdkflags "github.com/cosmos/cosmos-sdk/client/flags"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
-
-	fpcmd "github.com/babylonlabs-io/finality-provider/finality-provider/cmd"
-	fpcfg "github.com/babylonlabs-io/finality-provider/finality-provider/config"
-	dc "github.com/babylonlabs-io/finality-provider/finality-provider/service/client"
 )
 
 var (
@@ -446,6 +446,75 @@ func runCommandAddFinalitySig(cmd *cobra.Command, args []string) error {
 	return nil
 }
 
+// CommandEditFinalityDescription edits description of finality provider
+func CommandEditFinalityDescription() *cobra.Command {
+	var cmd = &cobra.Command{
+		Use:     "edit-finality-provider [btc_pk]",
+		Aliases: []string{"efp"},
+		Short:   "Edit finality provider data without resetting unchanged fields",
+		Long: "Edit the details of a finality provider using the specified BTC public key. " +
+			"\nThe provided [btc_pk] must correspond to the Babylon address controlled by the key specified in fpd.conf. " +
+			"\nIf one or more optional flags are passed (such as --moniker, --website, etc.), " +
+			"the corresponding values are updated, while unchanged fields retain their current values from the Babylon Node.",
+		Example: fmt.Sprintf(`fpd edit-finality-provider [btc_pk] --daemon-address %s --moniker "new-moniker"`, defaultFpdDaemonAddress),
+		Args:    cobra.ExactArgs(1),
+		RunE:    runCommandEditFinalityDescription,
+	}
+	cmd.Flags().String(fpdDaemonAddressFlag, defaultFpdDaemonAddress, "The RPC server address of fpd")
+	cmd.Flags().String(monikerFlag, "", "The finality provider's (optional) moniker")
+	cmd.Flags().String(websiteFlag, "", "The finality provider's (optional) website")
+	cmd.Flags().String(securityContactFlag, "", "The finality provider's (optional) security contact email")
+	cmd.Flags().String(detailsFlag, "", "The finality provider's (optional) details")
+	cmd.Flags().String(identityFlag, "", "The (optional) identity signature (ex. UPort or Keybase)")
+	cmd.Flags().String(commissionRateFlag, "", "The (optional) commission rate percentage (ex. 0.2)")
+
+	return cmd
+}
+
+func runCommandEditFinalityDescription(cmd *cobra.Command, args []string) error {
+	fpPk, err := bbntypes.NewBIP340PubKeyFromHex(args[0])
+	if err != nil {
+		return err
+	}
+
+	flags := cmd.Flags()
+	daemonAddress, err := flags.GetString(fpdDaemonAddressFlag)
+	if err != nil {
+		return fmt.Errorf("failed to read flag %s: %w", fpdDaemonAddressFlag, err)
+	}
+
+	grpcClient, cleanUp, err := dc.NewFinalityProviderServiceGRpcClient(daemonAddress)
+	if err != nil {
+		return err
+	}
+	defer func() {
+		if err := cleanUp(); err != nil {
+			fmt.Printf("Failed to clean up grpc client: %v\n", err)
+		}
+	}()
+
+	moniker, _ := cmd.Flags().GetString(monikerFlag)
+	website, _ := cmd.Flags().GetString(websiteFlag)
+	securityContact, _ := cmd.Flags().GetString(securityContactFlag)
+	details, _ := cmd.Flags().GetString(detailsFlag)
+	identity, _ := cmd.Flags().GetString(identityFlag)
+	rate, _ := cmd.Flags().GetString(commissionRateFlag)
+
+	desc := &proto.Description{
+		Moniker:         moniker,
+		Identity:        identity,
+		Website:         website,
+		SecurityContact: securityContact,
+		Details:         details,
+	}
+
+	if err := grpcClient.EditFinalityProvider(cmd.Context(), fpPk, desc, rate); err != nil {
+		return fmt.Errorf("failed to edit finality provider %v err %v", fpPk.MarshalHex(), err)
+	}
+
+	return nil
+}
+
 func printRespJSON(resp interface{}) {
 	jsonBytes, err := json.MarshalIndent(resp, "", "    ")
 	if err != nil {

finality-provider/cmd/fpd/daemon/flags.go

@@ -18,5 +18,5 @@ const (
 	websiteFlag         = "website"
 	securityContactFlag = "security-contact"
 	detailsFlag         = "details"
-	commissionRateFlag  = "commission"
+	commissionRateFlag  = "commission-rate"
 )

finality-provider/cmd/fpd/main.go

@@ -34,6 +34,7 @@ func main() {
 		daemon.CommandGetDaemonInfo(), daemon.CommandCreateFP(), daemon.CommandLsFP(),
 		daemon.CommandInfoFP(), daemon.CommandRegisterFP(), daemon.CommandAddFinalitySig(),
 		daemon.CommandExportFP(), daemon.CommandTxs(), daemon.CommandUnjailFP(),
+		daemon.CommandEditFinalityDescription(),
 	)
 
 	if err := cmd.Execute(); err != nil {