fix(rollappparams): change DRS version from commit to int (#585)

proto/rollappparams/params.proto

@@ -8,6 +8,6 @@ option go_package = "github.com/dymensionxyz/dymension-rdk/x/rollappparams/types
 message Params {
   // data availability type (e.g. celestia) used in the rollapp
   string da = 1;
-  // commit of the version used for the rollapp executable
-  string version = 2;
+  // drs version
+  uint32 drs_version = 2;
 }

testutil/utils/test_app.go

@@ -21,7 +21,6 @@ import (
 	app "github.com/dymensionxyz/dymension-rdk/testutil/app"
 
 	hubgenesistypes "github.com/dymensionxyz/dymension-rdk/x/hub-genesis/types"
-	rollappparamstypes "github.com/dymensionxyz/dymension-rdk/x/rollappparams/types"
 
 	"github.com/stretchr/testify/require"
 
@@ -89,8 +88,6 @@ func setup(withGenesis bool, invCheckPeriod uint) (*app.App, map[string]json.Raw
 		log.NewNopLogger(), db, nil, true, map[int64]bool{}, "/tmp", invCheckPeriod, encCdc, app.GetEnabledProposals(), EmptyAppOptions{}, emptyWasmOpts,
 	)
 	if withGenesis {
-		// override the rollapp version, so we'll have a valid default genesis
-		rollappparamstypes.Version = "5f8393904fb1e9c616fe89f013cafe7501a63f86"
 		return testApp, app.NewDefaultGenesisState(encCdc.Codec)
 	}
 	return testApp, map[string]json.RawMessage{}

x/rollappparams/keeper/genesis_test.go

@@ -15,7 +15,7 @@ func TestGenesis(t *testing.T) {
 
 	state := types.GenesisState{}
 
-	state.Params = types.NewParams("mock", "5f8393904fb1e9c616fe89f013cafe7501a63f86")
+	state.Params = types.NewParams("mock", 1)
 
 	k.InitGenesis(ctx, &state)
 	got := k.ExportGenesis(ctx)

x/rollappparams/keeper/keeper.go

@@ -42,7 +42,7 @@ func (k Keeper) DA(ctx sdk.Context) (res string) {
 	return
 }
 
-func (k Keeper) Version(ctx sdk.Context) (res string) {
+func (k Keeper) Version(ctx sdk.Context) (res uint32) {
 	k.paramSpace.Get(ctx, types.KeyVersion, &res)
 	return
 }

x/rollappparams/types/genesis_test.go

@@ -10,7 +10,7 @@ import (
 
 func TestGenesisState(t *testing.T) {
 
-	testParams := types.NewParams("mock", "5f8393904fb1e9c616fe89f013cafe7501a63f86")
+	testParams := types.NewParams("mock", 1)
 	testCases := []struct {
 		name        string
 		params      func() types.Params
@@ -24,28 +24,10 @@ func TestGenesisState(t *testing.T) {
 			},
 		},
 		{
-			name: "missing version",
+			name: "wrong drs version",
 			params: func() types.Params {
 				p := testParams
-				p.Version = ""
-				return p
-			},
-			expectedErr: true,
-		},
-		{
-			name: "wrong length version",
-			params: func() types.Params {
-				p := testParams
-				p.Version = "fdasfewkq102382w523"
-				return p
-			},
-			expectedErr: true,
-		},
-		{
-			name: "version not alphanumeric",
-			params: func() types.Params {
-				p := testParams
-				p.Version = "3a19edd887_9b576a866750bc9d480ada53d2c0d"
+				p.DrsVersion = 0
 				return p
 			},
 			expectedErr: true,
@@ -56,7 +38,7 @@ func TestGenesisState(t *testing.T) {
 		state := types.NewGenesisState(tc.params())
 		err := types.ValidateGenesis(state)
 		if tc.expectedErr {
-			require.ErrorIs(t, err, gerrc.ErrInvalidArgument)
+			require.Error(t, err, gerrc.ErrInvalidArgument)
 		} else {
 			require.NoError(t, err)
 		}

x/rollappparams/types/params.go

@@ -2,16 +2,14 @@ package types
 
 import (
 	"fmt"
-	"regexp"
 
 	paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
 	"github.com/dymensionxyz/dymint/da/registry"
 	"github.com/dymensionxyz/gerr-cosmos/gerrc"
 )
 
 const (
-	// length of the version commit string.
-	VersionLength = 40
+
 	// Data availability used by the RollApp. Default value used is mock da.
 	DefaultDA = "mock"
 )
@@ -20,12 +18,8 @@ const (
 var (
 	KeyDa      = []byte("da")
 	KeyVersion = []byte("version")
-
-	// git commit for the version used for the rollapp binary. it must be overwritten in the build process
-	Version = "<version>"
-	// default max block size accepted (equivalent to block max size it can fit into a celestia blob).
-	// regexp used to validate version commit
-	VersionRegExp = regexp.MustCompile(`^[a-z0-9]*$`)
+	// Default version set
+	DrsVersion = uint32(1)
 )
 
 func ParamKeyTable() paramtypes.KeyTable {
@@ -35,19 +29,19 @@ func ParamKeyTable() paramtypes.KeyTable {
 // NewParams creates a new Params object
 func NewParams(
 	da string,
-	version string,
+	drsVersion uint32,
 ) Params {
 	return Params{
-		Da:      da,
-		Version: version,
+		Da:         da,
+		DrsVersion: drsVersion,
 	}
 }
 
 // DefaultParams returns default x/rollappparams module parameters.
 func DefaultParams() Params {
 	return Params{
-		Da:      DefaultDA,
-		Version: Version,
+		Da:         DefaultDA,
+		DrsVersion: DrsVersion,
 	}
 }
 
@@ -56,10 +50,11 @@ func (p Params) Validate() error {
 	if err != nil {
 		return err
 	}
-	err = ValidateVersion(p.Version)
+	err = ValidateVersion(p.DrsVersion)
 	if err != nil {
 		return err
 	}
+
 	return nil
 }
 
@@ -73,25 +68,22 @@ func ValidateDa(i any) error {
 }
 
 func ValidateVersion(i any) error {
-
-	version, ok := i.(string)
+	version, ok := i.(uint32)
 	if !ok {
 		return fmt.Errorf("invalid version type param type: %w", gerrc.ErrInvalidArgument)
 	}
-	if len(version) != VersionLength {
-		return fmt.Errorf("invalid version length: param length: %d accepted: %d: %w", len(version), VersionLength, gerrc.ErrInvalidArgument)
-	}
-	if !VersionRegExp.MatchString(version) {
-		return fmt.Errorf("invalid version: it must be alphanumeric %w", gerrc.ErrInvalidArgument)
+	if version <= 0 {
+		return fmt.Errorf("invalid DRS version: Version must be positive")
 	}
 
 	return nil
+
 }
 
 // Implements params.ParamSet.
 func (p *Params) ParamSetPairs() paramtypes.ParamSetPairs {
 	return paramtypes.ParamSetPairs{
 		paramtypes.NewParamSetPair(KeyDa, &p.Da, ValidateDa),
-		paramtypes.NewParamSetPair(KeyVersion, &p.Version, ValidateVersion),
+		paramtypes.NewParamSetPair(KeyVersion, &p.DrsVersion, ValidateVersion),
 	}
 }