fix: merge conflict resolution errors, fix types key config merge error

types/config.go

@@ -2,6 +2,7 @@ package types
 
 import (
 	"context"
+	"fmt"
 	"sync"
 
 	"github.com/cosmos/cosmos-sdk/version"
@@ -10,20 +11,19 @@ import (
 // DefaultKeyringServiceName defines a default service name for the keyring.
 const DefaultKeyringServiceName = "cosmos"
 
-func KeyringServiceName() string {
-	if len(version.Name) == 0 {
-		return DefaultKeyringServiceName
-	}
-	return version.Name
-}
-
 // Config is the structure that holds the SDK configuration parameters.
-// Deprecated: The global SDK config is deprecated and users should prefer using an address codec.
-// Users must still set the global config until the Stringer interface on `AccAddress`, `ValAddress`, and `ConsAddress` is removed.
+// This could be used to initialize certain configuration parameters for the SDK.
 type Config struct {
+	fullFundraiserPath  string
 	bech32AddressPrefix map[string]string
+	txEncoder           TxEncoder
+	addressVerifier     func([]byte) error
 	mtx                 sync.RWMutex
 
+	// SLIP-44 related
+	purpose  uint32
+	coinType uint32
+
 	sealed   bool
 	sealedch chan struct{}
 }
@@ -46,6 +46,11 @@ func NewConfig() *Config {
 			"validator_pub":  Bech32PrefixValPub,
 			"consensus_pub":  Bech32PrefixConsPub,
 		},
+		fullFundraiserPath: FullFundraiserPath,
+
+		purpose:   Purpose,
+		coinType:  CoinType,
+		txEncoder: nil,
 	}
 }
 
@@ -102,6 +107,39 @@ func (config *Config) SetBech32PrefixForConsensusNode(addressPrefix, pubKeyPrefi
 	config.bech32AddressPrefix["consensus_pub"] = pubKeyPrefix
 }
 
+// SetTxEncoder builds the Config with TxEncoder used to marshal StdTx to bytes
+func (config *Config) SetTxEncoder(encoder TxEncoder) {
+	config.assertNotSealed()
+	config.txEncoder = encoder
+}
+
+// SetAddressVerifier builds the Config with the provided function for verifying that addresses
+// have the correct format
+func (config *Config) SetAddressVerifier(addressVerifier func([]byte) error) {
+	config.assertNotSealed()
+	config.addressVerifier = addressVerifier
+}
+
+// Set the FullFundraiserPath (BIP44Prefix) on the config.
+//
+// Deprecated: This method is supported for backward compatibility only and will be removed in a future release. Use SetPurpose and SetCoinType instead.
+func (config *Config) SetFullFundraiserPath(fullFundraiserPath string) {
+	config.assertNotSealed()
+	config.fullFundraiserPath = fullFundraiserPath
+}
+
+// Set the BIP-0044 Purpose code on the config
+func (config *Config) SetPurpose(purpose uint32) {
+	config.assertNotSealed()
+	config.purpose = purpose
+}
+
+// Set the BIP-0044 CoinType code on the config
+func (config *Config) SetCoinType(coinType uint32) {
+	config.assertNotSealed()
+	config.coinType = coinType
+}
+
 // Seal seals the config such that the config state could not be modified further
 func (config *Config) Seal() *Config {
 	config.mtx.Lock()
@@ -148,3 +186,42 @@ func (config *Config) GetBech32ValidatorPubPrefix() string {
 func (config *Config) GetBech32ConsensusPubPrefix() string {
 	return config.bech32AddressPrefix["consensus_pub"]
 }
+
+// GetTxEncoder return function to encode transactions
+func (config *Config) GetTxEncoder() TxEncoder {
+	return config.txEncoder
+}
+
+// GetAddressVerifier returns the function to verify that addresses have the correct format
+func (config *Config) GetAddressVerifier() func([]byte) error {
+	return config.addressVerifier
+}
+
+// GetPurpose returns the BIP-0044 Purpose code on the config.
+func (config *Config) GetPurpose() uint32 {
+	return config.purpose
+}
+
+// GetCoinType returns the BIP-0044 CoinType code on the config.
+func (config *Config) GetCoinType() uint32 {
+	return config.coinType
+}
+
+// GetFullFundraiserPath returns the BIP44Prefix.
+//
+// Deprecated: This method is supported for backward compatibility only and will be removed in a future release. Use GetFullBIP44Path instead.
+func (config *Config) GetFullFundraiserPath() string {
+	return config.fullFundraiserPath
+}
+
+// GetFullBIP44Path returns the BIP44Prefix.
+func (config *Config) GetFullBIP44Path() string {
+	return fmt.Sprintf("m/%d'/%d'/0'/0/0", config.purpose, config.coinType)
+}
+
+func KeyringServiceName() string {
+	if len(version.Name) == 0 {
+		return DefaultKeyringServiceName
+	}
+	return version.Name
+}