feat: CNS-962-user-spec-implementation

app/app.go

@@ -480,6 +480,7 @@ func New(
 		keys[specmoduletypes.MemStoreKey],
 		app.GetSubspace(specmoduletypes.ModuleName),
 		app.StakingKeeper,
+		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
 	)
 	specModule := specmodule.NewAppModule(appCodec, app.SpecKeeper, app.AccountKeeper, app.BankKeeper)
 
@@ -608,10 +609,8 @@ func New(
 	govRouter.AddRoute(govtypes.RouterKey, v1beta1.ProposalHandler).
 		//
 		// user defined
-		AddRoute(specmoduletypes.ProposalsRouterKey, specmodule.NewSpecProposalsHandler(app.SpecKeeper)).
 		// copied the code from param and changed the handler to enable functionality
 		AddRoute(paramproposal.RouterKey, specmodule.NewParamChangeProposalHandler(app.ParamsKeeper)).
-		// user defined
 		AddRoute(plansmoduletypes.ProposalsRouterKey, plansmodule.NewPlansProposalsHandler(app.PlansKeeper)).
 		AddRoute(pairingmoduletypes.ProposalsRouterKey, pairingmodule.NewPairingProposalsHandler(app.PairingKeeper)).
 

app/upgrades/upgrade_0_35_0.go

@@ -24,7 +24,7 @@ func v_35_0(
 		params := lk.SpecKeeper.GetParams(ctx)
 		params.AllowlistedExpeditedMsgs = []string{
 			proto.MessageName(&protocoltypes.MsgSetVersion{}),
-			proto.MessageName(&spectypes.SpecAddProposal{}),
+			proto.MessageName(&spectypes.MsgAddSpecs{}),
 			proto.MessageName(&ibctypes.ClientUpdateProposal{}),
 			proto.MessageName(&ibctypes.UpgradeProposal{}),
 		}

proto/lavanet/lava/spec/spec.proto

@@ -38,4 +38,5 @@ message Spec {
     ];
   uint64 shares = 19;
   string identity = 20;
+  bool user_spec = 21;
 }

proto/lavanet/lava/spec/tx.proto

@@ -4,10 +4,21 @@ package lavanet.lava.spec;
 // this line is used by starport scaffolding # proto/tx/import
 
 option go_package = "github.com/lavanet/lava/x/spec/types";
+import "gogoproto/gogo.proto";
+import "lavanet/lava/spec/spec.proto";
 
 // Msg defines the Msg service.
 service Msg {
+    rpc AddSpecs(MsgAddSpecs) returns (MsgAddSpecsResponse);
     // this line is used by starport scaffolding # proto/tx/rpc
 }
 
-// this line is used by starport scaffolding # proto/tx/message
+// this line is used by starport scaffolding # proto/tx/message
+
+message MsgAddSpecs {
+    string creator = 1;
+    repeated Spec specs = 3 [(gogoproto.nullable) = false]; 
+}
+
+message MsgAddSpecsResponse {
+}

testutil/keeper/dualstaking.go

@@ -67,7 +67,7 @@ func DualstakingKeeper(t testing.TB) (*keeper.Keeper, sdk.Context) {
 		nil,
 		&mockAccountKeeper{},
 		epochstorageKeeper,
-		speckeeper.NewKeeper(cdc, nil, nil, paramsSubspaceSpec, nil),
+		speckeeper.NewKeeper(cdc, nil, nil, paramsSubspaceSpec, nil, ""),
 		fixationkeeper.NewKeeper(cdc, tsKeeper, epochstorageKeeper.BlocksToSaveRaw),
 	)
 

testutil/keeper/keepers_init.go

@@ -253,7 +253,7 @@ func InitAllKeepers(t testing.TB) (*Servers, *Keepers, context.Context) {
 	init_balance()
 	ks.StakingKeeper = *stakingkeeper.NewKeeper(cdc, stakingStoreKey, ks.AccountKeeper, ks.BankKeeper, authtypes.NewModuleAddress(govtypes.ModuleName).String())
 	ks.Distribution = distributionkeeper.NewKeeper(cdc, distributionStoreKey, ks.AccountKeeper, ks.BankKeeper, ks.StakingKeeper, authtypes.FeeCollectorName, authtypes.NewModuleAddress(govtypes.ModuleName).String())
-	ks.Spec = *speckeeper.NewKeeper(cdc, specStoreKey, specMemStoreKey, specparamsSubspace, ks.StakingKeeper)
+	ks.Spec = *speckeeper.NewKeeper(cdc, specStoreKey, specMemStoreKey, specparamsSubspace, ks.StakingKeeper, authtypes.NewModuleAddress(govtypes.ModuleName).String())
 	ks.Epochstorage = *epochstoragekeeper.NewKeeper(cdc, epochStoreKey, epochMemStoreKey, epochparamsSubspace, &ks.BankKeeper, &ks.AccountKeeper, ks.Spec, ks.StakingKeeper)
 	ks.FixationStoreKeeper = fixationkeeper.NewKeeper(cdc, ks.TimerStoreKeeper, ks.Epochstorage.BlocksToSaveRaw)
 	ks.Dualstaking = *dualstakingkeeper.NewKeeper(cdc, dualstakingStoreKey, dualstakingMemStoreKey, dualstakingparamsSubspace, &ks.BankKeeper, &ks.StakingKeeper, &ks.AccountKeeper, ks.Epochstorage, ks.Spec, ks.FixationStoreKeeper)
@@ -383,14 +383,7 @@ func SimulatePlansDelProposal(ctx sdk.Context, plansKeeper planskeeper.Keeper, p
 }
 
 func SimulateSpecAddProposal(ctx sdk.Context, specKeeper speckeeper.Keeper, specsToPropose []spectypes.Spec) error {
-	proposal := spectypes.NewSpecAddProposal("mockProposal", "mockProposal specs add for testing", specsToPropose)
-	err := proposal.ValidateBasic()
-	if err != nil {
-		return err
-	}
-	proposalHandler := spec.NewSpecProposalsHandler(specKeeper)
-	err = proposalHandler(ctx, proposal)
-	return err
+	return specKeeper.HandleSpecs(ctx, specsToPropose, specKeeper.GetAuthority())
 }
 
 func SimulateUnstakeProposal(ctx sdk.Context, pairingKeeper pairingkeeper.Keeper, providersInfo []pairingtypes.ProviderUnstakeInfo, delegatorsSlashing []pairingtypes.DelegatorSlashing) error {

testutil/keeper/plan.go

@@ -63,7 +63,7 @@ func PlanKeeper(t testing.TB) (*keeper.Keeper, sdk.Context) {
 		memStoreKey,
 		paramsSubspace,
 		epochstorageKeeper,
-		speckeeper.NewKeeper(cdc, nil, nil, paramsSubspaceSpec, nil),
+		speckeeper.NewKeeper(cdc, nil, nil, paramsSubspaceSpec, nil, ""),
 		fixationkeeper.NewKeeper(cdc, timerstorekeeper.NewKeeper(cdc), epochstorageKeeper.BlocksToSaveRaw),
 		nil,
 	)

testutil/keeper/spec.go

@@ -57,6 +57,7 @@ func specKeeper() (*keeper.Keeper, sdk.Context, error) {
 		memStoreKey,
 		paramsSubspace,
 		nil,
+		"",
 	)
 
 	ctx := sdk.NewContext(stateStore, tmproto.Header{}, false, log.NewNopLogger())
@@ -79,7 +80,7 @@ func GetASpec(specIndex, getToTopMostPath string, ctxArg *sdk.Context, keeper *k
 	}
 	proposalFile := "./cookbook/specs/ibc.json,./cookbook/specs/cosmoswasm.json,./cookbook/specs/tendermint.json,./cookbook/specs/cosmossdk.json,./cookbook/specs/cosmossdk_full.json,./cookbook/specs/ethereum.json,./cookbook/specs/cosmoshub.json,./cookbook/specs/lava.json,./cookbook/specs/osmosis.json,./cookbook/specs/fantom.json,./cookbook/specs/celo.json,./cookbook/specs/optimism.json,./cookbook/specs/arbitrum.json,./cookbook/specs/starknet.json,./cookbook/specs/aptos.json,./cookbook/specs/juno.json,./cookbook/specs/polygon.json,./cookbook/specs/evmos.json,./cookbook/specs/base.json,./cookbook/specs/canto.json,./cookbook/specs/sui.json,./cookbook/specs/solana.json,./cookbook/specs/bsc.json,./cookbook/specs/axelar.json,./cookbook/specs/avalanche.json,./cookbook/specs/fvm.json"
 	for _, fileName := range strings.Split(proposalFile, ",") {
-		proposal := utils.SpecAddProposalJSON{}
+		proposal := utils.SpecAddProposalWithDepositJSON{}
 
 		contents, err := os.ReadFile(getToTopMostPath + fileName)
 		if err != nil {

x/conflict/keeper/msg_server_detection.go

@@ -26,6 +26,15 @@ func (k msgServer) Detection(goCtx context.Context, msg *types.MsgDetection) (*t
 			utils.Attribute{Key: "client", Value: msg.Creator},
 		)
 	}
+
+	spec, found := k.specKeeper.GetSpec(ctx, msg.ResponseConflict.ConflictRelayData0.Request.RelaySession.SpecId)
+	if !found || spec.UserSpec {
+		return nil, utils.LavaFormatWarning("Simulation: invalid spec for conflict (not found or user spec)", err,
+			utils.Attribute{Key: "found", Value: found},
+			utils.Attribute{Key: "userSpec", Value: spec.UserSpec},
+		)
+	}
+
 	if msg.FinalizationConflict != nil && msg.ResponseConflict == nil && msg.SameProviderConflict == nil {
 		err := k.Keeper.ValidateFinalizationConflict(ctx, msg.FinalizationConflict, clientAddr)
 		if err != nil {

x/conflict/types/expected_keepers.go

@@ -36,6 +36,7 @@ type EpochstorageKeeper interface {
 type SpecKeeper interface {
 	IsSpecFoundAndActive(ctx sdk.Context, chainID string) (foundAndActive, found bool, providersType spectypes.Spec_ProvidersTypes)
 	IsFinalizedBlock(ctx sdk.Context, chainID string, requestedBlock, latestBlock int64) bool
+	GetSpec(ctx sdk.Context, index string) (val spectypes.Spec, found bool)
 }
 
 // AccountKeeper defines the expected account keeper used for simulations (noalias)

x/pairing/keeper/msg_server_relay_payment.go

@@ -277,7 +277,7 @@ func (k msgServer) RelayPayment(goCtx context.Context, msg *types.MsgRelayPaymen
 		utils.LogLavaEvent(ctx, logger, types.RelayPaymentEventName, successDetails, "New Proof Of Work Was Accepted")
 
 		cuAfterQos := rewardedCUDec.TruncateInt().Uint64()
-		err = k.chargeCuToSubscriptionAndCreditProvider(ctx, project, relay, cuAfterQos)
+		err = k.chargeCuToSubscriptionAndCreditProvider(ctx, project, relay, cuAfterQos, spec.UserSpec)
 		if err != nil {
 			return nil, utils.LavaFormatError("Failed charging CU to project and subscription", err)
 		}
@@ -393,7 +393,7 @@ func (k EpochCuCache) updateProvidersComplainerCU(ctx sdk.Context, unresponsiveP
 	return nil
 }
 
-func (k Keeper) chargeCuToSubscriptionAndCreditProvider(ctx sdk.Context, project projectstypes.Project, relay *types.RelaySession, cuAfterQos uint64) error {
+func (k Keeper) chargeCuToSubscriptionAndCreditProvider(ctx sdk.Context, project projectstypes.Project, relay *types.RelaySession, cuAfterQos uint64, userSpec bool) error {
 	epoch := uint64(relay.Epoch)
 
 	err := k.projectsKeeper.ChargeComputeUnitsToProject(ctx, project, epoch, relay.CuSum)
@@ -406,7 +406,7 @@ func (k Keeper) chargeCuToSubscriptionAndCreditProvider(ctx sdk.Context, project
 		return fmt.Errorf("failed to add CU to the subscription")
 	}
 
-	err = k.subscriptionKeeper.AddTrackedCu(ctx, sub.Consumer, relay.Provider, relay.SpecId, cuAfterQos, sub.Block)
+	err = k.subscriptionKeeper.AddTrackedCu(ctx, sub.Consumer, relay.Provider, relay.SpecId, cuAfterQos, sub.Block, userSpec)
 	if err != nil {
 		return err
 	}

x/pairing/types/expected_keepers.go

@@ -91,7 +91,7 @@ type SubscriptionKeeper interface {
 	GetAllSubTrackedCuIndices(ctx sdk.Context, sub string) []string
 	GetTrackedCu(ctx sdk.Context, sub string, provider string, chainID string, block uint64) (cu uint64, found bool, key string)
 	CalcTotalMonthlyReward(ctx sdk.Context, totalAmount math.Int, trackedCu uint64, totalCuUsedBySub uint64) math.Int
-	AddTrackedCu(ctx sdk.Context, sub string, provider string, chainID string, cu uint64, block uint64) error
+	AddTrackedCu(ctx sdk.Context, sub string, provider string, chainID string, cu uint64, block uint64, userSpec bool) error
 	GetAllSubscriptionsIndices(ctx sdk.Context) []string
 	AppendAdjustment(ctx sdk.Context, consumer string, provider string, totalConsumerUsage uint64, usageWithThisProvider uint64)
 	CalculateParticipationFees(ctx sdk.Context, reward sdk.Coin) (sdk.Coins, sdk.Coins, error)

x/spec/client/cli/tx.go

@@ -5,7 +5,6 @@ import (
 	"strings"
 	"time"
 
-	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 	govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
@@ -18,6 +17,7 @@ import (
 	"github.com/lavanet/lava/x/spec/client/utils"
 	"github.com/lavanet/lava/x/spec/types"
 
+	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/client/tx"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/version"
@@ -43,7 +43,7 @@ func GetTxCmd() *cobra.Command {
 	}
 
 	// this line is used by starport scaffolding # 1
-
+	cmd.AddCommand(NewAddSpecsTxCmd())
 	return cmd
 }
 
@@ -89,10 +89,6 @@ $ %s tx gov spec-proposal spec-add <path/to/proposal.json> --from=<key_or_addres
 
 			from := clientCtx.GetFromAddress()
 			content := &proposal.Proposal
-			deposit, err := sdk.ParseCoinsNormalized(proposal.Deposit)
-			if err != nil {
-				return err
-			}
 
 			devTest, err := cmd.Flags().GetBool(devTestFlagName)
 			if err == nil && devTest {
@@ -115,14 +111,13 @@ $ %s tx gov spec-proposal spec-add <path/to/proposal.json> --from=<key_or_addres
 				}
 			}
 
-			contentAny, err := codectypes.NewAnyWithValue(content)
+			deposit, err := sdk.ParseCoinsNormalized(proposal.Deposit)
 			if err != nil {
 				return err
 			}
 
-			msgExecLegacy := govv1.NewMsgExecLegacyContent(contentAny, authtypes.NewModuleAddress(govtypes.ModuleName).String())
-
-			submitPropMsg, err := govv1.NewMsgSubmitProposal([]sdk.Msg{msgExecLegacy}, deposit, from.String(), proposal.Proposal.Description, proposal.Proposal.Title, "Add a new spec", isExpedited)
+			msgAddSpecs := types.NewMsgAddSpecs(authtypes.NewModuleAddress(govtypes.ModuleName).String(), content.Specs)
+			submitPropMsg, err := govv1.NewMsgSubmitProposal([]sdk.Msg{msgAddSpecs}, deposit, from.String(), proposal.Proposal.Description, proposal.Proposal.Title, "Add a new spec", isExpedited)
 			if err != nil {
 				return err
 			}
@@ -134,3 +129,61 @@ $ %s tx gov spec-proposal spec-add <path/to/proposal.json> --from=<key_or_addres
 	cmd.Flags().Bool(expeditedFlagName, false, "set to true to make the spec proposal expedited")
 	return cmd
 }
+
+// NewAddSpecsTxCmd returns a CLI command handler for creating
+// a add spec transaction
+func NewAddSpecsTxCmd() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "spec-add [proposal-file,proposal-file,...]",
+		Args:  cobra.ExactArgs(1),
+		Short: "Submit a spec add",
+		Long: strings.TrimSpace(
+			fmt.Sprintf(`send a transaction to add or modify existing user specs.
+Example:
+$ %s tx spec spec-add <path/to/proposal.json> --from=<key_or_address>
+`,
+				version.AppName,
+			),
+		),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			clientCtx, err := client.GetClientTxContext(cmd)
+			if err != nil {
+				return err
+			}
+			proposal, err := utils.ParseSpecAddProposalJSON(clientCtx.LegacyAmino, args[0])
+			if err != nil {
+				return err
+			}
+
+			from := clientCtx.GetFromAddress()
+			content := &proposal.Proposal
+
+			devTest, err := cmd.Flags().GetBool(devTestFlagName)
+			if err == nil && devTest {
+				// modify the lava spec for dev tests
+				for idx, spec := range content.Specs {
+					if spec.Index == "LAV1" {
+						utilslib.LavaFormatInfo("modified lava spec time for dev tests")
+						content.Specs[idx].AverageBlockTime = (1 * time.Second).Milliseconds()
+						for collection := range content.Specs[idx].ApiCollections {
+							for verification := range content.Specs[idx].ApiCollections[collection].Verifications {
+								if content.Specs[idx].ApiCollections[collection].Verifications[verification].Name == "chain-id" {
+									content.Specs[idx].ApiCollections[collection].Verifications[verification].Values[0].ExpectedValue = "*"
+								}
+								if content.Specs[idx].ApiCollections[collection].Verifications[verification].Name == "pruning" {
+									content.Specs[idx].ApiCollections[collection].Verifications = append(content.Specs[idx].ApiCollections[collection].Verifications[:verification], content.Specs[idx].ApiCollections[collection].Verifications[verification+1:]...)
+								}
+							}
+						}
+					}
+				}
+			}
+
+			msgAddSpecs := types.NewMsgAddSpecs(from.String(), content.Specs)
+			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msgAddSpecs)
+		},
+	}
+	cmd.Flags().Bool(devTestFlagName, false, "set to true to modify the average block time for lava spec")
+	flags.AddTxFlagsToCmd(cmd)
+	return cmd
+}

x/spec/client/utils/utils.go

@@ -17,15 +17,21 @@ import (
 
 type (
 	SpecAddProposalJSON struct {
-		Proposal types.SpecAddProposal `json:"proposal"`
-		Deposit  string                `json:"deposit" yaml:"deposit"`
+		Title       string       `json:"title"`
+		Description string       `json:"description"`
+		Specs       []types.Spec `json:"specs"`
+	}
+
+	SpecAddProposalWithDepositJSON struct {
+		Proposal SpecAddProposalJSON `json:"proposal"`
+		Deposit  string              `json:"deposit" yaml:"deposit"`
 	}
 )
 
 // Parse spec add proposal JSON form file
-func ParseSpecAddProposalJSON(cdc *codec.LegacyAmino, proposalFile string) (ret SpecAddProposalJSON, err error) {
+func ParseSpecAddProposalJSON(cdc *codec.LegacyAmino, proposalFile string) (ret SpecAddProposalWithDepositJSON, err error) {
 	for _, fileName := range strings.Split(proposalFile, ",") {
-		proposal := SpecAddProposalJSON{}
+		proposal := SpecAddProposalWithDepositJSON{}
 
 		contents, err := os.ReadFile(fileName)
 		if err != nil {

x/spec/keeper/keeper.go

@@ -21,6 +21,7 @@ type (
 		paramstore paramtypes.Subspace
 
 		stakingKeeper types.StakingKeeper
+		authority     string
 	}
 )
 
@@ -30,6 +31,7 @@ func NewKeeper(
 	memKey storetypes.StoreKey,
 	ps paramtypes.Subspace,
 	stakingKeeper types.StakingKeeper,
+	authority string,
 ) *Keeper {
 	// set KeyTable if it has not already been set
 	if !ps.HasKeyTable() {
@@ -42,6 +44,7 @@ func NewKeeper(
 		memKey:        memKey,
 		paramstore:    ps,
 		stakingKeeper: stakingKeeper,
+		authority:     authority,
 	}
 }
 
@@ -50,3 +53,5 @@ func (k Keeper) Logger(ctx sdk.Context) log.Logger {
 }
 
 func (k Keeper) BeginBlock(ctx sdk.Context) {}
+
+func (k Keeper) GetAuthority() string { return k.authority }

x/spec/keeper/migrations.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/store/prefix"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/gogoproto/proto"
 	"github.com/lavanet/lava/x/spec/types"
 	typesv1 "github.com/lavanet/lava/x/spec/types/migrations/v1"
 )
@@ -50,3 +51,10 @@ func (m Migrator) Migrate3to4(ctx sdk.Context) error {
 
 	return nil
 }
+
+func (m Migrator) Migrate4to5(ctx sdk.Context) error {
+	params := m.keeper.GetParams(ctx)
+	params.AllowlistedExpeditedMsgs = append(params.AllowlistedExpeditedMsgs, proto.MessageName(&types.MsgAddSpecs{}))
+	m.keeper.SetParams(ctx, params)
+	return nil
+}