From a1f637f99041fdbe47ca441cb0b784e30bed8dbc Mon Sep 17 00:00:00 2001
From: Edgar Aroutiounian <edgar.factorial@gmail.com>
Date: Thu, 21 Nov 2019 11:01:20 -0800
Subject: [PATCH] [staking] Undo bad merge from master

---
 staking/types/validator.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/staking/types/validator.go b/staking/types/validator.go
index 6c87d2620..c2333060f 100644
--- a/staking/types/validator.go
+++ b/staking/types/validator.go
@@ -236,10 +236,11 @@ func CreateValidatorFromNewMsg(val *CreateValidator, blockNum *big.Int) (*Valida
 	commission := Commission{val.CommissionRates, blockNum}
 	pubKeys := []shard.BlsPublicKey{}
 	pubKeys = append(pubKeys, val.SlotPubKeys...)
+	// TODO: a new validator should have a minimum of 1 token as self delegation, and that should be added as a delegation entry here.
 	v := Validator{
 		val.ValidatorAddress, pubKeys,
 		val.Amount, new(big.Int), val.MinSelfDelegation, val.MaxTotalDelegation, false,
-		commission, desc, big.NewInt(0),
+		commission, desc, blockNum,
 	}
 	return &v, nil
 }