Merge pull request bnb-chain#3170 from bnb-chain/develop

Draft release v1.5.17

Author: zzzckck

.github/workflows/docker-release.yml

@@ -5,47 +5,111 @@ on:
     # Publish `v1.2.3` tags as releases.
     tags:
       - v*
-
 env:
-  IMAGE_NAME: bsc
+  REGISTRY: ghcr.io
+  REGISTRY_IMAGE: ${{ github.repository }}
 
 jobs:
-  # Push image to GitHub Packages.
-  push:
-    runs-on: ubuntu-latest
-    if: github.event_name == 'push'
-
+  build:
+    strategy:
+      matrix:
+        include:
+          - os: ubuntu-24.04
+            platform_pair: linux-amd64
+          - os: ubuntu-24.04-arm
+            platform_pair: linux-arm64
+    runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v3
 
-      - name: Build image
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Docker
+        uses: docker/setup-docker-action@v4
+        with:
+          daemon-config: |
+            {
+              "features": {
+                "containerd-snapshotter": true
+              }
+            }
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ env.REGISTRY }}/${{ env.REGISTRY_IMAGE }}
+          labels: |
+            org.opencontainers.image.licenses=LGPL-3.0,GPL-3.0
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.PACKAGE_TOKEN }}
+
+      - name: Build and push
+        id: build
+        uses: docker/build-push-action@v6
+        with:
+          outputs: type=image,push-by-digest=true,name-canonical=true,push=true
+          tags: ${{ env.REGISTRY }}/${{ env.REGISTRY_IMAGE }}
+          labels: ${{ steps.meta.outputs.labels }}
+
+      - name: Export digest
         run: |
-            docker build . \
-            --label "org.opencontainers.image.source=${{ secrets.IMAGE_SOURCE }}" \
-            --label "org.opencontainers.image.revision=$(git rev-parse HEAD)" \
-            --label "org.opencontainers.image.version=$(git describe --tags --abbrev=0)" \
-            --label "org.opencontainers.image.licenses=LGPL-3.0,GPL-3.0" \
-            -f ./Dockerfile -t "${IMAGE_NAME}"
+          mkdir -p ${{ runner.temp }}/digests
+          digest="${{ steps.build.outputs.digest }}"
+          touch "${{ runner.temp }}/digests/${digest#sha256:}"
+
+      - name: Upload digest
+        uses: actions/upload-artifact@v4
+        with:
+          name: digests-${{ matrix.platform_pair }}
+          path: ${{ runner.temp }}/digests/*
+          if-no-files-found: error
+          retention-days: 1
+  merge:
+    runs-on: ubuntu-latest
+    needs:
+      - build
+    steps:
+      - name: Download digests
+        uses: actions/download-artifact@v4
+        with:
+          path: ${{ runner.temp }}/digests
+          pattern: digests-*
+          merge-multiple: true
 
-      - name: Log into registry
-        run: echo "${{ secrets.PACKAGE_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.PACKAGE_TOKEN }}
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.REGISTRY_IMAGE }}
+          tags: |
+            type=semver,pattern={{version}}
+
+      - name: Create manifest list and push
+        working-directory: ${{ runner.temp }}/digests
+        run: |
+          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+            $(printf '${{ env.REGISTRY }}/${{ env.REGISTRY_IMAGE }}@sha256:%s ' *)
 
-      - name: Push image
+      - name: Inspect image
         run: |
-          IMAGE_ID=ghcr.io/${{ github.repository }}
-          
-          # Change all uppercase to lowercase
-          IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
-          # Strip git ref prefix from version
-          VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
-          # Strip "v" prefix from tag name
-          [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
-          # Use Docker `latest` tag convention
-          [ "$VERSION" == "master" ] && VERSION=latest
-          echo IMAGE_ID=$IMAGE_ID
-          echo VERSION=$VERSION
-          docker tag $IMAGE_NAME $IMAGE_ID:$VERSION
-          docker tag $IMAGE_NAME $IMAGE_ID:latest
-          docker push $IMAGE_ID:$VERSION
-          docker push $IMAGE_ID:latest
-          
+          docker buildx imagetools inspect ${{ env.REGISTRY }}/${{ env.REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }}

CHANGELOG.md

@@ -1,4 +1,25 @@
 # Changelog
+## v1.5.17
+### FEATURE
+[\#3141](https://github.com/bnb-chain/bsc/pull/3141) feat: support to disable txindexer;
+
+### BUGFIX
+[\#3157](https://github.com/bnb-chain/bsc/pull/3157) build(deps): bump github.com/pion/interceptor from 0.1.37 to 0.1.39
+[\#3167](https://github.com/bnb-chain/bsc/pull/3167) eth: not begin to sync during processing broadcasted blocks or hash
+
+### IMPROVEMENT
+[\#3140](https://github.com/bnb-chain/bsc/pull/3140) feat: remove gc restriction for large mem;
+[\#3135](https://github.com/bnb-chain/bsc/pull/3135) miner: simplify code for simulating bids
+[\#3151](https://github.com/bnb-chain/bsc/pull/3151) cmd/jsutils: add new builders for chapel net
+[\#3111](https://github.com/bnb-chain/bsc/pull/3111) config: default config values if not set in config.toml
+[\#3137](https://github.com/bnb-chain/bsc/pull/3137) Docker arm64 runners
+[\#3156](https://github.com/bnb-chain/bsc/pull/3156) vm: implement contract pool
+[\#3166](https://github.com/bnb-chain/bsc/pull/3166) chore: remove unused file
+[\#3164](https://github.com/bnb-chain/bsc/pull/3164) cmd/jsutils: add builders and improve output for getMevStatus
+[\#3139](https://github.com/bnb-chain/bsc/pull/3139) miner/worker: broadcast mined block immediately before wroten into db
+[\#3160](https://github.com/bnb-chain/bsc/pull/3160) miner: add more metrics for mev
+[\#3145](https://github.com/bnb-chain/bsc/pull/3145) miner: prefetch states for bids simulating
+
 ## v1.5.16
 ### FEATURE
 [\#3130](https://github.com/bnb-chain/bsc/pull/3130) config: update BSC Mainnet hardfork time: Maxwell

Dockerfile

@@ -20,7 +20,7 @@ ENV CGO_CFLAGS_ALLOW="-O -D__BLST_PORTABLE__"
 RUN cd /go-ethereum && go run build/ci.go install -static ./cmd/geth
 
 # Pull Geth into a second stage deploy alpine container
-FROM alpine:3.17
+FROM alpine:3.21
 
 ARG BSC_USER=bsc
 ARG BSC_USER_UID=1000

cmd/geth/chaincmd.go

@@ -64,6 +64,7 @@ var (
 			utils.OverridePassedForkTime,
 			utils.OverrideLorentz,
 			utils.OverrideMaxwell,
+			utils.OverrideFermi,
 			utils.OverrideVerkle,
 			utils.MultiDataBaseFlag,
 		}, utils.DatabaseFlags),
@@ -283,6 +284,10 @@ func initGenesis(ctx *cli.Context) error {
 		v := ctx.Uint64(utils.OverrideMaxwell.Name)
 		overrides.OverrideMaxwell = &v
 	}
+	if ctx.IsSet(utils.OverrideFermi.Name) {
+		v := ctx.Uint64(utils.OverrideFermi.Name)
+		overrides.OverrideFermi = &v
+	}
 	if ctx.IsSet(utils.OverrideVerkle.Name) {
 		v := ctx.Uint64(utils.OverrideVerkle.Name)
 		overrides.OverrideVerkle = &v

cmd/geth/config.go

@@ -216,6 +216,10 @@ func makeFullNode(ctx *cli.Context) (*node.Node, ethapi.Backend) {
 		v := ctx.Uint64(utils.OverrideMaxwell.Name)
 		cfg.Eth.OverrideMaxwell = &v
 	}
+	if ctx.IsSet(utils.OverrideFermi.Name) {
+		v := ctx.Uint64(utils.OverrideFermi.Name)
+		cfg.Eth.OverrideFermi = &v
+	}
 	if ctx.IsSet(utils.OverrideVerkle.Name) {
 		v := ctx.Uint64(utils.OverrideVerkle.Name)
 		cfg.Eth.OverrideVerkle = &v

cmd/geth/main.go

@@ -76,6 +76,7 @@ var (
 		utils.OverridePassedForkTime,
 		utils.OverrideLorentz,
 		utils.OverrideMaxwell,
+		utils.OverrideFermi,
 		utils.OverrideVerkle,
 		utils.OverrideFullImmutabilityThreshold,
 		utils.OverrideMinBlocksForBlobRequests,

cmd/jsutils/getchainstatus.js

@@ -247,17 +247,25 @@ const builderMap = new Map([
     ["0xb49f86586a840AB9920D2f340a85586E50FD30a2", "inblock eu"],
     ["0x0F6D8b72F3687de6f2824903a83B3ba13c0e88A0", "inblock us"],
     //      nodereal
-    ["0x79102dB16781ddDfF63F301C9Be557Fd1Dd48fA0", "nodereal ap x"],
+    ["0x79102dB16781ddDfF63F301C9Be557Fd1Dd48fA0", "nodereal ap"],
     ["0xd0d56b330a0dea077208b96910ce452fd77e1b6f", "nodereal eu"],
     ["0x4f24ce4cd03a6503de97cf139af2c26347930b99", "nodereal us"],
     //      xzbuilder
     ["0x812720cb4639550D7BDb1d8F2be463F4a9663762", "xzbuilder"],
 
     // Chapel
     ["0x627fE6AFA2E84e461CB7AE7C2c46e8adf9a954a2", "txboost"],
-    ["0x5EC60f73f938e36400ec3CC3Ff4d7a7703F7c005", "nodereal ap y"],
-    // ["0x4827b423D03a349b7519Dda537e9A28d31ecBB48", "puissant y"],
-    ["0x0eAbBdE133fbF3c5eB2BEE6F7c8210deEAA0f7db", "blockrazor"],
+    ["0x5EC60f73f938e36400ec3CC3Ff4d7a7703F7c005", "nodereal ap"],
+    ["0x6C98EB21139F6E12db5b78a4AeD4d8eBA147FB7b", "nodereal eu"],
+    // ["0x79102dB16781ddDfF63F301C9Be557Fd1Dd48fA0", "nodereal us"],
+    ["0x4827b423D03a349b7519Dda537e9A28d31ecBB48", "club48 ap"],
+    ["0x48B2665E5E9a343409199D70F7495c8aB660BB48", "club48 eu"],
+    ["0x48B4bBEbF0655557A461e91B8905b85864B8BB48", "club48 us"],
+    ["0x0eAbBdE133fbF3c5eB2BEE6F7c8210deEAA0f7db", "blockrazor ap"],
+    ["0x95c8436143c82Ea4d3529A3ed8DDa9998F6daC5F", "blockrazor eu"],
+    ["0xb71Ba9e570ee20E983De1d5aE01baf5dCB4e4299", "blockrazor us"],
+    ["0x7b3ee856c98b1bb3689ef7f90477df2927fcbdb6",  "trustnet"],
+    ["0xA8caEc0D68a90Ac971EA1aDEFA1747447e1f9871",  "blockroute"],
 ]);
 
 // 1.cmd: "GetMaxTxCountInBlockRange", usage:
@@ -749,16 +757,7 @@ async function getEip7623() {
 async function getMevStatus() {
     let counts = {
         local: 0,
-        blockrazor: 0,
-        puissant: 0,
-        blockroute: 0,
-        jetbldr: 0,
-        txboost: 0,
-        blockbus: 0,
-        darwin: 0,
-        inblock: 0,
-        nodereal: 0,
-        xzbuilder: 0,
+        ...Object.fromEntries([...new Set(builderMap.values())].map(builder => [builder, 0]))
     };
 
     // Get the latest block number
@@ -813,11 +812,7 @@ async function getMevStatus() {
         for (const txData of txResults) {
             if (builderMap.has(txData.to)) {
                 const builder = builderMap.get(txData.to);
-                const builderKey = Object.keys(counts).find(key => builder.includes(key));
-
-                if (builderKey) {
-                    counts[builderKey]++;
-                }
+                counts[builder]++;
 
                 mevBlock = true;
                 console.log(
@@ -844,10 +839,16 @@ async function getMevStatus() {
     console.log(`Range: [${startBlock}, ${endBlock}]`);
     console.log(`Total Blocks: ${total}`);
     console.log("\nBuilder Distribution:");
-    Object.entries(counts).forEach(([key, value]) => {
-        const ratio = (value *100 / total).toFixed(2);
-        console.log(`${key.padEnd(10)}: ${value.toString().padStart(3)} blocks (${ratio}%)`);
-    });
+    const localRatio = (counts.local * 100 / total).toFixed(2);
+    console.log(`${"local".padEnd(maxBuilderLength)}: ${counts.local.toString().padStart(3)} blocks (${localRatio}%)`);
+
+    Object.entries(counts)
+        .filter(([key, value]) => key !== "local" && value > 0)
+        .sort(([a], [b]) => a.localeCompare(b))
+        .forEach(([key, value]) => {
+            const ratio = (value * 100 / total).toFixed(2);
+            console.log(`${key.padEnd(maxBuilderLength)}: ${value.toString().padStart(3)} blocks (${ratio}%)`);
+        });
 }
 
 // 11.cmd: "getLargeTxs", usage:

cmd/utils/flags.go

@@ -311,6 +311,11 @@ var (
 		Usage:    "Manually specify the Maxwell fork timestamp, overriding the bundled setting",
 		Category: flags.EthCategory,
 	}
+	OverrideFermi = &cli.Uint64Flag{
+		Name:     "override.fermi",
+		Usage:    "Manually specify the Fermi fork timestamp, overriding the bundled setting",
+		Category: flags.EthCategory,
+	}
 	OverrideVerkle = &cli.Uint64Flag{
 		Name:     "override.verkle",
 		Usage:    "Manually specify the Verkle fork timestamp, overriding the bundled setting",
@@ -826,6 +831,7 @@ var (
 		Value:    strings.Join(node.DefaultConfig.GraphQLVirtualHosts, ","),
 		Category: flags.APICategory,
 	}
+
 	WSEnabledFlag = &cli.BoolFlag{
 		Name:     "ws",
 		Usage:    "Enable the WS-RPC server",
@@ -2025,12 +2031,17 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *ethconfig.Config) {
 			ctx.Set(CacheFlag.Name, strconv.Itoa(allowance))
 		}
 	}
-	// Ensure Go's GC ignores the database cache for trigger percentage
-	cache := ctx.Int(CacheFlag.Name)
-	gogc := math.Max(20, math.Min(100, 100/(float64(cache)/1024)))
+	// if the total memory is greater than 64GB, skip the GC trigger sanitization
+	if err == nil && int(mem.Total/1024/1024) > 64000 {
+		log.Info("Skipping Go's GC trigger sanitization", "total", mem.Total/1024/1024)
+	} else {
+		// Ensure Go's GC ignores the database cache for trigger percentage
+		cache := ctx.Int(CacheFlag.Name)
+		gogc := math.Max(20, math.Min(100, 100/(float64(cache)/1024)))
 
-	log.Debug("Sanitizing Go's GC trigger", "percent", int(gogc))
-	godebug.SetGCPercent(int(gogc))
+		log.Info("Sanitizing Go's GC trigger", "percent", int(gogc))
+		godebug.SetGCPercent(int(gogc))
+	}
 
 	if ctx.IsSet(SyncTargetFlag.Name) {
 		cfg.SyncMode = ethconfig.FullSync // dev sync target forces full sync
@@ -2491,7 +2502,7 @@ func parseMiningFeatures(ctx *cli.Context, cfg *ethconfig.Config) string {
 		return ""
 	}
 	var features []string
-	if cfg.Miner.Mev.Enabled {
+	if cfg.Miner.Mev.Enabled != nil && *cfg.Miner.Mev.Enabled {
 		features = append(features, "MEV")
 	}
 	if cfg.Miner.VoteEnable {

consensus/misc/eip4844/eip4844.go

@@ -83,7 +83,7 @@ func CalcExcessBlobGas(config *params.ChainConfig, parent *types.Header, headTim
 func CalcBlobFee(config *params.ChainConfig, header *types.Header) *big.Int {
 	var frac uint64
 	switch config.LatestFork(header.Time) {
-	case forks.Maxwell, forks.Lorentz, forks.Prague:
+	case forks.Fermi, forks.Maxwell, forks.Lorentz, forks.Prague:
 		frac = config.BlobScheduleConfig.Prague.UpdateFraction
 	case forks.Cancun:
 		frac = config.BlobScheduleConfig.Cancun.UpdateFraction