Merge pull request #24 from git-remote-gitopia/release-v1.10.0

Author: gitopia1c2zfrmhra3spfrc2m5ft64hef30guf60lvtcm3

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes will be documented here.
 
+## [v1.10.0] - 2024-12-02
+
+- upgrade gitopia version to v5.1.0
+- upgrade gitopia-go version to v0.6.2
+- update the push permissions logic for dao repositories
+
 ## [v1.9.1] - 2024-08-31
 
 - fix offchain proto warning

cmd/git-gitopia/lfs/init.go

@@ -14,7 +14,7 @@ import (
 	"github.com/gitopia/git-remote-gitopia/config"
 	"github.com/gitopia/git-remote-gitopia/core"
 	"github.com/gitopia/git-remote-gitopia/core/api"
-	gitopiatypes "github.com/gitopia/gitopia/v4/x/gitopia/types"
+	gitopiatypes "github.com/gitopia/gitopia/v5/x/gitopia/types"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"google.golang.org/grpc"

cmd/git-remote-gitopia/gitopia.go

@@ -20,8 +20,8 @@ import (
 	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/v4/x/gitopia/types"
-	"github.com/gitopia/gitopia/v4/x/gitopia/utils"
+	gitopiatypes "github.com/gitopia/gitopia/v5/x/gitopia/types"
+	"github.com/gitopia/gitopia/v5/x/gitopia/utils"
 	"github.com/go-git/go-git/v5/plumbing"
 	"github.com/pkg/errors"
 	"google.golang.org/grpc"
@@ -360,15 +360,18 @@ func (h *GitopiaHandler) havePushPermission(walletAddress string) (havePermissio
 			havePermission = true
 		}
 	} else if h.remoteRepository.Owner.Type == gitopiatypes.OwnerType_DAO {
-		member, err := h.queryClient.DaoMember(context.Background(), &gitopiatypes.QueryGetDaoMemberRequest{
-			DaoId:  h.remoteRepository.Owner.Id,
-			UserId: h.wallet.Address(),
+		resp, err := h.queryClient.DaoMemberAll(context.Background(), &gitopiatypes.QueryAllDaoMemberRequest{
+			DaoId: h.remoteRepository.Owner.Id,
 		})
 		if err != nil {
 			return havePermission, err
 		}
-		if member.Member.Role == gitopiatypes.MemberRole_OWNER {
-			havePermission = true
+
+		for _, member := range resp.Members {
+			if member.Member.Address == walletAddress {
+				havePermission = true
+				break
+			}
 		}
 	}
 

core/wallet/gitopia_wallet.go

@@ -24,8 +24,8 @@ import (
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	"github.com/cosmos/cosmos-sdk/x/feegrant"
 	"github.com/gitopia/git-remote-gitopia/config"
-	gitopia "github.com/gitopia/gitopia/v4/app"
-	offchaintypes "github.com/gitopia/gitopia/v4/x/offchain/types"
+	gitopia "github.com/gitopia/gitopia/v5/app"
+	offchaintypes "github.com/gitopia/gitopia/v5/x/offchain/types"
 	"github.com/pkg/errors"
 	"google.golang.org/grpc"
 )

core/wallet/ledger.go

@@ -24,8 +24,8 @@ import (
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	"github.com/cosmos/cosmos-sdk/x/feegrant"
 	"github.com/gitopia/git-remote-gitopia/config"
-	gitopia "github.com/gitopia/gitopia/v4/app"
-	offchaintypes "github.com/gitopia/gitopia/v4/x/offchain/types"
+	gitopia "github.com/gitopia/gitopia/v5/app"
+	offchaintypes "github.com/gitopia/gitopia/v5/x/offchain/types"
 	"github.com/pkg/errors"
 	"google.golang.org/grpc"
 )

core/wallet/os_keyring.go

@@ -18,8 +18,8 @@ import (
 	"github.com/gitopia/git-remote-gitopia/config"
 	glib "github.com/gitopia/gitopia-go"
 	"github.com/gitopia/gitopia-go/logger"
-	gitopia "github.com/gitopia/gitopia/v4/app"
-	offchaintypes "github.com/gitopia/gitopia/v4/x/offchain/types"
+	gitopia "github.com/gitopia/gitopia/v5/app"
+	offchaintypes "github.com/gitopia/gitopia/v5/x/offchain/types"
 	goGitConfig "github.com/go-git/go-git/v5/config"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"

go.mod

@@ -5,8 +5,8 @@ go 1.21
 require (
 	github.com/cometbft/cometbft v0.37.6
 	github.com/cosmos/cosmos-sdk v0.47.13
-	github.com/gitopia/gitopia-go v0.6.1
-	github.com/gitopia/gitopia/v4 v4.0.1
+	github.com/gitopia/gitopia-go v0.6.2
+	github.com/gitopia/gitopia/v5 v5.1.0
 	github.com/go-git/go-git/v5 v5.11.0
 	github.com/pkg/errors v0.9.1
 	github.com/sirupsen/logrus v1.9.3
@@ -218,3 +218,5 @@ require (
 
 // https://github.com/cosmos/cosmos-sdk/issues/20159
 replace golang.org/x/exp => golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb
+
+replace github.com/gitopia/gitopia/v4 => ../gitopia

go.sum

@@ -448,10 +448,10 @@ github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm
 github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
 github.com/gin-gonic/gin v1.8.1 h1:4+fr/el88TOO3ewCmQr8cx/CtZ/umlIRIs5M4NTNjf8=
 github.com/gin-gonic/gin v1.8.1/go.mod h1:ji8BvRH1azfM+SYow9zQ6SZMvR8qOMZHmsCuWR9tTTk=
-github.com/gitopia/gitopia-go v0.6.1 h1:AINALBdUcn1VYzw+so7nrKgIW5+0juhIP2hG5sHfwLY=
-github.com/gitopia/gitopia-go v0.6.1/go.mod h1:1gNKxYitlxt5gVknvgzqHO/3cCkNI0VlCQKfF8vYEUs=
-github.com/gitopia/gitopia/v4 v4.0.1 h1:PPLYC6X9+dMYVaa/hTJaQyv/X0Tz3DqL1/cwTujm5TI=
-github.com/gitopia/gitopia/v4 v4.0.1/go.mod h1:Z0PIKA/0xwsR3VDoLTILrMnhzqsXKaHfMyGT2ajjqPE=
+github.com/gitopia/gitopia-go v0.6.2 h1:3Xu090ObJ8TP5FqmRj/blRSX0721ootXojwuOJLHb6Y=
+github.com/gitopia/gitopia-go v0.6.2/go.mod h1:UueURx6CKcAl95Y+ldqX1k41TlfjM8fRuBCUNanW6TY=
+github.com/gitopia/gitopia/v5 v5.1.0 h1:a/RySnjfpRYJwbkqW76QFmkBW/FihLDJHEpCtbF85Zg=
+github.com/gitopia/gitopia/v5 v5.1.0/go.mod h1:t1FjB6j0LlGB2Ka1+Hu+XiARQ4NHhoVx9uKiR8+yhwc=
 github.com/gliderlabs/ssh v0.3.5 h1:OcaySEmAQJgyYcArR+gGGTHCyE7nvhEMTlYY+Dp8CpY=
 github.com/gliderlabs/ssh v0.3.5/go.mod h1:8XB4KraRrX39qHhT6yxPsHedjA08I/uBVwj4xC+/+z4=
 github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA=

readme.md

@@ -55,7 +55,7 @@ export GITOPIA_WALLET=/path/to/wallet.json
 ```
 git config --global gitopia.chainId "gitopia"
 git config --global gitopia.grpcHost "localhost:9090"
-git config --global gitopia.gitServerhHst "http://localhost:5001"
+git config --global gitopia.gitServerHost "http://localhost:5001"
 git config --global gitopia.tmAddr "http://localhost:26657"
 git config --global gitopia.gasPrices "0.001ulore"
 git config --global gitopia.feeGranter ""