chore: Add param update support for uint64

pokt-network · Oct 7, 2024 · 0cda3f7 · 0cda3f7
1 parent 50ea8ed
commit 0cda3f7
Show file tree

Hide file tree

Showing 15 changed files with 417 additions and 418 deletions.
diff --git a/api/poktroll/application/tx.pulsar.go b/api/poktroll/application/tx.pulsar.go
diff --git a/api/poktroll/shared/tx.pulsar.go b/api/poktroll/shared/tx.pulsar.go
diff --git a/proto/poktroll/application/tx.proto b/proto/poktroll/application/tx.proto
@@ -103,8 +103,8 @@ message MsgUpdateParam {
 
   string name = 2;
   oneof asType    {
-    int64 as_int64 = 3;
-    cosmos.base.v1beta1.Coin as_coin = 4;
+    uint64 as_uint64 = 3 [(gogoproto.jsontag) = "as_uint64"];
+    cosmos.base.v1beta1.Coin as_coin = 4 [(gogoproto.jsontag) = "as_coin"];
   };
 }
 

diff --git a/proto/poktroll/shared/tx.proto b/proto/poktroll/shared/tx.proto
@@ -48,7 +48,7 @@ message MsgUpdateParam {
   string name      = 2;
   oneof as_type {
     string as_string = 3 [(gogoproto.jsontag) = "as_string"];
-    int64 as_int64 = 6 [(gogoproto.jsontag) = "as_int64"];
+    uint64 as_uint64 = 6 [(gogoproto.jsontag) = "as_uint64"];
     bytes as_bytes = 7 [(gogoproto.jsontag) = "as_bytes"];
   }
 }

diff --git a/testutil/integration/suites/param_configs.go b/testutil/integration/suites/param_configs.go
@@ -81,9 +81,7 @@ var (
 			QueryParamsResponse:     sharedtypes.QueryParamsResponse{},
 		},
 		ParamTypes: map[ParamType]any{
-			// TODO_IMPROVE: Add a Uint64 asType instead of using int64 for uint64 params.
-			ParamTypeUint64: sharedtypes.MsgUpdateParam_AsInt64{},
-			ParamTypeInt64:  sharedtypes.MsgUpdateParam_AsInt64{},
+			ParamTypeUint64: sharedtypes.MsgUpdateParam_AsUint64{},
 			ParamTypeString: sharedtypes.MsgUpdateParam_AsString{},
 			ParamTypeBytes:  sharedtypes.MsgUpdateParam_AsBytes{},
 		},
@@ -147,8 +145,7 @@ var (
 			MinStake:             &ValidActorMinStake,
 		},
 		ParamTypes: map[ParamType]any{
-			// TODO_IMPROVE: Add a Uint64 asType instead of using int64 for uint64 params.
-			ParamTypeUint64: apptypes.MsgUpdateParam_AsInt64{},
+			ParamTypeUint64: apptypes.MsgUpdateParam_AsUint64{},
 			ParamTypeCoin:   apptypes.MsgUpdateParam_AsCoin{},
 		},
 		DefaultParams:    apptypes.DefaultParams(),

diff --git a/testutil/integration/suites/update_params.go b/testutil/integration/suites/update_params.go
@@ -241,7 +241,7 @@ func (s *ParamsSuite) RunUpdateParamAsSigner(
 	switch paramType {
 	case ParamTypeUint64:
 		// NB: MsgUpdateParam doesn't currently support uint64 param type.
-		msgAsTypeValue.Elem().FieldByName("AsInt64").SetInt(int64(paramReflectValue.Interface().(uint64)))
+		msgAsTypeValue.Elem().FieldByName("AsUint64").Set(paramReflectValue)
 	case ParamTypeInt64:
 		msgAsTypeValue.Elem().FieldByName("AsInt64").Set(paramReflectValue)
 	case ParamTypeFloat32:

diff --git a/x/application/keeper/msg_server_update_param.go b/x/application/keeper/msg_server_update_param.go
@@ -20,10 +20,10 @@ func (k msgServer) UpdateParam(ctx context.Context, msg *apptypes.MsgUpdateParam
 	switch msg.Name {
 	// TODO_IMPROVE: Add a Uint64 asType instead of using int64 for uint64 params.
 	case apptypes.ParamMaxDelegatedGateways:
-		if _, ok := msg.AsType.(*apptypes.MsgUpdateParam_AsInt64); !ok {
+		if _, ok := msg.AsType.(*apptypes.MsgUpdateParam_AsUint64); !ok {
 			return nil, apptypes.ErrAppParamInvalid.Wrapf("unsupported value type for %s param: %T", msg.Name, msg.AsType)
 		}
-		maxDelegatedGateways := uint64(msg.GetAsInt64())
+		maxDelegatedGateways := msg.GetAsUint64()
 
 		if err := apptypes.ValidateMaxDelegatedGateways(maxDelegatedGateways); err != nil {
 			return nil, apptypes.ErrAppParamInvalid.Wrapf("maxdelegegated_gateways (%d): %v", maxDelegatedGateways, err)

diff --git a/x/application/keeper/msg_server_update_param_test.go b/x/application/keeper/msg_server_update_param_test.go
@@ -28,7 +28,7 @@ func TestMsgUpdateParam_UpdateMaxDelegatedGatewaysOnly(t *testing.T) {
 	updateParamMsg := &apptypes.MsgUpdateParam{
 		Authority: authtypes.NewModuleAddress(govtypes.ModuleName).String(),
 		Name:      apptypes.ParamMaxDelegatedGateways,
-		AsType:    &apptypes.MsgUpdateParam_AsInt64{AsInt64: int64(expectedMaxDelegatedGateways)},
+		AsType:    &apptypes.MsgUpdateParam_AsUint64{AsUint64: expectedMaxDelegatedGateways},
 	}
 	res, err := msgSrv.UpdateParam(ctx, updateParamMsg)
 	require.NoError(t, err)

diff --git a/x/application/types/message_update_param.go b/x/application/types/message_update_param.go
@@ -15,7 +15,7 @@ func NewMsgUpdateParam(authority string, name string, asType any) *MsgUpdatePara
 
 	switch t := asType.(type) {
 	case uint64:
-		asTypeIface = &MsgUpdateParam_AsInt64{AsInt64: int64(t)}
+		asTypeIface = &MsgUpdateParam_AsUint64{AsUint64: t}
 	case *cosmostypes.Coin:
 		asTypeIface = &MsgUpdateParam_AsCoin{AsCoin: t}
 	default:
@@ -52,10 +52,10 @@ func (msg *MsgUpdateParam) ValidateBasic() error {
 }
 
 func (msg *MsgUpdateParam) paramTypeIsUint64() error {
-	if _, ok := msg.AsType.(*MsgUpdateParam_AsInt64); !ok {
+	if _, ok := msg.AsType.(*MsgUpdateParam_AsUint64); !ok {
 		return ErrAppParamInvalid.Wrapf(""+
 			"invalid type for param %q; expected %T, got %T",
-			msg.Name, &MsgUpdateParam_AsInt64{}, msg.AsType,
+			msg.Name, &MsgUpdateParam_AsUint64{}, msg.AsType,
 		)
 	}
 	return nil

diff --git a/x/application/types/tx.pb.go b/x/application/types/tx.pb.go