Skip to content

Commit d7e572d

Browse files
brilliant-lxbrilliant-lx
authored
Merge pull request #3387 from bnb-chain/develop
Draft release v1.6.2
2 parents 91e0d26 + f59453b commit d7e572d

File tree

132 files changed

+13763
-748
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

132 files changed

+13763
-748
lines changed

‎.github/workflows/nancy.yml‎

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
name: Go Nancy
22

33
on:
4-
# Scan changed files in PRs (diff-aware scanning):
5-
pull_request: {}
4+
# Scan changed files in PRs from same repository only:
5+
pull_request:
6+
types: [opened, synchronize, reopened]
67
# Scan on-demand through GitHub Actions interface:
78
workflow_dispatch: {}
89
# Scan mainline branches and report all findings:
@@ -11,27 +12,36 @@ on:
1112

1213
jobs:
1314
build:
15+
if: github.event.pull_request.head.repo.full_name == github.repository
1416
strategy:
1517
matrix:
1618
go-version: [1.24.x]
1719
os: [ubuntu-latest]
1820
runs-on: ${{ matrix.os }}
1921
steps:
2022
- name: Check out code into the Go module directory
21-
uses: actions/checkout@v2
23+
uses: actions/checkout@v4
2224

2325
- name: Set up Go 1.x in order to write go.list file
24-
uses: actions/setup-go@v2
26+
uses: actions/setup-go@v4
2527
with:
2628
go-version: ${{ matrix.go-version }}
2729

28-
- name: Go mod tidy
29-
run: go mod tidy
30+
- name: Install Nancy
31+
run: |
32+
curl -sSL -o nancy https://github.com/sonatype-nexus-community/nancy/releases/download/v1.0.52/nancy-v1.0.52-linux-amd64
33+
chmod +x nancy
34+
sudo mv nancy /usr/local/bin/
35+
file /usr/local/bin/nancy
3036
31-
- name: WriteGoList
32-
run: go list -json -deps ./... > go.list
33-
34-
- name: Nancy
35-
uses: sonatype-nexus-community/nancy-github-action@main
36-
with:
37-
nancyCommand: sleuth --loud
37+
- name: Nancy Security Scan
38+
shell: bash
39+
env:
40+
OSSINDEX_USERNAME: ${{ secrets.OSSINDEX_USERNAME }}
41+
OSSINDEX_TOKEN: ${{ secrets.OSSINDEX_TOKEN }}
42+
run: |
43+
if [[ -z "${OSSINDEX_USERNAME:-}" || -z "${OSSINDEX_TOKEN:-}" ]]; then
44+
echo "::error::Missing OSS Index credentials"
45+
fi
46+
47+
go list -json -deps ./... | nancy sleuth --username "${OSSINDEX_USERNAME}" --token "${OSSINDEX_TOKEN}"

‎CHANGELOG.md‎

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,32 @@
11
# Changelog
2+
3+
## v1.6.2
4+
### FEATURE
5+
[\#3363](https://github.com/bnb-chain/bsc/pull/3363) websocket: add transactionReceipts for receipts notification
6+
[\#3367](https://github.com/bnb-chain/bsc/pull/3367) BEP-619: Short Block Interval Phase Three: 0.45 Seconds
7+
[\#3368](https://github.com/bnb-chain/bsc/pull/3368) BEP-590: Extended Voting Rules for Fast Finality Stability
8+
[\#3374](https://github.com/bnb-chain/bsc/pull/3374) Implement BEP-592: Non-Consensus Based Block-Level Access List
9+
[\#3372](https://github.com/bnb-chain/bsc/pull/3372) core/systemcontracts: define fermiUpgrade
10+
[\#3390](https://github.com/bnb-chain/bsc/pull/3390) feat: implement incremental snapshot
11+
[\#3395](https://github.com/bnb-chain/bsc/pull/3395) feat: EVM execution opcode level optimization
12+
[\#3400](https://github.com/bnb-chain/bsc/pull/3400) consensus/parlia: set kAncestorGenerationDepth to 3 in BEP-590
13+
[\#3397](https://github.com/bnb-chain/bsc/pull/3397) consensus/parlia: fix updateAttestation&improve assembleVoteAttestation
14+
[\#0000](https://github.com/bnb-chain/bsc/pull/0000) p2p: define ProxyedNodeIds in Config #3417
15+
16+
### BUGFIX
17+
[\#3373](https://github.com/bnb-chain/bsc/pull/3373) ethapi: reject oversize storage keys before hex decode
18+
19+
### IMPROVEMENT
20+
[\#3388](https://github.com/bnb-chain/bsc/pull/3388) miner/minerconfig: update config to adapt 100M gaslimit
21+
[\#3404](https://github.com/bnb-chain/bsc/pull/3404) miner: validator not inturn backoff before mining
22+
[\#3407](https://github.com/bnb-chain/bsc/pull/3407) fix: change lock to read lock in legacy pool
23+
[\#3415](https://github.com/bnb-chain/bsc/pull/3415) eth: broadcast votes to evn peers regardless of deltaTdThreshold
24+
[\#3416](https://github.com/bnb-chain/bsc/pull/3416) cmd/geth: improve config for sentry nodes when init network
25+
[\#3419](https://github.com/bnb-chain/bsc/pull/3419) miner: use latest block as pending block for simplicity
26+
[\#3426](https://github.com/bnb-chain/bsc/pull/3426) eth: increase the delta td threshold to broadcast votes
27+
228
## v1.6.1
3-
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.
29+
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.
430

531
### FEATURE
632
NA

‎cmd/evm/main.go‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,12 @@ var (
114114
Category: traceCategory,
115115
}
116116

117+
// Vm flags.
118+
VMOpcodeOptimizeFlag = &cli.BoolFlag{
119+
Name: "vm.opcode.optimize",
120+
Usage: "enable opcode optimization",
121+
}
122+
117123
// Deprecated flags.
118124
DebugFlag = &cli.BoolFlag{
119125
Name: "debug",

‎cmd/evm/runner.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,8 @@ func runCmd(ctx *cli.Context) error {
284284
BlobHashes: blobHashes,
285285
BlobBaseFee: blobBaseFee,
286286
EVMConfig: vm.Config{
287-
Tracer: tracer,
287+
Tracer: tracer,
288+
EnableOpcodeOptimizations: ctx.Bool(VMOpcodeOptimizeFlag.Name),
288289
},
289290
}
290291

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

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -202,38 +202,38 @@ ERR: undefined instruction: op opcode 0xac not defined, pos 0
202202
ERR: undefined instruction: op opcode 0xad not defined, pos 0
203203
ERR: undefined instruction: op opcode 0xae not defined, pos 0
204204
ERR: undefined instruction: op opcode 0xaf not defined, pos 0
205-
ERR: undefined instruction: op opcode 0xb0 not defined, pos 0
206-
ERR: undefined instruction: op opcode 0xb1 not defined, pos 0
207-
ERR: undefined instruction: op opcode 0xb2 not defined, pos 0
208-
ERR: undefined instruction: op opcode 0xb3 not defined, pos 0
209-
ERR: undefined instruction: op opcode 0xb4 not defined, pos 0
210-
ERR: undefined instruction: op opcode 0xb5 not defined, pos 0
211-
ERR: undefined instruction: op opcode 0xb6 not defined, pos 0
212-
ERR: undefined instruction: op opcode 0xb7 not defined, pos 0
213-
ERR: undefined instruction: op opcode 0xb8 not defined, pos 0
214-
ERR: undefined instruction: op opcode 0xb9 not defined, pos 0
215-
ERR: undefined instruction: op opcode 0xba not defined, pos 0
216-
ERR: undefined instruction: op opcode 0xbb not defined, pos 0
217-
ERR: undefined instruction: op opcode 0xbc not defined, pos 0
218-
ERR: undefined instruction: op opcode 0xbd not defined, pos 0
219-
ERR: undefined instruction: op opcode 0xbe not defined, pos 0
220-
ERR: undefined instruction: op opcode 0xbf not defined, pos 0
221-
ERR: undefined instruction: op opcode 0xc0 not defined, pos 0
222-
ERR: undefined instruction: op opcode 0xc1 not defined, pos 0
223-
ERR: undefined instruction: op opcode 0xc2 not defined, pos 0
224-
ERR: undefined instruction: op opcode 0xc3 not defined, pos 0
225-
ERR: undefined instruction: op opcode 0xc4 not defined, pos 0
226-
ERR: undefined instruction: op opcode 0xc5 not defined, pos 0
227-
ERR: undefined instruction: op opcode 0xc6 not defined, pos 0
228-
ERR: undefined instruction: op opcode 0xc7 not defined, pos 0
229-
ERR: undefined instruction: op opcode 0xc8 not defined, pos 0
230-
ERR: undefined instruction: op opcode 0xc9 not defined, pos 0
231-
ERR: undefined instruction: op opcode 0xca not defined, pos 0
232-
ERR: undefined instruction: op opcode 0xcb not defined, pos 0
233-
ERR: undefined instruction: op opcode 0xcc not defined, pos 0
234-
ERR: undefined instruction: op opcode 0xcd not defined, pos 0
235-
ERR: undefined instruction: op opcode 0xce not defined, pos 0
236-
ERR: undefined instruction: op opcode 0xcf not defined, pos 0
205+
ERR: undefined instruction: op NOP, pos 0
206+
ERR: undefined instruction: op ANDSWAP1POPSWAP2SWAP1, pos 0
207+
ERR: undefined instruction: op SWAP2SWAP1POPJUMP, pos 0
208+
ERR: undefined instruction: op SWAP1POPSWAP2SWAP1, pos 0
209+
ERR: undefined instruction: op POPSWAP2SWAP1POP, pos 0
210+
ERR: undefined instruction: op PUSH2JUMP, pos 0
211+
ERR: undefined instruction: op PUSH2JUMPI, pos 0
212+
ERR: undefined instruction: op PUSH1PUSH1, pos 0
213+
ERR: undefined instruction: op PUSH1ADD, pos 0
214+
ERR: undefined instruction: op PUSH1SHL, pos 0
215+
ERR: undefined instruction: op PUSH1DUP1, pos 0
216+
ERR: undefined instruction: op SWAP1POP, pos 0
217+
ERR: undefined instruction: op POPJUMP, pos 0
218+
ERR: undefined instruction: op POP2, pos 0
219+
ERR: undefined instruction: op SWAP2SWAP1, pos 0
220+
ERR: undefined instruction: op SWAP2POP, pos 0
221+
ERR: undefined instruction: op DUP2LT, pos 0
222+
ERR: undefined instruction: op JUMPIFZERO, pos 0
223+
ERR: undefined instruction: op ISZEROPUSH2, pos 0
224+
ERR: undefined instruction: op DUP2MSTOREPUSH1ADD, pos 0
225+
ERR: undefined instruction: op DUP1PUSH4EQPUSH2, pos 0
226+
ERR: undefined instruction: op PUSH1CALLDATALOADPUSH1SHRDUP1PUSH4GTPUSH2, pos 0
227+
ERR: undefined instruction: op PUSH1PUSH1PUSH1SHLSUB, pos 0
228+
ERR: undefined instruction: op ANDDUP2ADDSWAP1DUP2LT, pos 0
229+
ERR: undefined instruction: op SWAP1PUSH1DUP1NOTSWAP2ADDANDDUP2ADDSWAP1DUP2LT, pos 0
230+
ERR: undefined instruction: op DUP3AND, pos 0
231+
ERR: undefined instruction: op SWAP2SWAP1DUP3SUBSWAP2DUP3GTPUSH2, pos 0
232+
ERR: undefined instruction: op SWAP1DUP2, pos 0
233+
ERR: undefined instruction: op SHRSHRDUP1MULDUP1, pos 0
234+
ERR: undefined instruction: op SWAP3POPPOPPOP, pos 0
235+
ERR: undefined instruction: op SUBSLTISZEROPUSH2, pos 0
236+
ERR: undefined instruction: op DUP11MULDUP3SUBMULDUP1, pos 0
237237
ERR: undefined instruction: op opcode 0xd4 not defined, pos 0
238238
ERR: undefined instruction: op opcode 0xd5 not defined, pos 0
239239
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,
22502250
ERR: initcode contains a RETURN or STOP opcode
22512251
ERR: initcode contains a RETURN or STOP opcode
22522252
ERR: initcode contains a RETURN or STOP opcode
2253-
ERR: undefined instruction: op opcode 0xc8 not defined, pos 1179
2253+
ERR: undefined instruction: op SWAP1PUSH1DUP1NOTSWAP2ADDANDDUP2ADDSWAP1DUP2LT, pos 1179
22542254
ERR: invalid dataloadN argument: arg 5, last 32, pos 1728
22552255
ERR: invalid dataloadN argument: arg 62719, last 32, pos 945
22562256
ERR: invalid dataloadN argument: arg 16, last 32, pos 771

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

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -202,38 +202,38 @@ ERR: undefined instruction: op opcode 0xac not defined, pos 0
202202
ERR: undefined instruction: op opcode 0xad not defined, pos 0
203203
ERR: undefined instruction: op opcode 0xae not defined, pos 0
204204
ERR: undefined instruction: op opcode 0xaf not defined, pos 0
205-
ERR: undefined instruction: op opcode 0xb0 not defined, pos 0
206-
ERR: undefined instruction: op opcode 0xb1 not defined, pos 0
207-
ERR: undefined instruction: op opcode 0xb2 not defined, pos 0
208-
ERR: undefined instruction: op opcode 0xb3 not defined, pos 0
209-
ERR: undefined instruction: op opcode 0xb4 not defined, pos 0
210-
ERR: undefined instruction: op opcode 0xb5 not defined, pos 0
211-
ERR: undefined instruction: op opcode 0xb6 not defined, pos 0
212-
ERR: undefined instruction: op opcode 0xb7 not defined, pos 0
213-
ERR: undefined instruction: op opcode 0xb8 not defined, pos 0
214-
ERR: undefined instruction: op opcode 0xb9 not defined, pos 0
215-
ERR: undefined instruction: op opcode 0xba not defined, pos 0
216-
ERR: undefined instruction: op opcode 0xbb not defined, pos 0
217-
ERR: undefined instruction: op opcode 0xbc not defined, pos 0
218-
ERR: undefined instruction: op opcode 0xbd not defined, pos 0
219-
ERR: undefined instruction: op opcode 0xbe not defined, pos 0
220-
ERR: undefined instruction: op opcode 0xbf not defined, pos 0
221-
ERR: undefined instruction: op opcode 0xc0 not defined, pos 0
222-
ERR: undefined instruction: op opcode 0xc1 not defined, pos 0
223-
ERR: undefined instruction: op opcode 0xc2 not defined, pos 0
224-
ERR: undefined instruction: op opcode 0xc3 not defined, pos 0
225-
ERR: undefined instruction: op opcode 0xc4 not defined, pos 0
226-
ERR: undefined instruction: op opcode 0xc5 not defined, pos 0
227-
ERR: undefined instruction: op opcode 0xc6 not defined, pos 0
228-
ERR: undefined instruction: op opcode 0xc7 not defined, pos 0
229-
ERR: undefined instruction: op opcode 0xc8 not defined, pos 0
230-
ERR: undefined instruction: op opcode 0xc9 not defined, pos 0
231-
ERR: undefined instruction: op opcode 0xca not defined, pos 0
232-
ERR: undefined instruction: op opcode 0xcb not defined, pos 0
233-
ERR: undefined instruction: op opcode 0xcc not defined, pos 0
234-
ERR: undefined instruction: op opcode 0xcd not defined, pos 0
235-
ERR: undefined instruction: op opcode 0xce not defined, pos 0
236-
ERR: undefined instruction: op opcode 0xcf not defined, pos 0
205+
ERR: undefined instruction: op NOP, pos 0
206+
ERR: undefined instruction: op ANDSWAP1POPSWAP2SWAP1, pos 0
207+
ERR: undefined instruction: op SWAP2SWAP1POPJUMP, pos 0
208+
ERR: undefined instruction: op SWAP1POPSWAP2SWAP1, pos 0
209+
ERR: undefined instruction: op POPSWAP2SWAP1POP, pos 0
210+
ERR: undefined instruction: op PUSH2JUMP, pos 0
211+
ERR: undefined instruction: op PUSH2JUMPI, pos 0
212+
ERR: undefined instruction: op PUSH1PUSH1, pos 0
213+
ERR: undefined instruction: op PUSH1ADD, pos 0
214+
ERR: undefined instruction: op PUSH1SHL, pos 0
215+
ERR: undefined instruction: op PUSH1DUP1, pos 0
216+
ERR: undefined instruction: op SWAP1POP, pos 0
217+
ERR: undefined instruction: op POPJUMP, pos 0
218+
ERR: undefined instruction: op POP2, pos 0
219+
ERR: undefined instruction: op SWAP2SWAP1, pos 0
220+
ERR: undefined instruction: op SWAP2POP, pos 0
221+
ERR: undefined instruction: op DUP2LT, pos 0
222+
ERR: undefined instruction: op JUMPIFZERO, pos 0
223+
ERR: undefined instruction: op ISZEROPUSH2, pos 0
224+
ERR: undefined instruction: op DUP2MSTOREPUSH1ADD, pos 0
225+
ERR: undefined instruction: op DUP1PUSH4EQPUSH2, pos 0
226+
ERR: undefined instruction: op PUSH1CALLDATALOADPUSH1SHRDUP1PUSH4GTPUSH2, pos 0
227+
ERR: undefined instruction: op PUSH1PUSH1PUSH1SHLSUB, pos 0
228+
ERR: undefined instruction: op ANDDUP2ADDSWAP1DUP2LT, pos 0
229+
ERR: undefined instruction: op SWAP1PUSH1DUP1NOTSWAP2ADDANDDUP2ADDSWAP1DUP2LT, pos 0
230+
ERR: undefined instruction: op DUP3AND, pos 0
231+
ERR: undefined instruction: op SWAP2SWAP1DUP3SUBSWAP2DUP3GTPUSH2, pos 0
232+
ERR: undefined instruction: op SWAP1DUP2, pos 0
233+
ERR: undefined instruction: op SHRSHRDUP1MULDUP1, pos 0
234+
ERR: undefined instruction: op SWAP3POPPOPPOP, pos 0
235+
ERR: undefined instruction: op SUBSLTISZEROPUSH2, pos 0
236+
ERR: undefined instruction: op DUP11MULDUP3SUBMULDUP1, pos 0
237237
ERR: undefined instruction: op opcode 0xd4 not defined, pos 0
238238
ERR: undefined instruction: op opcode 0xd5 not defined, pos 0
239239
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,
22502250
ERR: invalid dataloadN argument: arg 24833, last 0, pos 1397
22512251
ERR: invalid jump destination: out-of-bounds offset: offset 24833, dest 26278, pos 1443
22522252
ERR: stack limit reached 1048 (1024): at pos 75
2253-
ERR: undefined instruction: op opcode 0xc8 not defined, pos 1179
2253+
ERR: undefined instruction: op SWAP1PUSH1DUP1NOTSWAP2ADDANDDUP2ADDSWAP1DUP2LT, pos 1179
22542254
ERR: invalid dataloadN argument: arg 5, last 32, pos 1728
22552255
ERR: invalid dataloadN argument: arg 62719, last 32, pos 945
22562256
ERR: invalid dataloadN argument: arg 16, last 32, pos 771

‎cmd/geth/chaincmd.go‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ func initGenesis(ctx *cli.Context) error {
363363
log.Warn("Multi-database is an experimental feature")
364364
}
365365

366-
triedb := utils.MakeTrieDatabase(ctx, stack, chaindb, ctx.Bool(utils.CachePreimagesFlag.Name), false, genesis.IsVerkle())
366+
triedb := utils.MakeTrieDatabase(ctx, stack, chaindb, ctx.Bool(utils.CachePreimagesFlag.Name), false, genesis.IsVerkle(), false)
367367
defer triedb.Close()
368368

369369
_, hash, compatErr, err := core.SetupGenesisBlockWithOverride(chaindb, triedb, genesis, &overrides)
@@ -521,7 +521,6 @@ func initNetwork(ctx *cli.Context) error {
521521
sentryEnodes []*enode.Node
522522
sentryNodeIDs []enode.ID
523523
connectOneExtraEnodes bool
524-
staticConnect bool
525524
)
526525
if enableSentryNode {
527526
sentryConfigs, sentryEnodes, err = createSentryNodeConfigs(ctx, config, initDir)
@@ -533,10 +532,9 @@ func initNetwork(ctx *cli.Context) error {
533532
sentryNodeIDs[i] = sentryEnodes[i].ID()
534533
}
535534
connectOneExtraEnodes = true
536-
staticConnect = true
537535
}
538536

539-
configs, enodes, accounts, err := createConfigs(config, initDir, "node", ips, ports, sentryEnodes, connectOneExtraEnodes, staticConnect)
537+
configs, enodes, accounts, err := createConfigs(config, initDir, "node", ips, ports, sentryEnodes, connectOneExtraEnodes, true)
540538
if err != nil {
541539
utils.Fatalf("Failed to create node configs: %v", err)
542540
}
@@ -549,6 +547,7 @@ func initNetwork(ctx *cli.Context) error {
549547
if enableSentryNode {
550548
for i := 0; i < len(sentryConfigs); i++ {
551549
sentryConfigs[i].Node.P2P.ProxyedValidatorAddresses = accounts[i]
550+
sentryConfigs[i].Node.P2P.ProxyedNodeIds = []enode.ID{nodeIDs[i]}
552551
}
553552
}
554553
if ctx.Bool(utils.InitEVNValidatorWhitelist.Name) {
@@ -563,7 +562,8 @@ func initNetwork(ctx *cli.Context) error {
563562
}
564563
if enableSentryNode && ctx.Bool(utils.InitEVNSentryWhitelist.Name) {
565564
for i := 0; i < len(sentryConfigs); i++ {
566-
sentryConfigs[i].Node.P2P.EVNNodeIdsWhitelist = sentryNodeIDs
565+
sentryConfigs[i].Node.P2P.EVNNodeIdsWhitelist = append([]enode.ID{}, sentryNodeIDs...)
566+
sentryConfigs[i].Node.P2P.EVNNodeIdsWhitelist[i] = nodeIDs[i]
567567
}
568568
}
569569
if enableSentryNode && ctx.Bool(utils.InitEVNSentryRegister.Name) {
@@ -587,11 +587,9 @@ func initNetwork(ctx *cli.Context) error {
587587
}
588588

589589
if ctx.Int(utils.InitFullNodeSize.Name) > 0 {
590-
var extraEnodes []*enode.Node
590+
extraEnodes := enodes
591591
if enableSentryNode {
592592
extraEnodes = sentryEnodes
593-
} else {
594-
extraEnodes = enodes
595593
}
596594
_, _, err := createAndSaveFullNodeConfigs(ctx, inGenesisFile, config, initDir, extraEnodes)
597595
if err != nil {
@@ -1091,7 +1089,7 @@ func dump(ctx *cli.Context) error {
10911089
return err
10921090
}
10931091
defer db.Close()
1094-
triedb := utils.MakeTrieDatabase(ctx, stack, db, true, true, false) // always enable preimage lookup
1092+
triedb := utils.MakeTrieDatabase(ctx, stack, db, true, true, false, false) // always enable preimage lookup
10951093
defer triedb.Close()
10961094

10971095
state, err := state.New(root, state.NewDatabase(triedb, nil))

‎cmd/geth/config.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ func makeFullNode(ctx *cli.Context) (*node.Node, ethapi.Backend) {
280280
}
281281
if ctx.IsSet(utils.OverrideMinBlocksForBlobRequests.Name) {
282282
params.MinBlocksForBlobRequests = ctx.Uint64(utils.OverrideMinBlocksForBlobRequests.Name)
283-
params.MinTimeDurationForBlobRequests = uint64(float64(params.MinBlocksForBlobRequests) * 0.75 /*maxwellBlockInterval*/)
283+
params.MinTimeDurationForBlobRequests = uint64(float64(params.MinBlocksForBlobRequests) * 0.45 /*fermiBlockInterval*/)
284284
}
285285
if ctx.IsSet(utils.OverrideDefaultExtraReserveForBlobRequests.Name) {
286286
params.DefaultExtraReserveForBlobRequests = ctx.Uint64(utils.OverrideDefaultExtraReserveForBlobRequests.Name)

0 commit comments

Comments
 (0)