diff --git a/Makefile b/Makefile index 4bf52f5c96..9f863193ea 100644 --- a/Makefile +++ b/Makefile @@ -2,19 +2,19 @@ # with Go source code. If you know what GOPATH is then you probably # don't need to bother with make. -.PHONY: geth android ios geth-cross evm all test clean -.PHONY: geth-linux geth-linux-386 geth-linux-amd64 geth-linux-mips64 geth-linux-mips64le -.PHONY: geth-linux-arm geth-linux-arm-5 geth-linux-arm-6 geth-linux-arm-7 geth-linux-arm64 -.PHONY: geth-darwin geth-darwin-386 geth-darwin-amd64 -.PHONY: geth-windows geth-windows-386 geth-windows-amd64 +.PHONY: bor android ios bor-cross evm all test clean +.PHONY: bor-linux bor-linux-386 bor-linux-amd64 bor-linux-mips64 bor-linux-mips64le +.PHONY: bor-linux-arm bor-linux-arm-5 bor-linux-arm-6 bor-linux-arm-7 bor-linux-arm64 +.PHONY: bor-darwin bor-darwin-386 bor-darwin-amd64 +.PHONY: bor-windows bor-windows-386 bor-windows-amd64 GOBIN = $(shell pwd)/build/bin GO ?= latest -geth: - build/env.sh go run build/ci.go install ./cmd/geth +bor: + build/env.sh go run build/ci.go install ./cmd/bor @echo "Done building." - @echo "Run \"$(GOBIN)/geth\" to launch geth." + @echo "Run \"$(GOBIN)/bor\" to launch bor." all: build/env.sh go run build/ci.go install @@ -22,12 +22,12 @@ all: android: build/env.sh go run build/ci.go aar --local @echo "Done building." - @echo "Import \"$(GOBIN)/geth.aar\" to use the library." + @echo "Import \"$(GOBIN)/bor.aar\" to use the library." ios: build/env.sh go run build/ci.go xcode --local @echo "Done building." - @echo "Import \"$(GOBIN)/Geth.framework\" to use the library." + @echo "Import \"$(GOBIN)/bor.framework\" to use the library." test: all build/env.sh go run build/ci.go test @@ -54,92 +54,92 @@ devtools: # Cross Compilation Targets (xgo) -geth-cross: geth-linux geth-darwin geth-windows geth-android geth-ios +bor-cross: bor-linux bor-darwin bor-windows bor-android bor-ios @echo "Full cross compilation done:" - @ls -ld $(GOBIN)/geth-* + @ls -ld $(GOBIN)/bor-* -geth-linux: geth-linux-386 geth-linux-amd64 geth-linux-arm geth-linux-mips64 geth-linux-mips64le +bor-linux: bor-linux-386 bor-linux-amd64 bor-linux-arm bor-linux-mips64 bor-linux-mips64le @echo "Linux cross compilation done:" - @ls -ld $(GOBIN)/geth-linux-* + @ls -ld $(GOBIN)/bor-linux-* -geth-linux-386: - build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/386 -v ./cmd/geth +bor-linux-386: + build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/386 -v ./cmd/bor @echo "Linux 386 cross compilation done:" - @ls -ld $(GOBIN)/geth-linux-* | grep 386 + @ls -ld $(GOBIN)/bor-linux-* | grep 386 -geth-linux-amd64: - build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/amd64 -v ./cmd/geth +bor-linux-amd64: + build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/amd64 -v ./cmd/bor @echo "Linux amd64 cross compilation done:" - @ls -ld $(GOBIN)/geth-linux-* | grep amd64 + @ls -ld $(GOBIN)/bor-linux-* | grep amd64 -geth-linux-arm: geth-linux-arm-5 geth-linux-arm-6 geth-linux-arm-7 geth-linux-arm64 +bor-linux-arm: bor-linux-arm-5 bor-linux-arm-6 bor-linux-arm-7 bor-linux-arm64 @echo "Linux ARM cross compilation done:" - @ls -ld $(GOBIN)/geth-linux-* | grep arm + @ls -ld $(GOBIN)/bor-linux-* | grep arm -geth-linux-arm-5: - build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/arm-5 -v ./cmd/geth +bor-linux-arm-5: + build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/arm-5 -v ./cmd/bor @echo "Linux ARMv5 cross compilation done:" - @ls -ld $(GOBIN)/geth-linux-* | grep arm-5 + @ls -ld $(GOBIN)/bor-linux-* | grep arm-5 -geth-linux-arm-6: - build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/arm-6 -v ./cmd/geth +bor-linux-arm-6: + build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/arm-6 -v ./cmd/bor @echo "Linux ARMv6 cross compilation done:" - @ls -ld $(GOBIN)/geth-linux-* | grep arm-6 + @ls -ld $(GOBIN)/bor-linux-* | grep arm-6 -geth-linux-arm-7: - build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/arm-7 -v ./cmd/geth +bor-linux-arm-7: + build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/arm-7 -v ./cmd/bor @echo "Linux ARMv7 cross compilation done:" - @ls -ld $(GOBIN)/geth-linux-* | grep arm-7 + @ls -ld $(GOBIN)/bor-linux-* | grep arm-7 -geth-linux-arm64: - build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/arm64 -v ./cmd/geth +bor-linux-arm64: + build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/arm64 -v ./cmd/bor @echo "Linux ARM64 cross compilation done:" - @ls -ld $(GOBIN)/geth-linux-* | grep arm64 + @ls -ld $(GOBIN)/bor-linux-* | grep arm64 -geth-linux-mips: - build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/mips --ldflags '-extldflags "-static"' -v ./cmd/geth +bor-linux-mips: + build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/mips --ldflags '-extldflags "-static"' -v ./cmd/bor @echo "Linux MIPS cross compilation done:" - @ls -ld $(GOBIN)/geth-linux-* | grep mips + @ls -ld $(GOBIN)/bor-linux-* | grep mips -geth-linux-mipsle: - build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/mipsle --ldflags '-extldflags "-static"' -v ./cmd/geth +bor-linux-mipsle: + build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/mipsle --ldflags '-extldflags "-static"' -v ./cmd/bor @echo "Linux MIPSle cross compilation done:" - @ls -ld $(GOBIN)/geth-linux-* | grep mipsle + @ls -ld $(GOBIN)/bor-linux-* | grep mipsle -geth-linux-mips64: - build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/mips64 --ldflags '-extldflags "-static"' -v ./cmd/geth +bor-linux-mips64: + build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/mips64 --ldflags '-extldflags "-static"' -v ./cmd/bor @echo "Linux MIPS64 cross compilation done:" - @ls -ld $(GOBIN)/geth-linux-* | grep mips64 + @ls -ld $(GOBIN)/bor-linux-* | grep mips64 -geth-linux-mips64le: - build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/mips64le --ldflags '-extldflags "-static"' -v ./cmd/geth +bor-linux-mips64le: + build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/mips64le --ldflags '-extldflags "-static"' -v ./cmd/bor @echo "Linux MIPS64le cross compilation done:" - @ls -ld $(GOBIN)/geth-linux-* | grep mips64le + @ls -ld $(GOBIN)/bor-linux-* | grep mips64le -geth-darwin: geth-darwin-386 geth-darwin-amd64 +bor-darwin: bor-darwin-386 bor-darwin-amd64 @echo "Darwin cross compilation done:" - @ls -ld $(GOBIN)/geth-darwin-* + @ls -ld $(GOBIN)/bor-darwin-* -geth-darwin-386: - build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=darwin/386 -v ./cmd/geth +bor-darwin-386: + build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=darwin/386 -v ./cmd/bor @echo "Darwin 386 cross compilation done:" - @ls -ld $(GOBIN)/geth-darwin-* | grep 386 + @ls -ld $(GOBIN)/bor-darwin-* | grep 386 -geth-darwin-amd64: - build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=darwin/amd64 -v ./cmd/geth +bor-darwin-amd64: + build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=darwin/amd64 -v ./cmd/bor @echo "Darwin amd64 cross compilation done:" - @ls -ld $(GOBIN)/geth-darwin-* | grep amd64 + @ls -ld $(GOBIN)/bor-darwin-* | grep amd64 -geth-windows: geth-windows-386 geth-windows-amd64 +bor-windows: bor-windows-386 bor-windows-amd64 @echo "Windows cross compilation done:" - @ls -ld $(GOBIN)/geth-windows-* + @ls -ld $(GOBIN)/bor-windows-* -geth-windows-386: - build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=windows/386 -v ./cmd/geth +bor-windows-386: + build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=windows/386 -v ./cmd/bor @echo "Windows 386 cross compilation done:" - @ls -ld $(GOBIN)/geth-windows-* | grep 386 + @ls -ld $(GOBIN)/bor-windows-* | grep 386 -geth-windows-amd64: - build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=windows/amd64 -v ./cmd/geth +bor-windows-amd64: + build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=windows/amd64 -v ./cmd/bor @echo "Windows amd64 cross compilation done:" - @ls -ld $(GOBIN)/geth-windows-* | grep amd64 + @ls -ld $(GOBIN)/bor-windows-* | grep amd64 diff --git a/README.md b/README.md index fd25941543..fa5c73c4cd 100644 --- a/README.md +++ b/README.md @@ -2,9 +2,7 @@ Official Golang implementation of the Ethereum protocol. -[![API Reference]( -https://camo.githubusercontent.com/915b7be44ada53c290eb157634330494ebe3e30a/68747470733a2f2f676f646f632e6f72672f6769746875622e636f6d2f676f6c616e672f6764646f3f7374617475732e737667 -)](https://godoc.org/github.com/ethereum/go-ethereum) +[![API Reference](https://camo.githubusercontent.com/915b7be44ada53c290eb157634330494ebe3e30a/68747470733a2f2f676f646f632e6f72672f6769746875622e636f6d2f676f6c616e672f6764646f3f7374617475732e737667)](https://godoc.org/github.com/ethereum/go-ethereum) [![Go Report Card](https://goreportcard.com/badge/github.com/ethereum/go-ethereum)](https://goreportcard.com/report/github.com/ethereum/go-ethereum) [![Travis](https://travis-ci.org/ethereum/go-ethereum.svg?branch=master)](https://travis-ci.org/ethereum/go-ethereum) [![Discord](https://img.shields.io/badge/discord-join%20chat-blue.svg)](https://discord.gg/nthXNEv) @@ -63,14 +61,15 @@ $ geth console ``` This command will: - * Start `geth` in fast sync mode (default, can be changed with the `--syncmode` flag), - causing it to download more data in exchange for avoiding processing the entire history - of the Ethereum network, which is very CPU intensive. - * Start up `geth`'s built-in interactive [JavaScript console](https://github.com/ethereum/go-ethereum/wiki/JavaScript-Console), - (via the trailing `console` subcommand) through which you can invoke all official [`web3` methods](https://github.com/ethereum/wiki/wiki/JavaScript-API) - as well as `geth`'s own [management APIs](https://github.com/ethereum/go-ethereum/wiki/Management-APIs). - This tool is optional and if you leave it out you can always attach to an already running - `geth` instance with `geth attach`. + +- Start `geth` in fast sync mode (default, can be changed with the `--syncmode` flag), + causing it to download more data in exchange for avoiding processing the entire history + of the Ethereum network, which is very CPU intensive. +- Start up `geth`'s built-in interactive [JavaScript console](https://github.com/ethereum/go-ethereum/wiki/JavaScript-Console), + (via the trailing `console` subcommand) through which you can invoke all official [`web3` methods](https://github.com/ethereum/wiki/wiki/JavaScript-API) + as well as `geth`'s own [management APIs](https://github.com/ethereum/go-ethereum/wiki/Management-APIs). + This tool is optional and if you leave it out you can always attach to an already running + `geth` instance with `geth attach`. ### A Full node on the Ethereum test network @@ -89,28 +88,28 @@ useful on the testnet too. Please see above for their explanations if you've ski Specifying the `--testnet` flag, however, will reconfigure your `geth` instance a bit: - * Instead of using the default data directory (`~/.ethereum` on Linux for example), `geth` - will nest itself one level deeper into a `testnet` subfolder (`~/.ethereum/testnet` on - Linux). Note, on OSX and Linux this also means that attaching to a running testnet node - requires the use of a custom endpoint since `geth attach` will try to attach to a - production node endpoint by default. E.g. - `geth attach /testnet/geth.ipc`. Windows users are not affected by - this. - * Instead of connecting the main Ethereum network, the client will connect to the test - network, which uses different P2P bootnodes, different network IDs and genesis states. - -*Note: Although there are some internal protective measures to prevent transactions from +- Instead of using the default data directory (`~/.ethereum` on Linux for example), `geth` + will nest itself one level deeper into a `testnet` subfolder (`~/.ethereum/testnet` on + Linux). Note, on OSX and Linux this also means that attaching to a running testnet node + requires the use of a custom endpoint since `geth attach` will try to attach to a + production node endpoint by default. E.g. + `geth attach /testnet/bor.ipc`. Windows users are not affected by + this. +- Instead of connecting the main Ethereum network, the client will connect to the test + network, which uses different P2P bootnodes, different network IDs and genesis states. + +_Note: Although there are some internal protective measures to prevent transactions from crossing over between the main network and test network, you should make sure to always use separate accounts for play-money and real-money. Unless you manually move accounts, `geth` will by default correctly separate the two networks and will not make any -accounts available between them.* +accounts available between them._ ### Full node on the Rinkeby test network The above test network is a cross-client one based on the ethash proof-of-work consensus algorithm. As such, it has certain extra overhead and is more susceptible to reorganization attacks due to the network's low difficulty/security. Go Ethereum also supports connecting -to a proof-of-authority based test network called [*Rinkeby*](https://www.rinkeby.io) +to a proof-of-authority based test network called [_Rinkeby_](https://www.rinkeby.io) (operated by members of the community). This network is lighter, more secure, but is only supported by go-ethereum. @@ -134,7 +133,7 @@ export your existing configuration: $ geth --your-favourite-flags dumpconfig ``` -*Note: This works only with `geth` v1.6.0 and above.* +_Note: This works only with `geth` v1.6.0 and above._ #### Docker quick start @@ -148,7 +147,7 @@ docker run -d --name ethereum-node -v /Users/alice/ethereum:/root \ ``` This will start `geth` in fast-sync mode with a DB memory allowance of 1GB just as the -above command does. It will also create a persistent volume in your home directory for +above command does. It will also create a persistent volume in your home directory for saving your blockchain as well as map the default ports. There is also an `alpine` tag available for a slim version of the image. @@ -172,19 +171,19 @@ you'd expect. HTTP based JSON-RPC API options: - * `--rpc` Enable the HTTP-RPC server - * `--rpcaddr` HTTP-RPC server listening interface (default: `localhost`) - * `--rpcport` HTTP-RPC server listening port (default: `8545`) - * `--rpcapi` API's offered over the HTTP-RPC interface (default: `eth,net,web3`) - * `--rpccorsdomain` Comma separated list of domains from which to accept cross origin requests (browser enforced) - * `--ws` Enable the WS-RPC server - * `--wsaddr` WS-RPC server listening interface (default: `localhost`) - * `--wsport` WS-RPC server listening port (default: `8546`) - * `--wsapi` API's offered over the WS-RPC interface (default: `eth,net,web3`) - * `--wsorigins` Origins from which to accept websockets requests - * `--ipcdisable` Disable the IPC-RPC server - * `--ipcapi` API's offered over the IPC-RPC interface (default: `admin,debug,eth,miner,net,personal,shh,txpool,web3`) - * `--ipcpath` Filename for IPC socket/pipe within the datadir (explicit paths escape it) +- `--rpc` Enable the HTTP-RPC server +- `--rpcaddr` HTTP-RPC server listening interface (default: `localhost`) +- `--rpcport` HTTP-RPC server listening port (default: `8545`) +- `--rpcapi` API's offered over the HTTP-RPC interface (default: `eth,net,web3`) +- `--rpccorsdomain` Comma separated list of domains from which to accept cross origin requests (browser enforced) +- `--ws` Enable the WS-RPC server +- `--wsaddr` WS-RPC server listening interface (default: `localhost`) +- `--wsport` WS-RPC server listening port (default: `8546`) +- `--wsapi` API's offered over the WS-RPC interface (default: `eth,net,web3`) +- `--wsorigins` Origins from which to accept websockets requests +- `--ipcdisable` Disable the IPC-RPC server +- `--ipcapi` API's offered over the IPC-RPC interface (default: `admin,debug,eth,miner,net,personal,shh,txpool,web3`) +- `--ipcpath` Filename for IPC socket/pipe within the datadir (explicit paths escape it) You'll need to use your own programming environments' capabilities (libraries, tools, etc) to connect via HTTP, WS or IPC to a `geth` node configured with the above flags and you'll @@ -267,8 +266,8 @@ that other nodes can use to connect to it and exchange peer information. Make su replace the displayed IP address information (most probably `[::]`) with your externally accessible IP to get the actual `enode` URL. -*Note: You could also use a full-fledged `geth` node as a bootnode, but it's the less -recommended way.* +_Note: You could also use a full-fledged `geth` node as a bootnode, but it's the less +recommended way._ #### Starting up your member nodes @@ -282,8 +281,8 @@ do also specify a custom `--datadir` flag. $ geth --datadir=path/to/custom/data/folder --bootnodes= ``` -*Note: Since your network will be completely cut off from the main and test networks, you'll -also need to configure a miner to process transactions and create new blocks for you.* +_Note: Since your network will be completely cut off from the main and test networks, you'll +also need to configure a miner to process transactions and create new blocks for you._ #### Running a private miner @@ -321,13 +320,13 @@ and merge procedures quick and simple. Please make sure your contributions adhere to our coding guidelines: - * Code must adhere to the official Go [formatting](https://golang.org/doc/effective_go.html#formatting) - guidelines (i.e. uses [gofmt](https://golang.org/cmd/gofmt/)). - * Code must be documented adhering to the official Go [commentary](https://golang.org/doc/effective_go.html#commentary) - guidelines. - * Pull requests need to be based on and opened against the `master` branch. - * Commit messages should be prefixed with the package(s) they modify. - * E.g. "eth, rpc: make trace configs optional" +- Code must adhere to the official Go [formatting](https://golang.org/doc/effective_go.html#formatting) + guidelines (i.e. uses [gofmt](https://golang.org/cmd/gofmt/)). +- Code must be documented adhering to the official Go [commentary](https://golang.org/doc/effective_go.html#commentary) + guidelines. +- Pull requests need to be based on and opened against the `master` branch. +- Commit messages should be prefixed with the package(s) they modify. + - E.g. "eth, rpc: make trace configs optional" Please see the [Developers' Guide](https://github.com/ethereum/go-ethereum/wiki/Developers'-Guide) for more details on configuring your environment, managing project dependencies, and diff --git a/build/nsis.install.nsh b/build/nsis.install.nsh index 57ef5a37c6..9068fbfa76 100644 --- a/build/nsis.install.nsh +++ b/build/nsis.install.nsh @@ -34,8 +34,8 @@ Section "Geth" GETH_IDX SimpleFC::AdvAddRule "Geth UDP discovery (UDP:30303)" "" 17 2 1 2147483647 1 "$INSTDIR\geth.exe" "" "" "Ethereum" "" 30303 "" "" # Set default IPC endpoint (https://github.com/ethereum/EIPs/issues/147) - ${EnvVarUpdate} $0 "ETHEREUM_SOCKET" "R" "HKLM" "\\.\pipe\geth.ipc" - ${EnvVarUpdate} $0 "ETHEREUM_SOCKET" "A" "HKLM" "\\.\pipe\geth.ipc" + ${EnvVarUpdate} $0 "ETHEREUM_SOCKET" "R" "HKLM" "\\.\pipe\bor.ipc" + ${EnvVarUpdate} $0 "ETHEREUM_SOCKET" "A" "HKLM" "\\.\pipe\bor.ipc" # Add instdir to PATH Push "$INSTDIR" diff --git a/build/nsis.uninstall.nsh b/build/nsis.uninstall.nsh index 6358faa74e..eb7407b78a 100644 --- a/build/nsis.uninstall.nsh +++ b/build/nsis.uninstall.nsh @@ -22,7 +22,7 @@ Section "Uninstall" SimpleFC::AdvRemoveRule "Geth UDP discovery (UDP:30303)" # Remove IPC endpoint (https://github.com/ethereum/EIPs/issues/147) - ${un.EnvVarUpdate} $0 "ETHEREUM_SOCKET" "R" "HKLM" "\\.\pipe\geth.ipc" + ${un.EnvVarUpdate} $0 "ETHEREUM_SOCKET" "R" "HKLM" "\\.\pipe\bor.ipc" # Remove install directory from PATH Push "$INSTDIR" diff --git a/cmd/geth/accountcmd.go b/cmd/bor/accountcmd.go similarity index 100% rename from cmd/geth/accountcmd.go rename to cmd/bor/accountcmd.go diff --git a/cmd/geth/accountcmd_test.go b/cmd/bor/accountcmd_test.go similarity index 100% rename from cmd/geth/accountcmd_test.go rename to cmd/bor/accountcmd_test.go diff --git a/cmd/geth/chaincmd.go b/cmd/bor/chaincmd.go similarity index 100% rename from cmd/geth/chaincmd.go rename to cmd/bor/chaincmd.go diff --git a/cmd/geth/config.go b/cmd/bor/config.go similarity index 99% rename from cmd/geth/config.go rename to cmd/bor/config.go index 0a63a02776..f03381a614 100644 --- a/cmd/geth/config.go +++ b/cmd/bor/config.go @@ -102,7 +102,7 @@ func defaultNodeConfig() node.Config { cfg.Version = params.VersionWithCommit(gitCommit, gitDate) cfg.HTTPModules = append(cfg.HTTPModules, "eth", "shh") cfg.WSModules = append(cfg.WSModules, "eth", "shh") - cfg.IPCPath = "geth.ipc" + cfg.IPCPath = "bor.ipc" return cfg } diff --git a/cmd/geth/consolecmd.go b/cmd/bor/consolecmd.go similarity index 99% rename from cmd/geth/consolecmd.go rename to cmd/bor/consolecmd.go index d4443b3282..8cc89eb0f2 100644 --- a/cmd/geth/consolecmd.go +++ b/cmd/bor/consolecmd.go @@ -128,7 +128,7 @@ func remoteConsole(ctx *cli.Context) error { path = filepath.Join(path, "rinkeby") } } - endpoint = fmt.Sprintf("%s/geth.ipc", path) + endpoint = fmt.Sprintf("%s/bor.ipc", path) } client, err := dialRPC(endpoint) if err != nil { diff --git a/cmd/geth/consolecmd_test.go b/cmd/bor/consolecmd_test.go similarity index 99% rename from cmd/geth/consolecmd_test.go rename to cmd/bor/consolecmd_test.go index 4360451195..7c0fafe9ac 100644 --- a/cmd/geth/consolecmd_test.go +++ b/cmd/bor/consolecmd_test.go @@ -79,7 +79,7 @@ func TestIPCAttachWelcome(t *testing.T) { } else { ws := tmpdir(t) defer os.RemoveAll(ws) - ipc = filepath.Join(ws, "geth.ipc") + ipc = filepath.Join(ws, "bor.ipc") } // Note: we need --shh because testAttachWelcome checks for default // list of ipc modules and shh is included there. diff --git a/cmd/geth/dao_test.go b/cmd/bor/dao_test.go similarity index 100% rename from cmd/geth/dao_test.go rename to cmd/bor/dao_test.go diff --git a/cmd/geth/genesis_test.go b/cmd/bor/genesis_test.go similarity index 100% rename from cmd/geth/genesis_test.go rename to cmd/bor/genesis_test.go diff --git a/cmd/geth/main.go b/cmd/bor/main.go similarity index 100% rename from cmd/geth/main.go rename to cmd/bor/main.go diff --git a/cmd/geth/misccmd.go b/cmd/bor/misccmd.go similarity index 100% rename from cmd/geth/misccmd.go rename to cmd/bor/misccmd.go diff --git a/cmd/geth/retesteth.go b/cmd/bor/retesteth.go similarity index 100% rename from cmd/geth/retesteth.go rename to cmd/bor/retesteth.go diff --git a/cmd/geth/retesteth_copypaste.go b/cmd/bor/retesteth_copypaste.go similarity index 100% rename from cmd/geth/retesteth_copypaste.go rename to cmd/bor/retesteth_copypaste.go diff --git a/cmd/geth/run_test.go b/cmd/bor/run_test.go similarity index 100% rename from cmd/geth/run_test.go rename to cmd/bor/run_test.go diff --git a/cmd/geth/testdata/empty.js b/cmd/bor/testdata/empty.js similarity index 100% rename from cmd/geth/testdata/empty.js rename to cmd/bor/testdata/empty.js diff --git a/cmd/geth/testdata/guswallet.json b/cmd/bor/testdata/guswallet.json similarity index 100% rename from cmd/geth/testdata/guswallet.json rename to cmd/bor/testdata/guswallet.json diff --git a/cmd/geth/testdata/passwords.txt b/cmd/bor/testdata/passwords.txt similarity index 100% rename from cmd/geth/testdata/passwords.txt rename to cmd/bor/testdata/passwords.txt diff --git a/cmd/geth/testdata/wrong-passwords.txt b/cmd/bor/testdata/wrong-passwords.txt similarity index 100% rename from cmd/geth/testdata/wrong-passwords.txt rename to cmd/bor/testdata/wrong-passwords.txt diff --git a/cmd/geth/usage.go b/cmd/bor/usage.go similarity index 100% rename from cmd/geth/usage.go rename to cmd/bor/usage.go diff --git a/cmd/puppeth/module_dashboard.go b/cmd/puppeth/module_dashboard.go index 9a77587b4a..706d7fccd5 100644 --- a/cmd/puppeth/module_dashboard.go +++ b/cmd/puppeth/module_dashboard.go @@ -208,7 +208,7 @@ var dashboardContent = ` 
geth --datadir=$HOME/.{{.Network}} init {{.GethGenesis}}

With your local chain initialized, you can start the Ethereum Wallet: - 

ethereumwallet --rpc $HOME/.{{.Network}}/geth.ipc --node-networkid={{.NetworkID}} --node-datadir=$HOME/.{{.Network}}{{if .Ethstats}} --node-ethstats='{{.Ethstats}}'{{end}} --node-bootnodes={{.BootnodesFlat}}
+ 
ethereumwallet --rpc $HOME/.{{.Network}}/bor.ipc --node-networkid={{.NetworkID}} --node-datadir=$HOME/.{{.Network}}{{if .Ethstats}} --node-ethstats='{{.Ethstats}}'{{end}} --node-bootnodes={{.BootnodesFlat}}


You can download the Ethereum Wallet from https://github.com/ethereum/mist/releases.

@@ -229,7 +229,7 @@ var dashboardContent = ` 
geth --datadir=$HOME/.{{.Network}} init {{.GethGenesis}}

With your local chain initialized, you can start Mist: - 

mist --rpc $HOME/.{{.Network}}/geth.ipc --node-networkid={{.NetworkID}} --node-datadir=$HOME/.{{.Network}}{{if .Ethstats}} --node-ethstats='{{.Ethstats}}'{{end}} --node-bootnodes={{.BootnodesFlat}}
+ 
mist --rpc $HOME/.{{.Network}}/bor.ipc --node-networkid={{.NetworkID}} --node-datadir=$HOME/.{{.Network}}{{if .Ethstats}} --node-ethstats='{{.Ethstats}}'{{end}} --node-bootnodes={{.BootnodesFlat}}


You can download the Mist browser from https://github.com/ethereum/mist/releases.

diff --git a/node/config_test.go b/node/config_test.go index 00c24a2391..319932bbd8 100644 --- a/node/config_test.go +++ b/node/config_test.go @@ -85,15 +85,15 @@ func TestIPCPathResolution(t *testing.T) { }{ {"", "", false, ""}, {"data", "", false, ""}, - {"", "geth.ipc", false, filepath.Join(os.TempDir(), "geth.ipc")}, - {"data", "geth.ipc", false, "data/geth.ipc"}, - {"data", "./geth.ipc", false, "./geth.ipc"}, - {"data", "/geth.ipc", false, "/geth.ipc"}, + {"", "bor.ipc", false, filepath.Join(os.TempDir(), "bor.ipc")}, + {"data", "bor.ipc", false, "data/bor.ipc"}, + {"data", "./bor.ipc", false, "./bor.ipc"}, + {"data", "/bor.ipc", false, "/bor.ipc"}, {"", "", true, ``}, {"data", "", true, ``}, - {"", "geth.ipc", true, `\\.\pipe\geth.ipc`}, - {"data", "geth.ipc", true, `\\.\pipe\geth.ipc`}, - {"data", `\\.\pipe\geth.ipc`, true, `\\.\pipe\geth.ipc`}, + {"", "bor.ipc", true, `\\.\pipe\bor.ipc`}, + {"data", "bor.ipc", true, `\\.\pipe\bor.ipc`}, + {"data", `\\.\pipe\bor.ipc`, true, `\\.\pipe\bor.ipc`}, } for i, test := range tests { // Only run when platform/test match