mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-07-27 23:26:44 +00:00
Merge latest develop branch
This commit is contained in:
kamuikatsurgi
commit
cb10335739
15 changed files with 51 additions and 51 deletions
|
|
@ -59,9 +59,9 @@ syncmode = "full"
|
|||
nolocals = true
|
||||
pricelimit = 25000000000
|
||||
accountslots = 16
|
||||
globalslots = 32768
|
||||
accountqueue = 16
|
||||
globalqueue = 32768
|
||||
globalslots = 131072
|
||||
accountqueue = 64
|
||||
globalqueue = 131072
|
||||
lifetime = "1h30m0s"
|
||||
# locals = []
|
||||
# journal = ""
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ The ```bor server``` command runs the Bor client.
|
|||
|
||||
- ```eth.requiredblocks```: Comma separated block number-to-hash mappings to require for peering (<number>=<hash>)
|
||||
|
||||
- ```ethstats```: Reporting URL of an ethstats service (nodename:secret@host:port)
|
||||
- ```ethstats```: Reporting URL of a ethstats service (nodename:secret@host:port)
|
||||
|
||||
- ```gcmode```: Blockchain garbage collection mode ("full", "archive") (default: full)
|
||||
|
||||
|
|
@ -148,7 +148,7 @@ The ```bor server``` command runs the Bor client.
|
|||
|
||||
- ```graphql```: Enable GraphQL on the HTTP-RPC server. Note that GraphQL can only be started if an HTTP server is started as well. (default: false)
|
||||
|
||||
- ```graphql.corsdomain```: Comma separated list of domains from which to accept cross-origin requests (browser enforced) (default: localhost)
|
||||
- ```graphql.corsdomain```: Comma separated list of domains from which to accept cross origin requests (browser enforced) (default: localhost)
|
||||
|
||||
- ```graphql.vhosts```: Comma separated list of virtual hostnames from which to accept requests (server enforced). Accepts '*' wildcard. (default: localhost)
|
||||
|
||||
|
|
@ -158,7 +158,7 @@ The ```bor server``` command runs the Bor client.
|
|||
|
||||
- ```http.api```: API's offered over the HTTP-RPC interface (default: eth,net,web3,txpool,bor)
|
||||
|
||||
- ```http.corsdomain```: Comma separated list of domains from which to accept cross-origin requests (browser enforced) (default: localhost)
|
||||
- ```http.corsdomain```: Comma separated list of domains from which to accept cross origin requests (browser enforced) (default: localhost)
|
||||
|
||||
- ```http.ep-requesttimeout```: Request Timeout for rpc execution pool for HTTP requests (default: 0s)
|
||||
|
||||
|
|
@ -290,13 +290,13 @@ The ```bor server``` command runs the Bor client.
|
|||
|
||||
### Transaction Pool Options
|
||||
|
||||
- ```txpool.accountqueue```: Maximum number of non-executable transaction slots permitted per account (default: 16)
|
||||
- ```txpool.accountqueue```: Maximum number of non-executable transaction slots permitted per account (default: 64)
|
||||
|
||||
- ```txpool.accountslots```: Minimum number of executable transaction slots guaranteed per account (default: 16)
|
||||
|
||||
- ```txpool.globalqueue```: Maximum number of non-executable transaction slots for all accounts (default: 32768)
|
||||
- ```txpool.globalqueue```: Maximum number of non-executable transaction slots for all accounts (default: 131072)
|
||||
|
||||
- ```txpool.globalslots```: Maximum number of executable transaction slots for all accounts (default: 32768)
|
||||
- ```txpool.globalslots```: Maximum number of executable transaction slots for all accounts (default: 131072)
|
||||
|
||||
- ```txpool.journal```: Disk journal for local transaction to survive node restarts (default: transactions.rlp)
|
||||
|
||||
|
|
@ -310,4 +310,4 @@ The ```bor server``` command runs the Bor client.
|
|||
|
||||
- ```txpool.pricelimit```: Minimum gas price limit to enforce for acceptance into the pool (default: 25000000000)
|
||||
|
||||
- ```txpool.rejournal```: Time interval to regenerate the local transaction journal (default: 1h0m0s)
|
||||
- ```txpool.rejournal```: Time interval to regenerate the local transaction journal (default: 1h0m0s)
|
||||
8
go.mod
8
go.mod
|
|
@ -91,11 +91,11 @@ require (
|
|||
go.opentelemetry.io/otel/sdk v1.27.0
|
||||
go.uber.org/automaxprocs v1.5.3
|
||||
go.uber.org/goleak v1.3.0
|
||||
golang.org/x/crypto v0.24.0
|
||||
golang.org/x/crypto v0.31.0
|
||||
golang.org/x/exp v0.0.0-20240604190554-fc45aab8b7f8
|
||||
golang.org/x/sync v0.7.0
|
||||
golang.org/x/sys v0.21.0
|
||||
golang.org/x/text v0.16.0
|
||||
golang.org/x/sync v0.10.0
|
||||
golang.org/x/sys v0.28.0
|
||||
golang.org/x/text v0.21.0
|
||||
golang.org/x/time v0.5.0
|
||||
golang.org/x/tools v0.22.0
|
||||
google.golang.org/grpc v1.64.1
|
||||
|
|
|
|||
16
go.sum
16
go.sum
|
|
@ -2386,8 +2386,8 @@ golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq
|
|||
golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg=
|
||||
golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
|
||||
golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
|
||||
golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI=
|
||||
golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM=
|
||||
golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
|
||||
golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
|
||||
golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
|
||||
golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
|
||||
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
|
||||
|
|
@ -2617,8 +2617,8 @@ golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
|||
golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
|
||||
golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
|
||||
golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
|
||||
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
|
||||
golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
|
||||
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
|
||||
golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
|
|
@ -2759,8 +2759,8 @@ golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
|||
golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||
golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||
golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
|
||||
golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
|
||||
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||
golang.org/x/telemetry v0.0.0-20240208230135-b75ee8823808/go.mod h1:KG1lNk5ZFNssSZLrpVb4sMXKMpGwGXOxSG3rnu2gZQQ=
|
||||
golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
|
||||
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
|
||||
|
|
@ -2804,8 +2804,8 @@ golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
|
|||
golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
|
||||
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
|
||||
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
|
||||
golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
|
||||
golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
|
||||
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
|
||||
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
|
||||
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
||||
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
||||
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
||||
|
|
|
|||
|
|
@ -658,9 +658,9 @@ func DefaultConfig() *Config {
|
|||
PriceLimit: params.BorDefaultTxPoolPriceLimit, // bor's default
|
||||
PriceBump: 10,
|
||||
AccountSlots: 16,
|
||||
GlobalSlots: 32768,
|
||||
AccountQueue: 16,
|
||||
GlobalQueue: 32768,
|
||||
GlobalSlots: 131072,
|
||||
AccountQueue: 64,
|
||||
GlobalQueue: 131072,
|
||||
LifeTime: 3 * time.Hour,
|
||||
},
|
||||
Sealer: &SealerConfig{
|
||||
|
|
|
|||
6
internal/cli/server/testdata/default.toml
vendored
6
internal/cli/server/testdata/default.toml
vendored
|
|
@ -62,9 +62,9 @@ devfakeauthor = false
|
|||
pricelimit = 25000000000
|
||||
pricebump = 10
|
||||
accountslots = 16
|
||||
globalslots = 32768
|
||||
accountqueue = 16
|
||||
globalqueue = 32768
|
||||
globalslots = 131072
|
||||
accountqueue = 64
|
||||
globalqueue = 131072
|
||||
lifetime = "3h0m0s"
|
||||
|
||||
[miner]
|
||||
|
|
|
|||
|
|
@ -473,7 +473,7 @@ func checkDeletePermissions(path string) (bool, error) {
|
|||
func (c *PruneBlockCommand) pruneBlock(stack *node.Node, fdHandles int) error {
|
||||
name := "chaindata"
|
||||
|
||||
oldAncientPath := c.datadirAncient
|
||||
oldAncientPath := strings.TrimSuffix(c.datadirAncient, "/")
|
||||
|
||||
switch {
|
||||
case oldAncientPath == "":
|
||||
|
|
|
|||
|
|
@ -54,9 +54,9 @@ gcmode = "archive"
|
|||
nolocals = true
|
||||
pricelimit = 25000000000
|
||||
accountslots = 16
|
||||
globalslots = 32768
|
||||
accountqueue = 16
|
||||
globalqueue = 32768
|
||||
globalslots = 131072
|
||||
accountqueue = 64
|
||||
globalqueue = 131072
|
||||
lifetime = "1h30m0s"
|
||||
# locals = []
|
||||
# journal = ""
|
||||
|
|
|
|||
|
|
@ -53,9 +53,9 @@ syncmode = "full"
|
|||
nolocals = true
|
||||
pricelimit = 25000000000
|
||||
accountslots = 16
|
||||
globalslots = 32768
|
||||
accountqueue = 16
|
||||
globalqueue = 32768
|
||||
globalslots = 131072
|
||||
accountqueue = 64
|
||||
globalqueue = 131072
|
||||
lifetime = "1h30m0s"
|
||||
# locals = []
|
||||
# journal = ""
|
||||
|
|
|
|||
|
|
@ -55,9 +55,9 @@ syncmode = "full"
|
|||
nolocals = true
|
||||
pricelimit = 25000000000
|
||||
accountslots = 16
|
||||
globalslots = 32768
|
||||
accountqueue = 16
|
||||
globalqueue = 32768
|
||||
globalslots = 131072
|
||||
accountqueue = 64
|
||||
globalqueue = 131072
|
||||
lifetime = "1h30m0s"
|
||||
# locals = []
|
||||
# journal = ""
|
||||
|
|
|
|||
|
|
@ -55,9 +55,9 @@ syncmode = "full"
|
|||
nolocals = true
|
||||
pricelimit = 25000000000
|
||||
accountslots = 16
|
||||
globalslots = 32768
|
||||
accountqueue = 16
|
||||
globalqueue = 32768
|
||||
globalslots = 131072
|
||||
accountqueue = 64
|
||||
globalqueue = 131072
|
||||
lifetime = "1h30m0s"
|
||||
# locals = []
|
||||
# journal = ""
|
||||
|
|
|
|||
|
|
@ -57,9 +57,9 @@ syncmode = "full"
|
|||
nolocals = true
|
||||
pricelimit = 25000000000
|
||||
accountslots = 16
|
||||
globalslots = 32768
|
||||
accountqueue = 16
|
||||
globalqueue = 32768
|
||||
globalslots = 131072
|
||||
accountqueue = 64
|
||||
globalqueue = 131072
|
||||
lifetime = "1h30m0s"
|
||||
# locals = []
|
||||
# journal = ""
|
||||
|
|
|
|||
|
|
@ -55,9 +55,9 @@ syncmode = "full"
|
|||
nolocals = true
|
||||
pricelimit = 25000000000
|
||||
accountslots = 16
|
||||
globalslots = 32768
|
||||
accountqueue = 16
|
||||
globalqueue = 32768
|
||||
globalslots = 131072
|
||||
accountqueue = 64
|
||||
globalqueue = 131072
|
||||
lifetime = "1h30m0s"
|
||||
# locals = []
|
||||
# journal = ""
|
||||
|
|
|
|||
|
|
@ -56,9 +56,9 @@ syncmode = "full"
|
|||
nolocals = true
|
||||
pricelimit = 25000000000
|
||||
accountslots = 16
|
||||
globalslots = 32768
|
||||
accountqueue = 16
|
||||
globalqueue = 32768
|
||||
globalslots = 131072
|
||||
accountqueue = 64
|
||||
globalqueue = 131072
|
||||
lifetime = "1h30m0s"
|
||||
# locals = []
|
||||
# journal = ""
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ import (
|
|||
const (
|
||||
VersionMajor = 1 // Major version component of the current release
|
||||
VersionMinor = 5 // Minor version component of the current release
|
||||
VersionPatch = 3 // Patch version component of the current release
|
||||
VersionPatch = 4 // Patch version component of the current release
|
||||
VersionMeta = "" // Version metadata to append to the version string
|
||||
)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue