Merge pull request #117 from gitopia/fix-pr-merge

gitopia1c2zfrmhra3spfrc2m5ft64hef30guf60lvtcm3 · gitopia1c2zfrmhra3spfrc2m5ft64hef30guf60lvtcm3 · commit 3b1ea32980e7 · 2024-11-30T07:51:18.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,32 @@
 
 All notable changes will be documented here.
 
+## [5.1.0] - 2024-11-30
+
+- fix errors in pull request merge messages
+- set whois update in UpdateDaoMetadata proposal
+- fix UpdateDaoConfig proposal
+- update protobuf imports
+- add the new v5.1.0 upgrade handler
+
+## [5.0.1] - 2024-11-27
+
+- update mocks and fix build error
+
+## [5.0.0] - 2024-11-27
+
+- Use cosmos-sdk fork for disabling pruning of proposals and votes in group proposals
+- Implement Gitopia DAOs using the cosmos-sdk module group.
+- Port existing DAO transactions
+- Create new DAO proposal types
+  - Merging PR in DAO repositories
+  - Creating new releases in DAO repositories
+  - Managing collaborators in DAO repositories
+  - Updating DAO governance configuration
+  - Updating DAO metadata
+  - DAO treasury spend
+- Migration for existing DAOs and members
+
 ## [4.0.0] - 2024-08-20
 
 - Upgrade cosmos-sdk version to v0.47.13
diff --git a/app/app.go b/app/app.go
@@ -40,6 +40,7 @@ import (
 	"github.com/gitopia/gitopia/v5/app/upgrades"
 	v4 "github.com/gitopia/gitopia/v5/app/upgrades/v4"
 	v5 "github.com/gitopia/gitopia/v5/app/upgrades/v5"
+	v51 "github.com/gitopia/gitopia/v5/app/upgrades/v51"
 	gitopiatypes "github.com/gitopia/gitopia/v5/x/gitopia/types"
 	rewardstypes "github.com/gitopia/gitopia/v5/x/rewards/types"
 	"github.com/spf13/cast"
@@ -69,6 +70,7 @@ var (
 		},
 		v4.Upgrade,
 		v5.Upgrade,
+		v51.Upgrade,
 	}
 )
 
diff --git a/app/upgrades/v51/constants.go b/app/upgrades/v51/constants.go
@@ -0,0 +1,21 @@
+package v51
+
+import (
+	"github.com/gitopia/gitopia/v5/app/upgrades"
+
+	store "github.com/cosmos/cosmos-sdk/store/types"
+)
+
+// UpgradeName defines the on-chain upgrade name for the Gitopia v5.1.0 upgrade.
+const (
+	UpgradeName = "v5.1.0"
+)
+
+var Upgrade = upgrades.Upgrade{
+	UpgradeName:          UpgradeName,
+	CreateUpgradeHandler: CreateUpgradeHandler,
+	StoreUpgrades: store.StoreUpgrades{
+		Added:   []string{},
+		Deleted: []string{},
+	},
+}
diff --git a/app/upgrades/v51/upgrades.go b/app/upgrades/v51/upgrades.go
@@ -0,0 +1,28 @@
+package v51
+
+import (
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/types/module"
+	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
+	"github.com/gitopia/gitopia/v5/app/keepers"
+)
+
+func CreateUpgradeHandler(
+	mm *module.Manager,
+	configurator module.Configurator,
+	keepers *keepers.AppKeepers,
+) upgradetypes.UpgradeHandler {
+	return func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
+		ctx.Logger().Info("Starting upgrade v5.1.0...")
+
+		ctx.Logger().Info("Migrating DAOs to the newer implementation...")
+
+		migrations, err := mm.RunMigrations(ctx, configurator, fromVM)
+		if err != nil {
+			return nil, err
+		}
+
+		ctx.Logger().Info("v5.1.0 Upgrade Complete")
+		return migrations, nil
+	}
+}
diff --git a/proto/gitopia/gitopia/gitopia/attachment.proto b/proto/gitopia/gitopia/gitopia/attachment.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 package gitopia.gitopia.gitopia;
 
-option go_package = "github.com/gitopia/gitopia/v4/x/gitopia/types";
+option go_package = "github.com/gitopia/gitopia/v5/x/gitopia/types";
 
 message Attachment {
     string name = 1;
diff --git a/proto/gitopia/gitopia/gitopia/bounty.proto b/proto/gitopia/gitopia/gitopia/bounty.proto
@@ -4,7 +4,7 @@ package gitopia.gitopia.gitopia;
 import "gogoproto/gogo.proto";
 import "cosmos/base/v1beta1/coin.proto";
 
-option go_package = "github.com/gitopia/gitopia/v4/x/gitopia/types";
+option go_package = "github.com/gitopia/gitopia/v5/x/gitopia/types";
 
 enum BountyState {
   option (gogoproto.goproto_enum_prefix) = false;
diff --git a/proto/gitopia/gitopia/gitopia/branch.proto b/proto/gitopia/gitopia/gitopia/branch.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 package gitopia.gitopia.gitopia;
 
-option go_package = "github.com/gitopia/gitopia/v4/x/gitopia/types";
+option go_package = "github.com/gitopia/gitopia/v5/x/gitopia/types";
 
 message Branch {
   uint64 id = 1;
diff --git a/proto/gitopia/gitopia/gitopia/comment.proto b/proto/gitopia/gitopia/gitopia/comment.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 package gitopia.gitopia.gitopia;
 
-option go_package = "github.com/gitopia/gitopia/v4/x/gitopia/types";
+option go_package = "github.com/gitopia/gitopia/v5/x/gitopia/types";
 
 import "gogoproto/gogo.proto";
 import "gitopia/gitopia/gitopia/reaction.proto";
diff --git a/proto/gitopia/gitopia/gitopia/dao.proto b/proto/gitopia/gitopia/gitopia/dao.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 package gitopia.gitopia.gitopia;
 
-option go_package = "github.com/gitopia/gitopia/v4/x/gitopia/types";
+option go_package = "github.com/gitopia/gitopia/v5/x/gitopia/types";
 
 import "gogoproto/gogo.proto";
 
diff --git a/proto/gitopia/gitopia/gitopia/exercised_amount.proto b/proto/gitopia/gitopia/gitopia/exercised_amount.proto
@@ -4,7 +4,7 @@ package gitopia.gitopia.gitopia;
 import "gogoproto/gogo.proto";
 import "cosmos/base/v1beta1/coin.proto";
 
-option go_package = "github.com/gitopia/gitopia/v4/x/gitopia/types";
+option go_package = "github.com/gitopia/gitopia/v5/x/gitopia/types";
 
 message ExercisedAmount {
   string address = 1; 
diff --git a/proto/gitopia/gitopia/gitopia/genesis.proto b/proto/gitopia/gitopia/gitopia/genesis.proto
@@ -18,7 +18,7 @@ import "gitopia/gitopia/gitopia/whois.proto";
 import "gitopia/gitopia/gitopia/params.proto";
 import "gitopia/gitopia/gitopia/exercised_amount.proto";
 
-option go_package = "github.com/gitopia/gitopia/v4/x/gitopia/types";
+option go_package = "github.com/gitopia/gitopia/v5/x/gitopia/types";
 
 // GenesisState defines the gitopia module's genesis state.
 message GenesisState {
diff --git a/proto/gitopia/gitopia/gitopia/issue.proto b/proto/gitopia/gitopia/gitopia/issue.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 package gitopia.gitopia.gitopia;
 
-option go_package = "github.com/gitopia/gitopia/v4/x/gitopia/types";
+option go_package = "github.com/gitopia/gitopia/v5/x/gitopia/types";
 
 import "gogoproto/gogo.proto";
 import "gitopia/gitopia/gitopia/repository.proto";
diff --git a/proto/gitopia/gitopia/gitopia/params.proto b/proto/gitopia/gitopia/gitopia/params.proto
@@ -4,7 +4,7 @@ package gitopia.gitopia.gitopia;
 import "gogoproto/gogo.proto";
 import "google/protobuf/timestamp.proto";
 
-option go_package = "github.com/gitopia/gitopia/v4/x/gitopia/types";
+option go_package = "github.com/gitopia/gitopia/v5/x/gitopia/types";
 
 message DistributionProportion {
   string proportion = 1 [
diff --git a/proto/gitopia/gitopia/gitopia/pullRequest.proto b/proto/gitopia/gitopia/gitopia/pullRequest.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 package gitopia.gitopia.gitopia;
 
-option go_package = "github.com/gitopia/gitopia/v4/x/gitopia/types";
+option go_package = "github.com/gitopia/gitopia/v5/x/gitopia/types";
 
 import "gogoproto/gogo.proto";
 import "gitopia/gitopia/gitopia/repository.proto";
diff --git a/proto/gitopia/gitopia/gitopia/query.proto b/proto/gitopia/gitopia/gitopia/query.proto
@@ -21,7 +21,7 @@ import "cosmos/base/v1beta1/coin.proto";
 import "gitopia/gitopia/gitopia/params.proto";
 import "cosmos/group/v1/types.proto";
 
-option go_package = "github.com/gitopia/gitopia/v4/x/gitopia/types";
+option go_package = "github.com/gitopia/gitopia/v5/x/gitopia/types";
 
 // Query defines the gRPC querier service.
 service Query {
diff --git a/proto/gitopia/gitopia/gitopia/reaction.proto b/proto/gitopia/gitopia/gitopia/reaction.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 package gitopia.gitopia.gitopia;
 
-option go_package = "github.com/gitopia/gitopia/v4/x/gitopia/types";
+option go_package = "github.com/gitopia/gitopia/v5/x/gitopia/types";
 
 import "gogoproto/gogo.proto";
 
diff --git a/proto/gitopia/gitopia/gitopia/release.proto b/proto/gitopia/gitopia/gitopia/release.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 package gitopia.gitopia.gitopia;
 
-option go_package = "github.com/gitopia/gitopia/v4/x/gitopia/types";
+option go_package = "github.com/gitopia/gitopia/v5/x/gitopia/types";
 
 import "gogoproto/gogo.proto";
 import "gitopia/gitopia/gitopia/attachment.proto";
diff --git a/proto/gitopia/gitopia/gitopia/repository.proto b/proto/gitopia/gitopia/gitopia/repository.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 package gitopia.gitopia.gitopia;
 
-option go_package = "github.com/gitopia/gitopia/v4/x/gitopia/types";
+option go_package = "github.com/gitopia/gitopia/v5/x/gitopia/types";
 
 import "gogoproto/gogo.proto";
 import "gitopia/gitopia/gitopia/whois.proto";
diff --git a/proto/gitopia/gitopia/gitopia/tag.proto b/proto/gitopia/gitopia/gitopia/tag.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 package gitopia.gitopia.gitopia;
 
-option go_package = "github.com/gitopia/gitopia/v4/x/gitopia/types";
+option go_package = "github.com/gitopia/gitopia/v5/x/gitopia/types";
 
 message Tag {
   uint64 id = 1;
diff --git a/proto/gitopia/gitopia/gitopia/task.proto b/proto/gitopia/gitopia/gitopia/task.proto
@@ -3,7 +3,7 @@ package gitopia.gitopia.gitopia;
 
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/gitopia/gitopia/v4/x/gitopia/types";
+option go_package = "github.com/gitopia/gitopia/v5/x/gitopia/types";
 
 enum TaskType {
   option (gogoproto.goproto_enum_prefix) = false;
diff --git a/proto/gitopia/gitopia/gitopia/tx.proto b/proto/gitopia/gitopia/gitopia/tx.proto
@@ -23,7 +23,7 @@ import "cosmos_proto/cosmos.proto";
 import "cosmos/group/v1/types.proto";
 import "amino/amino.proto";
 
-option go_package = "github.com/gitopia/gitopia/v4/x/gitopia/types";
+option go_package = "github.com/gitopia/gitopia/v5/x/gitopia/types";
 
 // Msg defines the Msg service.
 service Msg {
diff --git a/proto/gitopia/gitopia/gitopia/user.proto b/proto/gitopia/gitopia/gitopia/user.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 package gitopia.gitopia.gitopia;
 
-option go_package = "github.com/gitopia/gitopia/v4/x/gitopia/types";
+option go_package = "github.com/gitopia/gitopia/v5/x/gitopia/types";
 
 import "gogoproto/gogo.proto";
 
diff --git a/proto/gitopia/gitopia/gitopia/whois.proto b/proto/gitopia/gitopia/gitopia/whois.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 package gitopia.gitopia.gitopia;
 
-option go_package = "github.com/gitopia/gitopia/v4/x/gitopia/types";
+option go_package = "github.com/gitopia/gitopia/v5/x/gitopia/types";
 
 import "gogoproto/gogo.proto";
 
diff --git a/proto/gitopia/gitopia/rewards/genesis.proto b/proto/gitopia/gitopia/rewards/genesis.proto
@@ -7,7 +7,7 @@ import "gitopia/gitopia/rewards/rewards.proto";
 
 // this line is used by starport scaffolding # genesis/proto/import
 
-option go_package = "github.com/gitopia/gitopia/v4/x/rewards/types";
+option go_package = "github.com/gitopia/gitopia/v5/x/rewards/types";
 
 // GenesisState defines the rewards module's genesis state.
 message GenesisState {
diff --git a/proto/gitopia/gitopia/rewards/params.proto b/proto/gitopia/gitopia/rewards/params.proto
@@ -5,7 +5,7 @@ import "gogoproto/gogo.proto";
 import "gitopia/gitopia/rewards/pool.proto";
 import "google/protobuf/timestamp.proto";
 
-option go_package = "github.com/gitopia/gitopia/v4/x/rewards/types";
+option go_package = "github.com/gitopia/gitopia/v5/x/rewards/types";
 
 // Params defines the parameters for the module.
 message Params {
diff --git a/proto/gitopia/gitopia/rewards/pool.proto b/proto/gitopia/gitopia/rewards/pool.proto
@@ -5,7 +5,7 @@ import "gogoproto/gogo.proto";
 import "cosmos/base/v1beta1/coin.proto";
 import "google/protobuf/timestamp.proto";
 
-option go_package = "github.com/gitopia/gitopia/v4/x/rewards/types";
+option go_package = "github.com/gitopia/gitopia/v5/x/rewards/types";
 
 enum Series {
     NONE = 0; 
diff --git a/proto/gitopia/gitopia/rewards/query.proto b/proto/gitopia/gitopia/rewards/query.proto
@@ -11,7 +11,7 @@ import "cosmos/base/v1beta1/coin.proto";
 import "gitopia/gitopia/rewards/params.proto";
 // this line is used by starport scaffolding # 1
 
-option go_package = "github.com/gitopia/gitopia/v4/x/rewards/types";
+option go_package = "github.com/gitopia/gitopia/v5/x/rewards/types";
 
 // Query defines the gRPC querier service.
 service Query {
diff --git a/proto/gitopia/gitopia/rewards/rewards.proto b/proto/gitopia/gitopia/rewards/rewards.proto
@@ -5,7 +5,7 @@ import "gogoproto/gogo.proto";
 import "gitopia/gitopia/rewards/pool.proto";
 import "cosmos/base/v1beta1/coin.proto";
 
-option go_package = "github.com/gitopia/gitopia/v4/x/rewards/types";
+option go_package = "github.com/gitopia/gitopia/v5/x/rewards/types";
 
 // a map from recipient to all her rewards
 message Reward {
diff --git a/proto/gitopia/gitopia/rewards/task.proto b/proto/gitopia/gitopia/rewards/task.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 package gitopia.gitopia.rewards;
 
-option go_package = "github.com/gitopia/gitopia/v4/x/rewards/types";
+option go_package = "github.com/gitopia/gitopia/v5/x/rewards/types";
 
 enum taskType {
   UNKNOWN = 0;
diff --git a/proto/gitopia/gitopia/rewards/tx.proto b/proto/gitopia/gitopia/rewards/tx.proto
@@ -10,7 +10,7 @@ import "cosmos_proto/cosmos.proto";
 
 // this line is used by starport scaffolding # proto/tx/import
 
-option go_package = "github.com/gitopia/gitopia/v4/x/rewards/types";
+option go_package = "github.com/gitopia/gitopia/v5/x/rewards/types";
 
 // Msg defines the Msg service.
 service Msg {
diff --git a/x/gitopia/keeper/msg_server_dao.go b/x/gitopia/keeper/msg_server_dao.go
@@ -377,6 +377,38 @@ func (k msgServer) UpdateDaoMetadata(goCtx context.Context, msg *types.MsgUpdate
 	}
 
 	if msg.Name != "" {
+		// Dao name validation and whois update
+		newDaoName := strings.ToLower(msg.Name)
+		currentDaoName := strings.ToLower(dao.Name)
+
+		if whois, found := k.GetWhois(ctx, newDaoName); found && whois.Address != daoAddress.Address {
+			return nil, sdkerrors.Wrap(sdkerrors.ErrInvalidRequest, fmt.Sprintf("name is already taken: (%v)", msg.Name))
+		}
+		if _, reserved := types.ReservedUsernames[newDaoName]; reserved {
+			return nil, sdkerrors.Wrap(sdkerrors.ErrInvalidRequest, fmt.Sprintf("(%v) is reserved name", msg.Name))
+		}
+
+		if whois, found := k.GetWhois(ctx, currentDaoName); found {
+			if newDaoName != currentDaoName { // skip whois update for case change in dao name
+				// Remove existing key
+				k.RemoveWhois(ctx, whois.Name)
+
+				whois.Name = newDaoName
+				k.SetWhois(
+					ctx,
+					whois,
+				)
+			}
+		} else {
+			whois = types.Whois{
+				Creator:   msg.Admin,
+				Name:      newDaoName,
+				Address:   dao.Address,
+				OwnerType: types.OwnerType_DAO,
+			}
+			k.AppendWhois(ctx, whois)
+		}
+
 		dao.Name = msg.Name
 	}
 	if msg.Description != "" {
@@ -403,6 +435,9 @@ func (k msgServer) UpdateDaoMetadata(goCtx context.Context, msg *types.MsgUpdate
 			sdk.NewAttribute(types.EventAttributeDaoIdKey, strconv.FormatUint(dao.Id, 10)),
 			sdk.NewAttribute(types.EventAttributeDaoAddressKey, dao.Address),
 			sdk.NewAttribute(types.EventAttributeDaoNameKey, dao.Name),
+			sdk.NewAttribute(types.EventAttributeDaoDescription, dao.Description),
+			sdk.NewAttribute(types.EventAttributeDaoLocation, dao.Location),
+			sdk.NewAttribute(types.EventAttributeDaoWebsite, dao.Website),
 			sdk.NewAttribute(types.EventAttributeAvatarUrl, dao.AvatarUrl),
 			sdk.NewAttribute(types.EventAttributeUpdatedAtKey, strconv.FormatInt(dao.UpdatedAt, 10)),
 		),
@@ -583,6 +618,9 @@ func (k msgServer) UpdateDaoConfig(goCtx context.Context, msg *types.MsgUpdateDa
 	}
 
 	dao.Config = msg.Config
+	dao.UpdatedAt = ctx.BlockTime().Unix()
+
+	k.SetDao(ctx, dao)
 
 	ctx.EventManager().EmitEvent(
 		sdk.NewEvent(sdk.EventTypeMessage,
diff --git a/x/gitopia/keeper/msg_server_provider.go b/x/gitopia/keeper/msg_server_provider.go
diff --git a/x/gitopia/keeper/msg_server_pullRequest.go b/x/gitopia/keeper/msg_server_pullRequest.go

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@ import (`
`40`	`40`	`"github.com/gitopia/gitopia/v5/app/upgrades"`
`41`	`41`	`v4 "github.com/gitopia/gitopia/v5/app/upgrades/v4"`
`42`	`42`	`v5 "github.com/gitopia/gitopia/v5/app/upgrades/v5"`
	`43`	`+ v51 "github.com/gitopia/gitopia/v5/app/upgrades/v51"`
`43`	`44`	`gitopiatypes "github.com/gitopia/gitopia/v5/x/gitopia/types"`
`44`	`45`	`rewardstypes "github.com/gitopia/gitopia/v5/x/rewards/types"`
`45`	`46`	`"github.com/spf13/cast"`
`@@ -69,6 +70,7 @@ var (`
`69`	`70`	`},`
`70`	`71`	`v4.Upgrade,`
`71`	`72`	`v5.Upgrade,`
	`73`	`+ v51.Upgrade,`
`72`	`74`	`}`
`73`	`75`	`)`
`74`	`76`