[pull] master from bnb-chain:master

.github/workflows/nancy.yml

@@ -1,8 +1,9 @@
 name: Go Nancy
 
 on:
-    # Scan changed files in PRs (diff-aware scanning):
-    pull_request: {}
+    # Scan changed files in PRs from same repository only:
+    pull_request:
+      types: [opened, synchronize, reopened]
     # Scan on-demand through GitHub Actions interface:
     workflow_dispatch: {}
     # Scan mainline branches and report all findings:
@@ -11,27 +12,36 @@ on:
 
 jobs:
   build:
+    if: github.event.pull_request.head.repo.full_name == github.repository
     strategy:
         matrix:
           go-version: [1.24.x]
           os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
     steps:
     - name: Check out code into the Go module directory
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     - name: Set up Go 1.x in order to write go.list file
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v4
       with:
         go-version: ${{ matrix.go-version }}
 
-    - name: Go mod tidy
-      run: go mod tidy
+    - name: Install Nancy
+      run: |
+        curl -sSL -o nancy https://github.com/sonatype-nexus-community/nancy/releases/download/v1.0.52/nancy-v1.0.52-linux-amd64
+        chmod +x nancy
+        sudo mv nancy /usr/local/bin/
+        file /usr/local/bin/nancy
 
-    - name: WriteGoList
-      run:  go list -json -deps ./... > go.list
-
-    - name: Nancy
-      uses: sonatype-nexus-community/nancy-github-action@main
-      with:
-        nancyCommand: sleuth --loud
+    - name: Nancy Security Scan
+      shell: bash
+      env:
+        OSSINDEX_USERNAME: ${{ secrets.OSSINDEX_USERNAME }}
+        OSSINDEX_TOKEN: ${{ secrets.OSSINDEX_TOKEN }}
+      run: |
+        if [[ -z "${OSSINDEX_USERNAME:-}" || -z "${OSSINDEX_TOKEN:-}" ]]; then
+          echo "::error::Missing OSS Index credentials"
+        fi
+
+        go list -json -deps ./... | nancy sleuth --username "${OSSINDEX_USERNAME}" --token "${OSSINDEX_TOKEN}"

CHANGELOG.md

@@ -1,6 +1,32 @@
 # Changelog
+
+## v1.6.2
+### FEATURE
+[\#3363](https://github.com/bnb-chain/bsc/pull/3363) websocket: add transactionReceipts for receipts notification
+[\#3367](https://github.com/bnb-chain/bsc/pull/3367) BEP-619: Short Block Interval Phase Three: 0.45 Seconds
+[\#3368](https://github.com/bnb-chain/bsc/pull/3368) BEP-590: Extended Voting Rules for Fast Finality Stability
+[\#3374](https://github.com/bnb-chain/bsc/pull/3374) Implement BEP-592: Non-Consensus Based Block-Level Access List
+[\#3372](https://github.com/bnb-chain/bsc/pull/3372) core/systemcontracts: define fermiUpgrade
+[\#3390](https://github.com/bnb-chain/bsc/pull/3390) feat: implement incremental snapshot
+[\#3395](https://github.com/bnb-chain/bsc/pull/3395) feat: EVM execution opcode level optimization
+[\#3400](https://github.com/bnb-chain/bsc/pull/3400) consensus/parlia: set kAncestorGenerationDepth to 3 in BEP-590
+[\#3397](https://github.com/bnb-chain/bsc/pull/3397) consensus/parlia: fix updateAttestation&improve assembleVoteAttestation
+[\#0000](https://github.com/bnb-chain/bsc/pull/0000) p2p: define ProxyedNodeIds in Config #3417
+
+### BUGFIX
+[\#3373](https://github.com/bnb-chain/bsc/pull/3373) ethapi: reject oversize storage keys before hex decode
+
+### IMPROVEMENT
+[\#3388](https://github.com/bnb-chain/bsc/pull/3388) miner/minerconfig: update config to adapt 100M gaslimit
+[\#3404](https://github.com/bnb-chain/bsc/pull/3404) miner: validator not inturn backoff before mining
+[\#3407](https://github.com/bnb-chain/bsc/pull/3407) fix: change lock to read lock in legacy pool
+[\#3415](https://github.com/bnb-chain/bsc/pull/3415) eth: broadcast votes to evn peers regardless of deltaTdThreshold
+[\#3416](https://github.com/bnb-chain/bsc/pull/3416) cmd/geth: improve config for sentry nodes when init network
+[\#3419](https://github.com/bnb-chain/bsc/pull/3419) miner: use latest block as pending block for simplicity
+[\#3426](https://github.com/bnb-chain/bsc/pull/3426) eth: increase the delta td threshold to broadcast votes
+
 ## v1.6.1
-v1.6.1-alpha is a preview release, which fixes several issues of the v1.6.0-alpha, it is more reliable than v1.6.0-alpha, so mark it as beta stage.
+v1.6.1-beta is a preview release, which fixes several issues of the v1.6.0-alpha, it is more reliable than v1.6.0-alpha, so mark it as beta stage.
 
 ### FEATURE
 NA

cmd/evm/main.go

@@ -114,6 +114,12 @@ var (
 		Category: traceCategory,
 	}
 
+	// Vm flags.
+	VMOpcodeOptimizeFlag = &cli.BoolFlag{
+		Name:  "vm.opcode.optimize",
+		Usage: "enable opcode optimization",
+	}
+
 	// Deprecated flags.
 	DebugFlag = &cli.BoolFlag{
 		Name:     "debug",

cmd/evm/runner.go

@@ -284,7 +284,8 @@ func runCmd(ctx *cli.Context) error {
 		BlobHashes:  blobHashes,
 		BlobBaseFee: blobBaseFee,
 		EVMConfig: vm.Config{
-			Tracer: tracer,
+			Tracer:                    tracer,
+			EnableOpcodeOptimizations: ctx.Bool(VMOpcodeOptimizeFlag.Name),
 		},
 	}
 

cmd/evm/testdata/eof/results.initcode.txt

@@ -202,38 +202,38 @@ ERR: undefined instruction: op opcode 0xac not defined, pos 0
 ERR: undefined instruction: op opcode 0xad not defined, pos 0
 ERR: undefined instruction: op opcode 0xae not defined, pos 0
 ERR: undefined instruction: op opcode 0xaf not defined, pos 0
-ERR: undefined instruction: op opcode 0xb0 not defined, pos 0
-ERR: undefined instruction: op opcode 0xb1 not defined, pos 0
-ERR: undefined instruction: op opcode 0xb2 not defined, pos 0
-ERR: undefined instruction: op opcode 0xb3 not defined, pos 0
-ERR: undefined instruction: op opcode 0xb4 not defined, pos 0
-ERR: undefined instruction: op opcode 0xb5 not defined, pos 0
-ERR: undefined instruction: op opcode 0xb6 not defined, pos 0
-ERR: undefined instruction: op opcode 0xb7 not defined, pos 0
-ERR: undefined instruction: op opcode 0xb8 not defined, pos 0
-ERR: undefined instruction: op opcode 0xb9 not defined, pos 0
-ERR: undefined instruction: op opcode 0xba not defined, pos 0
-ERR: undefined instruction: op opcode 0xbb not defined, pos 0
-ERR: undefined instruction: op opcode 0xbc not defined, pos 0
-ERR: undefined instruction: op opcode 0xbd not defined, pos 0
-ERR: undefined instruction: op opcode 0xbe not defined, pos 0
-ERR: undefined instruction: op opcode 0xbf not defined, pos 0
-ERR: undefined instruction: op opcode 0xc0 not defined, pos 0
-ERR: undefined instruction: op opcode 0xc1 not defined, pos 0
-ERR: undefined instruction: op opcode 0xc2 not defined, pos 0
-ERR: undefined instruction: op opcode 0xc3 not defined, pos 0
-ERR: undefined instruction: op opcode 0xc4 not defined, pos 0
-ERR: undefined instruction: op opcode 0xc5 not defined, pos 0
-ERR: undefined instruction: op opcode 0xc6 not defined, pos 0
-ERR: undefined instruction: op opcode 0xc7 not defined, pos 0
-ERR: undefined instruction: op opcode 0xc8 not defined, pos 0
-ERR: undefined instruction: op opcode 0xc9 not defined, pos 0
-ERR: undefined instruction: op opcode 0xca not defined, pos 0
-ERR: undefined instruction: op opcode 0xcb not defined, pos 0
-ERR: undefined instruction: op opcode 0xcc not defined, pos 0
-ERR: undefined instruction: op opcode 0xcd not defined, pos 0
-ERR: undefined instruction: op opcode 0xce not defined, pos 0
-ERR: undefined instruction: op opcode 0xcf not defined, pos 0
+ERR: undefined instruction: op NOP, pos 0
+ERR: undefined instruction: op ANDSWAP1POPSWAP2SWAP1, pos 0
+ERR: undefined instruction: op SWAP2SWAP1POPJUMP, pos 0
+ERR: undefined instruction: op SWAP1POPSWAP2SWAP1, pos 0
+ERR: undefined instruction: op POPSWAP2SWAP1POP, pos 0
+ERR: undefined instruction: op PUSH2JUMP, pos 0
+ERR: undefined instruction: op PUSH2JUMPI, pos 0
+ERR: undefined instruction: op PUSH1PUSH1, pos 0
+ERR: undefined instruction: op PUSH1ADD, pos 0
+ERR: undefined instruction: op PUSH1SHL, pos 0
+ERR: undefined instruction: op PUSH1DUP1, pos 0
+ERR: undefined instruction: op SWAP1POP, pos 0
+ERR: undefined instruction: op POPJUMP, pos 0
+ERR: undefined instruction: op POP2, pos 0
+ERR: undefined instruction: op SWAP2SWAP1, pos 0
+ERR: undefined instruction: op SWAP2POP, pos 0
+ERR: undefined instruction: op DUP2LT, pos 0
+ERR: undefined instruction: op JUMPIFZERO, pos 0
+ERR: undefined instruction: op ISZEROPUSH2, pos 0
+ERR: undefined instruction: op DUP2MSTOREPUSH1ADD, pos 0
+ERR: undefined instruction: op DUP1PUSH4EQPUSH2, pos 0
+ERR: undefined instruction: op PUSH1CALLDATALOADPUSH1SHRDUP1PUSH4GTPUSH2, pos 0
+ERR: undefined instruction: op PUSH1PUSH1PUSH1SHLSUB, pos 0
+ERR: undefined instruction: op ANDDUP2ADDSWAP1DUP2LT, pos 0
+ERR: undefined instruction: op SWAP1PUSH1DUP1NOTSWAP2ADDANDDUP2ADDSWAP1DUP2LT, pos 0
+ERR: undefined instruction: op DUP3AND, pos 0
+ERR: undefined instruction: op SWAP2SWAP1DUP3SUBSWAP2DUP3GTPUSH2, pos 0
+ERR: undefined instruction: op SWAP1DUP2, pos 0
+ERR: undefined instruction: op SHRSHRDUP1MULDUP1, pos 0
+ERR: undefined instruction: op SWAP3POPPOPPOP, pos 0
+ERR: undefined instruction: op SUBSLTISZEROPUSH2, pos 0
+ERR: undefined instruction: op DUP11MULDUP3SUBMULDUP1, pos 0
 ERR: undefined instruction: op opcode 0xd4 not defined, pos 0
 ERR: undefined instruction: op opcode 0xd5 not defined, pos 0
 ERR: undefined instruction: op opcode 0xd6 not defined, pos 0
@@ -2250,7 +2250,7 @@ ERR: invalid jump destination: out-of-bounds offset: offset -21151, dest -20628,
 ERR: initcode contains a RETURN or STOP opcode
 ERR: initcode contains a RETURN or STOP opcode
 ERR: initcode contains a RETURN or STOP opcode
-ERR: undefined instruction: op opcode 0xc8 not defined, pos 1179
+ERR: undefined instruction: op SWAP1PUSH1DUP1NOTSWAP2ADDANDDUP2ADDSWAP1DUP2LT, pos 1179
 ERR: invalid dataloadN argument: arg 5, last 32, pos 1728
 ERR: invalid dataloadN argument: arg 62719, last 32, pos 945
 ERR: invalid dataloadN argument: arg 16, last 32, pos 771

cmd/evm/testdata/eof/results.regular.txt

@@ -202,38 +202,38 @@ ERR: undefined instruction: op opcode 0xac not defined, pos 0
 ERR: undefined instruction: op opcode 0xad not defined, pos 0
 ERR: undefined instruction: op opcode 0xae not defined, pos 0
 ERR: undefined instruction: op opcode 0xaf not defined, pos 0
-ERR: undefined instruction: op opcode 0xb0 not defined, pos 0
-ERR: undefined instruction: op opcode 0xb1 not defined, pos 0
-ERR: undefined instruction: op opcode 0xb2 not defined, pos 0
-ERR: undefined instruction: op opcode 0xb3 not defined, pos 0
-ERR: undefined instruction: op opcode 0xb4 not defined, pos 0
-ERR: undefined instruction: op opcode 0xb5 not defined, pos 0
-ERR: undefined instruction: op opcode 0xb6 not defined, pos 0
-ERR: undefined instruction: op opcode 0xb7 not defined, pos 0
-ERR: undefined instruction: op opcode 0xb8 not defined, pos 0
-ERR: undefined instruction: op opcode 0xb9 not defined, pos 0
-ERR: undefined instruction: op opcode 0xba not defined, pos 0
-ERR: undefined instruction: op opcode 0xbb not defined, pos 0
-ERR: undefined instruction: op opcode 0xbc not defined, pos 0
-ERR: undefined instruction: op opcode 0xbd not defined, pos 0
-ERR: undefined instruction: op opcode 0xbe not defined, pos 0
-ERR: undefined instruction: op opcode 0xbf not defined, pos 0
-ERR: undefined instruction: op opcode 0xc0 not defined, pos 0
-ERR: undefined instruction: op opcode 0xc1 not defined, pos 0
-ERR: undefined instruction: op opcode 0xc2 not defined, pos 0
-ERR: undefined instruction: op opcode 0xc3 not defined, pos 0
-ERR: undefined instruction: op opcode 0xc4 not defined, pos 0
-ERR: undefined instruction: op opcode 0xc5 not defined, pos 0
-ERR: undefined instruction: op opcode 0xc6 not defined, pos 0
-ERR: undefined instruction: op opcode 0xc7 not defined, pos 0
-ERR: undefined instruction: op opcode 0xc8 not defined, pos 0
-ERR: undefined instruction: op opcode 0xc9 not defined, pos 0
-ERR: undefined instruction: op opcode 0xca not defined, pos 0
-ERR: undefined instruction: op opcode 0xcb not defined, pos 0
-ERR: undefined instruction: op opcode 0xcc not defined, pos 0
-ERR: undefined instruction: op opcode 0xcd not defined, pos 0
-ERR: undefined instruction: op opcode 0xce not defined, pos 0
-ERR: undefined instruction: op opcode 0xcf not defined, pos 0
+ERR: undefined instruction: op NOP, pos 0
+ERR: undefined instruction: op ANDSWAP1POPSWAP2SWAP1, pos 0
+ERR: undefined instruction: op SWAP2SWAP1POPJUMP, pos 0
+ERR: undefined instruction: op SWAP1POPSWAP2SWAP1, pos 0
+ERR: undefined instruction: op POPSWAP2SWAP1POP, pos 0
+ERR: undefined instruction: op PUSH2JUMP, pos 0
+ERR: undefined instruction: op PUSH2JUMPI, pos 0
+ERR: undefined instruction: op PUSH1PUSH1, pos 0
+ERR: undefined instruction: op PUSH1ADD, pos 0
+ERR: undefined instruction: op PUSH1SHL, pos 0
+ERR: undefined instruction: op PUSH1DUP1, pos 0
+ERR: undefined instruction: op SWAP1POP, pos 0
+ERR: undefined instruction: op POPJUMP, pos 0
+ERR: undefined instruction: op POP2, pos 0
+ERR: undefined instruction: op SWAP2SWAP1, pos 0
+ERR: undefined instruction: op SWAP2POP, pos 0
+ERR: undefined instruction: op DUP2LT, pos 0
+ERR: undefined instruction: op JUMPIFZERO, pos 0
+ERR: undefined instruction: op ISZEROPUSH2, pos 0
+ERR: undefined instruction: op DUP2MSTOREPUSH1ADD, pos 0
+ERR: undefined instruction: op DUP1PUSH4EQPUSH2, pos 0
+ERR: undefined instruction: op PUSH1CALLDATALOADPUSH1SHRDUP1PUSH4GTPUSH2, pos 0
+ERR: undefined instruction: op PUSH1PUSH1PUSH1SHLSUB, pos 0
+ERR: undefined instruction: op ANDDUP2ADDSWAP1DUP2LT, pos 0
+ERR: undefined instruction: op SWAP1PUSH1DUP1NOTSWAP2ADDANDDUP2ADDSWAP1DUP2LT, pos 0
+ERR: undefined instruction: op DUP3AND, pos 0
+ERR: undefined instruction: op SWAP2SWAP1DUP3SUBSWAP2DUP3GTPUSH2, pos 0
+ERR: undefined instruction: op SWAP1DUP2, pos 0
+ERR: undefined instruction: op SHRSHRDUP1MULDUP1, pos 0
+ERR: undefined instruction: op SWAP3POPPOPPOP, pos 0
+ERR: undefined instruction: op SUBSLTISZEROPUSH2, pos 0
+ERR: undefined instruction: op DUP11MULDUP3SUBMULDUP1, pos 0
 ERR: undefined instruction: op opcode 0xd4 not defined, pos 0
 ERR: undefined instruction: op opcode 0xd5 not defined, pos 0
 ERR: undefined instruction: op opcode 0xd6 not defined, pos 0
@@ -2250,7 +2250,7 @@ ERR: invalid jump destination: out-of-bounds offset: offset -21151, dest -20628,
 ERR: invalid dataloadN argument: arg 24833, last 0, pos 1397
 ERR: invalid jump destination: out-of-bounds offset: offset 24833, dest 26278, pos 1443
 ERR: stack limit reached 1048 (1024): at pos 75
-ERR: undefined instruction: op opcode 0xc8 not defined, pos 1179
+ERR: undefined instruction: op SWAP1PUSH1DUP1NOTSWAP2ADDANDDUP2ADDSWAP1DUP2LT, pos 1179
 ERR: invalid dataloadN argument: arg 5, last 32, pos 1728
 ERR: invalid dataloadN argument: arg 62719, last 32, pos 945
 ERR: invalid dataloadN argument: arg 16, last 32, pos 771

cmd/geth/chaincmd.go

@@ -363,7 +363,7 @@ func initGenesis(ctx *cli.Context) error {
 		log.Warn("Multi-database is an experimental feature")
 	}
 
-	triedb := utils.MakeTrieDatabase(ctx, stack, chaindb, ctx.Bool(utils.CachePreimagesFlag.Name), false, genesis.IsVerkle())
+	triedb := utils.MakeTrieDatabase(ctx, stack, chaindb, ctx.Bool(utils.CachePreimagesFlag.Name), false, genesis.IsVerkle(), false)
 	defer triedb.Close()
 
 	_, hash, compatErr, err := core.SetupGenesisBlockWithOverride(chaindb, triedb, genesis, &overrides)
@@ -521,7 +521,6 @@ func initNetwork(ctx *cli.Context) error {
 		sentryEnodes          []*enode.Node
 		sentryNodeIDs         []enode.ID
 		connectOneExtraEnodes bool
-		staticConnect         bool
 	)
 	if enableSentryNode {
 		sentryConfigs, sentryEnodes, err = createSentryNodeConfigs(ctx, config, initDir)
@@ -533,10 +532,9 @@ func initNetwork(ctx *cli.Context) error {
 			sentryNodeIDs[i] = sentryEnodes[i].ID()
 		}
 		connectOneExtraEnodes = true
-		staticConnect = true
 	}
 
-	configs, enodes, accounts, err := createConfigs(config, initDir, "node", ips, ports, sentryEnodes, connectOneExtraEnodes, staticConnect)
+	configs, enodes, accounts, err := createConfigs(config, initDir, "node", ips, ports, sentryEnodes, connectOneExtraEnodes, true)
 	if err != nil {
 		utils.Fatalf("Failed to create node configs: %v", err)
 	}
@@ -549,6 +547,7 @@ func initNetwork(ctx *cli.Context) error {
 	if enableSentryNode {
 		for i := 0; i < len(sentryConfigs); i++ {
 			sentryConfigs[i].Node.P2P.ProxyedValidatorAddresses = accounts[i]
+			sentryConfigs[i].Node.P2P.ProxyedNodeIds = []enode.ID{nodeIDs[i]}
 		}
 	}
 	if ctx.Bool(utils.InitEVNValidatorWhitelist.Name) {
@@ -563,7 +562,8 @@ func initNetwork(ctx *cli.Context) error {
 	}
 	if enableSentryNode && ctx.Bool(utils.InitEVNSentryWhitelist.Name) {
 		for i := 0; i < len(sentryConfigs); i++ {
-			sentryConfigs[i].Node.P2P.EVNNodeIdsWhitelist = sentryNodeIDs
+			sentryConfigs[i].Node.P2P.EVNNodeIdsWhitelist = append([]enode.ID{}, sentryNodeIDs...)
+			sentryConfigs[i].Node.P2P.EVNNodeIdsWhitelist[i] = nodeIDs[i]
 		}
 	}
 	if enableSentryNode && ctx.Bool(utils.InitEVNSentryRegister.Name) {
@@ -587,11 +587,9 @@ func initNetwork(ctx *cli.Context) error {
 	}
 
 	if ctx.Int(utils.InitFullNodeSize.Name) > 0 {
-		var extraEnodes []*enode.Node
+		extraEnodes := enodes
 		if enableSentryNode {
 			extraEnodes = sentryEnodes
-		} else {
-			extraEnodes = enodes
 		}
 		_, _, err := createAndSaveFullNodeConfigs(ctx, inGenesisFile, config, initDir, extraEnodes)
 		if err != nil {
@@ -1091,7 +1089,7 @@ func dump(ctx *cli.Context) error {
 		return err
 	}
 	defer db.Close()
-	triedb := utils.MakeTrieDatabase(ctx, stack, db, true, true, false) // always enable preimage lookup
+	triedb := utils.MakeTrieDatabase(ctx, stack, db, true, true, false, false) // always enable preimage lookup
 	defer triedb.Close()
 
 	state, err := state.New(root, state.NewDatabase(triedb, nil))

cmd/geth/config.go

@@ -280,7 +280,7 @@ func makeFullNode(ctx *cli.Context) (*node.Node, ethapi.Backend) {
 	}
 	if ctx.IsSet(utils.OverrideMinBlocksForBlobRequests.Name) {
 		params.MinBlocksForBlobRequests = ctx.Uint64(utils.OverrideMinBlocksForBlobRequests.Name)
-		params.MinTimeDurationForBlobRequests = uint64(float64(params.MinBlocksForBlobRequests) * 0.75 /*maxwellBlockInterval*/)
+		params.MinTimeDurationForBlobRequests = uint64(float64(params.MinBlocksForBlobRequests) * 0.45 /*fermiBlockInterval*/)
 	}
 	if ctx.IsSet(utils.OverrideDefaultExtraReserveForBlobRequests.Name) {
 		params.DefaultExtraReserveForBlobRequests = ctx.Uint64(utils.OverrideDefaultExtraReserveForBlobRequests.Name)