Record net value asset only when explicitly set

by user when adding marker #2030

.changelog/unreleased/improvements/2030-explicit-navs.md

@@ -0,0 +1 @@
+* Only set a NAV record when explicitly provided. [#2030](https://github.com/provenance-io/provenance/issues/2030).

x/marker/keeper/marker.go

@@ -447,9 +447,6 @@ func (k Keeper) FinalizeMarker(ctx sdk.Context, caller sdk.Address, denom string
 	if err != nil {
 		return err
 	}
-	if len(navs) == 0 {
-		return fmt.Errorf("marker %v does not have any net asset values assigned", denom)
-	}
 
 	// transition to finalized state ... then to active once mint is complete
 	if err = m.SetStatus(types.StatusFinalized); err != nil {

x/marker/keeper/msg_server.go

@@ -114,12 +114,17 @@ func (k msgServer) AddMarker(goCtx context.Context, msg *types.MsgAddMarkerReque
 		return nil, sdkerrors.ErrInvalidRequest.Wrap(err.Error())
 	}
 
-	usdMills := sdkmath.NewIntFromUint64(msg.UsdMills)
-	nav := types.NewNetAssetValue(sdk.NewCoin(types.UsdDenom, usdMills), msg.Volume)
-	err = k.AddSetNetAssetValues(ctx, ma, []types.NetAssetValue{nav}, types.ModuleName)
-	if err != nil {
-		return nil, sdkerrors.ErrInvalidRequest.Wrap(err.Error())
+	// Only create a NAV entry if an explicit value is given for a NAV.  If a zero value is desired this can be set explicitly in a followup call.
+	// This check prevents a proliferation of incorrect NAV entries being recorded when setting up markers.
+	if msg.UsdMills > 0 {
+		usdMills := sdkmath.NewIntFromUint64(msg.UsdMills)
+		nav := types.NewNetAssetValue(sdk.NewCoin(types.UsdDenom, usdMills), msg.Volume)
+		err = k.AddSetNetAssetValues(ctx, ma, []types.NetAssetValue{nav}, types.ModuleName)
+		if err != nil {
+			return nil, sdkerrors.ErrInvalidRequest.Wrap(err.Error())
+		}
 	}
+
 	// Note: The status can only be Active if this is being done via gov prop.
 	if ma.Status == types.StatusActive {
 		// Active markers should have supply set.
@@ -517,10 +522,14 @@ func (k msgServer) AddFinalizeActivateMarker(goCtx context.Context, msg *types.M
 		normalizedReqAttrs,
 	)
 
-	usdMills := sdkmath.NewIntFromUint64(msg.UsdMills)
-	err = k.AddSetNetAssetValues(ctx, ma, []types.NetAssetValue{types.NewNetAssetValue(sdk.NewCoin(types.UsdDenom, usdMills), msg.Volume)}, types.ModuleName)
-	if err != nil {
-		return nil, sdkerrors.ErrInvalidRequest.Wrap(err.Error())
+	// Only create a NAV entry if an explicit value is given for a NAV.  If a zero value is desired this can be set explicitly in a followup call.
+	// This check prevents a proliferation of incorrect NAV entries being recorded when setting up markers.
+	if msg.UsdMills > 0 {
+		usdMills := sdkmath.NewIntFromUint64(msg.UsdMills)
+		err = k.AddSetNetAssetValues(ctx, ma, []types.NetAssetValue{types.NewNetAssetValue(sdk.NewCoin(types.UsdDenom, usdMills), msg.Volume)}, types.ModuleName)
+		if err != nil {
+			return nil, sdkerrors.ErrInvalidRequest.Wrap(err.Error())
+		}
 	}
 
 	if err := k.Keeper.AddFinalizeAndActivateMarker(ctx, ma); err != nil {

x/marker/keeper/msg_server_test.go

@@ -108,12 +108,6 @@ func (s *MsgServerTestSuite) TestMsgAddMarkerRequest() {
 					Manager:    s.owner1,
 					MarkerType: types.MarkerType_Coin.String(),
 				},
-				&types.EventSetNetAssetValue{
-					Denom:  denom,
-					Price:  "0usd",
-					Volume: "0",
-					Source: types.ModuleName,
-				},
 			},
 		},
 		{
@@ -212,12 +206,6 @@ func (s *MsgServerTestSuite) TestMsgAddMarkerRequest() {
 					Manager:    s.owner1,
 					MarkerType: types.MarkerType_Coin.String(),
 				},
-				&types.EventSetNetAssetValue{
-					Denom:  denomWithDashPeriod,
-					Price:  "0usd",
-					Volume: "0",
-					Source: types.ModuleName,
-				},
 			},
 		},
 		{
@@ -242,12 +230,6 @@ func (s *MsgServerTestSuite) TestMsgAddMarkerRequest() {
 					Manager:    s.owner1,
 					MarkerType: types.MarkerType_RestrictedCoin.String(),
 				},
-				&types.EventSetNetAssetValue{
-					Denom:  rdenom,
-					Price:  "0usd",
-					Volume: "0",
-					Source: types.ModuleName,
-				},
 			},
 		},
 	}
@@ -311,11 +293,6 @@ func (s *MsgServerTestSuite) TestMsgFinalizeMarkerRequest() {
 		msg    types.MsgFinalizeRequest
 		expErr string
 	}{
-		{
-			name:   "marker does not have net asset value",
-			msg:    types.MsgFinalizeRequest{Denom: noNavMarker.Denom, Administrator: authUser.String()},
-			expErr: "marker nonav does not have any net asset values assigned: invalid request",
-		},
 		{
 			name: "successfully finalize",
 			msg:  types.MsgFinalizeRequest{Denom: validMarker.Denom, Administrator: authUser.String()},

x/metadata/keeper/msg_server.go

@@ -46,11 +46,16 @@ func (k msgServer) WriteScope(
 		return nil, sdkerrors.ErrInvalidRequest.Wrap(err.Error())
 	}
 
-	usdMills := sdkmath.NewIntFromUint64(msg.UsdMills)
-	nav := types.NewNetAssetValue(sdk.NewCoin(types.UsdDenom, usdMills), 1)
-	err := k.AddSetNetAssetValues(ctx, msg.Scope.ScopeId, []types.NetAssetValue{nav}, types.ModuleName)
-	if err != nil {
-		return nil, sdkerrors.ErrInvalidRequest.Wrap(err.Error())
+	// Do not set a NAV entry at this time unless a value greater than zero is specified.  This avoids the common case of
+	// not having a NAV entry value at hand during a scope write request.  A zero value can still be set explicitly with
+	// an add NAV call made separately.
+	if msg.UsdMills > 0 {
+		usdMills := sdkmath.NewIntFromUint64(msg.UsdMills)
+		nav := types.NewNetAssetValue(sdk.NewCoin(types.UsdDenom, usdMills), 1)
+		err := k.AddSetNetAssetValues(ctx, msg.Scope.ScopeId, []types.NetAssetValue{nav}, types.ModuleName)
+		if err != nil {
+			return nil, sdkerrors.ErrInvalidRequest.Wrap(err.Error())
+		}
 	}
 
 	k.SetScope(ctx, msg.Scope)