Merge pull request #21 from git-remote-gitopia/release-v1.9.0

Author: gitopia1gyrcgtfa8lqmytl5svv3y8s439l7xhccgh8q4p

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes will be documented here.
 
+## [v1.9.0] - 2024-08-20
+
+- upgrade cosmos-sdk to v0.47.13, gitopia to v4.0.0 and gitopia-go to v0.6.0
+- automatic selection of grpc host with the least latency
+- set gas adjustment to 1.8
+
 ## [v1.8.0] - 2024-05-31
 
 - Support custom configuration for api and other parameters

cmd/git-gitopia/lfs/init.go

@@ -13,7 +13,8 @@ import (
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
 	"github.com/gitopia/git-remote-gitopia/config"
 	"github.com/gitopia/git-remote-gitopia/core"
-	gitopiatypes "github.com/gitopia/gitopia/v2/x/gitopia/types"
+	"github.com/gitopia/git-remote-gitopia/core/api"
+	gitopiatypes "github.com/gitopia/gitopia/v4/x/gitopia/types"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"google.golang.org/grpc"
@@ -51,7 +52,15 @@ func InitCommand() *cobra.Command {
 
 			interfaceRegistry := codectypes.NewInterfaceRegistry()
 
-			grpcConn, err := grpc.Dial(config.GRPCHost,
+			grpcHost, _ := config.GitConfigGet(config.GitopiaConfigGRPCHostOption)
+			if grpcHost == "" || !api.CheckGRPCHostLiveness(grpcHost) {
+				provider := api.GetBestApiProvider()
+				if err := api.SetConfiguredGRPCHost(provider.GRPCHost); err != nil {
+					return err
+				}
+			}
+
+			grpcConn, err := grpc.Dial(grpcHost,
 				grpc.WithTransportCredentials(insecure.NewCredentials()),
 				grpc.WithDefaultCallOptions(grpc.ForceCodec(codec.NewProtoCodec(interfaceRegistry).GRPCCodec())),
 			)

cmd/git-remote-gitopia/gitopia.go

@@ -9,7 +9,6 @@ import (
 	"strings"
 
 	"github.com/cosmos/cosmos-sdk/client/grpc/tmservice"
-	"github.com/cosmos/cosmos-sdk/codec"
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
 	cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -19,9 +18,10 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/feegrant"
 	"github.com/gitopia/git-remote-gitopia/config"
 	core "github.com/gitopia/git-remote-gitopia/core"
+	"github.com/gitopia/git-remote-gitopia/core/api"
 	"github.com/gitopia/git-remote-gitopia/core/wallet"
-	gitopiatypes "github.com/gitopia/gitopia/v2/x/gitopia/types"
-	"github.com/gitopia/gitopia/v2/x/gitopia/utils"
+	gitopiatypes "github.com/gitopia/gitopia/v4/x/gitopia/types"
+	"github.com/gitopia/gitopia/v4/x/gitopia/utils"
 	"github.com/go-git/go-git/v5/plumbing"
 	"github.com/pkg/errors"
 	"google.golang.org/grpc"
@@ -55,32 +55,39 @@ type GitopiaHandler struct {
 func (h *GitopiaHandler) Initialize(remote *core.Remote) error {
 	var err error
 
-	interfaceRegistry := codectypes.NewInterfaceRegistry()
-	authtypes.RegisterInterfaces(interfaceRegistry)
-	cryptocodec.RegisterInterfaces(interfaceRegistry)
+	grpcHost, _ := config.GitConfigGet(config.GitopiaConfigGRPCHostOption)
+	tmAddr, _ := config.GitConfigGet(config.GitopiaConfigTmAddrOption)
+	if grpcHost == "" || tmAddr == "" || !api.CheckGRPCHostLiveness(grpcHost) || !api.CheckRPCHostLiveness(tmAddr) {
+		provider := api.GetBestApiProvider()
+		grpcHost = provider.GRPCHost
+		if err := api.SetConfiguredGRPCHost(provider.GRPCHost); err != nil {
+			return err
+		}
+		if err := api.SetConfiguredTmAddr(provider.TMAddr); err != nil {
+			return err
+		}
+	}
 
-	h.grpcConn, err = grpc.Dial(config.GRPCHost,
-		grpc.WithTransportCredentials(insecure.NewCredentials()),
-		grpc.WithDefaultCallOptions(grpc.ForceCodec(codec.NewProtoCodec(interfaceRegistry).GRPCCodec())),
-	)
+	h.grpcConn, err = grpc.Dial(grpcHost, grpc.WithTransportCredentials(insecure.NewCredentials()))
 	if err != nil {
 		return err
 	}
-	// defer grpcConn.Close()
+
+	interfaceRegistry := codectypes.NewInterfaceRegistry()
+	authtypes.RegisterInterfaces(interfaceRegistry)
+	cryptocodec.RegisterInterfaces(interfaceRegistry)
 
 	h.queryClient = gitopiatypes.NewQueryClient(h.grpcConn)
 	serviceClient := tmservice.NewServiceClient(h.grpcConn)
 	h.feegrantClient = feegrant.NewQueryClient(h.grpcConn)
 	h.bankClient = banktypes.NewQueryClient(h.grpcConn)
 
-	// Get chain id for signing transaction
 	nodeInfoRes, err := serviceClient.GetNodeInfo(context.Background(), &tmservice.GetNodeInfoRequest{})
 	if err != nil {
 		return err
 	}
 	h.chainId = nodeInfoRes.DefaultNodeInfo.Network
 
-	// Get RepositoryId
 	res, err := h.queryClient.AnyRepository(context.Background(), &gitopiatypes.QueryGetAnyRepositoryRequest{
 		Id:             h.remoteUserId,
 		RepositoryName: h.remoteRepositoryName,
@@ -336,6 +343,10 @@ func (h *GitopiaHandler) Push(remote *core.Remote, refsToPush []core.RefToPush)
 		}, deleteTags))
 	}
 
+	if h.wallet.Type() == wallet.LEDGER {
+		remote.Logger.Println("Please sign the gitopia transaction on your ledger device.")
+	}
+
 	if err := h.wallet.SignAndBroadcast(h.grpcConn, msg); err != nil {
 		return nil, err
 	}

config/config.go

@@ -7,11 +7,20 @@ import (
 )
 
 const (
-	AppName              = "git-remote-gitopia"
-	gitopiaConfigSection = "gitopia"
+	AppName                          = "git-remote-gitopia"
+	GitopiaConfigSection             = "gitopia"
+	GitopiaConfigChainIdOption       = "chainId"
+	GitopiaConfigGRPCHostOption      = "grpcHost"
+	GitopiaConfigTmAddrOption        = "tmAddr"
+	GitopiaConfigGitServerHostOption = "gitServerHost"
+	GitopiaConfigKeyOption           = "key"
+	GitopiaConfigBackendOption       = "backend"
+	GitopiaConfigGasPricesOption     = "gasPrices"
+	GitopiaConfigFeeGranterOption    = "feeGranter"
+	GitopiaConfigDenomOption         = "denom"
 )
 
-func gitConfigGet(key string) (string, error) {
+func GitConfigGet(key string) (string, error) {
 	cmd := exec.Command("git", "config", "--get", fmt.Sprintf("gitopia.%s", key))
 	stdout, err := cmd.Output()
 
@@ -24,25 +33,19 @@ func gitConfigGet(key string) (string, error) {
 }
 
 func LoadGitConfig() error {
-	if res, err := gitConfigGet("chainId"); err == nil {
+	if res, err := GitConfigGet(GitopiaConfigChainIdOption); err == nil {
 		ChainId = res
 	}
-	if res, err := gitConfigGet("grpcHost"); err == nil {
-		GRPCHost = res
-	}
-	if res, err := gitConfigGet("gitServerHost"); err == nil {
+	if res, err := GitConfigGet(GitopiaConfigGitServerHostOption); err == nil {
 		GitServerHost = res
 	}
-	if res, err := gitConfigGet("tmAddr"); err == nil {
-		TmAddr = res
-	}
-	if res, err := gitConfigGet("gasPrices"); err == nil {
+	if res, err := GitConfigGet(GitopiaConfigGasPricesOption); err == nil {
 		GasPrices = res
 	}
-	if res, err := gitConfigGet("feeGranter"); err == nil {
+	if res, err := GitConfigGet(GitopiaConfigFeeGranterOption); err == nil {
 		FeeGranterAddr = res
 	}
-	if res, err := gitConfigGet("denom"); err == nil {
+	if res, err := GitConfigGet(GitopiaConfigDenomOption); err == nil {
 		Denom = res
 	}
 	return nil

config/config_dev.go

@@ -4,9 +4,7 @@ package config
 
 var (
 	ChainId        = "gitopia"
-	GRPCHost       = "grpc.devnet.gitopia.com:9090"
 	GitServerHost  = "https://server.devnet.gitopia.com"
-	TmAddr         = "https://rpc.devnet.gitopia.com:443"
 	GasPrices      = "0.001ulore"
 	FeeGranterAddr = ""
 	Denom          = "ulore"

config/config_prod.go

@@ -4,9 +4,7 @@ package config
 
 var (
 	ChainId        = "gitopia"
-	GRPCHost       = "grpc.gitopia.com:9090"
 	GitServerHost  = "https://server.gitopia.com"
-	TmAddr         = "https://rpc.gitopia.com:443"
 	GasPrices      = "0.001ulore"
 	FeeGranterAddr = "gitopia13ashgc6j5xle4m47kqyn5psavq0u3klmscfxql"
 	Denom          = "ulore"

config/config_testing.go

@@ -3,11 +3,9 @@
 package config
 
 var (
-	ChainId        = "gitopia"
-	GRPCHost       = "localhost:9090"
+	ChainId        = "localgitopia"
 	GitServerHost  = "http://localhost:5001"
-	TmAddr         = "http://localhost:26657"
 	GasPrices      = "0.001ulore"
-	FeeGranterAddr = ""
+	FeeGranterAddr = "gitopia12sjhqc3rqgvu3zpg8ekmwl005rp4ys58ekqg89"
 	Denom          = "ulore"
 )

core/api/grpc.go

@@ -0,0 +1,44 @@
+package api
+
+import (
+	"context"
+	"time"
+
+	"github.com/cosmos/cosmos-sdk/client/grpc/tmservice"
+	"github.com/gitopia/git-remote-gitopia/core"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/credentials/insecure"
+)
+
+func CheckGRPCHostLiveness(host string) bool {
+	conn, err := grpc.Dial(host, grpc.WithTransportCredentials(insecure.NewCredentials()))
+	if err != nil {
+		return false
+	}
+	defer conn.Close()
+
+	client := tmservice.NewServiceClient(conn)
+	_, err = client.GetNodeInfo(context.Background(), &tmservice.GetNodeInfoRequest{})
+	return err == nil
+}
+
+func checkGRPCHostLatency(host string) time.Duration {
+	start := time.Now()
+	conn, err := grpc.Dial(host, grpc.WithTransportCredentials(insecure.NewCredentials()))
+	if err != nil {
+		return time.Hour
+	}
+	defer conn.Close()
+
+	client := tmservice.NewServiceClient(conn)
+	_, err = client.GetNodeInfo(context.Background(), &tmservice.GetNodeInfoRequest{})
+	if err != nil {
+		return time.Hour
+	}
+	return time.Since(start)
+}
+
+func SetConfiguredGRPCHost(host string) error {
+	cmd := core.GitCommand("git", "config", "--global", "gitopia.grpcHost", host)
+	return cmd.Run()
+}

core/api/providers.go

@@ -0,0 +1,44 @@
+package api
+
+import (
+	"time"
+)
+
+type ProviderConfig struct {
+	GRPCHost string
+	TMAddr   string
+}
+
+var providers = []ProviderConfig{
+	{
+		GRPCHost: "gitopia.declab.pro:9017",
+		TMAddr:   "https://gitopia.declab.pro:26625",
+	},
+	{
+		GRPCHost: "gitopia-grpc.polkachu.com:11390",
+		TMAddr:   "https://gitopia-rpc.polkachu.com:443",
+	},
+	{
+		GRPCHost: "gitopia.grpc.m.stavr.tech:5123",
+		TMAddr:   "http://gitopia.rpc.m.stavr.tech:51057",
+	},
+	{
+		GRPCHost: "gitopia-rpc.stakeangle.com:41390",
+		TMAddr:   "https://gitopia-rpc.stakeangle.com:443",
+	},
+}
+
+func GetBestApiProvider() ProviderConfig {
+	bestHost := providers[0]
+	bestLatency := time.Hour
+
+	for _, p := range providers {
+		latency := checkGRPCHostLatency(p.GRPCHost)
+		if latency < bestLatency && CheckRPCHostLiveness(p.TMAddr) {
+			bestHost = p
+			bestLatency = latency
+		}
+	}
+
+	return bestHost
+}

core/api/rpc.go

@@ -0,0 +1,37 @@
+package api
+
+import (
+	"context"
+	"time"
+
+	clienthttp "github.com/cometbft/cometbft/rpc/client/http"
+	jsonrpcclient "github.com/cometbft/cometbft/rpc/jsonrpc/client"
+	"github.com/gitopia/git-remote-gitopia/core"
+)
+
+func CheckRPCHostLiveness(host string) bool {
+	httpClient, err := jsonrpcclient.DefaultHTTPClient(host)
+	if err != nil {
+		return false
+	}
+	httpClient.Timeout = time.Duration(5) * time.Second
+	c, err := clienthttp.NewWithClient(host, "/websocket", httpClient)
+	if err != nil {
+		return false
+	}
+
+	res, err := c.Status(context.Background())
+	if err != nil {
+		return false
+	}
+	if res.SyncInfo.CatchingUp {
+		return false
+	}
+
+	return true
+}
+
+func SetConfiguredTmAddr(addr string) error {
+	cmd := core.GitCommand("git", "config", "--global", "gitopia.tmAddr", addr)
+	return cmd.Run()
+}