From b65689d7334cfaa8e1289c3ed97d2f08eded610d Mon Sep 17 00:00:00 2001 From: itsdevbear Date: Fri, 28 Jun 2024 14:24:31 -0400 Subject: [PATCH] feat(bartio): Update configs --- mod/beacon/blockchain/receive.go | 6 +++--- mod/beacon/validator/block_builder.go | 6 +----- mod/da/pkg/da/service.go | 6 +++--- mod/node-core/pkg/components/availability_store.go | 2 +- mod/payload/pkg/builder/payload.go | 4 ++-- testing/networks/80084/app.toml | 2 +- testing/networks/80084/config.toml | 4 ++-- 7 files changed, 13 insertions(+), 17 deletions(-) diff --git a/mod/beacon/blockchain/receive.go b/mod/beacon/blockchain/receive.go index a73b4dc42c..4f3ecede1f 100644 --- a/mod/beacon/blockchain/receive.go +++ b/mod/beacon/blockchain/receive.go @@ -60,13 +60,13 @@ func (s *Service[ // If the block is nil or a nil pointer, exit early. if blk.IsNil() { s.logger.Warn( - "Aborting block verification - beacon block not found in proposal 🚫", + "Aborting block verification - beacon block not found in proposal", ) return errors.WrapNonFatal(ErrNilBlk) } s.logger.Info( - "Received incoming beacon block πŸ“«", + "Received incoming beacon block", "state_root", blk.GetStateRoot(), ) @@ -96,7 +96,7 @@ func (s *Service[ } s.logger.Info( - "State root verification succeeded - accepting incoming beacon block 🏎️ ", + "State root verification succeeded - accepting incoming beacon block", "state_root", blk.GetStateRoot(), ) diff --git a/mod/beacon/validator/block_builder.go b/mod/beacon/validator/block_builder.go index b1a1cf38f4..b24c7a146a 100644 --- a/mod/beacon/validator/block_builder.go +++ b/mod/beacon/validator/block_builder.go @@ -50,10 +50,6 @@ func (s *Service[ ) defer s.metrics.measureRequestBlockForProposalTime(startTime) - s.logger.Info( - "Requesting beacon block assembly πŸ™ˆ", - "slot", requestedSlot.Base10(), - ) // The goal here is to acquire a payload whose parent is the previously // finalized block, such that, if this payload is accepted, it will be @@ -121,7 +117,7 @@ func (s *Service[ } s.logger.Info( - "Beacon block successfully built πŸ› οΈ ", + "Beacon block successfully built", "slot", requestedSlot.Base10(), "state_root", blk.GetStateRoot(), "duration", time.Since(startTime).String(), diff --git a/mod/da/pkg/da/service.go b/mod/da/pkg/da/service.go index 9340261361..b3cb234c57 100644 --- a/mod/da/pkg/da/service.go +++ b/mod/da/pkg/da/service.go @@ -191,20 +191,20 @@ func (s *Service[_, _, BlobSidecarsT, _, _]) receiveSidecars( } s.logger.Info( - "Received incoming blob sidecars πŸš”", + "Received incoming blob sidecars", ) // Verify the blobs and ensure they match the local state. if err := s.bp.VerifySidecars(sidecars); err != nil { s.logger.Error( - "rejecting incoming blob sidecars ❌", + "rejecting incoming blob sidecars", "reason", err, ) return err } s.logger.Info( - "Blob sidecars verification succeeded - accepting incoming blob sidecars πŸ’¦", + "Blob sidecars verification succeeded - accepting incoming blob sidecars", "num_blobs", sidecars.Len(), ) diff --git a/mod/node-core/pkg/components/availability_store.go b/mod/node-core/pkg/components/availability_store.go index 5231576d0b..f32fd36ec1 100644 --- a/mod/node-core/pkg/components/availability_store.go +++ b/mod/node-core/pkg/components/availability_store.go @@ -65,7 +65,7 @@ func ProvideAvailibilityStore[ filedb.WithLogger(in.Logger), ), ), - in.Logger.With("service", "beacon-kit.da.store"), + in.Logger.With("service", "da-store"), in.ChainSpec, ), nil } diff --git a/mod/payload/pkg/builder/payload.go b/mod/payload/pkg/builder/payload.go index cb06623012..5dd84159ad 100644 --- a/mod/payload/pkg/builder/payload.go +++ b/mod/payload/pkg/builder/payload.go @@ -204,7 +204,7 @@ func (pb *PayloadBuilder[ args = append(args, "num_blobs", len(blobsBundle.GetBlobs())) } - pb.logger.Info("Payload retrieved from local builder πŸ—οΈ ", args...) + pb.logger.Info("Payload retrieved from local builder", args...) // If the payload was built by a different builder, something is // wrong the EL<>CL setup. @@ -238,7 +238,7 @@ func (pb *PayloadBuilder[ } pb.logger.Info( - "Sending startup forkchoice update to execution client πŸš€ ", + "Sending startup forkchoice update to execution client", "head_eth1_hash", lph.GetBlockHash(), "safe_eth1_hash", lph.GetParentHash(), "finalized_eth1_hash", lph.GetParentHash(), diff --git a/testing/networks/80084/app.toml b/testing/networks/80084/app.toml index d2fe1ba815..bdc7f99795 100644 --- a/testing/networks/80084/app.toml +++ b/testing/networks/80084/app.toml @@ -278,7 +278,7 @@ suggested-fee-recipient = "0x0000000000000000000000000000000000000000" # The timeout for local build payload. This should match, or be slightly less # than the configured timeout on your execution client. It also must be less than # timeout_proposal in the CometBFT configuration. -payload-timeout = "1.1s" +payload-timeout = "1s" [beacon-kit.validator] # Graffiti string that will be included in the graffiti field of the beacon block. diff --git a/testing/networks/80084/config.toml b/testing/networks/80084/config.toml index 02b5d82ab7..f66173f6a3 100644 --- a/testing/networks/80084/config.toml +++ b/testing/networks/80084/config.toml @@ -453,7 +453,7 @@ version = "v0" wal_file = "data/cs.wal/wal" # How long we wait for a proposal block before prevoting nil -timeout_propose = "1.5s" +timeout_propose = "1.25s" # How much timeout_propose increases with each round timeout_propose_delta = "500ms" # How long we wait after receiving +2/3 prevotes for β€œanything” (ie. not a single block or nil) @@ -468,7 +468,7 @@ timeout_precommit_delta = "500ms" # height (this gives us a chance to receive some more precommits, even # though we already have +2/3). # Set to 0 if you want to make progress as soon as the node has all the precommits. -timeout_commit = "1s" +timeout_commit = "750ms" # Deprecated: set `timeout_commit` to 0 instead. skip_timeout_commit = false