Fix message ordering in the batch transaction

- storage update approval before reference updates

Author: faza

cmd/git-remote-gitopia/gitopia.go

@@ -374,6 +374,30 @@ func (h *GitopiaHandler) Push(remote *core.Remote, refsToPush []core.RefToPush)
 	}
 
 	var msg []sdk.Msg
+
+	// Approve packfile update
+	packfileUpdateProposalRes, err := h.storageClient.PackfileUpdateProposal(context.Background(), &storagetypes.QueryPackfileUpdateProposalRequest{
+		RepositoryId: h.remoteRepository.Id,
+		User:         h.wallet.Address(),
+	})
+	if err != nil {
+		return nil, err
+	}
+	msg = append(msg, storagetypes.NewMsgApproveRepositoryPackfileUpdate(h.wallet.Address(), packfileUpdateProposalRes.PackfileUpdateProposal.Id))
+
+	lfsObjectUpdateProposalRes, err := h.storageClient.LFSObjectUpdateProposalsByRepositoryId(context.Background(), &storagetypes.QueryLFSObjectUpdateProposalsByRepositoryIdRequest{
+		RepositoryId: h.remoteRepository.Id,
+		User:         h.wallet.Address(),
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	// Approve LFS object update
+	for _, lfsObjectUpdateProposal := range lfsObjectUpdateProposalRes.LfsObjectProposals {
+		msg = append(msg, storagetypes.NewMsgApproveLFSObjectUpdate(h.wallet.Address(), lfsObjectUpdateProposal.Id))
+	}
+
 	if len(setBranches) > 0 {
 		msg = append(msg, gitopiatypes.NewMsgMultiSetBranch(h.wallet.Address(), gitopiatypes.RepositoryId{
 			Id:   h.remoteRepository.Owner.Id,
@@ -403,29 +427,6 @@ func (h *GitopiaHandler) Push(remote *core.Remote, refsToPush []core.RefToPush)
 		remote.Logger.Println("Please sign the gitopia transaction on your ledger device.")
 	}
 
-	// Approve packfile update
-	packfileUpdateProposalRes, err := h.storageClient.PackfileUpdateProposal(context.Background(), &storagetypes.QueryPackfileUpdateProposalRequest{
-		RepositoryId: h.remoteRepository.Id,
-		User:         h.wallet.Address(),
-	})
-	if err != nil {
-		return nil, err
-	}
-	msg = append(msg, storagetypes.NewMsgApproveRepositoryPackfileUpdate(h.wallet.Address(), packfileUpdateProposalRes.PackfileUpdateProposal.Id))
-
-	lfsObjectUpdateProposalRes, err := h.storageClient.LFSObjectUpdateProposalsByRepositoryId(context.Background(), &storagetypes.QueryLFSObjectUpdateProposalsByRepositoryIdRequest{
-		RepositoryId: h.remoteRepository.Id,
-		User:         h.wallet.Address(),
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	// Approve LFS object update
-	for _, lfsObjectUpdateProposal := range lfsObjectUpdateProposalRes.LfsObjectProposals {
-		msg = append(msg, storagetypes.NewMsgApproveLFSObjectUpdate(h.wallet.Address(), lfsObjectUpdateProposal.Id))
-	}
-
 	if err := h.wallet.SignAndBroadcast(h.grpcConn, msg); err != nil {
 		return nil, err
 	}