Merge branch 'node-real:main' into devel

harshsingh-cs · web-flow · commit 9d40d68d4132 · 2024-05-14T12:38:06.000+05:30
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -3,7 +3,7 @@ name: Check
 on:
   push:
     branches:
-      - devel
+      - main
       - devel_1.2.0
   workflow_dispatch:
 
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -2,15 +2,13 @@ name: CI
 on:
   push:
     branches:
-      - devel
-      - alpha
+      - main
       - devel_1.2.0
       - 'release/**'
   pull_request:
     branches:
       - devel_1.2.0
-      - devel
-      - alpha
+      - main
       - 'release/**'
     types:
       - opened
@@ -113,7 +111,7 @@ jobs:
 
   docker-build-check:
     # don't run this on devel - the PR must have run it to be merged and it misleads that this pushes the docker image
-    if: (${{ github.event_name == 'push' || !github.event.pull_request.draft }}) && ${{ github.ref != 'refs/heads/devel' }}
+    if: (${{ github.event_name == 'push' || !github.event.pull_request.draft }}) && ${{ github.ref != 'refs/heads/main' }}
     runs-on: ubuntu-22.04
 
     steps:
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -2,7 +2,7 @@ name: Coverage
 on:
   push:
     branches:
-      - devel
+      - main
       - devel_1.2.0
 
 jobs:
diff --git a/.github/workflows/qa-clean-exit-block-downloading.yml b/.github/workflows/qa-clean-exit-block-downloading.yml
@@ -6,7 +6,7 @@ on:
       - 'release/**'
   pull_request:
     branches:
-      - devel
+      - main
       - 'release/**'
     types:
       - ready_for_review
diff --git a/.github/workflows/qa-clean-exit-snapshot-downloading.yml b/.github/workflows/qa-clean-exit-snapshot-downloading.yml
@@ -3,11 +3,11 @@ name: QA - Clean exit (snapshot downloading)
 on:
   push:
     branches:
-      - devel
+      - main
       - 'release/**'
   pull_request:
     branches:
-      - devel
+      - main
       - 'release/**'
     types:
       - ready_for_review
diff --git a/.github/workflows/test-integration.yml b/.github/workflows/test-integration.yml
@@ -2,8 +2,7 @@ name: Integration tests
 on:
   push:
     branches:
-      - devel
-      - alpha
+      - main
       - 'release/**'
   schedule:
     - cron: '20 16 * * *' # daily at 16:20 UTC
diff --git a/Makefile b/Makefile
@@ -17,7 +17,7 @@ DOCKER_TAG ?= thorax/erigon:latest
 # Pipe error below to /dev/null since Makefile structure kind of expects
 # Go to be available, but with docker it's not strictly necessary
 CGO_CFLAGS := $(shell $(GO) env CGO_CFLAGS 2>/dev/null) # don't lose default
-CGO_CFLAGS += -DMDBX_FORCE_ASSERTIONS=0 # Enable MDBX's asserts by default in 'devel' branch and disable in releases
+CGO_CFLAGS += -DMDBX_FORCE_ASSERTIONS=0 # Enable MDBX's asserts by default in 'main' branch and disable in releases
 #CGO_CFLAGS += -DMDBX_DISABLE_VALIDATION=1 # This feature is not ready yet
 #CGO_CFLAGS += -DMDBX_ENABLE_PROFGC=0 # Disabled by default, but may be useful for performance debugging
 #CGO_CFLAGS += -DMDBX_ENABLE_PGOP_STAT=0 # Disabled by default, but may be useful for performance debugging
diff --git a/README.md b/README.md
@@ -70,7 +70,7 @@ Bear in mind that SSD performance deteriorates when close to capacity.
 
 RAM: >=16GB, 64-bit architecture.
 
-[Golang version >= 1.20](https://golang.org/doc/install); GCC 10+ or Clang; On Linux: kernel > v4
+[Golang version >= 1.21](https://golang.org/doc/install); GCC 10+ or Clang; On Linux: kernel > v4
 
 <code>🔬 more details on disk storage [here](https://erigon.substack.com/p/disk-footprint-changes-in-new-erigon?s=r)
 and [here](https://ledgerwatch.github.io/turbo_geth_release.html#Disk-space).</code>
@@ -80,6 +80,7 @@ Usage
 
 ### Getting Started
 
+Building erigon requires both a Go (version 1.21 or later) and a C compiler (GCC 10+ or Clang). 
 For building the latest release (this will be suitable for most users just wanting to run a node):
 
 ```sh
diff --git a/core/data_availability.go b/core/data_availability.go
@@ -53,7 +53,7 @@ func IsDataAvailable(chain consensus.ChainHeaderReader, header *types.Header, bo
 	}
 
 	if len(blobTxs) != len(sidecars) {
-		return fmt.Errorf("blob info mismatch: sidecars %d, versionedHashes:%d", len(sidecars), len(blobTxs))
+		return fmt.Errorf("number %d, hash %v, blob info mismatch: have %d, want:%d", header.Number.Uint64(), header.Hash(), len(sidecars), len(blobTxs))
 	}
 
 	// check blob amount
diff --git a/core/types/blob_sidecars.go b/core/types/blob_sidecars.go
@@ -8,6 +8,7 @@ import (
 	"math/big"
 
 	libcommon "github.com/ledgerwatch/erigon-lib/common"
+	rlp2 "github.com/ledgerwatch/erigon-lib/rlp"
 	"github.com/ledgerwatch/erigon/rlp"
 )
 
@@ -65,18 +66,31 @@ func (s *BlobSidecar) EncodeRLP(w io.Writer) error {
 	if err := s.BlobTxSidecar.EncodeRLP(w); err != nil {
 		return err
 	}
-	if err := rlp.Encode(w, s.BlockNumber); err != nil {
+
+	if err := rlp.EncodeBigInt(s.BlockNumber, w, b[:]); err != nil {
+		return err
+	}
+
+	b[0] = 128 + 32
+	if _, err := w.Write(b[:1]); err != nil {
+		return err
+	}
+	if _, err := w.Write(s.BlockHash.Bytes()); err != nil {
 		return err
 	}
-	if err := rlp.Encode(w, s.BlockHash); err != nil {
+
+	if err := rlp.EncodeInt(s.TxIndex, w, b[:]); err != nil {
 		return err
 	}
-	if err := rlp.Encode(w, s.TxIndex); err != nil {
+
+	b[0] = 128 + 32
+	if _, err := w.Write(b[:1]); err != nil {
 		return err
 	}
-	if err := rlp.Encode(w, s.TxHash); err != nil {
+	if _, err := w.Write(s.TxHash.Bytes()); err != nil {
 		return err
 	}
+
 	return nil
 }
 
@@ -89,14 +103,20 @@ func (sc *BlobSidecar) DecodeRLP(s *rlp.Stream) error {
 	if err := sc.BlobTxSidecar.DecodeRLP(s); err != nil {
 		return err
 	}
+
 	var b []byte
-	if b, err = s.Bytes(); err != nil {
+
+	if b, err = s.Uint256Bytes(); err != nil {
 		return err
 	}
 	sc.BlockNumber = new(big.Int).SetBytes(b)
+
 	if b, err = s.Bytes(); err != nil {
 		return err
 	}
+	if len(b) != 32 {
+		return fmt.Errorf("invalid block hash length: %d", len(b))
+	}
 	sc.BlockHash = libcommon.BytesToHash(b)
 
 	if sc.TxIndex, err = s.Uint(); err != nil {
@@ -106,6 +126,9 @@ func (sc *BlobSidecar) DecodeRLP(s *rlp.Stream) error {
 	if b, err = s.Bytes(); err != nil {
 		return err
 	}
+	if len(b) != 32 {
+		return fmt.Errorf("invalid tx hash length: %d", len(b))
+	}
 	sc.TxHash = libcommon.BytesToHash(b)
 
 	if err = s.ListEnd(); err != nil {
@@ -116,10 +139,17 @@ func (sc *BlobSidecar) DecodeRLP(s *rlp.Stream) error {
 
 func (s *BlobSidecar) payloadSize() int {
 	size := s.BlobTxSidecar.payloadSize()
+	size += rlp2.ListPrefixLen(size) // size of payload size encoding
+
+	size++
 	size += rlp.BigIntLenExcludingHead(s.BlockNumber)
-	size += 32
-	size += 8
-	size += 32
+
+	size += rlp2.StringLen(s.BlockHash.Bytes())
+
+	size++
+	size += rlp.IntLenExcludingHead(s.TxIndex)
+
+	size += rlp2.StringLen(s.TxHash.Bytes())
 	return size
 }
 
diff --git a/core/types/blob_sidecars_test.go b/core/types/blob_sidecars_test.go
diff --git a/core/types/block.go b/core/types/block.go
@@ -1286,7 +1286,7 @@ func (b *Block) HashCheck() error {
 		return fmt.Errorf("block has invalid uncle hash: have %x, exp: %x", hash, b.UncleHash())
 	}
 
-	if b.WithdrawalsHash() == nil || *b.WithdrawalsHash() == EmptyRootHash {
+	if b.WithdrawalsHash() == nil {
 		if b.Withdrawals() != nil {
 			return errors.New("header missing WithdrawalsHash")
 		}
diff --git a/eth/ethconsensusconfig/config.go b/eth/ethconsensusconfig/config.go
@@ -103,7 +103,7 @@ func CreateConsensusEngine(ctx context.Context, nodeConfig *nodecfg.Config, chai
 			var err error
 			var db kv.RwDB
 
-			if consensusCfg.DBPath == "" {
+			if consensusCfg.DBPath != "" {
 				if filepath.Base(consensusCfg.DBPath) == "parlia" {
 					nodeConfig.Dirs.DataDir = filepath.Dir(consensusCfg.DBPath)
 				} else {
diff --git a/eth/protocols/eth/protocol.go b/eth/protocols/eth/protocol.go
@@ -22,11 +22,11 @@ import (
 	"io"
 	"math/big"
 
+	rlp2 "github.com/ledgerwatch/erigon-lib/rlp"
+
 	libcommon "github.com/ledgerwatch/erigon-lib/common"
 	"github.com/ledgerwatch/erigon-lib/direct"
 	proto_sentry "github.com/ledgerwatch/erigon-lib/gointerfaces/sentry"
-	rlp2 "github.com/ledgerwatch/erigon-lib/rlp"
-
 	"github.com/ledgerwatch/erigon/core/forkid"
 	"github.com/ledgerwatch/erigon/core/types"
 	"github.com/ledgerwatch/erigon/rlp"
@@ -284,6 +284,14 @@ func (nbp NewBlockPacket) EncodeRLP(w io.Writer) error {
 		}
 	}
 	encodingSize += tdLen
+	if len(nbp.Sidecars) > 0 {
+		sidecarsLen := 0
+		for _, item := range nbp.Sidecars {
+			size := item.EncodingSize()
+			sidecarsLen += rlp2.ListPrefixLen(size) + size
+		}
+		encodingSize += rlp2.ListPrefixLen(sidecarsLen) + sidecarsLen
+	}
 	var b [33]byte
 	// prefix
 	if err := types.EncodeStructSizePrefix(encodingSize, w, b[:]); err != nil {
diff --git a/eth/protocols/eth/protocol_test.go b/eth/protocols/eth/protocol_test.go
@@ -21,6 +21,11 @@ import (
 	"math/big"
 	"testing"
 
+	"github.com/holiman/uint256"
+	types2 "github.com/ledgerwatch/erigon-lib/types"
+	"github.com/ledgerwatch/erigon/params"
+	"github.com/stretchr/testify/require"
+
 	libcommon "github.com/ledgerwatch/erigon-lib/common"
 
 	"github.com/ledgerwatch/erigon/common"
@@ -229,3 +234,87 @@ func TestEth66Messages(t *testing.T) {
 		}
 	}
 }
+
+func TestNewBlockPacket_EncodeDecode(t *testing.T) {
+	dynamicTx := &types.DynamicFeeTransaction{
+		CommonTx: types.CommonTx{
+			Nonce: 0,
+			Gas:   25000,
+			To:    &libcommon.Address{0x03, 0x04, 0x05},
+			Value: uint256.NewInt(99), // wei amount
+			Data:  make([]byte, 50),
+		},
+		ChainID:    uint256.NewInt(716),
+		Tip:        uint256.NewInt(22),
+		FeeCap:     uint256.NewInt(5),
+		AccessList: types2.AccessList{},
+	}
+	txSidecar := types.BlobTxSidecar{
+		Blobs:       types.Blobs{types.Blob{}, types.Blob{}},
+		Commitments: types.BlobKzgs{types.KZGCommitment{}, types.KZGCommitment{}},
+		Proofs:      types.KZGProofs{types.KZGProof{}, types.KZGProof{}},
+	}
+	blobTx := &types.BlobTx{
+		DynamicFeeTransaction: *dynamicTx,
+		MaxFeePerBlobGas:      uint256.NewInt(5),
+		BlobVersionedHashes:   []libcommon.Hash{{}},
+	}
+	blobGasUsed := uint64(params.BlobTxBlobGasPerBlob)
+	excessBlobGas := uint64(0)
+	withdrawalsHash := libcommon.Hash{}
+	header := &types.Header{
+		ParentHash:      libcommon.HexToHash("0x85a8f2a2d4d2b3e73154d8ed1b5deb7c7c395dde7b934058bcc5d0efb69dff60"),
+		UncleHash:       types.EmptyUncleHash,
+		Coinbase:        libcommon.HexToAddress("0x76d76ee8823de52a1a431884c2ca930c5e72bff3 "),
+		Root:            types.EmptyRootHash,
+		TxHash:          libcommon.HexToHash("0xa84b1b157b86ed7e1352fa8e6518cd31e9be686bd27b1fe79d7ae6ebc02b29bb"),
+		ReceiptHash:     libcommon.HexToHash("https://testnet.bscscan.com/tx/0x5ebb92a3a3660c18655a29be937ac2704b807545996672836ea907e2685bc8fc"),
+		Bloom:           types.Bloom{},
+		Difficulty:      new(big.Int).SetUint64(2),
+		Number:          new(big.Int).SetUint64(1),
+		GasLimit:        69998932,
+		GasUsed:         998363,
+		Time:            1715485382,
+		Extra:           make([]byte, 64),
+		MixDigest:       libcommon.Hash{},
+		Nonce:           types.BlockNonce{},
+		BaseFee:         new(big.Int).SetUint64(0),
+		WithdrawalsHash: &withdrawalsHash,
+		BlobGasUsed:     &blobGasUsed,
+		ExcessBlobGas:   &excessBlobGas,
+	}
+
+	tests := []struct {
+		msg NewBlockPacket
+	}{
+		{msg: NewBlockPacket{
+			Block: types.NewBlockWithHeader(header),
+			TD:    new(big.Int).SetUint64(1),
+		}},
+		{msg: NewBlockPacket{
+			Block: types.NewBlock(header, []types.Transaction{dynamicTx}, nil, nil, types.Withdrawals{}),
+			TD:    new(big.Int).SetUint64(1),
+		}},
+		{msg: NewBlockPacket{
+			Block: types.NewBlock(header, []types.Transaction{dynamicTx, blobTx}, nil, nil, types.Withdrawals{}),
+			TD:    new(big.Int).SetUint64(1),
+			Sidecars: types.BlobSidecars{&types.BlobSidecar{
+				BlobTxSidecar: txSidecar,
+				BlockNumber:   new(big.Int).SetUint64(1),
+				BlockHash:     libcommon.Hash{},
+				TxIndex:       1,
+				TxHash:        libcommon.Hash{},
+			}},
+		}},
+	}
+
+	for _, item := range tests {
+		item.msg.Block.Size()
+		enc, err := rlp.EncodeToBytes(item.msg)
+		require.NoError(t, err)
+		var actual NewBlockPacket
+		err = rlp.DecodeBytes(enc, &actual)
+		require.NoError(t, err)
+		require.Equal(t, item.msg, actual)
+	}
+}
diff --git a/eth/stagedsync/stage_bodies.go b/eth/stagedsync/stage_bodies.go
@@ -239,8 +239,7 @@ func BodiesForward(
 
 				if cfg.chanConfig.Parlia != nil && cfg.chanConfig.IsCancun(headerNumber, header.Time) {
 					if err = core.IsDataAvailable(cr, header, rawBody); err != nil {
-						u.UnwindTo(blockHeight-1, BadBlock(header.Hash(), fmt.Errorf("CheckDataAvaliabe failed: %w", err)))
-						return true, err
+						return false, err
 					}
 				}
 
diff --git a/p2p/sentry/sentry_multi_client/broadcast.go b/p2p/sentry/sentry_multi_client/broadcast.go
@@ -67,6 +67,8 @@ func (cs *MultiClient) BroadcastNewBlock(ctx context.Context, header *types.Head
 		Sidecars: body.Sidecars,
 	})
 
+	//log.Debug("broadcastNewBlock", "number", block.NumberU64(), "hash", block.Hash(), "len(sidecar)", len(body.Sidecars))
+
 	if err != nil {
 		log.Error("broadcastNewBlock", "err", err)
 		return
diff --git a/p2p/sentry/sentry_multi_client/sentry_multi_client.go b/p2p/sentry/sentry_multi_client/sentry_multi_client.go
@@ -521,6 +521,7 @@ func (cs *MultiClient) newBlock66(ctx context.Context, inreq *proto_sentry.Inbou
 		request.Block = request.Block.WithSidecars(request.Sidecars)
 	}
 
+	log.Trace("NewBlockMsg", "number", request.Block.NumberU64(), "hash", request.Block.Hash(), "Sidecar", len(request.Sidecars), "PeerID", fmt.Sprintf("%x", sentry2.ConvertH512ToPeerID(inreq.PeerId))[:8])
 	if segments, penalty, err := cs.Hd.SingleHeaderAsSegment(headerRaw, request.Block.Header(), true /* penalizePoSBlocks */); err == nil {
 		if penalty == headerdownload.NoPenalty {
 			propagate := !cs.ChainConfig.TerminalTotalDifficultyPassed
diff --git a/params/version.go b/params/version.go
@@ -33,7 +33,7 @@ var (
 const (
 	VersionMajor       = 1     // Major version component of the current release
 	VersionMinor       = 2     // Minor version component of the current release
-	VersionMicro       = 6     // Patch version component of the current release
+	VersionMicro       = 8     // Patch version component of the current release
 	VersionModifier    = "dev" // Modifier component of the current release
 	VersionKeyCreated  = "ErigonVersionCreated"
 	VersionKeyFinished = "ErigonVersionFinished"
diff --git a/turbo/stages/bodydownload/body_algos.go b/turbo/stages/bodydownload/body_algos.go

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ func IsDataAvailable(chain consensus.ChainHeaderReader, header *types.Header, bo`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`if len(blobTxs) != len(sidecars) {`
`56`		`- return fmt.Errorf("blob info mismatch: sidecars %d, versionedHashes:%d", len(sidecars), len(blobTxs))`
	`56`	`+ return fmt.Errorf("number %d, hash %v, blob info mismatch: have %d, want:%d", header.Number.Uint64(), header.Hash(), len(sidecars), len(blobTxs))`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`// check blob amount`