From f0cf0a9f15a06a657059acaa155b4b105818ed02 Mon Sep 17 00:00:00 2001 From: AnilChinchawale Date: Sat, 17 Nov 2018 14:18:01 +0530 Subject: [PATCH] Add annouce-txs, maxpeers 25 --- Dockerfile.node | 1 + cmd/XDC/config.go | 1 - docker/XDCchain/entrypoint.sh | 9 +++++++-- internal/ethapi/api.go | 2 +- p2p/discover/udp.go | 2 +- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Dockerfile.node b/Dockerfile.node index e088af01d9..eaea4c6163 100644 --- a/Dockerfile.node +++ b/Dockerfile.node @@ -27,6 +27,7 @@ ENV NETWORK_ID '89' ENV WS_SECRET '' ENV NETSTATS_HOST 'netstats-server' ENV NETSTATS_PORT '3000' +ENV ANNOUNCE_TXS '' RUN apk add --no-cache ca-certificates diff --git a/cmd/XDC/config.go b/cmd/XDC/config.go index 629a1361bc..ff09e42a0b 100644 --- a/cmd/XDC/config.go +++ b/cmd/XDC/config.go @@ -36,7 +36,6 @@ import ( "github.com/ethereum/go-ethereum/params" whisper "github.com/ethereum/go-ethereum/whisper/whisperv6" "github.com/naoina/toml" - " ) var ( diff --git a/docker/XDCchain/entrypoint.sh b/docker/XDCchain/entrypoint.sh index 62b4e626b5..a0127cde58 100644 --- a/docker/XDCchain/entrypoint.sh +++ b/docker/XDCchain/entrypoint.sh @@ -28,7 +28,7 @@ accountsCount=$( # file to env for env in IDENTITY PASSWORD PRIVATE_KEY BOOTNODES WS_SECRET NETSTATS_HOST \ - NETSTATS_PORT EXTIP SYNC_MODE NETWORK_ID; do + NETSTATS_PORT EXTIP SYNC_MODE NETWORK_ID ANNOUNCE_TXS; do file=$(eval echo "\$${env}_FILE") if [[ -f $file ]] && [[ ! -z $file ]]; then echo "Replacing $env by $file" @@ -139,6 +139,11 @@ else echo "WS_SECRET not set, will not report to netstats server." fi +# annonce txs +if [[ ! -z $ANNOUNCE_TXS ]]; then + params="$params --announce-txs" +fi + # dump echo "dump: $IDENTITY $account $BOOTNODES" @@ -151,7 +156,7 @@ exec XDC $params \ --identity $IDENTITY \ --password ./password \ --port 30303 \ - --maxpeers 50 \ + --maxpeers 25 \ --txpool.globalqueue 5000 \ --txpool.globalslots 5000 \ --rpc \ diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go index 86379b12b2..ad8b98805f 100644 --- a/internal/ethapi/api.go +++ b/internal/ethapi/api.go @@ -30,7 +30,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus/XDPos" + "github.com/ethereum/go-ethereum/consensus/XDPoS" "github.com/ethereum/go-ethereum/consensus/ethash" "github.com/ethereum/go-ethereum/contracts" "github.com/ethereum/go-ethereum/core" diff --git a/p2p/discover/udp.go b/p2p/discover/udp.go index 6c0ae75d2d..de82db08fd 100644 --- a/p2p/discover/udp.go +++ b/p2p/discover/udp.go @@ -564,7 +564,7 @@ func decodePacket(buf []byte) (packet, NodeID, []byte, error) { } var req packet switch ptype := sigdata[0]; ptype { - case pingXDCt: + case pingXDC: req = new(ping) case pongPacket: req = new(pong)