gitopia · faza · Sep 2, 2025 · Jul 23, 2025 · Jul 23, 2025 · Jul 23, 2025
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 All notable changes will be documented here.
 
+## [6.0.0] - 2025-09-02
+
+- implement storage module to manage storage providers, storage information and storage challenges
+- handle race conditions in repository update transactions by including repository state in the transaction
+- implement storage update proposal and approval process
+- implement charging for storage usage beyond free limit
+
 ## [5.1.0] - 2024-11-30
 
 - fix errors in pull request merge messages

diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go
@@ -353,6 +353,7 @@ func NewAppKeeper(
 		appKeepers.SlashingKeeper,
 	)
 
+	// Initialize GitopiaKeeper with nil StorageKeeper to break circular dependency
 	appKeepers.GitopiaKeeper = *gitopiakeeper.NewKeeper(
 		appCodec,
 		appKeepers.keys[gitopiatypes.StoreKey],
@@ -365,6 +366,7 @@ func NewAppKeeper(
 		appKeepers.MintKeeper,
 		appKeepers.DistrKeeper,
 		appKeepers.GroupKeeper,
+		nil, // StorageKeeper will be set later
 		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
 	)
 	appKeepers.RewardKeeper = *rewardskeeper.NewKeeper(
@@ -390,6 +392,9 @@ func NewAppKeeper(
 		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
 	)
 
+	// Set StorageKeeper on GitopiaKeeper to complete the circular dependency resolution
+	appKeepers.GitopiaKeeper.SetStorageKeeper(appKeepers.StorageKeeper)
+
 	return appKeepers
 }
 

diff --git a/proto/gitopia/gitopia/gitopia/tx.proto b/proto/gitopia/gitopia/gitopia/tx.proto
@@ -54,6 +54,7 @@ service Msg {
   rpc UpdatePullRequestDescription(MsgUpdatePullRequestDescription) returns (MsgUpdatePullRequestDescriptionResponse);
   rpc InvokeMergePullRequest(MsgInvokeMergePullRequest) returns (MsgInvokeMergePullRequestResponse);
   rpc InvokeDaoMergePullRequest(MsgInvokeDaoMergePullRequest) returns (MsgInvokeDaoMergePullRequestResponse);
+  rpc MergePullRequest(MsgMergePullRequest) returns (MsgMergePullRequestResponse);
   rpc SetPullRequestState(MsgSetPullRequestState) returns (MsgSetPullRequestStateResponse);
   rpc AddPullRequestReviewers(MsgAddPullRequestReviewers) returns (MsgAddPullRequestReviewersResponse);
   rpc RemovePullRequestReviewers(MsgRemovePullRequestReviewers) returns (MsgRemovePullRequestReviewersResponse);
@@ -196,6 +197,10 @@ message MsgSetBranch {
     string name = 1;
     string sha = 2;
   }
+
+  // cid of repository packfile
+  // only proceed with the set branch if the current packfile cid matches the expected packfile cid
+  string packfile_cid = 4;
 }
 
 message MsgSetBranchResponse {}
@@ -216,6 +221,10 @@ message MsgMultiSetBranch {
     string name = 1;
     string sha = 2;
   }
+
+  // cid of repository packfile
+  // only proceed with the set branch if the current packfile cid matches the expected packfile cid
+  string packfile_cid = 4;
 }
 
 message MsgMultiSetBranchResponse { }
@@ -244,6 +253,10 @@ message MsgSetTag {
     string name = 1;
     string sha = 2;
   }
+
+  // cid of repository packfile
+  // only proceed with the set tag if the current packfile cid matches the expected packfile cid
+  string packfile_cid = 4;
 }
 
 message MsgSetTagResponse { }
@@ -256,6 +269,10 @@ message MsgMultiSetTag {
     string name = 1;
     string sha = 2;
   }
+
+  // cid of repository packfile
+  // only proceed with the set tag if the current packfile cid matches the expected packfile cid
+  string packfile_cid = 4;
 }
 
 message MsgMultiSetTagResponse { }
@@ -397,6 +414,10 @@ message MsgInvokeMergePullRequest {
   uint64 repositoryId = 2;
   uint64 iid = 3;
   string provider = 4;
+
+  // commit sha of base branch
+  // only proceed with the merge if the current commit sha matches the expected commit sha
+  string base_commit_sha = 5;
 }
 
 message MsgInvokeMergePullRequestResponse { }
@@ -410,10 +431,28 @@ message MsgInvokeDaoMergePullRequest {
   uint64 repositoryId = 2;
   uint64 iid = 3;
   string provider = 4;
+
+  // commit sha of base branch
+  // only proceed with the merge if the current commit sha matches the expected commit sha
+  string base_commit_sha = 5;
 }
 
 message MsgInvokeDaoMergePullRequestResponse { }
 
+// MsgMergePullRequest defines a message for completing a pull request merge
+message MsgMergePullRequest {
+  string creator = 1;
+  uint64 repository_id = 2;
+  uint64 pull_request_iid = 3;
+  string merge_commit_sha = 4;
+
+  // cid of repository packfile
+  // only proceed with the merge if the current packfile cid matches the expected packfile cid
+  string packfile_cid = 5;
+}
+
+message MsgMergePullRequestResponse {}
+
 message MsgSetPullRequestState {
   string creator = 1;
   uint64 repositoryId = 2;

diff --git a/proto/gitopia/gitopia/storage/events.proto b/proto/gitopia/gitopia/storage/events.proto
@@ -5,6 +5,7 @@ import "google/protobuf/timestamp.proto";
 import "gogoproto/gogo.proto";
 import "cosmos/base/v1beta1/coin.proto";
 import "amino/amino.proto";
+import "gitopia/gitopia/storage/types.proto";
 
 option go_package = "github.com/gitopia/gitopia/v6/x/storage/types";
 
@@ -27,33 +28,16 @@ message EventPackfileUpdated {
   string old_cid = 3;
   string new_name = 4;
   string old_name = 5;
+  string provider = 6;
+  bool deleted = 7;
 }
 
-// EventPackfileDeleted is emitted when a packfile is deleted
-message EventPackfileDeleted {
-  uint64 repository_id = 1;
-  string name = 2;
-  string cid = 3;
-}
-
-// EventReleaseAssetUpdated is emitted when a release asset is updated
-message EventReleaseAssetUpdated {
+// EventReleaseAssetsUpdated is emitted when release assets are updated
+message EventReleaseAssetsUpdated {
   uint64 repository_id = 1;
   string tag = 2;
-  string name = 3;
-  string new_cid = 4;
-  string old_cid = 5;
-  string new_sha256 = 6;
-  string old_sha256 = 7;
-}
-
-// EventReleaseAssetDeleted is emitted when a release asset is deleted
-message EventReleaseAssetDeleted {
-  uint64 repository_id = 1;
-  string tag = 2;
-  string name = 3;
-  string cid = 4;
-  string sha256 = 5;
+  repeated ReleaseAssetUpdate assets = 3;
+  string provider = 4;
 }
 
 // EventChallengeCreated is emitted when a new challenge is created
@@ -88,36 +72,48 @@ message EventProviderUnstakeCompleted {
   ];
 }
 
-// EventMergePullRequest is emitted when a pull request is merged
-message EventMergePullRequest {
-  string creator = 1;
-  uint64 pull_request_id = 2;
-  uint64 pull_request_iid = 3;
-  string state = 4;
-  string merge_commit_sha = 5;
-  uint64 task_id = 6;
-  string task_state = 7;
-  string repo_name = 8;
-  uint64 repo_id = 9;
-  string repo_owner_id = 10;
-  string repo_owner_type = 11;
-  string pull_request_head = 14;
-  string repo_branch = 15;
-  string merged_by = 16;
-  int64 updated_at = 17;
-  int64 merged_at = 18;
-}
-
 // EventLFSObjectUpdated is emitted when an LFS object is updated
 message EventLFSObjectUpdated {
   uint64 repository_id = 1;
   string oid = 2;
   string cid = 3;
+  string provider = 4;
+  bool deleted = 5;
 }
 
-// EventLFSObjectDeleted is emitted when an LFS object is deleted
-message EventLFSObjectDeleted {
+// EventDeleteStorageObject is emitted when older storage objects are deleted
+message EventDeleteStorageObject {
+  repeated string cids = 1;
+  uint64 repository_id = 2;
+  string provider = 3;
+}
+
+// EventRepositoryDeleted is emitted when a repository is deleted
+message EventRepositoryDeleted {
   uint64 repository_id = 1;
-  string oid = 2;
-  string cid = 3;
+  string provider = 2;
+  string packfile_cid = 3;
+  string packfile_name = 4;
+  repeated ReleaseAssetInfo release_assets = 5;
+  repeated LFSObjectInfo lfs_objects = 6;
+}
+
+// EventProposalTimeout is emitted when a storage update proposal times out
+message EventProposalTimeout {
+  string provider = 1;
+  repeated string cids = 2;
+}
+
+// ReleaseAssetInfo contains minimal information about a release asset
+message ReleaseAssetInfo {
+  string name = 1;
+  string cid = 2;
+  string sha256 = 3;
+  string tag = 4;
+}
+
+// LFSObjectInfo contains minimal information about an LFS object
+message LFSObjectInfo {
+  string oid = 1;
+  string cid = 2;
 }
diff --git a/proto/gitopia/gitopia/storage/params.proto b/proto/gitopia/gitopia/storage/params.proto
@@ -4,6 +4,7 @@ package gitopia.gitopia.storage;
 import "gogoproto/gogo.proto";
 import "cosmos/base/v1beta1/coin.proto";
 import "google/protobuf/duration.proto";
+import "amino/amino.proto";
 
 option go_package = "github.com/gitopia/gitopia/v6/x/storage/types";
 
@@ -13,18 +14,48 @@ message Params {
 
   uint64 min_stake_amount = 1 [(gogoproto.moretags) = "yaml:\"min_stake_amount\""];
   uint64 challenge_interval_blocks = 2 [(gogoproto.moretags) = "yaml:\"challenge_interval_blocks\""];
-  google.protobuf.Duration challenge_period = 3 [(gogoproto.stdduration) = true, (gogoproto.moretags) = "yaml:\"challenge_period\""];
+  google.protobuf.Duration challenge_period = 3 [(gogoproto.nullable) = false, (gogoproto.stdduration) = true, (gogoproto.moretags) = "yaml:\"challenge_period\""];
   cosmos.base.v1beta1.Coin reward_per_day = 4 [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"reward_per_day\""];
-  cosmos.base.v1beta1.Coin challenge_slash_amount = 5 [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"challenge_slash_amount\""];
-  uint64 consecutive_fails_threshold = 6 [(gogoproto.moretags) = "yaml:\"consecutive_fails_threshold\""];
-  uint64 consecutive_fails_slash_percentage = 7 [(gogoproto.moretags) = "yaml:\"consecutive_fails_slash_percentage\""];
-  uint64 unstake_cooldown_blocks = 8 [(gogoproto.moretags) = "yaml:\"unstake_cooldown_blocks\""];
+  uint64 unstake_cooldown_blocks = 5 [(gogoproto.moretags) = "yaml:\"unstake_cooldown_blocks\""];
 
-  // cost per MB of storage
-  cosmos.base.v1beta1.Coin storage_price_per_mb = 9 [(gogoproto.nullable) = false];
+  // cost per GB of storage
+  cosmos.base.v1beta1.Coin storage_price_per_gb = 6 [(gogoproto.nullable) = false];
   // free storage in MB
-  uint64 free_storage_mb = 10 [(gogoproto.moretags) = "yaml:\"free_storage_mb\""];
+  uint64 free_storage_mb = 7 [(gogoproto.moretags) = "yaml:\"free_storage_mb\""];
 
   // max providers
-  uint64 max_providers = 11 [(gogoproto.moretags) = "yaml:\"max_providers\""];
+  uint64 max_providers = 8 [(gogoproto.moretags) = "yaml:\"max_providers\""];
+
+  // Liveness tracking parameters
+  // Number of challenges to track for liveness calculation (sliding window)
+  uint64 liveness_window_challenges = 9 [(gogoproto.moretags) = "yaml:\"liveness_window_challenges\""];
+  // Minimum liveness ratio required (e.g., 67 = 67%)
+  bytes min_liveness_per_window = 10 [
+    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+    (gogoproto.nullable)   = false,
+    (amino.dont_omitempty) = true
+  ];
+
+  // Liveness fault slashing parameters (less severe)
+  cosmos.base.v1beta1.Coin liveness_slash_amount = 11 [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"liveness_slash_amount\""];
+  bytes liveness_slash_fraction = 12 [
+    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+    (gogoproto.nullable)   = false,
+    (amino.dont_omitempty) = true,
+    (gogoproto.moretags)   = "yaml:\"liveness_slash_fraction\""
+  ];
+  google.protobuf.Duration liveness_jail_time = 13 [(gogoproto.nullable) = false, (gogoproto.stdduration) = true, (gogoproto.moretags) = "yaml:\"liveness_jail_time\""];
+
+  // Proof fault slashing parameters (more severe for assigned provider)
+  cosmos.base.v1beta1.Coin proof_fault_slash_amount = 14 [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"proof_fault_slash_amount\""];
+  bytes proof_fault_slash_fraction = 15 [
+    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+    (gogoproto.nullable)   = false,
+    (amino.dont_omitempty) = true,
+    (gogoproto.moretags)   = "yaml:\"proof_fault_slash_fraction\""
+  ];
+  google.protobuf.Duration proof_fault_jail_time = 16 [(gogoproto.nullable) = false, (gogoproto.stdduration) = true, (gogoproto.moretags) = "yaml:\"proof_fault_jail_time\""];
+
+  // Maximum number of consecutive proof faults before suspension  
+  uint64 max_proof_faults = 17 [(gogoproto.moretags) = "yaml:\"max_proof_faults\""];
 }