refactor gitopia client integration

Author: ProgramCpp

core/wallet/os_keyring.go

@@ -5,8 +5,6 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/cosmos/cosmos-sdk/client"
-	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/client/tx"
 	"github.com/cosmos/cosmos-sdk/codec"
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
@@ -15,7 +13,6 @@ import (
 	sdkkeyring "github.com/cosmos/cosmos-sdk/crypto/keyring"
 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/cosmos/cosmos-sdk/version"
 	"github.com/gitopia/git-remote-gitopia/config"
 	glib "github.com/gitopia/gitopia-go"
 	"github.com/gitopia/gitopia-go/logger"
@@ -25,13 +22,6 @@ import (
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/pflag"
 
-	"github.com/cosmos/cosmos-sdk/std"
-	authtx "github.com/cosmos/cosmos-sdk/x/auth/tx"
-	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
-	gtypes "github.com/gitopia/gitopia/v2/x/gitopia/types"
-	otypes "github.com/gitopia/gitopia/v2/x/offchain/types"
-	rtypes "github.com/gitopia/gitopia/v2/x/rewards/types"
-
 	"github.com/pkg/errors"
 	"google.golang.org/grpc"
 )
@@ -96,7 +86,7 @@ func InitOSKeyringWallet() (Wallet, error) {
 	ctx := logger.ContextWithValue(context.Background(), l)
 	glib.WithGitopiaAddr(config.GRPCHost)
 	glib.WithGasPrices(config.GasPrices)
-	cc, err := NewContext(key)
+	cc, err := glib.GetClientContextWithOptions(AppName, key, backend)
 	if err != nil {
 		return nil, errors.Wrap(err, "error creating cosmos client context")
 	}
@@ -116,55 +106,6 @@ func InitOSKeyringWallet() (Wallet, error) {
 	return o, nil
 }
 
-func NewContext(from string) (client.Context, error) {
-	version.Name = AppName
-	clientCtx := client.Context{}
-
-	interfaceRegistry := codectypes.NewInterfaceRegistry()
-	std.RegisterInterfaces(interfaceRegistry)
-	cryptocodec.RegisterInterfaces(interfaceRegistry)
-	authtypes.RegisterInterfaces(interfaceRegistry)
-	gtypes.RegisterInterfaces(interfaceRegistry)
-	rtypes.RegisterInterfaces(interfaceRegistry)
-	otypes.RegisterInterfaces(interfaceRegistry)
-
-	marshaler := codec.NewProtoCodec(interfaceRegistry)
-	txCfg := authtx.NewTxConfig(marshaler, authtx.DefaultSignModes)
-	clientCtx = clientCtx.
-		WithCodec(marshaler).
-		WithInterfaceRegistry(interfaceRegistry).
-		WithAccountRetriever(authtypes.AccountRetriever{}).
-		WithTxConfig(txCfg).
-		WithInput(os.Stdin)
-
-	clientCtx = clientCtx.WithChainID(config.ChainId)
-	clientCtx = clientCtx.WithNodeURI(config.TmAddr)
-	c, err := client.NewClientFromNode(clientCtx.NodeURI)
-	if err != nil {
-		return clientCtx, errors.Wrap(err, "error creatig tm client")
-	}
-	clientCtx = clientCtx.WithClient(c)
-	clientCtx = clientCtx.WithBroadcastMode(flags.BroadcastSync)
-	clientCtx = clientCtx.WithSkipConfirmation(true)
-
-	kr, err := client.NewKeyringFromBackend(clientCtx, keyring.BackendOS)
-	if err != nil {
-		return clientCtx, errors.Wrap(err, "error creating keyring backend")
-	}
-	clientCtx = clientCtx.WithKeyring(kr)
-
-	fromAddr, fromName, _, err := client.GetFromFields(clientCtx, kr, from)
-	if err != nil {
-		return clientCtx, errors.Wrap(err, "error parsing from Addr")
-	}
-
-	clientCtx = clientCtx.WithFrom(from).WithFromAddress(fromAddr).WithFromName(fromName)
-
-	feeGranterAddr := sdk.MustAccAddressFromBech32(config.FeeGranterAddr)
-	clientCtx = clientCtx.WithFeeGranterAddress(feeGranterAddr)
-	return clientCtx, nil
-}
-
 func (o OSKeyring) SignData(data []byte) (string, error) {
 	var privKey offchaintypes.SignatureProvider
 

go.mod

@@ -176,3 +176,5 @@ require (
 replace github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
 
 replace github.com/tendermint/tendermint => github.com/cometbft/cometbft v0.34.27
+
+replace github.com/gitopia/gitopia-go => /users/jananianbarasan/go/src/github.com/gitopia/gitopia-go

go.sum

@@ -204,8 +204,6 @@ github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4
 github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI=
 github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
-github.com/gitopia/gitopia-go v0.4.0 h1:vuKVlUDKqUlK6wz5n/Lbn6q0H7+4v0PzI1DBnxKFpbE=
-github.com/gitopia/gitopia-go v0.4.0/go.mod h1:1in+bQqP/CFduTIvJbB8WowPGRBhvyFkp+ZhBddutt0=
 github.com/gitopia/gitopia/v2 v2.0.1 h1:SeHwKkUkA+bqEzsgVimsOb5v6A1wL6O0zqQg/PSSl5c=
 github.com/gitopia/gitopia/v2 v2.0.1/go.mod h1:ZEEo2wHSxjJL3tcGg+ZenFlYMhfqFzwJkGkNMkgA9lE=
 github.com/gliderlabs/ssh v0.3.5 h1:OcaySEmAQJgyYcArR+gGGTHCyE7nvhEMTlYY+Dp8CpY=