From dfd8bcff846cba8d566904e8c9668f2ec222e5fa Mon Sep 17 00:00:00 2001 From: Nishant Das Date: Mon, 6 Mar 2023 17:56:53 +0800 Subject: [PATCH 1/4] Remove Feature Flag From Prater (#12082) --- config/features/config.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/config/features/config.go b/config/features/config.go index 02cc1703ebfa..e444f7df2f57 100644 --- a/config/features/config.go +++ b/config/features/config.go @@ -147,9 +147,6 @@ func configureTestnet(ctx *cli.Context) error { // Insert feature flags within the function to be enabled for Prater testnet. func applyPraterFeatureFlags(ctx *cli.Context) { - if err := ctx.Set(SaveFullExecutionPayloads.Names()[0], "true"); err != nil { - log.WithError(err).Debug("error enabling save full execution payloads flag") - } } // Insert feature flags within the function to be enabled for Sepolia testnet. From e2fa7d40e3f496416283cc1d329a8ff6c048cb8a Mon Sep 17 00:00:00 2001 From: Potuz Date: Mon, 6 Mar 2023 18:42:47 -0300 Subject: [PATCH 2/4] Use Epoch boundary cache to retrieve balances (#12083) * Use Epoch boundary cache to retrieve balances * save boundary states before inserting to forkchoice * move up last block save * remove boundary checks on balances * fix ordering --------- Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com> --- beacon-chain/blockchain/process_block.go | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/beacon-chain/blockchain/process_block.go b/beacon-chain/blockchain/process_block.go index fdf18f313a0b..5174dbb3ca2c 100644 --- a/beacon-chain/blockchain/process_block.go +++ b/beacon-chain/blockchain/process_block.go @@ -447,12 +447,22 @@ func (s *Service) onBlockBatch(ctx context.Context, blks []interfaces.ReadOnlySi } } } + // Save boundary states that will be useful for forkchoice + for r, st := range boundaries { + if err := s.cfg.StateGen.SaveState(ctx, r, st); err != nil { + return err + } + } + // Also saves the last post state which to be used as pre state for the next batch. + lastBR := blockRoots[len(blks)-1] + if err := s.cfg.StateGen.SaveState(ctx, lastBR, preState); err != nil { + return err + } // Insert all nodes but the last one to forkchoice if err := s.cfg.ForkChoiceStore.InsertChain(ctx, pendingNodes); err != nil { return errors.Wrap(err, "could not insert batch to forkchoice") } // Insert the last block to forkchoice - lastBR := blockRoots[len(blks)-1] if err := s.cfg.ForkChoiceStore.InsertNode(ctx, preState, lastBR); err != nil { return errors.Wrap(err, "could not insert last block in batch to forkchoice") } @@ -462,17 +472,7 @@ func (s *Service) onBlockBatch(ctx context.Context, blks []interfaces.ReadOnlySi return errors.Wrap(err, "could not set optimistic block to valid") } } - - for r, st := range boundaries { - if err := s.cfg.StateGen.SaveState(ctx, r, st); err != nil { - return err - } - } - // Also saves the last post state which to be used as pre state for the next batch. lastB := blks[len(blks)-1] - if err := s.cfg.StateGen.SaveState(ctx, lastBR, preState); err != nil { - return err - } arg := ¬ifyForkchoiceUpdateArg{ headState: preState, headRoot: lastBR, From a330ebf9be155110a42f1a4096fafb69c84ed11f Mon Sep 17 00:00:00 2001 From: ethfanWilliam Date: Mon, 1 Jul 2024 20:27:54 +0400 Subject: [PATCH 3/4] chore: fix unfound image --- runtime/logging/logrus-prefixed-formatter/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/logging/logrus-prefixed-formatter/README.md b/runtime/logging/logrus-prefixed-formatter/README.md index cf15699db6cd..d3811b033626 100644 --- a/runtime/logging/logrus-prefixed-formatter/README.md +++ b/runtime/logging/logrus-prefixed-formatter/README.md @@ -6,7 +6,7 @@ Originally from [github.com/x-cray/logrus-prefixed-formatter(https://github.com/ modified colored output and support for log entry prefixes, e.g. message source followed by a colon. In addition, custom color themes are supported. -![Formatter screenshot](http://cl.ly/image/1w0B3F233F3z/formatter-screenshot@2x.png) +![Formatter screenshot](https://camo.githubusercontent.com/3177c4e5657f79815e562c79c07469374a68b837e0e7fee919675adcd7f499e6/687474703a2f2f692e696d6775722e636f6d2f505937714d77642e706e67) Just like with the original `logrus.TextFormatter` when a TTY is not attached, the output is compatible with the [logfmt](http://godoc.org/github.com/kr/logfmt) format: From 731827a23e031ca27bab712c2f1999c9315b08d2 Mon Sep 17 00:00:00 2001 From: ethfanWilliam Date: Sun, 21 Jul 2024 22:22:08 +0400 Subject: [PATCH 4/4] fix link --- runtime/logging/logrus-prefixed-formatter/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/logging/logrus-prefixed-formatter/README.md b/runtime/logging/logrus-prefixed-formatter/README.md index d3811b033626..e51b5d2e0f1b 100644 --- a/runtime/logging/logrus-prefixed-formatter/README.md +++ b/runtime/logging/logrus-prefixed-formatter/README.md @@ -6,7 +6,7 @@ Originally from [github.com/x-cray/logrus-prefixed-formatter(https://github.com/ modified colored output and support for log entry prefixes, e.g. message source followed by a colon. In addition, custom color themes are supported. -![Formatter screenshot](https://camo.githubusercontent.com/3177c4e5657f79815e562c79c07469374a68b837e0e7fee919675adcd7f499e6/687474703a2f2f692e696d6775722e636f6d2f505937714d77642e706e67) +![Formatter screenshot](http://i.imgur.com/PY7qMwd.png) Just like with the original `logrus.TextFormatter` when a TTY is not attached, the output is compatible with the [logfmt](http://godoc.org/github.com/kr/logfmt) format: