Upstream v3.0.6

.github/workflows/ci.yml

@@ -15,16 +15,15 @@ on:
 
   workflow_dispatch:
 
-concurrency:
-  group: ${{ github.ref }}
-  cancel-in-progress: ${{ !contains(fromJSON('[
-      "refs/heads/release/2.60",
-      "refs/heads/release/2.61",
-      "refs/heads/main"
-    ]'), github.ref) }}
-
 jobs:
-  tests:
+  linux:
+    concurrency:
+      group: ci-${{ matrix.os }}-${{ github.ref }}
+      cancel-in-progress: >-
+        ${{
+          !startsWith(github.ref, 'refs/heads/release/') &&
+          github.ref != 'refs/heads/main'
+        }}
     if: ${{ github.event_name == 'push' || !github.event.pull_request.draft }}
     strategy:
       matrix:
@@ -76,7 +75,14 @@ jobs:
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         continue-on-error: true
 
-#  tests-windows:
+#  win:
+#    concurrency:
+#      group: ci-win-${{ matrix.os }}-${{ github.ref }}
+#      cancel-in-progress: >-
+#        ${{
+#          !startsWith(github.ref, 'refs/heads/release/') &&
+#          github.ref != 'refs/heads/main'
+#        }}
 #    if: ${{ github.event_name == 'push' || !github.event.pull_request.draft }}
 #    strategy:
 #      matrix:

.github/workflows/kurtosis/eip7702-test.io

@@ -18,6 +18,7 @@ tasks:
     prefundMinBalance: 10000000000000000000 # ensure 10 ETH
     walletAddressResultVar: "eoaAddress"
     walletPrivateKeyResultVar: "eoaPrivateKey"
+    randomSeed: true
   configVars:
     privateKey: "walletPrivkey"
 - name: sleep
@@ -60,4 +61,4 @@ tasks:
   configVars:
     privateKey: "eoaPrivateKey"
     targetAddress: "testContractAddr"
-    authorizations: "| [ { codeAddress: .delegateContractAddr, signerPrivkey: .eoaPrivateKey } ]"
+    authorizations: "| [ { codeAddress: .delegateContractAddr, signerPrivkey: .eoaPrivateKey, nonce: 3 } ]"

.github/workflows/kurtosis/pectra.io

@@ -2,6 +2,7 @@ participants_matrix:
   el:
     - el_type: erigon
       el_image: test/erigon:current
+      el_log_level: "debug"
   cl:
     - cl_type: teku
       cl_image: consensys/teku:develop

.github/workflows/qa-rpc-integration-tests.yml

@@ -13,6 +13,15 @@ on:
 #    types:
 #      - ready_for_review
 
+concurrency:
+  group: ${{ github.ref }}
+  cancel-in-progress: >-
+    ${{
+      !startsWith(github.ref, 'refs/heads/release/') &&
+      github.ref != 'refs/heads/main'
+    }}
+
+
 jobs:
   integration-test-suite:
     runs-on: [ self-hosted, qa, RpcSpecific ]
@@ -21,6 +30,7 @@ jobs:
       ERIGON_TESTBED_AREA: /opt/erigon-testbed
       ERIGON_QA_PATH: /home/qarunner/erigon-qa
       RPC_PAST_TEST_DIR: /opt/rpc-past-tests
+      ERIGON_ASSERT: true
       CHAIN: mainnet
 
     steps:
@@ -30,7 +40,7 @@ jobs:
       - name: Checkout RPC Tests Repository & Install Requirements
         run: |
           rm -rf ${{ runner.workspace }}/rpc-tests
-          git -c advice.detachedHead=false clone --depth 1 --branch v1.41.0  https://github.com/erigontech/rpc-tests ${{runner.workspace}}/rpc-tests
+          git -c advice.detachedHead=false clone --depth 1 --branch release/3.0  https://github.com/erigontech/rpc-tests ${{runner.workspace}}/rpc-tests
           cd ${{ runner.workspace }}/rpc-tests
           pip3 install -r requirements.txt
 

.github/workflows/qa-sync-from-scratch-minimal-node.yml

@@ -26,6 +26,7 @@ jobs:
       TRACKING_TIME_SECONDS: 7200 # 2 hours
       TOTAL_TIME_SECONDS: 64800 # 18 hours
       CHAIN: ${{ matrix.chain }}
+      ERIGON_ASSERT: true
 
     steps:
       - name: Check out repository

.github/workflows/qa-sync-from-scratch.yml

@@ -23,6 +23,8 @@ jobs:
       TRACKING_TIME_SECONDS: 7200 # 2 hours
       TOTAL_TIME_SECONDS: 43200 # 12 hours
       CHAIN: ${{ matrix.chain }}
+      ERIGON_ASSERT: true
+
 
     steps:
     - name: Check out repository

.github/workflows/qa-sync-with-externalcl.yml

@@ -30,6 +30,7 @@ jobs:
       ERIGON_QA_PATH: /home/qarunner/erigon-qa
       TRACKING_TIME_SECONDS: 3600 # 1 hour
       TOTAL_TIME_SECONDS: 25200 # 7 hours
+      ERIGON_ASSERT: true
 
     steps:
       - name: Check out repository

.github/workflows/test-integration-caplin.yml

@@ -13,7 +13,7 @@ on:
       - reopened
       - synchronize
       - ready_for_review
-    
+
 jobs:
   tests:
     strategy:

.github/workflows/test-integration-erigon.yml

@@ -43,6 +43,14 @@ jobs:
 
   tests-mac-linux:
     needs: source-of-changes
+    concurrency:
+      group: tests-mac-linux-${{ matrix.os }}-${{ github.ref }}
+      cancel-in-progress: >-
+        ${{
+          needs.source-of-changes.outputs.changed_files != 'true' &&
+          !startsWith(github.ref, 'refs/heads/release/') &&
+          github.ref != 'refs/heads/main'
+        }}
     strategy:
       matrix:
         os:
@@ -88,6 +96,14 @@ jobs:
 
   tests-windows:
     needs: source-of-changes
+    concurrency:
+      group: tests-windows-${{ matrix.os }}-${{ github.ref }}
+      cancel-in-progress: >-
+        ${{
+          needs.source-of-changes.outputs.changed_files != 'true' &&
+          !startsWith(github.ref, 'refs/heads/release/') &&
+          github.ref != 'refs/heads/main'
+        }}
     strategy:
       matrix:
         os: [ windows-2025 ]

ChangeLog.md

@@ -1,18 +1,110 @@
 ChangeLog
 ---------
 
-## v3.0.3 (in development)
+## v3.0.5 (in development)
+
+### Milestone
+
+https://github.com/erigontech/erigon/milestone/44
+
+## v3.0.4
+
+### Milestone
+
+https://github.com/erigontech/erigon/milestone/43
+
+**Improvements:**
+
+- disable diagnostics by default by @yperbasis in https://github.com/erigontech/erigon/pull/14953
+- less disk IO during files merge by @AskAlexSharov in https://github.com/erigontech/erigon/pull/14901
+- stage_custom_trace: to produce indices by @AskAlexSharov in https://github.com/erigontech/erigon/pull/14879
+- persist receipts - external rpcd support by @AskAlexSharov in https://github.com/erigontech/erigon/pull/15004
+- support `NO_PRUNE` env var by @AskAlexSharov in https://github.com/erigontech/erigon/pull/15131
+- cmd: Increase default `db.size.limit` by @AskAlexSharov in https://github.com/erigontech/erigon/pull/15170
+- notify rpcd when e3 files change by @sudeepdino008 in https://github.com/erigontech/erigon/pull/15044
+- mdbx v0.13.6 by @JkLondon in https://github.com/erigontech/erigon/pull/15112
+
+**Bugfixes:**
+
+- Fix issues reported in snapshot processing to fix sync issues due to bugs in sync event and checkpoint snapshot production by @eastorski in https://github.com/erigontech/erigon/pull/14887, https://github.com/erigontech/erigon/pull/14947,  https://github.com/erigontech/erigon/pull/14951
+- Update go-libutp for AUR build error by @anacrolix in https://github.com/erigontech/erigon/pull/14892
+- Caplin: fix occassional mev-boost bug by @Giulio2002 in https://github.com/erigontech/erigon/pull/14991
+- Erigon: optimistic inclusion for deep reorgs #14875 by @Giulio2002 in https://github.com/erigontech/erigon/pull/14876
+- Caplin: Fix misc issues after electra (#14910) by @domiwei in https://github.com/erigontech/erigon/pull/14935
+- fix erigon seg retire to handle incomplete merges by @sudeepdino008 in https://github.com/erigontech/erigon/pull/15003
+- fast failing if version string contains "." (v1.0- v2.23 for ex) by @JkLondon in https://github.com/erigontech/erigon/pull/15048
+- prune mode flag parsing and `String()`-ing by @awskii in https://github.com/erigontech/erigon/pull/14882
+- rpcdaemon: fix txNum at GetReceipt call in getLogsV3 by @lupin012 in https://github.com/erigontech/erigon/pull/14986
+
+**Full Changelog**: https://github.com/erigontech/erigon/compare/v3.0.3...v3.0.4
+
+## v3.0.3
 
 ### Milestone
 
 https://github.com/erigontech/erigon/milestone/42
 
+**RPC fixes:**
+
+Polygon users who have previously run migration steps to fix incorrect logIndex related to state sync transactions released in 3.0.2 are advised to run the migration steps again and add the --polygon.logindex flag to their flags for a complete mitigation.
+
+**Improvements:**
+
+- consensus: Add syscall failure scenarios (#14403) by @somnathb1 in https://github.com/erigontech/erigon/pull/14818
+- consensus: validate fixed lengths in abi decoding EIP-6110 deposit requests by @somnathb1 in https://github.com/erigontech/erigon/pull/14823
+- historical receipts persistency (optional) by @AskAlexSharov in https://github.com/erigontech/erigon/pull/14781
+- reduce dependency on github; download snapshot hashes from R2 by @wmitsuda in https://github.com/erigontech/erigon/pull/14849
+
+**Bugfixes:**
+
+- eth, execution: Use block level gasPool in serial execution (#14761) by @somnathb1 in https://github.com/erigontech/erigon/pull/14820
+- no greedy prune on chain-tip  (node did fall behind periodically) by @AskAlexSharov in https://github.com/erigontech/erigon/pull/14782
+- fixed performance and ordering issues with the [RPC fix from 3.0.2](https://github.com/erigontech/erigon/releases/tag/v3.0.2) by @mh0lt and @shohamc1 in https://github.com/erigontech/erigon/pull/14842 https://github.com/erigontech/erigon/pull/14785 https://github.com/erigontech/erigon/pull/14790
+
+**Full Changelog**: https://github.com/erigontech/erigon/compare/v3.0.2...v3.0.3
+
 ## v3.0.2
 
 ### Milestone
 
 https://github.com/erigontech/erigon/milestone/41
 
+**Gnosis users: this is a required update for the upcoming Pectra hardfork scheduled for 30 April 2025**
+
+**RPC fixes:**
+
+Previous versions of Erigon 3 have two bugs regarding handling of state sync events on Polygon chains:
+- Incorrect `logIndex` on all state sync transaction logs
+- Missing log events when using `eth_getLogs` with filters
+
+A proper fix has been implemented and will be progressively rolled out in Erigon 3.1 and 3.2 (track issue [here](https://github.com/erigontech/erigon/issues/14003)). A temporary workaround has been introduced if these issues are critical for your use-case. This requires regenerating receipts for all transactions on the chain. The procedure is as follows:
+1. Shutdown Erigon and all rpcdaemon processes
+2. Update binaries Erigon release
+3. `erigon seg rm-state-snapshots --domain=receipt --datadir <your-datadir>`
+4. `integration stage_custom_trace --datadir <your-datadir> --chain <amoy|bor-mainnet> --bor.heimdall <heimdall-url>`
+	- For machines with many cores, you can add ` --exec.workers=<num>` to improve performance (default is `7`)
+5. Once complete, `rm -rf <your-datadir>/chaindata`
+6. Start Erigon
+
+**Improvements:**
+
+- Schedule Pectra hard fork for Gnosis Mainnet (#14521) by @somnathb1 in https://github.com/erigontech/erigon/pull/14523
+- params: Use no padding in minor version (#14588) by @somnathb1 in https://github.com/erigontech/erigon/pull/14594
+- recent receipts persistence: to reduce RPC latency  by @AskAlexSharov in https://github.com/erigontech/erigon/pull/14532
+- historical `eth_getProof` experimental flag by @Giulio2002 in https://github.com/erigontech/erigon/pull/14568
+- Enhance efficiency of attestation selection (#14624) by @Giulio2002 in https://github.com/erigontech/erigon/pull/14633
+- EngineAPI: recover from missing chain segments (#14579) by @Giulio2002 in https://github.com/erigontech/erigon/pull/14589
+- remove unsafe closing of subsumed files in mergeLoopStep by @sudeepdino008 in https://github.com/erigontech/erigon/pull/14557
+
+**Bugfixes:**
+
+- execution: fix missing log notifications when flushing extending fork… by @Giulio2002 in https://github.com/erigontech/erigon/pull/14578
+- EthereumExecution: fix canonical chain routine (#14580) by @Giulio2002 in https://github.com/erigontech/erigon/pull/14592
+- caplin: fix parsing topics (#14543) by @Giulio2002 in https://github.com/erigontech/erigon/pull/14593
+- Fix `trace_transaction` for Polygon chains (#14470) by @shohamc1 in https://github.com/erigontech/erigon/pull/14530
+
+**Full Changelog**: https://github.com/erigontech/erigon/compare/v3.0.1...v3.0.2
+
 ## v3.0.1 
 
 **Improvements:**

cl/beacon/handler/block_production.go

@@ -573,6 +573,10 @@ func (a *ApiHandler) produceBeaconBody(
 	if finalizedHash == (libcommon.Hash{}) {
 		finalizedHash = head // probably fuck up fcu for EL but not a big deal.
 	}
+	safeHash := a.forkchoiceStore.GetEth1Hash(baseState.CurrentJustifiedCheckpoint().Root)
+	if safeHash == (libcommon.Hash{}) {
+		safeHash = head
+	}
 	proposerIndex, err := baseState.GetBeaconProposerIndexForSlot(targetSlot)
 	if err != nil {
 		return nil, 0, err
@@ -616,6 +620,7 @@ func (a *ApiHandler) produceBeaconBody(
 		idBytes, err := a.engine.ForkChoiceUpdate(
 			ctx,
 			finalizedHash,
+			safeHash,
 			head,
 			&engine_types.PayloadAttributes{
 				Timestamp:             hexutil.Uint64(latestExecutionPayload.Time + secsDiff),
@@ -1207,8 +1212,9 @@ func (a *ApiHandler) storeBlockAndBlobs(
 	if err := a.forkchoiceStore.OnBlock(ctx, block, true, true, false); err != nil {
 		return err
 	}
-	finalizedBlockRoot := a.forkchoiceStore.FinalizedCheckpoint().Root
-	if _, err := a.engine.ForkChoiceUpdate(ctx, a.forkchoiceStore.GetEth1Hash(finalizedBlockRoot), a.forkchoiceStore.GetEth1Hash(blockRoot), nil); err != nil {
+	finalizedHash := a.forkchoiceStore.GetEth1Hash(a.forkchoiceStore.FinalizedCheckpoint().Root)
+	safeHash := a.forkchoiceStore.GetEth1Hash(a.forkchoiceStore.JustifiedCheckpoint().Root)
+	if _, err := a.engine.ForkChoiceUpdate(ctx, finalizedHash, safeHash, a.forkchoiceStore.GetEth1Hash(blockRoot), nil); err != nil {
 		return err
 	}
 	headState, err := a.forkchoiceStore.GetStateAtBlockRoot(blockRoot, false)

cl/phase1/execution_client/block_collector/block_collector.go

@@ -148,7 +148,7 @@ func (b *blockCollector) Flush(ctx context.Context) error {
 			isForkchoiceNeeded := currentHeader == nil || blocksBatch[len(blocksBatch)-1].NumberU64() > currentHeader.Number.Uint64()
 			if inserted >= b.syncBackLoop {
 				if isForkchoiceNeeded {
-					if _, err := b.engine.ForkChoiceUpdate(ctx, lastBlockHash, lastBlockHash, nil); err != nil {
+					if _, err := b.engine.ForkChoiceUpdate(ctx, lastBlockHash, lastBlockHash, lastBlockHash, nil); err != nil {
 						b.logger.Warn("failed to update fork choice", "err", err)
 					}
 				}

cl/phase1/execution_client/execution_client_direct.go

@@ -113,8 +113,8 @@ func (cc *ExecutionClientDirect) NewPayload(
 	return PayloadStatusNone, errors.New("unexpected status")
 }
 
-func (cc *ExecutionClientDirect) ForkChoiceUpdate(ctx context.Context, finalized libcommon.Hash, head libcommon.Hash, attr *engine_types.PayloadAttributes) ([]byte, error) {
-	status, _, _, err := cc.chainRW.UpdateForkChoice(ctx, head, head, finalized)
+func (cc *ExecutionClientDirect) ForkChoiceUpdate(ctx context.Context, finalized, safe, head libcommon.Hash, attr *engine_types.PayloadAttributes) ([]byte, error) {
+	status, _, _, err := cc.chainRW.UpdateForkChoice(ctx, head, safe, finalized)
 	if err != nil {
 		return nil, fmt.Errorf("execution Client RPC failed to retrieve ForkChoiceUpdate response, err: %w", err)
 	}

cl/phase1/execution_client/execution_client_rpc.go

@@ -154,10 +154,10 @@ func (cc *ExecutionClientRpc) NewPayload(
 	return newPayloadStatusByEngineStatus(payloadStatus.Status), checkPayloadStatus(payloadStatus)
 }
 
-func (cc *ExecutionClientRpc) ForkChoiceUpdate(ctx context.Context, finalized libcommon.Hash, head libcommon.Hash, attributes *engine_types.PayloadAttributes) ([]byte, error) {
+func (cc *ExecutionClientRpc) ForkChoiceUpdate(ctx context.Context, finalized, safe, head libcommon.Hash, attributes *engine_types.PayloadAttributes) ([]byte, error) {
 	forkChoiceRequest := engine_types.ForkChoiceState{
 		HeadHash:           head,
-		SafeBlockHash:      head,
+		SafeBlockHash:      safe,
 		FinalizedBlockHash: finalized,
 	}
 	forkChoiceResp := &engine_types.ForkChoiceUpdatedResponse{}

cl/phase1/execution_client/interface.go

@@ -37,7 +37,7 @@ var errContextExceeded = "rpc error: code = DeadlineExceeded desc = context dead
 //go:generate mockgen -typed=true -source=./interface.go -destination=./execution_engine_mock.go -package=execution_client . ExecutionEngine
 type ExecutionEngine interface {
 	NewPayload(ctx context.Context, payload *cltypes.Eth1Block, beaconParentRoot *libcommon.Hash, versionedHashes []libcommon.Hash, executionRequestsList []hexutility.Bytes) (PayloadStatus, error)
-	ForkChoiceUpdate(ctx context.Context, finalized libcommon.Hash, head libcommon.Hash, attributes *engine_types.PayloadAttributes) ([]byte, error)
+	ForkChoiceUpdate(ctx context.Context, finalized, safe, head libcommon.Hash, attributes *engine_types.PayloadAttributes) ([]byte, error)
 	SupportInsertion() bool
 	InsertBlocks(ctx context.Context, blocks []*types.Block, wait bool) error
 	InsertBlock(ctx context.Context, block *types.Block) error

cl/phase1/stages/forkchoice.go

@@ -61,12 +61,14 @@ func computeAndNotifyServicesOfNewForkChoice(ctx context.Context, logger log.Log
 	// Perform fork choice update if the engine is available
 	if cfg.forkChoice.Engine() != nil {
 		finalizedCheckpoint := cfg.forkChoice.FinalizedCheckpoint()
+		justifiedCheckpoint := cfg.forkChoice.JustifiedCheckpoint()
 		logger.Debug("Caplin is sending forkchoice")
 
 		// Run fork choice update with finalized checkpoint and head
 		if _, err = cfg.forkChoice.Engine().ForkChoiceUpdate(
 			ctx,
 			cfg.forkChoice.GetEth1Hash(finalizedCheckpoint.Root),
+			cfg.forkChoice.GetEth1Hash(justifiedCheckpoint.Root),
 			cfg.forkChoice.GetEth1Hash(headRoot), nil,
 		); err != nil {
 			err = fmt.Errorf("failed to run forkchoice: %w", err)