forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-27 15:16:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #442 from maticnetwork/v0.3.0-candidate

Browse source 
Merge fixes from v0.3.0-candidate to develop
This commit is contained in:
Jerry 2022-06-30 12:07:06 -07:00 committed by GitHub
commit 5f69302b3a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
builder/files/bor.service
View file

@ -7,22 +7,33 @@
Restart=on-failure Restart=on-failure
RestartSec=5s RestartSec=5s
ExecStart=/usr/local/bin/bor server \ ExecStart=/usr/local/bin/bor server \
-chain=mumbai \ --chain=mumbai \
# -chain=mainnet \ # --chain=mainnet \
-datadir /var/lib/bor/data \ --datadir /var/lib/bor/data \
-metrics \ --metrics \
-metrics.prometheus-addr="127.0.0.1:7071" \ --metrics.prometheus-addr="127.0.0.1:7071" \
-bootnodes "enode://0cb82b395094ee4a2915e9714894627de9ed8498fb881cec6db7c65e8b9a5bd7f2f25cc84e71e89d0947e51c76e85d0847de848c7782b13c0255247a6758178c@44.232.55.71:30303,enode://88116f4295f5a31538ae409e4d44ad40d22e44ee9342869e7d68bdec55b0f83c1530355ce8b41fbec0928a7d75a5745d528450d30aec92066ab6ba1ee351d710@159.203.9.164:30303" --syncmode 'full' \
--miner.gasprice '30000000000' \
--miner.gaslimit '20000000' \
--miner.gastarget '20000000' \
--txpool.nolocals \
--txpool.accountslots 16 \
--txpool.globalslots 32768 \
--txpool.accountqueue 16 \
--txpool.globalqueue 32768 \
--txpool.pricelimit '30000000000' \
--txpool.lifetime '1h30m0s' \
--bootnodes "enode://0cb82b395094ee4a2915e9714894627de9ed8498fb881cec6db7c65e8b9a5bd7f2f25cc84e71e89d0947e51c76e85d0847de848c7782b13c0255247a6758178c@44.232.55.71:30303,enode://88116f4295f5a31538ae409e4d44ad40d22e44ee9342869e7d68bdec55b0f83c1530355ce8b41fbec0928a7d75a5745d528450d30aec92066ab6ba1ee351d710@159.203.9.164:30303"
# Validator params # Validator params
# Uncomment and configure the following lines in case you run a validator. Don't forget to add backslash (\) # Uncomment and configure the following lines in case you run a validator. Don't forget to add backslash (\)
# to previous command line. # to previous command line.
# -keystore /var/lib/bor/keystore \ # --keystore /var/lib/bor/keystore \
# -unlock [VALIDATOR ADDRESS] \ # --unlock [VALIDATOR ADDRESS] \
# -password /var/lib/bor/password.txt \ # --password /var/lib/bor/password.txt \
# -allow-insecure-unlock \ # --allow-insecure-unlock \
# -nodiscover -maxpeers 1 \ # --nodiscover --maxpeers 1 \
# -miner.etherbase [VALIDATOR ADDRESS] \ # --miner.etherbase [VALIDATOR ADDRESS] \
# -mine # --mine
Type=simple Type=simple
User=ubuntu User=ubuntu
KillSignal=SIGINT KillSignal=SIGINT

2
internal/cli/server/config.go
View file

@ -431,7 +431,7 @@ func DefaultConfig() *Config {
Sealer: &SealerConfig{ Sealer: &SealerConfig{
Enabled: false, Enabled: false,
Etherbase: "", Etherbase: "",
GasCeil: 8000000, GasCeil: 20000000,
GasPrice: big.NewInt(30 * params.GWei), GasPrice: big.NewInt(30 * params.GWei),
ExtraData: "", ExtraData: "",
}, },

8
params/version.go
View file

@ -21,10 +21,10 @@ import (
) )
const ( const (
VersionMajor = 0 // Major version component of the current release VersionMajor = 0 // Major version component of the current release
VersionMinor = 2 // Minor version component of the current release VersionMinor = 3 // Minor version component of the current release
VersionPatch = 16 // Patch version component of the current release VersionPatch = 0 // Patch version component of the current release
VersionMeta = "stable" // Version metadata to append to the version string VersionMeta = "beta" // Version metadata to append to the version string
) )
// Version holds the textual version string. // Version holds the textual version string.