add switch to add proofs to blocks (#278)

Author: gballet

consensus/beacon/consensus.go

@@ -391,7 +391,7 @@ func (beacon *Beacon) FinalizeAndAssemble(chain consensus.ChainHeaderReader, hea
 		k    verkle.StateDiff
 		keys = state.Witness().Keys()
 	)
-	if chain.Config().IsPrague(header.Number, header.Time) {
+	if chain.Config().IsPrague(header.Number, header.Time) && chain.Config().ProofInBlock {
 		// Open the pre-tree to prove the pre-state against
 		parent := chain.GetHeaderByNumber(header.Number.Uint64() - 1)
 		if parent == nil {
@@ -441,7 +441,9 @@ func (beacon *Beacon) FinalizeAndAssemble(chain consensus.ChainHeaderReader, hea
 
 	// Assemble and return the final block.
 	block := types.NewBlockWithWithdrawals(header, txs, uncles, receipts, withdrawals, trie.NewStackTrie(nil))
-	block.SetVerkleProof(p, k)
+	if chain.Config().IsPrague(header.Number, header.Time) && chain.Config().ProofInBlock {
+		block.SetVerkleProof(p, k)
+	}
 	return block, nil
 }
 

core/state_processor_test.go

@@ -454,6 +454,7 @@ func TestProcessVerkle(t *testing.T) {
 			PragueTime:                    u64(0),
 			TerminalTotalDifficulty:       common.Big0,
 			TerminalTotalDifficultyPassed: true,
+			ProofInBlock:                  true,
 		}
 		signer     = types.LatestSigner(config)
 		testKey, _ = crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291")

params/config.go

@@ -299,6 +299,9 @@ type ChainConfig struct {
 	Ethash    *EthashConfig `json:"ethash,omitempty"`
 	Clique    *CliqueConfig `json:"clique,omitempty"`
 	IsDevMode bool          `json:"isDev,omitempty"`
+
+	// Proof in block
+	ProofInBlock bool `json:"proofInBlock,omitempty"`
 }
 
 // EthashConfig is the consensus engine configs for proof-of-work based sealing.