diff --git a/core/blockchain.go b/core/blockchain.go index 88dbeb6a68..cc6a980be9 100644 --- a/core/blockchain.go +++ b/core/blockchain.go @@ -33,15 +33,11 @@ import ( "sync/atomic" "time" - "go.opentelemetry.io/otel/attribute" - "go.opentelemetry.io/otel/trace" - "github.com/ethereum/go-ethereum" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/lru" "github.com/ethereum/go-ethereum/common/mclock" "github.com/ethereum/go-ethereum/common/prque" - "github.com/ethereum/go-ethereum/common/tracing" "github.com/ethereum/go-ethereum/consensus" "github.com/ethereum/go-ethereum/core/blockstm" "github.com/ethereum/go-ethereum/core/rawdb" @@ -1779,77 +1775,34 @@ func (bc *BlockChain) WriteBlockAndSetHead(ctx context.Context, block *types.Blo // writeBlockAndSetHead is the internal implementation of WriteBlockAndSetHead. // This function expects the chain mutex to be held. func (bc *BlockChain) writeBlockAndSetHead(ctx context.Context, block *types.Block, receipts []*types.Receipt, logs []*types.Log, state *state.StateDB, emitHeadEvent bool) (status WriteStatus, err error) { - writeBlockAndSetHeadCtx, span := tracing.StartSpan(ctx, "blockchain.writeBlockAndSetHead") - defer tracing.EndSpan(span) - - var stateSyncLogs []*types.Log - - tracing.Exec(writeBlockAndSetHeadCtx, "", "blockchain.writeBlockWithState", func(_ context.Context, span trace.Span) { - stateSyncLogs, err = bc.writeBlockWithState(block, receipts, logs, state) - tracing.SetAttributes( - span, - attribute.Int("number", int(block.Number().Uint64())), - attribute.Bool("error", err != nil), - ) - }) - + stateSyncLogs, err := bc.writeBlockWithState(block, receipts, logs, state) if err != nil { return NonStatTy, err } currentBlock := bc.CurrentBlock() - - var reorg bool - - tracing.Exec(writeBlockAndSetHeadCtx, "", "blockchain.ReorgNeeded", func(_ context.Context, span trace.Span) { - reorg, err = bc.forker.ReorgNeeded(currentBlock, block.Header()) - tracing.SetAttributes( - span, - attribute.Int("number", int(block.Number().Uint64())), - attribute.Int("current block", int(currentBlock.Number.Uint64())), - attribute.Bool("reorg needed", reorg), - attribute.Bool("error", err != nil), - ) - }) - + reorg, err := bc.forker.ReorgNeeded(currentBlock, block.Header()) if err != nil { return NonStatTy, err } - tracing.Exec(writeBlockAndSetHeadCtx, "", "blockchain.reorg", func(_ context.Context, span trace.Span) { - if reorg { - // Reorganise the chain if the parent is not the head block - if block.ParentHash() != currentBlock.Hash() { - if err = bc.reorg(currentBlock, block); err != nil { - status = NonStatTy - } + if reorg { + // Reorganise the chain if the parent is not the head block + if block.ParentHash() != currentBlock.Hash() { + if err = bc.reorg(currentBlock, block); err != nil { + return NonStatTy, err } - - status = CanonStatTy - } else { - status = SideStatTy } - tracing.SetAttributes( - span, - attribute.Int("number", int(block.Number().Uint64())), - attribute.Int("current block", int(currentBlock.Number.Uint64())), - attribute.Bool("reorg needed", reorg), - attribute.Bool("error", err != nil), - attribute.String("status", string(status)), - ) - }) - - if status == NonStatTy { - return + status = CanonStatTy + } else { + status = SideStatTy } + // Set new head. if status == CanonStatTy { - tracing.Exec(writeBlockAndSetHeadCtx, "", "blockchain.writeHeadBlock", func(_ context.Context, _ trace.Span) { - bc.writeHeadBlock(block) - }) + bc.writeHeadBlock(block) } - bc.futureBlocks.Remove(block.Hash()) if status == CanonStatTy { diff --git a/packaging/templates/package_scripts/control b/packaging/templates/package_scripts/control index c8c4b10eef..e7ace96e72 100644 --- a/packaging/templates/package_scripts/control +++ b/packaging/templates/package_scripts/control @@ -1,5 +1,5 @@ Source: bor -Version: 1.2.8 +Version: 1.2.9-beta Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.arm64 b/packaging/templates/package_scripts/control.arm64 index 9dafa758f6..2ea263e599 100644 --- a/packaging/templates/package_scripts/control.arm64 +++ b/packaging/templates/package_scripts/control.arm64 @@ -1,5 +1,5 @@ Source: bor -Version: 1.2.8 +Version: 1.2.9-beta Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.profile.amd64 b/packaging/templates/package_scripts/control.profile.amd64 index e03bfa3aec..ccc8936dbd 100644 --- a/packaging/templates/package_scripts/control.profile.amd64 +++ b/packaging/templates/package_scripts/control.profile.amd64 @@ -1,5 +1,5 @@ Source: bor-profile -Version: 1.2.8 +Version: 1.2.9-beta Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.profile.arm64 b/packaging/templates/package_scripts/control.profile.arm64 index dc2f77ca51..5b4e012780 100644 --- a/packaging/templates/package_scripts/control.profile.arm64 +++ b/packaging/templates/package_scripts/control.profile.arm64 @@ -1,5 +1,5 @@ Source: bor-profile -Version: 1.2.8 +Version: 1.2.9-beta Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.validator b/packaging/templates/package_scripts/control.validator index e47788ccd2..5dd2bca4c5 100644 --- a/packaging/templates/package_scripts/control.validator +++ b/packaging/templates/package_scripts/control.validator @@ -1,5 +1,5 @@ Source: bor-profile -Version: 1.2.8 +Version: 1.2.9-beta Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.validator.arm64 b/packaging/templates/package_scripts/control.validator.arm64 index 6e6931eeb4..8b45776fde 100644 --- a/packaging/templates/package_scripts/control.validator.arm64 +++ b/packaging/templates/package_scripts/control.validator.arm64 @@ -1,5 +1,5 @@ Source: bor-profile -Version: 1.2.8 +Version: 1.2.9-beta Section: develop Priority: standard Maintainer: Polygon diff --git a/params/version.go b/params/version.go index 54a2410a56..4f2658a99d 100644 --- a/params/version.go +++ b/params/version.go @@ -21,10 +21,10 @@ import ( ) const ( - VersionMajor = 1 // Major version component of the current release - VersionMinor = 2 // Minor version component of the current release - VersionPatch = 8 // Patch version component of the current release - VersionMeta = "" // Version metadata to append to the version string + VersionMajor = 1 // Major version component of the current release + VersionMinor = 2 // Minor version component of the current release + VersionPatch = 9 // Patch version component of the current release + VersionMeta = "beta" // Version metadata to append to the version string ) var GitCommit string