mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-07-26 06:36:43 +00:00
Modify more strings from go-ethereum to go-ubiq
This commit is contained in:
Julian Yap
parent
885de700ff
commit
f5a1692b10
58 changed files with 117 additions and 116 deletions
3
AUTHORS
3
AUTHORS
|
|
@ -1,4 +1,4 @@
|
|||
# This is the official list of go-ethereum authors for copyright purposes.
|
||||
# This is the official list of go-ubiq authors for copyright purposes.
|
||||
|
||||
Ales Katona <ales@coinbase.com>
|
||||
Alex Leverington <alex@ethdev.com>
|
||||
|
|
@ -27,6 +27,7 @@ Jeffrey Wilcke <jeffrey@ethereum.org>
|
|||
Jens Agerberg <github@agerberg.me>
|
||||
Jonathan Brown <jbrown@bluedroplet.com>
|
||||
Joseph Chow <ethereum@outlook.com>
|
||||
Julian Yap <julianokyap@gmail.com>
|
||||
Justin Clark-Casey <justincc@justincc.org>
|
||||
Kenji Siu <kenji@isuntv.com>
|
||||
Kobi Gurkan <kobigurk@gmail.com>
|
||||
|
|
|
|||
2
COPYING
2
COPYING
|
|
@ -1,7 +1,7 @@
|
|||
GNU GENERAL PUBLIC LICENSE
|
||||
Version 3, 29 June 2007
|
||||
|
||||
Copyright (C) 2014 The go-ethereum Authors.
|
||||
Copyright (C) 2014 The go-ubiq Authors.
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
FROM alpine:3.3
|
||||
|
||||
ADD . /go-ethereum
|
||||
ADD . /go-ubiq
|
||||
RUN \
|
||||
apk add --update git go make gcc musl-dev && \
|
||||
(cd go-ethereum && make gubiq) && \
|
||||
cp go-ethereum/build/bin/gubiq /gubiq && \
|
||||
(cd go-ubiq && make gubiq) && \
|
||||
cp go-ubiq/build/bin/gubiq /gubiq && \
|
||||
apk del git go make gcc musl-dev && \
|
||||
rm -rf /go-ethereum && rm -rf /var/cache/apk/*
|
||||
rm -rf /go-ubiq && rm -rf /var/cache/apk/*
|
||||
|
||||
EXPOSE 8588
|
||||
EXPOSE 30303
|
||||
|
|
|
|||
28
README.md
28
README.md
|
|
@ -5,7 +5,7 @@ Official golang implementation of the Ethereum protocol.
|
|||
[](https://godoc.org/github.com/ubiq/go-ubiq)
|
||||
[](https://gitter.im/ethereum/go-ethereum?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
|
||||
[](https://gitter.im/ubiq/go-ubiq?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
|
||||
|
||||
Automated builds are available for stable releases and the unstable master branch.
|
||||
Binary archives are published at https://gubiq.ethereum.org/downloads/.
|
||||
|
|
@ -28,17 +28,17 @@ or, to build the full suite of utilities:
|
|||
|
||||
## Executables
|
||||
|
||||
The go-ethereum project comes with several wrappers/executables found in the `cmd` directory.
|
||||
The go-ubiq project comes with several wrappers/executables found in the `cmd` directory.
|
||||
|
||||
| Command | Description |
|
||||
|:----------:|-------------|
|
||||
| **`gubiq`** | Our main Ethereum CLI client. It is the entry point into the Ethereum network (main-, test- or private net), capable of running as a full node (default) archive node (retaining all historical state) or a light node (retrieving data live). It can be used by other processes as a gateway into the Ethereum network via JSON RPC endpoints exposed on top of HTTP, WebSocket and/or IPC transports. `gubiq --help` and the [CLI Wiki page](https://github.com/ubiq/go-ubiq/wiki/Command-Line-Options) for command line options |
|
||||
| `abigen` | Source code generator to convert Ethereum contract definitions into easy to use, compile-time type-safe Go packages. It operates on plain [Ethereum contract ABIs](https://github.com/ethereum/wiki/wiki/Ethereum-Contract-ABI) with expanded functionality if the contract bytecode is also available. However it also accepts Solidity source files, making development much more streamlined. Please see our [Native DApps](https://github.com/ubiq/go-ubiq/wiki/Native-DApps:-Go-bindings-to-Ethereum-contracts) wiki page for details. |
|
||||
| `abigen` | Source code generator to convert Ethereum contract definitions into easy to use, compile-time type-safe Go packages. It operates on plain [Ethereum contract ABIs](https://github.com/ubiq/wiki/wiki/Ethereum-Contract-ABI) with expanded functionality if the contract bytecode is also available. However it also accepts Solidity source files, making development much more streamlined. Please see our [Native DApps](https://github.com/ubiq/go-ubiq/wiki/Native-DApps:-Go-bindings-to-Ethereum-contracts) wiki page for details. |
|
||||
| `bootnode` | Stripped down version of our Ethereum client implementation that only takes part in the network node discovery protocol, but does not run any of the higher level application protocols. It can be used as a lightweight bootstrap node to aid in finding peers in private networks. |
|
||||
| `disasm` | Bytecode disassembler to convert EVM (Ethereum Virtual Machine) bytecode into more user friendly assembly-like opcodes (e.g. `echo "6001" | disasm`). For details on the individual opcodes, please see pages 22-30 of the [Ethereum Yellow Paper](http://gavwood.com/paper.pdf). |
|
||||
| `evm` | Developer utility version of the EVM (Ethereum Virtual Machine) that is capable of running bytecode snippets within a configurable environment and execution mode. Its purpose is to allow insolated, fine-grained debugging of EVM opcodes (e.g. `evm --code 60ff60ff --debug`). |
|
||||
| `gubiqrpctest` | Developer utility tool to support our [ethereum/rpc-test](https://github.com/ethereum/rpc-tests) test suite which validates baseline conformity to the [Ethereum JSON RPC](https://github.com/ethereum/wiki/wiki/JSON-RPC) specs. Please see the [test suite's readme](https://github.com/ethereum/rpc-tests/blob/master/README.md) for details. |
|
||||
| `rlpdump` | Developer utility tool to convert binary RLP ([Recursive Length Prefix](https://github.com/ethereum/wiki/wiki/RLP)) dumps (data encoding used by the Ethereum protocol both network as well as consensus wise) to user friendlier hierarchical representation (e.g. `rlpdump --hex CE0183FFFFFFC4C304050583616263`). |
|
||||
| `gubiqrpctest` | Developer utility tool to support our [ubiq/rpc-test](https://github.com/ubiq/rpc-tests) test suite which validates baseline conformity to the [Ethereum JSON RPC](https://github.com/ubiq/wiki/wiki/JSON-RPC) specs. Please see the [test suite's readme](https://github.com/ubiq/rpc-tests/blob/master/README.md) for details. |
|
||||
| `rlpdump` | Developer utility tool to convert binary RLP ([Recursive Length Prefix](https://github.com/ubiq/wiki/wiki/RLP)) dumps (data encoding used by the Ethereum protocol both network as well as consensus wise) to user friendlier hierarchical representation (e.g. `rlpdump --hex CE0183FFFFFFC4C304050583616263`). |
|
||||
| `bzzd` | swarm daemon. This is the entrypoint for the swarm network. `bzzd --help` for command line options. See http://swarm-guide.readthedocs.io for swarm documentation. |
|
||||
| `bzzup` | swarm command line file uploader. `bzzup --help` for command line options |
|
||||
| `bzzhash` | command to calculate the swarm hash of a file or directory. `bzzhash --help` for command line options |
|
||||
|
|
@ -69,7 +69,7 @@ This command will:
|
|||
sync times especially for HDD users. This flag is optional and you can set it as high or as low as
|
||||
you'd like, though we'd recommend the 512MB - 2GB range.
|
||||
* Start up Gubiq's built-in interactive [JavaScript console](https://github.com/ubiq/go-ubiq/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)
|
||||
(via the trailing `console` subcommand) through which you can invoke all official [`web3` methods](https://github.com/ubiq/wiki/wiki/JavaScript-API)
|
||||
as well as Gubiq's own [management APIs](https://github.com/ubiq/go-ubiq/wiki/Management-APIs).
|
||||
This too is optional and if you leave it out you can always attach to an already running Gubiq instance
|
||||
with `gubiq --attach`.
|
||||
|
|
@ -91,8 +91,8 @@ here.
|
|||
|
||||
Specifying the `--testnet` flag however will reconfigure your Gubiq instance a bit:
|
||||
|
||||
* Instead of using the default data directory (`~/.ethereum` on Linux for example), Gubiq will nest
|
||||
itself one level deeper into a `testnet` subfolder (`~/.ethereum/testnet` on Linux).
|
||||
* Instead of using the default data directory (`~/.ubiq` on Linux for example), Gubiq will nest
|
||||
itself one level deeper into a `testnet` subfolder (`~/.ubiq/testnet` on Linux).
|
||||
* 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.
|
||||
|
||||
|
|
@ -118,7 +118,7 @@ This will start gubiq in fast sync mode with a DB memory allowance of 512MB just
|
|||
|
||||
As a developer, sooner rather than later you'll want to start interacting with Gubiq and the Ethereum
|
||||
network via your own programs and not manually through the console. To aid this, Gubiq has built in
|
||||
support for a JSON-RPC based APIs ([standard APIs](https://github.com/ethereum/wiki/wiki/JSON-RPC) and
|
||||
support for a JSON-RPC based APIs ([standard APIs](https://github.com/ubiq/wiki/wiki/JSON-RPC) and
|
||||
[Gubiq specific APIs](https://github.com/ubiq/go-ubiq/wiki/Management-APIs)). These can be
|
||||
exposed via HTTP, WebSockets and IPC (unix sockets on unix based platroms, and named pipes on Windows).
|
||||
|
||||
|
|
@ -205,7 +205,7 @@ $ bootnode --genkey=boot.key
|
|||
$ bootnode --nodekey=boot.key
|
||||
```
|
||||
|
||||
With the bootnode online, it will display an [`enode` URL](https://github.com/ethereum/wiki/wiki/enode-url-format)
|
||||
With the bootnode online, it will display an [`enode` URL](https://github.com/ubiq/wiki/wiki/enode-url-format)
|
||||
that other nodes can use to connect to it and exchange peer information. Make sure to replace the
|
||||
displayed IP address information (most probably `[::]`) with your externally accessible IP to get the
|
||||
actual `enode` URL.
|
||||
|
|
@ -251,9 +251,9 @@ limit blocks converge to (`--targetgaslimit`) and the price transactions are acc
|
|||
Thank you for considering to help out with the source code! We welcome contributions from
|
||||
anyone on the internet, and are grateful for even the smallest of fixes!
|
||||
|
||||
If you'd like to contribute to go-ethereum, please fork, fix, commit and send a pull request
|
||||
If you'd like to contribute to go-ubiq, please fork, fix, commit and send a pull request
|
||||
for the maintainers to review and merge into the main code base. If you wish to submit more
|
||||
complex changes though, please check up with the core devs first on [our gitter channel](https://gitter.im/ethereum/go-ethereum)
|
||||
complex changes though, please check up with the core devs first on [our gitter channel](https://gitter.im/ubiq/go-ubiq)
|
||||
to ensure those changes are in line with the general philosophy of the project and/or get some
|
||||
early feedback which can make both your efforts much lighter as well as our review and merge
|
||||
procedures quick and simple.
|
||||
|
|
@ -271,10 +271,10 @@ for more details on configuring your environment, managing project dependencies
|
|||
|
||||
## License
|
||||
|
||||
The go-ethereum library (i.e. all code outside of the `cmd` directory) is licensed under the
|
||||
The go-ubiq library (i.e. all code outside of the `cmd` directory) is licensed under the
|
||||
[GNU Lesser General Public License v3.0](https://www.gnu.org/licenses/lgpl-3.0.en.html), also
|
||||
included in our repository in the `COPYING.LESSER` file.
|
||||
|
||||
The go-ethereum binaries (i.e. all code inside of the `cmd` directory) is licensed under the
|
||||
The go-ubiq binaries (i.e. all code inside of the `cmd` directory) is licensed under the
|
||||
[GNU General Public License v3.0](https://www.gnu.org/licenses/gpl-3.0.en.html), also included
|
||||
in our repository in the `COPYING` file.
|
||||
|
|
|
|||
|
|
@ -375,13 +375,13 @@ func TestBindings(t *testing.T) {
|
|||
if !common.FileExist(gocmd) {
|
||||
t.Skip("go sdk not found for testing")
|
||||
}
|
||||
// Skip the test if the go-ethereum sources are symlinked (https://github.com/golang/go/issues/14845)
|
||||
// Skip the test if the go-ubiq sources are symlinked (https://github.com/golang/go/issues/14845)
|
||||
linkTestCode := fmt.Sprintf("package linktest\nfunc CheckSymlinks(){\nfmt.Println(backends.NewSimulatedBackend())\n}")
|
||||
linkTestDeps, err := imports.Process("", []byte(linkTestCode), nil)
|
||||
if err != nil {
|
||||
t.Fatalf("failed check for goimports symlink bug: %v", err)
|
||||
}
|
||||
if !strings.Contains(string(linkTestDeps), "go-ethereum") {
|
||||
if !strings.Contains(string(linkTestDeps), "go-ubiq") {
|
||||
t.Skip("symlinked environment doesn't support bind (https://github.com/golang/go/issues/14845)")
|
||||
}
|
||||
// Create a temporary workspace for the test suite
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
// Package accounts implements encrypted storage of secp256k1 private keys.
|
||||
//
|
||||
// Keys are stored as encrypted JSON files according to the Web3 Secret Storage specification.
|
||||
// See https://github.com/ethereum/wiki/wiki/Web3-Secret-Storage-Definition for more information.
|
||||
// See https://github.com/ubiq/wiki/wiki/Web3-Secret-Storage-Definition for more information.
|
||||
package accounts
|
||||
|
||||
import (
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
This key store behaves as KeyStorePlain with the difference that
|
||||
the private key is encrypted and on disk uses another JSON encoding.
|
||||
|
||||
The crypto is documented at https://github.com/ethereum/wiki/wiki/Web3-Secret-Storage-Definition
|
||||
The crypto is documented at https://github.com/ubiq/wiki/wiki/Web3-Secret-Storage-Definition
|
||||
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
os: Visual Studio 2015
|
||||
|
||||
# Clone directly into GOPATH.
|
||||
clone_folder: C:\gopath\src\github.com\ethereum\go-ethereum
|
||||
clone_folder: C:\gopath\src\github.com\ubiq\go-ubiq
|
||||
clone_depth: 5
|
||||
version: "{branch}.{build}"
|
||||
environment:
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
# Vendored Dependencies
|
||||
|
||||
Dependencies are almost all vendored in at the standard Go `/vendor` path. This allows
|
||||
people to build go-ethereum using the standard toolchain without any particular package
|
||||
people to build go-ubiq using the standard toolchain without any particular package
|
||||
manager. It also plays nicely with `go get`, not requiring external code to be relied on.
|
||||
|
||||
The one single dependent package missing from `vendor` is `golang.org/x/net/context`. As
|
||||
this is a package exposed via public library APIs, it must not be vendored as dependent
|
||||
code woulnd't be able to instantiate.
|
||||
|
||||
To allow reproducible builds of go-ethereum nonetheless that don't need network access
|
||||
To allow reproducible builds of go-ubiq nonetheless that don't need network access
|
||||
during build time to fetch `golang.org/x/net/context`, a version was copied into our repo
|
||||
at the very specific `/build/_vendor` path, which is added automatically by all CI build
|
||||
scripts and the makefile too.
|
||||
|
|
@ -33,7 +33,7 @@ and installs the new version into the PPA repository. Launchpad requires a valid
|
|||
by a team member for source package uploads. The signing key is stored in an environment
|
||||
variable which Travis CI makes available to certain builds.
|
||||
|
||||
We want to build go-ethereum with the most recent version of Go, irrespective of the Go
|
||||
We want to build go-ubiq with the most recent version of Go, irrespective of the Go
|
||||
version that is available in the main Ubuntu repository. In order to make this possible,
|
||||
our PPA depends on the ~gophers/ubuntu/archive PPA. Our source package build-depends on
|
||||
golang-1.7, which is co-installable alongside the regular golang package. PPA dependencies
|
||||
|
|
|
|||
14
build/ci.go
14
build/ci.go
|
|
@ -79,7 +79,7 @@ var (
|
|||
debExecutables = []debExecutable{
|
||||
{
|
||||
Name: "gubiq",
|
||||
Description: "Ethereum CLI client.",
|
||||
Description: "Ubiq CLI client.",
|
||||
},
|
||||
{
|
||||
Name: "rlpdump",
|
||||
|
|
@ -153,7 +153,7 @@ func doInstall(cmdline []string) {
|
|||
// failure with outdated Go. This should save them the trouble.
|
||||
if runtime.Version() < "go1.4" && !strings.HasPrefix(runtime.Version(), "devel") {
|
||||
log.Println("You have Go version", runtime.Version())
|
||||
log.Println("go-ethereum requires at least Go version 1.4 and cannot")
|
||||
log.Println("go-ubiq requires at least Go version 1.4 and cannot")
|
||||
log.Println("be compiled with an earlier version. Please upgrade your Go installation.")
|
||||
os.Exit(1)
|
||||
}
|
||||
|
|
@ -468,7 +468,7 @@ func isUnstableBuild(env build.Environment) bool {
|
|||
type debMetadata struct {
|
||||
Env build.Environment
|
||||
|
||||
// go-ethereum version being built. Note that this
|
||||
// go-ubiq version being built. Note that this
|
||||
// is not the debian package version. The package version
|
||||
// is constructed by VersionString.
|
||||
Version string
|
||||
|
|
@ -485,7 +485,7 @@ type debExecutable struct {
|
|||
func newDebMetadata(distro, author string, env build.Environment, t time.Time) debMetadata {
|
||||
if author == "" {
|
||||
// No signing key, use default author.
|
||||
author = "Ethereum Builds <fjl@ethereum.org>"
|
||||
author = "Ubiq Builds <fjl@ethereum.org>"
|
||||
}
|
||||
return debMetadata{
|
||||
Env: env,
|
||||
|
|
@ -501,9 +501,9 @@ func newDebMetadata(distro, author string, env build.Environment, t time.Time) d
|
|||
// on all executable packages.
|
||||
func (meta debMetadata) Name() string {
|
||||
if isUnstableBuild(meta.Env) {
|
||||
return "ethereum-unstable"
|
||||
return "ubiq-unstable"
|
||||
}
|
||||
return "ethereum"
|
||||
return "ubiq"
|
||||
}
|
||||
|
||||
// VersionString returns the debian version of the packages.
|
||||
|
|
@ -547,7 +547,7 @@ func (meta debMetadata) ExeConflicts(exe debExecutable) string {
|
|||
// be preferred and the conflicting files should be handled via
|
||||
// alternates. We might do this eventually but using a conflict is
|
||||
// easier now.
|
||||
return "ethereum, " + exe.Name
|
||||
return "ubiq, " + exe.Name
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
Copyright 2016 The go-ethereum Authors
|
||||
Copyright 2016 The go-ubiq Authors
|
||||
|
||||
go-ethereum is free software: you can redistribute it and/or modify
|
||||
go-ubiq is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
go-ethereum is distributed in the hope that it will be useful,
|
||||
go-ubiq is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with go-ethereum. If not, see <http://www.gnu.org/licenses/>.
|
||||
along with go-ubiq. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
<packaging>aar</packaging>
|
||||
|
||||
<name>Android Ethereum Client</name>
|
||||
<description>Android port of the go-ethereum libraries and node</description>
|
||||
<description>Android port of the go-ubiq libraries and node</description>
|
||||
<url>https://github.com/ubiq/go-ubiq</url>
|
||||
<inceptionYear>2015</inceptionYear>
|
||||
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
# - sign installer
|
||||
CRCCheck on
|
||||
|
||||
!define GROUPNAME "Ethereum"
|
||||
!define GROUPNAME "Ubiq"
|
||||
!define APPNAME "Gubiq"
|
||||
!define DESCRIPTION "Official Go implementation of the Ethereum protocol"
|
||||
!addplugindir .\
|
||||
|
|
|
|||
|
|
@ -29,9 +29,9 @@ Section "Gubiq" GETH_IDX
|
|||
SimpleFC::AdvRemoveRule "Gubiq UDP discovery (UDP:30303)"
|
||||
|
||||
# Firewall - add rules
|
||||
SimpleFC::AdvAddRule "Gubiq incoming peers (TCP:30303)" "" 6 1 1 2147483647 1 "$INSTDIR\gubiq.exe" "" "" "Ethereum" 30303 "" "" ""
|
||||
SimpleFC::AdvAddRule "Gubiq outgoing peers (TCP:30303)" "" 6 2 1 2147483647 1 "$INSTDIR\gubiq.exe" "" "" "Ethereum" "" 30303 "" ""
|
||||
SimpleFC::AdvAddRule "Gubiq UDP discovery (UDP:30303)" "" 17 2 1 2147483647 1 "$INSTDIR\gubiq.exe" "" "" "Ethereum" "" 30303 "" ""
|
||||
SimpleFC::AdvAddRule "Gubiq incoming peers (TCP:30303)" "" 6 1 1 2147483647 1 "$INSTDIR\gubiq.exe" "" "" "Ubiq" 30303 "" "" ""
|
||||
SimpleFC::AdvAddRule "Gubiq outgoing peers (TCP:30303)" "" 6 2 1 2147483647 1 "$INSTDIR\gubiq.exe" "" "" "Ubiq" "" 30303 "" ""
|
||||
SimpleFC::AdvAddRule "Gubiq UDP discovery (UDP:30303)" "" 17 2 1 2147483647 1 "$INSTDIR\gubiq.exe" "" "" "Ubiq" "" 30303 "" ""
|
||||
|
||||
# Set default IPC endpoint (https://github.com/ethereum/EIPs/issues/147)
|
||||
${EnvVarUpdate} $0 "ETHEREUM_SOCKET" "R" "HKLM" "\\.\pipe\gubiq.ipc"
|
||||
|
|
|
|||
|
|
@ -64,13 +64,13 @@ var (
|
|||
licenseCommentRE = regexp.MustCompile(`^//\s*(Copyright|This file is part of).*?\n(?://.*?\n)*\n*`)
|
||||
|
||||
// this text appears at the start of AUTHORS
|
||||
authorsFileHeader = "# This is the official list of go-ethereum authors for copyright purposes.\n\n"
|
||||
authorsFileHeader = "# This is the official list of go-ubiq authors for copyright purposes.\n\n"
|
||||
)
|
||||
|
||||
// this template generates the license comment.
|
||||
// its input is an info structure.
|
||||
var licenseT = template.Must(template.New("").Parse(`
|
||||
// Copyright {{.Year}} The go-ethereum Authors
|
||||
// Copyright {{.Year}} The go-ubiq Authors
|
||||
// This file is part of {{.Whole false}}.
|
||||
//
|
||||
// {{.Whole true}} is free software: you can redistribute it and/or modify
|
||||
|
|
@ -109,12 +109,12 @@ func (i info) ShortLicense() string {
|
|||
|
||||
func (i info) Whole(startOfSentence bool) string {
|
||||
if i.gpl() {
|
||||
return "go-ethereum"
|
||||
return "go-ubiq"
|
||||
}
|
||||
if startOfSentence {
|
||||
return "The go-ethereum library"
|
||||
return "The go-ubiq library"
|
||||
}
|
||||
return "the go-ethereum library"
|
||||
return "the go-ubiq library"
|
||||
}
|
||||
|
||||
func (i info) gpl() bool {
|
||||
|
|
|
|||
|
|
@ -28,5 +28,5 @@ test:
|
|||
- cp ./build/bin/gubiq $HOME/gubiq
|
||||
|
||||
# Run hive and move all generated logs into the public artifacts folder
|
||||
- (cd ~/.go_workspace/src/github.com/karalabe/hive && hive --docker-noshell --client=go-ethereum:local --override=$HOME/gubiq --test=. --sim=.)
|
||||
- (cd ~/.go_workspace/src/github.com/karalabe/hive && hive --docker-noshell --client=go-ubiq:local --override=$HOME/gubiq --test=. --sim=.)
|
||||
- cp -r ~/.go_workspace/src/github.com/karalabe/hive/workspace/logs/* $CIRCLE_ARTIFACTS
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ const clientIdentifier = "bzzd"
|
|||
|
||||
var (
|
||||
gitCommit string // Git SHA1 commit hash of the release (set via linker flags)
|
||||
app = utils.NewApp(gitCommit, "Ethereum Swarm server daemon")
|
||||
app = utils.NewApp(gitCommit, "Ubiq Swarm server daemon")
|
||||
)
|
||||
|
||||
var (
|
||||
|
|
|
|||
|
|
@ -206,10 +206,10 @@ func main() {
|
|||
|
||||
app := cli.NewApp()
|
||||
app.Name = "ethtest"
|
||||
app.Usage = "go-ethereum test interface"
|
||||
app.Usage = "go-ubiq test interface"
|
||||
app.Action = setupApp
|
||||
app.Version = "0.2.0"
|
||||
app.Author = "go-ethereum team"
|
||||
app.Author = "go-ubiq team"
|
||||
|
||||
app.Flags = []cli.Flag{
|
||||
TestFlag,
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@ TODO: Please write this
|
|||
Category: "BLOCKCHAIN COMMANDS",
|
||||
Description: `
|
||||
The arguments are interpreted as block numbers or hashes.
|
||||
Use "ethereum dump 0" to dump the genesis block.
|
||||
Use "ubiq dump 0" to dump the genesis block.
|
||||
`,
|
||||
}
|
||||
)
|
||||
|
|
|
|||
|
|
@ -54,14 +54,14 @@ var (
|
|||
// Ethereum address of the Gubiq release oracle.
|
||||
relOracle = common.HexToAddress("0xfa7b9770ca4cb04296cac84f37736d4041251cdf")
|
||||
// The app that holds all commands and flags.
|
||||
app = utils.NewApp(gitCommit, "the go-ethereum command line interface")
|
||||
app = utils.NewApp(gitCommit, "the go-ubiq command line interface")
|
||||
)
|
||||
|
||||
func init() {
|
||||
// Initialize the CLI app and start Gubiq
|
||||
app.Action = gubiq
|
||||
app.HideVersion = true // we have a command to print the version
|
||||
app.Copyright = "Copyright 2013-2016 The go-ethereum Authors"
|
||||
app.Copyright = "Copyright 2013-2016 The go-ubiq Authors"
|
||||
app.Commands = []cli.Command{
|
||||
importCommand,
|
||||
exportCommand,
|
||||
|
|
@ -306,7 +306,7 @@ func startNode(ctx *cli.Context, stack *node.Node) {
|
|||
if ctx.GlobalBool(utils.MiningEnabledFlag.Name) {
|
||||
var ethereum *eth.Ethereum
|
||||
if err := stack.Service(ðereum); err != nil {
|
||||
utils.Fatalf("ethereum service not running: %v", err)
|
||||
utils.Fatalf("ubiq service not running: %v", err)
|
||||
}
|
||||
if err := ethereum.StartMining(ctx.GlobalInt(utils.MinerThreadsFlag.Name)); err != nil {
|
||||
utils.Fatalf("Failed to start mining: %v", err)
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ import (
|
|||
var AppHelpTemplate = `NAME:
|
||||
{{.App.Name}} - {{.App.Usage}}
|
||||
|
||||
Copyright 2013-2016 The go-ethereum Authors
|
||||
Copyright 2013-2016 The go-ubiq Authors
|
||||
|
||||
USAGE:
|
||||
{{.App.HelpName}} [options]{{if .App.Commands}} command [command options]{{end}} {{if .App.ArgsUsage}}{{.App.ArgsUsage}}{{else}}[arguments...]{{end}}
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ func (self *DirectoryString) Set(value string) error {
|
|||
}
|
||||
|
||||
// Custom cli.Flag type which expand the received string to an absolute path.
|
||||
// e.g. ~/.ethereum -> /home/username/.ethereum
|
||||
// e.g. ~/.ubiq -> /home/username/.ubiq
|
||||
type DirectoryFlag struct {
|
||||
cli.GenericFlag
|
||||
Name string
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
# common
|
||||
|
||||
[](https://travis-ci.org/ethereum/go-ethereum)
|
||||
Status](https://travis-ci.org/ubiq/go-ubiq.png?branch=master)](https://travis-ci.org/ubiq/go-ubiq)
|
||||
|
||||
The common package contains the ethereum utility library.
|
||||
|
||||
# Installation
|
||||
|
||||
As a subdirectory the main go-ethereum repository, you get it with
|
||||
As a subdirectory the main go-ubiq repository, you get it with
|
||||
`go get github.com/ubiq/go-ubiq`.
|
||||
|
||||
# Usage
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
// You should have received a copy of the GNU Lesser General Public License
|
||||
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
// Spec at https://github.com/ethereum/wiki/wiki/ICAP:-Inter-exchange-Client-Address-Protocol
|
||||
// Spec at https://github.com/ubiq/wiki/wiki/ICAP:-Inter-exchange-Client-Address-Protocol
|
||||
|
||||
package common
|
||||
|
||||
|
|
|
|||
|
|
@ -3,10 +3,10 @@ FROM alpine:3.4
|
|||
RUN \
|
||||
apk add --update go git make gcc musl-dev && \
|
||||
git clone --depth 1 https://github.com/ubiq/go-ubiq && \
|
||||
(cd go-ethereum && make gubiq) && \
|
||||
cp go-ethereum/build/bin/gubiq /gubiq && \
|
||||
(cd go-ubiq && make gubiq) && \
|
||||
cp go-ubiq/build/bin/gubiq /gubiq && \
|
||||
apk del go git make gcc musl-dev && \
|
||||
rm -rf /go-ethereum && rm -rf /var/cache/apk/*
|
||||
rm -rf /go-ubiq && rm -rf /var/cache/apk/*
|
||||
|
||||
EXPOSE 8588
|
||||
EXPOSE 30303
|
||||
|
|
|
|||
|
|
@ -3,10 +3,10 @@ FROM alpine:3.4
|
|||
RUN \
|
||||
apk add --update go git make gcc musl-dev && \
|
||||
git clone --depth 1 --branch release/1.5 https://github.com/ubiq/go-ubiq && \
|
||||
(cd go-ethereum && make gubiq) && \
|
||||
cp go-ethereum/build/bin/gubiq /gubiq && \
|
||||
(cd go-ubiq && make gubiq) && \
|
||||
cp go-ubiq/build/bin/gubiq /gubiq && \
|
||||
apk del go git make gcc musl-dev && \
|
||||
rm -rf /go-ethereum && rm -rf /var/cache/apk/*
|
||||
rm -rf /go-ubiq && rm -rf /var/cache/apk/*
|
||||
|
||||
EXPOSE 8588
|
||||
EXPOSE 30303
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ var (
|
|||
mipmapPre = []byte("mipmap-log-bloom-")
|
||||
MIPMapLevels = []uint64{1000000, 500000, 100000, 50000, 1000}
|
||||
|
||||
configPrefix = []byte("ethereum-config-") // config prefix for the db
|
||||
configPrefix = []byte("ubiq-config-") // config prefix for the db
|
||||
|
||||
// used by old (non-sequential keys) db, now only used for conversion
|
||||
oldBlockPrefix = []byte("block-")
|
||||
|
|
|
|||
|
|
@ -102,7 +102,7 @@ func NewHeaderChain(chainDb ethdb.Database, config *params.ChainConfig, getValid
|
|||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
glog.V(logger.Info).Infoln("WARNING: Wrote default ethereum genesis block")
|
||||
glog.V(logger.Info).Infoln("WARNING: Wrote default ubiq genesis block")
|
||||
hc.genesisHeader = genesisBlock.Header()
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ type revision struct {
|
|||
journalIndex int
|
||||
}
|
||||
|
||||
// StateDBs within the ethereum protocol are used to store anything
|
||||
// StateDBs within the ubiq protocol are used to store anything
|
||||
// within the merkle trie. StateDBs take care of caching and storing
|
||||
// nested states. It's the general query interface to retrieve:
|
||||
// * Contracts
|
||||
|
|
|
|||
|
|
@ -208,7 +208,7 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) {
|
|||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
glog.V(logger.Info).Infoln("WARNING: Wrote default ethereum genesis block")
|
||||
glog.V(logger.Info).Infoln("WARNING: Wrote default ubiq genesis block")
|
||||
}
|
||||
|
||||
if config.ChainConfig == nil {
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@ func (api *PublicFilterAPI) timeoutLoop() {
|
|||
// It is part of the filter package because this filter can be used throug the
|
||||
// `eth_getFilterChanges` polling method that is also used for log filters.
|
||||
//
|
||||
// https://github.com/ethereum/wiki/wiki/JSON-RPC#eth_newpendingtransactionfilter
|
||||
// https://github.com/ubiq/wiki/wiki/JSON-RPC#eth_newpendingtransactionfilter
|
||||
func (api *PublicFilterAPI) NewPendingTransactionFilter() rpc.ID {
|
||||
var (
|
||||
pendingTxs = make(chan common.Hash)
|
||||
|
|
@ -170,7 +170,7 @@ func (api *PublicFilterAPI) NewPendingTransactions(ctx context.Context) (*rpc.Su
|
|||
// NewBlockFilter creates a filter that fetches blocks that are imported into the chain.
|
||||
// It is part of the filter package since polling goes with eth_getFilterChanges.
|
||||
//
|
||||
// https://github.com/ethereum/wiki/wiki/JSON-RPC#eth_newblockfilter
|
||||
// https://github.com/ubiq/wiki/wiki/JSON-RPC#eth_newblockfilter
|
||||
func (api *PublicFilterAPI) NewBlockFilter() rpc.ID {
|
||||
var (
|
||||
headers = make(chan *types.Header)
|
||||
|
|
@ -276,7 +276,7 @@ type FilterCriteria struct {
|
|||
// used to retrieve logs when the state changes. This method cannot be
|
||||
// used to fetch logs that are already stored in the state.
|
||||
//
|
||||
// https://github.com/ethereum/wiki/wiki/JSON-RPC#eth_newfilter
|
||||
// https://github.com/ubiq/wiki/wiki/JSON-RPC#eth_newfilter
|
||||
func (api *PublicFilterAPI) NewFilter(crit FilterCriteria) rpc.ID {
|
||||
var (
|
||||
logs = make(chan []Log)
|
||||
|
|
@ -317,7 +317,7 @@ func (api *PublicFilterAPI) NewFilter(crit FilterCriteria) rpc.ID {
|
|||
|
||||
// GetLogs returns logs matching the given argument that are stored within the state.
|
||||
//
|
||||
// https://github.com/ethereum/wiki/wiki/JSON-RPC#eth_getlogs
|
||||
// https://github.com/ubiq/wiki/wiki/JSON-RPC#eth_getlogs
|
||||
func (api *PublicFilterAPI) GetLogs(ctx context.Context, crit FilterCriteria) ([]Log, error) {
|
||||
if crit.FromBlock == nil {
|
||||
crit.FromBlock = big.NewInt(rpc.LatestBlockNumber.Int64())
|
||||
|
|
@ -338,7 +338,7 @@ func (api *PublicFilterAPI) GetLogs(ctx context.Context, crit FilterCriteria) ([
|
|||
|
||||
// UninstallFilter removes the filter with the given filter id.
|
||||
//
|
||||
// https://github.com/ethereum/wiki/wiki/JSON-RPC#eth_uninstallfilter
|
||||
// https://github.com/ubiq/wiki/wiki/JSON-RPC#eth_uninstallfilter
|
||||
func (api *PublicFilterAPI) UninstallFilter(id rpc.ID) bool {
|
||||
api.filtersMu.Lock()
|
||||
f, found := api.filters[id]
|
||||
|
|
@ -356,7 +356,7 @@ func (api *PublicFilterAPI) UninstallFilter(id rpc.ID) bool {
|
|||
// GetFilterLogs returns the logs for the filter with the given id.
|
||||
// If the filter could not be found an empty array of logs is returned.
|
||||
//
|
||||
// https://github.com/ethereum/wiki/wiki/JSON-RPC#eth_getfilterlogs
|
||||
// https://github.com/ubiq/wiki/wiki/JSON-RPC#eth_getfilterlogs
|
||||
func (api *PublicFilterAPI) GetFilterLogs(ctx context.Context, id rpc.ID) ([]Log, error) {
|
||||
api.filtersMu.Lock()
|
||||
f, found := api.filters[id]
|
||||
|
|
@ -383,7 +383,7 @@ func (api *PublicFilterAPI) GetFilterLogs(ctx context.Context, id rpc.ID) ([]Log
|
|||
// (pending)Log filters return []Log. If the filter could not be found
|
||||
// []interface{}{} is returned.
|
||||
//
|
||||
// https://github.com/ethereum/wiki/wiki/JSON-RPC#eth_getfilterchanges
|
||||
// https://github.com/ubiq/wiki/wiki/JSON-RPC#eth_getfilterchanges
|
||||
func (api *PublicFilterAPI) GetFilterChanges(id rpc.ID) interface{} {
|
||||
api.filtersMu.Lock()
|
||||
defer api.filtersMu.Unlock()
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ func BenchmarkMipmaps(b *testing.B) {
|
|||
key1, _ = crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291")
|
||||
addr1 = crypto.PubkeyToAddress(key1.PublicKey)
|
||||
addr2 = common.BytesToAddress([]byte("jeff"))
|
||||
addr3 = common.BytesToAddress([]byte("ethereum"))
|
||||
addr3 = common.BytesToAddress([]byte("ubiq"))
|
||||
addr4 = common.BytesToAddress([]byte("random addresses please"))
|
||||
)
|
||||
defer db.Close()
|
||||
|
|
|
|||
|
|
@ -225,7 +225,7 @@ func (pm *ProtocolManager) Start() {
|
|||
}
|
||||
|
||||
func (pm *ProtocolManager) Stop() {
|
||||
glog.V(logger.Info).Infoln("Stopping ethereum protocol handler...")
|
||||
glog.V(logger.Info).Infoln("Stopping ubiq protocol handler...")
|
||||
|
||||
pm.txSub.Unsubscribe() // quits txBroadcastLoop
|
||||
pm.minedBlockSub.Unsubscribe() // quits blockBroadcastLoop
|
||||
|
|
@ -246,7 +246,7 @@ func (pm *ProtocolManager) Stop() {
|
|||
// Wait for all peer handler goroutines and the loops to come down.
|
||||
pm.wg.Wait()
|
||||
|
||||
glog.V(logger.Info).Infoln("Ethereum protocol handler stopped")
|
||||
glog.V(logger.Info).Infoln("Ubiq protocol handler stopped")
|
||||
}
|
||||
|
||||
func (pm *ProtocolManager) newPeer(pv int, p *p2p.Peer, rw p2p.MsgReadWriter) *peer {
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ func main() {
|
|||
m := make(map[string]setting)
|
||||
json.Unmarshal(content, &m)
|
||||
|
||||
filepath := filepath.Join(os.Getenv("GOPATH"), "src", "github.com", "ethereum", "go-ethereum", "params", os.Args[2])
|
||||
filepath := filepath.Join(os.Getenv("GOPATH"), "src", "github.com", "ubiq", "go-ubiq", "params", os.Args[2])
|
||||
output, err := os.OpenFile(filepath, os.O_RDWR|os.O_CREATE, 0666)
|
||||
if err != nil {
|
||||
fatalf("error opening file for writing %v\n", err)
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ func Env() Environment {
|
|||
|
||||
// LocalEnv returns build environment metadata gathered from git.
|
||||
func LocalEnv() Environment {
|
||||
env := applyEnvFlags(Environment{Name: "local", Repo: "ethereum/go-ethereum"})
|
||||
env := applyEnvFlags(Environment{Name: "local", Repo: "ubiq/go-ubiq"})
|
||||
if _, err := os.Stat(".git"); err != nil {
|
||||
return env
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1115,7 +1115,7 @@ func (s *PublicTransactionPoolAPI) SendRawTransaction(ctx context.Context, encod
|
|||
//
|
||||
// The account associated with addr must be unlocked.
|
||||
//
|
||||
// https://github.com/ethereum/wiki/wiki/JSON-RPC#eth_sign
|
||||
// https://github.com/ubiq/wiki/wiki/JSON-RPC#eth_sign
|
||||
func (s *PublicTransactionPoolAPI) Sign(addr common.Address, message string) (string, error) {
|
||||
hash := signHash(message)
|
||||
signature, err := s.b.AccountManager().SignEthereum(addr, hash)
|
||||
|
|
@ -1450,7 +1450,7 @@ func (s *PublicNetAPI) PeerCount() *rpc.HexNumber {
|
|||
return rpc.NewHexNumber(s.net.PeerCount())
|
||||
}
|
||||
|
||||
// Version returns the current ethereum protocol version.
|
||||
// Version returns the current ubiq protocol version.
|
||||
func (s *PublicNetAPI) Version() string {
|
||||
return fmt.Sprintf("%d", s.networkVersion)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -296,7 +296,7 @@ func (pm *ProtocolManager) Start(srvr *p2p.Server) {
|
|||
func (pm *ProtocolManager) Stop() {
|
||||
// Showing a log message. During download / process this could actually
|
||||
// take between 5 to 10 seconds and therefor feedback is required.
|
||||
glog.V(logger.Info).Infoln("Stopping light ethereum protocol handler...")
|
||||
glog.V(logger.Info).Infoln("Stopping light ubiq protocol handler...")
|
||||
|
||||
// Quit the sync loop.
|
||||
// After this send has completed, no new peers will be accepted.
|
||||
|
|
@ -313,7 +313,7 @@ func (pm *ProtocolManager) Stop() {
|
|||
// Wait for any process action
|
||||
pm.wg.Wait()
|
||||
|
||||
glog.V(logger.Info).Infoln("Light ethereum protocol handler stopped")
|
||||
glog.V(logger.Info).Infoln("Light ubiq protocol handler stopped")
|
||||
}
|
||||
|
||||
func (pm *ProtocolManager) newPeer(pv, nv int, p *p2p.Peer, rw p2p.MsgReadWriter) *peer {
|
||||
|
|
|
|||
|
|
@ -101,7 +101,7 @@ func NewLightChain(odr OdrBackend, config *params.ChainConfig, pow pow.PoW, mux
|
|||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
glog.V(logger.Info).Infoln("WARNING: Wrote default ethereum genesis block")
|
||||
glog.V(logger.Info).Infoln("WARNING: Wrote default ubiq genesis block")
|
||||
}
|
||||
|
||||
if bc.genesisBlock.Hash() == (common.Hash{212, 229, 103, 64, 248, 118, 174, 248, 192, 16, 184, 106, 64, 213, 245, 103, 69, 161, 24, 208, 144, 106, 52, 230, 154, 236, 140, 13, 177, 203, 143, 163}) {
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ public class AndroidTest extends InstrumentationTestCase {
|
|||
|
||||
try {
|
||||
// Start up a new inprocess node
|
||||
Node node = new Node(getInstrumentation().getContext().getFilesDir() + "/.ethereum", new NodeConfig());
|
||||
Node node = new Node(getInstrumentation().getContext().getFilesDir() + "/.ubiq", new NodeConfig());
|
||||
node.start();
|
||||
|
||||
// Retrieve some data via function calls (we don't really care about the results)
|
||||
|
|
@ -151,7 +151,7 @@ func TestAndroid(t *testing.T) {
|
|||
}
|
||||
build.CopyFile(filepath.Join("libs", "gubiq.aar"), "gubiq.aar", os.ModePerm)
|
||||
|
||||
if err = ioutil.WriteFile(filepath.Join("src", "androidTest", "java", "org", "ethereum", "gubiqtest", "AndroidTest.java"), []byte(androidTestClass), os.ModePerm); err != nil {
|
||||
if err = ioutil.WriteFile(filepath.Join("src", "androidTest", "java", "org", "ubiq", "gubiqtest", "AndroidTest.java"), []byte(androidTestClass), os.ModePerm); err != nil {
|
||||
t.Fatalf("failed to write Android test class: %v", err)
|
||||
}
|
||||
// Finish creating the project and run the tests via gradle
|
||||
|
|
|
|||
|
|
@ -158,7 +158,7 @@ func NewNode(datadir string, config *NodeConfig) (*Node, error) {
|
|||
if err := stack.Register(func(ctx *node.ServiceContext) (node.Service, error) {
|
||||
return les.New(ctx, ethConf)
|
||||
}); err != nil {
|
||||
return nil, fmt.Errorf("ethereum init: %v", err)
|
||||
return nil, fmt.Errorf("ubiq init: %v", err)
|
||||
}
|
||||
}
|
||||
// Register the Whisper protocol if requested
|
||||
|
|
|
|||
|
|
@ -417,7 +417,7 @@ func makeAccountManager(conf *Config) (am *accounts.Manager, ephemeralKeystore s
|
|||
keydir, err = filepath.Abs(conf.KeyStoreDir)
|
||||
default:
|
||||
// There is no datadir.
|
||||
keydir, err = ioutil.TempDir("", "go-ethereum-keystore")
|
||||
keydir, err = ioutil.TempDir("", "go-ubiq-keystore")
|
||||
ephemeralKeystore = keydir
|
||||
}
|
||||
if err != nil {
|
||||
|
|
|
|||
|
|
@ -229,7 +229,7 @@ func newUDP(priv *ecdsa.PrivateKey, c conn, natm nat.Interface, nodeDBPath strin
|
|||
realaddr := c.LocalAddr().(*net.UDPAddr)
|
||||
if natm != nil {
|
||||
if !realaddr.IP.IsLoopback() {
|
||||
go nat.Map(natm, udp.closing, "udp", realaddr.Port, realaddr.Port, "ethereum discovery")
|
||||
go nat.Map(natm, udp.closing, "udp", realaddr.Port, realaddr.Port, "ubiq discovery")
|
||||
}
|
||||
// TODO: react to external IP changes over time.
|
||||
if ext, err := natm.ExternalIP(); err == nil {
|
||||
|
|
|
|||
|
|
@ -419,7 +419,7 @@ func (srv *Server) startListening() error {
|
|||
if !laddr.IP.IsLoopback() && srv.NAT != nil {
|
||||
srv.loopWG.Add(1)
|
||||
go func() {
|
||||
nat.Map(srv.NAT, srv.quit, "tcp", laddr.Port, laddr.Port, "ethereum p2p")
|
||||
nat.Map(srv.NAT, srv.quit, "tcp", laddr.Port, laddr.Port, "ubiq p2p")
|
||||
srv.loopWG.Done()
|
||||
}()
|
||||
}
|
||||
|
|
|
|||
|
|
@ -493,7 +493,7 @@ func httpTestClient(srv *Server, transport string, fl *flakeyListener) (*Client,
|
|||
|
||||
func ipcTestClient(srv *Server, fl *flakeyListener) (*Client, net.Listener) {
|
||||
// Listen on a random endpoint.
|
||||
endpoint := fmt.Sprintf("go-ethereum-test-ipc-%d-%d", os.Getpid(), rand.Int63())
|
||||
endpoint := fmt.Sprintf("go-ubiq-test-ipc-%d-%d", os.Getpid(), rand.Int63())
|
||||
if runtime.GOOS == "windows" {
|
||||
endpoint = `\\.\pipe\` + endpoint
|
||||
} else {
|
||||
|
|
|
|||
2
swarm/api/testdata/test0/index.html
vendored
2
swarm/api/testdata/test0/index.html
vendored
|
|
@ -5,6 +5,6 @@
|
|||
</head>
|
||||
<body>
|
||||
<h1>Swarm Test</h1>
|
||||
<img src="img/logo.gif" align="center", alt="Ethereum logo">
|
||||
<img src="img/logo.gif" align="center", alt="Ubiq logo">
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -2,6 +2,6 @@
|
|||
|
||||
# creates the necessary docker images to run testrunner.sh locally
|
||||
|
||||
docker build --tag="ethereum/cppjit-testrunner" docker-cppjit
|
||||
docker build --tag="ethereum/python-testrunner" docker-python
|
||||
docker build --tag="ethereum/go-testrunner" docker-go
|
||||
docker build --tag="ubiq/cppjit-testrunner" docker-cppjit
|
||||
docker build --tag="ubiq/python-testrunner" docker-python
|
||||
docker build --tag="ubiq/go-testrunner" docker-go
|
||||
|
|
|
|||
|
|
@ -31,9 +31,9 @@ RUN git checkout v1
|
|||
RUN go install -v
|
||||
|
||||
# this is a workaround, to make sure that docker's cache is invalidated whenever the git repo changes
|
||||
ADD https://api.github.com/repos/ethereum/go-ethereum/git/refs/heads/develop unused.txt
|
||||
ADD https://api.github.com/repos/ubiq/go-ubiq/git/refs/heads/develop unused.txt
|
||||
|
||||
## Fetch and install go-ethereum
|
||||
## Fetch and install go-ubiq
|
||||
RUN go get -u -v -d github.com/ubiq/go-ubiq/...
|
||||
WORKDIR $GOPATH/src/github.com/ubiq/go-ubiq
|
||||
|
||||
|
|
|
|||
2
vendor/github.com/ethereum/ethash/README.md
generated
vendored
2
vendor/github.com/ethereum/ethash/README.md
generated
vendored
|
|
@ -4,7 +4,7 @@
|
|||
# Ethash
|
||||
|
||||
For details on this project, please see the Ethereum wiki:
|
||||
https://github.com/ethereum/wiki/wiki/Ethash
|
||||
https://github.com/ubiq/wiki/wiki/Ethash
|
||||
|
||||
### Coding Style for C++ code:
|
||||
|
||||
|
|
|
|||
2
vendor/github.com/ethereum/ethash/ethash.go
generated
vendored
2
vendor/github.com/ethereum/ethash/ethash.go
generated
vendored
|
|
@ -369,7 +369,7 @@ func (pow *Full) Search(block pow.Block, stop <-chan struct{}, index int) (nonce
|
|||
ret := C.ethash_full_compute(dag.ptr, hash, C.uint64_t(nonce))
|
||||
result := h256ToHash(ret.result).Big()
|
||||
|
||||
// TODO: disagrees with the spec https://github.com/ethereum/wiki/wiki/Ethash#mining
|
||||
// TODO: disagrees with the spec https://github.com/ubiq/wiki/wiki/Ethash#mining
|
||||
if ret.success && result.Cmp(target) <= 0 {
|
||||
mixDigest = C.GoBytes(unsafe.Pointer(&ret.mix_hash), C.int(32))
|
||||
atomic.AddInt32(&pow.hashRate, -previousHashrate)
|
||||
|
|
|
|||
6
vendor/github.com/ethereum/ethash/src/libethash/io.h
generated
vendored
6
vendor/github.com/ethereum/ethash/src/libethash/io.h
generated
vendored
|
|
@ -38,7 +38,7 @@ extern "C" {
|
|||
// 10 is for maximum number of digits of a uint32_t (for REVISION)
|
||||
// 1 is for - and 16 is for the first 16 hex digits for first 8 bytes of
|
||||
// the seedhash and last 1 is for the null terminating character
|
||||
// Reference: https://github.com/ethereum/wiki/wiki/Ethash-DAG
|
||||
// Reference: https://github.com/ubiq/wiki/wiki/Ethash-DAG
|
||||
#define DAG_MUTABLE_NAME_MAX_SIZE (6 + 10 + 1 + 16 + 1)
|
||||
/// Possible return values of @see ethash_io_prepare
|
||||
enum ethash_io_rc {
|
||||
|
|
@ -80,7 +80,7 @@ enum ethash_io_rc {
|
|||
* data directory. If it does not exist it's created.
|
||||
* @param[in] seedhash The seedhash of the current block number, used in the
|
||||
* naming of the file as can be seen from the spec at:
|
||||
* https://github.com/ethereum/wiki/wiki/Ethash-DAG
|
||||
* https://github.com/ubiq/wiki/wiki/Ethash-DAG
|
||||
* @param[out] output_file If there was no failure then this will point to an open
|
||||
* file descriptor. User is responsible for closing it.
|
||||
* In the case of memo match then the file is open on read
|
||||
|
|
@ -175,7 +175,7 @@ char* ethash_io_create_filename(
|
|||
/**
|
||||
* Gets the default directory name for the DAG depending on the system
|
||||
*
|
||||
* The spec defining this directory is here: https://github.com/ethereum/wiki/wiki/Ethash-DAG
|
||||
* The spec defining this directory is here: https://github.com/ubiq/wiki/wiki/Ethash-DAG
|
||||
*
|
||||
* @param[out] strbuf A string buffer of sufficient size to keep the
|
||||
* null termninated string of the directory name
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
/*
|
||||
Package whisper implements the Whisper PoC-1.
|
||||
|
||||
(https://github.com/ethereum/wiki/wiki/Whisper-PoC-1-Protocol-Spec)
|
||||
(https://github.com/ubiq/wiki/wiki/Whisper-PoC-1-Protocol-Spec)
|
||||
|
||||
Whisper combines aspects of both DHTs and datagram messaging systems (e.g. UDP).
|
||||
As such it may be likened and compared to both, not dissimilar to the
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
// Contains the Whisper protocol Envelope element. For formal details please see
|
||||
// the specs at https://github.com/ethereum/wiki/wiki/Whisper-PoC-1-Protocol-Spec#envelopes.
|
||||
// the specs at https://github.com/ubiq/wiki/wiki/Whisper-PoC-1-Protocol-Spec#envelopes.
|
||||
|
||||
package whisperv2
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
// Contains the Whisper protocol Message element. For formal details please see
|
||||
// the specs at https://github.com/ethereum/wiki/wiki/Whisper-PoC-1-Protocol-Spec#messages.
|
||||
// the specs at https://github.com/ubiq/wiki/wiki/Whisper-PoC-1-Protocol-Spec#messages.
|
||||
|
||||
package whisperv2
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
// Contains the Whisper protocol Topic element. For formal details please see
|
||||
// the specs at https://github.com/ethereum/wiki/wiki/Whisper-PoC-1-Protocol-Spec#topics.
|
||||
// the specs at https://github.com/ubiq/wiki/wiki/Whisper-PoC-1-Protocol-Spec#topics.
|
||||
|
||||
package whisperv2
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
/*
|
||||
Package whisper implements the Whisper PoC-1.
|
||||
|
||||
(https://github.com/ethereum/wiki/wiki/Whisper-PoC-1-Protocol-Spec)
|
||||
(https://github.com/ubiq/wiki/wiki/Whisper-PoC-1-Protocol-Spec)
|
||||
|
||||
Whisper combines aspects of both DHTs and datagram messaging systems (e.g. UDP).
|
||||
As such it may be likened and compared to both, not dissimilar to the
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
// Contains the Whisper protocol Envelope element. For formal details please see
|
||||
// the specs at https://github.com/ethereum/wiki/wiki/Whisper-PoC-1-Protocol-Spec#envelopes.
|
||||
// the specs at https://github.com/ubiq/wiki/wiki/Whisper-PoC-1-Protocol-Spec#envelopes.
|
||||
|
||||
package whisperv5
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
// Contains the Whisper protocol Message element. For formal details please see
|
||||
// the specs at https://github.com/ethereum/wiki/wiki/Whisper-PoC-1-Protocol-Spec#messages.
|
||||
// the specs at https://github.com/ubiq/wiki/wiki/Whisper-PoC-1-Protocol-Spec#messages.
|
||||
// todo: fix the spec link, and move it to doc.go
|
||||
|
||||
package whisperv5
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
// Contains the Whisper protocol Topic element. For formal details please see
|
||||
// the specs at https://github.com/ethereum/wiki/wiki/Whisper-PoC-1-Protocol-Spec#topics.
|
||||
// the specs at https://github.com/ubiq/wiki/wiki/Whisper-PoC-1-Protocol-Spec#topics.
|
||||
|
||||
package whisperv5
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue