tendermint/apps/roothash: fix restoring state

go/consensus/tendermint/apps/roothash/roothash.go

@@ -385,9 +385,18 @@ func (app *rootHashApplication) onNewRuntime(ctx *abci.Context, runtime *registr
 	// Create genesis block.
 	now := ctx.Now().Unix()
 	genesisBlock := block.NewGenesisBlock(runtime.ID, uint64(now))
-	genesisBlock.Header.Round = runtime.Genesis.Round
-	if !runtime.Genesis.StateRoot.IsEmpty() {
+	// Fill the Header fields with Genesis runtime states, if this was called during InitChain().
+	if ctx.IsInitChain() {
+		genesisRts := genesis.RuntimeStates[runtime.ID]
+		if genesisRts != nil {
+			genesisBlock.Header.Round = genesisRts.Round
+			genesisBlock.Header.StateRoot = genesisRts.StateRoot
+			genesisBlock.Header.StorageSignatures = []signature.Signature{runtime.Genesis.StorageReceipt}
+		}
+	} else {
+		genesisBlock.Header.Round = runtime.Genesis.Round
 		genesisBlock.Header.StateRoot = runtime.Genesis.StateRoot
+		genesisBlock.Header.StorageSignatures = []signature.Signature{runtime.Genesis.StorageReceipt}
 	}
 
 	// Create new state containing the genesis block.