build fix

Author: vlad

x/compute/client/cli/tx.go

@@ -3,7 +3,6 @@ package cli
 import (
 	"context"
 	"encoding/hex"
-	"encoding/json"
 	"fmt"
 	"os"
 	"strconv"
@@ -676,15 +675,15 @@ Each machine ID must be exactly 20 bytes.`,
 			}
 
 			// Read machine IDs from file
-			machineIDs, err := readMachineIDsFromFile(args[1])
+			machineId, err := hex.DecodeString(args[1])
 			if err != nil {
 				return err
 			}
 
 			msg := &types.MsgUpdateMachineWhitelist{
 				Sender:     clientCtx.GetFromAddress().String(),
 				ProposalId: proposalID,
-				MachineIds: machineIDs,
+				MachineId:  machineId,
 			}
 
 			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg)
@@ -694,32 +693,3 @@ Each machine ID must be exactly 20 bytes.`,
 	flags.AddTxFlagsToCmd(cmd)
 	return cmd
 }
-
-func readMachineIDsFromFile(filename string) ([][]byte, error) {
-	data, err := os.ReadFile(filename)
-	if err != nil {
-		return nil, fmt.Errorf("failed to read file: %w", err)
-	}
-
-	var config struct {
-		MachineIDs []string `json:"machine_ids"`
-	}
-
-	if err := json.Unmarshal(data, &config); err != nil {
-		return nil, fmt.Errorf("failed to parse JSON: %w", err)
-	}
-
-	machineIDs := make([][]byte, len(config.MachineIDs))
-	for i, idHex := range config.MachineIDs {
-		id, err := hex.DecodeString(idHex)
-		if err != nil {
-			return nil, fmt.Errorf("invalid hex at index %d: %w", i, err)
-		}
-		if len(id) != 20 {
-			return nil, fmt.Errorf("machine ID at index %d must be 20 bytes, got %d", i, len(id))
-		}
-		machineIDs[i] = id
-	}
-
-	return machineIDs, nil
-}

x/compute/internal/keeper/ante.go

@@ -147,15 +147,10 @@ func (a *CountTXDecorator) validateUpdateMachineWhitelist(ctx sdk.Context, msgUp
 		return err
 	}
 
-	if len(msgUpdateWhitelist.MachineIds) != len(updateMachineWhitelistProposalMsg.MachineIds) {
-		return sdkerrors.ErrInvalidRequest.Wrapf("machine ids count %d does not match the proposal %d", len(msgUpdateWhitelist.MachineIds), len(updateMachineWhitelistProposalMsg.MachineIds))
-	}
-	// ensure the machine ids match the proposal exactly in order
-	for i, mid := range msgUpdateWhitelist.MachineIds {
-		if !bytes.Equal(mid, updateMachineWhitelistProposalMsg.MachineIds[i]) {
-			return sdkerrors.ErrInvalidRequest.Wrapf("machine id %s at position %d does not match the proposal", mid, i)
-		}
+	if !bytes.Equal(msgUpdateWhitelist.MachineId, updateMachineWhitelistProposalMsg.MachineId) {
+		return sdkerrors.ErrInvalidRequest.Wrapf("machine id %s does not match the proposal %s", msgUpdateWhitelist.MachineId, updateMachineWhitelistProposalMsg.MachineId)
 	}
+
 	return nil
 }
 

x/compute/internal/keeper/msg_server.go

@@ -328,7 +328,7 @@ func (m msgServer) UpdateMachineWhitelistProposal(goCtx context.Context, msg *ty
 
 	ctx.EventManager().EmitEvent(sdk.NewEvent(
 		types.EventTypeMachineWhitelistProposal,
-		sdk.NewAttribute("machine_count", fmt.Sprintf("%d", len(msg.MachineIds))),
+		sdk.NewAttribute("machine_id", fmt.Sprintf("%x", len(msg.MachineId))),
 		sdk.NewAttribute(sdk.AttributeKeySender, msg.Authority),
 	))
 
@@ -345,22 +345,21 @@ func (m msgServer) UpdateMachineWhitelist(goCtx context.Context, msg *types.MsgU
 	ctx.EventManager().EmitEvent(sdk.NewEvent(
 		types.EventTypeMachineWhitelistUpdate,
 		sdk.NewAttribute("proposal_id", fmt.Sprintf("%d", msg.ProposalId)),
-		sdk.NewAttribute("machine_count", fmt.Sprintf("%d", len(msg.MachineIds))),
+		sdk.NewAttribute("machine_id", fmt.Sprintf("%x", len(msg.MachineId))),
 		sdk.NewAttribute(sdk.AttributeKeySender, msg.Sender),
 	))
 
 	store := m.keeper.storeService.OpenKVStore(ctx)
 
-	for _, id := range msg.MachineIds {
-
+	id := msg.MachineId
+	{
 		proof := [32]byte{}
 		if err := api.OnApproveMachineID(id, &proof, true); err != nil {
 			return nil, err
-
-			key := append(types.MachineIDEvidencePrefix, id...)
-			_ = store.Set(key, proof[:])
-
 		}
+
+		key := append(types.MachineIDEvidencePrefix, id...)
+		_ = store.Set(key, proof[:])
 	}
 
 	return &types.MsgUpdateMachineWhitelistResponse{}, nil

x/compute/internal/types/msg.go

@@ -332,15 +332,8 @@ func (msg MsgUpdateMachineWhitelistProposal) ValidateBasic() error {
 		return errorsmod.Wrap(err, "invalid authority")
 	}
 
-	if len(msg.MachineIds) == 0 {
-		return errorsmod.Wrap(ErrEmpty, "machine_ids cannot be empty")
-	}
-
-	for i, id := range msg.MachineIds {
-		if len(id) != 20 {
-			return errorsmod.Wrapf(ErrInvalid,
-				"machine_id at index %d must be 20 bytes, got %d", i, len(id))
-		}
+	if len(msg.MachineId) != 20 {
+		return errorsmod.Wrap(ErrInvalid, "machine_id must be 20 bytes")
 	}
 
 	return nil
@@ -375,15 +368,8 @@ func (msg MsgUpdateMachineWhitelist) ValidateBasic() error {
 		return errorsmod.Wrap(sdkerrors.ErrInvalidRequest, "proposal ID cannot be zero")
 	}
 
-	if len(msg.MachineIds) == 0 {
-		return errorsmod.Wrap(sdkerrors.ErrInvalidRequest, "machine IDs cannot be empty")
-	}
-
-	// Validate each machine ID is exactly 20 bytes
-	for i, id := range msg.MachineIds {
-		if len(id) != 20 {
-			return errorsmod.Wrapf(sdkerrors.ErrInvalidRequest, "machine ID at index %d must be 20 bytes, got %d", i, len(id))
-		}
+	if len(msg.MachineId) != 20 {
+		return errorsmod.Wrap(sdkerrors.ErrInvalidRequest, "machine ID must be 20 bytes")
 	}
 
 	return nil