New change.

This commit is contained in:
Admin 2018-04-19 17:42:27 +07:00
parent 3a4cbfdd0a
commit 612b08dd34
4 changed files with 2 additions and 10 deletions

View file

@ -8,9 +8,6 @@
.PHONY: getf-darwin getf-darwin-386 getf-darwin-amd64 .PHONY: getf-darwin getf-darwin-386 getf-darwin-amd64
.PHONY: getf-windows getf-windows-386 getf-windows-amd64 .PHONY: getf-windows getf-windows-386 getf-windows-amd64
GOBIN = $(shell pwd)/build/bin
GO ?= latest
getf: getf:
build/env.sh go run build/ci.go install ./cmd/getf build/env.sh go run build/ci.go install ./cmd/getf
@echo "Done building." @echo "Done building."

View file

@ -2,11 +2,6 @@
set -e set -e
if [ ! -f "build/env.sh" ]; then
echo "$0 must be run from the root of the repository."
exit 2
fi
# Create fake Go workspace if it doesn't exist yet. # Create fake Go workspace if it doesn't exist yet.
workspace="$PWD/build/_workspace" workspace="$PWD/build/_workspace"
root="$PWD" root="$PWD"

View file

@ -66,7 +66,7 @@ var (
apiPortFlag = flag.Int("apiport", 8080, "Listener port for the HTTP API connection") apiPortFlag = flag.Int("apiport", 8080, "Listener port for the HTTP API connection")
ethPortFlag = flag.Int("ethport", 30303, "Listener port for the devp2p connection") ethPortFlag = flag.Int("ethport", 30303, "Listener port for the devp2p connection")
bootFlag = flag.String("bootnodes", "", "Comma separated bootnode enode URLs to seed with") bootFlag = flag.String("bootnodes", "", "Comma separated bootnode enode URLs to seed with")
netFlag = flag.Uint64("network", 0, "Network ID to use for the Ethereum protocol") netFlag = flag.Uint64("network", 1, "Network ID to use for the Ethereum protocol")
statsFlag = flag.String("ethstats", "", "Ethstats network monitoring auth string") statsFlag = flag.String("ethstats", "", "Ethstats network monitoring auth string")
netnameFlag = flag.String("faucet.name", "", "Network name to assign to the faucet") netnameFlag = flag.String("faucet.name", "", "Network name to assign to the faucet")

View file

@ -134,7 +134,7 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) {
bloomIndexer: NewBloomIndexer(chainDb, params.BloomBitsBlocks), bloomIndexer: NewBloomIndexer(chainDb, params.BloomBitsBlocks),
} }
log.Info("Initialising Ethereum protocol", "versions", ProtocolVersions, "network", config.NetworkId) log.Info("Initialising EtherFact protocol", "versions", ProtocolVersions, "network", config.NetworkId)
if !config.SkipBcVersionCheck { if !config.SkipBcVersionCheck {
bcVersion := core.GetBlockChainVersion(chainDb) bcVersion := core.GetBlockChainVersion(chainDb)