nanopb: fix system header includes

Use code generation to include the Firedancer integration header
instead of adding project-wide compiler flags.

config/base.mk

@@ -1,7 +1,7 @@
 BASEDIR?=build
 
 SHELL:=bash
-CPPFLAGS:=-isystem ./opt/include -DFD_LOG_UNCLEAN_EXIT=1 -DFD_HAS_BACKTRACE=0 -DPB_SYSTEM_HEADER="\"pb_firedancer.h\""
+CPPFLAGS:=-isystem ./opt/include -DFD_LOG_UNCLEAN_EXIT=1 -DFD_HAS_BACKTRACE=0
 CC:=gcc
 CFLAGS:=-std=c17
 CXX:=g++

src/flamenco/nanopb/README.txt

@@ -1,10 +1,13 @@
 This directory contains a copy of the Nanopb library.
 
 This library is copied exactly from commit `839156b`, and there are
-no Firedancer specific modifications to the code.  `pb_firedancer.h`
-has a few Firedancer specific #defines, which are loaded into the
-library by #define'ing the `PB_SYSTEM_HEADER` to it as part of our
-build.  You should not make local modifications to nanopb.  instead
-prefer to upstream changes, or make a local patch if needed.
+no Firedancer specific modifications to the code.  You should not make
+local modifications to nanopb.  Instead prefer to upstream changes, or
+make a local patch if needed.
 
 For licensing information, refer to NOTICE in the root of this repo.
+
+nanopb_generator.py can be invoked like so:
+
+  cd src/flamenco/types
+  nanopb_generator.py -L "" fd_solana_block.proto

src/flamenco/nanopb/pb_firedancer.h

@@ -1,3 +1,10 @@
+#ifndef HEADER_fd_src_flamenco_nanopb_pb_firedancer_h
+#define HEADER_fd_src_flamenco_nanopb_pb_firedancer_h
+
+#ifdef PB_H_INCLUDED
+#error "Only include pb_firedancer.h"
+#endif
+
 #include <stdint.h>
 #include <stddef.h>
 #include <stdbool.h>
@@ -10,3 +17,7 @@
 #define PB_BUFFER_ONLY
 #define PB_FIELD_32BIT 1
 #define PB_ENABLE_MALLOC 1
+
+#include "pb.h"
+
+#endif /* HEADER_fd_src_flamenco_nanopb_pb_firedancer_h */

src/flamenco/types/fd_solana_block.pb.h

@@ -1,9 +1,10 @@
 /* Automatically generated nanopb header */
 /* Generated by nanopb-0.4.8-dev */
 
-#ifndef PB_SOLANA_STORAGE_CONFIRMEDBLOCK_SRC_FLAMENCO_TYPES_FD_SOLANA_BLOCK_PB_H_INCLUDED
-#define PB_SOLANA_STORAGE_CONFIRMEDBLOCK_SRC_FLAMENCO_TYPES_FD_SOLANA_BLOCK_PB_H_INCLUDED
-#include "../nanopb/pb.h"
+#ifndef PB_SOLANA_STORAGE_CONFIRMEDBLOCK_FD_SOLANA_BLOCK_PB_H_INCLUDED
+#define PB_SOLANA_STORAGE_CONFIRMEDBLOCK_FD_SOLANA_BLOCK_PB_H_INCLUDED
+
+#include "../nanopb/pb_firedancer.h"
 
 #if PB_PROTO_HEADER_VERSION != 40
 #error Regenerate this file with the current version of nanopb generator.

src/flamenco/types/fd_solana_block.proto

@@ -50,6 +50,7 @@ package solana.storage.ConfirmedBlock;
 
 import "nanopb.proto";
 option (nanopb_fileopt).package = "fd_solblock";
+option (nanopb_fileopt).include = "../nanopb/pb_firedancer.h";
 
 // Transaction related