diff options
1169 files changed, 8534 insertions, 5008 deletions
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 2cbe1e097..158663544 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -30,11 +30,11 @@ Please make sure your contributions adhere to our coding guidelines: Before you submit a feature request, please check and make sure that it isn't possible through some other means. The JavaScript-enabled console is a powerful feature in the right hands. Please check our -[Wiki page](https://github.com/dexon-foundation/dexon/wiki) for more info +[Wiki page](https://github.com/tangerine-network/go-tangerine/wiki) for more info and help. ## Configuration, dependencies, and tests -Please see the [Developers' Guide](https://github.com/dexon-foundation/dexon/wiki/Developers'-Guide) +Please see the [Developers' Guide](https://github.com/tangerine-network/go-tangerine/wiki/Developers'-Guide) for more details on configuring your environment, managing project dependencies and testing procedures. diff --git a/.gitignore b/.gitignore index 1e62cbb81..ea200aabe 100644 --- a/.gitignore +++ b/.gitignore @@ -57,5 +57,5 @@ test/*.log dex/transactions.rlp # consensus -vendor/github.com/dexon-foundation/mcl/lib/*.dylib -vendor/github.com/dexon-foundation/bls/lib/*.dylib +vendor/github.com/byzantine-lab/mcl/lib/*.dylib +vendor/github.com/byzantine-lab/bls/lib/*.dylib diff --git a/.gitmodules b/.gitmodules index 65209955b..ce2439518 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "tests/testdata"] path = tests/testdata - url = https://github.com/dexon-foundation/tests + url = https://github.com/tangerine-network/tests diff --git a/.travis.yml b/.travis.yml index b290da717..6c758c483 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: go -go_import_path: github.com/dexon-foundation/dexon +go_import_path: github.com/tangerine-network/go-tangerine sudo: false branches: only: @@ -63,12 +63,12 @@ matrix: - cd build - ./setup_recovery_env.sh - cd .. - - make gdex + - make gtan - cd test - ./run_test.sh --smoke-test - cd .. - ./build/fullnode-test.sh - - pkill -15 -f gdex + - pkill -15 -f gtan - cd test - ./run_test.sh --continue --smoke-test - cd .. diff --git a/Dockerfile b/Dockerfile index 161d441d7..2f4918367 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,16 +2,16 @@ FROM golang:1.12-alpine as builder RUN apk add --no-cache make gcc musl-dev linux-headers g++ gmp-dev pkgconfig -ADD . /dexon -RUN cd /dexon && make clean-cgo && DOCKER=alpine make gdex -RUN cd /dexon && build/env.sh go build -o build/bin/bootnode ./cmd/bootnode +ADD . /go-tangerine +RUN cd /go-tangerine && make clean-cgo && DOCKER=alpine make gtan +RUN cd /go-tangerine && build/env.sh go build -o build/bin/bootnode ./cmd/bootnode # Pull Gdex into a second stage deploy alpine container FROM alpine:latest RUN apk add --no-cache ca-certificates curl libstdc++ gmp -COPY --from=builder /dexon/build/bin/gdex /usr/local/bin/ -COPY --from=builder /dexon/build/bin/bootnode /usr/local/bin/ +COPY --from=builder /go-tangerine/build/bin/gtan /usr/local/bin/ +COPY --from=builder /go-tangerine/build/bin/bootnode /usr/local/bin/ EXPOSE 8545 8546 30303 30303/udp -ENTRYPOINT ["gdex"] +ENTRYPOINT ["gtan"] @@ -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: gdex android ios gdex-cross swarm evm all test clean -.PHONY: gdex-linux gdex-linux-386 gdex-linux-amd64 gdex-linux-mips64 gdex-linux-mips64le -.PHONY: gdex-linux-arm gdex-linux-arm-5 gdex-linux-arm-6 gdex-linux-arm-7 gdex-linux-arm64 -.PHONY: gdex-darwin gdex-darwin-386 gdex-darwin-amd64 -.PHONY: gdex-windows gdex-windows-386 gdex-windows-amd64 +.PHONY: gtan android ios gtan-cross swarm evm all test clean +.PHONY: gtan-linux gtan-linux-386 gtan-linux-amd64 gtan-linux-mips64 gtan-linux-mips64le +.PHONY: gtan-linux-arm gtan-linux-arm-5 gtan-linux-arm-6 gtan-linux-arm-7 gtan-linux-arm64 +.PHONY: gtan-darwin gtan-darwin-386 gtan-darwin-amd64 +.PHONY: gtan-windows gtan-windows-386 gtan-windows-amd64 GOBIN = $(shell pwd)/build/bin GO ?= latest -gdex: libbls - build/env.sh go run build/ci.go install ./cmd/gdex +gtan: libbls + build/env.sh go run build/ci.go install ./cmd/gtan @echo "Done building." - @echo "Run \"$(GOBIN)/gdex\" to launch gdex." + @echo "Run \"$(GOBIN)/gtan\" to launch gtan." swarm: libbls build/env.sh go run build/ci.go install ./cmd/swarm @@ -27,7 +27,7 @@ all: libbls android: build/env.sh go run build/ci.go aar --local @echo "Done building." - @echo "Import \"$(GOBIN)/gdex.aar\" to use the library." + @echo "Import \"$(GOBIN)/gtan.aar\" to use the library." ios: build/env.sh go run build/ci.go xcode --local @@ -41,11 +41,11 @@ lint: ## Run linters. build/env.sh go run build/ci.go lint libbls: - make -C vendor/github.com/dexon-foundation/bls MCL_USE_OPENSSL=0 lib/libbls384.a + make -C vendor/github.com/byzantine-lab/bls MCL_USE_OPENSSL=0 lib/libbls384.a clean-cgo: - make -C vendor/github.com/dexon-foundation/bls clean - make -C vendor/github.com/dexon-foundation/mcl clean + make -C vendor/github.com/byzantine-lab/bls clean + make -C vendor/github.com/byzantine-lab/mcl clean clean: clean-cgo ./build/clean_go_build_cache.sh @@ -69,92 +69,92 @@ swarm-devtools: # Cross Compilation Targets (xgo) -gdex-cross: gdex-linux gdex-darwin gdex-windows gdex-android gdex-ios +gtan-cross: gtan-linux gtan-darwin gtan-windows gtan-android gtan-ios @echo "Full cross compilation done:" - @ls -ld $(GOBIN)/gdex-* + @ls -ld $(GOBIN)/gtan-* -gdex-linux: gdex-linux-386 gdex-linux-amd64 gdex-linux-arm gdex-linux-mips64 gdex-linux-mips64le +gtan-linux: gtan-linux-386 gtan-linux-amd64 gtan-linux-arm gtan-linux-mips64 gtan-linux-mips64le @echo "Linux cross compilation done:" - @ls -ld $(GOBIN)/gdex-linux-* + @ls -ld $(GOBIN)/gtan-linux-* -gdex-linux-386: - build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/386 -v ./cmd/gdex +gtan-linux-386: + build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/386 -v ./cmd/gtan @echo "Linux 386 cross compilation done:" - @ls -ld $(GOBIN)/gdex-linux-* | grep 386 + @ls -ld $(GOBIN)/gtan-linux-* | grep 386 -gdex-linux-amd64: - build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/amd64 -v ./cmd/gdex +gtan-linux-amd64: + build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/amd64 -v ./cmd/gtan @echo "Linux amd64 cross compilation done:" - @ls -ld $(GOBIN)/gdex-linux-* | grep amd64 + @ls -ld $(GOBIN)/gtan-linux-* | grep amd64 -gdex-linux-arm: gdex-linux-arm-5 gdex-linux-arm-6 gdex-linux-arm-7 gdex-linux-arm64 +gtan-linux-arm: gtan-linux-arm-5 gtan-linux-arm-6 gtan-linux-arm-7 gtan-linux-arm64 @echo "Linux ARM cross compilation done:" - @ls -ld $(GOBIN)/gdex-linux-* | grep arm + @ls -ld $(GOBIN)/gtan-linux-* | grep arm -gdex-linux-arm-5: - build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/arm-5 -v ./cmd/gdex +gtan-linux-arm-5: + build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/arm-5 -v ./cmd/gtan @echo "Linux ARMv5 cross compilation done:" - @ls -ld $(GOBIN)/gdex-linux-* | grep arm-5 + @ls -ld $(GOBIN)/gtan-linux-* | grep arm-5 -gdex-linux-arm-6: - build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/arm-6 -v ./cmd/gdex +gtan-linux-arm-6: + build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/arm-6 -v ./cmd/gtan @echo "Linux ARMv6 cross compilation done:" - @ls -ld $(GOBIN)/gdex-linux-* | grep arm-6 + @ls -ld $(GOBIN)/gtan-linux-* | grep arm-6 -gdex-linux-arm-7: - build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/arm-7 -v ./cmd/gdex +gtan-linux-arm-7: + build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/arm-7 -v ./cmd/gtan @echo "Linux ARMv7 cross compilation done:" - @ls -ld $(GOBIN)/gdex-linux-* | grep arm-7 + @ls -ld $(GOBIN)/gtan-linux-* | grep arm-7 -gdex-linux-arm64: - build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/arm64 -v ./cmd/gdex +gtan-linux-arm64: + build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/arm64 -v ./cmd/gtan @echo "Linux ARM64 cross compilation done:" - @ls -ld $(GOBIN)/gdex-linux-* | grep arm64 + @ls -ld $(GOBIN)/gtan-linux-* | grep arm64 -gdex-linux-mips: - build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/mips --ldflags '-extldflags "-static"' -v ./cmd/gdex +gtan-linux-mips: + build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/mips --ldflags '-extldflags "-static"' -v ./cmd/gtan @echo "Linux MIPS cross compilation done:" - @ls -ld $(GOBIN)/gdex-linux-* | grep mips + @ls -ld $(GOBIN)/gtan-linux-* | grep mips -gdex-linux-mipsle: - build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/mipsle --ldflags '-extldflags "-static"' -v ./cmd/gdex +gtan-linux-mipsle: + build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/mipsle --ldflags '-extldflags "-static"' -v ./cmd/gtan @echo "Linux MIPSle cross compilation done:" - @ls -ld $(GOBIN)/gdex-linux-* | grep mipsle + @ls -ld $(GOBIN)/gtan-linux-* | grep mipsle -gdex-linux-mips64: - build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/mips64 --ldflags '-extldflags "-static"' -v ./cmd/gdex +gtan-linux-mips64: + build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/mips64 --ldflags '-extldflags "-static"' -v ./cmd/gtan @echo "Linux MIPS64 cross compilation done:" - @ls -ld $(GOBIN)/gdex-linux-* | grep mips64 + @ls -ld $(GOBIN)/gtan-linux-* | grep mips64 -gdex-linux-mips64le: - build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/mips64le --ldflags '-extldflags "-static"' -v ./cmd/gdex +gtan-linux-mips64le: + build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/mips64le --ldflags '-extldflags "-static"' -v ./cmd/gtan @echo "Linux MIPS64le cross compilation done:" - @ls -ld $(GOBIN)/gdex-linux-* | grep mips64le + @ls -ld $(GOBIN)/gtan-linux-* | grep mips64le -gdex-darwin: gdex-darwin-386 gdex-darwin-amd64 +gtan-darwin: gtan-darwin-386 gtan-darwin-amd64 @echo "Darwin cross compilation done:" - @ls -ld $(GOBIN)/gdex-darwin-* + @ls -ld $(GOBIN)/gtan-darwin-* -gdex-darwin-386: - build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=darwin/386 -v ./cmd/gdex +gtan-darwin-386: + build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=darwin/386 -v ./cmd/gtan @echo "Darwin 386 cross compilation done:" - @ls -ld $(GOBIN)/gdex-darwin-* | grep 386 + @ls -ld $(GOBIN)/gtan-darwin-* | grep 386 -gdex-darwin-amd64: - build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=darwin/amd64 -v ./cmd/gdex +gtan-darwin-amd64: + build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=darwin/amd64 -v ./cmd/gtan @echo "Darwin amd64 cross compilation done:" - @ls -ld $(GOBIN)/gdex-darwin-* | grep amd64 + @ls -ld $(GOBIN)/gtan-darwin-* | grep amd64 -gdex-windows: gdex-windows-386 gdex-windows-amd64 +gtan-windows: gtan-windows-386 gtan-windows-amd64 @echo "Windows cross compilation done:" - @ls -ld $(GOBIN)/gdex-windows-* + @ls -ld $(GOBIN)/gtan-windows-* -gdex-windows-386: - build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=windows/386 -v ./cmd/gdex +gtan-windows-386: + build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=windows/386 -v ./cmd/gtan @echo "Windows 386 cross compilation done:" - @ls -ld $(GOBIN)/gdex-windows-* | grep 386 + @ls -ld $(GOBIN)/gtan-windows-* | grep 386 -gdex-windows-amd64: - build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=windows/amd64 -v ./cmd/gdex +gtan-windows-amd64: + build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=windows/amd64 -v ./cmd/gtan @echo "Windows amd64 cross compilation done:" - @ls -ld $(GOBIN)/gdex-windows-* | grep amd64 + @ls -ld $(GOBIN)/gtan-windows-* | grep amd64 @@ -1,32 +1,26 @@ ## DEXON -Official golang implementation of the DEXON fullnode. +Official golang implementation of the Tangerine fullnode. -DEXON implementation is based-on the [go-ethereum](https://github.com/ethereum/go-ethereum) project. The consensus layer is replaced with the [DEXON consensus](https://github.com/dexon-foundation/dexon-consensus) implementation. - -[](https://godoc.org/github.com/dexon-foundation/dexon) -[](https://goreportcard.com/report/github.com/dexon-foundation/dexon) -[](https://travis-ci.org/dexon-foundation/dexon) -[](https://gitter.im/dexon-foundation/Lobby) +[](https://godoc.org/github.com/tangerine-network/go-tangerine) +[](https://goreportcard.com/report/github.com/tangerine-network/go-tangerine) <!-- Automated builds are available for stable releases and the unstable master branch. -Binary archives are published at https://gdex.ethereum.org/downloads/. +Binary archives are published at https://gtan.ethereum.org/downloads/. --> ## Building the source For prerequisites and detailed build instructions please read the -[Installation Instructions](https://github.com/dexon-foundation/wiki/wiki/Building-DEXON) +[Installation Instructions](https://tangerine-network.github.io/wiki/#/Building-Tangerine) on the wiki. -Building gdex requires both a Go (version 1.10 or later) and a C compiler. +Building gtan requires both a Go (version 1.10 or later) and a C compiler. You can install them using your favourite package manager. Once the dependencies are installed, run - make gdex + make gtan or, to build the full suite of utilities: @@ -34,25 +28,25 @@ or, to build the full suite of utilities: ## Executables -The dexon project comes with several wrappers/executables found in the `cmd` directory. +The go-tangerine project comes with several wrappers/executables found in the `cmd` directory. | Command | Description | |:----------:|-------------| -| **`gdex`** | 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. `gdex --help`<!-- and the [CLI Wiki page](https://github.com/dexon-foundation/dexon/wiki/Command-Line-Options) for command line options -->. | +| **`gtan`** | 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. `gtan --help`<!-- and the [CLI Wiki page](https://github.com/tangerine-network/go-tangerine/wiki/Command-Line-Options) for command line options -->. | | `nodekey` | Utility to generate key pair for operating a node. | -| `abigen` | Source code generator to convert Ethereum contract definitions into easy to use, compile-time type-safe Go packages. It operates on plain [Contract ABIs](https://solidity.readthedocs.io/en/develop/abi-spec.html) 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/dexon-foundation/wiki/wiki/Dapp-Development) 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 [Contract ABIs](https://solidity.readthedocs.io/en/develop/abi-spec.html) 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://tangerine-network.github.io/wiki/#/Dapp-Development-Guide) 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. | | `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 isolated, fine-grained debugging of EVM opcodes (e.g. `evm --code 60ff60ff --debug`). | -| `rlpdump` | Developer utility tool to convert binary RLP <!-- ([Recursive Length Prefix](https://github.com/ethereum/wiki/wiki/RLP)) --> dumps (data encoding used by the DEXON protocol both network as well as consensus wise) to user friendlier hierarchical representation (e.g. `rlpdump --hex CE0183FFFFFFC4C304050583616263`). | +| `rlpdump` | Developer utility tool to convert binary RLP <!-- ([Recursive Length Prefix](https://github.com/ethereum/wiki/wiki/RLP)) --> dumps (data encoding used by the Tangerine protocol both network as well as consensus wise) to user friendlier hierarchical representation (e.g. `rlpdump --hex CE0183FFFFFFC4C304050583616263`). | -## Running gdex +## Running gtan Going through all the possible command line flags is out of scope here <!-- (please consult our -[CLI Wiki page](https://github.com/dexon-foundation/dexon/wiki/Command-Line-Options)) -->, but we've +[CLI Wiki page](https://github.com/tangerine-network/go-tangerine/wiki/Command-Line-Options)) -->, but we've enumerated a few common parameter combos to get you up to speed quickly on how you can run your -own Gdex instance. +own Gtan instance. -### Full node on the main DEXON network +### Full node on the main Tangerine network By far the most common scenario is people wanting to simply interact with the DRXON network: create accounts; transfer funds; deploy and interact with contracts. For this particular use-case @@ -60,89 +54,89 @@ the user doesn't care about years-old historical data, so we can fast-sync quick state of the network. To do so: ``` -$ gdex console +$ gtan console ``` This command will: - * Start gdex in fast sync mode (default, can be changed with the `--syncmode` flag), causing it to + * Start gtan 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 [JavaScript console](https://github.com/dexon-foundation/wiki/wiki/JavaScript-Console), - (via the trailing `console` subcommand) through which you can invoke all official [`web3` methods](https://github.com/dexon-foundation/wiki/wiki/JavaScript-API) - as well as Gdex's own [management APIs](https://github.com/dexon-foundation/wiki/wiki/Management-APIs) + * Start up Geth's built-in interactive JavaScript console [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://tangerine-network.github.io/wiki/#/JSON-RPC-API?id=javascript-api) + as well as Gtan'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 `gdex attach`. + with `gtan attach`. -### Full node on the DEXON test network +### Full node on the Tangerine test network -Transitioning towards developers, if you'd like to play around with creating DEXON contracts, you +Transitioning towards developers, if you'd like to play around with creating Tangerine contracts, you almost certainly would like to do that without any real money involved until you get the hang of the entire system. In other words, instead of attaching to the main network, you want to join the **test** -network with your node, which is fully equivalent to the main network, but with play-DEX only. +network with your node, which is fully equivalent to the main network, but with play-TAN only. ``` -$ gdex --testnet console +$ gtan --testnet console ``` The `console` subcommand have the exact same meaning as above and they are equally useful on the testnet too. Please see above for their explanations if you've skipped to here. -Specifying the `--testnet` flag however will reconfigure your Gdex instance a bit: +Specifying the `--testnet` flag however will reconfigure your Gtan instance a bit: - * Instead of using the default data directory (`~/.dexon` on Linux for example), Gdex will nest - itself one level deeper into a `testnet` subfolder (`~/.dexon/testnet` on Linux). Note, on OSX + * Instead of using the default data directory (`~/.tangerine` on Linux for example), Gtan will nest + itself one level deeper into a `testnet` subfolder (`~/.tangerine/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 `gdex attach` will try to attach to a production node endpoint by default. E.g. - `gdex attach <datadir>/testnet/gdex.ipc`. Windows users are not affected by this. - * Instead of connecting the main DEXON network, the client will connect to the test network, + endpoint since `gtan attach` will try to attach to a production node endpoint by default. E.g. + `gtan attach <datadir>/testnet/gtan.ipc`. Windows users are not affected by this. + * Instead of connecting the main Tangerine 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, Gdex will by default correctly +for play-money and real-money. Unless you manually move accounts, Gtan will by default correctly separate the two networks and will not make any accounts available between them.* ### Configuration -As an alternative to passing the numerous flags to the `gdex` binary, you can also pass a configuration file via: +As an alternative to passing the numerous flags to the `gtan` binary, you can also pass a configuration file via: ``` -$ gdex --config /path/to/your_config.toml +$ gtan --config /path/to/your_config.toml ``` To get an idea how the file should look like you can use the `dumpconfig` subcommand to export your existing configuration: ``` -$ gdex --your-favourite-flags dumpconfig +$ gtan --your-favourite-flags dumpconfig ``` -*Note: This works only with gdex v1.6.0 and above.* +*Note: This works only with gtan v1.6.0 and above.* #### Docker quick start -One of the quickest ways to get DEXON up and running on your machine is by using Docker: +One of the quickest ways to get Tangerine up and running on your machine is by using Docker: ``` -docker run -d --name dexon-node -v /Users/bob/dexon:/root \ +docker run -d --name tangerine-node -v /Users/bob/tangerine:/root \ -p 8545:8545 -p 30303:30303 \ - dexonfoundation/dexon + byzantinelab/go-tangerine ``` -This will start gdex 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 saving your blockchain as well as map the default ports. There is also an `alpine` tag available for a slim version of the image. +This will start gtan 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 saving your blockchain as well as map the default ports. There is also an `alpine` tag available for a slim version of the image. -Do not forget `--rpcaddr 0.0.0.0`, if you want to access RPC from other containers and/or hosts. By default, `gdex` binds to the local interface and RPC endpoints is not accessible from the outside. +Do not forget `--rpcaddr 0.0.0.0`, if you want to access RPC from other containers and/or hosts. By default, `gtan` binds to the local interface and RPC endpoints is not accessible from the outside. --> -### Programatically interfacing Gdex nodes +### Programatically interfacing Gtan nodes -As a developer, sooner rather than later you'll want to start interacting with Gdex and the DEXON -network via your own programs and not manually through the console. To aid this, Gdex has built-in +As a developer, sooner rather than later you'll want to start interacting with Gtan and the Tangerine +network via your own programs and not manually through the console. To aid this, Gtan has built-in support for a JSON-RPC based APIs which are ethereum-compatible ([standard APIs](https://github.com/ethereum/wiki/wiki/JSON-RPC) and -[Gdex specific APIs](https://github.com/ethereum/go-ethereum/wiki/Management-APIs)). These can be +[Gtan specific APIs](https://github.com/ethereum/go-ethereum/wiki/Management-APIs)). These can be exposed via HTTP, WebSockets and IPC (unix sockets on unix based platforms, and named pipes on Windows). -The IPC interface is enabled by default and exposes all the APIs supported by Gdex, whereas the HTTP +The IPC interface is enabled by default and exposes all the APIs supported by Gtan, whereas the HTTP and WS interfaces need to manually be enabled and only expose a subset of APIs due to security reasons. These can be turned on/off and configured as you'd expect. @@ -171,7 +165,6 @@ doing so! Hackers on the internet are actively trying to subvert Ethereum nodes Further, all browser tabs can access locally running webservers, so malicious webpages could try to subvert locally available APIs!** - <!-- ### Operating a private network @@ -219,7 +212,7 @@ With the genesis state defined in the above JSON file, you'll need to initialize with it prior to starting it up to ensure all blockchain parameters are correctly set: ``` -$ gdex init path/to/genesis.json +$ gtan init path/to/genesis.json ``` #### Creating the rendezvous point @@ -248,7 +241,7 @@ via the `--bootnodes` flag. It will probably also be desirable to keep the data private network separated, so do also specify a custom `--datadir` flag. ``` -$ gdex --datadir=path/to/custom/data/folder --bootnodes=<bootnode-enode-url-from-above> +$ gtan --datadir=path/to/custom/data/folder --bootnodes=<bootnode-enode-url-from-above> ``` *Note: Since your network will be completely cut off from the main and test networks, you'll also @@ -260,9 +253,9 @@ need to configure a miner to process transactions and create new blocks for you. 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 dexon, please fork, fix, commit and send a pull request +If you'd like to contribute to go-tangerine, 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/dexon-foundation/Lobby) +complex changes though, please check up with the core devs first on [our gitter channel](https://gitter.im/TangerineNetwork/lobby) 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. @@ -275,17 +268,18 @@ Please make sure your contributions adhere to our coding guidelines: * 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/dexon-foundation/dexon/wiki/Developers'-Guide) +Please see the [Developers' Guide](https://github.com/tangerine-network/go-tangerine/wiki/Developers'-Guide) for more details on configuring your environment, managing project dependencies and testing procedures. ## License -The dexon repository is forked from ethereum/go-ethereum, thus it inherit the licensing terms from upstream go-ethereum license: +The go-tangerine repository is forked from dexon-foundation/dexon, which is forked as well +from ethereum/go-ethereum. Thus, it inherits the licensing terms from upstream go-ethereum license: -The dexon library (i.e. all code outside of the `cmd` directory) is licensed under the +The go-tangerine 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 dexon binaries (i.e. all code inside of the `cmd` directory) is licensed under the +The go-tangeirne 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. diff --git a/accounts/abi/abi_test.go b/accounts/abi/abi_test.go index 067b2b622..ca430ab83 100644 --- a/accounts/abi/abi_test.go +++ b/accounts/abi/abi_test.go @@ -26,8 +26,8 @@ import ( "strings" "testing" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/crypto" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/crypto" ) const jsondata = ` diff --git a/accounts/abi/bind/auth.go b/accounts/abi/bind/auth.go index e201554a1..cdb812e25 100644 --- a/accounts/abi/bind/auth.go +++ b/accounts/abi/bind/auth.go @@ -22,10 +22,10 @@ import ( "io" "io/ioutil" - "github.com/dexon-foundation/dexon/accounts/keystore" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/crypto" + "github.com/tangerine-network/go-tangerine/accounts/keystore" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/crypto" ) // NewTransactor is a utility method to easily create a transaction signer from diff --git a/accounts/abi/bind/backend.go b/accounts/abi/bind/backend.go index 099c0f9cc..a2cac7e2f 100644 --- a/accounts/abi/bind/backend.go +++ b/accounts/abi/bind/backend.go @@ -21,9 +21,9 @@ import ( "errors" "math/big" - "github.com/dexon-foundation/dexon" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/types" + ethereum "github.com/tangerine-network/go-tangerine" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/types" ) var ( diff --git a/accounts/abi/bind/backends/simulated.go b/accounts/abi/bind/backends/simulated.go index c4048b503..65d790f7d 100644 --- a/accounts/abi/bind/backends/simulated.go +++ b/accounts/abi/bind/backends/simulated.go @@ -24,22 +24,22 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon" - "github.com/dexon-foundation/dexon/accounts/abi/bind" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/math" - "github.com/dexon-foundation/dexon/consensus/ethash" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/bloombits" - "github.com/dexon-foundation/dexon/core/rawdb" - "github.com/dexon-foundation/dexon/core/state" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/core/vm" - "github.com/dexon-foundation/dexon/eth/filters" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/event" - "github.com/dexon-foundation/dexon/params" - "github.com/dexon-foundation/dexon/rpc" + ethereum "github.com/tangerine-network/go-tangerine" + "github.com/tangerine-network/go-tangerine/accounts/abi/bind" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/math" + "github.com/tangerine-network/go-tangerine/consensus/ethash" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/bloombits" + "github.com/tangerine-network/go-tangerine/core/rawdb" + "github.com/tangerine-network/go-tangerine/core/state" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/core/vm" + "github.com/tangerine-network/go-tangerine/eth/filters" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/event" + "github.com/tangerine-network/go-tangerine/params" + "github.com/tangerine-network/go-tangerine/rpc" ) // This nil assignment ensures compile time that SimulatedBackend implements bind.ContractBackend. diff --git a/accounts/abi/bind/base.go b/accounts/abi/bind/base.go index b88795aa8..93ec8f4bb 100644 --- a/accounts/abi/bind/base.go +++ b/accounts/abi/bind/base.go @@ -22,12 +22,12 @@ import ( "fmt" "math/big" - "github.com/dexon-foundation/dexon" - "github.com/dexon-foundation/dexon/accounts/abi" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/event" + ethereum "github.com/tangerine-network/go-tangerine" + "github.com/tangerine-network/go-tangerine/accounts/abi" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/event" ) // SignerFn is a signer function callback when a contract requires a method to diff --git a/accounts/abi/bind/base_test.go b/accounts/abi/bind/base_test.go index ea3035638..4690df78d 100644 --- a/accounts/abi/bind/base_test.go +++ b/accounts/abi/bind/base_test.go @@ -5,10 +5,10 @@ import ( "math/big" "testing" - ethereum "github.com/dexon-foundation/dexon" - "github.com/dexon-foundation/dexon/accounts/abi" - "github.com/dexon-foundation/dexon/accounts/abi/bind" - "github.com/dexon-foundation/dexon/common" + ethereum "github.com/tangerine-network/go-tangerine" + "github.com/tangerine-network/go-tangerine/accounts/abi" + "github.com/tangerine-network/go-tangerine/accounts/abi/bind" + "github.com/tangerine-network/go-tangerine/common" ) type mockCaller struct { diff --git a/accounts/abi/bind/bind.go b/accounts/abi/bind/bind.go index 30738fcb5..d0ca5625b 100644 --- a/accounts/abi/bind/bind.go +++ b/accounts/abi/bind/bind.go @@ -17,7 +17,7 @@ // Package bind generates Ethereum contract Go bindings. // // Detailed usage document and tutorial available on the go-ethereum Wiki page: -// https://github.com/dexon-foundation/dexon/wiki/Native-DApps:-Go-bindings-to-Ethereum-contracts +// https://github.com/tangerine-network/go-tangerine/wiki/Native-DApps:-Go-bindings-to-Ethereum-contracts package bind import ( @@ -29,7 +29,7 @@ import ( "text/template" "unicode" - "github.com/dexon-foundation/dexon/accounts/abi" + "github.com/tangerine-network/go-tangerine/accounts/abi" ) // Lang is a target programming language selector to generate bindings for. diff --git a/accounts/abi/bind/bind_test.go b/accounts/abi/bind/bind_test.go index a197bb638..451339a2e 100644 --- a/accounts/abi/bind/bind_test.go +++ b/accounts/abi/bind/bind_test.go @@ -26,7 +26,7 @@ import ( "strings" "testing" - "github.com/dexon-foundation/dexon/common" + "github.com/tangerine-network/go-tangerine/common" ) var bindTests = []struct { @@ -43,7 +43,7 @@ var bindTests = []struct { `contract NilContract {}`, `606060405260068060106000396000f3606060405200`, `[]`, - `"github.com/dexon-foundation/dexon/common"`, + `"github.com/tangerine-network/go-tangerine/common"`, ` if b, err := NewEmpty(common.Address{}, nil); b == nil || err != nil { t.Fatalf("combined binding (%v) nil or error (%v) not nil", b, nil) @@ -62,7 +62,7 @@ var bindTests = []struct { `https://ethereum.org/token`, `60606040526040516107fd3803806107fd83398101604052805160805160a05160c051929391820192909101600160a060020a0333166000908152600360209081526040822086905581548551838052601f6002600019610100600186161502019093169290920482018390047f290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e56390810193919290918801908390106100e857805160ff19168380011785555b506101189291505b8082111561017157600081556001016100b4565b50506002805460ff19168317905550505050610658806101a56000396000f35b828001600101855582156100ac579182015b828111156100ac5782518260005055916020019190600101906100fa565b50508060016000509080519060200190828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061017557805160ff19168380011785555b506100c89291506100b4565b5090565b82800160010185558215610165579182015b8281111561016557825182600050559160200191906001019061018756606060405236156100775760e060020a600035046306fdde03811461007f57806323b872dd146100dc578063313ce5671461010e57806370a082311461011a57806395d89b4114610132578063a9059cbb1461018e578063cae9ca51146101bd578063dc3080f21461031c578063dd62ed3e14610341575b610365610002565b61036760008054602060026001831615610100026000190190921691909104601f810182900490910260809081016040526060828152929190828280156104eb5780601f106104c0576101008083540402835291602001916104eb565b6103d5600435602435604435600160a060020a038316600090815260036020526040812054829010156104f357610002565b6103e760025460ff1681565b6103d560043560036020526000908152604090205481565b610367600180546020600282841615610100026000190190921691909104601f810182900490910260809081016040526060828152929190828280156104eb5780601f106104c0576101008083540402835291602001916104eb565b610365600435602435600160a060020a033316600090815260036020526040902054819010156103f157610002565b60806020604435600481810135601f8101849004909302840160405260608381526103d5948235946024803595606494939101919081908382808284375094965050505050505060006000836004600050600033600160a060020a03168152602001908152602001600020600050600087600160a060020a031681526020019081526020016000206000508190555084905080600160a060020a0316638f4ffcb1338630876040518560e060020a0281526004018085600160a060020a0316815260200184815260200183600160a060020a03168152602001806020018281038252838181518152602001915080519060200190808383829060006004602084601f0104600f02600301f150905090810190601f1680156102f25780820380516001836020036101000a031916815260200191505b50955050505050506000604051808303816000876161da5a03f11561000257505050509392505050565b6005602090815260043560009081526040808220909252602435815220546103d59081565b60046020818152903560009081526040808220909252602435815220546103d59081565b005b60405180806020018281038252838181518152602001915080519060200190808383829060006004602084601f0104600f02600301f150905090810190601f1680156103c75780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b60408051918252519081900360200190f35b6060908152602090f35b600160a060020a03821660009081526040902054808201101561041357610002565b806003600050600033600160a060020a03168152602001908152602001600020600082828250540392505081905550806003600050600084600160a060020a0316815260200190815260200160002060008282825054019250508190555081600160a060020a031633600160a060020a03167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35050565b820191906000526020600020905b8154815290600101906020018083116104ce57829003601f168201915b505050505081565b600160a060020a03831681526040812054808301101561051257610002565b600160a060020a0380851680835260046020908152604080852033949094168086529382528085205492855260058252808520938552929052908220548301111561055c57610002565b816003600050600086600160a060020a03168152602001908152602001600020600082828250540392505081905550816003600050600085600160a060020a03168152602001908152602001600020600082828250540192505081905550816005600050600086600160a060020a03168152602001908152602001600020600050600033600160a060020a0316815260200190815260200160002060008282825054019250508190555082600160a060020a031633600160a060020a03167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3939250505056`, `[{"constant":true,"inputs":[],"name":"name","outputs":[{"name":"","type":"string"}],"type":"function"},{"constant":false,"inputs":[{"name":"_from","type":"address"},{"name":"_to","type":"address"},{"name":"_value","type":"uint256"}],"name":"transferFrom","outputs":[{"name":"success","type":"bool"}],"type":"function"},{"constant":true,"inputs":[],"name":"decimals","outputs":[{"name":"","type":"uint8"}],"type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"}],"name":"balanceOf","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"symbol","outputs":[{"name":"","type":"string"}],"type":"function"},{"constant":false,"inputs":[{"name":"_to","type":"address"},{"name":"_value","type":"uint256"}],"name":"transfer","outputs":[],"type":"function"},{"constant":false,"inputs":[{"name":"_spender","type":"address"},{"name":"_value","type":"uint256"},{"name":"_extraData","type":"bytes"}],"name":"approveAndCall","outputs":[{"name":"success","type":"bool"}],"type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"},{"name":"","type":"address"}],"name":"spentAllowance","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"},{"name":"","type":"address"}],"name":"allowance","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"inputs":[{"name":"initialSupply","type":"uint256"},{"name":"tokenName","type":"string"},{"name":"decimalUnits","type":"uint8"},{"name":"tokenSymbol","type":"string"}],"type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"name":"from","type":"address"},{"indexed":true,"name":"to","type":"address"},{"indexed":false,"name":"value","type":"uint256"}],"name":"Transfer","type":"event"}]`, - `"github.com/dexon-foundation/dexon/common"`, + `"github.com/tangerine-network/go-tangerine/common"`, ` if b, err := NewToken(common.Address{}, nil); b == nil || err != nil { t.Fatalf("binding (%v) nil or error (%v) not nil", b, nil) @@ -74,7 +74,7 @@ var bindTests = []struct { `https://ethereum.org/crowdsale`, `606060408190526007805460ff1916905560a0806105a883396101006040529051608051915160c05160e05160008054600160a060020a03199081169095178155670de0b6b3a7640000958602600155603c9093024201600355930260045560058054909216909217905561052f90819061007990396000f36060604052361561006c5760e060020a600035046301cb3b20811461008257806329dcb0cf1461014457806338af3eed1461014d5780636e66f6e91461015f5780637a3a0e84146101715780637b3e5e7b1461017a578063a035b1fe14610183578063dc0d3dff1461018c575b61020060075460009060ff161561032357610002565b61020060035460009042106103205760025460015490106103cb576002548154600160a060020a0316908290606082818181858883f150915460025460408051600160a060020a039390931683526020830191909152818101869052517fe842aea7a5f1b01049d752008c53c52890b1a6daf660cf39e8eec506112bbdf6945090819003909201919050a15b60405160008054600160a060020a039081169230909116319082818181858883f150506007805460ff1916600117905550505050565b6103a160035481565b6103ab600054600160a060020a031681565b6103ab600554600160a060020a031681565b6103a160015481565b6103a160025481565b6103a160045481565b6103be60043560068054829081101561000257506000526002027ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d3f8101547ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d409190910154600160a060020a03919091169082565b005b505050815481101561000257906000526020600020906002020160005060008201518160000160006101000a815481600160a060020a030219169083021790555060208201518160010160005055905050806002600082828250540192505081905550600560009054906101000a9004600160a060020a0316600160a060020a031663a9059cbb3360046000505484046040518360e060020a0281526004018083600160a060020a03168152602001828152602001925050506000604051808303816000876161da5a03f11561000257505060408051600160a060020a03331681526020810184905260018183015290517fe842aea7a5f1b01049d752008c53c52890b1a6daf660cf39e8eec506112bbdf692509081900360600190a15b50565b5060a0604052336060908152346080819052600680546001810180835592939282908280158290116102025760020281600202836000526020600020918201910161020291905b8082111561039d57805473ffffffffffffffffffffffffffffffffffffffff19168155600060019190910190815561036a565b5090565b6060908152602090f35b600160a060020a03166060908152602090f35b6060918252608052604090f35b5b60065481101561010e576006805482908110156100025760009182526002027ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d3f0190600680549254600160a060020a0316928490811015610002576002027ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d40015460405190915082818181858883f19350505050507fe842aea7a5f1b01049d752008c53c52890b1a6daf660cf39e8eec506112bbdf660066000508281548110156100025760008290526002027ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d3f01548154600160a060020a039190911691908490811015610002576002027ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d40015460408051600160a060020a0394909416845260208401919091526000838201525191829003606001919050a16001016103cc56`, `[{"constant":false,"inputs":[],"name":"checkGoalReached","outputs":[],"type":"function"},{"constant":true,"inputs":[],"name":"deadline","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"beneficiary","outputs":[{"name":"","type":"address"}],"type":"function"},{"constant":true,"inputs":[],"name":"tokenReward","outputs":[{"name":"","type":"address"}],"type":"function"},{"constant":true,"inputs":[],"name":"fundingGoal","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"amountRaised","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"price","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[{"name":"","type":"uint256"}],"name":"funders","outputs":[{"name":"addr","type":"address"},{"name":"amount","type":"uint256"}],"type":"function"},{"inputs":[{"name":"ifSuccessfulSendTo","type":"address"},{"name":"fundingGoalInEthers","type":"uint256"},{"name":"durationInMinutes","type":"uint256"},{"name":"etherCostOfEachToken","type":"uint256"},{"name":"addressOfTokenUsedAsReward","type":"address"}],"type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"name":"backer","type":"address"},{"indexed":false,"name":"amount","type":"uint256"},{"indexed":false,"name":"isContribution","type":"bool"}],"name":"FundTransfer","type":"event"}]`, - `"github.com/dexon-foundation/dexon/common"`, + `"github.com/tangerine-network/go-tangerine/common"`, ` if b, err := NewCrowdsale(common.Address{}, nil); b == nil || err != nil { t.Fatalf("binding (%v) nil or error (%v) not nil", b, nil) @@ -86,7 +86,7 @@ var bindTests = []struct { `https://ethereum.org/dao`, `606060405260405160808061145f833960e06040529051905160a05160c05160008054600160a060020a03191633179055600184815560028490556003839055600780549182018082558280158290116100b8576003028160030283600052602060002091820191016100b891906101c8565b50506060919091015160029190910155600160a060020a0381166000146100a65760008054600160a060020a031916821790555b505050506111f18061026e6000396000f35b505060408051608081018252600080825260208281018290528351908101845281815292820192909252426060820152600780549194509250811015610002579081527fa66cc928b5edb82af9bd49922954155ab7b0942694bea4ce44661d9a8736c6889050815181546020848101517401000000000000000000000000000000000000000002600160a060020a03199290921690921760a060020a60ff021916178255604083015180516001848101805460008281528690209195600293821615610100026000190190911692909204601f9081018390048201949192919091019083901061023e57805160ff19168380011785555b50610072929150610226565b5050600060028201556001015b8082111561023a578054600160a860020a031916815560018181018054600080835592600290821615610100026000190190911604601f81901061020c57506101bb565b601f0160209004906000526020600020908101906101bb91905b8082111561023a5760008155600101610226565b5090565b828001600101855582156101af579182015b828111156101af57825182600050559160200191906001019061025056606060405236156100b95760e060020a6000350463013cf08b81146100bb578063237e9492146101285780633910682114610281578063400e3949146102995780635daf08ca146102a257806369bd34361461032f5780638160f0b5146103385780638da5cb5b146103415780639644fcbd14610353578063aa02a90f146103be578063b1050da5146103c7578063bcca1fd3146104b5578063d3c0715b146104dc578063eceb29451461058d578063f2fde38b1461067b575b005b61069c6004356004805482908110156100025790600052602060002090600a02016000506005810154815460018301546003840154600485015460068601546007870154600160a060020a03959095169750929560020194919360ff828116946101009093041692919089565b60408051602060248035600481810135601f81018590048502860185019096528585526107759581359591946044949293909201918190840183828082843750949650505050505050600060006004600050848154811015610002575090527f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19e600a8402908101547f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b909101904210806101e65750600481015460ff165b8061026757508060000160009054906101000a9004600160a060020a03168160010160005054846040518084600160a060020a0316606060020a0281526014018381526020018280519060200190808383829060006004602084601f0104600f02600301f15090500193505050506040518091039020816007016000505414155b8061027757506001546005820154105b1561109257610002565b61077560043560066020526000908152604090205481565b61077560055481565b61078760043560078054829081101561000257506000526003026000805160206111d18339815191528101547fa66cc928b5edb82af9bd49922954155ab7b0942694bea4ce44661d9a8736c68a820154600160a060020a0382169260a060020a90920460ff16917fa66cc928b5edb82af9bd49922954155ab7b0942694bea4ce44661d9a8736c689019084565b61077560025481565b61077560015481565b610830600054600160a060020a031681565b604080516020604435600481810135601f81018490048402850184019095528484526100b9948135946024803595939460649492939101918190840183828082843750949650505050505050600080548190600160a060020a03908116339091161461084d57610002565b61077560035481565b604080516020604435600481810135601f8101849004840285018401909552848452610775948135946024803595939460649492939101918190840183828082843750506040805160209735808a0135601f81018a90048a0283018a019093528282529698976084979196506024909101945090925082915084018382808284375094965050505050505033600160a060020a031660009081526006602052604081205481908114806104ab5750604081205460078054909190811015610002579082526003026000805160206111d1833981519152015460a060020a900460ff16155b15610ce557610002565b6100b960043560243560443560005433600160a060020a03908116911614610b1857610002565b604080516020604435600481810135601f810184900484028501840190955284845261077594813594602480359593946064949293910191819084018382808284375094965050505050505033600160a060020a031660009081526006602052604081205481908114806105835750604081205460078054909190811015610002579082526003026000805160206111d18339815191520181505460a060020a900460ff16155b15610f1d57610002565b604080516020606435600481810135601f81018490048402850184019095528484526107759481359460248035956044359560849492019190819084018382808284375094965050505050505060006000600460005086815481101561000257908252600a027f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b01815090508484846040518084600160a060020a0316606060020a0281526014018381526020018280519060200190808383829060006004602084601f0104600f02600301f150905001935050505060405180910390208160070160005054149150610cdc565b6100b960043560005433600160a060020a03908116911614610f0857610002565b604051808a600160a060020a031681526020018981526020018060200188815260200187815260200186815260200185815260200184815260200183815260200182810382528981815460018160011615610100020316600290048152602001915080546001816001161561010002031660029004801561075e5780601f106107335761010080835404028352916020019161075e565b820191906000526020600020905b81548152906001019060200180831161074157829003601f168201915b50509a505050505050505050505060405180910390f35b60408051918252519081900360200190f35b60408051600160a060020a038616815260208101859052606081018390526080918101828152845460026001821615610100026000190190911604928201839052909160a08301908590801561081e5780601f106107f35761010080835404028352916020019161081e565b820191906000526020600020905b81548152906001019060200180831161080157829003601f168201915b50509550505050505060405180910390f35b60408051600160a060020a03929092168252519081900360200190f35b600160a060020a03851660009081526006602052604081205414156108a957604060002060078054918290556001820180825582801582901161095c5760030281600302836000526020600020918201910161095c9190610a4f565b600160a060020a03851660009081526006602052604090205460078054919350908390811015610002575060005250600381026000805160206111d183398151915201805474ff0000000000000000000000000000000000000000191660a060020a85021781555b60408051600160a060020a03871681526020810186905281517f27b022af4a8347100c7a041ce5ccf8e14d644ff05de696315196faae8cd50c9b929181900390910190a15050505050565b505050915081506080604051908101604052808681526020018581526020018481526020014281526020015060076000508381548110156100025790600052602060002090600302016000508151815460208481015160a060020a02600160a060020a03199290921690921774ff00000000000000000000000000000000000000001916178255604083015180516001848101805460008281528690209195600293821615610100026000190190911692909204601f90810183900482019491929190910190839010610ad357805160ff19168380011785555b50610b03929150610abb565b5050600060028201556001015b80821115610acf57805474ffffffffffffffffffffffffffffffffffffffffff1916815560018181018054600080835592600290821615610100026000190190911604601f819010610aa15750610a42565b601f016020900490600052602060002090810190610a4291905b80821115610acf5760008155600101610abb565b5090565b82800160010185558215610a36579182015b82811115610a36578251826000505591602001919060010190610ae5565b50506060919091015160029190910155610911565b600183905560028290556003819055604080518481526020810184905280820183905290517fa439d3fa452be5e0e1e24a8145e715f4fd8b9c08c96a42fd82a855a85e5d57de9181900360600190a1505050565b50508585846040518084600160a060020a0316606060020a0281526014018381526020018280519060200190808383829060006004602084601f0104600f02600301f150905001935050505060405180910390208160070160005081905550600260005054603c024201816003016000508190555060008160040160006101000a81548160ff0219169083021790555060008160040160016101000a81548160ff02191690830217905550600081600501600050819055507f646fec02522b41e7125cfc859a64fd4f4cefd5dc3b6237ca0abe251ded1fa881828787876040518085815260200184600160a060020a03168152602001838152602001806020018281038252838181518152602001915080519060200190808383829060006004602084601f0104600f02600301f150905090810190601f168015610cc45780820380516001836020036101000a031916815260200191505b509550505050505060405180910390a1600182016005555b50949350505050565b6004805460018101808355909190828015829011610d1c57600a0281600a028360005260206000209182019101610d1c9190610db8565b505060048054929450918491508110156100025790600052602060002090600a02016000508054600160a060020a031916871781556001818101879055855160028381018054600082815260209081902096975091959481161561010002600019011691909104601f90810182900484019391890190839010610ed857805160ff19168380011785555b50610b6c929150610abb565b50506001015b80821115610acf578054600160a060020a03191681556000600182810182905560028381018054848255909281161561010002600019011604601f819010610e9c57505b5060006003830181905560048301805461ffff191690556005830181905560068301819055600783018190556008830180548282559082526020909120610db2916002028101905b80821115610acf57805474ffffffffffffffffffffffffffffffffffffffffff1916815560018181018054600080835592600290821615610100026000190190911604601f819010610eba57505b5050600101610e44565b601f016020900490600052602060002090810190610dfc9190610abb565b601f016020900490600052602060002090810190610e929190610abb565b82800160010185558215610da6579182015b82811115610da6578251826000505591602001919060010190610eea565b60008054600160a060020a0319168217905550565b600480548690811015610002576000918252600a027f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b01905033600160a060020a0316600090815260098201602052604090205490915060ff1660011415610f8457610002565b33600160a060020a031660009081526009820160205260409020805460ff1916600190811790915560058201805490910190558315610fcd576006810180546001019055610fda565b6006810180546000190190555b7fc34f869b7ff431b034b7b9aea9822dac189a685e0b015c7d1be3add3f89128e8858533866040518085815260200184815260200183600160a060020a03168152602001806020018281038252838181518152602001915080519060200190808383829060006004602084601f0104600f02600301f150905090810190601f16801561107a5780820380516001836020036101000a031916815260200191505b509550505050505060405180910390a1509392505050565b6006810154600354901315611158578060000160009054906101000a9004600160a060020a0316600160a060020a03168160010160005054670de0b6b3a76400000284604051808280519060200190808383829060006004602084601f0104600f02600301f150905090810190601f1680156111225780820380516001836020036101000a031916815260200191505b5091505060006040518083038185876185025a03f15050505060048101805460ff191660011761ff00191661010017905561116d565b60048101805460ff191660011761ff00191690555b60068101546005820154600483015460408051888152602081019490945283810192909252610100900460ff166060830152517fd220b7272a8b6d0d7d6bcdace67b936a8f175e6d5c1b3ee438b72256b32ab3af9181900360800190a1509291505056a66cc928b5edb82af9bd49922954155ab7b0942694bea4ce44661d9a8736c688`, `[{"constant":true,"inputs":[{"name":"","type":"uint256"}],"name":"proposals","outputs":[{"name":"recipient","type":"address"},{"name":"amount","type":"uint256"},{"name":"description","type":"string"},{"name":"votingDeadline","type":"uint256"},{"name":"executed","type":"bool"},{"name":"proposalPassed","type":"bool"},{"name":"numberOfVotes","type":"uint256"},{"name":"currentResult","type":"int256"},{"name":"proposalHash","type":"bytes32"}],"type":"function"},{"constant":false,"inputs":[{"name":"proposalNumber","type":"uint256"},{"name":"transactionBytecode","type":"bytes"}],"name":"executeProposal","outputs":[{"name":"result","type":"int256"}],"type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"}],"name":"memberId","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"numProposals","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[{"name":"","type":"uint256"}],"name":"members","outputs":[{"name":"member","type":"address"},{"name":"canVote","type":"bool"},{"name":"name","type":"string"},{"name":"memberSince","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"debatingPeriodInMinutes","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"minimumQuorum","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"owner","outputs":[{"name":"","type":"address"}],"type":"function"},{"constant":false,"inputs":[{"name":"targetMember","type":"address"},{"name":"canVote","type":"bool"},{"name":"memberName","type":"string"}],"name":"changeMembership","outputs":[],"type":"function"},{"constant":true,"inputs":[],"name":"majorityMargin","outputs":[{"name":"","type":"int256"}],"type":"function"},{"constant":false,"inputs":[{"name":"beneficiary","type":"address"},{"name":"etherAmount","type":"uint256"},{"name":"JobDescription","type":"string"},{"name":"transactionBytecode","type":"bytes"}],"name":"newProposal","outputs":[{"name":"proposalID","type":"uint256"}],"type":"function"},{"constant":false,"inputs":[{"name":"minimumQuorumForProposals","type":"uint256"},{"name":"minutesForDebate","type":"uint256"},{"name":"marginOfVotesForMajority","type":"int256"}],"name":"changeVotingRules","outputs":[],"type":"function"},{"constant":false,"inputs":[{"name":"proposalNumber","type":"uint256"},{"name":"supportsProposal","type":"bool"},{"name":"justificationText","type":"string"}],"name":"vote","outputs":[{"name":"voteID","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[{"name":"proposalNumber","type":"uint256"},{"name":"beneficiary","type":"address"},{"name":"etherAmount","type":"uint256"},{"name":"transactionBytecode","type":"bytes"}],"name":"checkProposalCode","outputs":[{"name":"codeChecksOut","type":"bool"}],"type":"function"},{"constant":false,"inputs":[{"name":"newOwner","type":"address"}],"name":"transferOwnership","outputs":[],"type":"function"},{"inputs":[{"name":"minimumQuorumForProposals","type":"uint256"},{"name":"minutesForDebate","type":"uint256"},{"name":"marginOfVotesForMajority","type":"int256"},{"name":"congressLeader","type":"address"}],"type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"name":"proposalID","type":"uint256"},{"indexed":false,"name":"recipient","type":"address"},{"indexed":false,"name":"amount","type":"uint256"},{"indexed":false,"name":"description","type":"string"}],"name":"ProposalAdded","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"proposalID","type":"uint256"},{"indexed":false,"name":"position","type":"bool"},{"indexed":false,"name":"voter","type":"address"},{"indexed":false,"name":"justification","type":"string"}],"name":"Voted","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"proposalID","type":"uint256"},{"indexed":false,"name":"result","type":"int256"},{"indexed":false,"name":"quorum","type":"uint256"},{"indexed":false,"name":"active","type":"bool"}],"name":"ProposalTallied","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"member","type":"address"},{"indexed":false,"name":"isMember","type":"bool"}],"name":"MembershipChanged","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"minimumQuorum","type":"uint256"},{"indexed":false,"name":"debatingPeriodInMinutes","type":"uint256"},{"indexed":false,"name":"majorityMargin","type":"int256"}],"name":"ChangeOfRules","type":"event"}]`, - `"github.com/dexon-foundation/dexon/common"`, + `"github.com/tangerine-network/go-tangerine/common"`, ` if b, err := NewDAO(common.Address{}, nil); b == nil || err != nil { t.Fatalf("binding (%v) nil or error (%v) not nil", b, nil) @@ -109,7 +109,7 @@ var bindTests = []struct { ` "fmt" - "github.com/dexon-foundation/dexon/common" + "github.com/tangerine-network/go-tangerine/common" `, `if b, err := NewInputChecker(common.Address{}, nil); b == nil || err != nil { t.Fatalf("binding (%v) nil or error (%v) not nil", b, nil) @@ -143,7 +143,7 @@ var bindTests = []struct { ` "fmt" - "github.com/dexon-foundation/dexon/common" + "github.com/tangerine-network/go-tangerine/common" `, `if b, err := NewOutputChecker(common.Address{}, nil); b == nil || err != nil { t.Fatalf("binding (%v) nil or error (%v) not nil", b, nil) @@ -179,7 +179,7 @@ var bindTests = []struct { "math/big" "reflect" - "github.com/dexon-foundation/dexon/common" + "github.com/tangerine-network/go-tangerine/common" `, `if e, err := NewEventChecker(common.Address{}, nil); e == nil || err != nil { t.Fatalf("binding (%v) nil or error (%v) not nil", e, nil) @@ -249,10 +249,10 @@ var bindTests = []struct { ` "math/big" - "github.com/dexon-foundation/dexon/accounts/abi/bind" - "github.com/dexon-foundation/dexon/accounts/abi/bind/backends" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/crypto" + "github.com/tangerine-network/go-tangerine/accounts/abi/bind" + "github.com/tangerine-network/go-tangerine/accounts/abi/bind/backends" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/crypto" `, ` // Generate a new random account and a funded simulator @@ -298,10 +298,10 @@ var bindTests = []struct { ` "math/big" - "github.com/dexon-foundation/dexon/accounts/abi/bind" - "github.com/dexon-foundation/dexon/accounts/abi/bind/backends" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/crypto" + "github.com/tangerine-network/go-tangerine/accounts/abi/bind" + "github.com/tangerine-network/go-tangerine/accounts/abi/bind/backends" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/crypto" `, ` // Generate a new random account and a funded simulator @@ -338,10 +338,10 @@ var bindTests = []struct { ` "math/big" - "github.com/dexon-foundation/dexon/accounts/abi/bind" - "github.com/dexon-foundation/dexon/accounts/abi/bind/backends" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/crypto" + "github.com/tangerine-network/go-tangerine/accounts/abi/bind" + "github.com/tangerine-network/go-tangerine/accounts/abi/bind/backends" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/crypto" `, ` // Generate a new random account and a funded simulator @@ -389,11 +389,11 @@ var bindTests = []struct { "math/big" "reflect" - "github.com/dexon-foundation/dexon/accounts/abi/bind" - "github.com/dexon-foundation/dexon/accounts/abi/bind/backends" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/crypto" + "github.com/tangerine-network/go-tangerine/accounts/abi/bind" + "github.com/tangerine-network/go-tangerine/accounts/abi/bind/backends" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/crypto" `, ` // Generate a new random account and a funded simulator @@ -432,10 +432,10 @@ var bindTests = []struct { ` "math/big" - "github.com/dexon-foundation/dexon/accounts/abi/bind" - "github.com/dexon-foundation/dexon/accounts/abi/bind/backends" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/crypto" + "github.com/tangerine-network/go-tangerine/accounts/abi/bind" + "github.com/tangerine-network/go-tangerine/accounts/abi/bind/backends" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/crypto" `, ` // Generate a new random account and a funded simulator @@ -473,9 +473,9 @@ var bindTests = []struct { `6060604052609f8060106000396000f3606060405260e060020a6000350463f97a60058114601a575b005b600060605260c0604052600d60809081527f4920646f6e27742065786973740000000000000000000000000000000000000060a052602060c0908152600d60e081905281906101009060a09080838184600060046012f15050815172ffffffffffffffffffffffffffffffffffffff1916909152505060405161012081900392509050f3`, `[{"constant":true,"inputs":[],"name":"String","outputs":[{"name":"","type":"string"}],"type":"function"}]`, ` - "github.com/dexon-foundation/dexon/accounts/abi/bind" - "github.com/dexon-foundation/dexon/accounts/abi/bind/backends" - "github.com/dexon-foundation/dexon/common" + "github.com/tangerine-network/go-tangerine/accounts/abi/bind" + "github.com/tangerine-network/go-tangerine/accounts/abi/bind/backends" + "github.com/tangerine-network/go-tangerine/common" `, ` // Create a simulator and wrap a non-deployed contract @@ -514,10 +514,10 @@ var bindTests = []struct { ` "math/big" - "github.com/dexon-foundation/dexon/accounts/abi/bind" - "github.com/dexon-foundation/dexon/accounts/abi/bind/backends" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/crypto" + "github.com/tangerine-network/go-tangerine/accounts/abi/bind" + "github.com/tangerine-network/go-tangerine/accounts/abi/bind/backends" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/crypto" `, ` // Generate a new random account and a funded simulator @@ -557,11 +557,11 @@ var bindTests = []struct { ` "math/big" - "github.com/dexon-foundation/dexon/accounts/abi/bind" - "github.com/dexon-foundation/dexon/accounts/abi/bind/backends" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/crypto" + "github.com/tangerine-network/go-tangerine/accounts/abi/bind" + "github.com/tangerine-network/go-tangerine/accounts/abi/bind/backends" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/crypto" `, ` // Generate a new random account and a funded simulator @@ -627,10 +627,10 @@ var bindTests = []struct { "fmt" "math/big" - "github.com/dexon-foundation/dexon/accounts/abi/bind" - "github.com/dexon-foundation/dexon/accounts/abi/bind/backends" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/crypto" + "github.com/tangerine-network/go-tangerine/accounts/abi/bind" + "github.com/tangerine-network/go-tangerine/accounts/abi/bind/backends" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/crypto" `, ` // Generate a new random account and a funded simulator @@ -706,11 +706,11 @@ var bindTests = []struct { "math/big" "time" - "github.com/dexon-foundation/dexon/accounts/abi/bind" - "github.com/dexon-foundation/dexon/accounts/abi/bind/backends" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/crypto" + "github.com/tangerine-network/go-tangerine/accounts/abi/bind" + "github.com/tangerine-network/go-tangerine/accounts/abi/bind/backends" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/crypto" `, ` // Generate a new random account and a funded simulator @@ -864,10 +864,10 @@ var bindTests = []struct { ` "math/big" - "github.com/dexon-foundation/dexon/accounts/abi/bind" - "github.com/dexon-foundation/dexon/accounts/abi/bind/backends" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/crypto" + "github.com/tangerine-network/go-tangerine/accounts/abi/bind" + "github.com/tangerine-network/go-tangerine/accounts/abi/bind/backends" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/crypto" `, ` // Generate a new random account and a funded simulator diff --git a/accounts/abi/bind/template.go b/accounts/abi/bind/template.go index 85cef3c31..0068f1de0 100644 --- a/accounts/abi/bind/template.go +++ b/accounts/abi/bind/template.go @@ -16,7 +16,7 @@ package bind -import "github.com/dexon-foundation/dexon/accounts/abi" +import "github.com/tangerine-network/go-tangerine/accounts/abi" // tmplData is the data structure required to fill the binding template. type tmplData struct { @@ -68,12 +68,12 @@ import ( "math/big" "strings" - ethereum "github.com/dexon-foundation/dexon" - "github.com/dexon-foundation/dexon/accounts/abi" - "github.com/dexon-foundation/dexon/accounts/abi/bind" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/event" + ethereum "github.com/tangerine-network/go-tangerine" + "github.com/tangerine-network/go-tangerine/accounts/abi" + "github.com/tangerine-network/go-tangerine/accounts/abi/bind" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/event" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/accounts/abi/bind/topics.go b/accounts/abi/bind/topics.go index c7e550ac6..e352743bb 100644 --- a/accounts/abi/bind/topics.go +++ b/accounts/abi/bind/topics.go @@ -22,9 +22,9 @@ import ( "math/big" "reflect" - "github.com/dexon-foundation/dexon/accounts/abi" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/crypto" + "github.com/tangerine-network/go-tangerine/accounts/abi" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/crypto" ) // makeTopics converts a filter query argument list into a filter topic set. diff --git a/accounts/abi/bind/util.go b/accounts/abi/bind/util.go index 8744696da..ad649cfb1 100644 --- a/accounts/abi/bind/util.go +++ b/accounts/abi/bind/util.go @@ -21,9 +21,9 @@ import ( "fmt" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/log" ) // WaitMined waits for tx to be mined on the blockchain. diff --git a/accounts/abi/bind/util_test.go b/accounts/abi/bind/util_test.go index 4226affa3..1708a84b5 100644 --- a/accounts/abi/bind/util_test.go +++ b/accounts/abi/bind/util_test.go @@ -22,12 +22,12 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/accounts/abi/bind" - "github.com/dexon-foundation/dexon/accounts/abi/bind/backends" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/crypto" + "github.com/tangerine-network/go-tangerine/accounts/abi/bind" + "github.com/tangerine-network/go-tangerine/accounts/abi/bind/backends" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/crypto" ) var testKey, _ = crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291") diff --git a/accounts/abi/event.go b/accounts/abi/event.go index 397864280..2c16c517a 100644 --- a/accounts/abi/event.go +++ b/accounts/abi/event.go @@ -20,8 +20,8 @@ import ( "fmt" "strings" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/crypto" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/crypto" ) // Event is an event potentially triggered by the EVM's LOG mechanism. The Event diff --git a/accounts/abi/event_test.go b/accounts/abi/event_test.go index 11fdce681..17a825062 100644 --- a/accounts/abi/event_test.go +++ b/accounts/abi/event_test.go @@ -25,10 +25,10 @@ import ( "strings" "testing" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/crypto" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/crypto" ) var jsonEventTransfer = []byte(`{ @@ -356,7 +356,7 @@ func unpackTestEventData(dest interface{}, hexData string, jsonEvent []byte, ass /* Taken from -https://github.com/dexon-foundation/dexon/pull/15568 +https://github.com/tangerine-network/go-tangerine/pull/15568 */ type testResult struct { diff --git a/accounts/abi/method.go b/accounts/abi/method.go index 960324643..8f5e66a76 100644 --- a/accounts/abi/method.go +++ b/accounts/abi/method.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "github.com/dexon-foundation/dexon/crypto" + "github.com/tangerine-network/go-tangerine/crypto" ) // Method represents a callable given a `Name` and whether the method is a constant. diff --git a/accounts/abi/numbers.go b/accounts/abi/numbers.go index d2c34ebf3..c8a42964d 100644 --- a/accounts/abi/numbers.go +++ b/accounts/abi/numbers.go @@ -20,8 +20,8 @@ import ( "math/big" "reflect" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/math" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/math" ) var ( diff --git a/accounts/abi/pack.go b/accounts/abi/pack.go index e9dfe8106..082b68bcf 100644 --- a/accounts/abi/pack.go +++ b/accounts/abi/pack.go @@ -20,8 +20,8 @@ import ( "math/big" "reflect" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/math" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/math" ) // packBytesSlice packs the given bytes as [L, V] as the canonical representation diff --git a/accounts/abi/pack_test.go b/accounts/abi/pack_test.go index 2c7ec9aa9..8c7a6d3f5 100644 --- a/accounts/abi/pack_test.go +++ b/accounts/abi/pack_test.go @@ -24,7 +24,7 @@ import ( "strings" "testing" - "github.com/dexon-foundation/dexon/common" + "github.com/tangerine-network/go-tangerine/common" ) func TestPack(t *testing.T) { diff --git a/accounts/abi/type_test.go b/accounts/abi/type_test.go index 9e8f76247..21d15f3b4 100644 --- a/accounts/abi/type_test.go +++ b/accounts/abi/type_test.go @@ -22,7 +22,7 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/dexon-foundation/dexon/common" + "github.com/tangerine-network/go-tangerine/common" ) // typeWithoutStringer is a alias for the Type type which simply doesn't implement diff --git a/accounts/abi/unpack.go b/accounts/abi/unpack.go index 0c7a6962e..f5dbd1ff8 100644 --- a/accounts/abi/unpack.go +++ b/accounts/abi/unpack.go @@ -22,7 +22,7 @@ import ( "math/big" "reflect" - "github.com/dexon-foundation/dexon/common" + "github.com/tangerine-network/go-tangerine/common" ) var ( diff --git a/accounts/abi/unpack_test.go b/accounts/abi/unpack_test.go index 26fe1b8c8..fac65cbc6 100644 --- a/accounts/abi/unpack_test.go +++ b/accounts/abi/unpack_test.go @@ -26,8 +26,8 @@ import ( "strings" "testing" - "github.com/dexon-foundation/dexon/common" "github.com/stretchr/testify/require" + "github.com/tangerine-network/go-tangerine/common" ) type unpackTest struct { diff --git a/accounts/accounts.go b/accounts/accounts.go index 9a1e8fd4a..9592110e3 100644 --- a/accounts/accounts.go +++ b/accounts/accounts.go @@ -20,10 +20,10 @@ package accounts import ( "math/big" - ethereum "github.com/dexon-foundation/dexon" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/event" + ethereum "github.com/tangerine-network/go-tangerine" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/event" ) // Account represents an Ethereum account located at a specific location defined diff --git a/accounts/keystore/account_cache.go b/accounts/keystore/account_cache.go index afda188ec..e9bcd0ab5 100644 --- a/accounts/keystore/account_cache.go +++ b/accounts/keystore/account_cache.go @@ -28,9 +28,9 @@ import ( "time" mapset "github.com/deckarep/golang-set" - "github.com/dexon-foundation/dexon/accounts" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/accounts" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/log" ) // Minimum amount of time between cache reloads. This limit applies if the platform does diff --git a/accounts/keystore/account_cache_test.go b/accounts/keystore/account_cache_test.go index 7ad45e0c5..51f3d83eb 100644 --- a/accounts/keystore/account_cache_test.go +++ b/accounts/keystore/account_cache_test.go @@ -29,8 +29,8 @@ import ( "github.com/cespare/cp" "github.com/davecgh/go-spew/spew" - "github.com/dexon-foundation/dexon/accounts" - "github.com/dexon-foundation/dexon/common" + "github.com/tangerine-network/go-tangerine/accounts" + "github.com/tangerine-network/go-tangerine/common" ) var ( diff --git a/accounts/keystore/file_cache.go b/accounts/keystore/file_cache.go index 80516ad0f..ec8ca6d2a 100644 --- a/accounts/keystore/file_cache.go +++ b/accounts/keystore/file_cache.go @@ -25,7 +25,7 @@ import ( "time" mapset "github.com/deckarep/golang-set" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/log" ) // fileCache is a cache of files seen during scan of keystore. diff --git a/accounts/keystore/key.go b/accounts/keystore/key.go index fe401252e..eb97d2ed6 100644 --- a/accounts/keystore/key.go +++ b/accounts/keystore/key.go @@ -29,10 +29,10 @@ import ( "strings" "time" - "github.com/dexon-foundation/dexon/accounts" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/crypto" "github.com/pborman/uuid" + "github.com/tangerine-network/go-tangerine/accounts" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/crypto" ) const ( diff --git a/accounts/keystore/keystore.go b/accounts/keystore/keystore.go index 432077d56..58478284e 100644 --- a/accounts/keystore/keystore.go +++ b/accounts/keystore/keystore.go @@ -33,11 +33,11 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/accounts" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/event" + "github.com/tangerine-network/go-tangerine/accounts" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/event" ) var ( diff --git a/accounts/keystore/keystore_test.go b/accounts/keystore/keystore_test.go index 2742ec152..f9c9b1518 100644 --- a/accounts/keystore/keystore_test.go +++ b/accounts/keystore/keystore_test.go @@ -26,9 +26,9 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/accounts" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/event" + "github.com/tangerine-network/go-tangerine/accounts" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/event" ) var testSigData = make([]byte, 32) diff --git a/accounts/keystore/passphrase.go b/accounts/keystore/passphrase.go index 07454146d..853b6b4d1 100644 --- a/accounts/keystore/passphrase.go +++ b/accounts/keystore/passphrase.go @@ -38,10 +38,10 @@ import ( "os" "path/filepath" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/math" - "github.com/dexon-foundation/dexon/crypto" "github.com/pborman/uuid" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/math" + "github.com/tangerine-network/go-tangerine/crypto" "golang.org/x/crypto/pbkdf2" "golang.org/x/crypto/scrypt" ) @@ -120,7 +120,7 @@ func (ks keyStorePassphrase) StoreKey(filename string, key *Key, auth string) er "This indicates that the keystore is corrupted. \n" + "The corrupted file is stored at \n%v\n" + "Please file a ticket at:\n\n" + - "https://github.com/dexon-foundation/dexon/issues." + + "https://github.com/tangerine-network/go-tangerine/issues." + "The error was : %s" return fmt.Errorf(msg, tmpName, err) } diff --git a/accounts/keystore/passphrase_test.go b/accounts/keystore/passphrase_test.go index ee3616ed9..a773db94e 100644 --- a/accounts/keystore/passphrase_test.go +++ b/accounts/keystore/passphrase_test.go @@ -20,7 +20,7 @@ import ( "io/ioutil" "testing" - "github.com/dexon-foundation/dexon/common" + "github.com/tangerine-network/go-tangerine/common" ) const ( diff --git a/accounts/keystore/plain.go b/accounts/keystore/plain.go index 6099ad2c0..84a521b2f 100644 --- a/accounts/keystore/plain.go +++ b/accounts/keystore/plain.go @@ -22,7 +22,7 @@ import ( "os" "path/filepath" - "github.com/dexon-foundation/dexon/common" + "github.com/tangerine-network/go-tangerine/common" ) type keyStorePlain struct { diff --git a/accounts/keystore/plain_test.go b/accounts/keystore/plain_test.go index b4d6aa999..d383541bf 100644 --- a/accounts/keystore/plain_test.go +++ b/accounts/keystore/plain_test.go @@ -27,8 +27,8 @@ import ( "strings" "testing" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/crypto" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/crypto" ) func tmpKeyStoreIface(t *testing.T, encrypted bool) (dir string, ks keyStore) { diff --git a/accounts/keystore/presale.go b/accounts/keystore/presale.go index e5f8a53be..ec32c444a 100644 --- a/accounts/keystore/presale.go +++ b/accounts/keystore/presale.go @@ -25,9 +25,9 @@ import ( "errors" "fmt" - "github.com/dexon-foundation/dexon/accounts" - "github.com/dexon-foundation/dexon/crypto" "github.com/pborman/uuid" + "github.com/tangerine-network/go-tangerine/accounts" + "github.com/tangerine-network/go-tangerine/crypto" "golang.org/x/crypto/pbkdf2" ) diff --git a/accounts/keystore/wallet.go b/accounts/keystore/wallet.go index e3fc00ca5..b2d8c9f55 100644 --- a/accounts/keystore/wallet.go +++ b/accounts/keystore/wallet.go @@ -19,9 +19,9 @@ package keystore import ( "math/big" - ethereum "github.com/dexon-foundation/dexon" - "github.com/dexon-foundation/dexon/accounts" - "github.com/dexon-foundation/dexon/core/types" + ethereum "github.com/tangerine-network/go-tangerine" + "github.com/tangerine-network/go-tangerine/accounts" + "github.com/tangerine-network/go-tangerine/core/types" ) // keystoreWallet implements the accounts.Wallet interface for the original diff --git a/accounts/keystore/watch.go b/accounts/keystore/watch.go index a5e6f99ab..8ad453858 100644 --- a/accounts/keystore/watch.go +++ b/accounts/keystore/watch.go @@ -21,8 +21,8 @@ package keystore import ( "time" - "github.com/dexon-foundation/dexon/log" "github.com/rjeczalik/notify" + "github.com/tangerine-network/go-tangerine/log" ) type watcher struct { diff --git a/accounts/manager.go b/accounts/manager.go index b855d42e1..384a63836 100644 --- a/accounts/manager.go +++ b/accounts/manager.go @@ -21,7 +21,7 @@ import ( "sort" "sync" - "github.com/dexon-foundation/dexon/event" + "github.com/tangerine-network/go-tangerine/event" ) // Manager is an overarching account manager that can communicate with various diff --git a/accounts/usbwallet/hub.go b/accounts/usbwallet/hub.go index 162134131..41c464dd1 100644 --- a/accounts/usbwallet/hub.go +++ b/accounts/usbwallet/hub.go @@ -22,10 +22,10 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/accounts" - "github.com/dexon-foundation/dexon/event" - "github.com/dexon-foundation/dexon/log" "github.com/karalabe/hid" + "github.com/tangerine-network/go-tangerine/accounts" + "github.com/tangerine-network/go-tangerine/event" + "github.com/tangerine-network/go-tangerine/log" ) // LedgerScheme is the protocol scheme prefixing account and wallet URLs. diff --git a/accounts/usbwallet/ledger.go b/accounts/usbwallet/ledger.go index d02ad49a2..fddeb1801 100644 --- a/accounts/usbwallet/ledger.go +++ b/accounts/usbwallet/ledger.go @@ -28,12 +28,12 @@ import ( "io" "math/big" - "github.com/dexon-foundation/dexon/accounts" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/accounts" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/rlp" ) // ledgerOpcode is an enumeration encoding the supported Ledger opcodes. diff --git a/accounts/usbwallet/trezor.go b/accounts/usbwallet/trezor.go index 06e440cf9..5686bb6ec 100644 --- a/accounts/usbwallet/trezor.go +++ b/accounts/usbwallet/trezor.go @@ -27,13 +27,13 @@ import ( "io" "math/big" - "github.com/dexon-foundation/dexon/accounts" - "github.com/dexon-foundation/dexon/accounts/usbwallet/internal/trezor" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/log" "github.com/golang/protobuf/proto" + "github.com/tangerine-network/go-tangerine/accounts" + "github.com/tangerine-network/go-tangerine/accounts/usbwallet/internal/trezor" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/log" ) // ErrTrezorPINNeeded is returned if opening the trezor requires a PIN code. In diff --git a/accounts/usbwallet/wallet.go b/accounts/usbwallet/wallet.go index 85660ed41..e6fbe34d4 100644 --- a/accounts/usbwallet/wallet.go +++ b/accounts/usbwallet/wallet.go @@ -25,12 +25,12 @@ import ( "sync" "time" - ethereum "github.com/dexon-foundation/dexon" - "github.com/dexon-foundation/dexon/accounts" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/log" "github.com/karalabe/hid" + ethereum "github.com/tangerine-network/go-tangerine" + "github.com/tangerine-network/go-tangerine/accounts" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/log" ) // Maximum time between wallet health checks to detect USB unplugs. diff --git a/build/bls-arm64.sh b/build/bls-arm64.sh index e2046dee0..d2e82bec0 100755 --- a/build/bls-arm64.sh +++ b/build/bls-arm64.sh @@ -1,6 +1,6 @@ #!/bin/bash -f -cd vendor/github.com/dexon-foundation/ +cd vendor/github.com/tangerine-network/ sudo apt-get update diff --git a/build/ci.go b/build/ci.go index 931fa2f83..ea9fddd03 100644 --- a/build/ci.go +++ b/build/ci.go @@ -58,25 +58,25 @@ import ( "strings" "time" - "github.com/dexon-foundation/dexon/internal/build" - "github.com/dexon-foundation/dexon/params" - sv "github.com/dexon-foundation/dexon/swarm/version" + "github.com/tangerine-network/go-tangerine/internal/build" + "github.com/tangerine-network/go-tangerine/params" + sv "github.com/tangerine-network/go-tangerine/swarm/version" ) var ( - // Files that end up in the gdex*.zip archive. - gdexArchiveFiles = []string{ + // Files that end up in the gtan*.zip archive. + gtanArchiveFiles = []string{ "COPYING", - executablePath("gdex"), + executablePath("gtan"), } - // Files that end up in the gdex-alltools*.zip archive. + // Files that end up in the gtan-alltools*.zip archive. allToolsArchiveFiles = []string{ "COPYING", executablePath("abigen"), executablePath("bootnode"), executablePath("evm"), - executablePath("gdex"), + executablePath("gtan"), executablePath("puppeth"), executablePath("rlpdump"), executablePath("wnode"), @@ -92,23 +92,23 @@ var ( debExecutables = []debExecutable{ { BinaryName: "abigen", - Description: "Source code generator to convert Dexon contract definitions into easy to use, compile-time type-safe Go packages.", + Description: "Source code generator to convert Tangerine contract definitions into easy to use, compile-time type-safe Go packages.", }, { BinaryName: "bootnode", - Description: "Dexon bootnode.", + Description: "Tangerine bootnode.", }, { BinaryName: "evm", - Description: "Developer utility version of the EVM (Dexon Virtual Machine) that is capable of running bytecode snippets within a configurable environment and execution mode.", + Description: "Developer utility version of the EVM (Tangerine Virtual Machine) that is capable of running bytecode snippets within a configurable environment and execution mode.", }, { - BinaryName: "gdex", - Description: "Dexon CLI client.", + BinaryName: "gtan", + Description: "Tangerine CLI client.", }, { BinaryName: "puppeth", - Description: "Dexon private network manager.", + Description: "Tangerine private network manager.", }, { BinaryName: "rlpdump", @@ -116,7 +116,7 @@ var ( }, { BinaryName: "wnode", - Description: "Dexon Whisper diagnostic tool", + Description: "Tangerine Whisper diagnostic tool", }, } @@ -125,11 +125,11 @@ var ( { BinaryName: "swarm", PackageName: "dexon-swarm", - Description: "Dexon Swarm daemon and tools", + Description: "Tangerine Swarm daemon and tools", }, } - debDexon = debPackage{ + debTangerine = debPackage{ Name: "dexon", Version: params.Version, Executables: debExecutables, @@ -144,7 +144,7 @@ var ( // Debian meta packages to build and push to Ubuntu PPA debPackages = []debPackage{ debSwarm, - debDexon, + debTangerine, } // Packages to be cross-compiled by the xgo command @@ -422,15 +422,15 @@ func doArchive(cmdline []string) { var ( env = build.Env() - basegdex = archiveBasename(*arch, params.ArchiveVersion(env.Commit)) - gdex = "gdex-" + basegdex + ext - alltools = "gdex-alltools-" + basegdex + ext + basegtan = archiveBasename(*arch, params.ArchiveVersion(env.Commit)) + gtan = "gtan-" + basegtan + ext + alltools = "gtan-alltools-" + basegtan + ext baseswarm = archiveBasename(*arch, sv.ArchiveVersion(env.Commit)) swarm = "swarm-" + baseswarm + ext ) maybeSkipArchive(env) - if err := build.WriteArchive(gdex, gdexArchiveFiles); err != nil { + if err := build.WriteArchive(gtan, gtanArchiveFiles); err != nil { log.Fatal(err) } if err := build.WriteArchive(alltools, allToolsArchiveFiles); err != nil { @@ -439,7 +439,7 @@ func doArchive(cmdline []string) { if err := build.WriteArchive(swarm, swarmArchiveFiles); err != nil { log.Fatal(err) } - for _, archive := range []string{gdex, alltools, swarm} { + for _, archive := range []string{gtan, alltools, swarm} { if err := archiveUpload(archive, *upload, *signer); err != nil { log.Fatal(err) } @@ -584,7 +584,7 @@ func makeWorkdir(wdflag string) string { if wdflag != "" { err = os.MkdirAll(wdflag, 0744) } else { - wdflag, err = ioutil.TempDir("", "gdex-build-") + wdflag, err = ioutil.TempDir("", "gtan-build-") } if err != nil { log.Fatal(err) @@ -638,7 +638,7 @@ func (d debExecutable) Package() string { func newDebMetadata(distro, author string, env build.Environment, t time.Time, name string, version string, exes []debExecutable) debMetadata { if author == "" { // No signing key, use default author. - author = "Dexon Builds <fjl@dexon.org>" + author = "Tangerine Builds <fjl@dexon.org>" } return debMetadata{ PackageName: name, @@ -752,28 +752,28 @@ func doWindowsInstaller(cmdline []string) { var ( devTools []string allTools []string - gdexTool string + gtanTool string ) for _, file := range allToolsArchiveFiles { if file == "COPYING" { // license, copied later continue } allTools = append(allTools, filepath.Base(file)) - if filepath.Base(file) == "gdex.exe" { - gdexTool = file + if filepath.Base(file) == "gtan.exe" { + gtanTool = file } else { devTools = append(devTools, file) } } // Render NSIS scripts: Installer NSIS contains two installer sections, - // first section contains the gdex binary, second section holds the dev tools. + // first section contains the gtan binary, second section holds the dev tools. templateData := map[string]interface{}{ "License": "COPYING", - "Gdex": gdexTool, + "Gdex": gtanTool, "DevTools": devTools, } - build.Render("build/nsis.gdex.nsi", filepath.Join(*workdir, "gdex.nsi"), 0644, nil) + build.Render("build/nsis.gtan.nsi", filepath.Join(*workdir, "gtan.nsi"), 0644, nil) build.Render("build/nsis.install.nsh", filepath.Join(*workdir, "install.nsh"), 0644, templateData) build.Render("build/nsis.uninstall.nsh", filepath.Join(*workdir, "uninstall.nsh"), 0644, allTools) build.Render("build/nsis.pathupdate.nsh", filepath.Join(*workdir, "PathUpdate.nsh"), 0644, nil) @@ -788,14 +788,14 @@ func doWindowsInstaller(cmdline []string) { if env.Commit != "" { version[2] += "-" + env.Commit[:8] } - installer, _ := filepath.Abs("gdex-" + archiveBasename(*arch, params.ArchiveVersion(env.Commit)) + ".exe") + installer, _ := filepath.Abs("gtan-" + archiveBasename(*arch, params.ArchiveVersion(env.Commit)) + ".exe") build.MustRunCommand("makensis.exe", "/DOUTPUTFILE="+installer, "/DMAJORVERSION="+version[0], "/DMINORVERSION="+version[1], "/DBUILDVERSION="+version[2], "/DARCH="+*arch, - filepath.Join(*workdir, "gdex.nsi"), + filepath.Join(*workdir, "gtan.nsi"), ) // Sign and publish installer. @@ -826,11 +826,11 @@ func doAndroidArchive(cmdline []string) { // Build the Android archive and Maven resources build.MustRun(goTool("get", "golang.org/x/mobile/cmd/gomobile", "golang.org/x/mobile/cmd/gobind")) build.MustRun(gomobileTool("init", "--ndk", os.Getenv("ANDROID_NDK"))) - build.MustRun(gomobileTool("bind", "-ldflags", "-s -w", "--target", "android", "--javapkg", "org.dexon", "-v", "github.com/dexon-foundation/dexon/mobile")) + build.MustRun(gomobileTool("bind", "-ldflags", "-s -w", "--target", "android", "--javapkg", "org.dexon", "-v", "github.com/tangerine-network/go-tangerine/mobile")) if *local { // If we're building locally, copy bundle to build dir and skip Maven - os.Rename("gdex.aar", filepath.Join(GOBIN, "gdex.aar")) + os.Rename("gtan.aar", filepath.Join(GOBIN, "gtan.aar")) return } meta := newMavenMetadata(env) @@ -840,8 +840,8 @@ func doAndroidArchive(cmdline []string) { maybeSkipArchive(env) // Sign and upload the archive to Azure - archive := "gdex-" + archiveBasename("android", params.ArchiveVersion(env.Commit)) + ".aar" - os.Rename("gdex.aar", archive) + archive := "gtan-" + archiveBasename("android", params.ArchiveVersion(env.Commit)) + ".aar" + os.Rename("gtan.aar", archive) if err := archiveUpload(archive, *upload, *signer); err != nil { log.Fatal(err) @@ -926,7 +926,7 @@ func newMavenMetadata(env build.Environment) mavenMetadata { } return mavenMetadata{ Version: version, - Package: "gdex-" + version, + Package: "gtan-" + version, Develop: isUnstableBuild(env), Contributors: contribs, } @@ -947,7 +947,7 @@ func doXCodeFramework(cmdline []string) { // Build the iOS XCode framework build.MustRun(goTool("get", "golang.org/x/mobile/cmd/gomobile", "golang.org/x/mobile/cmd/gobind")) build.MustRun(gomobileTool("init")) - bind := gomobileTool("bind", "-ldflags", "-s -w", "--target", "ios", "--tags", "ios", "-v", "github.com/dexon-foundation/dexon/mobile") + bind := gomobileTool("bind", "-ldflags", "-s -w", "--target", "ios", "--tags", "ios", "-v", "github.com/tangerine-network/go-tangerine/mobile") if *local { // If we're building locally, use the build folder and stop afterwards @@ -955,7 +955,7 @@ func doXCodeFramework(cmdline []string) { build.MustRun(bind) return } - archive := "gdex-" + archiveBasename("ios", params.ArchiveVersion(env.Commit)) + archive := "gtan-" + archiveBasename("ios", params.ArchiveVersion(env.Commit)) if err := os.Mkdir(archive, os.ModePerm); err != nil { log.Fatal(err) } diff --git a/build/deb/dexon-swarm/deb.control b/build/deb/dexon-swarm/deb.control index b787fe391..41727ea85 100644 --- a/build/deb/dexon-swarm/deb.control +++ b/build/deb/dexon-swarm/deb.control @@ -5,8 +5,8 @@ Maintainer: {{.Author}} Build-Depends: debhelper (>= 8.0.0), golang-1.10 Standards-Version: 3.9.5 Homepage: https://ethereum.org -Vcs-Git: git://github.com/dexon-foundation/dexon.git -Vcs-Browser: https://github.com/dexon-foundation/dexon +Vcs-Git: git://github.com/tangerine-network/go-tangerine.git +Vcs-Browser: https://github.com/tangerine-network/go-tangerine {{range .Executables}} Package: {{$.ExeName .}} diff --git a/build/deb/dexon/deb.control b/build/deb/dexon/deb.control index 6d9c51346..113ed8389 100644 --- a/build/deb/dexon/deb.control +++ b/build/deb/dexon/deb.control @@ -5,8 +5,8 @@ Maintainer: {{.Author}} Build-Depends: debhelper (>= 8.0.0), golang-1.10 Standards-Version: 3.9.5 Homepage: https://ethereum.org -Vcs-Git: git://github.com/dexon-foundation/dexon.git -Vcs-Browser: https://github.com/dexon-foundation/dexon +Vcs-Git: git://github.com/tangerine-network/go-tangerine.git +Vcs-Browser: https://github.com/tangerine-network/go-tangerine Package: {{.Name}} Architecture: any diff --git a/build/env.sh b/build/env.sh index aa7aeba95..720d12bab 100755 --- a/build/env.sh +++ b/build/env.sh @@ -10,11 +10,11 @@ fi # Create fake Go workspace if it doesn't exist yet. workspace="$PWD/build/_workspace" root="$PWD" -ethdir="$workspace/src/github.com/dexon-foundation" -if [ ! -L "$ethdir/dexon" ]; then +ethdir="$workspace/src/github.com/tangerine-network" +if [ ! -L "$ethdir/go-tangerine" ]; then mkdir -p "$ethdir" cd "$ethdir" - ln -s ../../../../../. dexon + ln -s ../../../../../. go-tangerine cd "$root" fi @@ -23,8 +23,8 @@ GOPATH="$workspace" export GOPATH # Run the command inside the workspace. -cd "$ethdir/dexon" -PWD="$ethdir/dexon" +cd "$ethdir/go-tangerine" +PWD="$ethdir/go-tangerine" # Launch the arguments with the configured environment. exec "$@" diff --git a/build/mvn.pom b/build/mvn.pom index 41f01204b..b323b5304 100644 --- a/build/mvn.pom +++ b/build/mvn.pom @@ -11,7 +11,7 @@ <name>Android Ethereum Client</name> <description>Android port of the go-ethereum libraries and node</description> - <url>https://github.com/dexon-foundation/dexon</url> + <url>https://github.com/tangerine-network/go-tangerine</url> <inceptionYear>2015</inceptionYear> <licenses> @@ -48,10 +48,10 @@ <issueManagement> <system>GitHub Issues</system> - <url>https://github.com/dexon-foundation/dexon/issues/</url> + <url>https://github.com/tangerine-network/go-tangerine/issues/</url> </issueManagement> <scm> - <url>https://github.com/dexon-foundation/dexon</url> + <url>https://github.com/tangerine-network/go-tangerine</url> </scm> </project> diff --git a/build/nsis.install.nsh b/build/nsis.install.nsh index 9f8f54b14..553ecb0fa 100644 --- a/build/nsis.install.nsh +++ b/build/nsis.install.nsh @@ -3,9 +3,9 @@ InstallDir "$InstDir" OutFile "${OUTPUTFILE}" # set through command line arguments # Links for "Add/Remove Programs" -!define HELPURL "https://github.com/dexon-foundation/dexon/issues" -!define UPDATEURL "https://github.com/dexon-foundation/dexon/releases" -!define ABOUTURL "https://github.com/dexon-foundation/dexon#ethereum-go" +!define HELPURL "https://github.com/tangerine-network/go-tangerine/issues" +!define UPDATEURL "https://github.com/tangerine-network/go-tangerine/releases" +!define ABOUTURL "https://github.com/tangerine-network/go-tangerine#ethereum-go" !define /date NOW "%Y%m%d" PageEx license diff --git a/build/pod.podspec b/build/pod.podspec index fe60f9f68..d47d7afff 100644 --- a/build/pod.podspec +++ b/build/pod.podspec @@ -2,12 +2,12 @@ Pod::Spec.new do |spec| spec.name = 'Geth' spec.version = '{{.Version}}' spec.license = { :type => 'GNU Lesser General Public License, Version 3.0' } - spec.homepage = 'https://github.com/dexon-foundation/dexon' + spec.homepage = 'https://github.com/tangerine-network/go-tangerine' spec.authors = { {{range .Contributors}} '{{.Name}}' => '{{.Email}}',{{end}} } spec.summary = 'iOS Ethereum Client' - spec.source = { :git => 'https://github.com/dexon-foundation/dexon.git', :commit => '{{.Commit}}' } + spec.source = { :git => 'https://github.com/tangerine-network/go-tangerine.git', :commit => '{{.Commit}}' } spec.platform = :ios spec.ios.deployment_target = '9.0' diff --git a/build/testtool/testtool.go b/build/testtool/testtool.go index a801cfbb3..15659f656 100644 --- a/build/testtool/testtool.go +++ b/build/testtool/testtool.go @@ -11,16 +11,16 @@ import ( "strings" "time" - dexCore "github.com/dexon-foundation/dexon-consensus/core" - - "github.com/dexon-foundation/dexon" - "github.com/dexon-foundation/dexon/accounts/abi" - "github.com/dexon-foundation/dexon/cmd/zoo/monkey" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/core/vm" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/ethclient" - "github.com/dexon-foundation/dexon/internal/build" + dexCore "github.com/byzantine-lab/dexon-consensus/core" + + ethereum "github.com/tangerine-network/go-tangerine" + "github.com/tangerine-network/go-tangerine/accounts/abi" + "github.com/tangerine-network/go-tangerine/cmd/zoo/monkey" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/core/vm" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/ethclient" + "github.com/tangerine-network/go-tangerine/internal/build" ) func main() { diff --git a/cmd/abigen/main.go b/cmd/abigen/main.go index fcfbcadd6..29d80311a 100644 --- a/cmd/abigen/main.go +++ b/cmd/abigen/main.go @@ -24,8 +24,8 @@ import ( "os" "strings" - "github.com/dexon-foundation/dexon/accounts/abi/bind" - "github.com/dexon-foundation/dexon/common/compiler" + "github.com/tangerine-network/go-tangerine/accounts/abi/bind" + "github.com/tangerine-network/go-tangerine/common/compiler" ) var ( diff --git a/cmd/bootnode/main.go b/cmd/bootnode/main.go index 118f57753..1de94bd5b 100644 --- a/cmd/bootnode/main.go +++ b/cmd/bootnode/main.go @@ -24,14 +24,14 @@ import ( "net" "os" - "github.com/dexon-foundation/dexon/cmd/utils" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/p2p/discover" - "github.com/dexon-foundation/dexon/p2p/discv5" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/nat" - "github.com/dexon-foundation/dexon/p2p/netutil" + "github.com/tangerine-network/go-tangerine/cmd/utils" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/p2p/discover" + "github.com/tangerine-network/go-tangerine/p2p/discv5" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/nat" + "github.com/tangerine-network/go-tangerine/p2p/netutil" ) func main() { diff --git a/cmd/clef/main.go b/cmd/clef/main.go index fa5c8cb97..535b3ab21 100644 --- a/cmd/clef/main.go +++ b/cmd/clef/main.go @@ -35,17 +35,17 @@ import ( "runtime" "strings" - "github.com/dexon-foundation/dexon/accounts/keystore" - "github.com/dexon-foundation/dexon/cmd/utils" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/console" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/node" - "github.com/dexon-foundation/dexon/rpc" - "github.com/dexon-foundation/dexon/signer/core" - "github.com/dexon-foundation/dexon/signer/rules" - "github.com/dexon-foundation/dexon/signer/storage" + "github.com/tangerine-network/go-tangerine/accounts/keystore" + "github.com/tangerine-network/go-tangerine/cmd/utils" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/console" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/node" + "github.com/tangerine-network/go-tangerine/rpc" + "github.com/tangerine-network/go-tangerine/signer/core" + "github.com/tangerine-network/go-tangerine/signer/rules" + "github.com/tangerine-network/go-tangerine/signer/storage" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/ethkey/changepassphrase.go b/cmd/ethkey/changepassphrase.go index 4e47f2324..7c5bf3dd4 100644 --- a/cmd/ethkey/changepassphrase.go +++ b/cmd/ethkey/changepassphrase.go @@ -5,8 +5,8 @@ import ( "io/ioutil" "strings" - "github.com/dexon-foundation/dexon/accounts/keystore" - "github.com/dexon-foundation/dexon/cmd/utils" + "github.com/tangerine-network/go-tangerine/accounts/keystore" + "github.com/tangerine-network/go-tangerine/cmd/utils" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/ethkey/generate.go b/cmd/ethkey/generate.go index aa4a51138..23fd77618 100644 --- a/cmd/ethkey/generate.go +++ b/cmd/ethkey/generate.go @@ -23,10 +23,10 @@ import ( "os" "path/filepath" - "github.com/dexon-foundation/dexon/accounts/keystore" - "github.com/dexon-foundation/dexon/cmd/utils" - "github.com/dexon-foundation/dexon/crypto" "github.com/pborman/uuid" + "github.com/tangerine-network/go-tangerine/accounts/keystore" + "github.com/tangerine-network/go-tangerine/cmd/utils" + "github.com/tangerine-network/go-tangerine/crypto" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/ethkey/inspect.go b/cmd/ethkey/inspect.go index 3fe2dbe3f..21584ec6f 100644 --- a/cmd/ethkey/inspect.go +++ b/cmd/ethkey/inspect.go @@ -21,9 +21,9 @@ import ( "fmt" "io/ioutil" - "github.com/dexon-foundation/dexon/accounts/keystore" - "github.com/dexon-foundation/dexon/cmd/utils" - "github.com/dexon-foundation/dexon/crypto" + "github.com/tangerine-network/go-tangerine/accounts/keystore" + "github.com/tangerine-network/go-tangerine/cmd/utils" + "github.com/tangerine-network/go-tangerine/crypto" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/ethkey/main.go b/cmd/ethkey/main.go index f87303808..0ed85600e 100644 --- a/cmd/ethkey/main.go +++ b/cmd/ethkey/main.go @@ -20,7 +20,7 @@ import ( "fmt" "os" - "github.com/dexon-foundation/dexon/cmd/utils" + "github.com/tangerine-network/go-tangerine/cmd/utils" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/ethkey/message.go b/cmd/ethkey/message.go index 9bbfd68f3..55f301d63 100644 --- a/cmd/ethkey/message.go +++ b/cmd/ethkey/message.go @@ -21,10 +21,10 @@ import ( "fmt" "io/ioutil" - "github.com/dexon-foundation/dexon/accounts/keystore" - "github.com/dexon-foundation/dexon/cmd/utils" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/crypto" + "github.com/tangerine-network/go-tangerine/accounts/keystore" + "github.com/tangerine-network/go-tangerine/cmd/utils" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/crypto" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/ethkey/run_test.go b/cmd/ethkey/run_test.go index f7b03249e..0b7e78dc9 100644 --- a/cmd/ethkey/run_test.go +++ b/cmd/ethkey/run_test.go @@ -21,8 +21,8 @@ import ( "os" "testing" - "github.com/dexon-foundation/dexon/internal/cmdtest" "github.com/docker/docker/pkg/reexec" + "github.com/tangerine-network/go-tangerine/internal/cmdtest" ) type testEthkey struct { diff --git a/cmd/ethkey/utils.go b/cmd/ethkey/utils.go index 99f5e923d..c3e06304e 100644 --- a/cmd/ethkey/utils.go +++ b/cmd/ethkey/utils.go @@ -22,9 +22,9 @@ import ( "io/ioutil" "strings" - "github.com/dexon-foundation/dexon/cmd/utils" - "github.com/dexon-foundation/dexon/console" - "github.com/dexon-foundation/dexon/crypto" + "github.com/tangerine-network/go-tangerine/cmd/utils" + "github.com/tangerine-network/go-tangerine/console" + "github.com/tangerine-network/go-tangerine/crypto" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/compiler.go b/cmd/evm/compiler.go index e56dcb877..fe6635bc3 100644 --- a/cmd/evm/compiler.go +++ b/cmd/evm/compiler.go @@ -21,7 +21,7 @@ import ( "fmt" "io/ioutil" - "github.com/dexon-foundation/dexon/cmd/evm/internal/compiler" + "github.com/tangerine-network/go-tangerine/cmd/evm/internal/compiler" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/disasm.go b/cmd/evm/disasm.go index 16c3832c9..5933a3b99 100644 --- a/cmd/evm/disasm.go +++ b/cmd/evm/disasm.go @@ -22,7 +22,7 @@ import ( "io/ioutil" "strings" - "github.com/dexon-foundation/dexon/core/asm" + "github.com/tangerine-network/go-tangerine/core/asm" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/internal/compiler/compiler.go b/cmd/evm/internal/compiler/compiler.go index a90007a03..ab46b784b 100644 --- a/cmd/evm/internal/compiler/compiler.go +++ b/cmd/evm/internal/compiler/compiler.go @@ -20,7 +20,7 @@ import ( "errors" "fmt" - "github.com/dexon-foundation/dexon/core/asm" + "github.com/tangerine-network/go-tangerine/core/asm" ) func Compile(fn string, src []byte, debug bool) (string, error) { diff --git a/cmd/evm/main.go b/cmd/evm/main.go index 82d7b7600..749a1cd4e 100644 --- a/cmd/evm/main.go +++ b/cmd/evm/main.go @@ -22,7 +22,7 @@ import ( "math/big" "os" - "github.com/dexon-foundation/dexon/cmd/utils" + "github.com/tangerine-network/go-tangerine/cmd/utils" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/runner.go b/cmd/evm/runner.go index 114b9fd60..087f868c0 100644 --- a/cmd/evm/runner.go +++ b/cmd/evm/runner.go @@ -27,16 +27,16 @@ import ( "runtime/pprof" "time" - "github.com/dexon-foundation/dexon/cmd/evm/internal/compiler" - "github.com/dexon-foundation/dexon/cmd/utils" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/state" - "github.com/dexon-foundation/dexon/core/vm" - "github.com/dexon-foundation/dexon/core/vm/runtime" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/cmd/evm/internal/compiler" + "github.com/tangerine-network/go-tangerine/cmd/utils" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/state" + "github.com/tangerine-network/go-tangerine/core/vm" + "github.com/tangerine-network/go-tangerine/core/vm/runtime" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/params" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/staterunner.go b/cmd/evm/staterunner.go index b76dc3ca4..200d6da5c 100644 --- a/cmd/evm/staterunner.go +++ b/cmd/evm/staterunner.go @@ -23,10 +23,10 @@ import ( "io/ioutil" "os" - "github.com/dexon-foundation/dexon/core/state" - "github.com/dexon-foundation/dexon/core/vm" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/tests" + "github.com/tangerine-network/go-tangerine/core/state" + "github.com/tangerine-network/go-tangerine/core/vm" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/tests" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/faucet/faucet.go b/cmd/faucet/faucet.go index 238d6884d..061bb8e62 100644 --- a/cmd/faucet/faucet.go +++ b/cmd/faucet/faucet.go @@ -41,23 +41,23 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/accounts" - "github.com/dexon-foundation/dexon/accounts/keystore" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/eth" - "github.com/dexon-foundation/dexon/eth/downloader" - "github.com/dexon-foundation/dexon/ethclient" - "github.com/dexon-foundation/dexon/ethstats" - "github.com/dexon-foundation/dexon/les" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/node" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/discv5" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/nat" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/accounts" + "github.com/tangerine-network/go-tangerine/accounts/keystore" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/eth" + "github.com/tangerine-network/go-tangerine/eth/downloader" + "github.com/tangerine-network/go-tangerine/ethclient" + "github.com/tangerine-network/go-tangerine/ethstats" + "github.com/tangerine-network/go-tangerine/les" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/node" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/discv5" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/nat" + "github.com/tangerine-network/go-tangerine/params" "golang.org/x/net/websocket" ) @@ -215,7 +215,7 @@ type faucet struct { func newFaucet(genesis *core.Genesis, port int, enodes []*discv5.Node, network uint64, stats string, ks *keystore.KeyStore, index []byte) (*faucet, error) { // Assemble the raw devp2p protocol stack stack, err := node.New(&node.Config{ - Name: "gdex", + Name: "gtan", Version: params.VersionWithMeta, DataDir: filepath.Join(os.Getenv("HOME"), ".faucet"), P2P: p2p.Config{ @@ -449,7 +449,7 @@ func (f *faucet) apiHandler(conn *websocket.Conn) { case *noauthFlag: username, avatar, address, err = authNoAuth(msg.URL) default: - err = errors.New("Something funky happened, please open an issue at https://github.com/dexon-foundation/dexon/issues") + err = errors.New("Something funky happened, please open an issue at https://github.com/tangerine-network/go-tangerine/issues") } if err != nil { if err = sendError(conn, err); err != nil { diff --git a/cmd/govtool/main.go b/cmd/govtool/main.go index 1425b9faf..68e3452c1 100644 --- a/cmd/govtool/main.go +++ b/cmd/govtool/main.go @@ -6,11 +6,11 @@ import ( "math/big" "os" - coreTypes "github.com/dexon-foundation/dexon-consensus/core/types" - dkgTypes "github.com/dexon-foundation/dexon-consensus/core/types/dkg" - "github.com/dexon-foundation/dexon/cmd/utils" - "github.com/dexon-foundation/dexon/core/vm" - "github.com/dexon-foundation/dexon/rlp" + coreTypes "github.com/byzantine-lab/dexon-consensus/core/types" + dkgTypes "github.com/byzantine-lab/dexon-consensus/core/types/dkg" + "github.com/tangerine-network/go-tangerine/cmd/utils" + "github.com/tangerine-network/go-tangerine/core/vm" + "github.com/tangerine-network/go-tangerine/rlp" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/gdex/accountcmd.go b/cmd/gtan/accountcmd.go index d910831d7..aa112297c 100644 --- a/cmd/gdex/accountcmd.go +++ b/cmd/gtan/accountcmd.go @@ -20,12 +20,12 @@ import ( "fmt" "io/ioutil" - "github.com/dexon-foundation/dexon/accounts" - "github.com/dexon-foundation/dexon/accounts/keystore" - "github.com/dexon-foundation/dexon/cmd/utils" - "github.com/dexon-foundation/dexon/console" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/accounts" + "github.com/tangerine-network/go-tangerine/accounts/keystore" + "github.com/tangerine-network/go-tangerine/cmd/utils" + "github.com/tangerine-network/go-tangerine/console" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/log" "gopkg.in/urfave/cli.v1" ) @@ -36,7 +36,7 @@ var ( ArgsUsage: "", Category: "ACCOUNT COMMANDS", Description: ` - gdex wallet import /path/to/my/presale.wallet + gtan wallet import /path/to/my/presale.wallet will prompt for your password and imports your ether presale account. It can be used non-interactively with the --password option taking a @@ -56,7 +56,7 @@ passwordfile as argument containing the wallet password in plaintext.`, utils.LightKDFFlag, }, Description: ` - gdex wallet [options] /path/to/my/presale.wallet + gtan wallet [options] /path/to/my/presale.wallet will prompt for your password and imports your ether presale account. It can be used non-interactively with the --password option taking a @@ -112,7 +112,7 @@ Print a short summary of all accounts`, utils.LightKDFFlag, }, Description: ` - gdex account new + gtan account new Creates a new account and prints the address. @@ -137,7 +137,7 @@ password to file or expose in any other way. utils.LightKDFFlag, }, Description: ` - gdex account update <address> + gtan account update <address> Update an existing account. @@ -149,7 +149,7 @@ format to the newest format or change the password for an account. For non-interactive use the passphrase can be specified with the --password flag: - gdex account update [options] <address> + gtan account update [options] <address> Since only one password can be given, only format update can be performed, changing your password is only possible interactively. @@ -167,7 +167,7 @@ changing your password is only possible interactively. }, ArgsUsage: "<keyFile>", Description: ` - gdex account import <keyfile> + gtan account import <keyfile> Imports an unencrypted private key from <keyfile> and creates a new account. Prints the address. @@ -180,7 +180,7 @@ You must remember this passphrase to unlock your account in the future. For non-interactive use the passphrase can be specified with the -password flag: - gdex account import [options] <keyfile> + gtan account import [options] <keyfile> Note: As you can directly copy your encrypted accounts to another ethereum instance, diff --git a/cmd/gdex/accountcmd_test.go b/cmd/gtan/accountcmd_test.go index 38e21eaca..e0964b078 100644 --- a/cmd/gdex/accountcmd_test.go +++ b/cmd/gtan/accountcmd_test.go @@ -43,22 +43,22 @@ func tmpDatadirWithKeystore(t *testing.T) string { } func TestAccountListEmpty(t *testing.T) { - gdex := runGeth(t, "account", "list") - gdex.ExpectExit() + gtan := runGeth(t, "account", "list") + gtan.ExpectExit() } func TestAccountList(t *testing.T) { datadir := tmpDatadirWithKeystore(t) - gdex := runGeth(t, "account", "list", "--datadir", datadir) - defer gdex.ExpectExit() + gtan := runGeth(t, "account", "list", "--datadir", datadir) + defer gtan.ExpectExit() if runtime.GOOS == "windows" { - gdex.Expect(` + gtan.Expect(` Account #0: {7ef5a6135f1fd6a02593eedc869c6d41d934aef8} keystore://{{.Datadir}}\keystore\UTC--2016-03-22T12-57-55.920751759Z--7ef5a6135f1fd6a02593eedc869c6d41d934aef8 Account #1: {f466859ead1932d743d622cb74fc058882e8648a} keystore://{{.Datadir}}\keystore\aaa Account #2: {289d485d9771714cce91d3393d764e1311907acc} keystore://{{.Datadir}}\keystore\zzz `) } else { - gdex.Expect(` + gtan.Expect(` Account #0: {7ef5a6135f1fd6a02593eedc869c6d41d934aef8} keystore://{{.Datadir}}/keystore/UTC--2016-03-22T12-57-55.920751759Z--7ef5a6135f1fd6a02593eedc869c6d41d934aef8 Account #1: {f466859ead1932d743d622cb74fc058882e8648a} keystore://{{.Datadir}}/keystore/aaa Account #2: {289d485d9771714cce91d3393d764e1311907acc} keystore://{{.Datadir}}/keystore/zzz @@ -67,21 +67,21 @@ Account #2: {289d485d9771714cce91d3393d764e1311907acc} keystore://{{.Datadir}}/k } func TestAccountNew(t *testing.T) { - gdex := runGeth(t, "account", "new", "--lightkdf") - defer gdex.ExpectExit() - gdex.Expect(` + gtan := runGeth(t, "account", "new", "--lightkdf") + defer gtan.ExpectExit() + gtan.Expect(` Your new account is locked with a password. Please give a password. Do not forget this password. !! Unsupported terminal, password will be echoed. Passphrase: {{.InputLine "foobar"}} Repeat passphrase: {{.InputLine "foobar"}} `) - gdex.ExpectRegexp(`Address: \{[0-9a-f]{40}\}\n`) + gtan.ExpectRegexp(`Address: \{[0-9a-f]{40}\}\n`) } func TestAccountNewBadRepeat(t *testing.T) { - gdex := runGeth(t, "account", "new", "--lightkdf") - defer gdex.ExpectExit() - gdex.Expect(` + gtan := runGeth(t, "account", "new", "--lightkdf") + defer gtan.ExpectExit() + gtan.Expect(` Your new account is locked with a password. Please give a password. Do not forget this password. !! Unsupported terminal, password will be echoed. Passphrase: {{.InputLine "something"}} @@ -92,11 +92,11 @@ Fatal: Passphrases do not match func TestAccountUpdate(t *testing.T) { datadir := tmpDatadirWithKeystore(t) - gdex := runGeth(t, "account", "update", + gtan := runGeth(t, "account", "update", "--datadir", datadir, "--lightkdf", "f466859ead1932d743d622cb74fc058882e8648a") - defer gdex.ExpectExit() - gdex.Expect(` + defer gtan.ExpectExit() + gtan.Expect(` Unlocking account f466859ead1932d743d622cb74fc058882e8648a | Attempt 1/3 !! Unsupported terminal, password will be echoed. Passphrase: {{.InputLine "foobar"}} @@ -107,24 +107,24 @@ Repeat passphrase: {{.InputLine "foobar2"}} } func TestWalletImport(t *testing.T) { - gdex := runGeth(t, "wallet", "import", "--lightkdf", "testdata/guswallet.json") - defer gdex.ExpectExit() - gdex.Expect(` + gtan := runGeth(t, "wallet", "import", "--lightkdf", "testdata/guswallet.json") + defer gtan.ExpectExit() + gtan.Expect(` !! Unsupported terminal, password will be echoed. Passphrase: {{.InputLine "foo"}} Address: {d4584b5f6229b7be90727b0fc8c6b91bb427821f} `) - files, err := ioutil.ReadDir(filepath.Join(gdex.Datadir, "keystore")) + files, err := ioutil.ReadDir(filepath.Join(gtan.Datadir, "keystore")) if len(files) != 1 { t.Errorf("expected one key file in keystore directory, found %d files (error: %v)", len(files), err) } } func TestWalletImportBadPassword(t *testing.T) { - gdex := runGeth(t, "wallet", "import", "--lightkdf", "testdata/guswallet.json") - defer gdex.ExpectExit() - gdex.Expect(` + gtan := runGeth(t, "wallet", "import", "--lightkdf", "testdata/guswallet.json") + defer gtan.ExpectExit() + gtan.Expect(` !! Unsupported terminal, password will be echoed. Passphrase: {{.InputLine "wrong"}} Fatal: could not decrypt key with given passphrase @@ -133,23 +133,23 @@ Fatal: could not decrypt key with given passphrase func TestUnlockFlag(t *testing.T) { datadir := tmpDatadirWithKeystore(t) - gdex := runGeth(t, + gtan := runGeth(t, "--datadir", datadir, "--nat", "none", "--nodiscover", "--maxpeers", "0", "--port", "0", "--unlock", "f466859ead1932d743d622cb74fc058882e8648a", "js", "testdata/empty.js") - gdex.Expect(` + gtan.Expect(` Unlocking account f466859ead1932d743d622cb74fc058882e8648a | Attempt 1/3 !! Unsupported terminal, password will be echoed. Passphrase: {{.InputLine "foobar"}} `) - gdex.ExpectExit() + gtan.ExpectExit() wantMessages := []string{ "Unlocked account", "=0xf466859eAD1932D743d622CB74FC058882E8648A", } for _, m := range wantMessages { - if !strings.Contains(gdex.StderrText(), m) { + if !strings.Contains(gtan.StderrText(), m) { t.Errorf("stderr text does not contain %q", m) } } @@ -157,11 +157,11 @@ Passphrase: {{.InputLine "foobar"}} func TestUnlockFlagWrongPassword(t *testing.T) { datadir := tmpDatadirWithKeystore(t) - gdex := runGeth(t, + gtan := runGeth(t, "--datadir", datadir, "--nat", "none", "--nodiscover", "--maxpeers", "0", "--port", "0", "--unlock", "f466859ead1932d743d622cb74fc058882e8648a") - defer gdex.ExpectExit() - gdex.Expect(` + defer gtan.ExpectExit() + gtan.Expect(` Unlocking account f466859ead1932d743d622cb74fc058882e8648a | Attempt 1/3 !! Unsupported terminal, password will be echoed. Passphrase: {{.InputLine "wrong1"}} @@ -173,21 +173,21 @@ Fatal: Failed to unlock account f466859ead1932d743d622cb74fc058882e8648a (could `) } -// https://github.com/dexon-foundation/dexon/issues/1785 +// https://github.com/tangerine-network/go-tangerine/issues/1785 func TestUnlockFlagMultiIndex(t *testing.T) { datadir := tmpDatadirWithKeystore(t) - gdex := runGeth(t, + gtan := runGeth(t, "--datadir", datadir, "--nat", "none", "--nodiscover", "--maxpeers", "0", "--port", "0", "--unlock", "0,2", "js", "testdata/empty.js") - gdex.Expect(` + gtan.Expect(` Unlocking account 0 | Attempt 1/3 !! Unsupported terminal, password will be echoed. Passphrase: {{.InputLine "foobar"}} Unlocking account 2 | Attempt 1/3 Passphrase: {{.InputLine "foobar"}} `) - gdex.ExpectExit() + gtan.ExpectExit() wantMessages := []string{ "Unlocked account", @@ -195,7 +195,7 @@ Passphrase: {{.InputLine "foobar"}} "=0x289d485D9771714CCe91D3393D764E1311907ACc", } for _, m := range wantMessages { - if !strings.Contains(gdex.StderrText(), m) { + if !strings.Contains(gtan.StderrText(), m) { t.Errorf("stderr text does not contain %q", m) } } @@ -203,11 +203,11 @@ Passphrase: {{.InputLine "foobar"}} func TestUnlockFlagPasswordFile(t *testing.T) { datadir := tmpDatadirWithKeystore(t) - gdex := runGeth(t, + gtan := runGeth(t, "--datadir", datadir, "--nat", "none", "--nodiscover", "--maxpeers", "0", "--port", "0", "--password", "testdata/passwords.txt", "--unlock", "0,2", "js", "testdata/empty.js") - gdex.ExpectExit() + gtan.ExpectExit() wantMessages := []string{ "Unlocked account", @@ -215,7 +215,7 @@ func TestUnlockFlagPasswordFile(t *testing.T) { "=0x289d485D9771714CCe91D3393D764E1311907ACc", } for _, m := range wantMessages { - if !strings.Contains(gdex.StderrText(), m) { + if !strings.Contains(gtan.StderrText(), m) { t.Errorf("stderr text does not contain %q", m) } } @@ -223,29 +223,29 @@ func TestUnlockFlagPasswordFile(t *testing.T) { func TestUnlockFlagPasswordFileWrongPassword(t *testing.T) { datadir := tmpDatadirWithKeystore(t) - gdex := runGeth(t, + gtan := runGeth(t, "--datadir", datadir, "--nat", "none", "--nodiscover", "--maxpeers", "0", "--port", "0", "--password", "testdata/wrong-passwords.txt", "--unlock", "0,2") - defer gdex.ExpectExit() - gdex.Expect(` + defer gtan.ExpectExit() + gtan.Expect(` Fatal: Failed to unlock account 0 (could not decrypt key with given passphrase) `) } func TestUnlockFlagAmbiguous(t *testing.T) { store := filepath.Join("..", "..", "accounts", "keystore", "testdata", "dupes") - gdex := runGeth(t, + gtan := runGeth(t, "--keystore", store, "--nat", "none", "--nodiscover", "--maxpeers", "0", "--port", "0", "--unlock", "f466859ead1932d743d622cb74fc058882e8648a", "js", "testdata/empty.js") - defer gdex.ExpectExit() + defer gtan.ExpectExit() // Helper for the expect template, returns absolute keystore path. - gdex.SetTemplateFunc("keypath", func(file string) string { + gtan.SetTemplateFunc("keypath", func(file string) string { abs, _ := filepath.Abs(filepath.Join(store, file)) return abs }) - gdex.Expect(` + gtan.Expect(` Unlocking account f466859ead1932d743d622cb74fc058882e8648a | Attempt 1/3 !! Unsupported terminal, password will be echoed. Passphrase: {{.InputLine "foobar"}} @@ -257,14 +257,14 @@ Your passphrase unlocked keystore://{{keypath "1"}} In order to avoid this warning, you need to remove the following duplicate key files: keystore://{{keypath "2"}} `) - gdex.ExpectExit() + gtan.ExpectExit() wantMessages := []string{ "Unlocked account", "=0xf466859eAD1932D743d622CB74FC058882E8648A", } for _, m := range wantMessages { - if !strings.Contains(gdex.StderrText(), m) { + if !strings.Contains(gtan.StderrText(), m) { t.Errorf("stderr text does not contain %q", m) } } @@ -272,17 +272,17 @@ In order to avoid this warning, you need to remove the following duplicate key f func TestUnlockFlagAmbiguousWrongPassword(t *testing.T) { store := filepath.Join("..", "..", "accounts", "keystore", "testdata", "dupes") - gdex := runGeth(t, + gtan := runGeth(t, "--keystore", store, "--nat", "none", "--nodiscover", "--maxpeers", "0", "--port", "0", "--unlock", "f466859ead1932d743d622cb74fc058882e8648a") - defer gdex.ExpectExit() + defer gtan.ExpectExit() // Helper for the expect template, returns absolute keystore path. - gdex.SetTemplateFunc("keypath", func(file string) string { + gtan.SetTemplateFunc("keypath", func(file string) string { abs, _ := filepath.Abs(filepath.Join(store, file)) return abs }) - gdex.Expect(` + gtan.Expect(` Unlocking account f466859ead1932d743d622cb74fc058882e8648a | Attempt 1/3 !! Unsupported terminal, password will be echoed. Passphrase: {{.InputLine "wrong"}} @@ -292,5 +292,5 @@ Multiple key files exist for address f466859ead1932d743d622cb74fc058882e8648a: Testing your passphrase against all of them... Fatal: None of the listed files could be unlocked. `) - gdex.ExpectExit() + gtan.ExpectExit() } diff --git a/cmd/gdex/bugcmd.go b/cmd/gtan/bugcmd.go index 00c2f17e7..214a47de4 100644 --- a/cmd/gdex/bugcmd.go +++ b/cmd/gtan/bugcmd.go @@ -26,22 +26,22 @@ import ( "runtime" "strings" - "github.com/dexon-foundation/dexon/cmd/internal/browser" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/cmd/internal/browser" + "github.com/tangerine-network/go-tangerine/params" - "github.com/dexon-foundation/dexon/cmd/utils" + "github.com/tangerine-network/go-tangerine/cmd/utils" cli "gopkg.in/urfave/cli.v1" ) var bugCommand = cli.Command{ Action: utils.MigrateFlags(reportBug), Name: "bug", - Usage: "opens a window to report a bug on the gdex repo", + Usage: "opens a window to report a bug on the gtan repo", ArgsUsage: " ", Category: "MISCELLANEOUS COMMANDS", } -const issueURL = "https://github.com/dexon-foundation/dexon/issues/new" +const issueURL = "https://github.com/tangerine-network/go-tangerine/issues/new" // reportBug reports a bug by opening a new URL to the go-ethereum GH issue // tracker and setting default values as the issue body. diff --git a/cmd/gdex/chaincmd.go b/cmd/gtan/chaincmd.go index 470bb791a..a84fc9d94 100644 --- a/cmd/gdex/chaincmd.go +++ b/cmd/gtan/chaincmd.go @@ -25,18 +25,18 @@ import ( "sync/atomic" "time" - "github.com/dexon-foundation/dexon/cmd/utils" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/console" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/state" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/eth/downloader" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/event" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/trie" "github.com/syndtr/goleveldb/leveldb/util" + "github.com/tangerine-network/go-tangerine/cmd/utils" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/console" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/state" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/eth/downloader" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/event" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/trie" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/gdex/config.go b/cmd/gtan/config.go index 71024c40e..d748cda94 100644 --- a/cmd/gdex/config.go +++ b/cmd/gtan/config.go @@ -26,13 +26,13 @@ import ( cli "gopkg.in/urfave/cli.v1" - "github.com/dexon-foundation/dexon/cmd/utils" - "github.com/dexon-foundation/dexon/dashboard" - "github.com/dexon-foundation/dexon/dex" - "github.com/dexon-foundation/dexon/node" - "github.com/dexon-foundation/dexon/params" - whisper "github.com/dexon-foundation/dexon/whisper/whisperv6" "github.com/naoina/toml" + "github.com/tangerine-network/go-tangerine/cmd/utils" + "github.com/tangerine-network/go-tangerine/dashboard" + "github.com/tangerine-network/go-tangerine/dex" + "github.com/tangerine-network/go-tangerine/node" + "github.com/tangerine-network/go-tangerine/params" + whisper "github.com/tangerine-network/go-tangerine/whisper/whisperv6" ) var ( @@ -102,7 +102,7 @@ func defaultNodeConfig() node.Config { cfg.Version = params.VersionWithCommit(gitCommit) cfg.HTTPModules = append(cfg.HTTPModules, "eth", "shh") cfg.WSModules = append(cfg.WSModules, "eth", "shh") - cfg.IPCPath = "gdex.ipc" + cfg.IPCPath = "gtan.ipc" return cfg } diff --git a/cmd/gdex/consolecmd.go b/cmd/gtan/consolecmd.go index bc447fefd..750570094 100644 --- a/cmd/gdex/consolecmd.go +++ b/cmd/gtan/consolecmd.go @@ -24,10 +24,10 @@ import ( "strings" "syscall" - "github.com/dexon-foundation/dexon/cmd/utils" - "github.com/dexon-foundation/dexon/console" - "github.com/dexon-foundation/dexon/node" - "github.com/dexon-foundation/dexon/rpc" + "github.com/tangerine-network/go-tangerine/cmd/utils" + "github.com/tangerine-network/go-tangerine/console" + "github.com/tangerine-network/go-tangerine/node" + "github.com/tangerine-network/go-tangerine/rpc" "gopkg.in/urfave/cli.v1" ) @@ -43,7 +43,7 @@ var ( Description: ` The Geth console is an interactive shell for the JavaScript runtime environment which exposes a node admin interface as well as the Ðapp JavaScript API. -See https://github.com/dexon-foundation/dexon/wiki/JavaScript-Console.`, +See https://github.com/tangerine-network/go-tangerine/wiki/JavaScript-Console.`, } attachCommand = cli.Command{ @@ -56,8 +56,8 @@ See https://github.com/dexon-foundation/dexon/wiki/JavaScript-Console.`, Description: ` The Geth console is an interactive shell for the JavaScript runtime environment which exposes a node admin interface as well as the Ðapp JavaScript API. -See https://github.com/dexon-foundation/dexon/wiki/JavaScript-Console. -This command allows to open a console on a running gdex node.`, +See https://github.com/tangerine-network/go-tangerine/wiki/JavaScript-Console. +This command allows to open a console on a running gtan node.`, } javascriptCommand = cli.Command{ @@ -69,11 +69,11 @@ This command allows to open a console on a running gdex node.`, Category: "CONSOLE COMMANDS", Description: ` The JavaScript VM exposes a node admin interface as well as the Ðapp -JavaScript API. See https://github.com/dexon-foundation/dexon/wiki/JavaScript-Console`, +JavaScript API. See https://github.com/tangerine-network/go-tangerine/wiki/JavaScript-Console`, } ) -// localConsole starts a new gdex node, attaching a JavaScript console to it at the +// localConsole starts a new gtan node, attaching a JavaScript console to it at the // same time. func localConsole(ctx *cli.Context) error { // Create and start the node based on the CLI flags @@ -84,7 +84,7 @@ func localConsole(ctx *cli.Context) error { // Attach to the newly started node and start the JavaScript console client, err := node.Attach() if err != nil { - utils.Fatalf("Failed to attach to the inproc gdex: %v", err) + utils.Fatalf("Failed to attach to the inproc gtan: %v", err) } config := console.Config{ DataDir: utils.MakeDataDir(ctx), @@ -111,10 +111,10 @@ func localConsole(ctx *cli.Context) error { return nil } -// remoteConsole will connect to a remote gdex instance, attaching a JavaScript +// remoteConsole will connect to a remote gtan instance, attaching a JavaScript // console to it. func remoteConsole(ctx *cli.Context) error { - // Attach to a remotely running gdex instance and start the JavaScript console + // Attach to a remotely running gtan instance and start the JavaScript console endpoint := ctx.Args().First() if endpoint == "" { path := node.DefaultDataDir() @@ -130,11 +130,11 @@ func remoteConsole(ctx *cli.Context) error { path = filepath.Join(path, "yilan") } } - endpoint = fmt.Sprintf("%s/gdex.ipc", path) + endpoint = fmt.Sprintf("%s/gtan.ipc", path) } client, err := dialRPC(endpoint) if err != nil { - utils.Fatalf("Unable to attach to remote gdex: %v", err) + utils.Fatalf("Unable to attach to remote gtan: %v", err) } config := console.Config{ DataDir: utils.MakeDataDir(ctx), @@ -163,19 +163,19 @@ func remoteConsole(ctx *cli.Context) error { // dialRPC returns a RPC client which connects to the given endpoint. // The check for empty endpoint implements the defaulting logic -// for "gdex attach" and "gdex monitor" with no argument. +// for "gtan attach" and "gtan monitor" with no argument. func dialRPC(endpoint string) (*rpc.Client, error) { if endpoint == "" { endpoint = node.DefaultIPCEndpoint(clientIdentifier) } else if strings.HasPrefix(endpoint, "rpc:") || strings.HasPrefix(endpoint, "ipc:") { - // Backwards compatibility with gdex < 1.5 which required + // Backwards compatibility with gtan < 1.5 which required // these prefixes. endpoint = endpoint[4:] } return rpc.Dial(endpoint) } -// ephemeralConsole starts a new gdex node, attaches an ephemeral JavaScript +// ephemeralConsole starts a new gtan node, attaches an ephemeral JavaScript // console to it, executes each of the files specified as arguments and tears // everything down. func ephemeralConsole(ctx *cli.Context) error { @@ -187,7 +187,7 @@ func ephemeralConsole(ctx *cli.Context) error { // Attach to the newly started node and start the JavaScript console client, err := node.Attach() if err != nil { - utils.Fatalf("Failed to attach to the inproc gdex: %v", err) + utils.Fatalf("Failed to attach to the inproc gtan: %v", err) } config := console.Config{ DataDir: utils.MakeDataDir(ctx), diff --git a/cmd/gdex/consolecmd_test.go b/cmd/gtan/consolecmd_test.go index c1174f9e6..4cbb1c00d 100644 --- a/cmd/gdex/consolecmd_test.go +++ b/cmd/gtan/consolecmd_test.go @@ -27,7 +27,7 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/params" ) const ( @@ -40,32 +40,32 @@ const ( func TestConsoleWelcome(t *testing.T) { coinbase := "0x8605cdbbdb6d264aa742e77020dcbc58fcdce182" - // Start a gdex console, make sure it's cleaned up and terminate the console - gdex := runGeth(t, + // Start a gtan console, make sure it's cleaned up and terminate the console + gtan := runGeth(t, "--port", "0", "--maxpeers", "0", "--nodiscover", "--nat", "none", "--etherbase", coinbase, "--shh", "console") // Gather all the infos the welcome message needs to contain - gdex.SetTemplateFunc("goos", func() string { return runtime.GOOS }) - gdex.SetTemplateFunc("goarch", func() string { return runtime.GOARCH }) - gdex.SetTemplateFunc("gover", runtime.Version) - gdex.SetTemplateFunc("gethver", func() string { return params.VersionWithMeta }) - gdex.SetTemplateFunc("dextime", func() string { return time.Unix(int64(params.MainnetChainConfig.DMoment), 0).Format(time.RFC1123) }) - gdex.SetTemplateFunc("apis", func() string { return ipcAPIs }) + gtan.SetTemplateFunc("goos", func() string { return runtime.GOOS }) + gtan.SetTemplateFunc("goarch", func() string { return runtime.GOARCH }) + gtan.SetTemplateFunc("gover", runtime.Version) + gtan.SetTemplateFunc("gethver", func() string { return params.VersionWithMeta }) + gtan.SetTemplateFunc("dextime", func() string { return time.Unix(int64(params.MainnetChainConfig.DMoment), 0).Format(time.RFC1123) }) + gtan.SetTemplateFunc("apis", func() string { return ipcAPIs }) // Verify the actual welcome message to the required template - gdex.Expect(` + gtan.Expect(` Welcome to the Geth JavaScript console! -instance: gdex/v{{gethver}}/{{goos}}-{{goarch}}/{{gover}} +instance: gtan/v{{gethver}}/{{goos}}-{{goarch}}/{{gover}} at block: 0 ({{dextime}}) datadir: {{.Datadir}} modules: {{apis}} > {{.InputLine "exit"}} `) - gdex.ExpectExit() + gtan.ExpectExit() } // Tests that a console can be attached to a running node via various means. @@ -74,56 +74,56 @@ func TestIPCAttachWelcome(t *testing.T) { coinbase := "0x8605cdbbdb6d264aa742e77020dcbc58fcdce182" var ipc string if runtime.GOOS == "windows" { - ipc = `\\.\pipe\gdex` + strconv.Itoa(trulyRandInt(100000, 999999)) + ipc = `\\.\pipe\gtan` + strconv.Itoa(trulyRandInt(100000, 999999)) } else { ws := tmpdir(t) defer os.RemoveAll(ws) - ipc = filepath.Join(ws, "gdex.ipc") + ipc = filepath.Join(ws, "gtan.ipc") } // Note: we need --shh because testAttachWelcome checks for default // list of ipc modules and shh is included there. - gdex := runGeth(t, + gtan := runGeth(t, "--port", "0", "--maxpeers", "0", "--nodiscover", "--nat", "none", "--etherbase", coinbase, "--shh", "--ipcpath", ipc) time.Sleep(2 * time.Second) // Simple way to wait for the RPC endpoint to open - testAttachWelcome(t, gdex, "ipc:"+ipc, ipcAPIs) + testAttachWelcome(t, gtan, "ipc:"+ipc, ipcAPIs) - gdex.Interrupt() - gdex.ExpectExit() + gtan.Interrupt() + gtan.ExpectExit() } func TestHTTPAttachWelcome(t *testing.T) { coinbase := "0x8605cdbbdb6d264aa742e77020dcbc58fcdce182" port := strconv.Itoa(trulyRandInt(1024, 65536)) // Yeah, sometimes this will fail, sorry :P - gdex := runGeth(t, + gtan := runGeth(t, "--port", "0", "--maxpeers", "0", "--nodiscover", "--nat", "none", "--etherbase", coinbase, "--rpc", "--rpcport", port) time.Sleep(2 * time.Second) // Simple way to wait for the RPC endpoint to open - testAttachWelcome(t, gdex, "http://localhost:"+port, httpAPIs) + testAttachWelcome(t, gtan, "http://localhost:"+port, httpAPIs) - gdex.Interrupt() - gdex.ExpectExit() + gtan.Interrupt() + gtan.ExpectExit() } func TestWSAttachWelcome(t *testing.T) { coinbase := "0x8605cdbbdb6d264aa742e77020dcbc58fcdce182" port := strconv.Itoa(trulyRandInt(1024, 65536)) // Yeah, sometimes this will fail, sorry :P - gdex := runGeth(t, + gtan := runGeth(t, "--port", "0", "--maxpeers", "0", "--nodiscover", "--nat", "none", "--etherbase", coinbase, "--ws", "--wsport", port) time.Sleep(2 * time.Second) // Simple way to wait for the RPC endpoint to open - testAttachWelcome(t, gdex, "ws://localhost:"+port, httpAPIs) + testAttachWelcome(t, gtan, "ws://localhost:"+port, httpAPIs) - gdex.Interrupt() - gdex.ExpectExit() + gtan.Interrupt() + gtan.ExpectExit() } -func testAttachWelcome(t *testing.T, gdex *testgdex, endpoint, apis string) { - // Attach to a running gdex note and terminate immediately +func testAttachWelcome(t *testing.T, gtan *testgtan, endpoint, apis string) { + // Attach to a running gtan note and terminate immediately attach := runGeth(t, "attach", endpoint) defer attach.ExpectExit() attach.CloseStdin() @@ -133,17 +133,17 @@ func testAttachWelcome(t *testing.T, gdex *testgdex, endpoint, apis string) { attach.SetTemplateFunc("goarch", func() string { return runtime.GOARCH }) attach.SetTemplateFunc("gover", runtime.Version) attach.SetTemplateFunc("gethver", func() string { return params.VersionWithMeta }) - attach.SetTemplateFunc("etherbase", func() string { return gdex.Etherbase }) + attach.SetTemplateFunc("etherbase", func() string { return gtan.Etherbase }) attach.SetTemplateFunc("dextime", func() string { return time.Unix(int64(params.MainnetChainConfig.DMoment), 0).Format(time.RFC1123) }) attach.SetTemplateFunc("ipc", func() bool { return strings.HasPrefix(endpoint, "ipc") }) - attach.SetTemplateFunc("datadir", func() string { return gdex.Datadir }) + attach.SetTemplateFunc("datadir", func() string { return gtan.Datadir }) attach.SetTemplateFunc("apis", func() string { return apis }) // Verify the actual welcome message to the required template attach.Expect(` Welcome to the Geth JavaScript console! -instance: gdex/v{{gethver}}/{{goos}}-{{goarch}}/{{gover}} +instance: gtan/v{{gethver}}/{{goos}}-{{goarch}}/{{gover}} at block: 0 ({{dextime}}){{if ipc}} datadir: {{datadir}}{{end}} modules: {{apis}} diff --git a/cmd/gdex/dao_test.go b/cmd/gtan/dao_test.go index 1e8cfc487..ba62a91de 100644 --- a/cmd/gdex/dao_test.go +++ b/cmd/gtan/dao_test.go @@ -23,10 +23,10 @@ import ( "path/filepath" "testing" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/rawdb" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/rawdb" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/params" ) // Genesis block for nodes which don't care about the DAO fork (i.e. not configured) @@ -116,11 +116,11 @@ func testDAOForkBlockNewChain(t *testing.T, test int, genesis string, expectBloc } else { // Force chain initialization args := []string{"--port", "0", "--maxpeers", "0", "--nodiscover", "--nat", "none", "--ipcdisable", "--datadir", datadir} - gdex := runGeth(t, append(args, []string{"--exec", "2+2", "console"}...)...) - gdex.WaitExit() + gtan := runGeth(t, append(args, []string{"--exec", "2+2", "console"}...)...) + gtan.WaitExit() } // Retrieve the DAO config flag from the database - path := filepath.Join(datadir, "gdex", "chaindata") + path := filepath.Join(datadir, "gtan", "chaindata") db, err := ethdb.NewLDBDatabase(path, 0, 0) if err != nil { t.Fatalf("test %d: failed to open test database: %v", test, err) diff --git a/cmd/gdex/genesis_test.go b/cmd/gtan/genesis_test.go index 9187a68bf..8056559b5 100644 --- a/cmd/gdex/genesis_test.go +++ b/cmd/gtan/genesis_test.go @@ -107,11 +107,11 @@ func TestCustomGenesis(t *testing.T) { runGeth(t, "--datadir", datadir, "init", json).WaitExit() // Query the custom genesis block - gdex := runGeth(t, + gtan := runGeth(t, "--datadir", datadir, "--maxpeers", "0", "--port", "0", "--nodiscover", "--nat", "none", "--ipcdisable", "--exec", tt.query, "console") - gdex.ExpectRegexp(tt.result) - gdex.ExpectExit() + gtan.ExpectRegexp(tt.result) + gtan.ExpectExit() } } diff --git a/cmd/gdex/main.go b/cmd/gtan/main.go index 3c9e598a5..311c81187 100644 --- a/cmd/gdex/main.go +++ b/cmd/gtan/main.go @@ -14,7 +14,7 @@ // You should have received a copy of the GNU General Public License // along with go-ethereum. If not, see <http://www.gnu.org/licenses/>. -// gdex is the official command-line client for Ethereum. +// gtan is the official command-line client for Ethereum. package main import ( @@ -27,23 +27,23 @@ import ( "strings" "time" - "github.com/dexon-foundation/dexon/accounts" - "github.com/dexon-foundation/dexon/accounts/keystore" - "github.com/dexon-foundation/dexon/cmd/utils" - "github.com/dexon-foundation/dexon/console" - "github.com/dexon-foundation/dexon/dex" - "github.com/dexon-foundation/dexon/eth" - "github.com/dexon-foundation/dexon/ethclient" - "github.com/dexon-foundation/dexon/internal/debug" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/metrics" - "github.com/dexon-foundation/dexon/node" "github.com/elastic/gosigar" + "github.com/tangerine-network/go-tangerine/accounts" + "github.com/tangerine-network/go-tangerine/accounts/keystore" + "github.com/tangerine-network/go-tangerine/cmd/utils" + "github.com/tangerine-network/go-tangerine/console" + "github.com/tangerine-network/go-tangerine/dex" + "github.com/tangerine-network/go-tangerine/eth" + "github.com/tangerine-network/go-tangerine/ethclient" + "github.com/tangerine-network/go-tangerine/internal/debug" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/metrics" + "github.com/tangerine-network/go-tangerine/node" cli "gopkg.in/urfave/cli.v1" ) const ( - clientIdentifier = "gdex" // Client identifier to advertise over the network + clientIdentifier = "gtan" // Client identifier to advertise over the network ) var ( @@ -178,7 +178,7 @@ var ( func init() { // Initialize the CLI app and start Geth - app.Action = gdex + app.Action = gtan app.HideVersion = true // we have a command to print the version app.Copyright = "Copyright 2013-2018 The go-ethereum Authors" app.Commands = []cli.Command{ @@ -265,10 +265,10 @@ func main() { } } -// gdex is the main entry point into the system if no special subcommand is ran. +// gtan is the main entry point into the system if no special subcommand is ran. // It creates a default node based on the command line arguments and runs it in // blocking mode, waiting for it to be shut down. -func gdex(ctx *cli.Context) error { +func gtan(ctx *cli.Context) error { if args := ctx.Args(); len(args) > 0 { return fmt.Errorf("invalid command: %q", args[0]) } @@ -368,9 +368,9 @@ func startNode(ctx *cli.Context, stack *node.Node) { if ctx.GlobalString(utils.SyncModeFlag.Name) == "light" { utils.Fatalf("Light clients do not support proposing") } - var dexon *dex.Dexon + var dexon *dex.Tangerine if err := stack.Service(&dexon); err != nil { - utils.Fatalf("Dexon service not running: %v", err) + utils.Fatalf("Tangerine service not running: %v", err) } } } diff --git a/cmd/gdex/misccmd.go b/cmd/gtan/misccmd.go index 4109832a5..c5190555a 100644 --- a/cmd/gdex/misccmd.go +++ b/cmd/gtan/misccmd.go @@ -23,10 +23,10 @@ import ( "strconv" "strings" - "github.com/dexon-foundation/dexon/cmd/utils" - "github.com/dexon-foundation/dexon/consensus/ethash" - "github.com/dexon-foundation/dexon/dex" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/cmd/utils" + "github.com/tangerine-network/go-tangerine/consensus/ethash" + "github.com/tangerine-network/go-tangerine/dex" + "github.com/tangerine-network/go-tangerine/params" "gopkg.in/urfave/cli.v1" ) @@ -80,7 +80,7 @@ The output of this command is supposed to be machine-readable. func makecache(ctx *cli.Context) error { args := ctx.Args() if len(args) != 2 { - utils.Fatalf(`Usage: gdex makecache <block number> <outputdir>`) + utils.Fatalf(`Usage: gtan makecache <block number> <outputdir>`) } block, err := strconv.ParseUint(args[0], 0, 64) if err != nil { @@ -95,7 +95,7 @@ func makecache(ctx *cli.Context) error { func makedag(ctx *cli.Context) error { args := ctx.Args() if len(args) != 2 { - utils.Fatalf(`Usage: gdex makedag <block number> <outputdir>`) + utils.Fatalf(`Usage: gtan makedag <block number> <outputdir>`) } block, err := strconv.ParseUint(args[0], 0, 64) if err != nil { @@ -134,6 +134,6 @@ 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 gdex. If not, see <http://www.gnu.org/licenses/>.`) +along with gtan. If not, see <http://www.gnu.org/licenses/>.`) return nil } diff --git a/cmd/gdex/monitorcmd.go b/cmd/gtan/monitorcmd.go index 1038fe3a2..1ef1f7888 100644 --- a/cmd/gdex/monitorcmd.go +++ b/cmd/gtan/monitorcmd.go @@ -25,10 +25,10 @@ import ( "strings" "time" - "github.com/dexon-foundation/dexon/cmd/utils" - "github.com/dexon-foundation/dexon/node" - "github.com/dexon-foundation/dexon/rpc" "github.com/gizak/termui" + "github.com/tangerine-network/go-tangerine/cmd/utils" + "github.com/tangerine-network/go-tangerine/node" + "github.com/tangerine-network/go-tangerine/rpc" "gopkg.in/urfave/cli.v1" ) @@ -76,7 +76,7 @@ func monitor(ctx *cli.Context) error { // Attach to an Ethereum node over IPC or RPC endpoint := ctx.String(monitorCommandAttachFlag.Name) if client, err = dialRPC(endpoint); err != nil { - utils.Fatalf("Unable to attach to gdex node: %v", err) + utils.Fatalf("Unable to attach to gtan node: %v", err) } defer client.Close() @@ -93,7 +93,7 @@ func monitor(ctx *cli.Context) error { if len(list) > 0 { utils.Fatalf("No metrics specified.\n\nAvailable:\n - %s", strings.Join(list, "\n - ")) } else { - utils.Fatalf("No metrics collected by gdex (--%s).\n", utils.MetricsEnabledFlag.Name) + utils.Fatalf("No metrics collected by gtan (--%s).\n", utils.MetricsEnabledFlag.Name) } } sort.Strings(monitored) @@ -158,7 +158,7 @@ func monitor(ctx *cli.Context) error { return nil } -// retrieveMetrics contacts the attached gdex node and retrieves the entire set +// retrieveMetrics contacts the attached gtan node and retrieves the entire set // of collected system metrics. func retrieveMetrics(client *rpc.Client) (map[string]interface{}, error) { var metrics map[string]interface{} diff --git a/cmd/gdex/run_test.go b/cmd/gtan/run_test.go index a53a914d2..513b9b293 100644 --- a/cmd/gdex/run_test.go +++ b/cmd/gtan/run_test.go @@ -22,19 +22,19 @@ import ( "os" "testing" - "github.com/dexon-foundation/dexon/internal/cmdtest" "github.com/docker/docker/pkg/reexec" + "github.com/tangerine-network/go-tangerine/internal/cmdtest" ) func tmpdir(t *testing.T) string { - dir, err := ioutil.TempDir("", "gdex-test") + dir, err := ioutil.TempDir("", "gtan-test") if err != nil { t.Fatal(err) } return dir } -type testgdex struct { +type testgtan struct { *cmdtest.TestCmd // template variables for expect @@ -43,8 +43,8 @@ type testgdex struct { } func init() { - // Run the app if we've been exec'd as "gdex-test" in runGeth. - reexec.Register("gdex-test", func() { + // Run the app if we've been exec'd as "gtan-test" in runGeth. + reexec.Register("gtan-test", func() { if err := app.Run(os.Args); err != nil { fmt.Fprintln(os.Stderr, err) os.Exit(1) @@ -61,10 +61,10 @@ func TestMain(m *testing.M) { os.Exit(m.Run()) } -// spawns gdex with the given command line args. If the args don't set --datadir, the +// spawns gtan with the given command line args. If the args don't set --datadir, the // child g gets a temporary data directory. -func runGeth(t *testing.T, args ...string) *testgdex { - tt := &testgdex{} +func runGeth(t *testing.T, args ...string) *testgtan { + tt := &testgtan{} tt.TestCmd = cmdtest.NewTestCmd(t, tt) for i, arg := range args { switch { @@ -90,9 +90,9 @@ func runGeth(t *testing.T, args ...string) *testgdex { }() } - // Boot "gdex". This actually runs the test binary but the TestMain + // Boot "gtan". This actually runs the test binary but the TestMain // function will prevent any tests from running. - tt.Run("gdex-test", args...) + tt.Run("gtan-test", args...) return tt } diff --git a/cmd/gdex/testdata/empty.js b/cmd/gtan/testdata/empty.js index 8b1378917..8b1378917 100644 --- a/cmd/gdex/testdata/empty.js +++ b/cmd/gtan/testdata/empty.js diff --git a/cmd/gdex/testdata/guswallet.json b/cmd/gtan/testdata/guswallet.json index e8ea4f332..e8ea4f332 100644 --- a/cmd/gdex/testdata/guswallet.json +++ b/cmd/gtan/testdata/guswallet.json diff --git a/cmd/gdex/testdata/passwords.txt b/cmd/gtan/testdata/passwords.txt index 96f98c7f4..96f98c7f4 100644 --- a/cmd/gdex/testdata/passwords.txt +++ b/cmd/gtan/testdata/passwords.txt diff --git a/cmd/gdex/testdata/wrong-passwords.txt b/cmd/gtan/testdata/wrong-passwords.txt index 7d1e338bb..7d1e338bb 100644 --- a/cmd/gdex/testdata/wrong-passwords.txt +++ b/cmd/gtan/testdata/wrong-passwords.txt diff --git a/cmd/gdex/usage.go b/cmd/gtan/usage.go index 093115b93..117aa17a8 100644 --- a/cmd/gdex/usage.go +++ b/cmd/gtan/usage.go @@ -14,7 +14,7 @@ // You should have received a copy of the GNU General Public License // along with go-ethereum. If not, see <http://www.gnu.org/licenses/>. -// Contains the gdex command usage template and generator. +// Contains the gtan command usage template and generator. package main @@ -24,8 +24,8 @@ import ( "strings" - "github.com/dexon-foundation/dexon/cmd/utils" - "github.com/dexon-foundation/dexon/internal/debug" + "github.com/tangerine-network/go-tangerine/cmd/utils" + "github.com/tangerine-network/go-tangerine/internal/debug" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/nodekey/main.go b/cmd/nodekey/main.go index 81aef039f..668ddf3b1 100644 --- a/cmd/nodekey/main.go +++ b/cmd/nodekey/main.go @@ -5,8 +5,8 @@ import ( "fmt" "os" - "github.com/dexon-foundation/dexon/cmd/utils" - "github.com/dexon-foundation/dexon/crypto" + "github.com/tangerine-network/go-tangerine/cmd/utils" + "github.com/tangerine-network/go-tangerine/crypto" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/p2psim/main.go b/cmd/p2psim/main.go index f4fdff6d5..7eba5c50c 100644 --- a/cmd/p2psim/main.go +++ b/cmd/p2psim/main.go @@ -45,12 +45,12 @@ import ( "strings" "text/tabwriter" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/simulations" - "github.com/dexon-foundation/dexon/p2p/simulations/adapters" - "github.com/dexon-foundation/dexon/rpc" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/simulations" + "github.com/tangerine-network/go-tangerine/p2p/simulations/adapters" + "github.com/tangerine-network/go-tangerine/rpc" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/puppeth/genesis.go b/cmd/puppeth/genesis.go index 9cde461b2..8cfadc841 100644 --- a/cmd/puppeth/genesis.go +++ b/cmd/puppeth/genesis.go @@ -23,12 +23,12 @@ import ( "math/big" "strings" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" - math2 "github.com/dexon-foundation/dexon/common/math" - "github.com/dexon-foundation/dexon/consensus/ethash" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" + math2 "github.com/tangerine-network/go-tangerine/common/math" + "github.com/tangerine-network/go-tangerine/consensus/ethash" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/params" ) // alethGenesisSpec represents the genesis specification format used by the diff --git a/cmd/puppeth/genesis_test.go b/cmd/puppeth/genesis_test.go index 552bf99c2..0d028c899 100644 --- a/cmd/puppeth/genesis_test.go +++ b/cmd/puppeth/genesis_test.go @@ -25,7 +25,7 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/dexon-foundation/dexon/core" + "github.com/tangerine-network/go-tangerine/core" ) // Tests the go-ethereum to Aleth chainspec conversion for the Stureby testnet. diff --git a/cmd/puppeth/module.go b/cmd/puppeth/module.go index 8a9757aa8..1009ff07a 100644 --- a/cmd/puppeth/module.go +++ b/cmd/puppeth/module.go @@ -25,7 +25,7 @@ import ( "strings" "time" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/log" ) var ( diff --git a/cmd/puppeth/module_dashboard.go b/cmd/puppeth/module_dashboard.go index 933150e53..6e508db2a 100644 --- a/cmd/puppeth/module_dashboard.go +++ b/cmd/puppeth/module_dashboard.go @@ -26,7 +26,7 @@ import ( "strconv" "strings" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/log" ) // dashboardContent is the actual dashboard HTML content to serve up when users @@ -84,7 +84,7 @@ var dashboardContent = ` {{if .FaucetPage}}<li id="faucet_menu"><a onclick="load('#faucet')"><i class="fa fa-bath"></i> Crypto Faucet</a></li>{{end}} <li id="connect_menu"><a><i class="fa fa-plug"></i> Connect Yourself</a> <ul id="connect_list" class="nav child_menu"> - <li><a onclick="$('#connect_menu').removeClass('active'); $('#connect_list').toggle(); load('#gdex')">Go Ethereum: Geth</a></li> + <li><a onclick="$('#connect_menu').removeClass('active'); $('#connect_list').toggle(); load('#gtan')">Go Ethereum: Geth</a></li> <li><a onclick="$('#connect_menu').removeClass('active'); $('#connect_list').toggle(); load('#mist')">Go Ethereum: Wallet & Mist</a></li> <li><a onclick="$('#connect_menu').removeClass('active'); $('#connect_list').toggle(); load('#mobile')">Go Ethereum: Android & iOS</a></li>{{if .Ethash}} <li><a onclick="$('#connect_menu').removeClass('active'); $('#connect_list').toggle(); load('#other')">Other Ethereum Clients</a></li>{{end}} @@ -97,7 +97,7 @@ var dashboardContent = ` </div> </div> <div class="right_col" role="main" style="padding: 0 !important"> - <div id="gdex" hidden style="padding: 16px;"> + <div id="gtan" hidden style="padding: 16px;"> <div class="page-title"> <div class="title_left"> <h3>Connect Yourself – Go Ethereum: Geth</h3> @@ -116,11 +116,11 @@ var dashboardContent = ` <p>Initial processing required to execute all transactions may require non-negligible time and disk capacity required to store all past state may be non-insignificant. High end machines with SSD storage, modern CPUs and 8GB+ RAM are recommended.</p> <br/> <p>To run an archive node, download <a href="/{{.GethGenesis}}"><code>{{.GethGenesis}}</code></a> and start Geth with: - <pre>gdex --datadir=$HOME/.{{.Network}} init {{.GethGenesis}}</pre> - <pre>gdex --networkid={{.NetworkID}} --datadir=$HOME/.{{.Network}} --cache=1024 --syncmode=full{{if .Ethstats}} --ethstats='{{.Ethstats}}'{{end}} --bootnodes={{.BootnodesFlat}}</pre> + <pre>gtan --datadir=$HOME/.{{.Network}} init {{.GethGenesis}}</pre> + <pre>gtan --networkid={{.NetworkID}} --datadir=$HOME/.{{.Network}} --cache=1024 --syncmode=full{{if .Ethstats}} --ethstats='{{.Ethstats}}'{{end}} --bootnodes={{.BootnodesFlat}}</pre> </p> <br/> - <p>You can download Geth from <a href="https://gdex.ethereum.org/downloads/" target="about:blank">https://gdex.ethereum.org/downloads/</a>.</p> + <p>You can download Geth from <a href="https://gtan.ethereum.org/downloads/" target="about:blank">https://gtan.ethereum.org/downloads/</a>.</p> </div> </div> </div> @@ -135,11 +135,11 @@ var dashboardContent = ` <p>Initial processing required to synchronize is more bandwidth intensive, but is light on the CPU and has significantly reduced disk requirements. Mid range machines with HDD storage, decent CPUs and 4GB+ RAM should be enough.</p> <br/> <p>To run a full node, download <a href="/{{.GethGenesis}}"><code>{{.GethGenesis}}</code></a> and start Geth with: - <pre>gdex --datadir=$HOME/.{{.Network}} init {{.GethGenesis}}</pre> - <pre>gdex --networkid={{.NetworkID}} --datadir=$HOME/.{{.Network}} --cache=512{{if .Ethstats}} --ethstats='{{.Ethstats}}'{{end}} --bootnodes={{.BootnodesFlat}}</pre> + <pre>gtan --datadir=$HOME/.{{.Network}} init {{.GethGenesis}}</pre> + <pre>gtan --networkid={{.NetworkID}} --datadir=$HOME/.{{.Network}} --cache=512{{if .Ethstats}} --ethstats='{{.Ethstats}}'{{end}} --bootnodes={{.BootnodesFlat}}</pre> </p> <br/> - <p>You can download Geth from <a href="https://gdex.ethereum.org/downloads/" target="about:blank">https://gdex.ethereum.org/downloads/</a>.</p> + <p>You can download Geth from <a href="https://gtan.ethereum.org/downloads/" target="about:blank">https://gtan.ethereum.org/downloads/</a>.</p> </div> </div> </div> @@ -157,11 +157,11 @@ var dashboardContent = ` <p>Initial processing required to synchronize is light, as it only verifies the validity of the headers; similarly required disk capacity is small, tallying around 500 bytes per header. Low end machines with arbitrary storage, weak CPUs and 512MB+ RAM should cope well.</p> <br/> <p>To run a light node, download <a href="/{{.GethGenesis}}"><code>{{.GethGenesis}}</code></a> and start Geth with: - <pre>gdex --datadir=$HOME/.{{.Network}} init {{.GethGenesis}}</pre> - <pre>gdex --networkid={{.NetworkID}} --datadir=$HOME/.{{.Network}} --syncmode=light{{if .Ethstats}} --ethstats='{{.Ethstats}}'{{end}} --bootnodes={{.BootnodesFlat}}</pre> + <pre>gtan --datadir=$HOME/.{{.Network}} init {{.GethGenesis}}</pre> + <pre>gtan --networkid={{.NetworkID}} --datadir=$HOME/.{{.Network}} --syncmode=light{{if .Ethstats}} --ethstats='{{.Ethstats}}'{{end}} --bootnodes={{.BootnodesFlat}}</pre> </p> <br/> - <p>You can download Geth from <a href="https://gdex.ethereum.org/downloads/" target="about:blank">https://gdex.ethereum.org/downloads/</a>.</p> + <p>You can download Geth from <a href="https://gtan.ethereum.org/downloads/" target="about:blank">https://gtan.ethereum.org/downloads/</a>.</p> </div> </div> </div> @@ -176,11 +176,11 @@ var dashboardContent = ` <p>Initial processing required to synchronize is light, as it only verifies the validity of the headers; similarly required disk capacity is small, tallying around 500 bytes per header. Embedded machines with arbitrary storage, low power CPUs and 128MB+ RAM may work.</p> <br/> <p>To run an embedded node, download <a href="/{{.GethGenesis}}"><code>{{.GethGenesis}}</code></a> and start Geth with: - <pre>gdex --datadir=$HOME/.{{.Network}} init {{.GethGenesis}}</pre> - <pre>gdex --networkid={{.NetworkID}} --datadir=$HOME/.{{.Network}} --cache=16 --ethash.cachesinmem=1 --syncmode=light{{if .Ethstats}} --ethstats='{{.Ethstats}}'{{end}} --bootnodes={{.BootnodesFlat}}</pre> + <pre>gtan --datadir=$HOME/.{{.Network}} init {{.GethGenesis}}</pre> + <pre>gtan --networkid={{.NetworkID}} --datadir=$HOME/.{{.Network}} --cache=16 --ethash.cachesinmem=1 --syncmode=light{{if .Ethstats}} --ethstats='{{.Ethstats}}'{{end}} --bootnodes={{.BootnodesFlat}}</pre> </p> <br/> - <p>You can download Geth from <a href="https://gdex.ethereum.org/downloads/" target="about:blank">https://gdex.ethereum.org/downloads/</a>.</p> + <p>You can download Geth from <a href="https://gtan.ethereum.org/downloads/" target="about:blank">https://gtan.ethereum.org/downloads/</a>.</p> </div> </div> </div> @@ -205,10 +205,10 @@ var dashboardContent = ` <p>Under the hood the wallet is backed by a go-ethereum full node, meaning that a mid range machine is assumed. Similarly, synchronization is based on <strong>fast-sync</strong>, which will download all blockchain data from the network and make it available to the wallet. Light nodes cannot currently fully back the wallet, but it's a target actively pursued.</p> <br/> <p>To connect with the Ethereum Wallet, you'll need to initialize your private network first via Geth as the wallet does not currently support calling Geth directly. To initialize your local chain, download <a href="/{{.GethGenesis}}"><code>{{.GethGenesis}}</code></a> and run: - <pre>gdex --datadir=$HOME/.{{.Network}} init {{.GethGenesis}}</pre> + <pre>gtan --datadir=$HOME/.{{.Network}} init {{.GethGenesis}}</pre> </p> <p>With your local chain initialized, you can start the Ethereum Wallet: - <pre>ethereumwallet --rpc $HOME/.{{.Network}}/gdex.ipc --node-networkid={{.NetworkID}} --node-datadir=$HOME/.{{.Network}}{{if .Ethstats}} --node-ethstats='{{.Ethstats}}'{{end}} --node-bootnodes={{.BootnodesFlat}}</pre> + <pre>ethereumwallet --rpc $HOME/.{{.Network}}/gtan.ipc --node-networkid={{.NetworkID}} --node-datadir=$HOME/.{{.Network}}{{if .Ethstats}} --node-ethstats='{{.Ethstats}}'{{end}} --node-bootnodes={{.BootnodesFlat}}</pre> <p> <br/> <p>You can download the Ethereum Wallet from <a href="https://github.com/ethereum/mist/releases" target="about:blank">https://github.com/ethereum/mist/releases</a>.</p> @@ -226,10 +226,10 @@ var dashboardContent = ` <p>Under the hood the browser is backed by a go-ethereum full node, meaning that a mid range machine is assumed. Similarly, synchronization is based on <strong>fast-sync</strong>, which will download all blockchain data from the network and make it available to the wallet. Light nodes cannot currently fully back the wallet, but it's a target actively pursued.</p> <br/> <p>To connect with the Mist browser, you'll need to initialize your private network first via Geth as Mist does not currently support calling Geth directly. To initialize your local chain, download <a href="/{{.GethGenesis}}"><code>{{.GethGenesis}}</code></a> and run: - <pre>gdex --datadir=$HOME/.{{.Network}} init {{.GethGenesis}}</pre> + <pre>gtan --datadir=$HOME/.{{.Network}} init {{.GethGenesis}}</pre> </p> <p>With your local chain initialized, you can start Mist: - <pre>mist --rpc $HOME/.{{.Network}}/gdex.ipc --node-networkid={{.NetworkID}} --node-datadir=$HOME/.{{.Network}}{{if .Ethstats}} --node-ethstats='{{.Ethstats}}'{{end}} --node-bootnodes={{.BootnodesFlat}}</pre> + <pre>mist --rpc $HOME/.{{.Network}}/gtan.ipc --node-networkid={{.NetworkID}} --node-datadir=$HOME/.{{.Network}}{{if .Ethstats}} --node-ethstats='{{.Ethstats}}'{{end}} --node-bootnodes={{.BootnodesFlat}}</pre> <p> <br/> <p>You can download the Mist browser from <a href="https://github.com/ethereum/mist/releases" target="about:blank">https://github.com/ethereum/mist/releases</a>.</p> @@ -256,10 +256,10 @@ var dashboardContent = ` <p>Starting with the 1.5 release of go-ethereum, we've transitioned away from shipping only full blown Ethereum clients and started focusing on releasing the code as reusable packages initially for Go projects, then later for Java based Android projects too. Mobile support is still evolving, hence is bound to change often and hard, but the Ethereum network can nonetheless be accessed from Android too.</p> <p>Under the hood the Android library is backed by a go-ethereum light node, meaning that given a not-too-old Android device, you should be able to join the network without significant issues. Certain functionality is not yet available and rough edges are bound to appear here and there, please report issues if you find any.</p> <br/> - <p>The stable Android archives are distributed via Maven Central, and the develop snapshots via the Sonatype repositories. Before proceeding, please ensure you have a recent version configured in your Android project. You can find details in <a href="https://github.com/dexon-foundation/dexon/wiki/Mobile:-Introduction#android-archive" target="about:blank">Mobile: Introduction – Android archive</a>. + <p>The stable Android archives are distributed via Maven Central, and the develop snapshots via the Sonatype repositories. Before proceeding, please ensure you have a recent version configured in your Android project. You can find details in <a href="https://github.com/tangerine-network/go-tangerine/wiki/Mobile:-Introduction#android-archive" target="about:blank">Mobile: Introduction – Android archive</a>. <p>Before connecting to the Ethereum network, download the <a href="/{{.GethGenesis}}"><code>{{.GethGenesis}}</code></a> genesis json file and either store it in your Android project as a resource file you can access, or save it as a string in a variable. You're going to need to to initialize your client.</p> - <p>Inside your Java code you can now import the gdex archive and connect to Ethereum: - <pre>import org.ethereum.gdex.*;</pre> + <p>Inside your Java code you can now import the gtan archive and connect to Ethereum: + <pre>import org.ethereum.gtan.*;</pre> <pre> Enodes bootnodes = new Enodes();{{range .Bootnodes}} bootnodes.append(new Enode("{{.}}"));{{end}} @@ -287,9 +287,9 @@ node.start(); <p>Starting with the 1.5 release of go-ethereum, we've transitioned away from shipping only full blown Ethereum clients and started focusing on releasing the code as reusable packages initially for Go projects, then later for ObjC/Swift based iOS projects too. Mobile support is still evolving, hence is bound to change often and hard, but the Ethereum network can nonetheless be accessed from iOS too.</p> <p>Under the hood the iOS library is backed by a go-ethereum light node, meaning that given a not-too-old Apple device, you should be able to join the network without significant issues. Certain functionality is not yet available and rough edges are bound to appear here and there, please report issues if you find any.</p> <br/> - <p>Both stable and develop builds of the iOS framework are available via CocoaPods. Before proceeding, please ensure you have a recent version configured in your iOS project. You can find details in <a href="https://github.com/dexon-foundation/dexon/wiki/Mobile:-Introduction#ios-framework" target="about:blank">Mobile: Introduction – iOS framework</a>. + <p>Both stable and develop builds of the iOS framework are available via CocoaPods. Before proceeding, please ensure you have a recent version configured in your iOS project. You can find details in <a href="https://github.com/tangerine-network/go-tangerine/wiki/Mobile:-Introduction#ios-framework" target="about:blank">Mobile: Introduction – iOS framework</a>. <p>Before connecting to the Ethereum network, download the <a href="/{{.GethGenesis}}"><code>{{.GethGenesis}}</code></a> genesis json file and either store it in your iOS project as a resource file you can access, or save it as a string in a variable. You're going to need to to initialize your client.</p> - <p>Inside your Swift code you can now import the gdex framework and connect to Ethereum (ObjC should be analogous): + <p>Inside your Swift code you can now import the gtan framework and connect to Ethereum (ObjC should be analogous): <pre>import Geth</pre> <pre> var error: NSError? @@ -419,7 +419,7 @@ try! node?.start(); <p>Puppeth is a tool to aid you in creating a new Ethereum network down to the genesis block, bootnodes, signers, ethstats server, crypto faucet, wallet browsers, block explorer, dashboard and more; without the hassle that it would normally entail to manually configure all these services one by one.</p> <p>Puppeth uses ssh to dial in to remote servers, and builds its network components out of docker containers using docker-compose. The user is guided through the process via a command line wizard that does the heavy lifting and topology configuration automatically behind the scenes.</p> <br/> - <p>Puppeth is distributed as part of the <a href="https://gdex.ethereum.org/downloads/" target="about:blank">Geth & Tools</a> bundles, but can also be installed separately via:<pre>go get github.com/dexon-foundation/dexon/cmd/puppeth</pre></p> + <p>Puppeth is distributed as part of the <a href="https://gtan.ethereum.org/downloads/" target="about:blank">Geth & Tools</a> bundles, but can also be installed separately via:<pre>go get github.com/tangerine-network/go-tangerine/cmd/puppeth</pre></p> <br/> <p><em>Copyright 2017. The go-ethereum Authors.</em></p> </div> @@ -445,7 +445,7 @@ try! node?.start(); window.location.hash = hash; // Fade out all possible pages (yes, ugly, no, don't care) - $("#gdex").fadeOut(300) + $("#gtan").fadeOut(300) $("#mist").fadeOut(300) $("#mobile").fadeOut(300) $("#other").fadeOut(300) diff --git a/cmd/puppeth/module_ethstats.go b/cmd/puppeth/module_ethstats.go index deb5b4de2..a98345372 100644 --- a/cmd/puppeth/module_ethstats.go +++ b/cmd/puppeth/module_ethstats.go @@ -25,7 +25,7 @@ import ( "strings" "text/template" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/log" ) // ethstatsDockerfile is the Dockerfile required to build an ethstats backend diff --git a/cmd/puppeth/module_explorer.go b/cmd/puppeth/module_explorer.go index 45a7dab02..e636e9640 100644 --- a/cmd/puppeth/module_explorer.go +++ b/cmd/puppeth/module_explorer.go @@ -25,7 +25,7 @@ import ( "strconv" "strings" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/log" ) // explorerDockerfile is the Dockerfile required to run a block explorer. diff --git a/cmd/puppeth/module_faucet.go b/cmd/puppeth/module_faucet.go index 500ae51da..0970112f1 100644 --- a/cmd/puppeth/module_faucet.go +++ b/cmd/puppeth/module_faucet.go @@ -26,8 +26,8 @@ import ( "strconv" "strings" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/log" ) // faucetDockerfile is the Dockerfile required to build a faucet container to diff --git a/cmd/puppeth/module_nginx.go b/cmd/puppeth/module_nginx.go index 301933342..cfbc4b8aa 100644 --- a/cmd/puppeth/module_nginx.go +++ b/cmd/puppeth/module_nginx.go @@ -24,7 +24,7 @@ import ( "path/filepath" "strconv" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/log" ) // nginxDockerfile is theis the Dockerfile required to build an nginx reverse- diff --git a/cmd/puppeth/module_node.go b/cmd/puppeth/module_node.go index 64f7e52e4..1312e1fdf 100644 --- a/cmd/puppeth/module_node.go +++ b/cmd/puppeth/module_node.go @@ -26,8 +26,8 @@ import ( "strings" "text/template" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/log" ) // nodeDockerfile is the Dockerfile required to run an Ethereum node. @@ -40,11 +40,11 @@ ADD genesis.json /genesis.json ADD signer.pass /signer.pass {{end}} RUN \ - echo 'gdex --cache 512 init /genesis.json' > gdex.sh && \{{if .Unlock}} - echo 'mkdir -p /root/.ethereum/keystore/ && cp /signer.json /root/.ethereum/keystore/' >> gdex.sh && \{{end}} - echo $'exec gdex --networkid {{.NetworkID}} --cache 512 --port {{.Port}} --nat extip:{{.IP}} --maxpeers {{.Peers}} {{.LightFlag}} --ethstats \'{{.Ethstats}}\' {{if .Bootnodes}}--bootnodes {{.Bootnodes}}{{end}} {{if .Etherbase}}--miner.etherbase {{.Etherbase}} --mine --miner.threads 1{{end}} {{if .Unlock}}--unlock 0 --password /signer.pass --mine{{end}} --miner.gastarget {{.GasTarget}} --miner.gaslimit {{.GasLimit}} --miner.gasprice {{.GasPrice}}' >> gdex.sh + echo 'gtan --cache 512 init /genesis.json' > gtan.sh && \{{if .Unlock}} + echo 'mkdir -p /root/.ethereum/keystore/ && cp /signer.json /root/.ethereum/keystore/' >> gtan.sh && \{{end}} + echo $'exec gtan --networkid {{.NetworkID}} --cache 512 --port {{.Port}} --nat extip:{{.IP}} --maxpeers {{.Peers}} {{.LightFlag}} --ethstats \'{{.Ethstats}}\' {{if .Bootnodes}}--bootnodes {{.Bootnodes}}{{end}} {{if .Etherbase}}--miner.etherbase {{.Etherbase}} --mine --miner.threads 1{{end}} {{if .Unlock}}--unlock 0 --password /signer.pass --mine{{end}} --miner.gastarget {{.GasTarget}} --miner.gaslimit {{.GasLimit}} --miner.gasprice {{.GasPrice}}' >> gtan.sh -ENTRYPOINT ["/bin/sh", "gdex.sh"] +ENTRYPOINT ["/bin/sh", "gtan.sh"] ` // nodeComposefile is the docker-compose.yml file required to deploy and maintain @@ -229,7 +229,7 @@ func checkNode(client *sshClient, network string, boot bool) (*nodeInfos, error) // Container available, retrieve its node ID and its genesis json var out []byte - if out, err = client.Run(fmt.Sprintf("docker exec %s_%s_1 gdex --exec admin.nodeInfo.id --cache=16 attach", network, kind)); err != nil { + if out, err = client.Run(fmt.Sprintf("docker exec %s_%s_1 gtan --exec admin.nodeInfo.id --cache=16 attach", network, kind)); err != nil { return nil, ErrServiceUnreachable } enode := bytes.Trim(bytes.TrimSpace(out), "\"") diff --git a/cmd/puppeth/module_wallet.go b/cmd/puppeth/module_wallet.go index 0539c19e4..8dab8e350 100644 --- a/cmd/puppeth/module_wallet.go +++ b/cmd/puppeth/module_wallet.go @@ -25,7 +25,7 @@ import ( "strconv" "strings" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/log" ) // walletDockerfile is the Dockerfile required to run a web wallet. @@ -36,8 +36,8 @@ ADD genesis.json /genesis.json RUN \ echo 'node server.js &' > wallet.sh && \ - echo 'gdex --cache 512 init /genesis.json' >> wallet.sh && \ - echo $'exec gdex --networkid {{.NetworkID}} --port {{.NodePort}} --bootnodes {{.Bootnodes}} --ethstats \'{{.Ethstats}}\' --cache=512 --rpc --rpcaddr=0.0.0.0 --rpccorsdomain "*" --rpcvhosts "*"' >> wallet.sh + echo 'gtan --cache 512 init /genesis.json' >> wallet.sh && \ + echo $'exec gtan --networkid {{.NetworkID}} --port {{.NodePort}} --bootnodes {{.Bootnodes}} --ethstats \'{{.Ethstats}}\' --cache=512 --rpc --rpcaddr=0.0.0.0 --rpccorsdomain "*" --rpcvhosts "*"' >> wallet.sh RUN \ sed -i 's/PuppethNetworkID/{{.NetworkID}}/g' dist/js/etherwallet-master.js && \ diff --git a/cmd/puppeth/puppeth.go b/cmd/puppeth/puppeth.go index efcdba8b3..cfd68163b 100644 --- a/cmd/puppeth/puppeth.go +++ b/cmd/puppeth/puppeth.go @@ -23,7 +23,7 @@ import ( "strings" "time" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/log" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/puppeth/ssh.go b/cmd/puppeth/ssh.go index b26ea0856..bf297f9ed 100644 --- a/cmd/puppeth/ssh.go +++ b/cmd/puppeth/ssh.go @@ -28,7 +28,7 @@ import ( "path/filepath" "strings" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/log" "golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh/terminal" ) diff --git a/cmd/puppeth/wizard.go b/cmd/puppeth/wizard.go index 69fa52c14..f2c834e5e 100644 --- a/cmd/puppeth/wizard.go +++ b/cmd/puppeth/wizard.go @@ -31,9 +31,9 @@ import ( "strings" "sync" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/log" "golang.org/x/crypto/ssh/terminal" ) diff --git a/cmd/puppeth/wizard_dashboard.go b/cmd/puppeth/wizard_dashboard.go index 15126ddf0..91601616e 100644 --- a/cmd/puppeth/wizard_dashboard.go +++ b/cmd/puppeth/wizard_dashboard.go @@ -19,7 +19,7 @@ package main import ( "fmt" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/log" ) // deployDashboard queries the user for various input on deploying a web-service diff --git a/cmd/puppeth/wizard_ethstats.go b/cmd/puppeth/wizard_ethstats.go index 5eb333188..9baf62b0e 100644 --- a/cmd/puppeth/wizard_ethstats.go +++ b/cmd/puppeth/wizard_ethstats.go @@ -20,7 +20,7 @@ import ( "fmt" "sort" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/log" ) // deployEthstats queries the user for various input on deploying an ethstats diff --git a/cmd/puppeth/wizard_explorer.go b/cmd/puppeth/wizard_explorer.go index 0818e9d5b..7388e57f3 100644 --- a/cmd/puppeth/wizard_explorer.go +++ b/cmd/puppeth/wizard_explorer.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/log" ) // deployExplorer creates a new block explorer based on some user input. diff --git a/cmd/puppeth/wizard_faucet.go b/cmd/puppeth/wizard_faucet.go index 0ef0eef74..00df36cf8 100644 --- a/cmd/puppeth/wizard_faucet.go +++ b/cmd/puppeth/wizard_faucet.go @@ -20,8 +20,8 @@ import ( "encoding/json" "fmt" - "github.com/dexon-foundation/dexon/accounts/keystore" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/accounts/keystore" + "github.com/tangerine-network/go-tangerine/log" ) // deployFaucet queries the user for various input on deploying a faucet, after diff --git a/cmd/puppeth/wizard_genesis.go b/cmd/puppeth/wizard_genesis.go index 9f80d1ee8..7934e2b89 100644 --- a/cmd/puppeth/wizard_genesis.go +++ b/cmd/puppeth/wizard_genesis.go @@ -29,10 +29,10 @@ import ( "path/filepath" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/params" ) // makeGenesis creates a new genesis struct based on some user input. diff --git a/cmd/puppeth/wizard_intro.go b/cmd/puppeth/wizard_intro.go index f421c97f9..fb2e807a2 100644 --- a/cmd/puppeth/wizard_intro.go +++ b/cmd/puppeth/wizard_intro.go @@ -26,7 +26,7 @@ import ( "strings" "sync" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/log" ) // makeWizard creates and returns a new puppeth wizard. diff --git a/cmd/puppeth/wizard_netstats.go b/cmd/puppeth/wizard_netstats.go index 6909070a3..a26ddffd8 100644 --- a/cmd/puppeth/wizard_netstats.go +++ b/cmd/puppeth/wizard_netstats.go @@ -23,9 +23,9 @@ import ( "strings" "sync" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/log" "github.com/olekukonko/tablewriter" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/log" ) // networkStats verifies the status of network components and generates a protip diff --git a/cmd/puppeth/wizard_network.go b/cmd/puppeth/wizard_network.go index df8fb872a..0e15a1845 100644 --- a/cmd/puppeth/wizard_network.go +++ b/cmd/puppeth/wizard_network.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/log" ) // manageServers displays a list of servers the user can disconnect from, and an diff --git a/cmd/puppeth/wizard_nginx.go b/cmd/puppeth/wizard_nginx.go index 7bf3f2336..4c1afccb4 100644 --- a/cmd/puppeth/wizard_nginx.go +++ b/cmd/puppeth/wizard_nginx.go @@ -19,7 +19,7 @@ package main import ( "fmt" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/log" ) // ensureVirtualHost checks whether a reverse-proxy is running on the specified diff --git a/cmd/puppeth/wizard_node.go b/cmd/puppeth/wizard_node.go index 0412deaf6..a904f26d5 100644 --- a/cmd/puppeth/wizard_node.go +++ b/cmd/puppeth/wizard_node.go @@ -21,9 +21,9 @@ import ( "fmt" "time" - "github.com/dexon-foundation/dexon/accounts/keystore" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/accounts/keystore" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/log" ) // deployNode creates a new node configuration based on some user input. diff --git a/cmd/puppeth/wizard_wallet.go b/cmd/puppeth/wizard_wallet.go index 6bf25cee9..0976088f0 100644 --- a/cmd/puppeth/wizard_wallet.go +++ b/cmd/puppeth/wizard_wallet.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/log" ) // deployWallet creates a new web wallet based on some user input. diff --git a/cmd/rlpdump/main.go b/cmd/rlpdump/main.go index 639fa6d45..27a922260 100644 --- a/cmd/rlpdump/main.go +++ b/cmd/rlpdump/main.go @@ -26,7 +26,7 @@ import ( "os" "strings" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/rlp" ) var ( diff --git a/cmd/swarm/access.go b/cmd/swarm/access.go index a1cefa271..5bd064bcd 100644 --- a/cmd/swarm/access.go +++ b/cmd/swarm/access.go @@ -23,9 +23,9 @@ import ( "io/ioutil" "strings" - "github.com/dexon-foundation/dexon/cmd/utils" - "github.com/dexon-foundation/dexon/swarm/api" - "github.com/dexon-foundation/dexon/swarm/api/client" + "github.com/tangerine-network/go-tangerine/cmd/utils" + "github.com/tangerine-network/go-tangerine/swarm/api" + "github.com/tangerine-network/go-tangerine/swarm/api/client" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/access_test.go b/cmd/swarm/access_test.go index 498d668cd..863404c6b 100644 --- a/cmd/swarm/access_test.go +++ b/cmd/swarm/access_test.go @@ -31,12 +31,12 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/crypto/ecies" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/swarm/api" - swarmapi "github.com/dexon-foundation/dexon/swarm/api/client" - "github.com/dexon-foundation/dexon/swarm/testutil" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/crypto/ecies" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/swarm/api" + swarmapi "github.com/tangerine-network/go-tangerine/swarm/api/client" + "github.com/tangerine-network/go-tangerine/swarm/testutil" "golang.org/x/crypto/sha3" ) diff --git a/cmd/swarm/config.go b/cmd/swarm/config.go index 39f26a7e1..966d828f6 100644 --- a/cmd/swarm/config.go +++ b/cmd/swarm/config.go @@ -29,13 +29,13 @@ import ( cli "gopkg.in/urfave/cli.v1" - "github.com/dexon-foundation/dexon/cmd/utils" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/node" "github.com/naoina/toml" + "github.com/tangerine-network/go-tangerine/cmd/utils" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/node" - bzzapi "github.com/dexon-foundation/dexon/swarm/api" + bzzapi "github.com/tangerine-network/go-tangerine/swarm/api" ) var ( @@ -97,7 +97,7 @@ var tomlSettings = toml.Config{ MissingField: func(rt reflect.Type, field string) error { link := "" if unicode.IsUpper(rune(rt.Name()[0])) && rt.PkgPath() != "main" { - link = fmt.Sprintf(", check github.com/dexon-foundation/dexon/swarm/api/config.go for available fields") + link = fmt.Sprintf(", check github.com/tangerine-network/go-tangerine/swarm/api/config.go for available fields") } return fmt.Errorf("field '%s' is not defined in %s%s", field, rt.String(), link) }, @@ -127,7 +127,7 @@ func initSwarmNode(config *bzzapi.Config, stack *node.Node, ctx *cli.Context) { //at this point, all vars should be set in the Config //get the account for the provided swarm account prvkey := getAccount(config.BzzAccount, ctx, stack) - //set the resolved config path (gdex --datadir) + //set the resolved config path (gtan --datadir) config.Path = expandPath(stack.InstanceDir()) //finally, initialize the configuration config.Init(prvkey) diff --git a/cmd/swarm/config_test.go b/cmd/swarm/config_test.go index 17abb7c78..05d48087a 100644 --- a/cmd/swarm/config_test.go +++ b/cmd/swarm/config_test.go @@ -26,11 +26,11 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/cmd/utils" - "github.com/dexon-foundation/dexon/rpc" - "github.com/dexon-foundation/dexon/swarm" - "github.com/dexon-foundation/dexon/swarm/api" "github.com/docker/docker/pkg/reexec" + "github.com/tangerine-network/go-tangerine/cmd/utils" + "github.com/tangerine-network/go-tangerine/rpc" + "github.com/tangerine-network/go-tangerine/swarm" + "github.com/tangerine-network/go-tangerine/swarm/api" ) func TestConfigDump(t *testing.T) { @@ -473,7 +473,7 @@ func TestConfigValidate(t *testing.T) { }{ { cfg: &api.Config{EnsAPIs: []string{ - "/data/testnet/gdex.ipc", + "/data/testnet/gtan.ipc", }}, }, { @@ -488,7 +488,7 @@ func TestConfigValidate(t *testing.T) { }, { cfg: &api.Config{EnsAPIs: []string{ - "test:/data/testnet/gdex.ipc", + "test:/data/testnet/gtan.ipc", }}, }, { @@ -498,7 +498,7 @@ func TestConfigValidate(t *testing.T) { }, { cfg: &api.Config{EnsAPIs: []string{ - "314159265dD8dbb310642f98f50C066173C1259b@/data/testnet/gdex.ipc", + "314159265dD8dbb310642f98f50C066173C1259b@/data/testnet/gtan.ipc", }}, }, { @@ -513,7 +513,7 @@ func TestConfigValidate(t *testing.T) { }, { cfg: &api.Config{EnsAPIs: []string{ - "test:314159265dD8dbb310642f98f50C066173C1259b@/data/testnet/gdex.ipc", + "test:314159265dD8dbb310642f98f50C066173C1259b@/data/testnet/gtan.ipc", }}, }, { @@ -546,9 +546,9 @@ func TestConfigValidate(t *testing.T) { }, { cfg: &api.Config{EnsAPIs: []string{ - "@/data/testnet/gdex.ipc", + "@/data/testnet/gtan.ipc", }}, - err: "invalid format [tld:][contract-addr@]url for ENS API endpoint configuration \"@/data/testnet/gdex.ipc\": missing contract address", + err: "invalid format [tld:][contract-addr@]url for ENS API endpoint configuration \"@/data/testnet/gtan.ipc\": missing contract address", }, } { err := validateConfig(c.cfg) diff --git a/cmd/swarm/db.go b/cmd/swarm/db.go index 6445883ad..a8bcb38e1 100644 --- a/cmd/swarm/db.go +++ b/cmd/swarm/db.go @@ -22,10 +22,10 @@ import ( "os" "path/filepath" - "github.com/dexon-foundation/dexon/cmd/utils" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/swarm/storage" + "github.com/tangerine-network/go-tangerine/cmd/utils" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/swarm/storage" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/download.go b/cmd/swarm/download.go index 63f1131d6..67bdf0eb4 100644 --- a/cmd/swarm/download.go +++ b/cmd/swarm/download.go @@ -21,10 +21,10 @@ import ( "path/filepath" "strings" - "github.com/dexon-foundation/dexon/cmd/utils" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/swarm/api" - swarm "github.com/dexon-foundation/dexon/swarm/api/client" + "github.com/tangerine-network/go-tangerine/cmd/utils" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/swarm/api" + swarm "github.com/tangerine-network/go-tangerine/swarm/api/client" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/explore.go b/cmd/swarm/explore.go index 2280cade8..dc70a3d2c 100644 --- a/cmd/swarm/explore.go +++ b/cmd/swarm/explore.go @@ -22,8 +22,8 @@ import ( "fmt" "os" - "github.com/dexon-foundation/dexon/cmd/utils" - "github.com/dexon-foundation/dexon/swarm/storage" + "github.com/tangerine-network/go-tangerine/cmd/utils" + "github.com/tangerine-network/go-tangerine/swarm/storage" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/export_test.go b/cmd/swarm/export_test.go index 21bd9d4b0..89286f51f 100644 --- a/cmd/swarm/export_test.go +++ b/cmd/swarm/export_test.go @@ -26,8 +26,8 @@ import ( "strings" "testing" - "github.com/dexon-foundation/dexon/swarm" - "github.com/dexon-foundation/dexon/swarm/testutil" + "github.com/tangerine-network/go-tangerine/swarm" + "github.com/tangerine-network/go-tangerine/swarm/testutil" ) // TestCLISwarmExportImport perform the following test: diff --git a/cmd/swarm/feeds.go b/cmd/swarm/feeds.go index 9b6f67a45..ea589b331 100644 --- a/cmd/swarm/feeds.go +++ b/cmd/swarm/feeds.go @@ -21,13 +21,13 @@ import ( "fmt" "strings" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/crypto" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/crypto" - "github.com/dexon-foundation/dexon/cmd/utils" - swarm "github.com/dexon-foundation/dexon/swarm/api/client" - "github.com/dexon-foundation/dexon/swarm/storage/feed" + "github.com/tangerine-network/go-tangerine/cmd/utils" + swarm "github.com/tangerine-network/go-tangerine/swarm/api/client" + "github.com/tangerine-network/go-tangerine/swarm/storage/feed" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/feeds_test.go b/cmd/swarm/feeds_test.go index 672cbade7..b4fdce759 100644 --- a/cmd/swarm/feeds_test.go +++ b/cmd/swarm/feeds_test.go @@ -23,15 +23,15 @@ import ( "os" "testing" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/swarm/api" - swarm "github.com/dexon-foundation/dexon/swarm/api/client" - swarmhttp "github.com/dexon-foundation/dexon/swarm/api/http" - "github.com/dexon-foundation/dexon/swarm/storage/feed" - "github.com/dexon-foundation/dexon/swarm/storage/feed/lookup" - "github.com/dexon-foundation/dexon/swarm/testutil" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/swarm/api" + swarm "github.com/tangerine-network/go-tangerine/swarm/api/client" + swarmhttp "github.com/tangerine-network/go-tangerine/swarm/api/http" + "github.com/tangerine-network/go-tangerine/swarm/storage/feed" + "github.com/tangerine-network/go-tangerine/swarm/storage/feed/lookup" + "github.com/tangerine-network/go-tangerine/swarm/testutil" ) func TestCLIFeedUpdate(t *testing.T) { diff --git a/cmd/swarm/fs.go b/cmd/swarm/fs.go index ba68ed7b7..7917cc738 100644 --- a/cmd/swarm/fs.go +++ b/cmd/swarm/fs.go @@ -23,10 +23,10 @@ import ( "strings" "time" - "github.com/dexon-foundation/dexon/cmd/utils" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/rpc" - "github.com/dexon-foundation/dexon/swarm/fuse" + "github.com/tangerine-network/go-tangerine/cmd/utils" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/rpc" + "github.com/tangerine-network/go-tangerine/swarm/fuse" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/fs_test.go b/cmd/swarm/fs_test.go index 096178ebf..8636c2b96 100644 --- a/cmd/swarm/fs_test.go +++ b/cmd/swarm/fs_test.go @@ -29,8 +29,8 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/cmd/utils" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/cmd/utils" + "github.com/tangerine-network/go-tangerine/log" ) type testFile struct { diff --git a/cmd/swarm/global-store/global_store.go b/cmd/swarm/global-store/global_store.go index 1210e0c3c..5ff1a8647 100644 --- a/cmd/swarm/global-store/global_store.go +++ b/cmd/swarm/global-store/global_store.go @@ -21,11 +21,11 @@ import ( "net/http" "os" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/rpc" - "github.com/dexon-foundation/dexon/swarm/storage/mock" - "github.com/dexon-foundation/dexon/swarm/storage/mock/db" - "github.com/dexon-foundation/dexon/swarm/storage/mock/mem" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/rpc" + "github.com/tangerine-network/go-tangerine/swarm/storage/mock" + "github.com/tangerine-network/go-tangerine/swarm/storage/mock/db" + "github.com/tangerine-network/go-tangerine/swarm/storage/mock/mem" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/global-store/global_store_test.go b/cmd/swarm/global-store/global_store_test.go index 519c44627..5690686eb 100644 --- a/cmd/swarm/global-store/global_store_test.go +++ b/cmd/swarm/global-store/global_store_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/rpc" - mockRPC "github.com/dexon-foundation/dexon/swarm/storage/mock/rpc" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/rpc" + mockRPC "github.com/tangerine-network/go-tangerine/swarm/storage/mock/rpc" ) // TestHTTP_InMemory tests in-memory global store that exposes diff --git a/cmd/swarm/global-store/main.go b/cmd/swarm/global-store/main.go index 82c6a5c3b..2926cc09a 100644 --- a/cmd/swarm/global-store/main.go +++ b/cmd/swarm/global-store/main.go @@ -19,8 +19,8 @@ package main import ( "os" - "github.com/dexon-foundation/dexon/cmd/utils" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/cmd/utils" + "github.com/tangerine-network/go-tangerine/log" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/global-store/run_test.go b/cmd/swarm/global-store/run_test.go index 095fe9e65..15f3d6bef 100644 --- a/cmd/swarm/global-store/run_test.go +++ b/cmd/swarm/global-store/run_test.go @@ -21,8 +21,8 @@ import ( "os" "testing" - "github.com/dexon-foundation/dexon/internal/cmdtest" "github.com/docker/docker/pkg/reexec" + "github.com/tangerine-network/go-tangerine/internal/cmdtest" ) func init() { diff --git a/cmd/swarm/hash.go b/cmd/swarm/hash.go index 7e7fa279e..b2f536118 100644 --- a/cmd/swarm/hash.go +++ b/cmd/swarm/hash.go @@ -22,8 +22,8 @@ import ( "fmt" "os" - "github.com/dexon-foundation/dexon/cmd/utils" - "github.com/dexon-foundation/dexon/swarm/storage" + "github.com/tangerine-network/go-tangerine/cmd/utils" + "github.com/tangerine-network/go-tangerine/swarm/storage" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/list.go b/cmd/swarm/list.go index 8ac9b7bd3..fbf93b541 100644 --- a/cmd/swarm/list.go +++ b/cmd/swarm/list.go @@ -22,8 +22,8 @@ import ( "strings" "text/tabwriter" - "github.com/dexon-foundation/dexon/cmd/utils" - swarm "github.com/dexon-foundation/dexon/swarm/api/client" + "github.com/tangerine-network/go-tangerine/cmd/utils" + swarm "github.com/tangerine-network/go-tangerine/swarm/api/client" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/main.go b/cmd/swarm/main.go index 23d0a22e1..f806242d7 100644 --- a/cmd/swarm/main.go +++ b/cmd/swarm/main.go @@ -29,24 +29,24 @@ import ( "strings" "syscall" - "github.com/dexon-foundation/dexon/accounts" - "github.com/dexon-foundation/dexon/accounts/keystore" - "github.com/dexon-foundation/dexon/cmd/utils" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/console" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/internal/debug" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/node" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/rpc" - "github.com/dexon-foundation/dexon/swarm" - bzzapi "github.com/dexon-foundation/dexon/swarm/api" - swarmmetrics "github.com/dexon-foundation/dexon/swarm/metrics" - "github.com/dexon-foundation/dexon/swarm/storage/mock" - mockrpc "github.com/dexon-foundation/dexon/swarm/storage/mock/rpc" - "github.com/dexon-foundation/dexon/swarm/tracing" - sv "github.com/dexon-foundation/dexon/swarm/version" + "github.com/tangerine-network/go-tangerine/accounts" + "github.com/tangerine-network/go-tangerine/accounts/keystore" + "github.com/tangerine-network/go-tangerine/cmd/utils" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/console" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/internal/debug" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/node" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/rpc" + "github.com/tangerine-network/go-tangerine/swarm" + bzzapi "github.com/tangerine-network/go-tangerine/swarm/api" + swarmmetrics "github.com/tangerine-network/go-tangerine/swarm/metrics" + "github.com/tangerine-network/go-tangerine/swarm/storage/mock" + mockrpc "github.com/tangerine-network/go-tangerine/swarm/storage/mock/rpc" + "github.com/tangerine-network/go-tangerine/swarm/tracing" + sv "github.com/tangerine-network/go-tangerine/swarm/version" cli "gopkg.in/urfave/cli.v1" ) @@ -91,7 +91,7 @@ var defaultSubcommandHelp = cli.Command{ var defaultNodeConfig = node.DefaultConfig -// This init function sets defaults so cmd/swarm can run alongside gdex. +// This init function sets defaults so cmd/swarm can run alongside gtan. func init() { sv.GitCommit = gitCommit defaultNodeConfig.Name = clientIdentifier @@ -275,9 +275,9 @@ func bzzd(ctx *cli.Context) error { //pss operates on ws cfg.WSModules = append(cfg.WSModules, "pss") - //gdex only supports --datadir via command line + //gtan only supports --datadir via command line //in order to be consistent within swarm, if we pass --datadir via environment variable - //or via config file, we get the same directory for gdex and swarm + //or via config file, we get the same directory for gtan and swarm if _, err := os.Stat(bzzconfig.Path); err == nil { cfg.DataDir = bzzconfig.Path } diff --git a/cmd/swarm/manifest.go b/cmd/swarm/manifest.go index ad918b813..4cda941fc 100644 --- a/cmd/swarm/manifest.go +++ b/cmd/swarm/manifest.go @@ -22,9 +22,9 @@ import ( "os" "strings" - "github.com/dexon-foundation/dexon/cmd/utils" - "github.com/dexon-foundation/dexon/swarm/api" - swarm "github.com/dexon-foundation/dexon/swarm/api/client" + "github.com/tangerine-network/go-tangerine/cmd/utils" + "github.com/tangerine-network/go-tangerine/swarm/api" + swarm "github.com/tangerine-network/go-tangerine/swarm/api/client" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/manifest_test.go b/cmd/swarm/manifest_test.go index 55a0e596d..00a152255 100644 --- a/cmd/swarm/manifest_test.go +++ b/cmd/swarm/manifest_test.go @@ -24,9 +24,9 @@ import ( "runtime" "testing" - "github.com/dexon-foundation/dexon/swarm/api" - swarm "github.com/dexon-foundation/dexon/swarm/api/client" - swarmhttp "github.com/dexon-foundation/dexon/swarm/api/http" + "github.com/tangerine-network/go-tangerine/swarm/api" + swarm "github.com/tangerine-network/go-tangerine/swarm/api/client" + swarmhttp "github.com/tangerine-network/go-tangerine/swarm/api/http" ) // TestManifestChange tests manifest add, update and remove diff --git a/cmd/swarm/mimegen/generator.go b/cmd/swarm/mimegen/generator.go index c290351cc..c7daea735 100644 --- a/cmd/swarm/mimegen/generator.go +++ b/cmd/swarm/mimegen/generator.go @@ -101,7 +101,7 @@ func main() { } } -var tpl = `// Code generated by github.com/dexon-foundation/dexon/cmd/swarm/mimegen. DO NOT EDIT. +var tpl = `// Code generated by github.com/tangerine-network/go-tangerine/cmd/swarm/mimegen. DO NOT EDIT. package {{ .PackageName }} diff --git a/cmd/swarm/run_test.go b/cmd/swarm/run_test.go index c509ae307..d160859c4 100644 --- a/cmd/swarm/run_test.go +++ b/cmd/swarm/run_test.go @@ -32,16 +32,16 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/accounts" - "github.com/dexon-foundation/dexon/accounts/keystore" - "github.com/dexon-foundation/dexon/internal/cmdtest" - "github.com/dexon-foundation/dexon/node" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/rpc" - "github.com/dexon-foundation/dexon/swarm" - "github.com/dexon-foundation/dexon/swarm/api" - swarmhttp "github.com/dexon-foundation/dexon/swarm/api/http" "github.com/docker/docker/pkg/reexec" + "github.com/tangerine-network/go-tangerine/accounts" + "github.com/tangerine-network/go-tangerine/accounts/keystore" + "github.com/tangerine-network/go-tangerine/internal/cmdtest" + "github.com/tangerine-network/go-tangerine/node" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/rpc" + "github.com/tangerine-network/go-tangerine/swarm" + "github.com/tangerine-network/go-tangerine/swarm/api" + swarmhttp "github.com/tangerine-network/go-tangerine/swarm/api/http" ) var loglevel = flag.Int("loglevel", 3, "verbosity of logs") diff --git a/cmd/swarm/swarm-smoke/feed_upload_and_sync.go b/cmd/swarm/swarm-smoke/feed_upload_and_sync.go index 66e36b71a..b6c4049b9 100644 --- a/cmd/swarm/swarm-smoke/feed_upload_and_sync.go +++ b/cmd/swarm/swarm-smoke/feed_upload_and_sync.go @@ -12,13 +12,13 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/metrics" - "github.com/dexon-foundation/dexon/swarm/storage/feed" - "github.com/dexon-foundation/dexon/swarm/testutil" "github.com/pborman/uuid" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/metrics" + "github.com/tangerine-network/go-tangerine/swarm/storage/feed" + "github.com/tangerine-network/go-tangerine/swarm/testutil" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/swarm-smoke/main.go b/cmd/swarm/swarm-smoke/main.go index 343c9c3bf..a70d08d5b 100644 --- a/cmd/swarm/swarm-smoke/main.go +++ b/cmd/swarm/swarm-smoke/main.go @@ -21,13 +21,13 @@ import ( "os" "sort" - "github.com/dexon-foundation/dexon/cmd/utils" - gethmetrics "github.com/dexon-foundation/dexon/metrics" - "github.com/dexon-foundation/dexon/metrics/influxdb" - swarmmetrics "github.com/dexon-foundation/dexon/swarm/metrics" - "github.com/dexon-foundation/dexon/swarm/tracing" + "github.com/tangerine-network/go-tangerine/cmd/utils" + gethmetrics "github.com/tangerine-network/go-tangerine/metrics" + "github.com/tangerine-network/go-tangerine/metrics/influxdb" + swarmmetrics "github.com/tangerine-network/go-tangerine/swarm/metrics" + "github.com/tangerine-network/go-tangerine/swarm/tracing" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/log" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/swarm-smoke/sliding_window.go b/cmd/swarm/swarm-smoke/sliding_window.go index 3b17952d4..a6412eb3c 100644 --- a/cmd/swarm/swarm-smoke/sliding_window.go +++ b/cmd/swarm/swarm-smoke/sliding_window.go @@ -22,10 +22,10 @@ import ( "math/rand" "time" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/metrics" - "github.com/dexon-foundation/dexon/swarm/testutil" "github.com/pborman/uuid" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/metrics" + "github.com/tangerine-network/go-tangerine/swarm/testutil" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/swarm-smoke/upload_and_sync.go b/cmd/swarm/swarm-smoke/upload_and_sync.go index 1ea9f2b67..3e41aa460 100644 --- a/cmd/swarm/swarm-smoke/upload_and_sync.go +++ b/cmd/swarm/swarm-smoke/upload_and_sync.go @@ -26,13 +26,13 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/metrics" - "github.com/dexon-foundation/dexon/rpc" - "github.com/dexon-foundation/dexon/swarm/api" - "github.com/dexon-foundation/dexon/swarm/storage" - "github.com/dexon-foundation/dexon/swarm/testutil" "github.com/pborman/uuid" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/metrics" + "github.com/tangerine-network/go-tangerine/rpc" + "github.com/tangerine-network/go-tangerine/swarm/api" + "github.com/tangerine-network/go-tangerine/swarm/storage" + "github.com/tangerine-network/go-tangerine/swarm/testutil" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/swarm-smoke/upload_speed.go b/cmd/swarm/swarm-smoke/upload_speed.go index b44374d4e..723655503 100644 --- a/cmd/swarm/swarm-smoke/upload_speed.go +++ b/cmd/swarm/swarm-smoke/upload_speed.go @@ -21,9 +21,9 @@ import ( "fmt" "time" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/metrics" - "github.com/dexon-foundation/dexon/swarm/testutil" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/metrics" + "github.com/tangerine-network/go-tangerine/swarm/testutil" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/swarm-smoke/util.go b/cmd/swarm/swarm-smoke/util.go index 588af39c7..9d9b151a9 100644 --- a/cmd/swarm/swarm-smoke/util.go +++ b/cmd/swarm/swarm-smoke/util.go @@ -32,13 +32,13 @@ import ( "strings" "time" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/metrics" - "github.com/dexon-foundation/dexon/swarm/api" - "github.com/dexon-foundation/dexon/swarm/api/client" - "github.com/dexon-foundation/dexon/swarm/spancontext" opentracing "github.com/opentracing/opentracing-go" "github.com/pborman/uuid" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/metrics" + "github.com/tangerine-network/go-tangerine/swarm/api" + "github.com/tangerine-network/go-tangerine/swarm/api/client" + "github.com/tangerine-network/go-tangerine/swarm/spancontext" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/swarm-snapshot/create.go b/cmd/swarm/swarm-snapshot/create.go index 2e4dc084d..a56672f79 100644 --- a/cmd/swarm/swarm-snapshot/create.go +++ b/cmd/swarm/swarm-snapshot/create.go @@ -29,12 +29,12 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/node" - "github.com/dexon-foundation/dexon/p2p/simulations" - "github.com/dexon-foundation/dexon/p2p/simulations/adapters" - "github.com/dexon-foundation/dexon/swarm/network" - "github.com/dexon-foundation/dexon/swarm/network/simulation" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/node" + "github.com/tangerine-network/go-tangerine/p2p/simulations" + "github.com/tangerine-network/go-tangerine/p2p/simulations/adapters" + "github.com/tangerine-network/go-tangerine/swarm/network" + "github.com/tangerine-network/go-tangerine/swarm/network/simulation" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/swarm-snapshot/create_test.go b/cmd/swarm/swarm-snapshot/create_test.go index 5ade096c3..f28d4846b 100644 --- a/cmd/swarm/swarm-snapshot/create_test.go +++ b/cmd/swarm/swarm-snapshot/create_test.go @@ -27,7 +27,7 @@ import ( "strings" "testing" - "github.com/dexon-foundation/dexon/p2p/simulations" + "github.com/tangerine-network/go-tangerine/p2p/simulations" ) // TestSnapshotCreate is a high level e2e test that tests for snapshot generation. diff --git a/cmd/swarm/swarm-snapshot/main.go b/cmd/swarm/swarm-snapshot/main.go index 11e4174d0..55b834efb 100644 --- a/cmd/swarm/swarm-snapshot/main.go +++ b/cmd/swarm/swarm-snapshot/main.go @@ -19,8 +19,8 @@ package main import ( "os" - "github.com/dexon-foundation/dexon/cmd/utils" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/cmd/utils" + "github.com/tangerine-network/go-tangerine/log" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/swarm-snapshot/run_test.go b/cmd/swarm/swarm-snapshot/run_test.go index e02f06682..69e0d89a0 100644 --- a/cmd/swarm/swarm-snapshot/run_test.go +++ b/cmd/swarm/swarm-snapshot/run_test.go @@ -21,8 +21,8 @@ import ( "os" "testing" - "github.com/dexon-foundation/dexon/internal/cmdtest" "github.com/docker/docker/pkg/reexec" + "github.com/tangerine-network/go-tangerine/internal/cmdtest" ) func init() { diff --git a/cmd/swarm/upload.go b/cmd/swarm/upload.go index 8603d58f3..fd62bf2b0 100644 --- a/cmd/swarm/upload.go +++ b/cmd/swarm/upload.go @@ -29,10 +29,10 @@ import ( "strconv" "strings" - "github.com/dexon-foundation/dexon/log" - swarm "github.com/dexon-foundation/dexon/swarm/api/client" + "github.com/tangerine-network/go-tangerine/log" + swarm "github.com/tangerine-network/go-tangerine/swarm/api/client" - "github.com/dexon-foundation/dexon/cmd/utils" + "github.com/tangerine-network/go-tangerine/cmd/utils" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/upload_test.go b/cmd/swarm/upload_test.go index 6cdc53037..5ee48cc53 100644 --- a/cmd/swarm/upload_test.go +++ b/cmd/swarm/upload_test.go @@ -30,10 +30,10 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/log" - swarmapi "github.com/dexon-foundation/dexon/swarm/api/client" - "github.com/dexon-foundation/dexon/swarm/testutil" "github.com/mattn/go-colorable" + "github.com/tangerine-network/go-tangerine/log" + swarmapi "github.com/tangerine-network/go-tangerine/swarm/api/client" + "github.com/tangerine-network/go-tangerine/swarm/testutil" ) func init() { diff --git a/cmd/utils/cmd.go b/cmd/utils/cmd.go index 839d470e3..3abdcadbe 100644 --- a/cmd/utils/cmd.go +++ b/cmd/utils/cmd.go @@ -27,16 +27,16 @@ import ( "strings" "syscall" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/rawdb" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/internal/debug" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/node" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/rawdb" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/internal/debug" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/node" + "github.com/tangerine-network/go-tangerine/rlp" ) const ( diff --git a/cmd/utils/customflags.go b/cmd/utils/customflags.go index c29736c2d..d433531fa 100644 --- a/cmd/utils/customflags.go +++ b/cmd/utils/customflags.go @@ -27,7 +27,7 @@ import ( "path" "strings" - "github.com/dexon-foundation/dexon/common/math" + "github.com/tangerine-network/go-tangerine/common/math" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 6ac26d1fe..544f328b8 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -28,36 +28,36 @@ import ( "strings" "time" - "github.com/dexon-foundation/dexon/accounts" - "github.com/dexon-foundation/dexon/accounts/keystore" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/fdlimit" - "github.com/dexon-foundation/dexon/consensus" - "github.com/dexon-foundation/dexon/consensus/clique" - "github.com/dexon-foundation/dexon/consensus/ethash" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/state" - "github.com/dexon-foundation/dexon/core/vm" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/dashboard" - "github.com/dexon-foundation/dexon/dex" - "github.com/dexon-foundation/dexon/dex/downloader" - "github.com/dexon-foundation/dexon/eth" - "github.com/dexon-foundation/dexon/eth/gasprice" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/ethstats" - "github.com/dexon-foundation/dexon/les" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/metrics" - "github.com/dexon-foundation/dexon/metrics/influxdb" - "github.com/dexon-foundation/dexon/node" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/discv5" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/nat" - "github.com/dexon-foundation/dexon/p2p/netutil" - "github.com/dexon-foundation/dexon/params" - whisper "github.com/dexon-foundation/dexon/whisper/whisperv6" + "github.com/tangerine-network/go-tangerine/accounts" + "github.com/tangerine-network/go-tangerine/accounts/keystore" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/fdlimit" + "github.com/tangerine-network/go-tangerine/consensus" + "github.com/tangerine-network/go-tangerine/consensus/clique" + "github.com/tangerine-network/go-tangerine/consensus/ethash" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/state" + "github.com/tangerine-network/go-tangerine/core/vm" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/dashboard" + "github.com/tangerine-network/go-tangerine/dex" + "github.com/tangerine-network/go-tangerine/dex/downloader" + "github.com/tangerine-network/go-tangerine/eth" + "github.com/tangerine-network/go-tangerine/eth/gasprice" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/ethstats" + "github.com/tangerine-network/go-tangerine/les" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/metrics" + "github.com/tangerine-network/go-tangerine/metrics/influxdb" + "github.com/tangerine-network/go-tangerine/node" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/discv5" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/nat" + "github.com/tangerine-network/go-tangerine/p2p/netutil" + "github.com/tangerine-network/go-tangerine/params" + whisper "github.com/tangerine-network/go-tangerine/whisper/whisperv6" cli "gopkg.in/urfave/cli.v1" ) @@ -616,7 +616,7 @@ var ( MetricsInfluxDBDatabaseFlag = cli.StringFlag{ Name: "metrics.influxdb.database", Usage: "InfluxDB database name to push reported metrics to", - Value: "gdex", + Value: "gtan", } MetricsInfluxDBUsernameFlag = cli.StringFlag{ Name: "metrics.influxdb.username", @@ -902,7 +902,7 @@ func MakeAddress(ks *keystore.KeyStore, account string) (accounts.Account, error log.Warn("-------------------------------------------------------------------") log.Warn("Referring to accounts by order in the keystore folder is dangerous!") log.Warn("This functionality is deprecated and will be removed in the future!") - log.Warn("Please use explicit addresses! (can search via `gdex account list`)") + log.Warn("Please use explicit addresses! (can search via `gtan account list`)") log.Warn("-------------------------------------------------------------------") accs := ks.Accounts() @@ -1351,7 +1351,7 @@ func SetDashboardConfig(ctx *cli.Context, cfg *dashboard.Config) { cfg.Refresh = ctx.GlobalDuration(DashboardRefreshFlag.Name) } -// RegisterDexService adds an Dexon client to the stack. +// RegisterDexService adds an Tangerine client to the stack. func RegisterDexService(stack *node.Node, cfg *dex.Config) { var err error if cfg.SyncMode == downloader.LightSync { @@ -1423,7 +1423,7 @@ func SetupMetrics(ctx *cli.Context) { log.Info("Enabling metrics export to InfluxDB") - go influxdb.InfluxDBWithTags(metrics.DefaultRegistry, 10*time.Second, endpoint, database, username, password, "gdex.", tagsMap) + go influxdb.InfluxDBWithTags(metrics.DefaultRegistry, 10*time.Second, endpoint, database, username, password, "gtan.", tagsMap) } } } @@ -1545,11 +1545,11 @@ func MakeConsolePreloads(ctx *cli.Context) []string { // This is a temporary function used for migrating old command/flags to the // new format. // -// e.g. gdex account new --keystore /tmp/mykeystore --lightkdf +// e.g. gtan account new --keystore /tmp/mykeystore --lightkdf // // is equivalent after calling this method with: // -// gdex --keystore /tmp/mykeystore --lightkdf account new +// gtan --keystore /tmp/mykeystore --lightkdf account new // // This allows the use of the existing configuration functionality. // When all flags are migrated this function can be removed and the existing diff --git a/cmd/wnode/main.go b/cmd/wnode/main.go index 0cebacffd..9ee89ad0b 100644 --- a/cmd/wnode/main.go +++ b/cmd/wnode/main.go @@ -35,16 +35,16 @@ import ( "strings" "time" - "github.com/dexon-foundation/dexon/cmd/utils" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/console" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/nat" - "github.com/dexon-foundation/dexon/whisper/mailserver" - whisper "github.com/dexon-foundation/dexon/whisper/whisperv6" + "github.com/tangerine-network/go-tangerine/cmd/utils" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/console" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/nat" + "github.com/tangerine-network/go-tangerine/whisper/mailserver" + whisper "github.com/tangerine-network/go-tangerine/whisper/whisperv6" "golang.org/x/crypto/pbkdf2" ) diff --git a/cmd/zoo/client/client.go b/cmd/zoo/client/client.go index 9b65e778b..468035b5d 100644 --- a/cmd/zoo/client/client.go +++ b/cmd/zoo/client/client.go @@ -27,11 +27,11 @@ import ( "math/big" "time" - dexon "github.com/dexon-foundation/dexon" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/ethclient" + dexon "github.com/tangerine-network/go-tangerine" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/ethclient" ) type Client struct { diff --git a/cmd/zoo/main.go b/cmd/zoo/main.go index cd33d4cee..907fa37d2 100644 --- a/cmd/zoo/main.go +++ b/cmd/zoo/main.go @@ -3,8 +3,8 @@ package main import ( "flag" - "github.com/dexon-foundation/dexon/cmd/zoo/monkey" - "github.com/dexon-foundation/dexon/cmd/zoo/utils" + "github.com/tangerine-network/go-tangerine/cmd/zoo/monkey" + "github.com/tangerine-network/go-tangerine/cmd/zoo/utils" ) var key = flag.String("key", "", "private key path") diff --git a/cmd/zoo/monkey/feeder.go b/cmd/zoo/monkey/feeder.go index 99df83b98..59ecfbf0b 100644 --- a/cmd/zoo/monkey/feeder.go +++ b/cmd/zoo/monkey/feeder.go @@ -26,10 +26,10 @@ import ( "strings" "time" - "github.com/dexon-foundation/dexon/accounts/abi" - "github.com/dexon-foundation/dexon/cmd/zoo/client" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/crypto" + "github.com/tangerine-network/go-tangerine/accounts/abi" + "github.com/tangerine-network/go-tangerine/cmd/zoo/client" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/crypto" ) var bananaABI abi.ABI diff --git a/cmd/zoo/monkey/gambler.go b/cmd/zoo/monkey/gambler.go index 9c9098c42..c8539b249 100644 --- a/cmd/zoo/monkey/gambler.go +++ b/cmd/zoo/monkey/gambler.go @@ -24,8 +24,8 @@ import ( "strings" "time" - "github.com/dexon-foundation/dexon/accounts/abi" - "github.com/dexon-foundation/dexon/cmd/zoo/client" + "github.com/tangerine-network/go-tangerine/accounts/abi" + "github.com/tangerine-network/go-tangerine/cmd/zoo/client" ) var betContract = string("0x60806040523480156200001157600080fd5b5060405160208062000ee083398101806040528101908080519060200190929190505050336000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16600073ffffffffffffffffffffffffffffffffffffffff167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e060405160405180910390a36200010b8162000112640100000000026401000000009004565b50620003f5565b60006200011e62000364565b6000620001396200029f640100000000026401000000009004565b15156200014557600080fd5b606484101515620001e4576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260248152602001807f4578706563746174696f6e2073686f756c64206265206c657373207468616e2081526020017f3130302e0000000000000000000000000000000000000000000000000000000081525060400191505060405180910390fd5b836001819055506200021061271085620002f664010000000002620008c4179091906401000000009004565b925060008260006064811015156200022457fe5b602002018181525050600190505b606481101562000285576200025f8184620003386401000000000262000902179091906401000000009004565b82826064811015156200026e57fe5b602002018181525050808060010191505062000232565b8160029060646200029892919062000388565b5050505050565b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614905090565b60008060008414156200030d576000915062000331565b82840290508284828115156200031f57fe5b041415156200032d57600080fd5b8091505b5092915050565b6000806000831115156200034b57600080fd5b82848115156200035757fe5b0490508091505092915050565b610c8060405190810160405280606490602082028038833980820191505090505090565b8260648101928215620003ba579160200282015b82811115620003b95782518255916020019190600101906200039c565b5b509050620003c99190620003cd565b5090565b620003f291905b80821115620003ee576000816000905550600101620003d4565b5090565b90565b610adb80620004056000396000f3006080604052600436106100a4576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680630c60e0c3146100a9578063379607f5146100d6578063715018a6146101035780637365870b1461011a5780638da5cb5b1461013a5780638f32d59b14610191578063e1152343146101c0578063ed88c68e14610201578063f2fde38b1461020b578063fc1c39dc1461024e575b600080fd5b3480156100b557600080fd5b506100d460048036038101908080359060200190929190505050610279565b005b3480156100e257600080fd5b50610101600480360381019080803590602001909291905050506103cb565b005b34801561010f57600080fd5b506101186104be565b005b61013860048036038101908080359060200190929190505050610590565b005b34801561014657600080fd5b5061014f610803565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34801561019d57600080fd5b506101a661082c565b604051808215151515815260200191505060405180910390f35b3480156101cc57600080fd5b506101eb60048036038101908080359060200190929190505050610883565b6040518082815260200191505060405180910390f35b61020961089d565b005b34801561021757600080fd5b5061024c600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919050505061089f565b005b34801561025a57600080fd5b506102636108be565b6040518082815260200191505060405180910390f35b6000610283610a26565b600061028d61082c565b151561029857600080fd5b606484101515610336576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260248152602001807f4578706563746174696f6e2073686f756c64206265206c657373207468616e2081526020017f3130302e0000000000000000000000000000000000000000000000000000000081525060400191505060405180910390fd5b83600181905550610352612710856108c490919063ffffffff16565b9250600082600060648110151561036557fe5b602002018181525050600190505b60648110156103b35761038f818461090290919063ffffffff16565b828260648110151561039d57fe5b6020020181815250508080600101915050610373565b8160029060646103c4929190610a4a565b5050505050565b6103d361082c565b15156103de57600080fd5b3073ffffffffffffffffffffffffffffffffffffffff1631811115151561046d576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252601c8152602001807f4e6f20656e6f756768206f6620746f6b656e20746f20636c61696d2e0000000081525060200191505060405180910390fd5b610475610803565b73ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f193505050501580156104ba573d6000803e3d6000fd5b5050565b6104c661082c565b15156104d157600080fd5b600073ffffffffffffffffffffffffffffffffffffffff166000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e060405160405180910390a360008060006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550565b60008060018311151561060b576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260188152602001807f5461726765742073686f756c64206265206269676765722e000000000000000081525060200191505060405180910390fd5b6001548311151515610685576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260198152602001807f5461726765742073686f756c6420626520736d616c6c65722e0000000000000081525060200191505060405180910390fd5b612710341115156106fe576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260158152602001807f4d696e696d756d206265742069732031303030302e000000000000000000000081525060200191505060405180910390fd5b600160642f81151561070c57fe5b0601915060009050828210156107a05761075661271061074860026001870360648110151561073757fe5b0154346108c490919063ffffffff16565b61090290919063ffffffff16565b90503373ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f1935050505015801561079e573d6000803e3d6000fd5b505b3373ffffffffffffffffffffffffffffffffffffffff167f97371a3349bea11f577edf6e64350a3dfb9de665d1154c7e6d08eb0805aa043084348460405180848152602001838152602001828152602001935050505060405180910390a2505050565b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905090565b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614905090565b60028160648110151561089257fe5b016000915090505481565b565b6108a761082c565b15156108b257600080fd5b6108bb8161092c565b50565b60015481565b60008060008414156108d957600091506108fb565b82840290508284828115156108ea57fe5b041415156108f757600080fd5b8091505b5092915050565b60008060008311151561091457600080fd5b828481151561091f57fe5b0490508091505092915050565b600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff161415151561096857600080fd5b8073ffffffffffffffffffffffffffffffffffffffff166000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e060405160405180910390a3806000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050565b610c8060405190810160405280606490602082028038833980820191505090505090565b8260648101928215610a79579160200282015b82811115610a78578251825591602001919060010190610a5d565b5b509050610a869190610a8a565b5090565b610aac91905b80821115610aa8576000816000905550600101610a90565b5090565b905600a165627a7a7230582087d19571ab3ae7207fb8f6182b6b891f2414f00e1904790341a82c957044b5330029") diff --git a/cmd/zoo/monkey/monkey.go b/cmd/zoo/monkey/monkey.go index c228f1814..da32b42cc 100644 --- a/cmd/zoo/monkey/monkey.go +++ b/cmd/zoo/monkey/monkey.go @@ -29,8 +29,8 @@ import ( "os" "time" - "github.com/dexon-foundation/dexon/cmd/zoo/client" - "github.com/dexon-foundation/dexon/crypto" + "github.com/tangerine-network/go-tangerine/cmd/zoo/client" + "github.com/tangerine-network/go-tangerine/crypto" ) var config *MonkeyConfig @@ -110,7 +110,7 @@ func New(ep string, source *ecdsa.PrivateKey, num int, timeout time.Duration) *M } func (m *Monkey) Distribute() { - fmt.Println("Distributing DEX to random accounts ...") + fmt.Println("Distributing coins to random accounts ...") address := crypto.PubkeyToAddress(m.source.PublicKey) nonce, err := m.PendingNonceAt(context.Background(), address) if err != nil { diff --git a/cmd/zoo/utils/shutdown.go b/cmd/zoo/utils/shutdown.go index 288f664f6..932dbac1f 100644 --- a/cmd/zoo/utils/shutdown.go +++ b/cmd/zoo/utils/shutdown.go @@ -27,9 +27,9 @@ import ( "math/big" "os" - "github.com/dexon-foundation/dexon" - "github.com/dexon-foundation/dexon/cmd/zoo/client" - "github.com/dexon-foundation/dexon/crypto" + ethereum "github.com/tangerine-network/go-tangerine" + "github.com/tangerine-network/go-tangerine/cmd/zoo/client" + "github.com/tangerine-network/go-tangerine/crypto" ) type ShutdownConfig struct { @@ -82,7 +82,7 @@ func Shutdown(config *ShutdownConfig) { panic(err) } - gasLimit, err := cl.EstimateGas(context.Background(), dexon.CallMsg{}) + gasLimit, err := cl.EstimateGas(context.Background(), ethereum.CallMsg{}) if err != nil { panic(err) } diff --git a/common/bitutil/compress_test.go b/common/bitutil/compress_test.go index b02f9796f..440530706 100644 --- a/common/bitutil/compress_test.go +++ b/common/bitutil/compress_test.go @@ -21,7 +21,7 @@ import ( "math/rand" "testing" - "github.com/dexon-foundation/dexon/common/hexutil" + "github.com/tangerine-network/go-tangerine/common/hexutil" ) // Tests that data bitset encoding and decoding works and is bijective. diff --git a/common/debug.go b/common/debug.go index c06ad8133..2e4eebad2 100644 --- a/common/debug.go +++ b/common/debug.go @@ -26,7 +26,7 @@ import ( // Report gives off a warning requesting the user to submit an issue to the github tracker. func Report(extra ...interface{}) { - fmt.Fprintln(os.Stderr, "You've encountered a sought after, hard to reproduce bug. Please report this to the developers <3 https://github.com/dexon-foundation/dexon/issues") + fmt.Fprintln(os.Stderr, "You've encountered a sought after, hard to reproduce bug. Please report this to the developers <3 https://github.com/tangerine-network/go-tangerine/issues") fmt.Fprintln(os.Stderr, extra...) _, file, line, _ := runtime.Caller(1) diff --git a/common/hexutil/json_example_test.go b/common/hexutil/json_example_test.go index 95d03ca38..1fb8d23ff 100644 --- a/common/hexutil/json_example_test.go +++ b/common/hexutil/json_example_test.go @@ -20,7 +20,7 @@ import ( "encoding/json" "fmt" - "github.com/dexon-foundation/dexon/common/hexutil" + "github.com/tangerine-network/go-tangerine/common/hexutil" ) type MyType [5]byte diff --git a/common/math/big_test.go b/common/math/big_test.go index 97e319c58..3df1f1486 100644 --- a/common/math/big_test.go +++ b/common/math/big_test.go @@ -22,7 +22,7 @@ import ( "math/big" "testing" - "github.com/dexon-foundation/dexon/common" + "github.com/tangerine-network/go-tangerine/common" ) func TestHexOrDecimal256(t *testing.T) { diff --git a/common/types.go b/common/types.go index d0d4ce411..154def784 100644 --- a/common/types.go +++ b/common/types.go @@ -26,7 +26,7 @@ import ( "reflect" "strings" - "github.com/dexon-foundation/dexon/common/hexutil" + "github.com/tangerine-network/go-tangerine/common/hexutil" "golang.org/x/crypto/sha3" ) diff --git a/consensus/clique/api.go b/consensus/clique/api.go index e81908cc7..be313b2d3 100644 --- a/consensus/clique/api.go +++ b/consensus/clique/api.go @@ -17,10 +17,10 @@ package clique import ( - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/consensus" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/rpc" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/consensus" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/rpc" ) // API is a user facing RPC API to allow controlling the signer and voting diff --git a/consensus/clique/clique.go b/consensus/clique/clique.go index b6371abac..56f7d3e95 100644 --- a/consensus/clique/clique.go +++ b/consensus/clique/clique.go @@ -25,20 +25,20 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/accounts" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/consensus" - "github.com/dexon-foundation/dexon/consensus/misc" - "github.com/dexon-foundation/dexon/core/state" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/params" - "github.com/dexon-foundation/dexon/rlp" - "github.com/dexon-foundation/dexon/rpc" lru "github.com/hashicorp/golang-lru" + "github.com/tangerine-network/go-tangerine/accounts" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/consensus" + "github.com/tangerine-network/go-tangerine/consensus/misc" + "github.com/tangerine-network/go-tangerine/core/state" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/params" + "github.com/tangerine-network/go-tangerine/rlp" + "github.com/tangerine-network/go-tangerine/rpc" "golang.org/x/crypto/sha3" ) diff --git a/consensus/clique/snapshot.go b/consensus/clique/snapshot.go index 0dcbeed12..3c3a83dd1 100644 --- a/consensus/clique/snapshot.go +++ b/consensus/clique/snapshot.go @@ -21,11 +21,11 @@ import ( "encoding/json" "sort" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/params" lru "github.com/hashicorp/golang-lru" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/params" ) // Vote represents a single vote that an authorized signer made to modify the diff --git a/consensus/clique/snapshot_test.go b/consensus/clique/snapshot_test.go index d60005c7c..5b963ceab 100644 --- a/consensus/clique/snapshot_test.go +++ b/consensus/clique/snapshot_test.go @@ -22,13 +22,13 @@ import ( "sort" "testing" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/core/vm" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/core/vm" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/params" ) // testerAccountPool is a pool to maintain currently active tester accounts, @@ -363,7 +363,7 @@ func TestClique(t *testing.T) { failure: errRecentlySigned, }, { // Recent signatures should not reset on checkpoint blocks imported in a new - // batch (https://github.com/dexon-foundation/dexon/issues/17593). Whilst this + // batch (https://github.com/tangerine-network/go-tangerine/issues/17593). Whilst this // seems overly specific and weird, it was a Rinkeby consensus split. epoch: 3, signers: []string{"A", "B", "C"}, diff --git a/consensus/consensus.go b/consensus/consensus.go index 12dd40aef..b30ef4366 100644 --- a/consensus/consensus.go +++ b/consensus/consensus.go @@ -20,11 +20,11 @@ package consensus import ( "math/big" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/state" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/params" - "github.com/dexon-foundation/dexon/rpc" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/state" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/params" + "github.com/tangerine-network/go-tangerine/rpc" ) // ChainReader defines a small collection of methods needed to access the local diff --git a/consensus/dexcon/dexcon.go b/consensus/dexcon/dexcon.go index ae7ff0368..6b4a09359 100644 --- a/consensus/dexcon/dexcon.go +++ b/consensus/dexcon/dexcon.go @@ -21,14 +21,14 @@ import ( "fmt" "math/big" - dexCore "github.com/dexon-foundation/dexon-consensus/core" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/consensus" - "github.com/dexon-foundation/dexon/core/state" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/core/vm" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/rpc" + dexCore "github.com/byzantine-lab/dexon-consensus/core" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/consensus" + "github.com/tangerine-network/go-tangerine/core/state" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/core/vm" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/rpc" ) type GovernanceStateFetcher interface { diff --git a/consensus/dexcon/dexcon_test.go b/consensus/dexcon/dexcon_test.go index af20fbb1e..09b7281ef 100644 --- a/consensus/dexcon/dexcon_test.go +++ b/consensus/dexcon/dexcon_test.go @@ -23,12 +23,12 @@ import ( "github.com/stretchr/testify/suite" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/state" - "github.com/dexon-foundation/dexon/core/vm" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/state" + "github.com/tangerine-network/go-tangerine/core/vm" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/params" ) type govStateFetcher struct { diff --git a/consensus/dexcon/fake_dexcon.go b/consensus/dexcon/fake_dexcon.go index 430d9bc6b..d50deb147 100644 --- a/consensus/dexcon/fake_dexcon.go +++ b/consensus/dexcon/fake_dexcon.go @@ -4,21 +4,21 @@ import ( "crypto/ecdsa" "math/big" - coreCommon "github.com/dexon-foundation/dexon-consensus/common" - dexCore "github.com/dexon-foundation/dexon-consensus/core" - coreCrypto "github.com/dexon-foundation/dexon-consensus/core/crypto" - coreDKG "github.com/dexon-foundation/dexon-consensus/core/crypto/dkg" - coreEcdsa "github.com/dexon-foundation/dexon-consensus/core/crypto/ecdsa" - coreTypes "github.com/dexon-foundation/dexon-consensus/core/types" - coreTypesDKG "github.com/dexon-foundation/dexon-consensus/core/types/dkg" - coreUtils "github.com/dexon-foundation/dexon-consensus/core/utils" - - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/consensus" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/core/vm" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/rlp" + coreCommon "github.com/byzantine-lab/dexon-consensus/common" + dexCore "github.com/byzantine-lab/dexon-consensus/core" + coreCrypto "github.com/byzantine-lab/dexon-consensus/core/crypto" + coreDKG "github.com/byzantine-lab/dexon-consensus/core/crypto/dkg" + coreEcdsa "github.com/byzantine-lab/dexon-consensus/core/crypto/ecdsa" + coreTypes "github.com/byzantine-lab/dexon-consensus/core/types" + coreTypesDKG "github.com/byzantine-lab/dexon-consensus/core/types/dkg" + coreUtils "github.com/byzantine-lab/dexon-consensus/core/utils" + + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/consensus" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/core/vm" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/rlp" ) type FakeDexcon struct { diff --git a/consensus/ethash/algorithm.go b/consensus/ethash/algorithm.go index c77cad680..598d51b5e 100644 --- a/consensus/ethash/algorithm.go +++ b/consensus/ethash/algorithm.go @@ -27,10 +27,10 @@ import ( "time" "unsafe" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/bitutil" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/bitutil" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/log" "golang.org/x/crypto/sha3" ) diff --git a/consensus/ethash/algorithm_test.go b/consensus/ethash/algorithm_test.go index 44b3cb432..834f3352a 100644 --- a/consensus/ethash/algorithm_test.go +++ b/consensus/ethash/algorithm_test.go @@ -26,9 +26,9 @@ import ( "sync" "testing" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/core/types" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/core/types" ) // prepare converts an ethash cache or dataset from a byte stream into the internal diff --git a/consensus/ethash/api.go b/consensus/ethash/api.go index 05255e8d2..67bc8fd24 100644 --- a/consensus/ethash/api.go +++ b/consensus/ethash/api.go @@ -19,9 +19,9 @@ package ethash import ( "errors" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/core/types" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/core/types" ) var errEthashStopped = errors.New("ethash stopped") diff --git a/consensus/ethash/consensus.go b/consensus/ethash/consensus.go index 915e1f7f7..6f9418c2e 100644 --- a/consensus/ethash/consensus.go +++ b/consensus/ethash/consensus.go @@ -25,14 +25,14 @@ import ( "time" mapset "github.com/deckarep/golang-set" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/math" - "github.com/dexon-foundation/dexon/consensus" - "github.com/dexon-foundation/dexon/consensus/misc" - "github.com/dexon-foundation/dexon/core/state" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/params" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/math" + "github.com/tangerine-network/go-tangerine/consensus" + "github.com/tangerine-network/go-tangerine/consensus/misc" + "github.com/tangerine-network/go-tangerine/core/state" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/params" + "github.com/tangerine-network/go-tangerine/rlp" "golang.org/x/crypto/sha3" ) diff --git a/consensus/ethash/consensus_test.go b/consensus/ethash/consensus_test.go index 42075d08a..951c66dcf 100644 --- a/consensus/ethash/consensus_test.go +++ b/consensus/ethash/consensus_test.go @@ -23,9 +23,9 @@ import ( "path/filepath" "testing" - "github.com/dexon-foundation/dexon/common/math" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/common/math" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/params" ) type diffTest struct { diff --git a/consensus/ethash/ethash.go b/consensus/ethash/ethash.go index cb81a8e44..78269a9a2 100644 --- a/consensus/ethash/ethash.go +++ b/consensus/ethash/ethash.go @@ -33,14 +33,14 @@ import ( "time" "unsafe" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/consensus" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/metrics" - "github.com/dexon-foundation/dexon/rpc" mmap "github.com/edsrzf/mmap-go" "github.com/hashicorp/golang-lru/simplelru" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/consensus" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/metrics" + "github.com/tangerine-network/go-tangerine/rpc" ) var ErrInvalidDumpMagic = errors.New("invalid dump magic") diff --git a/consensus/ethash/ethash_test.go b/consensus/ethash/ethash_test.go index a97f7233a..83ad8bf7a 100644 --- a/consensus/ethash/ethash_test.go +++ b/consensus/ethash/ethash_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/core/types" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/core/types" ) // Tests that ethash works correctly in test mode. @@ -55,7 +55,7 @@ func TestTestMode(t *testing.T) { } // This test checks that cache lru logic doesn't crash under load. -// It reproduces https://github.com/dexon-foundation/dexon/issues/14943 +// It reproduces https://github.com/tangerine-network/go-tangerine/issues/14943 func TestCacheFileEvict(t *testing.T) { tmpdir, err := ioutil.TempDir("", "ethash-test") if err != nil { diff --git a/consensus/ethash/sealer.go b/consensus/ethash/sealer.go index 304482ac5..5900c7227 100644 --- a/consensus/ethash/sealer.go +++ b/consensus/ethash/sealer.go @@ -29,11 +29,11 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/consensus" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/consensus" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/log" ) const ( diff --git a/consensus/ethash/sealer_test.go b/consensus/ethash/sealer_test.go index e1482f24d..8f0cf46ed 100644 --- a/consensus/ethash/sealer_test.go +++ b/consensus/ethash/sealer_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/types" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/types" ) // Tests whether remote HTTP servers are correctly notified of new work. diff --git a/consensus/misc/dao.go b/consensus/misc/dao.go index bf7fa552a..3586e76d3 100644 --- a/consensus/misc/dao.go +++ b/consensus/misc/dao.go @@ -21,9 +21,9 @@ import ( "errors" "math/big" - "github.com/dexon-foundation/dexon/core/state" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/core/state" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/params" ) var ( diff --git a/consensus/misc/forks.go b/consensus/misc/forks.go index a73896252..2e089e426 100644 --- a/consensus/misc/forks.go +++ b/consensus/misc/forks.go @@ -19,9 +19,9 @@ package misc import ( "fmt" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/params" ) // VerifyForkHashes verifies that blocks conforming to network hard-forks do have diff --git a/console/bridge.go b/console/bridge.go index 938f1fc60..ad6d69422 100644 --- a/console/bridge.go +++ b/console/bridge.go @@ -23,10 +23,10 @@ import ( "strings" "time" - "github.com/dexon-foundation/dexon/accounts/usbwallet" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/rpc" "github.com/robertkrimen/otto" + "github.com/tangerine-network/go-tangerine/accounts/usbwallet" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/rpc" ) // bridge is a collection of JavaScript utility methods to bride the .js runtime diff --git a/console/console.go b/console/console.go index 898a945e2..ad536d657 100644 --- a/console/console.go +++ b/console/console.go @@ -28,12 +28,12 @@ import ( "strings" "syscall" - "github.com/dexon-foundation/dexon/internal/jsre" - "github.com/dexon-foundation/dexon/internal/web3ext" - "github.com/dexon-foundation/dexon/rpc" "github.com/mattn/go-colorable" "github.com/peterh/liner" "github.com/robertkrimen/otto" + "github.com/tangerine-network/go-tangerine/internal/jsre" + "github.com/tangerine-network/go-tangerine/internal/web3ext" + "github.com/tangerine-network/go-tangerine/rpc" ) var ( diff --git a/console/console_test.go b/console/console_test.go index 0d751a484..68781150e 100644 --- a/console/console_test.go +++ b/console/console_test.go @@ -26,12 +26,12 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/consensus/ethash" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/eth" - "github.com/dexon-foundation/dexon/internal/jsre" - "github.com/dexon-foundation/dexon/node" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/consensus/ethash" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/eth" + "github.com/tangerine-network/go-tangerine/internal/jsre" + "github.com/tangerine-network/go-tangerine/node" ) const ( diff --git a/containers/docker/develop-alpine/Dockerfile b/containers/docker/develop-alpine/Dockerfile index 978dad442..aac674746 100644 --- a/containers/docker/develop-alpine/Dockerfile +++ b/containers/docker/develop-alpine/Dockerfile @@ -2,7 +2,7 @@ FROM alpine:3.7 RUN \ apk add --update go git make gcc musl-dev linux-headers ca-certificates && \ - git clone --depth 1 https://github.com/dexon-foundation/dexon && \ + git clone --depth 1 https://github.com/tangerine-network/go-tangerine && \ (cd go-ethereum && make geth) && \ cp go-ethereum/build/bin/geth /geth && \ apk del go git make gcc musl-dev linux-headers && \ diff --git a/containers/docker/develop-ubuntu/Dockerfile b/containers/docker/develop-ubuntu/Dockerfile index b1b227ca8..c91b93b4f 100644 --- a/containers/docker/develop-ubuntu/Dockerfile +++ b/containers/docker/develop-ubuntu/Dockerfile @@ -5,7 +5,7 @@ ENV PATH=/usr/lib/go-1.9/bin:$PATH RUN \ apt-get update && apt-get upgrade -q -y && \ apt-get install -y --no-install-recommends golang-1.9 git make gcc libc-dev ca-certificates && \ - git clone --depth 1 https://github.com/dexon-foundation/dexon && \ + git clone --depth 1 https://github.com/tangerine-network/go-tangerine && \ (cd go-ethereum && make geth) && \ cp go-ethereum/build/bin/geth /geth && \ apt-get remove -y golang-1.9 git make gcc libc-dev && apt autoremove -y && apt-get clean && \ diff --git a/containers/docker/master-alpine/Dockerfile b/containers/docker/master-alpine/Dockerfile index 81b894421..a2ef9e0bc 100644 --- a/containers/docker/master-alpine/Dockerfile +++ b/containers/docker/master-alpine/Dockerfile @@ -2,7 +2,7 @@ FROM alpine:3.7 RUN \ apk add --update go git make gcc musl-dev linux-headers ca-certificates && \ - git clone --depth 1 --branch release/1.8 https://github.com/dexon-foundation/dexon && \ + git clone --depth 1 --branch release/1.8 https://github.com/tangerine-network/go-tangerine && \ (cd go-ethereum && make geth) && \ cp go-ethereum/build/bin/geth /geth && \ apk del go git make gcc musl-dev linux-headers && \ diff --git a/containers/docker/master-ubuntu/Dockerfile b/containers/docker/master-ubuntu/Dockerfile index 8af8a4128..177dc99a9 100644 --- a/containers/docker/master-ubuntu/Dockerfile +++ b/containers/docker/master-ubuntu/Dockerfile @@ -5,7 +5,7 @@ ENV PATH=/usr/lib/go-1.9/bin:$PATH RUN \ apt-get update && apt-get upgrade -q -y && \ apt-get install -y --no-install-recommends golang-1.9 git make gcc libc-dev ca-certificates && \ - git clone --depth 1 --branch release/1.8 https://github.com/dexon-foundation/dexon && \ + git clone --depth 1 --branch release/1.8 https://github.com/tangerine-network/go-tangerine && \ (cd go-ethereum && make geth) && \ cp go-ethereum/build/bin/geth /geth && \ apt-get remove -y golang-1.9 git make gcc libc-dev && apt autoremove -y && apt-get clean && \ diff --git a/contracts/chequebook/api.go b/contracts/chequebook/api.go index 14b2e9606..3b60685e8 100644 --- a/contracts/chequebook/api.go +++ b/contracts/chequebook/api.go @@ -20,7 +20,7 @@ import ( "errors" "math/big" - "github.com/dexon-foundation/dexon/common" + "github.com/tangerine-network/go-tangerine/common" ) const Version = "1.0" diff --git a/contracts/chequebook/cheque.go b/contracts/chequebook/cheque.go index 26e8b2bdf..18feb9e12 100644 --- a/contracts/chequebook/cheque.go +++ b/contracts/chequebook/cheque.go @@ -36,14 +36,14 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/accounts/abi/bind" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/contracts/chequebook/contract" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/swarm/services/swap/swap" + "github.com/tangerine-network/go-tangerine/accounts/abi/bind" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/contracts/chequebook/contract" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/swarm/services/swap/swap" ) // TODO(zelig): watch peer solvency and notify of bouncing cheques diff --git a/contracts/chequebook/cheque_test.go b/contracts/chequebook/cheque_test.go index 5e3ec782b..5a12e1aed 100644 --- a/contracts/chequebook/cheque_test.go +++ b/contracts/chequebook/cheque_test.go @@ -24,12 +24,12 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/accounts/abi/bind" - "github.com/dexon-foundation/dexon/accounts/abi/bind/backends" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/contracts/chequebook/contract" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/crypto" + "github.com/tangerine-network/go-tangerine/accounts/abi/bind" + "github.com/tangerine-network/go-tangerine/accounts/abi/bind/backends" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/contracts/chequebook/contract" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/crypto" ) var ( diff --git a/contracts/chequebook/contract/chequebook.go b/contracts/chequebook/contract/chequebook.go index 4dd0cc03a..55e1f7746 100644 --- a/contracts/chequebook/contract/chequebook.go +++ b/contracts/chequebook/contract/chequebook.go @@ -7,12 +7,12 @@ import ( "math/big" "strings" - ethereum "github.com/dexon-foundation/dexon" - "github.com/dexon-foundation/dexon/accounts/abi" - "github.com/dexon-foundation/dexon/accounts/abi/bind" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/event" + ethereum "github.com/tangerine-network/go-tangerine" + "github.com/tangerine-network/go-tangerine/accounts/abi" + "github.com/tangerine-network/go-tangerine/accounts/abi/bind" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/event" ) // ChequebookABI is the input ABI used to generate the binding from. diff --git a/contracts/chequebook/gencode.go b/contracts/chequebook/gencode.go index d4aad6cb4..65efaa483 100644 --- a/contracts/chequebook/gencode.go +++ b/contracts/chequebook/gencode.go @@ -25,11 +25,11 @@ import ( "io/ioutil" "math/big" - "github.com/dexon-foundation/dexon/accounts/abi/bind" - "github.com/dexon-foundation/dexon/accounts/abi/bind/backends" - "github.com/dexon-foundation/dexon/contracts/chequebook/contract" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/crypto" + "github.com/tangerine-network/go-tangerine/accounts/abi/bind" + "github.com/tangerine-network/go-tangerine/accounts/abi/bind/backends" + "github.com/tangerine-network/go-tangerine/contracts/chequebook/contract" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/crypto" ) var ( diff --git a/contracts/ens/contract/ens.go b/contracts/ens/contract/ens.go index 203205983..8ade52f82 100644 --- a/contracts/ens/contract/ens.go +++ b/contracts/ens/contract/ens.go @@ -6,12 +6,12 @@ package contract import ( "strings" - ethereum "github.com/dexon-foundation/dexon" - "github.com/dexon-foundation/dexon/accounts/abi" - "github.com/dexon-foundation/dexon/accounts/abi/bind" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/event" + ethereum "github.com/tangerine-network/go-tangerine" + "github.com/tangerine-network/go-tangerine/accounts/abi" + "github.com/tangerine-network/go-tangerine/accounts/abi/bind" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/event" ) // ENSABI is the input ABI used to generate the binding from. diff --git a/contracts/ens/contract/fifsregistrar.go b/contracts/ens/contract/fifsregistrar.go index 82e1cc43e..45acb9060 100644 --- a/contracts/ens/contract/fifsregistrar.go +++ b/contracts/ens/contract/fifsregistrar.go @@ -6,10 +6,10 @@ package contract import ( "strings" - "github.com/dexon-foundation/dexon/accounts/abi" - "github.com/dexon-foundation/dexon/accounts/abi/bind" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/types" + "github.com/tangerine-network/go-tangerine/accounts/abi" + "github.com/tangerine-network/go-tangerine/accounts/abi/bind" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/types" ) // FIFSRegistrarABI is the input ABI used to generate the binding from. diff --git a/contracts/ens/contract/publicresolver.go b/contracts/ens/contract/publicresolver.go index 9a6180c21..1793cb879 100644 --- a/contracts/ens/contract/publicresolver.go +++ b/contracts/ens/contract/publicresolver.go @@ -7,12 +7,12 @@ import ( "math/big" "strings" - ethereum "github.com/dexon-foundation/dexon" - "github.com/dexon-foundation/dexon/accounts/abi" - "github.com/dexon-foundation/dexon/accounts/abi/bind" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/event" + ethereum "github.com/tangerine-network/go-tangerine" + "github.com/tangerine-network/go-tangerine/accounts/abi" + "github.com/tangerine-network/go-tangerine/accounts/abi/bind" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/event" ) // PublicResolverABI is the input ABI used to generate the binding from. diff --git a/contracts/ens/ens.go b/contracts/ens/ens.go index 28822d80d..a5feed31f 100644 --- a/contracts/ens/ens.go +++ b/contracts/ens/ens.go @@ -23,11 +23,11 @@ package ens import ( "strings" - "github.com/dexon-foundation/dexon/accounts/abi/bind" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/contracts/ens/contract" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/crypto" + "github.com/tangerine-network/go-tangerine/accounts/abi/bind" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/contracts/ens/contract" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/crypto" ) var ( diff --git a/contracts/ens/ens_test.go b/contracts/ens/ens_test.go index d231c1918..750caf575 100644 --- a/contracts/ens/ens_test.go +++ b/contracts/ens/ens_test.go @@ -20,12 +20,12 @@ import ( "math/big" "testing" - "github.com/dexon-foundation/dexon/accounts/abi/bind" - "github.com/dexon-foundation/dexon/accounts/abi/bind/backends" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/contracts/ens/contract" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/crypto" + "github.com/tangerine-network/go-tangerine/accounts/abi/bind" + "github.com/tangerine-network/go-tangerine/accounts/abi/bind/backends" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/contracts/ens/contract" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/crypto" ) var ( diff --git a/core/asm/asm.go b/core/asm/asm.go index 8dbb45ed3..dcb56f554 100644 --- a/core/asm/asm.go +++ b/core/asm/asm.go @@ -21,7 +21,7 @@ import ( "encoding/hex" "fmt" - "github.com/dexon-foundation/dexon/core/vm" + "github.com/tangerine-network/go-tangerine/core/vm" ) // Iterator for disassembled EVM instructions diff --git a/core/asm/compiler.go b/core/asm/compiler.go index b1c7c76f0..979d9d311 100644 --- a/core/asm/compiler.go +++ b/core/asm/compiler.go @@ -22,8 +22,8 @@ import ( "os" "strings" - "github.com/dexon-foundation/dexon/common/math" - "github.com/dexon-foundation/dexon/core/vm" + "github.com/tangerine-network/go-tangerine/common/math" + "github.com/tangerine-network/go-tangerine/core/vm" ) // Compiler contains information about the parsed source diff --git a/core/bench_test.go b/core/bench_test.go index c9a9bf735..826cee2b9 100644 --- a/core/bench_test.go +++ b/core/bench_test.go @@ -23,15 +23,15 @@ import ( "os" "testing" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/math" - "github.com/dexon-foundation/dexon/consensus/ethash" - "github.com/dexon-foundation/dexon/core/rawdb" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/core/vm" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/math" + "github.com/tangerine-network/go-tangerine/consensus/ethash" + "github.com/tangerine-network/go-tangerine/core/rawdb" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/core/vm" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/params" ) func BenchmarkInsertChain_empty_memdb(b *testing.B) { diff --git a/core/block_validator.go b/core/block_validator.go index 856eec27b..1bb6aafa2 100644 --- a/core/block_validator.go +++ b/core/block_validator.go @@ -19,12 +19,12 @@ package core import ( "fmt" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/consensus" - "github.com/dexon-foundation/dexon/core/state" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/consensus" + "github.com/tangerine-network/go-tangerine/core/state" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/params" ) // BlockValidator is responsible for validating block headers, uncles and diff --git a/core/block_validator_test.go b/core/block_validator_test.go index f22653aca..dbf10733a 100644 --- a/core/block_validator_test.go +++ b/core/block_validator_test.go @@ -21,11 +21,11 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/consensus/ethash" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/core/vm" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/consensus/ethash" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/core/vm" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/params" ) // Tests that simple header verification works, for both good and bad blocks. diff --git a/core/blockchain.go b/core/blockchain.go index a1e82313b..e84e688c7 100644 --- a/core/blockchain.go +++ b/core/blockchain.go @@ -28,28 +28,28 @@ import ( "sync/atomic" "time" - dexCore "github.com/dexon-foundation/dexon-consensus/core" - coreTypes "github.com/dexon-foundation/dexon-consensus/core/types" - "github.com/hashicorp/golang-lru" - - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/math" - "github.com/dexon-foundation/dexon/common/mclock" - "github.com/dexon-foundation/dexon/common/prque" - "github.com/dexon-foundation/dexon/consensus" - "github.com/dexon-foundation/dexon/consensus/dexcon" - "github.com/dexon-foundation/dexon/core/rawdb" - "github.com/dexon-foundation/dexon/core/state" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/core/vm" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/event" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/metrics" - "github.com/dexon-foundation/dexon/params" - "github.com/dexon-foundation/dexon/rlp" - "github.com/dexon-foundation/dexon/trie" + dexCore "github.com/byzantine-lab/dexon-consensus/core" + coreTypes "github.com/byzantine-lab/dexon-consensus/core/types" + lru "github.com/hashicorp/golang-lru" + + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/math" + "github.com/tangerine-network/go-tangerine/common/mclock" + "github.com/tangerine-network/go-tangerine/common/prque" + "github.com/tangerine-network/go-tangerine/consensus" + "github.com/tangerine-network/go-tangerine/consensus/dexcon" + "github.com/tangerine-network/go-tangerine/core/rawdb" + "github.com/tangerine-network/go-tangerine/core/state" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/core/vm" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/event" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/metrics" + "github.com/tangerine-network/go-tangerine/params" + "github.com/tangerine-network/go-tangerine/rlp" + "github.com/tangerine-network/go-tangerine/trie" ) var ( @@ -1484,22 +1484,22 @@ func (bc *BlockChain) insertSidechain(block *types.Block, it *insertIterator) (i return 0, nil, nil, nil } -// InsertDexonChain attempts to insert the given batch of blocks in to the canonical +// InsertTangerineChain attempts to insert the given batch of blocks in to the canonical // chain or, otherwise, create a fork. If an error is returned it will return // the index number of the failing block as well an error describing what went // wrong. // // After insertion is done, all accumulated events will be fired. -func (bc *BlockChain) InsertDexonChain(chain types.Blocks) (int, error) { - n, events, logs, err := bc.insertDexonChain(chain) +func (bc *BlockChain) InsertTangerineChain(chain types.Blocks) (int, error) { + n, events, logs, err := bc.insertTangerineChain(chain) bc.PostChainEvents(events, logs) return n, err } -// insertDexoonChain will execute the actual chain insertion and event aggregation. The +// insertTangerineChain will execute the actual chain insertion and event aggregation. The // only reason this method exists as a separate one is to make locking cleaner // with deferred statements. -func (bc *BlockChain) insertDexonChain(chain types.Blocks) (int, []interface{}, []*types.Log, error) { +func (bc *BlockChain) insertTangerineChain(chain types.Blocks) (int, []interface{}, []*types.Log, error) { // Sanity check that we have something meaningful to import if len(chain) == 0 { return 0, nil, nil, nil @@ -1550,8 +1550,8 @@ func (bc *BlockChain) insertDexonChain(chain types.Blocks) (int, []interface{}, // Wait for the block's verification to complete bstart := time.Now() - // VerifyDexonHeader will verify tsig, witness and ensure dexon header is correct. - err := bc.hc.VerifyDexonHeader(block.Header(), bc.gov, bc.verifierCache, bc.Validator()) + // VerifyTangerineHeader will verify tsig, witness and ensure dexon header is correct. + err := bc.hc.VerifyTangerineHeader(block.Header(), bc.gov, bc.verifierCache, bc.Validator()) if err == nil { err = bc.Validator().ValidateBody(block) } @@ -1605,7 +1605,7 @@ func (bc *BlockChain) insertDexonChain(chain types.Blocks) (int, []interface{}, } // Import all the pruned blocks to make the state available bc.chainmu.Unlock() - _, evs, logs, err := bc.insertDexonChain(winner) + _, evs, logs, err := bc.insertTangerineChain(winner) bc.chainmu.Lock() events, coalescedLogs = evs, logs @@ -1697,8 +1697,8 @@ func (bc *BlockChain) insertDexonChain(chain types.Blocks) (int, []interface{}, return 0, events, coalescedLogs, nil } -func (bc *BlockChain) VerifyDexonHeader(header *types.Header) error { - return bc.hc.VerifyDexonHeader(header, bc.gov, bc.verifierCache, bc.Validator()) +func (bc *BlockChain) VerifyTangerineHeader(header *types.Header) error { + return bc.hc.VerifyTangerineHeader(header, bc.gov, bc.verifierCache, bc.Validator()) } func (bc *BlockChain) ProcessBlock(block *types.Block, witness *coreTypes.Witness) (*common.Hash, error) { @@ -2200,10 +2200,10 @@ func (bc *BlockChain) InsertHeaderChain(chain []*types.Header, checkFreq int) (i return bc.hc.InsertHeaderChain(chain, whFunc, start) } -func (bc *BlockChain) InsertDexonHeaderChain(chain []*types.HeaderWithGovState, +func (bc *BlockChain) InsertTangerineHeaderChain(chain []*types.HeaderWithGovState, gov dexcon.GovernanceStateFetcher, verifierCache *dexCore.TSigVerifierCache) (int, error) { start := time.Now() - if i, err := bc.hc.ValidateDexonHeaderChain(chain, gov, verifierCache, bc.Validator()); err != nil { + if i, err := bc.hc.ValidateTangerineHeaderChain(chain, gov, verifierCache, bc.Validator()); err != nil { return i, err } @@ -2216,7 +2216,7 @@ func (bc *BlockChain) InsertDexonHeaderChain(chain []*types.HeaderWithGovState, whFunc := func(header *types.HeaderWithGovState) error { bc.mu.Lock() defer bc.mu.Unlock() - status, err := bc.hc.WriteDexonHeader(header) + status, err := bc.hc.WriteTangerineHeader(header) if status == SideStatTy { log.Debug("Inserted forked block header", "number", header.Number, "hash", header.Hash, "diff", header.Difficulty, "gas", header.GasUsed) @@ -2225,7 +2225,7 @@ func (bc *BlockChain) InsertDexonHeaderChain(chain []*types.HeaderWithGovState, return err } - return bc.hc.InsertDexonHeaderChain(chain, whFunc, start) + return bc.hc.InsertTangerineHeaderChain(chain, whFunc, start) } // writeHeader writes a header into the local chain, given that its parent is diff --git a/core/blockchain_insert.go b/core/blockchain_insert.go index 7fb15b639..12e426f51 100644 --- a/core/blockchain_insert.go +++ b/core/blockchain_insert.go @@ -19,10 +19,10 @@ package core import ( "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/mclock" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/mclock" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/log" ) // insertStats tracks and reports on block insertion. diff --git a/core/blockchain_test.go b/core/blockchain_test.go index f8956da46..74d80a8d6 100644 --- a/core/blockchain_test.go +++ b/core/blockchain_test.go @@ -25,20 +25,20 @@ import ( "testing" "time" - coreTypes "github.com/dexon-foundation/dexon-consensus/core/types" - - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/consensus" - "github.com/dexon-foundation/dexon/consensus/dexcon" - "github.com/dexon-foundation/dexon/consensus/ethash" - "github.com/dexon-foundation/dexon/core/rawdb" - "github.com/dexon-foundation/dexon/core/state" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/core/vm" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/params" - "github.com/dexon-foundation/dexon/rlp" + coreTypes "github.com/byzantine-lab/dexon-consensus/core/types" + + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/consensus" + "github.com/tangerine-network/go-tangerine/consensus/dexcon" + "github.com/tangerine-network/go-tangerine/consensus/ethash" + "github.com/tangerine-network/go-tangerine/core/rawdb" + "github.com/tangerine-network/go-tangerine/core/state" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/core/vm" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/params" + "github.com/tangerine-network/go-tangerine/rlp" ) // So we can deterministically seed different blockchains @@ -1449,7 +1449,7 @@ func TestEIP161AccountRemoval(t *testing.T) { // tests that under weird reorg conditions the blockchain and its internal header- // chain return the same latest block/header. // -// https://github.com/dexon-foundation/dexon/pull/15941 +// https://github.com/tangerine-network/go-tangerine/pull/15941 func TestBlockchainHeaderchainReorgConsistency(t *testing.T) { // Generate a canonical chain to act as the main dataset engine := ethash.NewFaker() @@ -1916,8 +1916,8 @@ func BenchmarkBlockChain_1x1000Executions(b *testing.B) { // overtake the 'canon' chain until after it's passed canon by about 200 blocks. // // Details at: -// - https://github.com/dexon-foundation/dexon/issues/18977 -// - https://github.com/dexon-foundation/dexon/pull/18988 +// - https://github.com/tangerine-network/go-tangerine/issues/18977 +// - https://github.com/tangerine-network/go-tangerine/pull/18988 func TestLowDiffLongChain(t *testing.T) { // Generate a canonical chain to act as the main dataset engine := ethash.NewFaker() diff --git a/core/blocks.go b/core/blocks.go index 9acf80a15..eedbb2895 100644 --- a/core/blocks.go +++ b/core/blocks.go @@ -16,7 +16,7 @@ package core -import "github.com/dexon-foundation/dexon/common" +import "github.com/tangerine-network/go-tangerine/common" // BadHashes represent a set of manually tracked bad hashes (usually hard forks) var BadHashes = map[common.Hash]bool{ diff --git a/core/bloombits/generator.go b/core/bloombits/generator.go index 539331806..5d2bc7038 100644 --- a/core/bloombits/generator.go +++ b/core/bloombits/generator.go @@ -19,7 +19,7 @@ package bloombits import ( "errors" - "github.com/dexon-foundation/dexon/core/types" + "github.com/tangerine-network/go-tangerine/core/types" ) var ( diff --git a/core/bloombits/generator_test.go b/core/bloombits/generator_test.go index 795d08de3..b3924a4f2 100644 --- a/core/bloombits/generator_test.go +++ b/core/bloombits/generator_test.go @@ -21,7 +21,7 @@ import ( "math/rand" "testing" - "github.com/dexon-foundation/dexon/core/types" + "github.com/tangerine-network/go-tangerine/core/types" ) // Tests that batched bloom bits are correctly rotated from the input bloom diff --git a/core/bloombits/matcher.go b/core/bloombits/matcher.go index 73055ddfb..353d53c12 100644 --- a/core/bloombits/matcher.go +++ b/core/bloombits/matcher.go @@ -26,8 +26,8 @@ import ( "sync/atomic" "time" - "github.com/dexon-foundation/dexon/common/bitutil" - "github.com/dexon-foundation/dexon/crypto" + "github.com/tangerine-network/go-tangerine/common/bitutil" + "github.com/tangerine-network/go-tangerine/crypto" ) // bloomIndexes represents the bit indexes inside the bloom filter that belong diff --git a/core/bloombits/matcher_test.go b/core/bloombits/matcher_test.go index 286f873a6..54f70fdb3 100644 --- a/core/bloombits/matcher_test.go +++ b/core/bloombits/matcher_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/common" + "github.com/tangerine-network/go-tangerine/common" ) const testSectionSize = 4096 @@ -82,7 +82,7 @@ func TestMatcherRandom(t *testing.T) { // Tests that the matcher can properly find matches if the starting block is // shifter from a multiple of 8. This is needed to cover an optimisation with -// bitset matching https://github.com/dexon-foundation/dexon/issues/15309. +// bitset matching https://github.com/tangerine-network/go-tangerine/issues/15309. func TestMatcherShifted(t *testing.T) { // Block 0 always matches in the tests, skip ahead of first 8 blocks with the // start to get a potential zero byte in the matcher bitset. diff --git a/core/chain_indexer.go b/core/chain_indexer.go index 35815d0e6..6a626aa6f 100644 --- a/core/chain_indexer.go +++ b/core/chain_indexer.go @@ -24,12 +24,12 @@ import ( "sync/atomic" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/rawdb" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/event" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/rawdb" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/event" + "github.com/tangerine-network/go-tangerine/log" ) // ChainIndexerBackend defines the methods needed to process chain segments in diff --git a/core/chain_indexer_test.go b/core/chain_indexer_test.go index bb8cb5204..9027b280c 100644 --- a/core/chain_indexer_test.go +++ b/core/chain_indexer_test.go @@ -24,10 +24,10 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/rawdb" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/ethdb" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/rawdb" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/ethdb" ) // Runs multiple tests with randomized parameters. diff --git a/core/chain_makers.go b/core/chain_makers.go index f57eb37ff..2e7dde19c 100644 --- a/core/chain_makers.go +++ b/core/chain_makers.go @@ -22,14 +22,14 @@ import ( "math/rand" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/consensus" - "github.com/dexon-foundation/dexon/consensus/misc" - "github.com/dexon-foundation/dexon/core/state" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/core/vm" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/consensus" + "github.com/tangerine-network/go-tangerine/consensus/misc" + "github.com/tangerine-network/go-tangerine/core/state" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/core/vm" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/params" ) func init() { diff --git a/core/chain_makers_test.go b/core/chain_makers_test.go index 97896e87d..ada873cdc 100644 --- a/core/chain_makers_test.go +++ b/core/chain_makers_test.go @@ -20,12 +20,12 @@ import ( "fmt" "math/big" - "github.com/dexon-foundation/dexon/consensus/ethash" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/core/vm" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/consensus/ethash" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/core/vm" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/params" ) func ExampleGenerateChain() { diff --git a/core/dao_test.go b/core/dao_test.go index 785aab5f2..7a2283e78 100644 --- a/core/dao_test.go +++ b/core/dao_test.go @@ -20,10 +20,10 @@ import ( "math/big" "testing" - "github.com/dexon-foundation/dexon/consensus/ethash" - "github.com/dexon-foundation/dexon/core/vm" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/consensus/ethash" + "github.com/tangerine-network/go-tangerine/core/vm" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/params" ) // Tests that DAO-fork enabled clients can properly filter out fork-commencing diff --git a/core/dexon_chain_makers.go b/core/dexon_chain_makers.go index 010b30c84..2fdee2eca 100644 --- a/core/dexon_chain_makers.go +++ b/core/dexon_chain_makers.go @@ -22,25 +22,25 @@ import ( "math/rand" "time" - coreTypes "github.com/dexon-foundation/dexon-consensus/core/types" - - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/consensus" - "github.com/dexon-foundation/dexon/core/state" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/core/vm" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/params" - "github.com/dexon-foundation/dexon/rlp" + coreTypes "github.com/byzantine-lab/dexon-consensus/core/types" + + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/consensus" + "github.com/tangerine-network/go-tangerine/core/state" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/core/vm" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/params" + "github.com/tangerine-network/go-tangerine/rlp" ) func init() { rand.Seed(time.Now().UTC().UnixNano()) } -// DexonBlockGen creates blocks for testing. +// TangerineBlockGen creates blocks for testing. // See GenerateChain for a detailed explanation. -type DexonBlockGen struct { +type TangerineBlockGen struct { i int parent *types.Block chain []*types.Block @@ -61,7 +61,7 @@ type DexonBlockGen struct { // SetCoinbase sets the coinbase of the generated block. // It can be called at most once. -func (b *DexonBlockGen) SetCoinbase(addr common.Address) { +func (b *TangerineBlockGen) SetCoinbase(addr common.Address) { if b.gasPool != nil { if len(b.txs) > 0 { panic("coinbase must be set before adding transactions") @@ -73,16 +73,16 @@ func (b *DexonBlockGen) SetCoinbase(addr common.Address) { } // SetExtra sets the extra data field of the generated block. -func (b *DexonBlockGen) SetExtra(data []byte) { +func (b *TangerineBlockGen) SetExtra(data []byte) { b.header.Extra = data } // SetNonce sets the nonce field of the generated block. -func (b *DexonBlockGen) SetNonce(nonce types.BlockNonce) { +func (b *TangerineBlockGen) SetNonce(nonce types.BlockNonce) { b.header.Nonce = nonce } -func (b *DexonBlockGen) SetPosition(position coreTypes.Position) { +func (b *TangerineBlockGen) SetPosition(position coreTypes.Position) { b.position = position } @@ -94,16 +94,16 @@ func (b *DexonBlockGen) SetPosition(position coreTypes.Position) { // further limitations on the content of transactions that can be // added. If contract code relies on the BLOCKHASH instruction, // the block in chain will be returned. -func (b *DexonBlockGen) AddTx(tx *types.Transaction) { +func (b *TangerineBlockGen) AddTx(tx *types.Transaction) { // TODO: check nonce and maintain nonce. b.txs = append(b.txs, tx) } -func (b *DexonBlockGen) PreparePayload() []byte { +func (b *TangerineBlockGen) PreparePayload() []byte { return nil } -func (b *DexonBlockGen) ProcessTransactions(c ChainContext) { +func (b *TangerineBlockGen) ProcessTransactions(c ChainContext) { if b.gasPool == nil { b.SetCoinbase(common.Address{}) } @@ -119,7 +119,7 @@ func (b *DexonBlockGen) ProcessTransactions(c ChainContext) { } // Number returns the block number of the block being generated. -func (b *DexonBlockGen) Number() *big.Int { +func (b *TangerineBlockGen) Number() *big.Int { return new(big.Int).Set(b.header.Number) } @@ -128,13 +128,13 @@ func (b *DexonBlockGen) Number() *big.Int { // // AddUncheckedReceipt will cause consensus failures when used during real // chain processing. This is best used in conjunction with raw block insertion. -func (b *DexonBlockGen) AddUncheckedReceipt(receipt *types.Receipt) { +func (b *TangerineBlockGen) AddUncheckedReceipt(receipt *types.Receipt) { b.receipts = append(b.receipts, receipt) } // TxNonce returns the next valid transaction nonce for the // account at addr. It panics if the account does not exist. -func (b *DexonBlockGen) TxNonce(addr common.Address) uint64 { +func (b *TangerineBlockGen) TxNonce(addr common.Address) uint64 { if !b.statedb.Exist(addr) { panic("account does not exist") } @@ -147,7 +147,7 @@ func (b *DexonBlockGen) TxNonce(addr common.Address) uint64 { // PrevBlock returns a previously generated block by number. It panics if // num is greater or equal to the number of the block being generated. // For index -1, PrevBlock returns the parent block given to GenerateChain. -func (b *DexonBlockGen) PrevBlock(index int) *types.Block { +func (b *TangerineBlockGen) PrevBlock(index int) *types.Block { if index >= b.i { panic(fmt.Errorf("block index %d out of range (%d,%d)", index, -1, b.i)) } @@ -157,7 +157,7 @@ func (b *DexonBlockGen) PrevBlock(index int) *types.Block { return b.chain[index] } -func GenerateDexonChain(config *params.ChainConfig, parent *types.Block, engine consensus.Engine, db ethdb.Database, n int, gen func(int, *DexonBlockGen)) ([]*types.Block, []types.Receipts) { +func GenerateTangerineChain(config *params.ChainConfig, parent *types.Block, engine consensus.Engine, db ethdb.Database, n int, gen func(int, *TangerineBlockGen)) ([]*types.Block, []types.Receipts) { if config == nil { config = params.TestChainConfig } @@ -165,7 +165,7 @@ func GenerateDexonChain(config *params.ChainConfig, parent *types.Block, engine panic("engine is nil") } blocks, receipts := make(types.Blocks, n), make([]types.Receipts, n) - chain := &fakeDexonChain{ + chain := &fakeTangerineChain{ config: config, engine: engine, genesis: parent, @@ -174,8 +174,8 @@ func GenerateDexonChain(config *params.ChainConfig, parent *types.Block, engine roundHeight: make(map[uint64]uint64), } genblock := func(i int, parent *types.Block, statedb *state.StateDB) (*types.Block, types.Receipts) { - b := &DexonBlockGen{i: i, chain: blocks, parent: parent, statedb: statedb, config: config, engine: engine} - b.header = makeDexonHeader(chain, parent, statedb, b.engine) + b := &TangerineBlockGen{i: i, chain: blocks, parent: parent, statedb: statedb, config: config, engine: engine} + b.header = makeTangerineHeader(chain, parent, statedb, b.engine) // Execute any user modifications to the block if gen != nil { @@ -218,7 +218,7 @@ func GenerateDexonChain(config *params.ChainConfig, parent *types.Block, engine return blocks, receipts } -func makeDexonHeader(chain consensus.ChainReader, parent *types.Block, state *state.StateDB, engine consensus.Engine) *types.Header { +func makeTangerineHeader(chain consensus.ChainReader, parent *types.Block, state *state.StateDB, engine consensus.Engine) *types.Header { var time uint64 if parent.Time() == 0 { time = 10 @@ -238,7 +238,7 @@ func makeDexonHeader(chain consensus.ChainReader, parent *types.Block, state *st } // Setup DexconMeata skeleton -func makeDexconMeta(b *DexonBlockGen, parent *types.Block) []byte { +func makeDexconMeta(b *TangerineBlockGen, parent *types.Block) []byte { // Setup witness h := parent.Number().Int64() - rand.Int63n(6) if h < 0 { @@ -269,7 +269,7 @@ func makeDexconMeta(b *DexonBlockGen, parent *types.Block) []byte { return dexconMeta } -type fakeDexonChain struct { +type fakeTangerineChain struct { config *params.ChainConfig engine consensus.Engine db ethdb.Database @@ -278,7 +278,7 @@ type fakeDexonChain struct { roundHeight map[uint64]uint64 } -func (f *fakeDexonChain) InsertBlock(block *types.Block) { +func (f *fakeTangerineChain) InsertBlock(block *types.Block) { f.headersByNumber[block.NumberU64()] = block.Header() if _, exists := f.roundHeight[block.Round()]; !exists { f.roundHeight[block.Round()] = block.NumberU64() @@ -286,25 +286,25 @@ func (f *fakeDexonChain) InsertBlock(block *types.Block) { } // Config returns the chain configuration. -func (f *fakeDexonChain) Config() *params.ChainConfig { return f.config } -func (f *fakeDexonChain) Engine() consensus.Engine { return f.engine } -func (f *fakeDexonChain) CurrentHeader() *types.Header { return nil } -func (f *fakeDexonChain) GetHeaderByHash(hash common.Hash) *types.Header { return nil } -func (f *fakeDexonChain) GetHeader(hash common.Hash, number uint64) *types.Header { return nil } -func (f *fakeDexonChain) GetBlock(hash common.Hash, number uint64) *types.Block { return nil } - -func (f *fakeDexonChain) GetHeaderByNumber(number uint64) *types.Header { +func (f *fakeTangerineChain) Config() *params.ChainConfig { return f.config } +func (f *fakeTangerineChain) Engine() consensus.Engine { return f.engine } +func (f *fakeTangerineChain) CurrentHeader() *types.Header { return nil } +func (f *fakeTangerineChain) GetHeaderByHash(hash common.Hash) *types.Header { return nil } +func (f *fakeTangerineChain) GetHeader(hash common.Hash, number uint64) *types.Header { return nil } +func (f *fakeTangerineChain) GetBlock(hash common.Hash, number uint64) *types.Block { return nil } + +func (f *fakeTangerineChain) GetHeaderByNumber(number uint64) *types.Header { if number == 0 { return f.genesis.Header() } return f.headersByNumber[number] } -func (f *fakeDexonChain) StateAt(hash common.Hash) (*state.StateDB, error) { +func (f *fakeTangerineChain) StateAt(hash common.Hash) (*state.StateDB, error) { return state.New(hash, state.NewDatabase(f.db)) } -func (f *fakeDexonChain) GetRoundHeight(round uint64) (uint64, bool) { +func (f *fakeTangerineChain) GetRoundHeight(round uint64) (uint64, bool) { if round == 0 { return 0, true } diff --git a/core/events.go b/core/events.go index c2cabafd3..25125cfa0 100644 --- a/core/events.go +++ b/core/events.go @@ -17,8 +17,8 @@ package core import ( - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/types" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/types" ) // NewTxsEvent is posted when a batch of transactions enter the transaction pool. diff --git a/core/evm.go b/core/evm.go index a2b61c535..fcc3cd93e 100644 --- a/core/evm.go +++ b/core/evm.go @@ -19,11 +19,11 @@ package core import ( "math/big" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/consensus" - "github.com/dexon-foundation/dexon/core/state" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/core/vm" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/consensus" + "github.com/tangerine-network/go-tangerine/core/state" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/core/vm" ) // ChainContext supports retrieving headers and consensus parameters from the diff --git a/core/gen_genesis.go b/core/gen_genesis.go index 63f478cc7..4b17b8c09 100644 --- a/core/gen_genesis.go +++ b/core/gen_genesis.go @@ -7,10 +7,10 @@ import ( "errors" "math/big" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/common/math" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/common/math" + "github.com/tangerine-network/go-tangerine/params" ) var _ = (*genesisSpecMarshaling)(nil) diff --git a/core/gen_genesis_account.go b/core/gen_genesis_account.go index 15393d978..ffc2bae6b 100644 --- a/core/gen_genesis_account.go +++ b/core/gen_genesis_account.go @@ -7,9 +7,9 @@ import ( "errors" "math/big" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/common/math" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/common/math" ) var _ = (*genesisAccountMarshaling)(nil) diff --git a/core/genesis.go b/core/genesis.go index 48e1466e1..84bea56b7 100644 --- a/core/genesis.go +++ b/core/genesis.go @@ -26,17 +26,17 @@ import ( "sort" "strings" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/common/math" - "github.com/dexon-foundation/dexon/core/rawdb" - "github.com/dexon-foundation/dexon/core/state" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/core/vm" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/params" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/common/math" + "github.com/tangerine-network/go-tangerine/core/rawdb" + "github.com/tangerine-network/go-tangerine/core/state" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/core/vm" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/params" + "github.com/tangerine-network/go-tangerine/rlp" ) //go:generate gencodec -type Genesis -field-override genesisSpecMarshaling -out gen_genesis.go diff --git a/core/genesis_test.go b/core/genesis_test.go index 16958eac3..b02c0fa83 100644 --- a/core/genesis_test.go +++ b/core/genesis_test.go @@ -22,12 +22,12 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/consensus/ethash" - "github.com/dexon-foundation/dexon/core/rawdb" - "github.com/dexon-foundation/dexon/core/vm" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/consensus/ethash" + "github.com/tangerine-network/go-tangerine/core/rawdb" + "github.com/tangerine-network/go-tangerine/core/vm" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/params" ) func TestDefaultGenesisBlock(t *testing.T) { diff --git a/core/governance.go b/core/governance.go index c67b53f27..00cb47e4b 100644 --- a/core/governance.go +++ b/core/governance.go @@ -7,20 +7,20 @@ import ( "sync" "time" - coreCommon "github.com/dexon-foundation/dexon-consensus/common" - dexCore "github.com/dexon-foundation/dexon-consensus/core" - coreCrypto "github.com/dexon-foundation/dexon-consensus/core/crypto" - coreEcdsa "github.com/dexon-foundation/dexon-consensus/core/crypto/ecdsa" - coreTypes "github.com/dexon-foundation/dexon-consensus/core/types" - dkgTypes "github.com/dexon-foundation/dexon-consensus/core/types/dkg" - coreUtils "github.com/dexon-foundation/dexon-consensus/core/utils" + coreCommon "github.com/byzantine-lab/dexon-consensus/common" + dexCore "github.com/byzantine-lab/dexon-consensus/core" + coreCrypto "github.com/byzantine-lab/dexon-consensus/core/crypto" + coreEcdsa "github.com/byzantine-lab/dexon-consensus/core/crypto/ecdsa" + coreTypes "github.com/byzantine-lab/dexon-consensus/core/types" + dkgTypes "github.com/byzantine-lab/dexon-consensus/core/types/dkg" + coreUtils "github.com/byzantine-lab/dexon-consensus/core/utils" "github.com/hashicorp/golang-lru/simplelru" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/state" - "github.com/dexon-foundation/dexon/core/vm" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/state" + "github.com/tangerine-network/go-tangerine/core/vm" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/log" ) const dkgCacheSize = 5 diff --git a/core/headerchain.go b/core/headerchain.go index ffa005010..64eaff6f9 100644 --- a/core/headerchain.go +++ b/core/headerchain.go @@ -27,23 +27,23 @@ import ( "sync/atomic" "time" - dexCore "github.com/dexon-foundation/dexon-consensus/core" - coreCrypto "github.com/dexon-foundation/dexon-consensus/core/crypto" - coreTypes "github.com/dexon-foundation/dexon-consensus/core/types" - - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/consensus" - "github.com/dexon-foundation/dexon/consensus/dexcon" - "github.com/dexon-foundation/dexon/core/rawdb" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/core/vm" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/params" - "github.com/dexon-foundation/dexon/rlp" - "github.com/dexon-foundation/dexon/trie" - "github.com/hashicorp/golang-lru" + dexCore "github.com/byzantine-lab/dexon-consensus/core" + coreCrypto "github.com/byzantine-lab/dexon-consensus/core/crypto" + coreTypes "github.com/byzantine-lab/dexon-consensus/core/types" + lru "github.com/hashicorp/golang-lru" + + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/consensus" + "github.com/tangerine-network/go-tangerine/consensus/dexcon" + "github.com/tangerine-network/go-tangerine/core/rawdb" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/core/vm" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/params" + "github.com/tangerine-network/go-tangerine/rlp" + "github.com/tangerine-network/go-tangerine/trie" ) const ( @@ -307,7 +307,7 @@ func (hc *HeaderChain) InsertHeaderChain(chain []*types.Header, writeHeader WhCa return 0, nil } -func (hc *HeaderChain) WriteDexonHeader(header *types.HeaderWithGovState) (status WriteStatus, err error) { +func (hc *HeaderChain) WriteTangerineHeader(header *types.HeaderWithGovState) (status WriteStatus, err error) { // Cache some values to prevent constant recalculation var ( hash = header.Hash() @@ -463,7 +463,7 @@ func (c *headerVerifierCache) configuration(round uint64) *params.DexconConfig { return cfg } -func (hc *HeaderChain) ValidateDexonHeaderChain(chain []*types.HeaderWithGovState, +func (hc *HeaderChain) ValidateTangerineHeaderChain(chain []*types.HeaderWithGovState, gov dexcon.GovernanceStateFetcher, verifierCache *dexCore.TSigVerifierCache, validator Validator) (int, error) { // Do a sanity check that the provided chain is actually ordered and linked @@ -481,7 +481,7 @@ func (hc *HeaderChain) ValidateDexonHeaderChain(chain []*types.HeaderWithGovStat // If the last TSig pass the verification, we don't need to verify others. cache := newHeaderVerifierCache(verifierCache, gov) verifyTSig := false - if err := hc.verifyDexonHeader(chain[len(chain)-1].Header, gov, cache, true); err != nil { + if err := hc.verifyTangerineHeader(chain[len(chain)-1].Header, gov, cache, true); err != nil { verifyTSig = true } // Iterate over the headers and ensure they all check out @@ -499,7 +499,7 @@ func (hc *HeaderChain) ValidateDexonHeaderChain(chain []*types.HeaderWithGovStat } } - if err := hc.verifyDexonHeader(header.Header, gov, cache, verifyTSig); err != nil { + if err := hc.verifyTangerineHeader(header.Header, gov, cache, verifyTSig); err != nil { return i, err } @@ -532,7 +532,7 @@ func (hc *HeaderChain) ValidateDexonHeaderChain(chain []*types.HeaderWithGovStat return 0, nil } -func (hc *HeaderChain) VerifyDexonHeader(header *types.Header, +func (hc *HeaderChain) VerifyTangerineHeader(header *types.Header, gov dexcon.GovernanceStateFetcher, verifierCache *dexCore.TSigVerifierCache, validator Validator) error { @@ -540,7 +540,7 @@ func (hc *HeaderChain) VerifyDexonHeader(header *types.Header, return consensus.ErrUnknownAncestor } cache := newHeaderVerifierCache(verifierCache, gov) - if err := hc.verifyDexonHeader(header, gov, cache, true); err != nil { + if err := hc.verifyTangerineHeader(header, gov, cache, true); err != nil { return err } @@ -565,7 +565,7 @@ func (hc *HeaderChain) VerifyDexonHeader(header *types.Header, return nil } -func (hc *HeaderChain) verifyDexonHeader(header *types.Header, +func (hc *HeaderChain) verifyTangerineHeader(header *types.Header, gov dexcon.GovernanceStateFetcher, cache *headerVerifierCache, verifyTSig bool) error { @@ -659,7 +659,7 @@ func (hc *HeaderChain) verifyTSig(coreBlock *coreTypes.Block, return nil } -// InsertDexonHeaderChain attempts to insert the given header chain in to the local +// InsertTangerineHeaderChain attempts to insert the given header chain in to the local // chain, possibly creating a reorg. If an error is returned, it will return the // index number of the failing header as well an error describing what went wrong. // @@ -667,7 +667,7 @@ func (hc *HeaderChain) verifyTSig(coreBlock *coreTypes.Block, // should be done or not. The reason behind the optional check is because some // of the header retrieval mechanisms already need to verfy nonces, as well as // because nonces can be verified sparsely, not needing to check each. -func (hc *HeaderChain) InsertDexonHeaderChain(chain []*types.HeaderWithGovState, writeHeader Wh2Callback, start time.Time) (int, error) { +func (hc *HeaderChain) InsertTangerineHeaderChain(chain []*types.HeaderWithGovState, writeHeader Wh2Callback, start time.Time) (int, error) { // Collect some import statistics to report on stats := struct{ processed, ignored int }{} // All headers passed verification, import them into the database diff --git a/core/helper_test.go b/core/helper_test.go index 760829f18..7d66db974 100644 --- a/core/helper_test.go +++ b/core/helper_test.go @@ -19,9 +19,9 @@ package core import ( "container/list" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/event" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/event" ) // Implement our EthTest Manager diff --git a/core/mkalloc.go b/core/mkalloc.go index a871685f6..e6618bc0c 100644 --- a/core/mkalloc.go +++ b/core/mkalloc.go @@ -34,8 +34,8 @@ import ( "sort" "strconv" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/rlp" ) type nodeInfo struct { diff --git a/core/rawdb/accessors_chain.go b/core/rawdb/accessors_chain.go index 41a79b21d..ae2b461b1 100644 --- a/core/rawdb/accessors_chain.go +++ b/core/rawdb/accessors_chain.go @@ -22,10 +22,10 @@ import ( "math/big" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/rlp" ) // ReadCanonicalHash retrieves the hash assigned to a canonical block number. diff --git a/core/rawdb/accessors_chain_test.go b/core/rawdb/accessors_chain_test.go index 11f72b934..583e88872 100644 --- a/core/rawdb/accessors_chain_test.go +++ b/core/rawdb/accessors_chain_test.go @@ -21,10 +21,10 @@ import ( "math/big" "testing" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/rlp" "golang.org/x/crypto/sha3" ) diff --git a/core/rawdb/accessors_core_block.go b/core/rawdb/accessors_core_block.go index 5fa5c8f86..7484802a0 100644 --- a/core/rawdb/accessors_core_block.go +++ b/core/rawdb/accessors_core_block.go @@ -3,11 +3,11 @@ package rawdb import ( "bytes" - coreTypes "github.com/dexon-foundation/dexon-consensus/core/types" + coreTypes "github.com/byzantine-lab/dexon-consensus/core/types" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/rlp" ) func ReadCoreBlockRLP(db DatabaseReader, hash common.Hash) rlp.RawValue { diff --git a/core/rawdb/accessors_core_chain_tip.go b/core/rawdb/accessors_core_chain_tip.go index 95fa8854f..740fb470f 100644 --- a/core/rawdb/accessors_core_chain_tip.go +++ b/core/rawdb/accessors_core_chain_tip.go @@ -3,9 +3,9 @@ package rawdb import ( "bytes" - coreCommon "github.com/dexon-foundation/dexon-consensus/common" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/rlp" + coreCommon "github.com/byzantine-lab/dexon-consensus/common" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/rlp" ) func ReadCoreCompactionChainTipRLP(db DatabaseReader) (rlp.RawValue, error) { diff --git a/core/rawdb/accessors_core_dkg_private_key.go b/core/rawdb/accessors_core_dkg_private_key.go index 036e311aa..51938f204 100644 --- a/core/rawdb/accessors_core_dkg_private_key.go +++ b/core/rawdb/accessors_core_dkg_private_key.go @@ -3,9 +3,9 @@ package rawdb import ( "bytes" - coreDKG "github.com/dexon-foundation/dexon-consensus/core/crypto/dkg" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/rlp" + coreDKG "github.com/byzantine-lab/dexon-consensus/core/crypto/dkg" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/rlp" ) type dkgPrivateKey struct { diff --git a/core/rawdb/accessors_core_dkg_protocol.go b/core/rawdb/accessors_core_dkg_protocol.go index ba087b00d..b6ec532cd 100644 --- a/core/rawdb/accessors_core_dkg_protocol.go +++ b/core/rawdb/accessors_core_dkg_protocol.go @@ -3,9 +3,9 @@ package rawdb import ( "bytes" - coreDb "github.com/dexon-foundation/dexon-consensus/core/db" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/rlp" + coreDb "github.com/byzantine-lab/dexon-consensus/core/db" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/rlp" ) func ReadCoreDKGProtocolRLP(db DatabaseReader) rlp.RawValue { diff --git a/core/rawdb/accessors_indexes.go b/core/rawdb/accessors_indexes.go index 7cb938863..cf0a885d1 100644 --- a/core/rawdb/accessors_indexes.go +++ b/core/rawdb/accessors_indexes.go @@ -17,10 +17,10 @@ package rawdb import ( - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/rlp" ) // ReadTxLookupEntry retrieves the positional metadata associated with a transaction diff --git a/core/rawdb/accessors_indexes_test.go b/core/rawdb/accessors_indexes_test.go index ff59fad4c..f5d8b36f9 100644 --- a/core/rawdb/accessors_indexes_test.go +++ b/core/rawdb/accessors_indexes_test.go @@ -20,9 +20,9 @@ import ( "math/big" "testing" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/ethdb" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/ethdb" ) // Tests that positional lookup metadata can be stored and retrieved. diff --git a/core/rawdb/accessors_metadata.go b/core/rawdb/accessors_metadata.go index 3382a5300..ab13578c0 100644 --- a/core/rawdb/accessors_metadata.go +++ b/core/rawdb/accessors_metadata.go @@ -19,10 +19,10 @@ package rawdb import ( "encoding/json" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/params" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/params" + "github.com/tangerine-network/go-tangerine/rlp" ) // ReadDatabaseVersion retrieves the version number of the database. diff --git a/core/rawdb/schema.go b/core/rawdb/schema.go index 5b92891df..243730e3e 100644 --- a/core/rawdb/schema.go +++ b/core/rawdb/schema.go @@ -20,8 +20,8 @@ package rawdb import ( "encoding/binary" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/metrics" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/metrics" ) // The fields below define the low level database schema prefixing. diff --git a/core/state/database.go b/core/state/database.go index bdb64387f..4d264107c 100644 --- a/core/state/database.go +++ b/core/state/database.go @@ -20,10 +20,10 @@ import ( "fmt" "sync" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/trie" lru "github.com/hashicorp/golang-lru" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/trie" ) // Trie cache generation limit after which to evict trie nodes from memory. diff --git a/core/state/dump.go b/core/state/dump.go index 6033ae56c..1ec1c34b1 100644 --- a/core/state/dump.go +++ b/core/state/dump.go @@ -20,9 +20,9 @@ import ( "encoding/json" "fmt" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/rlp" - "github.com/dexon-foundation/dexon/trie" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/rlp" + "github.com/tangerine-network/go-tangerine/trie" ) type DumpAccount struct { diff --git a/core/state/gov.go b/core/state/gov.go index 8b94cfab2..766e64c72 100644 --- a/core/state/gov.go +++ b/core/state/gov.go @@ -1,9 +1,9 @@ package state import ( - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/trie" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/trie" ) func GetGovState(statedb *StateDB, header *types.Header, diff --git a/core/state/iterator.go b/core/state/iterator.go index 8c75f88e7..fac100212 100644 --- a/core/state/iterator.go +++ b/core/state/iterator.go @@ -20,9 +20,9 @@ import ( "bytes" "fmt" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/rlp" - "github.com/dexon-foundation/dexon/trie" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/rlp" + "github.com/tangerine-network/go-tangerine/trie" ) // NodeIterator is an iterator to traverse the entire state trie post-order, diff --git a/core/state/iterator_test.go b/core/state/iterator_test.go index 284f42c0e..7d69e0666 100644 --- a/core/state/iterator_test.go +++ b/core/state/iterator_test.go @@ -20,8 +20,8 @@ import ( "bytes" "testing" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/ethdb" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/ethdb" ) // Tests that the node iterator indeed walks over the entire database contents. diff --git a/core/state/journal.go b/core/state/journal.go index 9d669f73b..47f02f648 100644 --- a/core/state/journal.go +++ b/core/state/journal.go @@ -19,7 +19,7 @@ package state import ( "math/big" - "github.com/dexon-foundation/dexon/common" + "github.com/tangerine-network/go-tangerine/common" ) // journalEntry is a modification entry in the state change journal that can be diff --git a/core/state/managed_state.go b/core/state/managed_state.go index 4ac0a6bb2..6c084208e 100644 --- a/core/state/managed_state.go +++ b/core/state/managed_state.go @@ -19,7 +19,7 @@ package state import ( "sync" - "github.com/dexon-foundation/dexon/common" + "github.com/tangerine-network/go-tangerine/common" ) type account struct { diff --git a/core/state/managed_state_test.go b/core/state/managed_state_test.go index 74e7a6bd4..f1a6b977f 100644 --- a/core/state/managed_state_test.go +++ b/core/state/managed_state_test.go @@ -19,8 +19,8 @@ package state import ( "testing" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/ethdb" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/ethdb" ) var addr = common.BytesToAddress([]byte("test")) diff --git a/core/state/state_object.go b/core/state/state_object.go index 53f948346..e82d436fa 100644 --- a/core/state/state_object.go +++ b/core/state/state_object.go @@ -22,9 +22,9 @@ import ( "io" "math/big" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/rlp" ) var emptyCodeHash = crypto.Keccak256(nil) diff --git a/core/state/state_test.go b/core/state/state_test.go index cd7f56804..84e02e090 100644 --- a/core/state/state_test.go +++ b/core/state/state_test.go @@ -21,9 +21,9 @@ import ( "math/big" "testing" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/ethdb" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/ethdb" checker "gopkg.in/check.v1" ) diff --git a/core/state/statedb.go b/core/state/statedb.go index ee1a6d5d9..bc92cb21c 100644 --- a/core/state/statedb.go +++ b/core/state/statedb.go @@ -23,12 +23,12 @@ import ( "math/big" "sort" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/rlp" - "github.com/dexon-foundation/dexon/trie" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/rlp" + "github.com/tangerine-network/go-tangerine/trie" ) type revision struct { @@ -507,7 +507,7 @@ func (self *StateDB) Copy() *StateDB { } // Copy the dirty states, logs, and preimages for addr := range self.journal.dirties { - // As documented [here](https://github.com/dexon-foundation/dexon/pull/16485#issuecomment-380438527), + // As documented [here](https://github.com/tangerine-network/go-tangerine/pull/16485#issuecomment-380438527), // and in the Finalise-method, there is a case where an object is in the journal but not // in the stateObjects: OOG after touch on ripeMD prior to Byzantium. Thus, we need to check for // nil diff --git a/core/state/statedb_test.go b/core/state/statedb_test.go index 54b6e812a..d9ab94006 100644 --- a/core/state/statedb_test.go +++ b/core/state/statedb_test.go @@ -30,9 +30,9 @@ import ( check "gopkg.in/check.v1" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/ethdb" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/ethdb" ) // Tests that updating a state trie does not leak any database writes prior to @@ -119,7 +119,7 @@ func TestIntermediateLeaks(t *testing.T) { // TestCopy tests that copying a statedb object indeed makes the original and // the copy independent of each other. This test is a regression test against -// https://github.com/dexon-foundation/dexon/pull/15549. +// https://github.com/tangerine-network/go-tangerine/pull/15549. func TestCopy(t *testing.T) { // Create a random state test to copy and modify "independently" orig, _ := New(common.Hash{}, NewDatabase(ethdb.NewMemDatabase())) @@ -422,7 +422,7 @@ func (s *StateSuite) TestTouchDelete(c *check.C) { } // TestCopyOfCopy tests that modified objects are carried over to the copy, and the copy of the copy. -// See https://github.com/dexon-foundation/dexon/pull/15225#issuecomment-380191512 +// See https://github.com/tangerine-network/go-tangerine/pull/15225#issuecomment-380191512 func TestCopyOfCopy(t *testing.T) { sdb, _ := New(common.Hash{}, NewDatabase(ethdb.NewMemDatabase())) addr := common.HexToAddress("aaaa") diff --git a/core/state/sync.go b/core/state/sync.go index eb8f498a6..03073bff2 100644 --- a/core/state/sync.go +++ b/core/state/sync.go @@ -19,9 +19,9 @@ package state import ( "bytes" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/rlp" - "github.com/dexon-foundation/dexon/trie" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/rlp" + "github.com/tangerine-network/go-tangerine/trie" ) // NewStateSync create a new state trie download scheduler. diff --git a/core/state/sync_test.go b/core/state/sync_test.go index ef900e283..64b48cc27 100644 --- a/core/state/sync_test.go +++ b/core/state/sync_test.go @@ -21,10 +21,10 @@ import ( "math/big" "testing" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/trie" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/trie" ) // testAccount is the data associated with an account used by the state tests. diff --git a/core/state_processor.go b/core/state_processor.go index eaeb36f78..9edb6982c 100644 --- a/core/state_processor.go +++ b/core/state_processor.go @@ -17,14 +17,14 @@ package core import ( - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/consensus" - "github.com/dexon-foundation/dexon/consensus/misc" - "github.com/dexon-foundation/dexon/core/state" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/core/vm" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/consensus" + "github.com/tangerine-network/go-tangerine/consensus/misc" + "github.com/tangerine-network/go-tangerine/core/state" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/core/vm" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/params" ) // StateProcessor is a basic Processor, which takes care of transitioning diff --git a/core/state_transition.go b/core/state_transition.go index f5ac9bde6..8851b4f51 100644 --- a/core/state_transition.go +++ b/core/state_transition.go @@ -23,11 +23,11 @@ import ( "math/big" "sync/atomic" - dexCore "github.com/dexon-foundation/dexon-consensus/core" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/vm" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/params" + dexCore "github.com/byzantine-lab/dexon-consensus/core" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/vm" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/params" ) var legacyEvm = flag.Bool("legacy-evm", false, "make evm run origin logic") diff --git a/core/tx_cacher.go b/core/tx_cacher.go index 5140adee4..4de8d2657 100644 --- a/core/tx_cacher.go +++ b/core/tx_cacher.go @@ -19,7 +19,7 @@ package core import ( "runtime" - "github.com/dexon-foundation/dexon/core/types" + "github.com/tangerine-network/go-tangerine/core/types" ) // senderCacher is a concurrent transaction sender recoverer and cacher. diff --git a/core/tx_journal.go b/core/tx_journal.go index 9a121f911..a15134ea1 100644 --- a/core/tx_journal.go +++ b/core/tx_journal.go @@ -21,10 +21,10 @@ import ( "io" "os" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/rlp" ) // errNoActiveJournal is returned if a transaction is attempted to be inserted diff --git a/core/tx_list.go b/core/tx_list.go index 457f4da96..87e556170 100644 --- a/core/tx_list.go +++ b/core/tx_list.go @@ -22,9 +22,9 @@ import ( "math/big" "sort" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/log" ) // nonceHeap is a heap.Interface implementation over 64bit unsigned integers for diff --git a/core/tx_list_test.go b/core/tx_list_test.go index 20b6b543a..4b2a6c760 100644 --- a/core/tx_list_test.go +++ b/core/tx_list_test.go @@ -20,8 +20,8 @@ import ( "math/rand" "testing" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/crypto" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/crypto" ) // Tests that transactions can be added to strict lists and list contents and diff --git a/core/tx_pool.go b/core/tx_pool.go index e7dbab0d2..4822279c9 100644 --- a/core/tx_pool.go +++ b/core/tx_pool.go @@ -24,17 +24,17 @@ import ( "sync" "time" - dexCore "github.com/dexon-foundation/dexon-consensus/core" - - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/prque" - "github.com/dexon-foundation/dexon/core/state" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/core/vm" - "github.com/dexon-foundation/dexon/event" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/metrics" - "github.com/dexon-foundation/dexon/params" + dexCore "github.com/byzantine-lab/dexon-consensus/core" + + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/prque" + "github.com/tangerine-network/go-tangerine/core/state" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/core/vm" + "github.com/tangerine-network/go-tangerine/event" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/metrics" + "github.com/tangerine-network/go-tangerine/params" ) const ( diff --git a/core/tx_pool_test.go b/core/tx_pool_test.go index 2b362bdd4..e3c2e2382 100644 --- a/core/tx_pool_test.go +++ b/core/tx_pool_test.go @@ -26,13 +26,13 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/state" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/event" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/state" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/event" + "github.com/tangerine-network/go-tangerine/params" ) // testTxPoolConfig is a transaction pool configuration without stateful disk diff --git a/core/types.go b/core/types.go index 04a787b1e..c2ac688c6 100644 --- a/core/types.go +++ b/core/types.go @@ -17,10 +17,10 @@ package core import ( - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/state" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/core/vm" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/state" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/core/vm" ) // Validator is an interface which defines the standard for block validation. It diff --git a/core/types/block.go b/core/types/block.go index 88e537e3a..60e59e283 100644 --- a/core/types/block.go +++ b/core/types/block.go @@ -28,9 +28,9 @@ import ( "time" "unsafe" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/rlp" "golang.org/x/crypto/sha3" ) diff --git a/core/types/bloom9.go b/core/types/bloom9.go index 6ad94d5bb..112e471b2 100644 --- a/core/types/bloom9.go +++ b/core/types/bloom9.go @@ -20,8 +20,8 @@ import ( "fmt" "math/big" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/crypto" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/crypto" ) type bytesBacked interface { diff --git a/core/types/bloom9_test.go b/core/types/bloom9_test.go index 5234bf575..8ef457fb1 100644 --- a/core/types/bloom9_test.go +++ b/core/types/bloom9_test.go @@ -54,7 +54,7 @@ func TestBloom(t *testing.T) { import ( "testing" - "github.com/dexon-foundation/dexon/core/state" + "github.com/tangerine-network/go-tangerine/core/state" ) func TestBloom9(t *testing.T) { diff --git a/core/types/derive_sha.go b/core/types/derive_sha.go index 5ffb329eb..bede63eea 100644 --- a/core/types/derive_sha.go +++ b/core/types/derive_sha.go @@ -19,9 +19,9 @@ package types import ( "bytes" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/rlp" - "github.com/dexon-foundation/dexon/trie" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/rlp" + "github.com/tangerine-network/go-tangerine/trie" ) type DerivableList interface { diff --git a/core/types/gen_header_json.go b/core/types/gen_header_json.go index 5b14ab26e..8e5227bff 100644 --- a/core/types/gen_header_json.go +++ b/core/types/gen_header_json.go @@ -7,8 +7,8 @@ import ( "errors" "math/big" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" ) var _ = (*headerMarshaling)(nil) diff --git a/core/types/gen_log_json.go b/core/types/gen_log_json.go index e301a69c8..666f4287c 100644 --- a/core/types/gen_log_json.go +++ b/core/types/gen_log_json.go @@ -6,8 +6,8 @@ import ( "encoding/json" "errors" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" ) var _ = (*logMarshaling)(nil) diff --git a/core/types/gen_receipt_json.go b/core/types/gen_receipt_json.go index c9102e046..7b8d3f679 100644 --- a/core/types/gen_receipt_json.go +++ b/core/types/gen_receipt_json.go @@ -6,8 +6,8 @@ import ( "encoding/json" "errors" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" ) var _ = (*receiptMarshaling)(nil) diff --git a/core/types/gen_tx_json.go b/core/types/gen_tx_json.go index 2f216dfb9..2ff5c94e0 100644 --- a/core/types/gen_tx_json.go +++ b/core/types/gen_tx_json.go @@ -7,8 +7,8 @@ import ( "errors" "math/big" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" ) var _ = (*txdataMarshaling)(nil) diff --git a/core/types/govstate.go b/core/types/govstate.go index 2c3dff933..aa832e336 100644 --- a/core/types/govstate.go +++ b/core/types/govstate.go @@ -3,7 +3,7 @@ package types import ( "math/big" - "github.com/dexon-foundation/dexon/common" + "github.com/tangerine-network/go-tangerine/common" ) type GovState struct { diff --git a/core/types/log.go b/core/types/log.go index 4b7d8378d..be7539ee6 100644 --- a/core/types/log.go +++ b/core/types/log.go @@ -19,9 +19,9 @@ package types import ( "io" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/rlp" ) //go:generate gencodec -type Log -field-override logMarshaling -out gen_log_json.go diff --git a/core/types/log_test.go b/core/types/log_test.go index 2115c9333..119d0c793 100644 --- a/core/types/log_test.go +++ b/core/types/log_test.go @@ -23,8 +23,8 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" ) var unmarshalLogTests = map[string]struct { diff --git a/core/types/receipt.go b/core/types/receipt.go index f05acf8d3..1bea6962f 100644 --- a/core/types/receipt.go +++ b/core/types/receipt.go @@ -22,9 +22,9 @@ import ( "io" "unsafe" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/rlp" ) //go:generate gencodec -type Receipt -field-override receiptMarshaling -out gen_receipt_json.go diff --git a/core/types/transaction.go b/core/types/transaction.go index 857ac2137..2128e1a9a 100644 --- a/core/types/transaction.go +++ b/core/types/transaction.go @@ -23,10 +23,10 @@ import ( "math/big" "sync/atomic" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/rlp" ) //go:generate gencodec -type txdata -field-override txdataMarshaling -out gen_tx_json.go diff --git a/core/types/transaction_signing.go b/core/types/transaction_signing.go index 04abeb402..45a103df3 100644 --- a/core/types/transaction_signing.go +++ b/core/types/transaction_signing.go @@ -24,9 +24,9 @@ import ( "runtime" "sync" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/params" ) var ( diff --git a/core/types/transaction_signing_test.go b/core/types/transaction_signing_test.go index 4ce9f3947..3cd489ca2 100644 --- a/core/types/transaction_signing_test.go +++ b/core/types/transaction_signing_test.go @@ -20,9 +20,9 @@ import ( "math/big" "testing" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/rlp" ) func TestEIP155Signing(t *testing.T) { diff --git a/core/types/transaction_test.go b/core/types/transaction_test.go index 55e4ba93b..c2a23ee3a 100644 --- a/core/types/transaction_test.go +++ b/core/types/transaction_test.go @@ -23,9 +23,9 @@ import ( "math/big" "testing" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/rlp" ) // The values in those tests are from the Transaction Tests diff --git a/core/vm/analysis_test.go b/core/vm/analysis_test.go index c4fe93474..aa248c1ad 100644 --- a/core/vm/analysis_test.go +++ b/core/vm/analysis_test.go @@ -19,7 +19,7 @@ package vm import ( "testing" - "github.com/dexon-foundation/dexon/crypto" + "github.com/tangerine-network/go-tangerine/crypto" ) func TestJumpDestAnalysis(t *testing.T) { diff --git a/core/vm/common.go b/core/vm/common.go index 7702b2a86..f9877a494 100644 --- a/core/vm/common.go +++ b/core/vm/common.go @@ -19,8 +19,8 @@ package vm import ( "math/big" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/math" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/math" ) // calculates the memory size required for a step diff --git a/core/vm/contract.go b/core/vm/contract.go index 751da072e..1ad02c202 100644 --- a/core/vm/contract.go +++ b/core/vm/contract.go @@ -19,7 +19,7 @@ package vm import ( "math/big" - "github.com/dexon-foundation/dexon/common" + "github.com/tangerine-network/go-tangerine/common" ) // ContractRef is a reference to the contract's backing object diff --git a/core/vm/contracts.go b/core/vm/contracts.go index ac8fd22df..b24261b99 100644 --- a/core/vm/contracts.go +++ b/core/vm/contracts.go @@ -21,11 +21,11 @@ import ( "errors" "math/big" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/math" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/crypto/bn256" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/math" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/crypto/bn256" + "github.com/tangerine-network/go-tangerine/params" "golang.org/x/crypto/ripemd160" ) diff --git a/core/vm/contracts_test.go b/core/vm/contracts_test.go index f0090fcce..d602cea77 100644 --- a/core/vm/contracts_test.go +++ b/core/vm/contracts_test.go @@ -21,7 +21,7 @@ import ( "math/big" "testing" - "github.com/dexon-foundation/dexon/common" + "github.com/tangerine-network/go-tangerine/common" ) // precompiledTest defines the input/output pairs for precompiled contract tests. diff --git a/core/vm/evm.go b/core/vm/evm.go index baf3a0ac9..84b98d7c2 100644 --- a/core/vm/evm.go +++ b/core/vm/evm.go @@ -21,10 +21,10 @@ import ( "sync/atomic" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/state" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/state" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/params" ) // emptyCodeHash is used by create to ensure deployment is disallowed to already diff --git a/core/vm/evm_test.go b/core/vm/evm_test.go index 4b2714351..df78261aa 100644 --- a/core/vm/evm_test.go +++ b/core/vm/evm_test.go @@ -26,12 +26,12 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/accounts/abi" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/state" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/accounts/abi" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/state" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/params" ) var cobContract = string("608060405234801561001057600080fd5b5033600360006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506123ba806100616000396000f300608060405260043610610154576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806306fdde0314610160578063078fd9ea146101f0578063095ea7b31461021b5780630b97bc861461028057806318160ddd146102ab57806323b872dd146102d6578063313ce5671461035b5780634042b66f1461038c5780634bb278f3146103b7578063521eb273146103ce578063661884631461042557806368428a1b1461048a57806370a08231146104b9578063715018a6146105105780638da5cb5b1461052757806395d89b411461057e578063a77c61f21461060e578063a9059cbb1461066d578063b52e0dc8146106d2578063b753a98c14610713578063c24a0f8b14610760578063c3262dfd1461078b578063d73dd623146107bc578063dd62ed3e14610821578063f2fde38b14610898578063f92ad219146108db575b61015e3334610946565b005b34801561016c57600080fd5b50610175610b97565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156101b557808201518184015260208101905061019a565b50505050905090810190601f1680156101e25780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b3480156101fc57600080fd5b50610205610bd0565b6040518082815260200191505060405180910390f35b34801561022757600080fd5b50610266600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610bd6565b604051808215151515815260200191505060405180910390f35b34801561028c57600080fd5b50610295610cc8565b6040518082815260200191505060405180910390f35b3480156102b757600080fd5b506102c0610cce565b6040518082815260200191505060405180910390f35b3480156102e257600080fd5b50610341600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610cd8565b604051808215151515815260200191505060405180910390f35b34801561036757600080fd5b50610370611093565b604051808260ff1660ff16815260200191505060405180910390f35b34801561039857600080fd5b506103a1611098565b6040518082815260200191505060405180910390f35b3480156103c357600080fd5b506103cc61109e565b005b3480156103da57600080fd5b506103e361123f565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34801561043157600080fd5b50610470600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050611265565b604051808215151515815260200191505060405180910390f35b34801561049657600080fd5b5061049f6114f7565b604051808215151515815260200191505060405180910390f35b3480156104c557600080fd5b506104fa600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050611532565b6040518082815260200191505060405180910390f35b34801561051c57600080fd5b5061052561157a565b005b34801561053357600080fd5b5061053c61167f565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34801561058a57600080fd5b506105936116a5565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156105d35780820151818401526020810190506105b8565b50505050905090810190601f1680156106005780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b34801561061a57600080fd5b5061064f600480360381019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291905050506116de565b60405180826000191660001916815260200191505060405180910390f35b34801561067957600080fd5b506106b8600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001909291905050506116f6565b604051808215151515815260200191505060405180910390f35b3480156106de57600080fd5b506106fd60048036038101908080359060200190929190505050611916565b6040518082815260200191505060405180910390f35b34801561071f57600080fd5b5061075e600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001909291905050506119ae565b005b34801561076c57600080fd5b50610775611c35565b6040518082815260200191505060405180910390f35b34801561079757600080fd5b506107ba6004803603810190808035600019169060200190929190505050611c3b565b005b3480156107c857600080fd5b50610807600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050611cf9565b604051808215151515815260200191505060405180910390f35b34801561082d57600080fd5b50610882600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050611ef5565b6040518082815260200191505060405180910390f35b3480156108a457600080fd5b506108d9600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050611f7c565b005b3480156108e757600080fd5b50610944600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190803590602001909291908035906020019092919080359060200190929190505050611fe4565b005b6000806000806109546114f7565b151561095f57600080fd5b67016345785d8a0000851015151561097657600080fd5b84935061098e846009546121ec90919063ffffffff16565b92506109a061099b612208565b611916565b91506109b5828561221090919063ffffffff16565b9050806109c0612248565b101515156109cd57600080fd5b610a098160008060b173ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205461227990919063ffffffff16565b60008060b173ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610a87816000808973ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020546121ec90919063ffffffff16565b6000808873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508573ffffffffffffffffffffffffffffffffffffffff167fcd60aa75dea3072fbc07ae6d7d856b5dc5f4eee88854f5b4abf7b680ef8bc50f8583604051808381526020018281526020019250505060405180910390a282600981905550600860009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc349081150290604051600060405180830381858888f19350505050158015610b8e573d6000803e3d6000fd5b50505050505050565b6040805190810160405280600f81526020017f436f62696e686f6f6420546f6b656e000000000000000000000000000000000081525081565b60075481565b600081600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925846040518082815260200191505060405180910390a36001905092915050565b60055481565b6000600454905090565b60008060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548211151515610d2757600080fd5b600260008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548211151515610db257600080fd5b600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff1614151515610dee57600080fd5b610e3f826000808773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205461227990919063ffffffff16565b6000808673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610ed2826000808673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020546121ec90919063ffffffff16565b6000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610fa382600260008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205461227990919063ffffffff16565b600260008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3600190509392505050565b601281565b60095481565b600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff161415156110fa57600080fd5b6111026114f7565b15151561110e57600080fd5b6111aa60008060b173ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054600080600860009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020546121ec90919063ffffffff16565b600080600860009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550600080600060b173ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550565b600860009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b600080600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205490508083101515611377576000600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000208190555061140b565b61138a838261227990919063ffffffff16565b600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055505b8373ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020546040518082815260200191505060405180910390a3600191505092915050565b6000600554611504612208565b1015801561151a5750600654611518612208565b105b801561152d5750600061152b612248565b115b905090565b60008060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020549050919050565b600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff161415156115d657600080fd5b600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff167ff8df31144d9c2f0f6b59d69b8b98abd5459d07f2742c4df920b25aae33c6482060405160405180910390a26000600360006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550565b600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b6040805190810160405280600381526020017f434f42000000000000000000000000000000000000000000000000000000000081525081565b600a6020528060005260406000206000915090505481565b60008060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054821115151561174557600080fd5b600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff161415151561178157600080fd5b6117d2826000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205461227990919063ffffffff16565b6000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550611865826000808673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020546121ec90919063ffffffff16565b6000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a36001905092915050565b600060055482101561192b57600090506119a9565b62093a8060055401821015611944576115e090506119a9565b621275006005540182101561195d5761145090506119a9565b621baf8060055401821015611976576112c090506119a9565b6224ea006005540182101561198f5761113090506119a9565b600654821115156119a457610fa090506119a9565b600090505b919050565b600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515611a0a57600080fd5b80600080600860009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205410151515611a7957600080fd5b611aec81600080600860009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205461227990919063ffffffff16565b600080600860009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550611ba1816000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020546121ec90919063ffffffff16565b6000808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff167fdb2d10a559cb6e14fee5a7a2d8c216314e11c22404e85a4f9af45f07c87192bb826040518082815260200191505060405180910390a25050565b60065481565b80600a60003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081600019169055507fa1a3e4c7b21b6004c77b4fe18bdd0d1bd1be31dbb88112463524daa9abacb8363382604051808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182600019166000191681526020019250505060405180910390a150565b6000611d8a82600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020546121ec90919063ffffffff16565b600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020546040518082815260200191505060405180910390a36001905092915050565b6000600260008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054905092915050565b600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515611fd857600080fd5b611fe181612292565b50565b600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614151561204057600080fd5b6000600860009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1614151561208757600080fd5b61208f612208565b841015151561209d57600080fd5b82841015156120ab57600080fd5b60008573ffffffffffffffffffffffffffffffffffffffff16141515156120d157600080fd5b81811115156120df57600080fd5b83600581905550826006819055508160078190555084600860006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550806004819055506121516007548261227990919063ffffffff16565b600080600860009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000208190555060075460008060b173ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055505050505050565b600081830190508281101515156121ff57fe5b80905092915050565b600042905090565b6000808314156122235760009050612242565b818302905081838281151561223457fe5b0414151561223e57fe5b8090505b92915050565b600080600060b173ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054905090565b600082821115151561228757fe5b818303905092915050565b600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff16141515156122ce57600080fd5b8073ffffffffffffffffffffffffffffffffffffffff16600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e060405160405180910390a380600360006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550505600a165627a7a723058209accf1a69ff5978107f5013b9b8716cc08726d534484a57fc04c94d084be8cf80029") diff --git a/core/vm/gas.go b/core/vm/gas.go index 52c3b02f1..fa8db857f 100644 --- a/core/vm/gas.go +++ b/core/vm/gas.go @@ -19,7 +19,7 @@ package vm import ( "math/big" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/params" ) // Gas costs diff --git a/core/vm/gas_table.go b/core/vm/gas_table.go index 0126e26d4..a8a4990d0 100644 --- a/core/vm/gas_table.go +++ b/core/vm/gas_table.go @@ -17,9 +17,9 @@ package vm import ( - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/math" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/math" + "github.com/tangerine-network/go-tangerine/params" ) // memoryGasCosts calculates the quadratic gas for memory expansion. It does so diff --git a/core/vm/gen_structlog.go b/core/vm/gen_structlog.go index a3da8734f..b87fe4c3e 100644 --- a/core/vm/gen_structlog.go +++ b/core/vm/gen_structlog.go @@ -6,9 +6,9 @@ import ( "encoding/json" "math/big" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/common/math" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/common/math" ) var _ = (*structLogMarshaling)(nil) diff --git a/core/vm/instructions.go b/core/vm/instructions.go index cb1f1bbaa..b096bfdd4 100644 --- a/core/vm/instructions.go +++ b/core/vm/instructions.go @@ -22,11 +22,11 @@ import ( "fmt" "math/big" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/math" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/math" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/params" "golang.org/x/crypto/sha3" ) diff --git a/core/vm/instructions_test.go b/core/vm/instructions_test.go index 04c03e1a6..0eade4696 100644 --- a/core/vm/instructions_test.go +++ b/core/vm/instructions_test.go @@ -21,9 +21,9 @@ import ( "math/big" "testing" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/params" ) type twoOperandTest struct { diff --git a/core/vm/interface.go b/core/vm/interface.go index 3e86a4ff2..62199c9c9 100644 --- a/core/vm/interface.go +++ b/core/vm/interface.go @@ -19,8 +19,8 @@ package vm import ( "math/big" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/types" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/types" ) // StateDB is an EVM database for full state querying. diff --git a/core/vm/interpreter.go b/core/vm/interpreter.go index ffe5ff626..5a9fed0ba 100644 --- a/core/vm/interpreter.go +++ b/core/vm/interpreter.go @@ -21,9 +21,9 @@ import ( "hash" "sync/atomic" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/math" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/math" + "github.com/tangerine-network/go-tangerine/params" ) // Config are the configuration options for the Interpreter diff --git a/core/vm/jump_table.go b/core/vm/jump_table.go index 608e34419..c1b57ea89 100644 --- a/core/vm/jump_table.go +++ b/core/vm/jump_table.go @@ -20,7 +20,7 @@ import ( "errors" "math/big" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/params" ) type ( diff --git a/core/vm/logger.go b/core/vm/logger.go index fd36c26d5..2050d9fca 100644 --- a/core/vm/logger.go +++ b/core/vm/logger.go @@ -23,10 +23,10 @@ import ( "math/big" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/common/math" - "github.com/dexon-foundation/dexon/core/types" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/common/math" + "github.com/tangerine-network/go-tangerine/core/types" ) // Storage represents a contract's storage. diff --git a/core/vm/logger_json.go b/core/vm/logger_json.go index 9b7555194..bf909300b 100644 --- a/core/vm/logger_json.go +++ b/core/vm/logger_json.go @@ -22,8 +22,8 @@ import ( "math/big" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/math" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/math" ) type JSONLogger struct { diff --git a/core/vm/logger_test.go b/core/vm/logger_test.go index 560893c50..64960a4fd 100644 --- a/core/vm/logger_test.go +++ b/core/vm/logger_test.go @@ -20,9 +20,9 @@ import ( "math/big" "testing" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/state" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/state" + "github.com/tangerine-network/go-tangerine/params" ) type dummyContractRef struct { diff --git a/core/vm/memory.go b/core/vm/memory.go index 65ffe26c7..3f8a9f405 100644 --- a/core/vm/memory.go +++ b/core/vm/memory.go @@ -20,7 +20,7 @@ import ( "fmt" "math/big" - "github.com/dexon-foundation/dexon/common/math" + "github.com/tangerine-network/go-tangerine/common/math" ) // Memory implements a simple memory model for the ethereum virtual machine. diff --git a/core/vm/memory_table.go b/core/vm/memory_table.go index 13f15b943..423f661f4 100644 --- a/core/vm/memory_table.go +++ b/core/vm/memory_table.go @@ -19,7 +19,7 @@ package vm import ( "math/big" - "github.com/dexon-foundation/dexon/common/math" + "github.com/tangerine-network/go-tangerine/common/math" ) func memorySha3(stack *Stack) *big.Int { diff --git a/core/vm/oracle.go b/core/vm/oracle.go index 0d4c10d9e..b2dac4521 100644 --- a/core/vm/oracle.go +++ b/core/vm/oracle.go @@ -20,8 +20,8 @@ package vm import ( "strings" - "github.com/dexon-foundation/dexon/accounts/abi" - "github.com/dexon-foundation/dexon/common" + "github.com/tangerine-network/go-tangerine/accounts/abi" + "github.com/tangerine-network/go-tangerine/common" ) var GovernanceContractAddress = common.HexToAddress("63751838d6485578b23e8b051d40861ecc416794") diff --git a/core/vm/oracle_contract_abi.go b/core/vm/oracle_contract_abi.go index 0516f3891..53c3edc1e 100644 --- a/core/vm/oracle_contract_abi.go +++ b/core/vm/oracle_contract_abi.go @@ -18,7 +18,7 @@ package vm // The governance ABI is generated from: -// https://github.com/dexon-foundation/governance-abi +// https://github.com/tangerine-network/governance-abi const GovernanceABIJSON = ` [ diff --git a/core/vm/oracle_contracts.go b/core/vm/oracle_contracts.go index 72d929843..05d4bd821 100644 --- a/core/vm/oracle_contracts.go +++ b/core/vm/oracle_contracts.go @@ -26,21 +26,21 @@ import ( "sort" "sync/atomic" - "github.com/dexon-foundation/dexon/accounts/abi" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/params" - "github.com/dexon-foundation/dexon/rlp" - - coreCommon "github.com/dexon-foundation/dexon-consensus/common" - dexCore "github.com/dexon-foundation/dexon-consensus/core" - coreCrypto "github.com/dexon-foundation/dexon-consensus/core/crypto" - coreUtils "github.com/dexon-foundation/dexon-consensus/core/utils" - - "github.com/dexon-foundation/dexon-consensus/core/crypto/ecdsa" - coreTypes "github.com/dexon-foundation/dexon-consensus/core/types" - dkgTypes "github.com/dexon-foundation/dexon-consensus/core/types/dkg" + "github.com/tangerine-network/go-tangerine/accounts/abi" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/params" + "github.com/tangerine-network/go-tangerine/rlp" + + coreCommon "github.com/byzantine-lab/dexon-consensus/common" + dexCore "github.com/byzantine-lab/dexon-consensus/core" + coreCrypto "github.com/byzantine-lab/dexon-consensus/core/crypto" + coreUtils "github.com/byzantine-lab/dexon-consensus/core/utils" + + "github.com/byzantine-lab/dexon-consensus/core/crypto/ecdsa" + coreTypes "github.com/byzantine-lab/dexon-consensus/core/types" + dkgTypes "github.com/byzantine-lab/dexon-consensus/core/types/dkg" ) type Bytes32 [32]byte diff --git a/core/vm/oracle_contracts_test.go b/core/vm/oracle_contracts_test.go index 7605fadf8..9a2c151bf 100644 --- a/core/vm/oracle_contracts_test.go +++ b/core/vm/oracle_contracts_test.go @@ -26,21 +26,21 @@ import ( "testing" "time" - coreCommon "github.com/dexon-foundation/dexon-consensus/common" - dexCore "github.com/dexon-foundation/dexon-consensus/core" - coreCrypto "github.com/dexon-foundation/dexon-consensus/core/crypto" - coreEcdsa "github.com/dexon-foundation/dexon-consensus/core/crypto/ecdsa" - coreTypes "github.com/dexon-foundation/dexon-consensus/core/types" - dkgTypes "github.com/dexon-foundation/dexon-consensus/core/types/dkg" - coreUtils "github.com/dexon-foundation/dexon-consensus/core/utils" - - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/state" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/params" - "github.com/dexon-foundation/dexon/rlp" + coreCommon "github.com/byzantine-lab/dexon-consensus/common" + dexCore "github.com/byzantine-lab/dexon-consensus/core" + coreCrypto "github.com/byzantine-lab/dexon-consensus/core/crypto" + coreEcdsa "github.com/byzantine-lab/dexon-consensus/core/crypto/ecdsa" + coreTypes "github.com/byzantine-lab/dexon-consensus/core/types" + dkgTypes "github.com/byzantine-lab/dexon-consensus/core/types/dkg" + coreUtils "github.com/byzantine-lab/dexon-consensus/core/utils" + "github.com/stretchr/testify/suite" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/state" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/params" + "github.com/tangerine-network/go-tangerine/rlp" ) func init() { diff --git a/core/vm/runtime/env.go b/core/vm/runtime/env.go index 6f241a329..9031a130a 100644 --- a/core/vm/runtime/env.go +++ b/core/vm/runtime/env.go @@ -17,9 +17,9 @@ package runtime import ( - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/vm" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/vm" ) func NewEnv(cfg *Config) *vm.EVM { diff --git a/core/vm/runtime/runtime.go b/core/vm/runtime/runtime.go index 5656f661a..179a5c93a 100644 --- a/core/vm/runtime/runtime.go +++ b/core/vm/runtime/runtime.go @@ -21,12 +21,12 @@ import ( "math/big" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/state" - "github.com/dexon-foundation/dexon/core/vm" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/state" + "github.com/tangerine-network/go-tangerine/core/vm" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/params" ) // Config is a basic type specifying certain configuration flags for running diff --git a/core/vm/runtime/runtime_example_test.go b/core/vm/runtime/runtime_example_test.go index 036cfe558..8602b41be 100644 --- a/core/vm/runtime/runtime_example_test.go +++ b/core/vm/runtime/runtime_example_test.go @@ -19,8 +19,8 @@ package runtime_test import ( "fmt" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/vm/runtime" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/vm/runtime" ) func ExampleExecute() { diff --git a/core/vm/runtime/runtime_test.go b/core/vm/runtime/runtime_test.go index fe03bd43f..68d76dfd1 100644 --- a/core/vm/runtime/runtime_test.go +++ b/core/vm/runtime/runtime_test.go @@ -21,12 +21,12 @@ import ( "strings" "testing" - "github.com/dexon-foundation/dexon/accounts/abi" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/state" - "github.com/dexon-foundation/dexon/core/vm" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/accounts/abi" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/state" + "github.com/tangerine-network/go-tangerine/core/vm" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/params" ) func TestDefaults(t *testing.T) { diff --git a/core/vm/stack_table.go b/core/vm/stack_table.go index df544aef8..398eace16 100644 --- a/core/vm/stack_table.go +++ b/core/vm/stack_table.go @@ -19,7 +19,7 @@ package vm import ( "fmt" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/params" ) func makeStackFunc(pop, push int) stackValidationFunc { diff --git a/crypto/bn256/bn256_fast.go b/crypto/bn256/bn256_fast.go index 702521c32..75a6cfad9 100644 --- a/crypto/bn256/bn256_fast.go +++ b/crypto/bn256/bn256_fast.go @@ -7,7 +7,7 @@ // Package bn256 implements the Optimal Ate pairing over a 256-bit Barreto-Naehrig curve. package bn256 -import "github.com/dexon-foundation/dexon/crypto/bn256/cloudflare" +import bn256 "github.com/tangerine-network/go-tangerine/crypto/bn256/google" // G1 is an abstract cyclic group. The zero value is suitable for use as the // output of an operation, but cannot be used as an input. diff --git a/crypto/bn256/bn256_fuzz.go b/crypto/bn256/bn256_fuzz.go index dd838d7f2..6a969c9f8 100644 --- a/crypto/bn256/bn256_fuzz.go +++ b/crypto/bn256/bn256_fuzz.go @@ -10,8 +10,8 @@ import ( "bytes" "math/big" - cloudflare "github.com/dexon-foundation/dexon/crypto/bn256/cloudflare" - google "github.com/dexon-foundation/dexon/crypto/bn256/google" + cloudflare "github.com/tangerine-network/go-tangerine/crypto/bn256/cloudflare" + google "github.com/tangerine-network/go-tangerine/crypto/bn256/google" ) // FuzzAdd fuzzez bn256 addition between the Google and Cloudflare libraries. diff --git a/crypto/bn256/bn256_slow.go b/crypto/bn256/bn256_slow.go index 56c6437c5..9d1688dde 100644 --- a/crypto/bn256/bn256_slow.go +++ b/crypto/bn256/bn256_slow.go @@ -7,7 +7,7 @@ // Package bn256 implements the Optimal Ate pairing over a 256-bit Barreto-Naehrig curve. package bn256 -import "github.com/dexon-foundation/dexon/crypto/bn256/google" +import bn256 "github.com/tangerine-network/go-tangerine/crypto/bn256/google" // G1 is an abstract cyclic group. The zero value is suitable for use as the // output of an operation, but cannot be used as an input. diff --git a/crypto/crypto.go b/crypto/crypto.go index 1ae07e13c..d0c3d40da 100644 --- a/crypto/crypto.go +++ b/crypto/crypto.go @@ -28,9 +28,9 @@ import ( "math/big" "os" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/math" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/math" + "github.com/tangerine-network/go-tangerine/rlp" "golang.org/x/crypto/sha3" ) diff --git a/crypto/crypto_test.go b/crypto/crypto_test.go index fa8521248..fe380fe03 100644 --- a/crypto/crypto_test.go +++ b/crypto/crypto_test.go @@ -26,8 +26,8 @@ import ( "reflect" "testing" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" ) var testAddrHex = "970e8128ab834e8eac17ab8e3812f010678cf791" diff --git a/crypto/ecies/ecies_test.go b/crypto/ecies/ecies_test.go index 8d4e47ba7..b2009ea9a 100644 --- a/crypto/ecies/ecies_test.go +++ b/crypto/ecies/ecies_test.go @@ -40,7 +40,7 @@ import ( "math/big" "testing" - "github.com/dexon-foundation/dexon/crypto" + "github.com/tangerine-network/go-tangerine/crypto" ) var dumpEnc bool diff --git a/crypto/ecies/params.go b/crypto/ecies/params.go index cc66fe839..1329f5a1b 100644 --- a/crypto/ecies/params.go +++ b/crypto/ecies/params.go @@ -42,7 +42,7 @@ import ( "fmt" "hash" - ethcrypto "github.com/dexon-foundation/dexon/crypto" + ethcrypto "github.com/tangerine-network/go-tangerine/crypto" ) var ( diff --git a/crypto/signature_cgo.go b/crypto/signature_cgo.go index 523e11a5e..a5077dc17 100644 --- a/crypto/signature_cgo.go +++ b/crypto/signature_cgo.go @@ -23,8 +23,8 @@ import ( "crypto/elliptic" "fmt" - "github.com/dexon-foundation/dexon/common/math" "github.com/ethereum/go-ethereum/crypto/secp256k1" + "github.com/tangerine-network/go-tangerine/common/math" ) // Ecrecover returns the uncompressed public key that created the given signature. diff --git a/crypto/signature_test.go b/crypto/signature_test.go index 3cb850fb8..6d35d5094 100644 --- a/crypto/signature_test.go +++ b/crypto/signature_test.go @@ -22,9 +22,9 @@ import ( "reflect" "testing" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/common/math" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/common/math" ) var ( diff --git a/dashboard/assets.go b/dashboard/assets.go index 50467420c..7cecc7baa 100644 --- a/dashboard/assets.go +++ b/dashboard/assets.go @@ -32727,7 +32727,7 @@ var _bundleJs = []byte((((((((((`!function(modules) { }, _react2.default.createElement("span", { style: _common.styles.light }, "Commit "), _react2.default.createElement("a", { - href: "https://github.com/dexon-foundation/dexon/commit/" + general.commit, + href: "https://github.com/tangerine-network/go-tangerine/commit/" + general.commit, target: "_blank", style: { color: "inherit", diff --git a/dashboard/assets/components/Footer.jsx b/dashboard/assets/components/Footer.jsx index e167ea83e..7f6c8100d 100644 --- a/dashboard/assets/components/Footer.jsx +++ b/dashboard/assets/components/Footer.jsx @@ -165,7 +165,7 @@ class Footer extends Component<Props> { {general.commit && ( <Typography type='caption' color='inherit'> <span style={commonStyles.light}>{'Commit '}</span> - <a href={`https://github.com/dexon-foundation/dexon/commit/${general.commit}`} target='_blank' style={{color: 'inherit', textDecoration: 'none'}} > + <a href={`https://github.com/tangerine-network/go-tangerine/commit/${general.commit}`} target='_blank' style={{color: 'inherit', textDecoration: 'none'}} > {general.commit.substring(0, 8)} </a> </Typography> diff --git a/dashboard/cpu.go b/dashboard/cpu.go index d2669a9e3..86d987350 100644 --- a/dashboard/cpu.go +++ b/dashboard/cpu.go @@ -21,7 +21,7 @@ package dashboard import ( "syscall" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/log" ) // getProcessCPUTime retrieves the process' CPU time since program startup. diff --git a/dashboard/dashboard.go b/dashboard/dashboard.go index 2d2be27a2..141eb6def 100644 --- a/dashboard/dashboard.go +++ b/dashboard/dashboard.go @@ -34,13 +34,13 @@ import ( "io" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/metrics" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/params" - "github.com/dexon-foundation/dexon/rpc" "github.com/elastic/gosigar" "github.com/mohae/deepcopy" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/metrics" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/params" + "github.com/tangerine-network/go-tangerine/rpc" "golang.org/x/net/websocket" ) diff --git a/dashboard/log.go b/dashboard/log.go index 408061019..6a18aa07d 100644 --- a/dashboard/log.go +++ b/dashboard/log.go @@ -26,9 +26,9 @@ import ( "sort" "time" - "github.com/dexon-foundation/dexon/log" "github.com/mohae/deepcopy" "github.com/rjeczalik/notify" + "github.com/tangerine-network/go-tangerine/log" ) var emptyChunk = json.RawMessage("[]") diff --git a/dex/api.go b/dex/api.go index 991926740..1209e6583 100644 --- a/dex/api.go +++ b/dex/api.go @@ -25,28 +25,28 @@ import ( "os" "strings" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/rawdb" - "github.com/dexon-foundation/dexon/core/state" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/internal/ethapi" - "github.com/dexon-foundation/dexon/params" - "github.com/dexon-foundation/dexon/rlp" - "github.com/dexon-foundation/dexon/rpc" - "github.com/dexon-foundation/dexon/trie" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/rawdb" + "github.com/tangerine-network/go-tangerine/core/state" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/internal/ethapi" + "github.com/tangerine-network/go-tangerine/params" + "github.com/tangerine-network/go-tangerine/rlp" + "github.com/tangerine-network/go-tangerine/rpc" + "github.com/tangerine-network/go-tangerine/trie" ) // PrivateAdminAPI is the collection of Ethereum full node-related APIs // exposed over the private admin endpoint. type PrivateAdminAPI struct { - dex *Dexon + dex *Tangerine } // NewPrivateAdminAPI creates a new API definition for the full node private // admin methods of the Ethereum service. -func NewPrivateAdminAPI(dex *Dexon) *PrivateAdminAPI { +func NewPrivateAdminAPI(dex *Tangerine) *PrivateAdminAPI { return &PrivateAdminAPI{dex: dex} } @@ -146,12 +146,12 @@ func (api *PrivateAdminAPI) NotaryInfo() (*NotaryInfo, error) { // PublicDebugAPI is the collection of Ethereum full node APIs exposed // over the public debugging endpoint. type PublicDebugAPI struct { - dex *Dexon + dex *Tangerine } // NewPublicDebugAPI creates a new API definition for the full node- // related public debug methods of the Ethereum service. -func NewPublicDebugAPI(dex *Dexon) *PublicDebugAPI { +func NewPublicDebugAPI(dex *Tangerine) *PublicDebugAPI { return &PublicDebugAPI{dex: dex} } @@ -177,12 +177,12 @@ func (api *PublicDebugAPI) DumpBlock(blockNr rpc.BlockNumber) (state.Dump, error // the private debugging endpoint. type PrivateDebugAPI struct { config *params.ChainConfig - dex *Dexon + dex *Tangerine } // NewPrivateDebugAPI creates a new API definition for the full node-related // private debug methods of the Ethereum service. -func NewPrivateDebugAPI(config *params.ChainConfig, dex *Dexon) *PrivateDebugAPI { +func NewPrivateDebugAPI(config *params.ChainConfig, dex *Tangerine) *PrivateDebugAPI { return &PrivateDebugAPI{config: config, dex: dex} } diff --git a/dex/api_backend.go b/dex/api_backend.go index 7333a9bb1..39c34550b 100644 --- a/dex/api_backend.go +++ b/dex/api_backend.go @@ -20,26 +20,26 @@ import ( "context" "math/big" - "github.com/dexon-foundation/dexon/accounts" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/math" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/bloombits" - "github.com/dexon-foundation/dexon/core/state" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/core/vm" - "github.com/dexon-foundation/dexon/eth/gasprice" - "github.com/dexon-foundation/dexon/internal/ethapi" - - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/event" - "github.com/dexon-foundation/dexon/params" - "github.com/dexon-foundation/dexon/rpc" + "github.com/tangerine-network/go-tangerine/accounts" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/math" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/bloombits" + "github.com/tangerine-network/go-tangerine/core/state" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/core/vm" + "github.com/tangerine-network/go-tangerine/eth/gasprice" + "github.com/tangerine-network/go-tangerine/internal/ethapi" + + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/event" + "github.com/tangerine-network/go-tangerine/params" + "github.com/tangerine-network/go-tangerine/rpc" ) // DexAPIBackend implements ethapi.Backend for full nodes type DexAPIBackend struct { - dex *Dexon + dex *Tangerine gpo *gasprice.Oracle } diff --git a/dex/api_tracer.go b/dex/api_tracer.go index d451c376d..ccd77a30e 100644 --- a/dex/api_tracer.go +++ b/dex/api_tracer.go @@ -28,19 +28,19 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/rawdb" - "github.com/dexon-foundation/dexon/core/state" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/core/vm" - "github.com/dexon-foundation/dexon/eth/tracers" - "github.com/dexon-foundation/dexon/internal/ethapi" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/rlp" - "github.com/dexon-foundation/dexon/rpc" - "github.com/dexon-foundation/dexon/trie" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/rawdb" + "github.com/tangerine-network/go-tangerine/core/state" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/core/vm" + "github.com/tangerine-network/go-tangerine/eth/tracers" + "github.com/tangerine-network/go-tangerine/internal/ethapi" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/rlp" + "github.com/tangerine-network/go-tangerine/rpc" + "github.com/tangerine-network/go-tangerine/trie" ) const ( diff --git a/dex/app.go b/dex/app.go index 5a268a09d..8fbc53f82 100644 --- a/dex/app.go +++ b/dex/app.go @@ -25,16 +25,16 @@ import ( "sync" "time" - coreCommon "github.com/dexon-foundation/dexon-consensus/common" - coreTypes "github.com/dexon-foundation/dexon-consensus/core/types" - - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/event" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/rlp" + coreCommon "github.com/byzantine-lab/dexon-consensus/common" + coreTypes "github.com/byzantine-lab/dexon-consensus/core/types" + + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/event" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/rlp" ) // DexconApp implements the DEXON consensus core application interface. diff --git a/dex/app_test.go b/dex/app_test.go index bfc188f36..0a25f61f3 100644 --- a/dex/app_test.go +++ b/dex/app_test.go @@ -10,21 +10,21 @@ import ( "testing" "time" - coreCommon "github.com/dexon-foundation/dexon-consensus/common" - coreCrypto "github.com/dexon-foundation/dexon-consensus/core/crypto" - coreEcdsa "github.com/dexon-foundation/dexon-consensus/core/crypto/ecdsa" - coreTypes "github.com/dexon-foundation/dexon-consensus/core/types" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/math" - "github.com/dexon-foundation/dexon/consensus/dexcon" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/rawdb" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/core/vm" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/event" - "github.com/dexon-foundation/dexon/rlp" + coreCommon "github.com/byzantine-lab/dexon-consensus/common" + coreCrypto "github.com/byzantine-lab/dexon-consensus/core/crypto" + coreEcdsa "github.com/byzantine-lab/dexon-consensus/core/crypto/ecdsa" + coreTypes "github.com/byzantine-lab/dexon-consensus/core/types" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/math" + "github.com/tangerine-network/go-tangerine/consensus/dexcon" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/rawdb" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/core/vm" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/event" + "github.com/tangerine-network/go-tangerine/rlp" ) type singnal int @@ -2213,13 +2213,13 @@ func (f TxFactory) New(app App, center *ProductCenter, stopTimeMu *sync.RWMutex, return &f } -func TestDexonApp(t *testing.T) { +func TestTangerineApp(t *testing.T) { masterKey, err := crypto.GenerateKey() if err != nil { t.Fatalf("Generate key fail: %v", err) } - dex, keys, err := newDexon(masterKey, 15) + dex, keys, err := newTangerine(masterKey, 15) if err != nil { t.Fatalf("New dexon fail: %v", err) } @@ -2292,7 +2292,7 @@ func TestDexonApp(t *testing.T) { } } -func newDexon(masterKey *ecdsa.PrivateKey, accountNum int) (*Dexon, []*ecdsa.PrivateKey, error) { +func newTangerine(masterKey *ecdsa.PrivateKey, accountNum int) (*Tangerine, []*ecdsa.PrivateKey, error) { db := ethdb.NewMemDatabase() genesis := core.DefaultTestnetGenesisBlock() @@ -2330,7 +2330,7 @@ func newDexon(masterKey *ecdsa.PrivateKey, accountNum int) (*Dexon, []*ecdsa.Pri engine := dexcon.New() - dex := &Dexon{ + dex := &Tangerine{ chainDb: db, chainConfig: chainConfig, networkID: config.NetworkId, diff --git a/dex/backend.go b/dex/backend.go index 26a0b49eb..68783864c 100644 --- a/dex/backend.go +++ b/dex/backend.go @@ -21,30 +21,30 @@ import ( "fmt" "time" - "github.com/dexon-foundation/dexon-consensus/core/syncer" - "github.com/dexon-foundation/dexon/accounts" - "github.com/dexon-foundation/dexon/consensus" - "github.com/dexon-foundation/dexon/consensus/dexcon" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/bloombits" - "github.com/dexon-foundation/dexon/core/rawdb" - "github.com/dexon-foundation/dexon/core/vm" - "github.com/dexon-foundation/dexon/dex/downloader" - "github.com/dexon-foundation/dexon/eth/filters" - "github.com/dexon-foundation/dexon/eth/gasprice" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/event" - "github.com/dexon-foundation/dexon/indexer" - "github.com/dexon-foundation/dexon/internal/ethapi" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/node" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/params" - "github.com/dexon-foundation/dexon/rpc" + "github.com/byzantine-lab/dexon-consensus/core/syncer" + "github.com/tangerine-network/go-tangerine/accounts" + "github.com/tangerine-network/go-tangerine/consensus" + "github.com/tangerine-network/go-tangerine/consensus/dexcon" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/bloombits" + "github.com/tangerine-network/go-tangerine/core/rawdb" + "github.com/tangerine-network/go-tangerine/core/vm" + "github.com/tangerine-network/go-tangerine/dex/downloader" + "github.com/tangerine-network/go-tangerine/eth/filters" + "github.com/tangerine-network/go-tangerine/eth/gasprice" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/event" + "github.com/tangerine-network/go-tangerine/indexer" + "github.com/tangerine-network/go-tangerine/internal/ethapi" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/node" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/params" + "github.com/tangerine-network/go-tangerine/rpc" ) -// Dexon implements the DEXON fullnode service. -type Dexon struct { +// Tangerine implements the DEXON fullnode service. +type Tangerine struct { config *Config chainConfig *params.ChainConfig @@ -68,7 +68,7 @@ type Dexon struct { APIBackend *DexAPIBackend - // Dexon consensus. + // Tangerine consensus. app *DexconApp governance *DexconGovernance network *DexconNetwork @@ -81,7 +81,7 @@ type Dexon struct { indexer indexer.Indexer } -func New(ctx *node.ServiceContext, config *Config) (*Dexon, error) { +func New(ctx *node.ServiceContext, config *Config) (*Tangerine, error) { // Consensus. chainDb, err := CreateDB(ctx, config, "chaindata") if err != nil { @@ -104,7 +104,7 @@ func New(ctx *node.ServiceContext, config *Config) (*Dexon, error) { } engine := dexcon.New() - dex := &Dexon{ + dex := &Tangerine{ config: config, chainDb: chainDb, chainConfig: chainConfig, @@ -190,11 +190,11 @@ func New(ctx *node.ServiceContext, config *Config) (*Dexon, error) { return dex, nil } -func (s *Dexon) Protocols() []p2p.Protocol { +func (s *Tangerine) Protocols() []p2p.Protocol { return s.protocolManager.SubProtocols } -func (s *Dexon) APIs() []rpc.API { +func (s *Tangerine) APIs() []rpc.API { apis := ethapi.GetAPIs(s.APIBackend) // Append any APIs exposed explicitly by the consensus engine @@ -234,7 +234,7 @@ func (s *Dexon) APIs() []rpc.API { }...) } -func (s *Dexon) Start(srvr *p2p.Server) error { +func (s *Tangerine) Start(srvr *p2p.Server) error { // Start the bloom bits servicing goroutines s.startBloomHandlers(params.BloomBitsBlocks) @@ -271,7 +271,7 @@ func (s *Dexon) Start(srvr *p2p.Server) error { return nil } -func (s *Dexon) Stop() error { +func (s *Tangerine) Stop() error { s.bloomIndexer.Close() s.blockchain.Stop() s.engine.Close() @@ -288,11 +288,11 @@ func (s *Dexon) Stop() error { return nil } -func (s *Dexon) IsCoreSyncing() bool { +func (s *Tangerine) IsCoreSyncing() bool { return s.bp.IsCoreSyncing() } -func (s *Dexon) IsProposing() bool { +func (s *Tangerine) IsProposing() bool { return s.bp.IsProposing() } @@ -308,12 +308,12 @@ func CreateDB(ctx *node.ServiceContext, config *Config, name string) (ethdb.Data return db, nil } -func (d *Dexon) AccountManager() *accounts.Manager { return d.accountManager } -func (d *Dexon) BlockChain() *core.BlockChain { return d.blockchain } -func (d *Dexon) TxPool() *core.TxPool { return d.txPool } -func (d *Dexon) DexVersion() int { return int(d.protocolManager.SubProtocols[0].Version) } -func (d *Dexon) EventMux() *event.TypeMux { return d.eventMux } -func (d *Dexon) Engine() consensus.Engine { return d.engine } -func (d *Dexon) ChainDb() ethdb.Database { return d.chainDb } -func (d *Dexon) Downloader() ethapi.Downloader { return d.protocolManager.downloader } -func (d *Dexon) NetVersion() uint64 { return d.networkID } +func (d *Tangerine) AccountManager() *accounts.Manager { return d.accountManager } +func (d *Tangerine) BlockChain() *core.BlockChain { return d.blockchain } +func (d *Tangerine) TxPool() *core.TxPool { return d.txPool } +func (d *Tangerine) DexVersion() int { return int(d.protocolManager.SubProtocols[0].Version) } +func (d *Tangerine) EventMux() *event.TypeMux { return d.eventMux } +func (d *Tangerine) Engine() consensus.Engine { return d.engine } +func (d *Tangerine) ChainDb() ethdb.Database { return d.chainDb } +func (d *Tangerine) Downloader() ethapi.Downloader { return d.protocolManager.downloader } +func (d *Tangerine) NetVersion() uint64 { return d.networkID } diff --git a/dex/blockproposer.go b/dex/blockproposer.go index d675da4ac..f280d409e 100644 --- a/dex/blockproposer.go +++ b/dex/blockproposer.go @@ -7,15 +7,15 @@ import ( "sync/atomic" "time" - dexCore "github.com/dexon-foundation/dexon-consensus/core" - coreEcdsa "github.com/dexon-foundation/dexon-consensus/core/crypto/ecdsa" - "github.com/dexon-foundation/dexon-consensus/core/syncer" - coreTypes "github.com/dexon-foundation/dexon-consensus/core/types" - - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/dex/db" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/rlp" + dexCore "github.com/byzantine-lab/dexon-consensus/core" + coreEcdsa "github.com/byzantine-lab/dexon-consensus/core/crypto/ecdsa" + "github.com/byzantine-lab/dexon-consensus/core/syncer" + coreTypes "github.com/byzantine-lab/dexon-consensus/core/types" + + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/dex/db" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/rlp" ) var ( @@ -27,7 +27,7 @@ type blockProposer struct { running int32 syncing int32 proposing int32 - dex *Dexon + dex *Tangerine watchCat *syncer.WatchCat dMoment time.Time @@ -35,7 +35,7 @@ type blockProposer struct { stopCh chan struct{} } -func NewBlockProposer(dex *Dexon, watchCat *syncer.WatchCat, dMoment time.Time) *blockProposer { +func NewBlockProposer(dex *Tangerine, watchCat *syncer.WatchCat, dMoment time.Time) *blockProposer { return &blockProposer{ dex: dex, watchCat: watchCat, diff --git a/dex/bloombits.go b/dex/bloombits.go index 827cae5f4..1f9bea0cb 100644 --- a/dex/bloombits.go +++ b/dex/bloombits.go @@ -20,13 +20,13 @@ import ( "context" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/bitutil" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/bloombits" - "github.com/dexon-foundation/dexon/core/rawdb" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/ethdb" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/bitutil" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/bloombits" + "github.com/tangerine-network/go-tangerine/core/rawdb" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/ethdb" ) const ( @@ -49,7 +49,7 @@ const ( // startBloomHandlers starts a batch of goroutines to accept bloom bit database // retrievals from possibly a range of filters and serving the data to satisfy. -func (dex *Dexon) startBloomHandlers(sectionSize uint64) { +func (dex *Tangerine) startBloomHandlers(sectionSize uint64) { for i := 0; i < bloomServiceThreads; i++ { go func() { for { diff --git a/dex/cache.go b/dex/cache.go index dbd4b7b5d..a8d246eec 100644 --- a/dex/cache.go +++ b/dex/cache.go @@ -20,9 +20,9 @@ package dex import ( "sync" - coreCommon "github.com/dexon-foundation/dexon-consensus/common" - coreDb "github.com/dexon-foundation/dexon-consensus/core/db" - coreTypes "github.com/dexon-foundation/dexon-consensus/core/types" + coreCommon "github.com/byzantine-lab/dexon-consensus/common" + coreDb "github.com/byzantine-lab/dexon-consensus/core/db" + coreTypes "github.com/byzantine-lab/dexon-consensus/core/types" ) type voteKey struct { diff --git a/dex/cache_test.go b/dex/cache_test.go index 04bca06ef..64801db2d 100644 --- a/dex/cache_test.go +++ b/dex/cache_test.go @@ -24,9 +24,9 @@ import ( "strings" "testing" - coreCommon "github.com/dexon-foundation/dexon-consensus/common" - coreDb "github.com/dexon-foundation/dexon-consensus/core/db" - coreTypes "github.com/dexon-foundation/dexon-consensus/core/types" + coreCommon "github.com/byzantine-lab/dexon-consensus/common" + coreDb "github.com/byzantine-lab/dexon-consensus/core/db" + coreTypes "github.com/byzantine-lab/dexon-consensus/core/types" ) type byHash []*coreTypes.Vote diff --git a/dex/config.go b/dex/config.go index ac3e89969..1c1b588d3 100644 --- a/dex/config.go +++ b/dex/config.go @@ -25,12 +25,12 @@ import ( "runtime" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/dex/downloader" - "github.com/dexon-foundation/dexon/eth/gasprice" - "github.com/dexon-foundation/dexon/indexer" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/dex/downloader" + "github.com/tangerine-network/go-tangerine/eth/gasprice" + "github.com/tangerine-network/go-tangerine/indexer" + "github.com/tangerine-network/go-tangerine/params" ) // DefaultConfig contains default settings for use on the Ethereum main net. @@ -125,7 +125,7 @@ type Config struct { // RPCGasCap is the global gas cap for eth-call variants. RPCGasCap *big.Int `toml:",omitempty"` - // Dexon options + // Tangerine options DMoment int64 // Indexer config diff --git a/dex/db/db.go b/dex/db/db.go index 5cb809055..c6479cd8c 100644 --- a/dex/db/db.go +++ b/dex/db/db.go @@ -18,14 +18,14 @@ package db import ( - coreCommon "github.com/dexon-foundation/dexon-consensus/common" - coreDKG "github.com/dexon-foundation/dexon-consensus/core/crypto/dkg" - coreDb "github.com/dexon-foundation/dexon-consensus/core/db" - coreTypes "github.com/dexon-foundation/dexon-consensus/core/types" - - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/rawdb" - "github.com/dexon-foundation/dexon/ethdb" + coreCommon "github.com/byzantine-lab/dexon-consensus/common" + coreDKG "github.com/byzantine-lab/dexon-consensus/core/crypto/dkg" + coreDb "github.com/byzantine-lab/dexon-consensus/core/db" + coreTypes "github.com/byzantine-lab/dexon-consensus/core/types" + + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/rawdb" + "github.com/tangerine-network/go-tangerine/ethdb" ) // DB implement dexon-consensus BlockDatabase interface. diff --git a/dex/downloader/api.go b/dex/downloader/api.go index 721818e75..806a3e65e 100644 --- a/dex/downloader/api.go +++ b/dex/downloader/api.go @@ -20,9 +20,9 @@ import ( "context" "sync" - ethereum "github.com/dexon-foundation/dexon" - "github.com/dexon-foundation/dexon/event" - "github.com/dexon-foundation/dexon/rpc" + ethereum "github.com/tangerine-network/go-tangerine" + "github.com/tangerine-network/go-tangerine/event" + "github.com/tangerine-network/go-tangerine/rpc" ) // PublicDownloaderAPI provides an API which gives information about the current synchronisation status. diff --git a/dex/downloader/downloader.go b/dex/downloader/downloader.go index 0847cd062..71f68ff83 100644 --- a/dex/downloader/downloader.go +++ b/dex/downloader/downloader.go @@ -23,22 +23,22 @@ import ( "sync/atomic" "time" - dexCore "github.com/dexon-foundation/dexon-consensus/core" - - ethereum "github.com/dexon-foundation/dexon" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/consensus/dexcon" - "github.com/dexon-foundation/dexon/core/rawdb" - "github.com/dexon-foundation/dexon/core/state" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/core/vm" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/event" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/metrics" - "github.com/dexon-foundation/dexon/params" - "github.com/dexon-foundation/dexon/trie" + dexCore "github.com/byzantine-lab/dexon-consensus/core" + + ethereum "github.com/tangerine-network/go-tangerine" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/consensus/dexcon" + "github.com/tangerine-network/go-tangerine/core/rawdb" + "github.com/tangerine-network/go-tangerine/core/state" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/core/vm" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/event" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/metrics" + "github.com/tangerine-network/go-tangerine/params" + "github.com/tangerine-network/go-tangerine/trie" ) var ( @@ -178,8 +178,8 @@ type LightChain interface { GetGovStateByNumber(number uint64) (*types.GovState, error) - // InsertDexonHeaderChain inserts a batch of headers into the local chain. - InsertDexonHeaderChain([]*types.HeaderWithGovState, + // InsertTangerineHeaderChain inserts a batch of headers into the local chain. + InsertTangerineHeaderChain([]*types.HeaderWithGovState, dexcon.GovernanceStateFetcher, *dexCore.TSigVerifierCache) (int, error) // Rollback removes a few recently added elements from the local chain. @@ -208,8 +208,8 @@ type BlockChain interface { // FastSyncCommitHead directly commits the head block to a certain entity. FastSyncCommitHead(common.Hash) error - // InsertDexonChain inserts a batch of blocks into the local chain. - InsertDexonChain(types.Blocks) (int, error) + // InsertTangerineChain inserts a batch of blocks into the local chain. + InsertTangerineChain(types.Blocks) (int, error) // InsertReceiptChain inserts a batch of receipts into the local chain. InsertReceiptChain(types.Blocks, []types.Receipts) (int, error) @@ -1503,7 +1503,7 @@ func (d *Downloader) processHeaders(origin uint64, pivot uint64, number uint64) } } - if n, err := d.lightchain.InsertDexonHeaderChain(chunk, d.gov, d.verifierCache); err != nil { + if n, err := d.lightchain.InsertTangerineHeaderChain(chunk, d.gov, d.verifierCache); err != nil { // If some headers were inserted, add them too to the rollback list if n > 0 { for _, h := range chunk[:n] { @@ -1595,7 +1595,7 @@ func (d *Downloader) importBlockResults(results []*fetchResult) error { for i, result := range results { blocks[i] = types.NewBlockWithHeader(result.Header).WithBody(result.Transactions, result.Uncles) } - if index, err := d.blockchain.InsertDexonChain(blocks); err != nil { + if index, err := d.blockchain.InsertTangerineChain(blocks); err != nil { if index < len(results) { log.Debug("Downloaded item processing failed", "number", results[index].Header.Number, "hash", results[index].Header.Hash(), "err", err) } else { diff --git a/dex/downloader/downloader_test.go b/dex/downloader/downloader_test.go index e01e0d96b..6d3718d44 100644 --- a/dex/downloader/downloader_test.go +++ b/dex/downloader/downloader_test.go @@ -25,19 +25,19 @@ import ( "testing" "time" - ethereum "github.com/dexon-foundation/dexon" - dexCore "github.com/dexon-foundation/dexon-consensus/core" - coreTypes "github.com/dexon-foundation/dexon-consensus/core/types" - - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/consensus/dexcon" - "github.com/dexon-foundation/dexon/core/state" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/core/vm" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/event" - "github.com/dexon-foundation/dexon/rlp" - "github.com/dexon-foundation/dexon/trie" + dexCore "github.com/byzantine-lab/dexon-consensus/core" + coreTypes "github.com/byzantine-lab/dexon-consensus/core/types" + ethereum "github.com/tangerine-network/go-tangerine" + + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/consensus/dexcon" + "github.com/tangerine-network/go-tangerine/core/state" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/core/vm" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/event" + "github.com/tangerine-network/go-tangerine/rlp" + "github.com/tangerine-network/go-tangerine/trie" ) // Reduce some of the parameters to make the tester faster. @@ -213,13 +213,13 @@ func (dl *downloadTester) FastSyncCommitHead(hash common.Hash) error { return fmt.Errorf("non existent block: %x", hash[:4]) } -// InsertDexonHeaderChain injects a new batch of headers into the simulated chain. -func (dl *downloadTester) InsertDexonHeaderChain(headers []*types.HeaderWithGovState, +// InsertTangerineHeaderChain injects a new batch of headers into the simulated chain. +func (dl *downloadTester) InsertTangerineHeaderChain(headers []*types.HeaderWithGovState, gov dexcon.GovernanceStateFetcher, verifierCache *dexCore.TSigVerifierCache) (i int, err error) { dl.lock.Lock() defer dl.lock.Unlock() - // Do a quick check, as the blockchain.InsertDexonHeaderChain doesn't insert anything in case of errors + // Do a quick check, as the blockchain.InsertTangerineHeaderChain doesn't insert anything in case of errors if _, ok := dl.ownHeaders[headers[0].ParentHash]; !ok { return 0, errors.New("unknown parent") } @@ -265,8 +265,8 @@ func (dl *downloadTester) InsertDexonHeaderChain(headers []*types.HeaderWithGovS return len(headers), nil } -// InsertDexonChain injects a new batch of blocks into the simulated chain. -func (dl *downloadTester) InsertDexonChain(blocks types.Blocks) (i int, err error) { +// InsertTangerineChain injects a new batch of blocks into the simulated chain. +func (dl *downloadTester) InsertTangerineChain(blocks types.Blocks) (i int, err error) { dl.lock.Lock() defer dl.lock.Unlock() diff --git a/dex/downloader/fakepeer.go b/dex/downloader/fakepeer.go index e1c3070d2..4ec36c19f 100644 --- a/dex/downloader/fakepeer.go +++ b/dex/downloader/fakepeer.go @@ -19,11 +19,11 @@ package downloader import ( "math/big" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/rawdb" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/ethdb" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/rawdb" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/ethdb" ) // FakePeer is a mock downloader peer that operates on a local database instance diff --git a/dex/downloader/governance.go b/dex/downloader/governance.go index 38281b4a8..70dc3455a 100644 --- a/dex/downloader/governance.go +++ b/dex/downloader/governance.go @@ -4,14 +4,14 @@ import ( "fmt" "sync" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/state" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/trie" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/state" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/trie" ) // governanceDB is backed by memory db for fast sync. diff --git a/dex/downloader/metrics.go b/dex/downloader/metrics.go index 86f3298ad..98f793374 100644 --- a/dex/downloader/metrics.go +++ b/dex/downloader/metrics.go @@ -19,7 +19,7 @@ package downloader import ( - "github.com/dexon-foundation/dexon/metrics" + "github.com/tangerine-network/go-tangerine/metrics" ) var ( diff --git a/dex/downloader/peer.go b/dex/downloader/peer.go index df8ef0ee9..084cd5a0a 100644 --- a/dex/downloader/peer.go +++ b/dex/downloader/peer.go @@ -28,9 +28,9 @@ import ( "sync/atomic" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/event" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/event" + "github.com/tangerine-network/go-tangerine/log" ) const ( diff --git a/dex/downloader/queue.go b/dex/downloader/queue.go index ea847913f..6fbd65b1b 100644 --- a/dex/downloader/queue.go +++ b/dex/downloader/queue.go @@ -25,11 +25,11 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/prque" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/metrics" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/prque" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/metrics" ) var ( diff --git a/dex/downloader/statesync.go b/dex/downloader/statesync.go index 1695ba19c..07919c6d1 100644 --- a/dex/downloader/statesync.go +++ b/dex/downloader/statesync.go @@ -22,12 +22,12 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/rawdb" - "github.com/dexon-foundation/dexon/core/state" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/trie" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/rawdb" + "github.com/tangerine-network/go-tangerine/core/state" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/trie" "golang.org/x/crypto/sha3" ) diff --git a/dex/downloader/testchain_test.go b/dex/downloader/testchain_test.go index e5c5e4d23..5be77b86f 100644 --- a/dex/downloader/testchain_test.go +++ b/dex/downloader/testchain_test.go @@ -21,18 +21,18 @@ import ( "fmt" "math/big" - dexCore "github.com/dexon-foundation/dexon-consensus/core" - coreTypes "github.com/dexon-foundation/dexon-consensus/core/types" - - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/consensus/dexcon" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/state" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/core/vm" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/params" + dexCore "github.com/byzantine-lab/dexon-consensus/core" + coreTypes "github.com/byzantine-lab/dexon-consensus/core/types" + + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/consensus/dexcon" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/state" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/core/vm" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/params" ) // Test chain parameters. @@ -161,13 +161,13 @@ func (tc *testChain) generate(n int, seed byte, parent *types.Block, nodes *dexc round := uint64(0) roundInterval := int(100) - addTx := func(block *core.DexonBlockGen, node *dexcon.Node, data []byte) { + addTx := func(block *core.TangerineBlockGen, node *dexcon.Node, data []byte) { nonce := block.TxNonce(node.Address()) tx := node.CreateGovTx(nonce, data) block.AddTx(tx) } - blocks, receipts := core.GenerateDexonChain(params.TestnetChainConfig, parent, engine, testDB, n, func(i int, block *core.DexonBlockGen) { + blocks, receipts := core.GenerateTangerineChain(params.TestnetChainConfig, parent, engine, testDB, n, func(i int, block *core.TangerineBlockGen) { block.SetCoinbase(common.Address{seed}) block.SetPosition(coreTypes.Position{ Round: round, diff --git a/dex/downloader/types.go b/dex/downloader/types.go index a7143ccd9..8e3299832 100644 --- a/dex/downloader/types.go +++ b/dex/downloader/types.go @@ -19,7 +19,7 @@ package downloader import ( "fmt" - "github.com/dexon-foundation/dexon/core/types" + "github.com/tangerine-network/go-tangerine/core/types" ) // peerDropFn is a callback type for dropping a peer detected as malicious. diff --git a/dex/fetcher/fetcher.go b/dex/fetcher/fetcher.go index 64e576bd8..84737ab35 100644 --- a/dex/fetcher/fetcher.go +++ b/dex/fetcher/fetcher.go @@ -22,11 +22,11 @@ import ( "math/rand" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/prque" - "github.com/dexon-foundation/dexon/consensus" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/prque" + "github.com/tangerine-network/go-tangerine/consensus" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/log" ) const ( diff --git a/dex/fetcher/fetcher_test.go b/dex/fetcher/fetcher_test.go index 24611a8a0..6f012641c 100644 --- a/dex/fetcher/fetcher_test.go +++ b/dex/fetcher/fetcher_test.go @@ -24,13 +24,13 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/consensus/ethash" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/consensus/ethash" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/params" ) var ( diff --git a/dex/fetcher/metrics.go b/dex/fetcher/metrics.go index 23b670549..276ec557d 100644 --- a/dex/fetcher/metrics.go +++ b/dex/fetcher/metrics.go @@ -19,7 +19,7 @@ package fetcher import ( - "github.com/dexon-foundation/dexon/metrics" + "github.com/tangerine-network/go-tangerine/metrics" ) var ( diff --git a/dex/governance.go b/dex/governance.go index ec09969b0..3e73467b5 100644 --- a/dex/governance.go +++ b/dex/governance.go @@ -22,16 +22,16 @@ import ( "crypto/ecdsa" "math/big" - coreTypes "github.com/dexon-foundation/dexon-consensus/core/types" - dkgTypes "github.com/dexon-foundation/dexon-consensus/core/types/dkg" - - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/core/vm" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/params" + coreTypes "github.com/byzantine-lab/dexon-consensus/core/types" + dkgTypes "github.com/byzantine-lab/dexon-consensus/core/types/dkg" + + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/core/vm" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/params" ) type DexconGovernance struct { diff --git a/dex/handler.go b/dex/handler.go index cfa6d9bb1..0f0b33534 100644 --- a/dex/handler.go +++ b/dex/handler.go @@ -45,28 +45,28 @@ import ( "sync/atomic" "time" - coreCommon "github.com/dexon-foundation/dexon-consensus/common" - dexCore "github.com/dexon-foundation/dexon-consensus/core" - coreCrypto "github.com/dexon-foundation/dexon-consensus/core/crypto" - coreTypes "github.com/dexon-foundation/dexon-consensus/core/types" - dkgTypes "github.com/dexon-foundation/dexon-consensus/core/types/dkg" - - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/consensus" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/crypto" - dexDB "github.com/dexon-foundation/dexon/dex/db" - "github.com/dexon-foundation/dexon/dex/downloader" - "github.com/dexon-foundation/dexon/dex/fetcher" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/event" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/metrics" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/params" - "github.com/dexon-foundation/dexon/rlp" + coreCommon "github.com/byzantine-lab/dexon-consensus/common" + dexCore "github.com/byzantine-lab/dexon-consensus/core" + coreCrypto "github.com/byzantine-lab/dexon-consensus/core/crypto" + coreTypes "github.com/byzantine-lab/dexon-consensus/core/types" + dkgTypes "github.com/byzantine-lab/dexon-consensus/core/types/dkg" + + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/consensus" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/crypto" + dexDB "github.com/tangerine-network/go-tangerine/dex/db" + "github.com/tangerine-network/go-tangerine/dex/downloader" + "github.com/tangerine-network/go-tangerine/dex/fetcher" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/event" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/metrics" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/params" + "github.com/tangerine-network/go-tangerine/rlp" ) const ( @@ -234,7 +234,7 @@ func NewProtocolManager( manager.downloader = downloader.New(mode, chaindb, manager.eventMux, blockchain, nil, manager.removePeer) validator := func(header *types.Header) error { - return blockchain.VerifyDexonHeader(header) + return blockchain.VerifyTangerineHeader(header) } heighter := func() uint64 { return blockchain.CurrentBlock().NumberU64() @@ -246,7 +246,7 @@ func NewProtocolManager( return 0, nil } atomic.StoreUint32(&manager.acceptTxs, 1) // Mark initial sync done on any fetcher import - return manager.blockchain.InsertDexonChain(blocks) + return manager.blockchain.InsertTangerineChain(blocks) } manager.fetcher = fetcher.New(blockchain.GetBlockByHash, validator, manager.BroadcastBlock, heighter, inserter, manager.removePeer) diff --git a/dex/handler_test.go b/dex/handler_test.go index 75a57c125..80f36ae9e 100644 --- a/dex/handler_test.go +++ b/dex/handler_test.go @@ -22,15 +22,15 @@ import ( "math/rand" "testing" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/state" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/dex/downloader" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/state" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/dex/downloader" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/params" ) // Tests that protocol versions and modes of operations are matched up properly. diff --git a/dex/helper_test.go b/dex/helper_test.go index 1d267d9ae..6e2cd3d77 100644 --- a/dex/helper_test.go +++ b/dex/helper_test.go @@ -27,18 +27,18 @@ import ( "sync" "testing" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/consensus/ethash" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/core/vm" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/dex/downloader" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/event" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/consensus/ethash" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/core/vm" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/dex/downloader" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/event" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/params" ) var ( diff --git a/dex/metrics.go b/dex/metrics.go index 1f691bc15..1cee6aac4 100644 --- a/dex/metrics.go +++ b/dex/metrics.go @@ -17,8 +17,8 @@ package dex import ( - "github.com/dexon-foundation/dexon/metrics" - "github.com/dexon-foundation/dexon/p2p" + "github.com/tangerine-network/go-tangerine/metrics" + "github.com/tangerine-network/go-tangerine/p2p" ) var ( diff --git a/dex/network.go b/dex/network.go index ab676a349..f4f18beb5 100644 --- a/dex/network.go +++ b/dex/network.go @@ -18,10 +18,10 @@ package dex import ( - coreCommon "github.com/dexon-foundation/dexon-consensus/common" - "github.com/dexon-foundation/dexon-consensus/core/crypto" - "github.com/dexon-foundation/dexon-consensus/core/types" - dkgTypes "github.com/dexon-foundation/dexon-consensus/core/types/dkg" + coreCommon "github.com/byzantine-lab/dexon-consensus/common" + "github.com/byzantine-lab/dexon-consensus/core/crypto" + "github.com/byzantine-lab/dexon-consensus/core/types" + dkgTypes "github.com/byzantine-lab/dexon-consensus/core/types/dkg" ) type DexconNetwork struct { diff --git a/dex/peer.go b/dex/peer.go index 68576564f..a9a952f2f 100644 --- a/dex/peer.go +++ b/dex/peer.go @@ -40,18 +40,18 @@ import ( "sync" "time" + coreCommon "github.com/byzantine-lab/dexon-consensus/common" + coreTypes "github.com/byzantine-lab/dexon-consensus/core/types" + dkgTypes "github.com/byzantine-lab/dexon-consensus/core/types/dkg" mapset "github.com/deckarep/golang-set" - coreCommon "github.com/dexon-foundation/dexon-consensus/common" - coreTypes "github.com/dexon-foundation/dexon-consensus/core/types" - dkgTypes "github.com/dexon-foundation/dexon-consensus/core/types/dkg" - - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/rlp" + + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/rlp" ) var ( diff --git a/dex/peer_test.go b/dex/peer_test.go index 18f6617d3..7a7230351 100644 --- a/dex/peer_test.go +++ b/dex/peer_test.go @@ -6,8 +6,8 @@ import ( "reflect" "testing" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/p2p/enode" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/p2p/enode" ) func TestPeerSetBuildAndForgetConn(t *testing.T) { diff --git a/dex/protocol.go b/dex/protocol.go index 2ce850dc3..e054a3ed3 100644 --- a/dex/protocol.go +++ b/dex/protocol.go @@ -38,12 +38,12 @@ import ( "fmt" "io" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/event" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/event" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/rlp" "golang.org/x/crypto/sha3" ) diff --git a/dex/protocol_test.go b/dex/protocol_test.go index 81550d918..68b5c4b86 100644 --- a/dex/protocol_test.go +++ b/dex/protocol_test.go @@ -24,19 +24,19 @@ import ( "testing" "time" - coreCommon "github.com/dexon-foundation/dexon-consensus/common" - coreCrypto "github.com/dexon-foundation/dexon-consensus/core/crypto" - "github.com/dexon-foundation/dexon-consensus/core/crypto/dkg" - coreTypes "github.com/dexon-foundation/dexon-consensus/core/types" - dkgTypes "github.com/dexon-foundation/dexon-consensus/core/types/dkg" - - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/dex/downloader" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/rlp" + coreCommon "github.com/byzantine-lab/dexon-consensus/common" + coreCrypto "github.com/byzantine-lab/dexon-consensus/core/crypto" + "github.com/byzantine-lab/dexon-consensus/core/crypto/dkg" + coreTypes "github.com/byzantine-lab/dexon-consensus/core/types" + dkgTypes "github.com/byzantine-lab/dexon-consensus/core/types/dkg" + + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/dex/downloader" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/rlp" ) func init() { diff --git a/dex/recovery.go b/dex/recovery.go index 1393d37df..d687299ef 100644 --- a/dex/recovery.go +++ b/dex/recovery.go @@ -26,14 +26,14 @@ import ( "strconv" "strings" - "github.com/dexon-foundation/dexon/accounts/abi" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/params" - "github.com/dexon-foundation/dexon/rlp" "github.com/onrik/ethrpc" + "github.com/tangerine-network/go-tangerine/accounts/abi" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/params" + "github.com/tangerine-network/go-tangerine/rlp" ) const numConfirmation = 1 diff --git a/dex/recovery_test.go b/dex/recovery_test.go index 8c039db35..27a978488 100644 --- a/dex/recovery_test.go +++ b/dex/recovery_test.go @@ -20,9 +20,9 @@ package dex import ( "testing" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/params" ) func TestRecoveryVoteTxGeneration(t *testing.T) { diff --git a/dex/sync.go b/dex/sync.go index 84c161845..6f5d26a1f 100644 --- a/dex/sync.go +++ b/dex/sync.go @@ -21,11 +21,11 @@ import ( "sync/atomic" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/dex/downloader" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/p2p/enode" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/dex/downloader" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/p2p/enode" ) const ( diff --git a/eth/api.go b/eth/api.go index 22989ead6..dcb10f8c2 100644 --- a/eth/api.go +++ b/eth/api.go @@ -28,17 +28,17 @@ import ( "strings" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/rawdb" - "github.com/dexon-foundation/dexon/core/state" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/internal/ethapi" - "github.com/dexon-foundation/dexon/params" - "github.com/dexon-foundation/dexon/rlp" - "github.com/dexon-foundation/dexon/rpc" - "github.com/dexon-foundation/dexon/trie" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/rawdb" + "github.com/tangerine-network/go-tangerine/core/state" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/internal/ethapi" + "github.com/tangerine-network/go-tangerine/params" + "github.com/tangerine-network/go-tangerine/rlp" + "github.com/tangerine-network/go-tangerine/rpc" + "github.com/tangerine-network/go-tangerine/trie" ) // PublicEthereumAPI provides an API to access Ethereum full node-related diff --git a/eth/api_backend.go b/eth/api_backend.go index 696b6c64a..a97c0ca6f 100644 --- a/eth/api_backend.go +++ b/eth/api_backend.go @@ -20,20 +20,20 @@ import ( "context" "math/big" - "github.com/dexon-foundation/dexon/accounts" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/math" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/bloombits" - "github.com/dexon-foundation/dexon/core/state" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/core/vm" - "github.com/dexon-foundation/dexon/eth/gasprice" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/event" - "github.com/dexon-foundation/dexon/internal/ethapi" - "github.com/dexon-foundation/dexon/params" - "github.com/dexon-foundation/dexon/rpc" + "github.com/tangerine-network/go-tangerine/accounts" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/math" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/bloombits" + "github.com/tangerine-network/go-tangerine/core/state" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/core/vm" + "github.com/tangerine-network/go-tangerine/eth/gasprice" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/event" + "github.com/tangerine-network/go-tangerine/internal/ethapi" + "github.com/tangerine-network/go-tangerine/params" + "github.com/tangerine-network/go-tangerine/rpc" ) // EthAPIBackend implements ethapi.Backend for full nodes diff --git a/eth/api_test.go b/eth/api_test.go index 8efd21c71..388e12b16 100644 --- a/eth/api_test.go +++ b/eth/api_test.go @@ -21,9 +21,9 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/state" - "github.com/dexon-foundation/dexon/ethdb" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/state" + "github.com/tangerine-network/go-tangerine/ethdb" ) var dumper = spew.ConfigState{Indent: " "} diff --git a/eth/api_tracer.go b/eth/api_tracer.go index c80cb9a5c..0dfe3de75 100644 --- a/eth/api_tracer.go +++ b/eth/api_tracer.go @@ -28,19 +28,19 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/rawdb" - "github.com/dexon-foundation/dexon/core/state" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/core/vm" - "github.com/dexon-foundation/dexon/eth/tracers" - "github.com/dexon-foundation/dexon/internal/ethapi" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/rlp" - "github.com/dexon-foundation/dexon/rpc" - "github.com/dexon-foundation/dexon/trie" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/rawdb" + "github.com/tangerine-network/go-tangerine/core/state" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/core/vm" + "github.com/tangerine-network/go-tangerine/eth/tracers" + "github.com/tangerine-network/go-tangerine/internal/ethapi" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/rlp" + "github.com/tangerine-network/go-tangerine/rpc" + "github.com/tangerine-network/go-tangerine/trie" ) const ( diff --git a/eth/backend.go b/eth/backend.go index f75f2e521..6feba45db 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -25,30 +25,30 @@ import ( "sync" "sync/atomic" - "github.com/dexon-foundation/dexon/accounts" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/consensus" - "github.com/dexon-foundation/dexon/consensus/clique" - "github.com/dexon-foundation/dexon/consensus/ethash" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/bloombits" - "github.com/dexon-foundation/dexon/core/rawdb" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/core/vm" - "github.com/dexon-foundation/dexon/eth/downloader" - "github.com/dexon-foundation/dexon/eth/filters" - "github.com/dexon-foundation/dexon/eth/gasprice" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/event" - "github.com/dexon-foundation/dexon/internal/ethapi" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/miner" - "github.com/dexon-foundation/dexon/node" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/params" - "github.com/dexon-foundation/dexon/rlp" - "github.com/dexon-foundation/dexon/rpc" + "github.com/tangerine-network/go-tangerine/accounts" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/consensus" + "github.com/tangerine-network/go-tangerine/consensus/clique" + "github.com/tangerine-network/go-tangerine/consensus/ethash" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/bloombits" + "github.com/tangerine-network/go-tangerine/core/rawdb" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/core/vm" + "github.com/tangerine-network/go-tangerine/eth/downloader" + "github.com/tangerine-network/go-tangerine/eth/filters" + "github.com/tangerine-network/go-tangerine/eth/gasprice" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/event" + "github.com/tangerine-network/go-tangerine/internal/ethapi" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/miner" + "github.com/tangerine-network/go-tangerine/node" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/params" + "github.com/tangerine-network/go-tangerine/rlp" + "github.com/tangerine-network/go-tangerine/rpc" ) type LesServer interface { diff --git a/eth/bloombits.go b/eth/bloombits.go index 989ed23cb..203bc925f 100644 --- a/eth/bloombits.go +++ b/eth/bloombits.go @@ -20,13 +20,13 @@ import ( "context" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/bitutil" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/bloombits" - "github.com/dexon-foundation/dexon/core/rawdb" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/ethdb" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/bitutil" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/bloombits" + "github.com/tangerine-network/go-tangerine/core/rawdb" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/ethdb" ) const ( diff --git a/eth/config.go b/eth/config.go index e19b15934..3573f2090 100644 --- a/eth/config.go +++ b/eth/config.go @@ -24,13 +24,13 @@ import ( "runtime" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/consensus/ethash" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/eth/downloader" - "github.com/dexon-foundation/dexon/eth/gasprice" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/consensus/ethash" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/eth/downloader" + "github.com/tangerine-network/go-tangerine/eth/gasprice" + "github.com/tangerine-network/go-tangerine/params" ) // DefaultConfig contains default settings for use on the Ethereum main net. diff --git a/eth/downloader/api.go b/eth/downloader/api.go index 721818e75..806a3e65e 100644 --- a/eth/downloader/api.go +++ b/eth/downloader/api.go @@ -20,9 +20,9 @@ import ( "context" "sync" - ethereum "github.com/dexon-foundation/dexon" - "github.com/dexon-foundation/dexon/event" - "github.com/dexon-foundation/dexon/rpc" + ethereum "github.com/tangerine-network/go-tangerine" + "github.com/tangerine-network/go-tangerine/event" + "github.com/tangerine-network/go-tangerine/rpc" ) // PublicDownloaderAPI provides an API which gives information about the current synchronisation status. diff --git a/eth/downloader/downloader.go b/eth/downloader/downloader.go index e9283bdcc..d5c15b6fd 100644 --- a/eth/downloader/downloader.go +++ b/eth/downloader/downloader.go @@ -25,15 +25,15 @@ import ( "sync/atomic" "time" - ethereum "github.com/dexon-foundation/dexon" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/rawdb" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/event" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/metrics" - "github.com/dexon-foundation/dexon/params" + ethereum "github.com/tangerine-network/go-tangerine" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/rawdb" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/event" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/metrics" + "github.com/tangerine-network/go-tangerine/params" ) var ( diff --git a/eth/downloader/downloader_test.go b/eth/downloader/downloader_test.go index 3d17cc5f4..e8192d0c9 100644 --- a/eth/downloader/downloader_test.go +++ b/eth/downloader/downloader_test.go @@ -26,12 +26,12 @@ import ( "testing" "time" - ethereum "github.com/dexon-foundation/dexon" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/event" - "github.com/dexon-foundation/dexon/trie" + ethereum "github.com/tangerine-network/go-tangerine" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/event" + "github.com/tangerine-network/go-tangerine/trie" ) // Reduce some of the parameters to make the tester faster. diff --git a/eth/downloader/fakepeer.go b/eth/downloader/fakepeer.go index 3e29357ba..836c969c2 100644 --- a/eth/downloader/fakepeer.go +++ b/eth/downloader/fakepeer.go @@ -19,11 +19,11 @@ package downloader import ( "math/big" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/rawdb" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/ethdb" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/rawdb" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/ethdb" ) // FakePeer is a mock downloader peer that operates on a local database instance diff --git a/eth/downloader/metrics.go b/eth/downloader/metrics.go index 4c055dfa9..98367773f 100644 --- a/eth/downloader/metrics.go +++ b/eth/downloader/metrics.go @@ -19,7 +19,7 @@ package downloader import ( - "github.com/dexon-foundation/dexon/metrics" + "github.com/tangerine-network/go-tangerine/metrics" ) var ( diff --git a/eth/downloader/peer.go b/eth/downloader/peer.go index 1fd82fbe3..35e17daad 100644 --- a/eth/downloader/peer.go +++ b/eth/downloader/peer.go @@ -29,9 +29,9 @@ import ( "sync/atomic" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/event" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/event" + "github.com/tangerine-network/go-tangerine/log" ) const ( diff --git a/eth/downloader/queue.go b/eth/downloader/queue.go index 49e766ebf..1d1510a09 100644 --- a/eth/downloader/queue.go +++ b/eth/downloader/queue.go @@ -25,11 +25,11 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/prque" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/metrics" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/prque" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/metrics" ) var ( diff --git a/eth/downloader/statesync.go b/eth/downloader/statesync.go index 83bea1426..4d473e22c 100644 --- a/eth/downloader/statesync.go +++ b/eth/downloader/statesync.go @@ -22,12 +22,12 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/rawdb" - "github.com/dexon-foundation/dexon/core/state" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/trie" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/rawdb" + "github.com/tangerine-network/go-tangerine/core/state" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/trie" "golang.org/x/crypto/sha3" ) diff --git a/eth/downloader/testchain_test.go b/eth/downloader/testchain_test.go index e73bed513..fdedbb913 100644 --- a/eth/downloader/testchain_test.go +++ b/eth/downloader/testchain_test.go @@ -21,13 +21,13 @@ import ( "math/big" "sync" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/consensus/ethash" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/consensus/ethash" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/params" ) // Test chain parameters. diff --git a/eth/downloader/types.go b/eth/downloader/types.go index d320b7590..88ef0eb51 100644 --- a/eth/downloader/types.go +++ b/eth/downloader/types.go @@ -19,7 +19,7 @@ package downloader import ( "fmt" - "github.com/dexon-foundation/dexon/core/types" + "github.com/tangerine-network/go-tangerine/core/types" ) // peerDropFn is a callback type for dropping a peer detected as malicious. diff --git a/eth/fetcher/fetcher.go b/eth/fetcher/fetcher.go index f6807b5a5..ff9612934 100644 --- a/eth/fetcher/fetcher.go +++ b/eth/fetcher/fetcher.go @@ -22,11 +22,11 @@ import ( "math/rand" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/prque" - "github.com/dexon-foundation/dexon/consensus" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/prque" + "github.com/tangerine-network/go-tangerine/consensus" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/log" ) const ( diff --git a/eth/fetcher/fetcher_test.go b/eth/fetcher/fetcher_test.go index 24611a8a0..6f012641c 100644 --- a/eth/fetcher/fetcher_test.go +++ b/eth/fetcher/fetcher_test.go @@ -24,13 +24,13 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/consensus/ethash" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/consensus/ethash" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/params" ) var ( diff --git a/eth/fetcher/metrics.go b/eth/fetcher/metrics.go index 064038ab0..2f4c9fd4b 100644 --- a/eth/fetcher/metrics.go +++ b/eth/fetcher/metrics.go @@ -19,7 +19,7 @@ package fetcher import ( - "github.com/dexon-foundation/dexon/metrics" + "github.com/tangerine-network/go-tangerine/metrics" ) var ( diff --git a/eth/filters/api.go b/eth/filters/api.go index f00857f68..1cf898f16 100644 --- a/eth/filters/api.go +++ b/eth/filters/api.go @@ -25,13 +25,13 @@ import ( "sync" "time" - ethereum "github.com/dexon-foundation/dexon" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/event" - "github.com/dexon-foundation/dexon/rpc" + ethereum "github.com/tangerine-network/go-tangerine" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/event" + "github.com/tangerine-network/go-tangerine/rpc" ) var ( diff --git a/eth/filters/api_test.go b/eth/filters/api_test.go index 45dfd996e..a26363f8e 100644 --- a/eth/filters/api_test.go +++ b/eth/filters/api_test.go @@ -21,8 +21,8 @@ import ( "fmt" "testing" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/rpc" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/rpc" ) func TestUnmarshalJSONNewFilterArgs(t *testing.T) { diff --git a/eth/filters/bench_test.go b/eth/filters/bench_test.go index ae8318d85..4e02728d0 100644 --- a/eth/filters/bench_test.go +++ b/eth/filters/bench_test.go @@ -23,14 +23,14 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/bitutil" - "github.com/dexon-foundation/dexon/core/bloombits" - "github.com/dexon-foundation/dexon/core/rawdb" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/event" - "github.com/dexon-foundation/dexon/node" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/bitutil" + "github.com/tangerine-network/go-tangerine/core/bloombits" + "github.com/tangerine-network/go-tangerine/core/rawdb" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/event" + "github.com/tangerine-network/go-tangerine/node" ) func BenchmarkBloomBits512(b *testing.B) { diff --git a/eth/filters/filter.go b/eth/filters/filter.go index 7475cedf4..4e27d30e7 100644 --- a/eth/filters/filter.go +++ b/eth/filters/filter.go @@ -21,13 +21,13 @@ import ( "errors" "math/big" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/bloombits" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/event" - "github.com/dexon-foundation/dexon/rpc" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/bloombits" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/event" + "github.com/tangerine-network/go-tangerine/rpc" ) type Backend interface { diff --git a/eth/filters/filter_system.go b/eth/filters/filter_system.go index 09598524a..2cc0d424e 100644 --- a/eth/filters/filter_system.go +++ b/eth/filters/filter_system.go @@ -25,14 +25,14 @@ import ( "sync" "time" - ethereum "github.com/dexon-foundation/dexon" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/rawdb" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/event" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/rpc" + ethereum "github.com/tangerine-network/go-tangerine" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/rawdb" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/event" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/rpc" ) // Type determines the kind of filter and is used to put the filter in to diff --git a/eth/filters/filter_system_test.go b/eth/filters/filter_system_test.go index bff3c5edb..144fe31cd 100644 --- a/eth/filters/filter_system_test.go +++ b/eth/filters/filter_system_test.go @@ -25,17 +25,17 @@ import ( "testing" "time" - ethereum "github.com/dexon-foundation/dexon" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/consensus/ethash" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/bloombits" - "github.com/dexon-foundation/dexon/core/rawdb" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/event" - "github.com/dexon-foundation/dexon/params" - "github.com/dexon-foundation/dexon/rpc" + ethereum "github.com/tangerine-network/go-tangerine" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/consensus/ethash" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/bloombits" + "github.com/tangerine-network/go-tangerine/core/rawdb" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/event" + "github.com/tangerine-network/go-tangerine/params" + "github.com/tangerine-network/go-tangerine/rpc" ) type testBackend struct { diff --git a/eth/filters/filter_test.go b/eth/filters/filter_test.go index 04837caa7..30b2c969f 100644 --- a/eth/filters/filter_test.go +++ b/eth/filters/filter_test.go @@ -23,15 +23,15 @@ import ( "os" "testing" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/consensus/ethash" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/rawdb" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/event" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/consensus/ethash" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/rawdb" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/event" + "github.com/tangerine-network/go-tangerine/params" ) func makeReceipt(addr common.Address) *types.Receipt { diff --git a/eth/gasprice/gasprice.go b/eth/gasprice/gasprice.go index 9af33c682..dd5f0f14a 100644 --- a/eth/gasprice/gasprice.go +++ b/eth/gasprice/gasprice.go @@ -22,11 +22,11 @@ import ( "sort" "sync" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/internal/ethapi" - "github.com/dexon-foundation/dexon/params" - "github.com/dexon-foundation/dexon/rpc" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/internal/ethapi" + "github.com/tangerine-network/go-tangerine/params" + "github.com/tangerine-network/go-tangerine/rpc" ) var maxPrice = big.NewInt(500 * params.GWei) diff --git a/eth/gen_config.go b/eth/gen_config.go index 74b921032..a043026ad 100644 --- a/eth/gen_config.go +++ b/eth/gen_config.go @@ -6,12 +6,12 @@ import ( "math/big" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/consensus/ethash" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/eth/downloader" - "github.com/dexon-foundation/dexon/eth/gasprice" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/consensus/ethash" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/eth/downloader" + "github.com/tangerine-network/go-tangerine/eth/gasprice" ) var _ = (*configMarshaling)(nil) diff --git a/eth/handler.go b/eth/handler.go index 3b2cef19a..6a163b33c 100644 --- a/eth/handler.go +++ b/eth/handler.go @@ -26,19 +26,19 @@ import ( "sync/atomic" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/consensus" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/eth/downloader" - "github.com/dexon-foundation/dexon/eth/fetcher" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/event" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/params" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/consensus" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/eth/downloader" + "github.com/tangerine-network/go-tangerine/eth/fetcher" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/event" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/params" + "github.com/tangerine-network/go-tangerine/rlp" ) const ( diff --git a/eth/handler_test.go b/eth/handler_test.go index e7287ac6b..88b34a66a 100644 --- a/eth/handler_test.go +++ b/eth/handler_test.go @@ -24,18 +24,18 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/consensus/ethash" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/state" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/core/vm" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/eth/downloader" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/event" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/consensus/ethash" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/state" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/core/vm" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/eth/downloader" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/event" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/params" ) // Tests that protocol versions and modes of operations are matched up properly. diff --git a/eth/helper_test.go b/eth/helper_test.go index 9a30afef3..6c0fbf7f7 100644 --- a/eth/helper_test.go +++ b/eth/helper_test.go @@ -27,18 +27,18 @@ import ( "sync" "testing" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/consensus/ethash" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/core/vm" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/eth/downloader" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/event" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/consensus/ethash" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/core/vm" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/eth/downloader" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/event" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/params" ) var ( diff --git a/eth/metrics.go b/eth/metrics.go index 7b7b29cf5..4fd107f9d 100644 --- a/eth/metrics.go +++ b/eth/metrics.go @@ -17,8 +17,8 @@ package eth import ( - "github.com/dexon-foundation/dexon/metrics" - "github.com/dexon-foundation/dexon/p2p" + "github.com/tangerine-network/go-tangerine/metrics" + "github.com/tangerine-network/go-tangerine/p2p" ) var ( diff --git a/eth/peer.go b/eth/peer.go index 57d995b0f..ec3e2f269 100644 --- a/eth/peer.go +++ b/eth/peer.go @@ -24,10 +24,10 @@ import ( "time" mapset "github.com/deckarep/golang-set" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/rlp" ) var ( diff --git a/eth/protocol.go b/eth/protocol.go index 80298a26f..4f0e1d003 100644 --- a/eth/protocol.go +++ b/eth/protocol.go @@ -21,11 +21,11 @@ import ( "io" "math/big" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/event" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/event" + "github.com/tangerine-network/go-tangerine/rlp" ) // Constants to match up protocol versions and messages diff --git a/eth/protocol_test.go b/eth/protocol_test.go index 648917df5..5a9b98e36 100644 --- a/eth/protocol_test.go +++ b/eth/protocol_test.go @@ -22,12 +22,12 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/eth/downloader" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/eth/downloader" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/rlp" ) func init() { diff --git a/eth/sync.go b/eth/sync.go index 2406ff33c..db1e081d5 100644 --- a/eth/sync.go +++ b/eth/sync.go @@ -21,11 +21,11 @@ import ( "sync/atomic" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/eth/downloader" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/p2p/enode" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/eth/downloader" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/p2p/enode" ) const ( diff --git a/eth/sync_test.go b/eth/sync_test.go index 38b9c48fe..a8e8e7553 100644 --- a/eth/sync_test.go +++ b/eth/sync_test.go @@ -21,9 +21,9 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/eth/downloader" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/enode" + "github.com/tangerine-network/go-tangerine/eth/downloader" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/enode" ) // Tests that fast sync gets disabled as soon as a real block is successfully diff --git a/eth/tracers/tracer.go b/eth/tracers/tracer.go index 21c2b72d2..8bfce0626 100644 --- a/eth/tracers/tracer.go +++ b/eth/tracers/tracer.go @@ -25,11 +25,11 @@ import ( "time" "unsafe" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/core/vm" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/core/vm" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/log" duktape "gopkg.in/olebedev/go-duktape.v3" ) diff --git a/eth/tracers/tracer_test.go b/eth/tracers/tracer_test.go index 75140a5db..7aac407cc 100644 --- a/eth/tracers/tracer_test.go +++ b/eth/tracers/tracer_test.go @@ -24,10 +24,10 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/state" - "github.com/dexon-foundation/dexon/core/vm" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/state" + "github.com/tangerine-network/go-tangerine/core/vm" + "github.com/tangerine-network/go-tangerine/params" ) type account struct{} diff --git a/eth/tracers/tracers.go b/eth/tracers/tracers.go index ebfb222af..2b589543d 100644 --- a/eth/tracers/tracers.go +++ b/eth/tracers/tracers.go @@ -21,7 +21,7 @@ import ( "strings" "unicode" - "github.com/dexon-foundation/dexon/eth/tracers/internal/tracers" + "github.com/tangerine-network/go-tangerine/eth/tracers/internal/tracers" ) // all contains all the built in JavaScript tracers by name. diff --git a/eth/tracers/tracers_test.go b/eth/tracers/tracers_test.go index 1436cc67f..17e56b08d 100644 --- a/eth/tracers/tracers_test.go +++ b/eth/tracers/tracers_test.go @@ -27,17 +27,17 @@ import ( "strings" "testing" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/common/math" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/core/vm" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/params" - "github.com/dexon-foundation/dexon/rlp" - "github.com/dexon-foundation/dexon/tests" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/common/math" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/core/vm" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/params" + "github.com/tangerine-network/go-tangerine/rlp" + "github.com/tangerine-network/go-tangerine/tests" ) // To generate a new callTracer test, copy paste the makeTest method below into diff --git a/ethclient/ethclient.go b/ethclient/ethclient.go index c8a8e5eb5..8b25b71e5 100644 --- a/ethclient/ethclient.go +++ b/ethclient/ethclient.go @@ -24,12 +24,12 @@ import ( "fmt" "math/big" - "github.com/dexon-foundation/dexon" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/rlp" - "github.com/dexon-foundation/dexon/rpc" + ethereum "github.com/tangerine-network/go-tangerine" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/rlp" + "github.com/tangerine-network/go-tangerine/rpc" ) // Client defines typed wrappers for the Ethereum RPC API. diff --git a/ethclient/ethclient_test.go b/ethclient/ethclient_test.go index 46acf0dc0..c2bb96e50 100644 --- a/ethclient/ethclient_test.go +++ b/ethclient/ethclient_test.go @@ -22,8 +22,8 @@ import ( "reflect" "testing" - "github.com/dexon-foundation/dexon" - "github.com/dexon-foundation/dexon/common" + ethereum "github.com/tangerine-network/go-tangerine" + "github.com/tangerine-network/go-tangerine/common" ) // Verify that Client implements the ethereum interfaces. diff --git a/ethclient/signer.go b/ethclient/signer.go index 6c4fb0c6e..d64a462de 100644 --- a/ethclient/signer.go +++ b/ethclient/signer.go @@ -20,8 +20,8 @@ import ( "errors" "math/big" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/types" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/types" ) // senderFromServer is a types.Signer that remembers the sender address returned by the RPC diff --git a/ethdb/database.go b/ethdb/database.go index 1fcaeda3d..a3e4d7c35 100644 --- a/ethdb/database.go +++ b/ethdb/database.go @@ -25,14 +25,14 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/metrics" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/errors" "github.com/syndtr/goleveldb/leveldb/filter" "github.com/syndtr/goleveldb/leveldb/iterator" "github.com/syndtr/goleveldb/leveldb/opt" "github.com/syndtr/goleveldb/leveldb/util" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/metrics" ) const ( diff --git a/ethdb/database_js_test.go b/ethdb/database_js_test.go index 0883c054c..8d6208d50 100644 --- a/ethdb/database_js_test.go +++ b/ethdb/database_js_test.go @@ -19,7 +19,7 @@ package ethdb_test import ( - "github.com/dexon-foundation/dexon/ethdb" + "github.com/tangerine-network/go-tangerine/ethdb" ) var _ ethdb.Database = ðdb.LDBDatabase{} diff --git a/ethdb/database_test.go b/ethdb/database_test.go index df2c3b46a..2c8b1a7de 100644 --- a/ethdb/database_test.go +++ b/ethdb/database_test.go @@ -27,7 +27,7 @@ import ( "sync" "testing" - "github.com/dexon-foundation/dexon/ethdb" + "github.com/tangerine-network/go-tangerine/ethdb" ) func newTestLDB() (*ethdb.LDBDatabase, func()) { diff --git a/ethdb/memory_database.go b/ethdb/memory_database.go index 79d81ff9e..2ba86e3a9 100644 --- a/ethdb/memory_database.go +++ b/ethdb/memory_database.go @@ -20,7 +20,7 @@ import ( "errors" "sync" - "github.com/dexon-foundation/dexon/common" + "github.com/tangerine-network/go-tangerine/common" ) /* diff --git a/ethstats/ethstats.go b/ethstats/ethstats.go index aae5b9bc0..3082a58b4 100644 --- a/ethstats/ethstats.go +++ b/ethstats/ethstats.go @@ -30,17 +30,17 @@ import ( "strings" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/mclock" - "github.com/dexon-foundation/dexon/consensus" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/eth" - "github.com/dexon-foundation/dexon/event" - "github.com/dexon-foundation/dexon/les" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/rpc" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/mclock" + "github.com/tangerine-network/go-tangerine/consensus" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/eth" + "github.com/tangerine-network/go-tangerine/event" + "github.com/tangerine-network/go-tangerine/les" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/rpc" "golang.org/x/net/websocket" ) diff --git a/event/example_feed_test.go b/event/example_feed_test.go index 5bf4ed10c..f625d0785 100644 --- a/event/example_feed_test.go +++ b/event/example_feed_test.go @@ -19,7 +19,7 @@ package event_test import ( "fmt" - "github.com/dexon-foundation/dexon/event" + "github.com/tangerine-network/go-tangerine/event" ) func ExampleFeed_acknowledgedEvents() { diff --git a/event/example_scope_test.go b/event/example_scope_test.go index 6f684fd44..c413c3d74 100644 --- a/event/example_scope_test.go +++ b/event/example_scope_test.go @@ -20,7 +20,7 @@ import ( "fmt" "sync" - "github.com/dexon-foundation/dexon/event" + "github.com/tangerine-network/go-tangerine/event" ) // This example demonstrates how SubscriptionScope can be used to control the lifetime of diff --git a/event/example_subscription_test.go b/event/example_subscription_test.go index ffb071523..5265ac659 100644 --- a/event/example_subscription_test.go +++ b/event/example_subscription_test.go @@ -19,7 +19,7 @@ package event_test import ( "fmt" - "github.com/dexon-foundation/dexon/event" + "github.com/tangerine-network/go-tangerine/event" ) func ExampleNewSubscription() { diff --git a/event/subscription.go b/event/subscription.go index b0fbfad94..e2d4796fc 100644 --- a/event/subscription.go +++ b/event/subscription.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/common/mclock" + "github.com/tangerine-network/go-tangerine/common/mclock" ) // Subscription represents a stream of events. The carrier of the events is typically a diff --git a/indexer/blockchain.go b/indexer/blockchain.go index 390a5fa64..a54fd57e7 100644 --- a/indexer/blockchain.go +++ b/indexer/blockchain.go @@ -3,15 +3,15 @@ package indexer import ( "math/big" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/consensus" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/state" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/core/vm" - "github.com/dexon-foundation/dexon/event" - "github.com/dexon-foundation/dexon/params" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/consensus" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/state" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/core/vm" + "github.com/tangerine-network/go-tangerine/event" + "github.com/tangerine-network/go-tangerine/params" + "github.com/tangerine-network/go-tangerine/rlp" ) // ReadOnlyBlockChain defines safe reading blockchain interface by removing write diff --git a/indexer/config.go b/indexer/config.go index 0da9502a6..b6f327538 100644 --- a/indexer/config.go +++ b/indexer/config.go @@ -3,8 +3,8 @@ package indexer import ( "plugin" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/dex/downloader" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/dex/downloader" ) // Config is data sources related configs struct. diff --git a/indexer/interfaces.go b/indexer/interfaces.go index f35bc6547..647de7d81 100644 --- a/indexer/interfaces.go +++ b/indexer/interfaces.go @@ -10,10 +10,10 @@ type NewIndexerFunc = func(ReadOnlyBlockChain, Config) Indexer // core.Blockhain, passed by initialization function, to receiving latest block // event or other information query and interaction. type Indexer interface { - // Start is called by dex.Dexon if config is set. + // Start is called by dex.Tangerine if config is set. Start() error - // Stop is called by dex.Dexon if config is set and procedure is + // Stop is called by dex.Tangerine if config is set and procedure is // terminating. Stop() error } diff --git a/interfaces.go b/interfaces.go index d99324968..fe0961be6 100644 --- a/interfaces.go +++ b/interfaces.go @@ -22,8 +22,8 @@ import ( "errors" "math/big" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/types" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/types" ) // NotFound is returned by API methods if the requested item does not exist. diff --git a/internal/build/env.go b/internal/build/env.go index 2f5fbcbe3..5c1d434bd 100644 --- a/internal/build/env.go +++ b/internal/build/env.go @@ -81,7 +81,7 @@ func Env() Environment { // LocalEnv returns build environment metadata gathered from git. func LocalEnv() Environment { - env := applyEnvFlags(Environment{Name: "local", Repo: "dexon-foundation/dexon"}) + env := applyEnvFlags(Environment{Name: "local", Repo: "tangerine-network/go-tangerine"}) head := readGitFile("HEAD") if splits := strings.Split(head, " "); len(splits) == 2 { diff --git a/internal/debug/api.go b/internal/debug/api.go index a319b8f40..cfa44304b 100644 --- a/internal/debug/api.go +++ b/internal/debug/api.go @@ -34,7 +34,7 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/log" ) // Handler is the global debugging handler. diff --git a/internal/debug/flags.go b/internal/debug/flags.go index 25d3aab52..6aad390c4 100644 --- a/internal/debug/flags.go +++ b/internal/debug/flags.go @@ -24,12 +24,12 @@ import ( "os" "runtime" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/metrics" - "github.com/dexon-foundation/dexon/metrics/exp" "github.com/fjl/memsize/memsizeui" colorable "github.com/mattn/go-colorable" "github.com/mattn/go-isatty" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/metrics" + "github.com/tangerine-network/go-tangerine/metrics/exp" "gopkg.in/urfave/cli.v1" ) diff --git a/internal/debug/trace.go b/internal/debug/trace.go index e7509fc52..9be86ebaa 100644 --- a/internal/debug/trace.go +++ b/internal/debug/trace.go @@ -23,7 +23,7 @@ import ( "os" "runtime/trace" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/log" ) // StartGoTrace turns on tracing, writing to the given file. diff --git a/internal/ethapi/addrlock.go b/internal/ethapi/addrlock.go index c2c34eacd..946459250 100644 --- a/internal/ethapi/addrlock.go +++ b/internal/ethapi/addrlock.go @@ -19,7 +19,7 @@ package ethapi import ( "sync" - "github.com/dexon-foundation/dexon/common" + "github.com/tangerine-network/go-tangerine/common" ) type AddrLocker struct { diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go index 1be3bb413..86275b8a2 100644 --- a/internal/ethapi/api.go +++ b/internal/ethapi/api.go @@ -26,24 +26,24 @@ import ( "time" "github.com/davecgh/go-spew/spew" - "github.com/dexon-foundation/dexon/accounts" - "github.com/dexon-foundation/dexon/accounts/keystore" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/common/math" - "github.com/dexon-foundation/dexon/consensus/ethash" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/rawdb" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/core/vm" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/params" - "github.com/dexon-foundation/dexon/rlp" - "github.com/dexon-foundation/dexon/rpc" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/util" + "github.com/tangerine-network/go-tangerine/accounts" + "github.com/tangerine-network/go-tangerine/accounts/keystore" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/common/math" + "github.com/tangerine-network/go-tangerine/consensus/ethash" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/rawdb" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/core/vm" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/params" + "github.com/tangerine-network/go-tangerine/rlp" + "github.com/tangerine-network/go-tangerine/rpc" ) const ( @@ -429,7 +429,7 @@ func signHash(data []byte) []byte { // // The key used to calculate the signature is decrypted with the given password. // -// https://github.com/dexon-foundation/dexon/wiki/Management-APIs#personal_sign +// https://github.com/tangerine-network/go-tangerine/wiki/Management-APIs#personal_sign func (s *PrivateAccountAPI) Sign(ctx context.Context, data hexutil.Bytes, addr common.Address, passwd string) (hexutil.Bytes, error) { // Look up the wallet containing the requested signer account := accounts.Account{Address: addr} @@ -457,7 +457,7 @@ func (s *PrivateAccountAPI) Sign(ctx context.Context, data hexutil.Bytes, addr c // Note, the signature must conform to the secp256k1 curve R, S and V values, where // the V value must be 27 or 28 for legacy reasons. // -// https://github.com/dexon-foundation/dexon/wiki/Management-APIs#personal_ecRecover +// https://github.com/tangerine-network/go-tangerine/wiki/Management-APIs#personal_ecRecover func (s *PrivateAccountAPI) EcRecover(ctx context.Context, data, sig hexutil.Bytes) (common.Address, error) { if len(sig) != 65 { return common.Address{}, fmt.Errorf("signature must be 65 bytes long") diff --git a/internal/ethapi/backend.go b/internal/ethapi/backend.go index da13d3661..1c2e1e694 100644 --- a/internal/ethapi/backend.go +++ b/internal/ethapi/backend.go @@ -21,17 +21,17 @@ import ( "context" "math/big" - ethereum "github.com/dexon-foundation/dexon" - "github.com/dexon-foundation/dexon/accounts" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/state" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/core/vm" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/event" - "github.com/dexon-foundation/dexon/params" - "github.com/dexon-foundation/dexon/rpc" + ethereum "github.com/tangerine-network/go-tangerine" + "github.com/tangerine-network/go-tangerine/accounts" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/state" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/core/vm" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/event" + "github.com/tangerine-network/go-tangerine/params" + "github.com/tangerine-network/go-tangerine/rpc" ) type Downloader interface { diff --git a/internal/guide/guide_test.go b/internal/guide/guide_test.go index 1eeecc6b7..b0b064a07 100644 --- a/internal/guide/guide_test.go +++ b/internal/guide/guide_test.go @@ -30,8 +30,8 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/accounts/keystore" - "github.com/dexon-foundation/dexon/core/types" + "github.com/tangerine-network/go-tangerine/accounts/keystore" + "github.com/tangerine-network/go-tangerine/core/types" ) // Tests that the account management snippets work correctly. diff --git a/internal/jsre/deps/web3.js b/internal/jsre/deps/web3.js index 333c32b48..8f70384c9 100644 --- a/internal/jsre/deps/web3.js +++ b/internal/jsre/deps/web3.js @@ -5882,7 +5882,7 @@ module.exports = Shh; * @author Alex Beregszaszi <alex@rtfs.hu> * @date 2016 * - * Reference: https://github.com/dexon-foundation/dexon/blob/swarm/internal/web3ext/web3ext.go#L33 + * Reference: https://github.com/tangerine-network/go-tangerine/blob/swarm/internal/web3ext/web3ext.go#L33 */ "use strict"; diff --git a/internal/jsre/jsre.go b/internal/jsre/jsre.go index 78f0aa503..72825d27d 100644 --- a/internal/jsre/jsre.go +++ b/internal/jsre/jsre.go @@ -26,9 +26,9 @@ import ( "math/rand" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/internal/jsre/deps" "github.com/robertkrimen/otto" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/internal/jsre/deps" ) var ( diff --git a/les/api_backend.go b/les/api_backend.go index f69e67c60..ff6ffd414 100644 --- a/les/api_backend.go +++ b/les/api_backend.go @@ -20,22 +20,22 @@ import ( "context" "math/big" - "github.com/dexon-foundation/dexon/accounts" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/math" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/bloombits" - "github.com/dexon-foundation/dexon/core/rawdb" - "github.com/dexon-foundation/dexon/core/state" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/core/vm" - "github.com/dexon-foundation/dexon/eth/gasprice" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/event" - "github.com/dexon-foundation/dexon/internal/ethapi" - "github.com/dexon-foundation/dexon/light" - "github.com/dexon-foundation/dexon/params" - "github.com/dexon-foundation/dexon/rpc" + "github.com/tangerine-network/go-tangerine/accounts" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/math" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/bloombits" + "github.com/tangerine-network/go-tangerine/core/rawdb" + "github.com/tangerine-network/go-tangerine/core/state" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/core/vm" + "github.com/tangerine-network/go-tangerine/eth/gasprice" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/event" + "github.com/tangerine-network/go-tangerine/internal/ethapi" + "github.com/tangerine-network/go-tangerine/light" + "github.com/tangerine-network/go-tangerine/params" + "github.com/tangerine-network/go-tangerine/rpc" ) type LesApiBackend struct { diff --git a/les/backend.go b/les/backend.go index b56222bba..1b32c6822 100644 --- a/les/backend.go +++ b/les/backend.go @@ -22,27 +22,27 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/accounts" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/consensus" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/bloombits" - "github.com/dexon-foundation/dexon/core/rawdb" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/eth" - "github.com/dexon-foundation/dexon/eth/downloader" - "github.com/dexon-foundation/dexon/eth/filters" - "github.com/dexon-foundation/dexon/eth/gasprice" - "github.com/dexon-foundation/dexon/event" - "github.com/dexon-foundation/dexon/internal/ethapi" - "github.com/dexon-foundation/dexon/light" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/node" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/discv5" - "github.com/dexon-foundation/dexon/params" - rpc "github.com/dexon-foundation/dexon/rpc" + "github.com/tangerine-network/go-tangerine/accounts" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/consensus" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/bloombits" + "github.com/tangerine-network/go-tangerine/core/rawdb" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/eth" + "github.com/tangerine-network/go-tangerine/eth/downloader" + "github.com/tangerine-network/go-tangerine/eth/filters" + "github.com/tangerine-network/go-tangerine/eth/gasprice" + "github.com/tangerine-network/go-tangerine/event" + "github.com/tangerine-network/go-tangerine/internal/ethapi" + "github.com/tangerine-network/go-tangerine/light" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/node" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/discv5" + "github.com/tangerine-network/go-tangerine/params" + rpc "github.com/tangerine-network/go-tangerine/rpc" ) type LightEthereum struct { diff --git a/les/bloombits.go b/les/bloombits.go index 6d0142c21..223fb1a01 100644 --- a/les/bloombits.go +++ b/les/bloombits.go @@ -19,8 +19,8 @@ package les import ( "time" - "github.com/dexon-foundation/dexon/common/bitutil" - "github.com/dexon-foundation/dexon/light" + "github.com/tangerine-network/go-tangerine/common/bitutil" + "github.com/tangerine-network/go-tangerine/light" ) const ( diff --git a/les/commons.go b/les/commons.go index 0d0dbca7e..6fd165b6b 100644 --- a/les/commons.go +++ b/les/commons.go @@ -20,14 +20,14 @@ import ( "fmt" "math/big" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/eth" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/light" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/eth" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/light" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/params" ) // lesCommons contains fields needed by both server and client. diff --git a/les/fetcher.go b/les/fetcher.go index 5183fdc92..d229f5c5a 100644 --- a/les/fetcher.go +++ b/les/fetcher.go @@ -22,13 +22,13 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/mclock" - "github.com/dexon-foundation/dexon/consensus" - "github.com/dexon-foundation/dexon/core/rawdb" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/light" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/mclock" + "github.com/tangerine-network/go-tangerine/consensus" + "github.com/tangerine-network/go-tangerine/core/rawdb" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/light" + "github.com/tangerine-network/go-tangerine/log" ) const ( diff --git a/les/flowcontrol/control.go b/les/flowcontrol/control.go index bb4a73b6d..cca377688 100644 --- a/les/flowcontrol/control.go +++ b/les/flowcontrol/control.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/common/mclock" + "github.com/tangerine-network/go-tangerine/common/mclock" ) const fcTimeConst = time.Millisecond diff --git a/les/flowcontrol/manager.go b/les/flowcontrol/manager.go index ee565c83d..48cd774a1 100644 --- a/les/flowcontrol/manager.go +++ b/les/flowcontrol/manager.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/common/mclock" + "github.com/tangerine-network/go-tangerine/common/mclock" ) const rcConst = 1000000 diff --git a/les/freeclient.go b/les/freeclient.go index 10c7bba35..52589e463 100644 --- a/les/freeclient.go +++ b/les/freeclient.go @@ -23,11 +23,11 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/common/mclock" - "github.com/dexon-foundation/dexon/common/prque" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/common/mclock" + "github.com/tangerine-network/go-tangerine/common/prque" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/rlp" ) // freeClientPool implements a client database that limits the connection time diff --git a/les/freeclient_test.go b/les/freeclient_test.go index de879fc12..941908e24 100644 --- a/les/freeclient_test.go +++ b/les/freeclient_test.go @@ -24,8 +24,8 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/common/mclock" - "github.com/dexon-foundation/dexon/ethdb" + "github.com/tangerine-network/go-tangerine/common/mclock" + "github.com/tangerine-network/go-tangerine/ethdb" ) func TestFreeClientPoolL10C100(t *testing.T) { diff --git a/les/handler.go b/les/handler.go index 8a1dcc81f..14890c2fa 100644 --- a/les/handler.go +++ b/les/handler.go @@ -26,23 +26,23 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/mclock" - "github.com/dexon-foundation/dexon/consensus" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/rawdb" - "github.com/dexon-foundation/dexon/core/state" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/eth/downloader" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/event" - "github.com/dexon-foundation/dexon/light" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/discv5" - "github.com/dexon-foundation/dexon/params" - "github.com/dexon-foundation/dexon/rlp" - "github.com/dexon-foundation/dexon/trie" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/mclock" + "github.com/tangerine-network/go-tangerine/consensus" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/rawdb" + "github.com/tangerine-network/go-tangerine/core/state" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/eth/downloader" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/event" + "github.com/tangerine-network/go-tangerine/light" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/discv5" + "github.com/tangerine-network/go-tangerine/params" + "github.com/tangerine-network/go-tangerine/rlp" + "github.com/tangerine-network/go-tangerine/trie" ) const ( diff --git a/les/handler_test.go b/les/handler_test.go index d5579460d..9da186797 100644 --- a/les/handler_test.go +++ b/les/handler_test.go @@ -23,19 +23,19 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/consensus/ethash" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/rawdb" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/eth/downloader" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/light" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/params" - "github.com/dexon-foundation/dexon/rlp" - "github.com/dexon-foundation/dexon/trie" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/consensus/ethash" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/rawdb" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/eth/downloader" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/light" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/params" + "github.com/tangerine-network/go-tangerine/rlp" + "github.com/tangerine-network/go-tangerine/trie" ) func expectResponse(r p2p.MsgReader, msgcode, reqID, bv uint64, data interface{}) error { diff --git a/les/helper_test.go b/les/helper_test.go index 2ce78f0c9..bdb6dd373 100644 --- a/les/helper_test.go +++ b/les/helper_test.go @@ -26,20 +26,20 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/consensus/ethash" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/core/vm" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/eth" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/event" - "github.com/dexon-foundation/dexon/les/flowcontrol" - "github.com/dexon-foundation/dexon/light" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/consensus/ethash" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/core/vm" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/eth" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/event" + "github.com/tangerine-network/go-tangerine/les/flowcontrol" + "github.com/tangerine-network/go-tangerine/light" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/params" ) var ( diff --git a/les/metrics.go b/les/metrics.go index a221282a0..e949d7e31 100644 --- a/les/metrics.go +++ b/les/metrics.go @@ -17,8 +17,8 @@ package les import ( - "github.com/dexon-foundation/dexon/metrics" - "github.com/dexon-foundation/dexon/p2p" + "github.com/tangerine-network/go-tangerine/metrics" + "github.com/tangerine-network/go-tangerine/p2p" ) var ( diff --git a/les/odr.go b/les/odr.go index 4c05ce7f9..056965772 100644 --- a/les/odr.go +++ b/les/odr.go @@ -19,10 +19,10 @@ package les import ( "context" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/light" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/light" + "github.com/tangerine-network/go-tangerine/log" ) // LesOdr implements light.OdrBackend diff --git a/les/odr_requests.go b/les/odr_requests.go index 1a3887141..a7b65ff96 100644 --- a/les/odr_requests.go +++ b/les/odr_requests.go @@ -23,15 +23,15 @@ import ( "errors" "fmt" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/rawdb" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/light" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/rlp" - "github.com/dexon-foundation/dexon/trie" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/rawdb" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/light" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/rlp" + "github.com/tangerine-network/go-tangerine/trie" ) var ( diff --git a/les/odr_test.go b/les/odr_test.go index 9a6b1ef88..4d4a0c3bb 100644 --- a/les/odr_test.go +++ b/les/odr_test.go @@ -23,17 +23,17 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/math" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/rawdb" - "github.com/dexon-foundation/dexon/core/state" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/core/vm" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/light" - "github.com/dexon-foundation/dexon/params" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/math" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/rawdb" + "github.com/tangerine-network/go-tangerine/core/state" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/core/vm" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/light" + "github.com/tangerine-network/go-tangerine/params" + "github.com/tangerine-network/go-tangerine/rlp" ) type odrTestFn func(ctx context.Context, db ethdb.Database, config *params.ChainConfig, bc *core.BlockChain, lc *light.LightChain, bhash common.Hash) []byte diff --git a/les/peer.go b/les/peer.go index 8b05aa8d8..e62aef6c4 100644 --- a/les/peer.go +++ b/les/peer.go @@ -24,13 +24,13 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/eth" - "github.com/dexon-foundation/dexon/les/flowcontrol" - "github.com/dexon-foundation/dexon/light" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/eth" + "github.com/tangerine-network/go-tangerine/les/flowcontrol" + "github.com/tangerine-network/go-tangerine/light" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/rlp" ) var ( diff --git a/les/protocol.go b/les/protocol.go index 4d4519a42..09255d708 100644 --- a/les/protocol.go +++ b/les/protocol.go @@ -24,12 +24,12 @@ import ( "io" "math/big" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/rawdb" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/rawdb" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/rlp" ) // Constants to match up protocol versions and messages diff --git a/les/request_test.go b/les/request_test.go index c99ebab53..759fe7d20 100644 --- a/les/request_test.go +++ b/les/request_test.go @@ -21,11 +21,11 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/rawdb" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/light" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/rawdb" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/light" ) var testBankSecureTrieKey = secAddr(testBankAddress) diff --git a/les/retrieve.go b/les/retrieve.go index bc8763f3e..797cfedbb 100644 --- a/les/retrieve.go +++ b/les/retrieve.go @@ -26,8 +26,8 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/common/mclock" - "github.com/dexon-foundation/dexon/light" + "github.com/tangerine-network/go-tangerine/common/mclock" + "github.com/tangerine-network/go-tangerine/light" ) var ( diff --git a/les/server.go b/les/server.go index d681ba359..19a35e20c 100644 --- a/les/server.go +++ b/les/server.go @@ -23,19 +23,19 @@ import ( "math" "sync" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/rawdb" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/eth" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/les/flowcontrol" - "github.com/dexon-foundation/dexon/light" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/discv5" - "github.com/dexon-foundation/dexon/params" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/rawdb" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/eth" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/les/flowcontrol" + "github.com/tangerine-network/go-tangerine/light" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/discv5" + "github.com/tangerine-network/go-tangerine/params" + "github.com/tangerine-network/go-tangerine/rlp" ) type LesServer struct { diff --git a/les/serverpool.go b/les/serverpool.go index 5990344f4..3f9d8b584 100644 --- a/les/serverpool.go +++ b/les/serverpool.go @@ -28,14 +28,14 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/common/mclock" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/discv5" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/common/mclock" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/discv5" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/rlp" ) const ( diff --git a/les/sync.go b/les/sync.go index 42afb3933..77dbacb6b 100644 --- a/les/sync.go +++ b/les/sync.go @@ -20,9 +20,9 @@ import ( "context" "time" - "github.com/dexon-foundation/dexon/core/rawdb" - "github.com/dexon-foundation/dexon/eth/downloader" - "github.com/dexon-foundation/dexon/light" + "github.com/tangerine-network/go-tangerine/core/rawdb" + "github.com/tangerine-network/go-tangerine/eth/downloader" + "github.com/tangerine-network/go-tangerine/light" ) // syncer is responsible for periodically synchronising with the network, both diff --git a/les/txrelay.go b/les/txrelay.go index c1d43c2ba..e8b21c2eb 100644 --- a/les/txrelay.go +++ b/les/txrelay.go @@ -19,9 +19,9 @@ package les import ( "sync" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/rlp" ) type ltrInfo struct { diff --git a/light/lightchain.go b/light/lightchain.go index f4a6b7a27..065744395 100644 --- a/light/lightchain.go +++ b/light/lightchain.go @@ -24,18 +24,18 @@ import ( "sync/atomic" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/consensus" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/rawdb" - "github.com/dexon-foundation/dexon/core/state" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/event" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/params" - "github.com/dexon-foundation/dexon/rlp" - "github.com/hashicorp/golang-lru" + lru "github.com/hashicorp/golang-lru" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/consensus" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/rawdb" + "github.com/tangerine-network/go-tangerine/core/state" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/event" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/params" + "github.com/tangerine-network/go-tangerine/rlp" ) var ( diff --git a/light/lightchain_test.go b/light/lightchain_test.go index 92f3e02df..488f7cf1a 100644 --- a/light/lightchain_test.go +++ b/light/lightchain_test.go @@ -21,13 +21,13 @@ import ( "math/big" "testing" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/consensus/ethash" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/rawdb" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/consensus/ethash" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/rawdb" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/params" ) // So we can deterministically seed different blockchains diff --git a/light/nodeset.go b/light/nodeset.go index c63eee532..1923d8e98 100644 --- a/light/nodeset.go +++ b/light/nodeset.go @@ -20,10 +20,10 @@ import ( "errors" "sync" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/rlp" ) // NodeSet stores a set of trie nodes. It implements trie.Database and can also diff --git a/light/odr.go b/light/odr.go index 5db271100..5a23e1795 100644 --- a/light/odr.go +++ b/light/odr.go @@ -23,11 +23,11 @@ import ( "errors" "math/big" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/rawdb" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/ethdb" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/rawdb" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/ethdb" ) // NoOdr is the default context passed to an ODR capable function when the ODR diff --git a/light/odr_test.go b/light/odr_test.go index 34e1f6f7c..a8f089ba6 100644 --- a/light/odr_test.go +++ b/light/odr_test.go @@ -24,19 +24,19 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/math" - "github.com/dexon-foundation/dexon/consensus/ethash" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/rawdb" - "github.com/dexon-foundation/dexon/core/state" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/core/vm" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/params" - "github.com/dexon-foundation/dexon/rlp" - "github.com/dexon-foundation/dexon/trie" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/math" + "github.com/tangerine-network/go-tangerine/consensus/ethash" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/rawdb" + "github.com/tangerine-network/go-tangerine/core/state" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/core/vm" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/params" + "github.com/tangerine-network/go-tangerine/rlp" + "github.com/tangerine-network/go-tangerine/trie" ) var ( diff --git a/light/odr_util.go b/light/odr_util.go index db8f5941f..07a24c48c 100644 --- a/light/odr_util.go +++ b/light/odr_util.go @@ -20,12 +20,12 @@ import ( "bytes" "context" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/rawdb" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/rawdb" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/rlp" ) var sha3_nil = crypto.Keccak256Hash(nil) diff --git a/light/postprocess.go b/light/postprocess.go index 251b0c19d..9a36eabf4 100644 --- a/light/postprocess.go +++ b/light/postprocess.go @@ -24,16 +24,16 @@ import ( "math/big" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/bitutil" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/rawdb" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/params" - "github.com/dexon-foundation/dexon/rlp" - "github.com/dexon-foundation/dexon/trie" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/bitutil" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/rawdb" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/params" + "github.com/tangerine-network/go-tangerine/rlp" + "github.com/tangerine-network/go-tangerine/trie" ) // IndexerConfig includes a set of configs for chain indexers. diff --git a/light/trie.go b/light/trie.go index d71f52f3e..854dbca77 100644 --- a/light/trie.go +++ b/light/trie.go @@ -21,12 +21,12 @@ import ( "errors" "fmt" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/state" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/trie" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/state" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/trie" ) func NewState(ctx context.Context, head *types.Header, odr OdrBackend) *state.StateDB { diff --git a/light/trie_test.go b/light/trie_test.go index e0eee22e1..0ea124a50 100644 --- a/light/trie_test.go +++ b/light/trie_test.go @@ -23,13 +23,13 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/dexon-foundation/dexon/consensus/ethash" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/state" - "github.com/dexon-foundation/dexon/core/vm" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/params" - "github.com/dexon-foundation/dexon/trie" + "github.com/tangerine-network/go-tangerine/consensus/ethash" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/state" + "github.com/tangerine-network/go-tangerine/core/vm" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/params" + "github.com/tangerine-network/go-tangerine/trie" ) func TestNodeIterator(t *testing.T) { diff --git a/light/txpool.go b/light/txpool.go index abab7c740..16eee9f07 100644 --- a/light/txpool.go +++ b/light/txpool.go @@ -22,16 +22,16 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/rawdb" - "github.com/dexon-foundation/dexon/core/state" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/event" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/params" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/rawdb" + "github.com/tangerine-network/go-tangerine/core/state" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/event" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/params" + "github.com/tangerine-network/go-tangerine/rlp" ) const ( diff --git a/light/txpool_test.go b/light/txpool_test.go index b7e6fe5b3..3cd476e9e 100644 --- a/light/txpool_test.go +++ b/light/txpool_test.go @@ -23,13 +23,13 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/consensus/ethash" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/core/vm" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/consensus/ethash" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/core/vm" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/params" ) type testTxRelay struct { diff --git a/log/format.go b/log/format.go index 0a3c05f3e..0a3d8563d 100644 --- a/log/format.go +++ b/log/format.go @@ -22,7 +22,7 @@ const ( // locationTrims are trimmed for display to avoid unwieldy log lines. var locationTrims = []string{ - "github.com/dexon-foundation/dexon/", + "github.com/tangerine-network/go-tangerine/", } // PrintOrigins sets or unsets log location (file:line) printing for terminal diff --git a/metrics/exp/exp.go b/metrics/exp/exp.go index ad9ba1685..069d78b12 100644 --- a/metrics/exp/exp.go +++ b/metrics/exp/exp.go @@ -8,7 +8,7 @@ import ( "net/http" "sync" - "github.com/dexon-foundation/dexon/metrics" + "github.com/tangerine-network/go-tangerine/metrics" ) type exp struct { diff --git a/metrics/influxdb/influxdb.go b/metrics/influxdb/influxdb.go index 693ffb96c..2df77954e 100644 --- a/metrics/influxdb/influxdb.go +++ b/metrics/influxdb/influxdb.go @@ -5,9 +5,9 @@ import ( uurl "net/url" "time" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/metrics" "github.com/influxdata/influxdb/client" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/metrics" ) type reporter struct { diff --git a/metrics/librato/librato.go b/metrics/librato/librato.go index 4e69c8d6a..a9eb32b2b 100644 --- a/metrics/librato/librato.go +++ b/metrics/librato/librato.go @@ -7,7 +7,7 @@ import ( "regexp" "time" - "github.com/dexon-foundation/dexon/metrics" + "github.com/tangerine-network/go-tangerine/metrics" ) // a regexp for extracting the unit from time.Duration.String diff --git a/metrics/metrics.go b/metrics/metrics.go index 04f830d01..0b2ba621e 100644 --- a/metrics/metrics.go +++ b/metrics/metrics.go @@ -11,7 +11,7 @@ import ( "strings" "time" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/log" ) // Enabled is checked by the constructor functions for all of the diff --git a/miner/miner.go b/miner/miner.go index da6823b84..57f06dfd6 100644 --- a/miner/miner.go +++ b/miner/miner.go @@ -22,15 +22,15 @@ import ( "sync/atomic" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/consensus" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/state" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/eth/downloader" - "github.com/dexon-foundation/dexon/event" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/consensus" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/state" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/eth/downloader" + "github.com/tangerine-network/go-tangerine/event" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/params" ) // Backend wraps all methods required for mining. diff --git a/miner/stress_clique.go b/miner/stress_clique.go index 10186d478..13784e6c5 100644 --- a/miner/stress_clique.go +++ b/miner/stress_clique.go @@ -28,19 +28,19 @@ import ( "os" "time" - "github.com/dexon-foundation/dexon/accounts/keystore" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/fdlimit" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/eth" - "github.com/dexon-foundation/dexon/eth/downloader" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/node" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/accounts/keystore" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/fdlimit" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/eth" + "github.com/tangerine-network/go-tangerine/eth/downloader" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/node" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/params" ) func main() { diff --git a/miner/stress_ethash.go b/miner/stress_ethash.go index 073da6944..5675af0d8 100644 --- a/miner/stress_ethash.go +++ b/miner/stress_ethash.go @@ -28,20 +28,20 @@ import ( "path/filepath" "time" - "github.com/dexon-foundation/dexon/accounts/keystore" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/fdlimit" - "github.com/dexon-foundation/dexon/consensus/ethash" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/eth" - "github.com/dexon-foundation/dexon/eth/downloader" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/node" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/accounts/keystore" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/fdlimit" + "github.com/tangerine-network/go-tangerine/consensus/ethash" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/eth" + "github.com/tangerine-network/go-tangerine/eth/downloader" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/node" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/params" ) func main() { diff --git a/miner/unconfirmed.go b/miner/unconfirmed.go index 96c5bf1a0..ed6f2b289 100644 --- a/miner/unconfirmed.go +++ b/miner/unconfirmed.go @@ -20,9 +20,9 @@ import ( "container/ring" "sync" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/log" ) // chainRetriever is used by the unconfirmed block set to verify whether a previously diff --git a/miner/unconfirmed_test.go b/miner/unconfirmed_test.go index 02f4bf193..70fa3a5d4 100644 --- a/miner/unconfirmed_test.go +++ b/miner/unconfirmed_test.go @@ -19,8 +19,8 @@ package miner import ( "testing" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/types" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/types" ) // noopChainRetriever is an implementation of headerRetriever that always diff --git a/miner/worker.go b/miner/worker.go index 1a3c64d7b..cf1740753 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -25,15 +25,15 @@ import ( "time" mapset "github.com/deckarep/golang-set" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/consensus" - "github.com/dexon-foundation/dexon/consensus/misc" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/state" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/event" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/consensus" + "github.com/tangerine-network/go-tangerine/consensus/misc" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/state" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/event" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/params" ) const ( diff --git a/miner/worker_test.go b/miner/worker_test.go index a3468e551..86c92c468 100644 --- a/miner/worker_test.go +++ b/miner/worker_test.go @@ -21,17 +21,17 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/consensus" - "github.com/dexon-foundation/dexon/consensus/clique" - "github.com/dexon-foundation/dexon/consensus/ethash" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/core/vm" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/event" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/consensus" + "github.com/tangerine-network/go-tangerine/consensus/clique" + "github.com/tangerine-network/go-tangerine/consensus/ethash" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/core/vm" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/event" + "github.com/tangerine-network/go-tangerine/params" ) var ( diff --git a/mobile/accounts.go b/mobile/accounts.go index 6f5dfa11e..c6fae7534 100644 --- a/mobile/accounts.go +++ b/mobile/accounts.go @@ -23,10 +23,10 @@ import ( "errors" "time" - "github.com/dexon-foundation/dexon/accounts" - "github.com/dexon-foundation/dexon/accounts/keystore" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/crypto" + "github.com/tangerine-network/go-tangerine/accounts" + "github.com/tangerine-network/go-tangerine/accounts/keystore" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/crypto" ) const ( diff --git a/mobile/android_test.go b/mobile/android_test.go index 8cc4cfc25..44134c86d 100644 --- a/mobile/android_test.go +++ b/mobile/android_test.go @@ -25,7 +25,7 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/internal/build" + "github.com/tangerine-network/go-tangerine/internal/build" ) // androidTestClass is a Java class to do some lightweight tests against the Android @@ -207,7 +207,7 @@ func TestAndroid(t *testing.T) { } } // Generate the mobile bindings for Geth and add the tester class - gobind := exec.Command("gomobile", "bind", "-javapkg", "org.ethereum", "github.com/dexon-foundation/dexon/mobile") + gobind := exec.Command("gomobile", "bind", "-javapkg", "org.ethereum", "github.com/tangerine-network/go-tangerine/mobile") if output, err := gobind.CombinedOutput(); err != nil { t.Logf("%s", output) t.Fatalf("failed to run gomobile bind: %v", err) diff --git a/mobile/big.go b/mobile/big.go index 83f803a2e..a44309843 100644 --- a/mobile/big.go +++ b/mobile/big.go @@ -22,7 +22,7 @@ import ( "errors" "math/big" - "github.com/dexon-foundation/dexon/common" + "github.com/tangerine-network/go-tangerine/common" ) // A BigInt represents a signed multi-precision integer. diff --git a/mobile/bind.go b/mobile/bind.go index 159537eda..bb7ef758a 100644 --- a/mobile/bind.go +++ b/mobile/bind.go @@ -22,10 +22,10 @@ import ( "math/big" "strings" - "github.com/dexon-foundation/dexon/accounts/abi" - "github.com/dexon-foundation/dexon/accounts/abi/bind" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/types" + "github.com/tangerine-network/go-tangerine/accounts/abi" + "github.com/tangerine-network/go-tangerine/accounts/abi/bind" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/types" ) // Signer is an interaface defining the callback when a contract requires a diff --git a/mobile/common.go b/mobile/common.go index 8e66c1f20..026d6369f 100644 --- a/mobile/common.go +++ b/mobile/common.go @@ -24,7 +24,7 @@ import ( "fmt" "strings" - "github.com/dexon-foundation/dexon/common" + "github.com/tangerine-network/go-tangerine/common" ) // Hash represents the 32 byte Keccak256 hash of arbitrary data. diff --git a/mobile/discover.go b/mobile/discover.go index 172a9b55a..aa1ae0e73 100644 --- a/mobile/discover.go +++ b/mobile/discover.go @@ -22,7 +22,7 @@ package geth import ( "errors" - "github.com/dexon-foundation/dexon/p2p/discv5" + "github.com/tangerine-network/go-tangerine/p2p/discv5" ) // Enode represents a host on the network. diff --git a/mobile/ethclient.go b/mobile/ethclient.go index 400389db0..042f70a37 100644 --- a/mobile/ethclient.go +++ b/mobile/ethclient.go @@ -21,8 +21,8 @@ package geth import ( "math/big" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/ethclient" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/ethclient" ) // EthereumClient provides access to the Ethereum APIs. diff --git a/mobile/ethereum.go b/mobile/ethereum.go index 049e075f5..42a0ad9eb 100644 --- a/mobile/ethereum.go +++ b/mobile/ethereum.go @@ -21,8 +21,8 @@ package geth import ( "errors" - ethereum "github.com/dexon-foundation/dexon" - "github.com/dexon-foundation/dexon/common" + ethereum "github.com/tangerine-network/go-tangerine" + "github.com/tangerine-network/go-tangerine/common" ) // Subscription represents an event subscription where events are diff --git a/mobile/geth.go b/mobile/geth.go index 358bcf539..6fee4bd4c 100644 --- a/mobile/geth.go +++ b/mobile/geth.go @@ -24,18 +24,18 @@ import ( "fmt" "path/filepath" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/eth" - "github.com/dexon-foundation/dexon/eth/downloader" - "github.com/dexon-foundation/dexon/ethclient" - "github.com/dexon-foundation/dexon/ethstats" - "github.com/dexon-foundation/dexon/internal/debug" - "github.com/dexon-foundation/dexon/les" - "github.com/dexon-foundation/dexon/node" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/nat" - "github.com/dexon-foundation/dexon/params" - whisper "github.com/dexon-foundation/dexon/whisper/whisperv6" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/eth" + "github.com/tangerine-network/go-tangerine/eth/downloader" + "github.com/tangerine-network/go-tangerine/ethclient" + "github.com/tangerine-network/go-tangerine/ethstats" + "github.com/tangerine-network/go-tangerine/internal/debug" + "github.com/tangerine-network/go-tangerine/les" + "github.com/tangerine-network/go-tangerine/node" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/nat" + "github.com/tangerine-network/go-tangerine/params" + whisper "github.com/tangerine-network/go-tangerine/whisper/whisperv6" ) // NodeConfig represents the collection of configuration values to fine tune the Geth diff --git a/mobile/init.go b/mobile/init.go index c4cc38550..0eb393298 100644 --- a/mobile/init.go +++ b/mobile/init.go @@ -22,7 +22,7 @@ import ( "os" "runtime" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/log" ) func init() { diff --git a/mobile/interface.go b/mobile/interface.go index 3985b172f..12f3c1cac 100644 --- a/mobile/interface.go +++ b/mobile/interface.go @@ -22,7 +22,7 @@ import ( "errors" "math/big" - "github.com/dexon-foundation/dexon/common" + "github.com/tangerine-network/go-tangerine/common" ) // Interface represents a wrapped version of Go's interface{}, with the capacity diff --git a/mobile/logger.go b/mobile/logger.go index f9ecbf124..6f92a3091 100644 --- a/mobile/logger.go +++ b/mobile/logger.go @@ -19,7 +19,7 @@ package geth import ( "os" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/log" ) // SetVerbosity sets the global verbosity level (between 0 and 6 - see logger/verbosity.go). diff --git a/mobile/p2p.go b/mobile/p2p.go index 07197d240..3facda59d 100644 --- a/mobile/p2p.go +++ b/mobile/p2p.go @@ -21,7 +21,7 @@ package geth import ( "errors" - "github.com/dexon-foundation/dexon/p2p" + "github.com/tangerine-network/go-tangerine/p2p" ) // NodeInfo represents pi short summary of the information known about the host. diff --git a/mobile/params.go b/mobile/params.go index f9b94b130..48b1136a9 100644 --- a/mobile/params.go +++ b/mobile/params.go @@ -21,9 +21,9 @@ package geth import ( "encoding/json" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/p2p/discv5" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/p2p/discv5" + "github.com/tangerine-network/go-tangerine/params" ) // MainnetGenesis returns the JSON spec to use for the main Ethereum network. It diff --git a/mobile/shhclient.go b/mobile/shhclient.go index c3d57e9fe..7b557278a 100644 --- a/mobile/shhclient.go +++ b/mobile/shhclient.go @@ -19,8 +19,8 @@ package geth import ( - "github.com/dexon-foundation/dexon/whisper/shhclient" - whisper "github.com/dexon-foundation/dexon/whisper/whisperv6" + "github.com/tangerine-network/go-tangerine/whisper/shhclient" + whisper "github.com/tangerine-network/go-tangerine/whisper/whisperv6" ) // WhisperClient provides access to the Ethereum APIs. diff --git a/mobile/types.go b/mobile/types.go index 4267354b8..0f84d662e 100644 --- a/mobile/types.go +++ b/mobile/types.go @@ -23,10 +23,10 @@ import ( "errors" "fmt" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/rlp" - whisper "github.com/dexon-foundation/dexon/whisper/whisperv6" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/rlp" + whisper "github.com/tangerine-network/go-tangerine/whisper/whisperv6" ) // A Nonce is a 64-bit hash which proves (combined with the mix-hash) that diff --git a/mobile/vm.go b/mobile/vm.go index f35a5c130..ee118ba45 100644 --- a/mobile/vm.go +++ b/mobile/vm.go @@ -21,7 +21,7 @@ package geth import ( "errors" - "github.com/dexon-foundation/dexon/core/types" + "github.com/tangerine-network/go-tangerine/core/types" ) // Log represents a contract log event. These events are generated by the LOG diff --git a/node/api.go b/node/api.go index e2e214888..02de526f4 100644 --- a/node/api.go +++ b/node/api.go @@ -22,12 +22,12 @@ import ( "strings" "time" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/metrics" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/rpc" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/metrics" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/rpc" ) // PrivateAdminAPI is the collection of administrative API methods exposed only diff --git a/node/config.go b/node/config.go index 8305ac145..149df7822 100644 --- a/node/config.go +++ b/node/config.go @@ -26,15 +26,15 @@ import ( "strings" "sync" - "github.com/dexon-foundation/dexon/accounts" - "github.com/dexon-foundation/dexon/accounts/keystore" - "github.com/dexon-foundation/dexon/accounts/usbwallet" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/rpc" + "github.com/tangerine-network/go-tangerine/accounts" + "github.com/tangerine-network/go-tangerine/accounts/keystore" + "github.com/tangerine-network/go-tangerine/accounts/usbwallet" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/rpc" ) const ( diff --git a/node/config_test.go b/node/config_test.go index 6bc40d455..4fe11dfa5 100644 --- a/node/config_test.go +++ b/node/config_test.go @@ -24,8 +24,8 @@ import ( "runtime" "testing" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/p2p" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/p2p" ) // Tests that datadirs can be successfully created, be them manually configured diff --git a/node/defaults.go b/node/defaults.go index 90db6ea68..131124053 100644 --- a/node/defaults.go +++ b/node/defaults.go @@ -22,9 +22,9 @@ import ( "path/filepath" "runtime" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/nat" - "github.com/dexon-foundation/dexon/rpc" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/nat" + "github.com/tangerine-network/go-tangerine/rpc" ) const ( @@ -57,11 +57,11 @@ func DefaultDataDir() string { home := homeDir() if home != "" { if runtime.GOOS == "darwin" { - return filepath.Join(home, "Library", "Dexon") + return filepath.Join(home, "Library", "Tangerine") } else if runtime.GOOS == "windows" { - return filepath.Join(home, "AppData", "Roaming", "Dexon") + return filepath.Join(home, "AppData", "Roaming", "Tangerine") } else { - return filepath.Join(home, ".dexon") + return filepath.Join(home, ".tangerine") } } // As we cannot guess a stable location, return empty and handle later diff --git a/node/node.go b/node/node.go index 5f2c30e9b..746925951 100644 --- a/node/node.go +++ b/node/node.go @@ -26,14 +26,14 @@ import ( "strings" "sync" - "github.com/dexon-foundation/dexon/accounts" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/event" - "github.com/dexon-foundation/dexon/internal/debug" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/rpc" "github.com/prometheus/prometheus/util/flock" + "github.com/tangerine-network/go-tangerine/accounts" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/event" + "github.com/tangerine-network/go-tangerine/internal/debug" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/rpc" ) // Node is a container on which services can be registered. diff --git a/node/node_example_test.go b/node/node_example_test.go index 4d4613af4..4ef1f7276 100644 --- a/node/node_example_test.go +++ b/node/node_example_test.go @@ -20,9 +20,9 @@ import ( "fmt" "log" - "github.com/dexon-foundation/dexon/node" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/rpc" + "github.com/tangerine-network/go-tangerine/node" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/rpc" ) // SampleService is a trivial network service that can be attached to a node for diff --git a/node/node_test.go b/node/node_test.go index 9e203823a..b79c988c3 100644 --- a/node/node_test.go +++ b/node/node_test.go @@ -24,9 +24,9 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/rpc" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/rpc" ) var ( diff --git a/node/service.go b/node/service.go index 380f01c0f..1ecad5fcf 100644 --- a/node/service.go +++ b/node/service.go @@ -19,11 +19,11 @@ package node import ( "reflect" - "github.com/dexon-foundation/dexon/accounts" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/event" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/rpc" + "github.com/tangerine-network/go-tangerine/accounts" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/event" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/rpc" ) // ServiceContext is a collection of service independent options inherited from diff --git a/node/utils_test.go b/node/utils_test.go index 24f42a7cb..dc59670f4 100644 --- a/node/utils_test.go +++ b/node/utils_test.go @@ -22,8 +22,8 @@ package node import ( "reflect" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/rpc" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/rpc" ) // NoopService is a trivial implementation of the Service interface. diff --git a/p2p/dial.go b/p2p/dial.go index 8bb39f9e8..7d70727ce 100644 --- a/p2p/dial.go +++ b/p2p/dial.go @@ -23,9 +23,9 @@ import ( "net" "time" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/netutil" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/netutil" ) const ( diff --git a/p2p/dial_test.go b/p2p/dial_test.go index 84f138899..ba7f35d9d 100644 --- a/p2p/dial_test.go +++ b/p2p/dial_test.go @@ -24,9 +24,9 @@ import ( "time" "github.com/davecgh/go-spew/spew" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/enr" - "github.com/dexon-foundation/dexon/p2p/netutil" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/enr" + "github.com/tangerine-network/go-tangerine/p2p/netutil" ) func init() { diff --git a/p2p/discover/node.go b/p2p/discover/node.go index 18b4aeadd..b776e26a3 100644 --- a/p2p/discover/node.go +++ b/p2p/discover/node.go @@ -23,10 +23,10 @@ import ( "net" "time" - "github.com/dexon-foundation/dexon/common/math" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/p2p/enode" "github.com/ethereum/go-ethereum/crypto/secp256k1" + "github.com/tangerine-network/go-tangerine/common/math" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/p2p/enode" ) // node represents a host on the network. diff --git a/p2p/discover/ntp.go b/p2p/discover/ntp.go index be21a8e5e..993c1fabc 100644 --- a/p2p/discover/ntp.go +++ b/p2p/discover/ntp.go @@ -25,7 +25,7 @@ import ( "sort" "time" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/log" ) const ( diff --git a/p2p/discover/table.go b/p2p/discover/table.go index e8a219871..9e27715d9 100644 --- a/p2p/discover/table.go +++ b/p2p/discover/table.go @@ -33,11 +33,11 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/netutil" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/netutil" ) const ( diff --git a/p2p/discover/table_test.go b/p2p/discover/table_test.go index 8947a074e..6aabae230 100644 --- a/p2p/discover/table_test.go +++ b/p2p/discover/table_test.go @@ -27,10 +27,10 @@ import ( "testing/quick" "time" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/enr" - "github.com/dexon-foundation/dexon/p2p/netutil" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/enr" + "github.com/tangerine-network/go-tangerine/p2p/netutil" ) func TestTable_pingReplace(t *testing.T) { diff --git a/p2p/discover/table_util_test.go b/p2p/discover/table_util_test.go index 7e149b22c..fd11f9807 100644 --- a/p2p/discover/table_util_test.go +++ b/p2p/discover/table_util_test.go @@ -24,8 +24,8 @@ import ( "net" "sync" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/enr" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/enr" ) var nullNode *enode.Node diff --git a/p2p/discover/udp.go b/p2p/discover/udp.go index fbc729d81..f31d40528 100644 --- a/p2p/discover/udp.go +++ b/p2p/discover/udp.go @@ -26,11 +26,11 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/netutil" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/netutil" + "github.com/tangerine-network/go-tangerine/rlp" ) // Errors diff --git a/p2p/discover/udp_test.go b/p2p/discover/udp_test.go index 328e4d4d5..7560f7a05 100644 --- a/p2p/discover/udp_test.go +++ b/p2p/discover/udp_test.go @@ -35,10 +35,10 @@ import ( "time" "github.com/davecgh/go-spew/spew" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/rlp" ) func init() { diff --git a/p2p/discv5/database.go b/p2p/discv5/database.go index 8c580dec1..b7be73167 100644 --- a/p2p/discv5/database.go +++ b/p2p/discv5/database.go @@ -28,15 +28,15 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/rlp" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/errors" "github.com/syndtr/goleveldb/leveldb/iterator" "github.com/syndtr/goleveldb/leveldb/opt" "github.com/syndtr/goleveldb/leveldb/storage" "github.com/syndtr/goleveldb/leveldb/util" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/rlp" ) var ( diff --git a/p2p/discv5/metrics.go b/p2p/discv5/metrics.go index 741ce444c..edf6b3ce7 100644 --- a/p2p/discv5/metrics.go +++ b/p2p/discv5/metrics.go @@ -1,6 +1,6 @@ package discv5 -import "github.com/dexon-foundation/dexon/metrics" +import "github.com/tangerine-network/go-tangerine/metrics" var ( ingressTrafficMeter = metrics.NewRegisteredMeter("discv5/InboundTraffic", nil) diff --git a/p2p/discv5/net.go b/p2p/discv5/net.go index 1a01dd3d1..e6f6945bb 100644 --- a/p2p/discv5/net.go +++ b/p2p/discv5/net.go @@ -24,12 +24,12 @@ import ( "net" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/mclock" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/p2p/netutil" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/mclock" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/p2p/netutil" + "github.com/tangerine-network/go-tangerine/rlp" "golang.org/x/crypto/sha3" ) diff --git a/p2p/discv5/net_test.go b/p2p/discv5/net_test.go index ffaed71c5..bdb320886 100644 --- a/p2p/discv5/net_test.go +++ b/p2p/discv5/net_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/crypto" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/crypto" ) func TestNetwork_Lookup(t *testing.T) { diff --git a/p2p/discv5/node.go b/p2p/discv5/node.go index 53d82caac..7d6bdd1e7 100644 --- a/p2p/discv5/node.go +++ b/p2p/discv5/node.go @@ -30,8 +30,8 @@ import ( "strconv" "strings" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/crypto" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/crypto" ) // Node represents a host on the network. diff --git a/p2p/discv5/node_test.go b/p2p/discv5/node_test.go index 192115406..c091ac019 100644 --- a/p2p/discv5/node_test.go +++ b/p2p/discv5/node_test.go @@ -27,8 +27,8 @@ import ( "testing/quick" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/crypto" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/crypto" ) func ExampleNewNode() { diff --git a/p2p/discv5/ntp.go b/p2p/discv5/ntp.go index e8ffd81b4..d452ff7d8 100644 --- a/p2p/discv5/ntp.go +++ b/p2p/discv5/ntp.go @@ -26,7 +26,7 @@ import ( "strings" "time" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/log" ) const ( diff --git a/p2p/discv5/sim_test.go b/p2p/discv5/sim_test.go index 53b94b247..9f9312d0e 100644 --- a/p2p/discv5/sim_test.go +++ b/p2p/discv5/sim_test.go @@ -28,7 +28,7 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/common" + "github.com/tangerine-network/go-tangerine/common" ) // In this test, nodes try to randomly resolve each other. diff --git a/p2p/discv5/table.go b/p2p/discv5/table.go index 4d1d4ea8b..71a4c1754 100644 --- a/p2p/discv5/table.go +++ b/p2p/discv5/table.go @@ -29,7 +29,7 @@ import ( "net" "sort" - "github.com/dexon-foundation/dexon/common" + "github.com/tangerine-network/go-tangerine/common" ) const ( diff --git a/p2p/discv5/table_test.go b/p2p/discv5/table_test.go index b5442dfe1..d452cd302 100644 --- a/p2p/discv5/table_test.go +++ b/p2p/discv5/table_test.go @@ -27,8 +27,8 @@ import ( "testing/quick" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/crypto" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/crypto" ) type nullTransport struct{} diff --git a/p2p/discv5/ticket.go b/p2p/discv5/ticket.go index 3503d14ae..0758de15a 100644 --- a/p2p/discv5/ticket.go +++ b/p2p/discv5/ticket.go @@ -25,10 +25,10 @@ import ( "sort" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/mclock" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/mclock" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/log" ) const ( diff --git a/p2p/discv5/topic.go b/p2p/discv5/topic.go index 9ab29a9ff..7f2bd1bbc 100644 --- a/p2p/discv5/topic.go +++ b/p2p/discv5/topic.go @@ -23,8 +23,8 @@ import ( "math/rand" "time" - "github.com/dexon-foundation/dexon/common/mclock" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/common/mclock" + "github.com/tangerine-network/go-tangerine/log" ) const ( diff --git a/p2p/discv5/topic_test.go b/p2p/discv5/topic_test.go index b34fa4eff..1985d9445 100644 --- a/p2p/discv5/topic_test.go +++ b/p2p/discv5/topic_test.go @@ -21,8 +21,8 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/mclock" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/mclock" ) func TestTopicRadius(t *testing.T) { diff --git a/p2p/discv5/udp.go b/p2p/discv5/udp.go index dfcbaf810..84e345a1b 100644 --- a/p2p/discv5/udp.go +++ b/p2p/discv5/udp.go @@ -24,12 +24,12 @@ import ( "net" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/p2p/nat" - "github.com/dexon-foundation/dexon/p2p/netutil" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/p2p/nat" + "github.com/tangerine-network/go-tangerine/p2p/netutil" + "github.com/tangerine-network/go-tangerine/rlp" ) const Version = 4 diff --git a/p2p/discv5/udp_test.go b/p2p/discv5/udp_test.go index b3dbe4cab..0e64a50a2 100644 --- a/p2p/discv5/udp_test.go +++ b/p2p/discv5/udp_test.go @@ -26,9 +26,9 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/rlp" ) func init() { diff --git a/p2p/enode/idscheme.go b/p2p/enode/idscheme.go index 477428585..40e4d4330 100644 --- a/p2p/enode/idscheme.go +++ b/p2p/enode/idscheme.go @@ -21,10 +21,10 @@ import ( "fmt" "io" - "github.com/dexon-foundation/dexon/common/math" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/p2p/enr" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/common/math" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/p2p/enr" + "github.com/tangerine-network/go-tangerine/rlp" "golang.org/x/crypto/sha3" ) diff --git a/p2p/enode/idscheme_test.go b/p2p/enode/idscheme_test.go index c1144683e..caf597c52 100644 --- a/p2p/enode/idscheme_test.go +++ b/p2p/enode/idscheme_test.go @@ -23,11 +23,11 @@ import ( "math/big" "testing" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/p2p/enr" - "github.com/dexon-foundation/dexon/rlp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/p2p/enr" + "github.com/tangerine-network/go-tangerine/rlp" ) var ( diff --git a/p2p/enode/localnode.go b/p2p/enode/localnode.go index 9b1f6bef6..21119edf5 100644 --- a/p2p/enode/localnode.go +++ b/p2p/enode/localnode.go @@ -26,9 +26,9 @@ import ( "sync/atomic" "time" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/p2p/enr" - "github.com/dexon-foundation/dexon/p2p/netutil" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/p2p/enr" + "github.com/tangerine-network/go-tangerine/p2p/netutil" ) const ( diff --git a/p2p/enode/localnode_test.go b/p2p/enode/localnode_test.go index 4b80776db..f1a3eeac2 100644 --- a/p2p/enode/localnode_test.go +++ b/p2p/enode/localnode_test.go @@ -19,8 +19,8 @@ package enode import ( "testing" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/p2p/enr" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/p2p/enr" ) func newLocalNodeForTesting() (*LocalNode, *DB) { diff --git a/p2p/enode/node.go b/p2p/enode/node.go index 777299615..833c8aadd 100644 --- a/p2p/enode/node.go +++ b/p2p/enode/node.go @@ -26,7 +26,7 @@ import ( "net" "strings" - "github.com/dexon-foundation/dexon/p2p/enr" + "github.com/tangerine-network/go-tangerine/p2p/enr" ) // Node represents a host on the network. diff --git a/p2p/enode/node_test.go b/p2p/enode/node_test.go index 0a80ca445..8ffc97c89 100644 --- a/p2p/enode/node_test.go +++ b/p2p/enode/node_test.go @@ -21,9 +21,9 @@ import ( "fmt" "testing" - "github.com/dexon-foundation/dexon/p2p/enr" - "github.com/dexon-foundation/dexon/rlp" "github.com/stretchr/testify/assert" + "github.com/tangerine-network/go-tangerine/p2p/enr" + "github.com/tangerine-network/go-tangerine/rlp" ) var pyRecord, _ = hex.DecodeString("f884b8407098ad865b00a582051940cb9cf36836572411a47278783077011599ed5cd16b76f2635f4e234738f30813a89eb9137e3e3df5266e3a1f11df72ecf1145ccb9c01826964827634826970847f00000189736563703235366b31a103ca634cae0d49acb401d8a4c6b6fe8c55b70d115bf400769cc1400f3258cd31388375647082765f") diff --git a/p2p/enode/nodedb.go b/p2p/enode/nodedb.go index a3d868511..fe6625bdc 100644 --- a/p2p/enode/nodedb.go +++ b/p2p/enode/nodedb.go @@ -26,13 +26,13 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/rlp" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/errors" "github.com/syndtr/goleveldb/leveldb/iterator" "github.com/syndtr/goleveldb/leveldb/opt" "github.com/syndtr/goleveldb/leveldb/storage" "github.com/syndtr/goleveldb/leveldb/util" + "github.com/tangerine-network/go-tangerine/rlp" ) // Keys in the node database. diff --git a/p2p/enode/urlv4.go b/p2p/enode/urlv4.go index 2fa5a6464..dd91d7985 100644 --- a/p2p/enode/urlv4.go +++ b/p2p/enode/urlv4.go @@ -26,9 +26,9 @@ import ( "regexp" "strconv" - "github.com/dexon-foundation/dexon/common/math" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/p2p/enr" + "github.com/tangerine-network/go-tangerine/common/math" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/p2p/enr" ) var incompleteNodeURL = regexp.MustCompile("(?i)^(?:enode://)?([0-9a-f]+)$") diff --git a/p2p/enr/enr.go b/p2p/enr/enr.go index 62e351761..a7eb568cb 100644 --- a/p2p/enr/enr.go +++ b/p2p/enr/enr.go @@ -40,7 +40,7 @@ import ( "io" "sort" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/rlp" ) const SizeLimit = 300 // maximum encoded size of a node record in bytes diff --git a/p2p/enr/enr_test.go b/p2p/enr/enr_test.go index 72519b576..981222f51 100644 --- a/p2p/enr/enr_test.go +++ b/p2p/enr/enr_test.go @@ -24,9 +24,9 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/rlp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/tangerine-network/go-tangerine/rlp" ) var rnd = rand.New(rand.NewSource(time.Now().UnixNano())) diff --git a/p2p/enr/entries.go b/p2p/enr/entries.go index 576349777..861aa3679 100644 --- a/p2p/enr/entries.go +++ b/p2p/enr/entries.go @@ -21,7 +21,7 @@ import ( "io" "net" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/rlp" ) // Entry is implemented by known node record entry types. diff --git a/p2p/message.go b/p2p/message.go index 727946abc..38baa0d64 100644 --- a/p2p/message.go +++ b/p2p/message.go @@ -25,9 +25,9 @@ import ( "sync/atomic" "time" - "github.com/dexon-foundation/dexon/event" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/event" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/rlp" ) // Msg defines the structure of a p2p message. diff --git a/p2p/metrics.go b/p2p/metrics.go index 1e90d3e34..dd8ac5f0c 100644 --- a/p2p/metrics.go +++ b/p2p/metrics.go @@ -25,11 +25,11 @@ import ( "sync/atomic" "time" - "github.com/dexon-foundation/dexon/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/enode" - "github.com/dexon-foundation/dexon/event" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/metrics" + "github.com/tangerine-network/go-tangerine/event" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/metrics" ) const ( diff --git a/p2p/nat/nat.go b/p2p/nat/nat.go index 27cb82ad4..46f1128d1 100644 --- a/p2p/nat/nat.go +++ b/p2p/nat/nat.go @@ -25,8 +25,8 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/log" - "github.com/jackpal/go-nat-pmp" + natpmp "github.com/jackpal/go-nat-pmp" + "github.com/tangerine-network/go-tangerine/log" ) // An implementation of nat.Interface can map local ports to ports diff --git a/p2p/nat/natpmp.go b/p2p/nat/natpmp.go index 8ba971472..7f85543f8 100644 --- a/p2p/nat/natpmp.go +++ b/p2p/nat/natpmp.go @@ -22,7 +22,7 @@ import ( "strings" "time" - "github.com/jackpal/go-nat-pmp" + natpmp "github.com/jackpal/go-nat-pmp" ) // natPMPClient adapts the NAT-PMP protocol implementation so it conforms to diff --git a/p2p/netutil/iptrack.go b/p2p/netutil/iptrack.go index f9c97608f..d3d366d86 100644 --- a/p2p/netutil/iptrack.go +++ b/p2p/netutil/iptrack.go @@ -19,7 +19,7 @@ package netutil import ( "time" - "github.com/dexon-foundation/dexon/common/mclock" + "github.com/tangerine-network/go-tangerine/common/mclock" ) // IPTracker predicts the external endpoint, i.e. IP address and port, of the local host diff --git a/p2p/netutil/iptrack_test.go b/p2p/netutil/iptrack_test.go index 04b3b0961..0d77a1522 100644 --- a/p2p/netutil/iptrack_test.go +++ b/p2p/netutil/iptrack_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/common/mclock" + "github.com/tangerine-network/go-tangerine/common/mclock" ) const ( diff --git a/p2p/peer.go b/p2p/peer.go index cb6a7e484..adb6ad1b2 100644 --- a/p2p/peer.go +++ b/p2p/peer.go @@ -25,12 +25,12 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/common/mclock" - "github.com/dexon-foundation/dexon/event" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/enr" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/common/mclock" + "github.com/tangerine-network/go-tangerine/event" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/enr" + "github.com/tangerine-network/go-tangerine/rlp" ) var ( diff --git a/p2p/protocol.go b/p2p/protocol.go index 245361fc1..0b569ee31 100644 --- a/p2p/protocol.go +++ b/p2p/protocol.go @@ -19,8 +19,8 @@ package p2p import ( "fmt" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/enr" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/enr" ) // Protocol represents a P2P subprotocol implementation. diff --git a/p2p/protocols/accounting.go b/p2p/protocols/accounting.go index 89c711931..33f1533c2 100644 --- a/p2p/protocols/accounting.go +++ b/p2p/protocols/accounting.go @@ -19,7 +19,7 @@ package protocols import ( "time" - "github.com/dexon-foundation/dexon/metrics" + "github.com/tangerine-network/go-tangerine/metrics" ) // define some metrics diff --git a/p2p/protocols/accounting_simulation_test.go b/p2p/protocols/accounting_simulation_test.go index f79daedf2..dda30fd1b 100644 --- a/p2p/protocols/accounting_simulation_test.go +++ b/p2p/protocols/accounting_simulation_test.go @@ -31,14 +31,14 @@ import ( "github.com/mattn/go-colorable" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/rpc" - - "github.com/dexon-foundation/dexon/node" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/simulations" - "github.com/dexon-foundation/dexon/p2p/simulations/adapters" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/rpc" + + "github.com/tangerine-network/go-tangerine/node" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/simulations" + "github.com/tangerine-network/go-tangerine/p2p/simulations/adapters" ) const ( diff --git a/p2p/protocols/accounting_test.go b/p2p/protocols/accounting_test.go index 64839a720..a3de53991 100644 --- a/p2p/protocols/accounting_test.go +++ b/p2p/protocols/accounting_test.go @@ -19,9 +19,9 @@ package protocols import ( "testing" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/simulations/adapters" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/simulations/adapters" + "github.com/tangerine-network/go-tangerine/rlp" ) //dummy Balance implementation diff --git a/p2p/protocols/protocol.go b/p2p/protocols/protocol.go index 9a347988b..d0771e999 100644 --- a/p2p/protocols/protocol.go +++ b/p2p/protocols/protocol.go @@ -38,13 +38,13 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/metrics" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/rlp" - "github.com/dexon-foundation/dexon/swarm/spancontext" - "github.com/dexon-foundation/dexon/swarm/tracing" opentracing "github.com/opentracing/opentracing-go" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/metrics" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/rlp" + "github.com/tangerine-network/go-tangerine/swarm/spancontext" + "github.com/tangerine-network/go-tangerine/swarm/tracing" ) // error codes used by this protocol scheme diff --git a/p2p/protocols/protocol_test.go b/p2p/protocols/protocol_test.go index 80a221c74..52a0239a9 100644 --- a/p2p/protocols/protocol_test.go +++ b/p2p/protocols/protocol_test.go @@ -24,12 +24,12 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/rlp" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/simulations/adapters" - p2ptest "github.com/dexon-foundation/dexon/p2p/testing" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/simulations/adapters" + p2ptest "github.com/tangerine-network/go-tangerine/p2p/testing" ) // handshake message type diff --git a/p2p/protocols/reporter.go b/p2p/protocols/reporter.go index 8c9f30c25..4ebda6103 100644 --- a/p2p/protocols/reporter.go +++ b/p2p/protocols/reporter.go @@ -20,8 +20,8 @@ import ( "encoding/binary" "time" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/metrics" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/metrics" "github.com/syndtr/goleveldb/leveldb" ) diff --git a/p2p/protocols/reporter_test.go b/p2p/protocols/reporter_test.go index 3d9da777e..98e2d6dd2 100644 --- a/p2p/protocols/reporter_test.go +++ b/p2p/protocols/reporter_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/log" ) //TestReporter tests that the metrics being collected for p2p accounting diff --git a/p2p/rlpx.go b/p2p/rlpx.go index 45253e1e9..204b666c1 100644 --- a/p2p/rlpx.go +++ b/p2p/rlpx.go @@ -35,12 +35,12 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/common/bitutil" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/crypto/ecies" - "github.com/dexon-foundation/dexon/rlp" "github.com/ethereum/go-ethereum/crypto/secp256k1" "github.com/golang/snappy" + "github.com/tangerine-network/go-tangerine/common/bitutil" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/crypto/ecies" + "github.com/tangerine-network/go-tangerine/rlp" "golang.org/x/crypto/sha3" ) diff --git a/p2p/rlpx_test.go b/p2p/rlpx_test.go index ecff080ff..c40e49e8d 100644 --- a/p2p/rlpx_test.go +++ b/p2p/rlpx_test.go @@ -32,10 +32,10 @@ import ( "time" "github.com/davecgh/go-spew/spew" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/crypto/ecies" - "github.com/dexon-foundation/dexon/p2p/simulations/pipes" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/crypto/ecies" + "github.com/tangerine-network/go-tangerine/p2p/simulations/pipes" + "github.com/tangerine-network/go-tangerine/rlp" "golang.org/x/crypto/sha3" ) diff --git a/p2p/server.go b/p2p/server.go index bfd991b1b..77dfd164e 100644 --- a/p2p/server.go +++ b/p2p/server.go @@ -28,18 +28,18 @@ import ( "sync/atomic" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/mclock" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/event" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/p2p/discover" - "github.com/dexon-foundation/dexon/p2p/discv5" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/enr" - "github.com/dexon-foundation/dexon/p2p/nat" - "github.com/dexon-foundation/dexon/p2p/netutil" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/mclock" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/event" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/p2p/discover" + "github.com/tangerine-network/go-tangerine/p2p/discv5" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/enr" + "github.com/tangerine-network/go-tangerine/p2p/nat" + "github.com/tangerine-network/go-tangerine/p2p/netutil" + "github.com/tangerine-network/go-tangerine/rlp" ) const ( diff --git a/p2p/server_test.go b/p2p/server_test.go index 734b2a8c1..155234c38 100644 --- a/p2p/server_test.go +++ b/p2p/server_test.go @@ -25,10 +25,10 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/enr" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/enr" "golang.org/x/crypto/sha3" ) diff --git a/p2p/simulations/adapters/exec.go b/p2p/simulations/adapters/exec.go index 7d73905bc..039ea604e 100644 --- a/p2p/simulations/adapters/exec.go +++ b/p2p/simulations/adapters/exec.go @@ -35,12 +35,12 @@ import ( "syscall" "time" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/node" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/rpc" "github.com/docker/docker/pkg/reexec" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/node" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/rpc" "golang.org/x/net/websocket" ) diff --git a/p2p/simulations/adapters/inproc.go b/p2p/simulations/adapters/inproc.go index 827fe8c46..d809a59fb 100644 --- a/p2p/simulations/adapters/inproc.go +++ b/p2p/simulations/adapters/inproc.go @@ -23,13 +23,13 @@ import ( "net" "sync" - "github.com/dexon-foundation/dexon/event" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/node" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/simulations/pipes" - "github.com/dexon-foundation/dexon/rpc" + "github.com/tangerine-network/go-tangerine/event" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/node" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/simulations/pipes" + "github.com/tangerine-network/go-tangerine/rpc" ) // SimAdapter is a NodeAdapter which creates in-memory simulation nodes and diff --git a/p2p/simulations/adapters/inproc_test.go b/p2p/simulations/adapters/inproc_test.go index 6ce4c216a..7497f1330 100644 --- a/p2p/simulations/adapters/inproc_test.go +++ b/p2p/simulations/adapters/inproc_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/p2p/simulations/pipes" + "github.com/tangerine-network/go-tangerine/p2p/simulations/pipes" ) func TestTCPPipe(t *testing.T) { diff --git a/p2p/simulations/adapters/types.go b/p2p/simulations/adapters/types.go index d7a5149a8..aec70f19d 100644 --- a/p2p/simulations/adapters/types.go +++ b/p2p/simulations/adapters/types.go @@ -25,12 +25,12 @@ import ( "os" "strconv" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/node" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/rpc" "github.com/docker/docker/pkg/reexec" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/node" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/rpc" ) // Node represents a node in a simulation network which is created by a diff --git a/p2p/simulations/connect.go b/p2p/simulations/connect.go index ab444c7f4..e7dfd621d 100644 --- a/p2p/simulations/connect.go +++ b/p2p/simulations/connect.go @@ -20,7 +20,7 @@ import ( "errors" "strings" - "github.com/dexon-foundation/dexon/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/enode" ) var ( diff --git a/p2p/simulations/connect_test.go b/p2p/simulations/connect_test.go index 57adfca59..c68986196 100644 --- a/p2p/simulations/connect_test.go +++ b/p2p/simulations/connect_test.go @@ -19,9 +19,9 @@ package simulations import ( "testing" - "github.com/dexon-foundation/dexon/node" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/simulations/adapters" + "github.com/tangerine-network/go-tangerine/node" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/simulations/adapters" ) func newTestNetwork(t *testing.T, nodeCount int) (*Network, []enode.ID) { diff --git a/p2p/simulations/examples/ping-pong.go b/p2p/simulations/examples/ping-pong.go index 9e87df664..17683be5d 100644 --- a/p2p/simulations/examples/ping-pong.go +++ b/p2p/simulations/examples/ping-pong.go @@ -25,13 +25,13 @@ import ( "sync/atomic" "time" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/node" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/simulations" - "github.com/dexon-foundation/dexon/p2p/simulations/adapters" - "github.com/dexon-foundation/dexon/rpc" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/node" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/simulations" + "github.com/tangerine-network/go-tangerine/p2p/simulations/adapters" + "github.com/tangerine-network/go-tangerine/rpc" ) var adapterType = flag.String("adapter", "sim", `node adapter to use (one of "sim", "exec" or "docker")`) diff --git a/p2p/simulations/http.go b/p2p/simulations/http.go index d846db6ee..656e42886 100644 --- a/p2p/simulations/http.go +++ b/p2p/simulations/http.go @@ -29,12 +29,12 @@ import ( "strings" "sync" - "github.com/dexon-foundation/dexon/event" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/simulations/adapters" - "github.com/dexon-foundation/dexon/rpc" "github.com/julienschmidt/httprouter" + "github.com/tangerine-network/go-tangerine/event" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/simulations/adapters" + "github.com/tangerine-network/go-tangerine/rpc" "golang.org/x/net/websocket" ) diff --git a/p2p/simulations/http_test.go b/p2p/simulations/http_test.go index 213050d32..64d80cef7 100644 --- a/p2p/simulations/http_test.go +++ b/p2p/simulations/http_test.go @@ -28,14 +28,14 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/event" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/node" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/simulations/adapters" - "github.com/dexon-foundation/dexon/rpc" "github.com/mattn/go-colorable" + "github.com/tangerine-network/go-tangerine/event" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/node" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/simulations/adapters" + "github.com/tangerine-network/go-tangerine/rpc" ) var ( diff --git a/p2p/simulations/mocker.go b/p2p/simulations/mocker.go index d29f58615..b0a53d8a7 100644 --- a/p2p/simulations/mocker.go +++ b/p2p/simulations/mocker.go @@ -24,9 +24,9 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/simulations/adapters" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/simulations/adapters" ) //a map of mocker names to its function diff --git a/p2p/simulations/mocker_test.go b/p2p/simulations/mocker_test.go index fe6ff5445..1964f0582 100644 --- a/p2p/simulations/mocker_test.go +++ b/p2p/simulations/mocker_test.go @@ -27,7 +27,7 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/enode" ) func TestMocker(t *testing.T) { diff --git a/p2p/simulations/network.go b/p2p/simulations/network.go index 785bbbc4a..a5de89653 100644 --- a/p2p/simulations/network.go +++ b/p2p/simulations/network.go @@ -26,11 +26,11 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/event" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/simulations/adapters" + "github.com/tangerine-network/go-tangerine/event" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/simulations/adapters" ) var DialBanTimeout = 200 * time.Millisecond diff --git a/p2p/simulations/network_test.go b/p2p/simulations/network_test.go index 968700174..13760e7a9 100644 --- a/p2p/simulations/network_test.go +++ b/p2p/simulations/network_test.go @@ -26,10 +26,10 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/node" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/simulations/adapters" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/node" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/simulations/adapters" ) // Tests that a created snapshot with a minimal service only contains the expected connections diff --git a/p2p/simulations/simulation.go b/p2p/simulations/simulation.go index 4381ccca6..9431ade77 100644 --- a/p2p/simulations/simulation.go +++ b/p2p/simulations/simulation.go @@ -20,7 +20,7 @@ import ( "context" "time" - "github.com/dexon-foundation/dexon/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/enode" ) // Simulation provides a framework for running actions in a simulated network diff --git a/p2p/simulations/test.go b/p2p/simulations/test.go index fa868dfbe..45083a8de 100644 --- a/p2p/simulations/test.go +++ b/p2p/simulations/test.go @@ -3,10 +3,10 @@ package simulations import ( "testing" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/enr" - "github.com/dexon-foundation/dexon/rpc" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/enr" + "github.com/tangerine-network/go-tangerine/rpc" ) // NoopService is the service that does not do anything diff --git a/p2p/testing/peerpool.go b/p2p/testing/peerpool.go index e01c92285..5b55bec63 100644 --- a/p2p/testing/peerpool.go +++ b/p2p/testing/peerpool.go @@ -20,8 +20,8 @@ import ( "fmt" "sync" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/p2p/enode" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/p2p/enode" ) type TestPeer interface { diff --git a/p2p/testing/protocolsession.go b/p2p/testing/protocolsession.go index cd807f83b..1d45fbdad 100644 --- a/p2p/testing/protocolsession.go +++ b/p2p/testing/protocolsession.go @@ -22,10 +22,10 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/simulations/adapters" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/simulations/adapters" ) var errTimedOut = errors.New("timed out") diff --git a/p2p/testing/protocoltester.go b/p2p/testing/protocoltester.go index 492802587..85aeb8a03 100644 --- a/p2p/testing/protocoltester.go +++ b/p2p/testing/protocoltester.go @@ -31,14 +31,14 @@ import ( "strings" "sync" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/node" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/simulations" - "github.com/dexon-foundation/dexon/p2p/simulations/adapters" - "github.com/dexon-foundation/dexon/rlp" - "github.com/dexon-foundation/dexon/rpc" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/node" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/simulations" + "github.com/tangerine-network/go-tangerine/p2p/simulations/adapters" + "github.com/tangerine-network/go-tangerine/rlp" + "github.com/tangerine-network/go-tangerine/rpc" ) // ProtocolTester is the tester environment used for unit testing protocol diff --git a/params/config.go b/params/config.go index 80a73b00e..5e597cb7c 100644 --- a/params/config.go +++ b/params/config.go @@ -20,8 +20,8 @@ import ( "fmt" "math/big" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/math" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/math" ) // Genesis hashes to enforce below configs on. diff --git a/params/dao.go b/params/dao.go index 018454931..a13ae61e5 100644 --- a/params/dao.go +++ b/params/dao.go @@ -19,7 +19,7 @@ package params import ( "math/big" - "github.com/dexon-foundation/dexon/common" + "github.com/tangerine-network/go-tangerine/common" ) // DAOForkBlockExtra is the block header extra-data field to set for the DAO fork diff --git a/params/gen_dexcon_config.go b/params/gen_dexcon_config.go index dbceb1676..28e2775ff 100644 --- a/params/gen_dexcon_config.go +++ b/params/gen_dexcon_config.go @@ -6,8 +6,8 @@ import ( "encoding/json" "math/big" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/math" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/math" ) var _ = (*dexconConfigSpecMarshaling)(nil) diff --git a/rpc/client.go b/rpc/client.go index 2b5e79848..c41ad389b 100644 --- a/rpc/client.go +++ b/rpc/client.go @@ -32,7 +32,7 @@ import ( "sync/atomic" "time" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/log" ) var ( diff --git a/rpc/client_example_test.go b/rpc/client_example_test.go index 261c6fb70..15a27a308 100644 --- a/rpc/client_example_test.go +++ b/rpc/client_example_test.go @@ -22,7 +22,7 @@ import ( "math/big" "time" - "github.com/dexon-foundation/dexon/rpc" + "github.com/tangerine-network/go-tangerine/rpc" ) // In this example, our client wishes to track the latest 'block number' diff --git a/rpc/client_test.go b/rpc/client_test.go index ecb550521..5770e9358 100644 --- a/rpc/client_test.go +++ b/rpc/client_test.go @@ -31,7 +31,7 @@ import ( "time" "github.com/davecgh/go-spew/spew" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/log" ) func TestClientRequest(t *testing.T) { @@ -323,7 +323,7 @@ func TestClientSubscribeClose(t *testing.T) { } } -// This test reproduces https://github.com/dexon-foundation/dexon/issues/17837 where the +// This test reproduces https://github.com/tangerine-network/go-tangerine/issues/17837 where the // client hangs during shutdown when Unsubscribe races with Client.Close. func TestClientCloseUnsubscribeRace(t *testing.T) { service := &NotificationTestService{} diff --git a/rpc/endpoints.go b/rpc/endpoints.go index bf5f650aa..875959624 100644 --- a/rpc/endpoints.go +++ b/rpc/endpoints.go @@ -19,7 +19,7 @@ package rpc import ( "net" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/log" ) // StartHTTPEndpoint starts the HTTP RPC endpoint, configured with cors/vhosts/modules diff --git a/rpc/http.go b/rpc/http.go index 4c2e16a50..2ecb2166e 100644 --- a/rpc/http.go +++ b/rpc/http.go @@ -31,8 +31,8 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/log" "github.com/rs/cors" + "github.com/tangerine-network/go-tangerine/log" ) const ( diff --git a/rpc/ipc.go b/rpc/ipc.go index 1dc318e2d..d6043d249 100644 --- a/rpc/ipc.go +++ b/rpc/ipc.go @@ -20,8 +20,8 @@ import ( "context" "net" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/p2p/netutil" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/p2p/netutil" ) // ServeListener accepts connections on l, serving JSON-RPC on them. diff --git a/rpc/ipc_unix.go b/rpc/ipc_unix.go index c6218dbd9..e1624ca92 100644 --- a/rpc/ipc_unix.go +++ b/rpc/ipc_unix.go @@ -25,7 +25,7 @@ import ( "os" "path/filepath" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/log" ) /* diff --git a/rpc/json.go b/rpc/json.go index 1853a715f..42acff8f9 100644 --- a/rpc/json.go +++ b/rpc/json.go @@ -26,7 +26,7 @@ import ( "strings" "sync" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/log" ) const ( diff --git a/rpc/server.go b/rpc/server.go index bdd1877ab..2fdbd660e 100644 --- a/rpc/server.go +++ b/rpc/server.go @@ -26,7 +26,7 @@ import ( "sync/atomic" mapset "github.com/deckarep/golang-set" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/log" ) const MetadataApi = "rpc" diff --git a/rpc/types.go b/rpc/types.go index 368e840f0..e5b3e3648 100644 --- a/rpc/types.go +++ b/rpc/types.go @@ -24,7 +24,7 @@ import ( "sync" mapset "github.com/deckarep/golang-set" - "github.com/dexon-foundation/dexon/common/hexutil" + "github.com/tangerine-network/go-tangerine/common/hexutil" ) // API describes the set of methods offered over the RPC interface diff --git a/rpc/types_test.go b/rpc/types_test.go index cd0859925..6fe51740f 100644 --- a/rpc/types_test.go +++ b/rpc/types_test.go @@ -20,7 +20,7 @@ import ( "encoding/json" "testing" - "github.com/dexon-foundation/dexon/common/math" + "github.com/tangerine-network/go-tangerine/common/math" ) func TestBlockNumberJSONUnmarshal(t *testing.T) { diff --git a/rpc/websocket.go b/rpc/websocket.go index 8874e5e60..0c8749aad 100644 --- a/rpc/websocket.go +++ b/rpc/websocket.go @@ -31,7 +31,7 @@ import ( "time" mapset "github.com/deckarep/golang-set" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/log" "golang.org/x/net/websocket" ) diff --git a/signer/core/abihelper.go b/signer/core/abihelper.go index e1980979b..6274de1f5 100644 --- a/signer/core/abihelper.go +++ b/signer/core/abihelper.go @@ -22,8 +22,8 @@ import ( "io/ioutil" "strings" - "github.com/dexon-foundation/dexon/accounts/abi" - "github.com/dexon-foundation/dexon/common" + "github.com/tangerine-network/go-tangerine/accounts/abi" + "github.com/tangerine-network/go-tangerine/common" "bytes" "os" diff --git a/signer/core/abihelper_test.go b/signer/core/abihelper_test.go index a37cd2794..36427dbce 100644 --- a/signer/core/abihelper_test.go +++ b/signer/core/abihelper_test.go @@ -25,8 +25,8 @@ import ( "math/big" "reflect" - "github.com/dexon-foundation/dexon/accounts/abi" - "github.com/dexon-foundation/dexon/common" + "github.com/tangerine-network/go-tangerine/accounts/abi" + "github.com/tangerine-network/go-tangerine/common" ) func verify(t *testing.T, jsondata, calldata string, exp []interface{}) { diff --git a/signer/core/api.go b/signer/core/api.go index d76b89a8d..ef05e5a2a 100644 --- a/signer/core/api.go +++ b/signer/core/api.go @@ -25,15 +25,15 @@ import ( "math/big" "reflect" - "github.com/dexon-foundation/dexon/accounts" - "github.com/dexon-foundation/dexon/accounts/keystore" - "github.com/dexon-foundation/dexon/accounts/usbwallet" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/internal/ethapi" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/accounts" + "github.com/tangerine-network/go-tangerine/accounts/keystore" + "github.com/tangerine-network/go-tangerine/accounts/usbwallet" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/internal/ethapi" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/rlp" ) // numberOfAccountsToDerive For hardware wallets, the number of accounts to derive @@ -518,7 +518,7 @@ func (api *SignerAPI) SignTransaction(ctx context.Context, args SendTxArgs, meth // // The key used to calculate the signature is decrypted with the given password. // -// https://github.com/dexon-foundation/dexon/wiki/Management-APIs#personal_sign +// https://github.com/tangerine-network/go-tangerine/wiki/Management-APIs#personal_sign func (api *SignerAPI) Sign(ctx context.Context, addr common.MixedcaseAddress, data hexutil.Bytes) (hexutil.Bytes, error) { sighash, msg := SignHash(data) // We make the request prior to looking up if we actually have the account, to prevent diff --git a/signer/core/api_test.go b/signer/core/api_test.go index 885a59f47..3e6cfc97c 100644 --- a/signer/core/api_test.go +++ b/signer/core/api_test.go @@ -28,13 +28,13 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/accounts/keystore" - "github.com/dexon-foundation/dexon/cmd/utils" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/internal/ethapi" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/accounts/keystore" + "github.com/tangerine-network/go-tangerine/cmd/utils" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/internal/ethapi" + "github.com/tangerine-network/go-tangerine/rlp" ) //Used for testing diff --git a/signer/core/auditlog.go b/signer/core/auditlog.go index 142e794f5..b2eafc89e 100644 --- a/signer/core/auditlog.go +++ b/signer/core/auditlog.go @@ -21,11 +21,11 @@ import ( "encoding/json" - "github.com/dexon-foundation/dexon/accounts" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/internal/ethapi" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/accounts" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/internal/ethapi" + "github.com/tangerine-network/go-tangerine/log" ) type AuditLogger struct { diff --git a/signer/core/cliui.go b/signer/core/cliui.go index dc970519e..9e5d98c5c 100644 --- a/signer/core/cliui.go +++ b/signer/core/cliui.go @@ -25,9 +25,9 @@ import ( "sync" "github.com/davecgh/go-spew/spew" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/internal/ethapi" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/internal/ethapi" + "github.com/tangerine-network/go-tangerine/log" "golang.org/x/crypto/ssh/terminal" ) diff --git a/signer/core/stdioui.go b/signer/core/stdioui.go index 342488a70..b7d0641d8 100644 --- a/signer/core/stdioui.go +++ b/signer/core/stdioui.go @@ -21,9 +21,9 @@ import ( "context" "sync" - "github.com/dexon-foundation/dexon/internal/ethapi" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/rpc" + "github.com/tangerine-network/go-tangerine/internal/ethapi" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/rpc" ) type StdIOUI struct { diff --git a/signer/core/types.go b/signer/core/types.go index 2e433094d..66a606f41 100644 --- a/signer/core/types.go +++ b/signer/core/types.go @@ -23,10 +23,10 @@ import ( "math/big" - "github.com/dexon-foundation/dexon/accounts" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/core/types" + "github.com/tangerine-network/go-tangerine/accounts" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/core/types" ) type Accounts []Account diff --git a/signer/core/validation.go b/signer/core/validation.go index f3ccfb1c7..cc9c6c3c1 100644 --- a/signer/core/validation.go +++ b/signer/core/validation.go @@ -23,7 +23,7 @@ import ( "math/big" "regexp" - "github.com/dexon-foundation/dexon/common" + "github.com/tangerine-network/go-tangerine/common" ) // The validation package contains validation checks for transactions @@ -118,7 +118,7 @@ func (v *Validator) validate(msgs *ValidationMessages, txargs *SendTxArgs, metho if txargs.To == nil { //Contract creation should contain sufficient data to deploy a contract // A typical error is omitting sender due to some quirk in the javascript call - // e.g. https://github.com/dexon-foundation/dexon/issues/16106 + // e.g. https://github.com/tangerine-network/go-tangerine/issues/16106 if len(data) == 0 { if txargs.Value.ToInt().Cmp(big.NewInt(0)) > 0 { // Sending ether into black hole diff --git a/signer/core/validation_test.go b/signer/core/validation_test.go index 2afc28bea..f0ecede17 100644 --- a/signer/core/validation_test.go +++ b/signer/core/validation_test.go @@ -21,8 +21,8 @@ import ( "math/big" "testing" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" ) func hexAddr(a string) common.Address { return common.BytesToAddress(common.FromHex(a)) } diff --git a/signer/rules/rules.go b/signer/rules/rules.go index ce1f3e001..03f50c851 100644 --- a/signer/rules/rules.go +++ b/signer/rules/rules.go @@ -22,13 +22,13 @@ import ( "os" "strings" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/internal/ethapi" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/signer/core" - "github.com/dexon-foundation/dexon/signer/rules/deps" - "github.com/dexon-foundation/dexon/signer/storage" "github.com/robertkrimen/otto" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/internal/ethapi" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/signer/core" + "github.com/tangerine-network/go-tangerine/signer/rules/deps" + "github.com/tangerine-network/go-tangerine/signer/storage" ) var ( diff --git a/signer/rules/rules_test.go b/signer/rules/rules_test.go index 20887e5b7..97dcf33c9 100644 --- a/signer/rules/rules_test.go +++ b/signer/rules/rules_test.go @@ -22,13 +22,13 @@ import ( "strings" "testing" - "github.com/dexon-foundation/dexon/accounts" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/internal/ethapi" - "github.com/dexon-foundation/dexon/signer/core" - "github.com/dexon-foundation/dexon/signer/storage" + "github.com/tangerine-network/go-tangerine/accounts" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/internal/ethapi" + "github.com/tangerine-network/go-tangerine/signer/core" + "github.com/tangerine-network/go-tangerine/signer/storage" ) const JS = ` diff --git a/signer/storage/aes_gcm_storage.go b/signer/storage/aes_gcm_storage.go index 4fa1ba136..0306ce270 100644 --- a/signer/storage/aes_gcm_storage.go +++ b/signer/storage/aes_gcm_storage.go @@ -26,7 +26,7 @@ import ( "io/ioutil" "os" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/log" ) type storedCredential struct { diff --git a/signer/storage/aes_gcm_storage_test.go b/signer/storage/aes_gcm_storage_test.go index 45bb07e27..52f7459f7 100644 --- a/signer/storage/aes_gcm_storage_test.go +++ b/signer/storage/aes_gcm_storage_test.go @@ -23,9 +23,9 @@ import ( "io/ioutil" "testing" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/log" "github.com/mattn/go-colorable" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/log" ) func TestEncryption(t *testing.T) { diff --git a/swarm/README.md b/swarm/README.md index 30d053454..94f7882c1 100644 --- a/swarm/README.md +++ b/swarm/README.md @@ -27,9 +27,9 @@ Swarm is a distributed storage platform and content distribution service, a nati Building Swarm requires Go (version 1.10 or later). - go get -d github.com/dexon-foundation/dexon + go get -d github.com/tangerine-network/go-tangerine - go install github.com/dexon-foundation/dexon/cmd/swarm + go install github.com/tangerine-network/go-tangerine/cmd/swarm ## Running Swarm @@ -90,12 +90,12 @@ Swarm documentation can be found at [https://swarm-guide.readthedocs.io](https:/ We assume that you have Go v1.10 installed, and `GOPATH` is set. -You must have your working copy under `$GOPATH/src/github.com/dexon-foundation/dexon`. +You must have your working copy under `$GOPATH/src/github.com/tangerine-network/go-tangerine`. Most likely you will be working from your fork of `go-ethereum`, let's say from `github.com/nirname/go-ethereum`. Clone or move your fork into the right place: ``` -git clone git@github.com:nirname/go-ethereum.git $GOPATH/src/github.com/dexon-foundation/dexon +git clone git@github.com:nirname/go-ethereum.git $GOPATH/src/github.com/tangerine-network/go-tangerine ``` @@ -181,7 +181,7 @@ Once you have `stateth` installed, and you have Docker running locally, you have 1. Run `stateth` and keep it running in the background ``` -stateth --rm --grafana-dashboards-folder $GOPATH/src/github.com/dexon-foundation/dexon/swarm/grafana_dashboards --influxdb-database metrics +stateth --rm --grafana-dashboards-folder $GOPATH/src/github.com/tangerine-network/go-tangerine/swarm/grafana_dashboards --influxdb-database metrics ``` 2. Run `swarm` with at least the following params: @@ -228,7 +228,7 @@ 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. - * [Code review guidelines](https://github.com/dexon-foundation/dexon/wiki/Code-Review-Guidelines). + * [Code review guidelines](https://github.com/tangerine-network/go-tangerine/wiki/Code-Review-Guidelines). * Commit messages should be prefixed with the package(s) they modify. * E.g. "swarm/fuse: ignore default manifest entry" diff --git a/swarm/api/act.go b/swarm/api/act.go index 81badfe8f..a82f488e3 100644 --- a/swarm/api/act.go +++ b/swarm/api/act.go @@ -12,12 +12,12 @@ import ( "strings" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/crypto/ecies" - "github.com/dexon-foundation/dexon/swarm/log" - "github.com/dexon-foundation/dexon/swarm/sctx" - "github.com/dexon-foundation/dexon/swarm/storage" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/crypto/ecies" + "github.com/tangerine-network/go-tangerine/swarm/log" + "github.com/tangerine-network/go-tangerine/swarm/sctx" + "github.com/tangerine-network/go-tangerine/swarm/storage" "golang.org/x/crypto/scrypt" "golang.org/x/crypto/sha3" cli "gopkg.in/urfave/cli.v1" diff --git a/swarm/api/api.go b/swarm/api/api.go index 1f5109822..11acc458d 100644 --- a/swarm/api/api.go +++ b/swarm/api/api.go @@ -37,15 +37,15 @@ import ( "path/filepath" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/contracts/ens" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/metrics" - "github.com/dexon-foundation/dexon/swarm/log" - "github.com/dexon-foundation/dexon/swarm/spancontext" - "github.com/dexon-foundation/dexon/swarm/storage" - "github.com/dexon-foundation/dexon/swarm/storage/feed" - "github.com/dexon-foundation/dexon/swarm/storage/feed/lookup" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/contracts/ens" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/metrics" + "github.com/tangerine-network/go-tangerine/swarm/log" + "github.com/tangerine-network/go-tangerine/swarm/spancontext" + "github.com/tangerine-network/go-tangerine/swarm/storage" + "github.com/tangerine-network/go-tangerine/swarm/storage/feed" + "github.com/tangerine-network/go-tangerine/swarm/storage/feed/lookup" opentracing "github.com/opentracing/opentracing-go" ) diff --git a/swarm/api/api_test.go b/swarm/api/api_test.go index 2e573b9d0..a977041c2 100644 --- a/swarm/api/api_test.go +++ b/swarm/api/api_test.go @@ -28,11 +28,11 @@ import ( "os" "testing" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/swarm/sctx" - "github.com/dexon-foundation/dexon/swarm/storage" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/swarm/sctx" + "github.com/tangerine-network/go-tangerine/swarm/storage" ) func init() { diff --git a/swarm/api/client/client.go b/swarm/api/client/client.go index 8eb643c27..ac57ec136 100644 --- a/swarm/api/client/client.go +++ b/swarm/api/client/client.go @@ -37,12 +37,12 @@ import ( "strings" "time" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/metrics" - "github.com/dexon-foundation/dexon/swarm/api" - "github.com/dexon-foundation/dexon/swarm/spancontext" - "github.com/dexon-foundation/dexon/swarm/storage/feed" "github.com/pborman/uuid" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/metrics" + "github.com/tangerine-network/go-tangerine/swarm/api" + "github.com/tangerine-network/go-tangerine/swarm/spancontext" + "github.com/tangerine-network/go-tangerine/swarm/storage/feed" ) var ( diff --git a/swarm/api/client/client_test.go b/swarm/api/client/client_test.go index 6a4cd4dab..714f13339 100644 --- a/swarm/api/client/client_test.go +++ b/swarm/api/client/client_test.go @@ -25,14 +25,14 @@ import ( "sort" "testing" - "github.com/dexon-foundation/dexon/swarm/storage" - "github.com/dexon-foundation/dexon/swarm/storage/feed/lookup" - - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/swarm/api" - swarmhttp "github.com/dexon-foundation/dexon/swarm/api/http" - "github.com/dexon-foundation/dexon/swarm/storage/feed" + "github.com/tangerine-network/go-tangerine/swarm/storage" + "github.com/tangerine-network/go-tangerine/swarm/storage/feed/lookup" + + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/swarm/api" + swarmhttp "github.com/tangerine-network/go-tangerine/swarm/api/http" + "github.com/tangerine-network/go-tangerine/swarm/storage/feed" ) func serverFunc(api *api.API) swarmhttp.TestServer { diff --git a/swarm/api/config.go b/swarm/api/config.go index dc8b3bf53..d09dc9090 100644 --- a/swarm/api/config.go +++ b/swarm/api/config.go @@ -23,16 +23,16 @@ import ( "path/filepath" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/contracts/ens" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/node" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/swarm/log" - "github.com/dexon-foundation/dexon/swarm/network" - "github.com/dexon-foundation/dexon/swarm/pss" - "github.com/dexon-foundation/dexon/swarm/services/swap" - "github.com/dexon-foundation/dexon/swarm/storage" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/contracts/ens" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/node" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/swarm/log" + "github.com/tangerine-network/go-tangerine/swarm/network" + "github.com/tangerine-network/go-tangerine/swarm/pss" + "github.com/tangerine-network/go-tangerine/swarm/services/swap" + "github.com/tangerine-network/go-tangerine/swarm/storage" ) const ( diff --git a/swarm/api/config_test.go b/swarm/api/config_test.go index 7ebacacae..259554b8a 100644 --- a/swarm/api/config_test.go +++ b/swarm/api/config_test.go @@ -20,8 +20,8 @@ import ( "reflect" "testing" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/crypto" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/crypto" ) func TestConfig(t *testing.T) { diff --git a/swarm/api/encrypt.go b/swarm/api/encrypt.go index 91aada3ff..f444dfeb8 100644 --- a/swarm/api/encrypt.go +++ b/swarm/api/encrypt.go @@ -20,7 +20,7 @@ import ( "encoding/binary" "errors" - "github.com/dexon-foundation/dexon/swarm/storage/encryption" + "github.com/tangerine-network/go-tangerine/swarm/storage/encryption" "golang.org/x/crypto/sha3" ) diff --git a/swarm/api/filesystem.go b/swarm/api/filesystem.go index a7dc54071..c6c886b08 100644 --- a/swarm/api/filesystem.go +++ b/swarm/api/filesystem.go @@ -26,9 +26,9 @@ import ( "path/filepath" "sync" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/swarm/log" - "github.com/dexon-foundation/dexon/swarm/storage" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/swarm/log" + "github.com/tangerine-network/go-tangerine/swarm/storage" ) const maxParallelFiles = 5 diff --git a/swarm/api/filesystem_test.go b/swarm/api/filesystem_test.go index 6d9f3757a..e1387e6ce 100644 --- a/swarm/api/filesystem_test.go +++ b/swarm/api/filesystem_test.go @@ -24,8 +24,8 @@ import ( "path/filepath" "testing" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/swarm/storage" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/swarm/storage" ) var testDownloadDir, _ = ioutil.TempDir(os.TempDir(), "bzz-test") diff --git a/swarm/api/gen_mime.go b/swarm/api/gen_mime.go index b97880198..318ef311c 100644 --- a/swarm/api/gen_mime.go +++ b/swarm/api/gen_mime.go @@ -1,4 +1,4 @@ -// Code generated by github.com/dexon-foundation/dexon/cmd/swarm/mimegen. DO NOT EDIT. +// Code generated by github.com/tangerine-network/go-tangerine/cmd/swarm/mimegen. DO NOT EDIT. package api diff --git a/swarm/api/http/middleware.go b/swarm/api/http/middleware.go index f6ff463bf..fee556fe5 100644 --- a/swarm/api/http/middleware.go +++ b/swarm/api/http/middleware.go @@ -7,12 +7,12 @@ import ( "strings" "time" - "github.com/dexon-foundation/dexon/metrics" - "github.com/dexon-foundation/dexon/swarm/api" - "github.com/dexon-foundation/dexon/swarm/log" - "github.com/dexon-foundation/dexon/swarm/sctx" - "github.com/dexon-foundation/dexon/swarm/spancontext" "github.com/pborman/uuid" + "github.com/tangerine-network/go-tangerine/metrics" + "github.com/tangerine-network/go-tangerine/swarm/api" + "github.com/tangerine-network/go-tangerine/swarm/log" + "github.com/tangerine-network/go-tangerine/swarm/sctx" + "github.com/tangerine-network/go-tangerine/swarm/spancontext" ) // Adapt chains h (main request handler) main handler to adapters (middleware handlers) diff --git a/swarm/api/http/response.go b/swarm/api/http/response.go index 3ffa78509..cbabb33b4 100644 --- a/swarm/api/http/response.go +++ b/swarm/api/http/response.go @@ -24,9 +24,9 @@ import ( "strings" "time" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/metrics" - "github.com/dexon-foundation/dexon/swarm/api" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/metrics" + "github.com/tangerine-network/go-tangerine/swarm/api" ) var ( diff --git a/swarm/api/http/roundtripper.go b/swarm/api/http/roundtripper.go index c62b5bab7..38ccdc10a 100644 --- a/swarm/api/http/roundtripper.go +++ b/swarm/api/http/roundtripper.go @@ -20,17 +20,17 @@ import ( "fmt" "net/http" - "github.com/dexon-foundation/dexon/swarm/log" + "github.com/tangerine-network/go-tangerine/swarm/log" ) /* http roundtripper to register for bzz url scheme -see https://github.com/dexon-foundation/dexon/issues/2040 +see https://github.com/tangerine-network/go-tangerine/issues/2040 Usage: import ( - "github.com/dexon-foundation/dexon/common/httpclient" - "github.com/dexon-foundation/dexon/swarm/api/http" + "github.com/tangerine-network/go-tangerine/common/httpclient" + "github.com/tangerine-network/go-tangerine/swarm/api/http" ) client := httpclient.New() // for (private) swarm proxy running locally diff --git a/swarm/api/http/sctx.go b/swarm/api/http/sctx.go index cde99b8a7..bbbcb60a2 100644 --- a/swarm/api/http/sctx.go +++ b/swarm/api/http/sctx.go @@ -3,8 +3,8 @@ package http import ( "context" - "github.com/dexon-foundation/dexon/swarm/api" - "github.com/dexon-foundation/dexon/swarm/sctx" + "github.com/tangerine-network/go-tangerine/swarm/api" + "github.com/tangerine-network/go-tangerine/swarm/sctx" ) type uriKey struct{} diff --git a/swarm/api/http/server.go b/swarm/api/http/server.go index 2055bda58..e413e48cf 100644 --- a/swarm/api/http/server.go +++ b/swarm/api/http/server.go @@ -35,13 +35,13 @@ import ( "strings" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/metrics" - "github.com/dexon-foundation/dexon/swarm/api" - "github.com/dexon-foundation/dexon/swarm/log" - "github.com/dexon-foundation/dexon/swarm/storage" - "github.com/dexon-foundation/dexon/swarm/storage/feed" "github.com/rs/cors" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/metrics" + "github.com/tangerine-network/go-tangerine/swarm/api" + "github.com/tangerine-network/go-tangerine/swarm/log" + "github.com/tangerine-network/go-tangerine/swarm/storage" + "github.com/tangerine-network/go-tangerine/swarm/storage/feed" ) var ( diff --git a/swarm/api/http/server_test.go b/swarm/api/http/server_test.go index dbb86c200..6f8f296f7 100644 --- a/swarm/api/http/server_test.go +++ b/swarm/api/http/server_test.go @@ -37,17 +37,17 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/swarm/storage/feed/lookup" - - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/swarm/api" - swarm "github.com/dexon-foundation/dexon/swarm/api/client" - "github.com/dexon-foundation/dexon/swarm/storage" - "github.com/dexon-foundation/dexon/swarm/storage/feed" - "github.com/dexon-foundation/dexon/swarm/testutil" + "github.com/tangerine-network/go-tangerine/swarm/storage/feed/lookup" + + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/swarm/api" + swarm "github.com/tangerine-network/go-tangerine/swarm/api/client" + "github.com/tangerine-network/go-tangerine/swarm/storage" + "github.com/tangerine-network/go-tangerine/swarm/storage/feed" + "github.com/tangerine-network/go-tangerine/swarm/testutil" ) func init() { diff --git a/swarm/api/http/templates.go b/swarm/api/http/templates.go index a37d7b03b..8106403a9 100644 --- a/swarm/api/http/templates.go +++ b/swarm/api/http/templates.go @@ -22,7 +22,7 @@ import ( "html/template" "path" - "github.com/dexon-foundation/dexon/swarm/api" + "github.com/tangerine-network/go-tangerine/swarm/api" ) type htmlListData struct { diff --git a/swarm/api/http/test_server.go b/swarm/api/http/test_server.go index 14de20c77..e4daa4be2 100644 --- a/swarm/api/http/test_server.go +++ b/swarm/api/http/test_server.go @@ -23,9 +23,9 @@ import ( "os" "testing" - "github.com/dexon-foundation/dexon/swarm/api" - "github.com/dexon-foundation/dexon/swarm/storage" - "github.com/dexon-foundation/dexon/swarm/storage/feed" + "github.com/tangerine-network/go-tangerine/swarm/api" + "github.com/tangerine-network/go-tangerine/swarm/storage" + "github.com/tangerine-network/go-tangerine/swarm/storage/feed" ) type TestServer interface { diff --git a/swarm/api/inspector.go b/swarm/api/inspector.go index cc8b79a7a..4bd0bedb1 100644 --- a/swarm/api/inspector.go +++ b/swarm/api/inspector.go @@ -19,8 +19,8 @@ package api import ( "context" - "github.com/dexon-foundation/dexon/swarm/network" - "github.com/dexon-foundation/dexon/swarm/storage" + "github.com/tangerine-network/go-tangerine/swarm/network" + "github.com/tangerine-network/go-tangerine/swarm/storage" ) type Inspector struct { diff --git a/swarm/api/manifest.go b/swarm/api/manifest.go index d309f6914..51ff9b9a5 100644 --- a/swarm/api/manifest.go +++ b/swarm/api/manifest.go @@ -27,11 +27,11 @@ import ( "strings" "time" - "github.com/dexon-foundation/dexon/swarm/storage/feed" + "github.com/tangerine-network/go-tangerine/swarm/storage/feed" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/swarm/log" - "github.com/dexon-foundation/dexon/swarm/storage" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/swarm/log" + "github.com/tangerine-network/go-tangerine/swarm/storage" ) const ( diff --git a/swarm/api/manifest_test.go b/swarm/api/manifest_test.go index 268e628b1..ddd8b5b7e 100644 --- a/swarm/api/manifest_test.go +++ b/swarm/api/manifest_test.go @@ -25,7 +25,7 @@ import ( "strings" "testing" - "github.com/dexon-foundation/dexon/swarm/storage" + "github.com/tangerine-network/go-tangerine/swarm/storage" ) func manifest(paths ...string) (manifestReader storage.LazySectionReader) { diff --git a/swarm/api/storage.go b/swarm/api/storage.go index 7dd481377..dcdbe79d6 100644 --- a/swarm/api/storage.go +++ b/swarm/api/storage.go @@ -20,7 +20,7 @@ import ( "context" "path" - "github.com/dexon-foundation/dexon/swarm/storage" + "github.com/tangerine-network/go-tangerine/swarm/storage" ) type Response struct { diff --git a/swarm/api/uri.go b/swarm/api/uri.go index 30dcb4988..f42c7a339 100644 --- a/swarm/api/uri.go +++ b/swarm/api/uri.go @@ -22,8 +22,8 @@ import ( "regexp" "strings" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/swarm/storage" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/swarm/storage" ) //matches hex swarm hashes diff --git a/swarm/api/uri_test.go b/swarm/api/uri_test.go index 9cb34e941..42109d866 100644 --- a/swarm/api/uri_test.go +++ b/swarm/api/uri_test.go @@ -21,7 +21,7 @@ import ( "reflect" "testing" - "github.com/dexon-foundation/dexon/swarm/storage" + "github.com/tangerine-network/go-tangerine/swarm/storage" ) func TestParseURI(t *testing.T) { diff --git a/swarm/bmt/bmt_test.go b/swarm/bmt/bmt_test.go index 32443677a..e3ef7deb4 100644 --- a/swarm/bmt/bmt_test.go +++ b/swarm/bmt/bmt_test.go @@ -26,7 +26,7 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/swarm/testutil" + "github.com/tangerine-network/go-tangerine/swarm/testutil" "golang.org/x/crypto/sha3" ) diff --git a/swarm/dev/Makefile b/swarm/dev/Makefile index d571a7d31..7ca69851f 100644 --- a/swarm/dev/Makefile +++ b/swarm/dev/Makefile @@ -3,12 +3,12 @@ default: build build: - go build -o bin/swarm github.com/dexon-foundation/dexon/cmd/swarm - go build -o bin/geth github.com/dexon-foundation/dexon/cmd/geth - go build -o bin/bootnode github.com/dexon-foundation/dexon/cmd/bootnode + go build -o bin/swarm github.com/tangerine-network/go-tangerine/cmd/swarm + go build -o bin/geth github.com/tangerine-network/go-tangerine/cmd/geth + go build -o bin/bootnode github.com/tangerine-network/go-tangerine/cmd/bootnode cluster: build scripts/boot-cluster.sh test: - go test -v github.com/dexon-foundation/dexon/swarm/... + go test -v github.com/tangerine-network/go-tangerine/swarm/... diff --git a/swarm/dev/bashrc b/swarm/dev/bashrc index b1f9652e7..80218fe72 100644 --- a/swarm/dev/bashrc +++ b/swarm/dev/bashrc @@ -1,4 +1,4 @@ -export ROOT="${GOPATH}/src/github.com/dexon-foundation/dexon" +export ROOT="${GOPATH}/src/github.com/tangerine-network/go-tangerine" export PATH="${ROOT}/swarm/dev/bin:${PATH}" cd "${ROOT}/swarm/dev" diff --git a/swarm/dev/run.sh b/swarm/dev/run.sh index 71ed13262..a978448b1 100755 --- a/swarm/dev/run.sh +++ b/swarm/dev/run.sh @@ -80,7 +80,7 @@ run_image() { --rm \ --hostname "${name}" \ --name "${name}" \ - --volume "${ROOT}:/go/src/github.com/dexon-foundation/dexon" \ + --volume "${ROOT}:/go/src/github.com/tangerine-network/go-tangerine" \ --volume "/var/run/docker.sock:/var/run/docker.sock" \ ${docker_args} \ "${name}" \ diff --git a/swarm/fuse/fuse_dir.go b/swarm/fuse/fuse_dir.go index 59bfd66f9..5a9ac3055 100644 --- a/swarm/fuse/fuse_dir.go +++ b/swarm/fuse/fuse_dir.go @@ -25,7 +25,7 @@ import ( "bazil.org/fuse" "bazil.org/fuse/fs" - "github.com/dexon-foundation/dexon/swarm/log" + "github.com/tangerine-network/go-tangerine/swarm/log" "golang.org/x/net/context" ) diff --git a/swarm/fuse/fuse_file.go b/swarm/fuse/fuse_file.go index 073351f59..6164b1b97 100644 --- a/swarm/fuse/fuse_file.go +++ b/swarm/fuse/fuse_file.go @@ -26,8 +26,8 @@ import ( "bazil.org/fuse" "bazil.org/fuse/fs" - "github.com/dexon-foundation/dexon/swarm/log" - "github.com/dexon-foundation/dexon/swarm/storage" + "github.com/tangerine-network/go-tangerine/swarm/log" + "github.com/tangerine-network/go-tangerine/swarm/storage" "golang.org/x/net/context" ) diff --git a/swarm/fuse/swarmfs.go b/swarm/fuse/swarmfs.go index 4f690ea96..7c5fe7db9 100644 --- a/swarm/fuse/swarmfs.go +++ b/swarm/fuse/swarmfs.go @@ -20,7 +20,7 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/swarm/api" + "github.com/tangerine-network/go-tangerine/swarm/api" ) const ( diff --git a/swarm/fuse/swarmfs_test.go b/swarm/fuse/swarmfs_test.go index 4624f4392..26755121d 100644 --- a/swarm/fuse/swarmfs_test.go +++ b/swarm/fuse/swarmfs_test.go @@ -29,11 +29,11 @@ import ( "path/filepath" "testing" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/swarm/api" - "github.com/dexon-foundation/dexon/swarm/storage" - "github.com/dexon-foundation/dexon/swarm/testutil" colorable "github.com/mattn/go-colorable" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/swarm/api" + "github.com/tangerine-network/go-tangerine/swarm/storage" + "github.com/tangerine-network/go-tangerine/swarm/testutil" ) var ( diff --git a/swarm/fuse/swarmfs_unix.go b/swarm/fuse/swarmfs_unix.go index ede87c8a8..20a988d8f 100644 --- a/swarm/fuse/swarmfs_unix.go +++ b/swarm/fuse/swarmfs_unix.go @@ -30,9 +30,9 @@ import ( "bazil.org/fuse" "bazil.org/fuse/fs" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/swarm/api" - "github.com/dexon-foundation/dexon/swarm/log" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/swarm/api" + "github.com/tangerine-network/go-tangerine/swarm/log" ) var ( diff --git a/swarm/fuse/swarmfs_util.go b/swarm/fuse/swarmfs_util.go index 3db4ae25b..f5fe747fc 100644 --- a/swarm/fuse/swarmfs_util.go +++ b/swarm/fuse/swarmfs_util.go @@ -24,7 +24,7 @@ import ( "os/exec" "runtime" - "github.com/dexon-foundation/dexon/swarm/log" + "github.com/tangerine-network/go-tangerine/swarm/log" ) func externalUnmount(mountPoint string) error { diff --git a/swarm/log/log.go b/swarm/log/log.go index 901be4a4f..c2a5900ca 100644 --- a/swarm/log/log.go +++ b/swarm/log/log.go @@ -1,8 +1,8 @@ package log import ( - l "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/metrics" + l "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/metrics" ) const ( diff --git a/swarm/metrics/flags.go b/swarm/metrics/flags.go index 1164a9a1a..a0df5a86b 100644 --- a/swarm/metrics/flags.go +++ b/swarm/metrics/flags.go @@ -19,10 +19,10 @@ package metrics import ( "time" - "github.com/dexon-foundation/dexon/cmd/utils" - gethmetrics "github.com/dexon-foundation/dexon/metrics" - "github.com/dexon-foundation/dexon/metrics/influxdb" - "github.com/dexon-foundation/dexon/swarm/log" + "github.com/tangerine-network/go-tangerine/cmd/utils" + gethmetrics "github.com/tangerine-network/go-tangerine/metrics" + "github.com/tangerine-network/go-tangerine/metrics/influxdb" + "github.com/tangerine-network/go-tangerine/swarm/log" cli "gopkg.in/urfave/cli.v1" ) diff --git a/swarm/network/discovery.go b/swarm/network/discovery.go index 47835531f..e283bfc2f 100644 --- a/swarm/network/discovery.go +++ b/swarm/network/discovery.go @@ -21,7 +21,7 @@ import ( "fmt" "sync" - "github.com/dexon-foundation/dexon/swarm/pot" + "github.com/tangerine-network/go-tangerine/swarm/pot" ) // discovery bzz extension for requesting and relaying node address records diff --git a/swarm/network/discovery_test.go b/swarm/network/discovery_test.go index e7b5e3087..1e07b3aeb 100644 --- a/swarm/network/discovery_test.go +++ b/swarm/network/discovery_test.go @@ -19,7 +19,7 @@ package network import ( "testing" - p2ptest "github.com/dexon-foundation/dexon/p2p/testing" + p2ptest "github.com/tangerine-network/go-tangerine/p2p/testing" ) /*** diff --git a/swarm/network/fetcher.go b/swarm/network/fetcher.go index d246e0514..f22b35e55 100644 --- a/swarm/network/fetcher.go +++ b/swarm/network/fetcher.go @@ -21,9 +21,9 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/swarm/storage" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/swarm/storage" ) const ( diff --git a/swarm/network/fetcher_test.go b/swarm/network/fetcher_test.go index 691e0528a..3a500e804 100644 --- a/swarm/network/fetcher_test.go +++ b/swarm/network/fetcher_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/enode" ) var requestedPeerID = enode.HexID("3431c3939e1ee2a6345e976a8234f9870152d64879f30bc272a074f6859e75e8") diff --git a/swarm/network/hive.go b/swarm/network/hive.go index 161e9c41d..6322c578a 100644 --- a/swarm/network/hive.go +++ b/swarm/network/hive.go @@ -21,11 +21,11 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/swarm/log" - "github.com/dexon-foundation/dexon/swarm/state" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/swarm/log" + "github.com/tangerine-network/go-tangerine/swarm/state" ) /* diff --git a/swarm/network/hive_test.go b/swarm/network/hive_test.go index aa7781b72..5e5ffc292 100644 --- a/swarm/network/hive_test.go +++ b/swarm/network/hive_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" - p2ptest "github.com/dexon-foundation/dexon/p2p/testing" - "github.com/dexon-foundation/dexon/swarm/state" + p2ptest "github.com/tangerine-network/go-tangerine/p2p/testing" + "github.com/tangerine-network/go-tangerine/swarm/state" ) func newHiveTester(t *testing.T, params *HiveParams, n int, store state.Store) (*bzzTester, *Hive) { diff --git a/swarm/network/kademlia.go b/swarm/network/kademlia.go index ab919c70d..18113ed6d 100644 --- a/swarm/network/kademlia.go +++ b/swarm/network/kademlia.go @@ -24,10 +24,10 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/swarm/log" - "github.com/dexon-foundation/dexon/swarm/pot" - sv "github.com/dexon-foundation/dexon/swarm/version" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/swarm/log" + "github.com/tangerine-network/go-tangerine/swarm/pot" + sv "github.com/tangerine-network/go-tangerine/swarm/version" ) /* diff --git a/swarm/network/kademlia_test.go b/swarm/network/kademlia_test.go index 17e00f21e..8ffda7060 100644 --- a/swarm/network/kademlia_test.go +++ b/swarm/network/kademlia_test.go @@ -22,12 +22,12 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/protocols" - "github.com/dexon-foundation/dexon/swarm/pot" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/protocols" + "github.com/tangerine-network/go-tangerine/swarm/pot" ) func init() { diff --git a/swarm/network/networkid_test.go b/swarm/network/networkid_test.go index 6ea400e99..330bf4d63 100644 --- a/swarm/network/networkid_test.go +++ b/swarm/network/networkid_test.go @@ -26,13 +26,13 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/node" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/simulations" - "github.com/dexon-foundation/dexon/p2p/simulations/adapters" - "github.com/dexon-foundation/dexon/rpc" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/node" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/simulations" + "github.com/tangerine-network/go-tangerine/p2p/simulations/adapters" + "github.com/tangerine-network/go-tangerine/rpc" ) var ( diff --git a/swarm/network/priorityqueue/priorityqueue.go b/swarm/network/priorityqueue/priorityqueue.go index 2a5042911..e19c4d8af 100644 --- a/swarm/network/priorityqueue/priorityqueue.go +++ b/swarm/network/priorityqueue/priorityqueue.go @@ -29,7 +29,7 @@ import ( "context" "errors" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/log" ) var ( diff --git a/swarm/network/protocol.go b/swarm/network/protocol.go index bbfd2255a..8f6570361 100644 --- a/swarm/network/protocol.go +++ b/swarm/network/protocol.go @@ -24,13 +24,13 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/protocols" - "github.com/dexon-foundation/dexon/rpc" - "github.com/dexon-foundation/dexon/swarm/log" - "github.com/dexon-foundation/dexon/swarm/state" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/protocols" + "github.com/tangerine-network/go-tangerine/rpc" + "github.com/tangerine-network/go-tangerine/swarm/log" + "github.com/tangerine-network/go-tangerine/swarm/state" ) const ( diff --git a/swarm/network/protocol_test.go b/swarm/network/protocol_test.go index 96d49c9b9..e5d3bec71 100644 --- a/swarm/network/protocol_test.go +++ b/swarm/network/protocol_test.go @@ -23,11 +23,11 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/protocols" - p2ptest "github.com/dexon-foundation/dexon/p2p/testing" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/protocols" + p2ptest "github.com/tangerine-network/go-tangerine/p2p/testing" ) const ( diff --git a/swarm/network/simulation/bucket.go b/swarm/network/simulation/bucket.go index 63f2e543c..3c21fac96 100644 --- a/swarm/network/simulation/bucket.go +++ b/swarm/network/simulation/bucket.go @@ -16,7 +16,7 @@ package simulation -import "github.com/dexon-foundation/dexon/p2p/enode" +import "github.com/tangerine-network/go-tangerine/p2p/enode" // BucketKey is the type that should be used for keys in simulation buckets. type BucketKey string diff --git a/swarm/network/simulation/bucket_test.go b/swarm/network/simulation/bucket_test.go index 148745d9c..1f0e2e5aa 100644 --- a/swarm/network/simulation/bucket_test.go +++ b/swarm/network/simulation/bucket_test.go @@ -20,8 +20,8 @@ import ( "sync" "testing" - "github.com/dexon-foundation/dexon/node" - "github.com/dexon-foundation/dexon/p2p/simulations/adapters" + "github.com/tangerine-network/go-tangerine/node" + "github.com/tangerine-network/go-tangerine/p2p/simulations/adapters" ) // TestServiceBucket tests all bucket functionality using subtests. diff --git a/swarm/network/simulation/events.go b/swarm/network/simulation/events.go index c4a944ae4..8372326ff 100644 --- a/swarm/network/simulation/events.go +++ b/swarm/network/simulation/events.go @@ -20,8 +20,8 @@ import ( "context" "sync" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/simulations" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/simulations" ) // PeerEvent is the type of the channel returned by Simulation.PeerEvents. diff --git a/swarm/network/simulation/example_test.go b/swarm/network/simulation/example_test.go index fd66f3813..8420b4934 100644 --- a/swarm/network/simulation/example_test.go +++ b/swarm/network/simulation/example_test.go @@ -22,11 +22,11 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/node" - "github.com/dexon-foundation/dexon/p2p/simulations/adapters" - "github.com/dexon-foundation/dexon/swarm/network" - "github.com/dexon-foundation/dexon/swarm/network/simulation" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/node" + "github.com/tangerine-network/go-tangerine/p2p/simulations/adapters" + "github.com/tangerine-network/go-tangerine/swarm/network" + "github.com/tangerine-network/go-tangerine/swarm/network/simulation" ) // Every node can have a Kademlia associated using the node bucket under diff --git a/swarm/network/simulation/http.go b/swarm/network/simulation/http.go index b05deb59b..25e86d663 100644 --- a/swarm/network/simulation/http.go +++ b/swarm/network/simulation/http.go @@ -20,8 +20,8 @@ import ( "fmt" "net/http" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/p2p/simulations" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/p2p/simulations" ) // Package defaults. diff --git a/swarm/network/simulation/http_test.go b/swarm/network/simulation/http_test.go index 0ce9e5066..39c1896e7 100644 --- a/swarm/network/simulation/http_test.go +++ b/swarm/network/simulation/http_test.go @@ -24,9 +24,9 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/node" - "github.com/dexon-foundation/dexon/p2p/simulations/adapters" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/node" + "github.com/tangerine-network/go-tangerine/p2p/simulations/adapters" ) func TestSimulationWithHTTPServer(t *testing.T) { diff --git a/swarm/network/simulation/kademlia.go b/swarm/network/simulation/kademlia.go index bc491f724..82af20407 100644 --- a/swarm/network/simulation/kademlia.go +++ b/swarm/network/simulation/kademlia.go @@ -21,10 +21,10 @@ import ( "encoding/hex" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/swarm/network" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/swarm/network" ) // BucketKeyKademlia is the key to be used for storing the kademlia diff --git a/swarm/network/simulation/kademlia_test.go b/swarm/network/simulation/kademlia_test.go index 14708df8f..bcdbfc5e2 100644 --- a/swarm/network/simulation/kademlia_test.go +++ b/swarm/network/simulation/kademlia_test.go @@ -22,9 +22,9 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/node" - "github.com/dexon-foundation/dexon/p2p/simulations/adapters" - "github.com/dexon-foundation/dexon/swarm/network" + "github.com/tangerine-network/go-tangerine/node" + "github.com/tangerine-network/go-tangerine/p2p/simulations/adapters" + "github.com/tangerine-network/go-tangerine/swarm/network" ) func TestWaitTillHealthy(t *testing.T) { diff --git a/swarm/network/simulation/node.go b/swarm/network/simulation/node.go index 1f3c389a7..e3a44c7a5 100644 --- a/swarm/network/simulation/node.go +++ b/swarm/network/simulation/node.go @@ -24,10 +24,10 @@ import ( "os" "time" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/simulations" - "github.com/dexon-foundation/dexon/p2p/simulations/adapters" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/simulations" + "github.com/tangerine-network/go-tangerine/p2p/simulations/adapters" ) // NodeIDs returns NodeIDs for all nodes in the network. diff --git a/swarm/network/simulation/node_test.go b/swarm/network/simulation/node_test.go index fe8a174f9..bb24203dd 100644 --- a/swarm/network/simulation/node_test.go +++ b/swarm/network/simulation/node_test.go @@ -23,12 +23,12 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/node" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/simulations" - "github.com/dexon-foundation/dexon/p2p/simulations/adapters" - "github.com/dexon-foundation/dexon/swarm/network" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/node" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/simulations" + "github.com/tangerine-network/go-tangerine/p2p/simulations/adapters" + "github.com/tangerine-network/go-tangerine/swarm/network" ) func TestUpDownNodeIDs(t *testing.T) { diff --git a/swarm/network/simulation/service.go b/swarm/network/simulation/service.go index dac85a10b..787a6d3d7 100644 --- a/swarm/network/simulation/service.go +++ b/swarm/network/simulation/service.go @@ -17,9 +17,9 @@ package simulation import ( - "github.com/dexon-foundation/dexon/node" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/simulations/adapters" + "github.com/tangerine-network/go-tangerine/node" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/simulations/adapters" ) // Service returns a single Service by name on a particular node diff --git a/swarm/network/simulation/simulation.go b/swarm/network/simulation/simulation.go index a3afb118f..eb7795fe0 100644 --- a/swarm/network/simulation/simulation.go +++ b/swarm/network/simulation/simulation.go @@ -23,12 +23,12 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/node" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/simulations" - "github.com/dexon-foundation/dexon/p2p/simulations/adapters" - "github.com/dexon-foundation/dexon/swarm/network" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/node" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/simulations" + "github.com/tangerine-network/go-tangerine/p2p/simulations/adapters" + "github.com/tangerine-network/go-tangerine/swarm/network" ) // Common errors that are returned by functions in this package. diff --git a/swarm/network/simulation/simulation_test.go b/swarm/network/simulation/simulation_test.go index b28999d6b..c6f85673d 100644 --- a/swarm/network/simulation/simulation_test.go +++ b/swarm/network/simulation/simulation_test.go @@ -24,11 +24,11 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/node" - "github.com/dexon-foundation/dexon/p2p/simulations" - "github.com/dexon-foundation/dexon/p2p/simulations/adapters" "github.com/mattn/go-colorable" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/node" + "github.com/tangerine-network/go-tangerine/p2p/simulations" + "github.com/tangerine-network/go-tangerine/p2p/simulations/adapters" ) var ( diff --git a/swarm/network/simulations/discovery/discovery_test.go b/swarm/network/simulations/discovery/discovery_test.go index d997c328d..b288fe01a 100644 --- a/swarm/network/simulations/discovery/discovery_test.go +++ b/swarm/network/simulations/discovery/discovery_test.go @@ -27,16 +27,16 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/node" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/simulations" - "github.com/dexon-foundation/dexon/p2p/simulations/adapters" - "github.com/dexon-foundation/dexon/swarm/network" - "github.com/dexon-foundation/dexon/swarm/state" colorable "github.com/mattn/go-colorable" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/node" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/simulations" + "github.com/tangerine-network/go-tangerine/p2p/simulations/adapters" + "github.com/tangerine-network/go-tangerine/swarm/network" + "github.com/tangerine-network/go-tangerine/swarm/state" ) // serviceName is used with the exec adapter so the exec'd binary knows which diff --git a/swarm/network/simulations/overlay.go b/swarm/network/simulations/overlay.go index e9d288e72..1e9769200 100644 --- a/swarm/network/simulations/overlay.go +++ b/swarm/network/simulations/overlay.go @@ -27,14 +27,14 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/node" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/simulations" - "github.com/dexon-foundation/dexon/p2p/simulations/adapters" - "github.com/dexon-foundation/dexon/swarm/network" - "github.com/dexon-foundation/dexon/swarm/state" colorable "github.com/mattn/go-colorable" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/node" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/simulations" + "github.com/tangerine-network/go-tangerine/p2p/simulations/adapters" + "github.com/tangerine-network/go-tangerine/swarm/network" + "github.com/tangerine-network/go-tangerine/swarm/state" ) var ( diff --git a/swarm/network/simulations/overlay_test.go b/swarm/network/simulations/overlay_test.go index 52075caa0..24eb6e93a 100644 --- a/swarm/network/simulations/overlay_test.go +++ b/swarm/network/simulations/overlay_test.go @@ -26,9 +26,9 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/simulations" - "github.com/dexon-foundation/dexon/swarm/log" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/simulations" + "github.com/tangerine-network/go-tangerine/swarm/log" ) var ( diff --git a/swarm/network/stream/common_test.go b/swarm/network/stream/common_test.go index ebee84130..3fd67d5f8 100644 --- a/swarm/network/stream/common_test.go +++ b/swarm/network/stream/common_test.go @@ -30,17 +30,17 @@ import ( "sync/atomic" "time" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/simulations/adapters" - p2ptest "github.com/dexon-foundation/dexon/p2p/testing" - "github.com/dexon-foundation/dexon/swarm/network" - "github.com/dexon-foundation/dexon/swarm/network/simulation" - "github.com/dexon-foundation/dexon/swarm/state" - "github.com/dexon-foundation/dexon/swarm/storage" - mockmem "github.com/dexon-foundation/dexon/swarm/storage/mock/mem" - "github.com/dexon-foundation/dexon/swarm/testutil" colorable "github.com/mattn/go-colorable" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/simulations/adapters" + p2ptest "github.com/tangerine-network/go-tangerine/p2p/testing" + "github.com/tangerine-network/go-tangerine/swarm/network" + "github.com/tangerine-network/go-tangerine/swarm/network/simulation" + "github.com/tangerine-network/go-tangerine/swarm/state" + "github.com/tangerine-network/go-tangerine/swarm/storage" + mockmem "github.com/tangerine-network/go-tangerine/swarm/storage/mock/mem" + "github.com/tangerine-network/go-tangerine/swarm/testutil" ) var ( diff --git a/swarm/network/stream/delivery.go b/swarm/network/stream/delivery.go index bd14cb182..e3391ff6c 100644 --- a/swarm/network/stream/delivery.go +++ b/swarm/network/stream/delivery.go @@ -21,13 +21,13 @@ import ( "errors" "fmt" - "github.com/dexon-foundation/dexon/metrics" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/swarm/log" - "github.com/dexon-foundation/dexon/swarm/network" - "github.com/dexon-foundation/dexon/swarm/spancontext" - "github.com/dexon-foundation/dexon/swarm/storage" opentracing "github.com/opentracing/opentracing-go" + "github.com/tangerine-network/go-tangerine/metrics" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/swarm/log" + "github.com/tangerine-network/go-tangerine/swarm/network" + "github.com/tangerine-network/go-tangerine/swarm/spancontext" + "github.com/tangerine-network/go-tangerine/swarm/storage" ) const ( diff --git a/swarm/network/stream/delivery_test.go b/swarm/network/stream/delivery_test.go index 6a051460b..baecfa75a 100644 --- a/swarm/network/stream/delivery_test.go +++ b/swarm/network/stream/delivery_test.go @@ -25,19 +25,19 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/node" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/protocols" - "github.com/dexon-foundation/dexon/p2p/simulations/adapters" - p2ptest "github.com/dexon-foundation/dexon/p2p/testing" - "github.com/dexon-foundation/dexon/swarm/log" - "github.com/dexon-foundation/dexon/swarm/network" - pq "github.com/dexon-foundation/dexon/swarm/network/priorityqueue" - "github.com/dexon-foundation/dexon/swarm/network/simulation" - "github.com/dexon-foundation/dexon/swarm/state" - "github.com/dexon-foundation/dexon/swarm/storage" - "github.com/dexon-foundation/dexon/swarm/testutil" + "github.com/tangerine-network/go-tangerine/node" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/protocols" + "github.com/tangerine-network/go-tangerine/p2p/simulations/adapters" + p2ptest "github.com/tangerine-network/go-tangerine/p2p/testing" + "github.com/tangerine-network/go-tangerine/swarm/log" + "github.com/tangerine-network/go-tangerine/swarm/network" + pq "github.com/tangerine-network/go-tangerine/swarm/network/priorityqueue" + "github.com/tangerine-network/go-tangerine/swarm/network/simulation" + "github.com/tangerine-network/go-tangerine/swarm/state" + "github.com/tangerine-network/go-tangerine/swarm/storage" + "github.com/tangerine-network/go-tangerine/swarm/testutil" ) //Tests initializing a retrieve request diff --git a/swarm/network/stream/intervals/dbstore_test.go b/swarm/network/stream/intervals/dbstore_test.go index 9d07a95a6..d63e50df0 100644 --- a/swarm/network/stream/intervals/dbstore_test.go +++ b/swarm/network/stream/intervals/dbstore_test.go @@ -21,7 +21,7 @@ import ( "os" "testing" - "github.com/dexon-foundation/dexon/swarm/state" + "github.com/tangerine-network/go-tangerine/swarm/state" ) // TestDBStore tests basic functionality of DBStore. diff --git a/swarm/network/stream/intervals/store_test.go b/swarm/network/stream/intervals/store_test.go index c1db2687a..30aa62734 100644 --- a/swarm/network/stream/intervals/store_test.go +++ b/swarm/network/stream/intervals/store_test.go @@ -19,7 +19,7 @@ package intervals import ( "testing" - "github.com/dexon-foundation/dexon/swarm/state" + "github.com/tangerine-network/go-tangerine/swarm/state" ) // TestInmemoryStore tests basic functionality of InmemoryStore. diff --git a/swarm/network/stream/intervals_test.go b/swarm/network/stream/intervals_test.go index c72311a59..af14aa0f0 100644 --- a/swarm/network/stream/intervals_test.go +++ b/swarm/network/stream/intervals_test.go @@ -25,14 +25,14 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/node" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/simulations/adapters" - "github.com/dexon-foundation/dexon/swarm/network/simulation" - "github.com/dexon-foundation/dexon/swarm/state" - "github.com/dexon-foundation/dexon/swarm/storage" - "github.com/dexon-foundation/dexon/swarm/testutil" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/node" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/simulations/adapters" + "github.com/tangerine-network/go-tangerine/swarm/network/simulation" + "github.com/tangerine-network/go-tangerine/swarm/state" + "github.com/tangerine-network/go-tangerine/swarm/storage" + "github.com/tangerine-network/go-tangerine/swarm/testutil" ) func TestIntervalsLive(t *testing.T) { diff --git a/swarm/network/stream/lightnode_test.go b/swarm/network/stream/lightnode_test.go index 889b44c23..cf7f0b0df 100644 --- a/swarm/network/stream/lightnode_test.go +++ b/swarm/network/stream/lightnode_test.go @@ -18,7 +18,7 @@ package stream import ( "testing" - p2ptest "github.com/dexon-foundation/dexon/p2p/testing" + p2ptest "github.com/tangerine-network/go-tangerine/p2p/testing" ) // This test checks the default behavior of the server, that is diff --git a/swarm/network/stream/messages.go b/swarm/network/stream/messages.go index cb18d5a2a..88053e4f4 100644 --- a/swarm/network/stream/messages.go +++ b/swarm/network/stream/messages.go @@ -21,12 +21,12 @@ import ( "fmt" "time" - "github.com/dexon-foundation/dexon/metrics" - "github.com/dexon-foundation/dexon/swarm/log" - bv "github.com/dexon-foundation/dexon/swarm/network/bitvector" - "github.com/dexon-foundation/dexon/swarm/spancontext" - "github.com/dexon-foundation/dexon/swarm/storage" "github.com/opentracing/opentracing-go" + "github.com/tangerine-network/go-tangerine/metrics" + "github.com/tangerine-network/go-tangerine/swarm/log" + bv "github.com/tangerine-network/go-tangerine/swarm/network/bitvector" + "github.com/tangerine-network/go-tangerine/swarm/spancontext" + "github.com/tangerine-network/go-tangerine/swarm/storage" ) var syncBatchTimeout = 30 * time.Second diff --git a/swarm/network/stream/peer.go b/swarm/network/stream/peer.go index 12a933a29..3f80b19fb 100644 --- a/swarm/network/stream/peer.go +++ b/swarm/network/stream/peer.go @@ -23,15 +23,15 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/metrics" - "github.com/dexon-foundation/dexon/p2p/protocols" - "github.com/dexon-foundation/dexon/swarm/log" - pq "github.com/dexon-foundation/dexon/swarm/network/priorityqueue" - "github.com/dexon-foundation/dexon/swarm/network/stream/intervals" - "github.com/dexon-foundation/dexon/swarm/spancontext" - "github.com/dexon-foundation/dexon/swarm/state" - "github.com/dexon-foundation/dexon/swarm/storage" opentracing "github.com/opentracing/opentracing-go" + "github.com/tangerine-network/go-tangerine/metrics" + "github.com/tangerine-network/go-tangerine/p2p/protocols" + "github.com/tangerine-network/go-tangerine/swarm/log" + pq "github.com/tangerine-network/go-tangerine/swarm/network/priorityqueue" + "github.com/tangerine-network/go-tangerine/swarm/network/stream/intervals" + "github.com/tangerine-network/go-tangerine/swarm/spancontext" + "github.com/tangerine-network/go-tangerine/swarm/state" + "github.com/tangerine-network/go-tangerine/swarm/storage" ) type notFoundError struct { diff --git a/swarm/network/stream/snapshot_retrieval_test.go b/swarm/network/stream/snapshot_retrieval_test.go index 67db13365..da49ed4b4 100644 --- a/swarm/network/stream/snapshot_retrieval_test.go +++ b/swarm/network/stream/snapshot_retrieval_test.go @@ -22,13 +22,13 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/node" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/simulations/adapters" - "github.com/dexon-foundation/dexon/swarm/log" - "github.com/dexon-foundation/dexon/swarm/network/simulation" - "github.com/dexon-foundation/dexon/swarm/state" - "github.com/dexon-foundation/dexon/swarm/storage" + "github.com/tangerine-network/go-tangerine/node" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/simulations/adapters" + "github.com/tangerine-network/go-tangerine/swarm/log" + "github.com/tangerine-network/go-tangerine/swarm/network/simulation" + "github.com/tangerine-network/go-tangerine/swarm/state" + "github.com/tangerine-network/go-tangerine/swarm/storage" ) //constants for random file generation diff --git a/swarm/network/stream/snapshot_sync_test.go b/swarm/network/stream/snapshot_sync_test.go index 8a25e2b06..7afdeb31a 100644 --- a/swarm/network/stream/snapshot_sync_test.go +++ b/swarm/network/stream/snapshot_sync_test.go @@ -26,20 +26,20 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/node" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/simulations" - "github.com/dexon-foundation/dexon/p2p/simulations/adapters" - "github.com/dexon-foundation/dexon/swarm/network" - "github.com/dexon-foundation/dexon/swarm/network/simulation" - "github.com/dexon-foundation/dexon/swarm/pot" - "github.com/dexon-foundation/dexon/swarm/state" - "github.com/dexon-foundation/dexon/swarm/storage" - "github.com/dexon-foundation/dexon/swarm/storage/mock" - mockmem "github.com/dexon-foundation/dexon/swarm/storage/mock/mem" - "github.com/dexon-foundation/dexon/swarm/testutil" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/node" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/simulations" + "github.com/tangerine-network/go-tangerine/p2p/simulations/adapters" + "github.com/tangerine-network/go-tangerine/swarm/network" + "github.com/tangerine-network/go-tangerine/swarm/network/simulation" + "github.com/tangerine-network/go-tangerine/swarm/pot" + "github.com/tangerine-network/go-tangerine/swarm/state" + "github.com/tangerine-network/go-tangerine/swarm/storage" + "github.com/tangerine-network/go-tangerine/swarm/storage/mock" + mockmem "github.com/tangerine-network/go-tangerine/swarm/storage/mock/mem" + "github.com/tangerine-network/go-tangerine/swarm/testutil" ) const MaxTimeout = 600 diff --git a/swarm/network/stream/stream.go b/swarm/network/stream/stream.go index ab9f8d152..32218a688 100644 --- a/swarm/network/stream/stream.go +++ b/swarm/network/stream/stream.go @@ -25,16 +25,16 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/metrics" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/protocols" - "github.com/dexon-foundation/dexon/rpc" - "github.com/dexon-foundation/dexon/swarm/log" - "github.com/dexon-foundation/dexon/swarm/network" - "github.com/dexon-foundation/dexon/swarm/network/stream/intervals" - "github.com/dexon-foundation/dexon/swarm/state" - "github.com/dexon-foundation/dexon/swarm/storage" + "github.com/tangerine-network/go-tangerine/metrics" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/protocols" + "github.com/tangerine-network/go-tangerine/rpc" + "github.com/tangerine-network/go-tangerine/swarm/log" + "github.com/tangerine-network/go-tangerine/swarm/network" + "github.com/tangerine-network/go-tangerine/swarm/network/stream/intervals" + "github.com/tangerine-network/go-tangerine/swarm/state" + "github.com/tangerine-network/go-tangerine/swarm/storage" ) const ( diff --git a/swarm/network/stream/streamer_test.go b/swarm/network/stream/streamer_test.go index aee069823..adbf353b6 100644 --- a/swarm/network/stream/streamer_test.go +++ b/swarm/network/stream/streamer_test.go @@ -27,15 +27,15 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/node" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/simulations/adapters" - p2ptest "github.com/dexon-foundation/dexon/p2p/testing" - "github.com/dexon-foundation/dexon/swarm/network" - "github.com/dexon-foundation/dexon/swarm/network/simulation" - "github.com/dexon-foundation/dexon/swarm/state" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/node" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/simulations/adapters" + p2ptest "github.com/tangerine-network/go-tangerine/p2p/testing" + "github.com/tangerine-network/go-tangerine/swarm/network" + "github.com/tangerine-network/go-tangerine/swarm/network/simulation" + "github.com/tangerine-network/go-tangerine/swarm/state" "golang.org/x/crypto/sha3" ) diff --git a/swarm/network/stream/syncer.go b/swarm/network/stream/syncer.go index 0a53cd3c8..53710a83d 100644 --- a/swarm/network/stream/syncer.go +++ b/swarm/network/stream/syncer.go @@ -21,9 +21,9 @@ import ( "strconv" "time" - "github.com/dexon-foundation/dexon/metrics" - "github.com/dexon-foundation/dexon/swarm/log" - "github.com/dexon-foundation/dexon/swarm/storage" + "github.com/tangerine-network/go-tangerine/metrics" + "github.com/tangerine-network/go-tangerine/swarm/log" + "github.com/tangerine-network/go-tangerine/swarm/storage" ) const ( diff --git a/swarm/network/stream/syncer_test.go b/swarm/network/stream/syncer_test.go index b1491f501..0a42b9c41 100644 --- a/swarm/network/stream/syncer_test.go +++ b/swarm/network/stream/syncer_test.go @@ -27,17 +27,17 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/node" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/simulations/adapters" - "github.com/dexon-foundation/dexon/swarm/log" - "github.com/dexon-foundation/dexon/swarm/network" - "github.com/dexon-foundation/dexon/swarm/network/simulation" - "github.com/dexon-foundation/dexon/swarm/state" - "github.com/dexon-foundation/dexon/swarm/storage" - "github.com/dexon-foundation/dexon/swarm/storage/mock" - "github.com/dexon-foundation/dexon/swarm/testutil" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/node" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/simulations/adapters" + "github.com/tangerine-network/go-tangerine/swarm/log" + "github.com/tangerine-network/go-tangerine/swarm/network" + "github.com/tangerine-network/go-tangerine/swarm/network/simulation" + "github.com/tangerine-network/go-tangerine/swarm/state" + "github.com/tangerine-network/go-tangerine/swarm/storage" + "github.com/tangerine-network/go-tangerine/swarm/storage/mock" + "github.com/tangerine-network/go-tangerine/swarm/testutil" ) const dataChunkCount = 200 diff --git a/swarm/network/stream/visualized_snapshot_sync_sim_test.go b/swarm/network/stream/visualized_snapshot_sync_sim_test.go index 21cc77e59..50854677b 100644 --- a/swarm/network/stream/visualized_snapshot_sync_sim_test.go +++ b/swarm/network/stream/visualized_snapshot_sync_sim_test.go @@ -28,17 +28,17 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/node" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/protocols" - "github.com/dexon-foundation/dexon/p2p/simulations" - "github.com/dexon-foundation/dexon/p2p/simulations/adapters" - "github.com/dexon-foundation/dexon/rlp" - "github.com/dexon-foundation/dexon/swarm/log" - "github.com/dexon-foundation/dexon/swarm/network/simulation" - "github.com/dexon-foundation/dexon/swarm/state" - "github.com/dexon-foundation/dexon/swarm/storage" + "github.com/tangerine-network/go-tangerine/node" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/protocols" + "github.com/tangerine-network/go-tangerine/p2p/simulations" + "github.com/tangerine-network/go-tangerine/p2p/simulations/adapters" + "github.com/tangerine-network/go-tangerine/rlp" + "github.com/tangerine-network/go-tangerine/swarm/log" + "github.com/tangerine-network/go-tangerine/swarm/network/simulation" + "github.com/tangerine-network/go-tangerine/swarm/state" + "github.com/tangerine-network/go-tangerine/swarm/storage" ) /* diff --git a/swarm/network_test.go b/swarm/network_test.go index 45e17dff1..f70c6e239 100644 --- a/swarm/network_test.go +++ b/swarm/network_test.go @@ -28,15 +28,15 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/node" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/simulations/adapters" - "github.com/dexon-foundation/dexon/swarm/api" - "github.com/dexon-foundation/dexon/swarm/network/simulation" - "github.com/dexon-foundation/dexon/swarm/storage" colorable "github.com/mattn/go-colorable" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/node" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/simulations/adapters" + "github.com/tangerine-network/go-tangerine/swarm/api" + "github.com/tangerine-network/go-tangerine/swarm/network/simulation" + "github.com/tangerine-network/go-tangerine/swarm/storage" ) var ( diff --git a/swarm/pot/address.go b/swarm/pot/address.go index 75c2994ec..dee4372a4 100644 --- a/swarm/pot/address.go +++ b/swarm/pot/address.go @@ -24,7 +24,7 @@ import ( "strconv" "strings" - "github.com/dexon-foundation/dexon/common" + "github.com/tangerine-network/go-tangerine/common" ) var ( diff --git a/swarm/pot/pot_test.go b/swarm/pot/pot_test.go index ca0f61430..87c3025e2 100644 --- a/swarm/pot/pot_test.go +++ b/swarm/pot/pot_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/swarm/log" + "github.com/tangerine-network/go-tangerine/swarm/log" ) const ( diff --git a/swarm/pss/api.go b/swarm/pss/api.go index 9cb1208f4..eb9fd2c73 100644 --- a/swarm/pss/api.go +++ b/swarm/pss/api.go @@ -21,11 +21,11 @@ import ( "errors" "fmt" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/rpc" - "github.com/dexon-foundation/dexon/swarm/log" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/rpc" + "github.com/tangerine-network/go-tangerine/swarm/log" ) // Wrapper for receiving pss messages when using the pss API diff --git a/swarm/pss/client/client.go b/swarm/pss/client/client.go index 89c6d9b13..47a9cd3da 100644 --- a/swarm/pss/client/client.go +++ b/swarm/pss/client/client.go @@ -25,14 +25,14 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/protocols" - "github.com/dexon-foundation/dexon/rlp" - "github.com/dexon-foundation/dexon/rpc" - "github.com/dexon-foundation/dexon/swarm/log" - "github.com/dexon-foundation/dexon/swarm/pss" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/protocols" + "github.com/tangerine-network/go-tangerine/rlp" + "github.com/tangerine-network/go-tangerine/rpc" + "github.com/tangerine-network/go-tangerine/swarm/log" + "github.com/tangerine-network/go-tangerine/swarm/pss" ) const ( diff --git a/swarm/pss/client/client_test.go b/swarm/pss/client/client_test.go index ed01badb2..9aded872a 100644 --- a/swarm/pss/client/client_test.go +++ b/swarm/pss/client/client_test.go @@ -27,18 +27,18 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/node" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/simulations" - "github.com/dexon-foundation/dexon/p2p/simulations/adapters" - "github.com/dexon-foundation/dexon/rpc" - "github.com/dexon-foundation/dexon/swarm/network" - "github.com/dexon-foundation/dexon/swarm/pss" - "github.com/dexon-foundation/dexon/swarm/state" - whisper "github.com/dexon-foundation/dexon/whisper/whisperv6" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/node" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/simulations" + "github.com/tangerine-network/go-tangerine/p2p/simulations/adapters" + "github.com/tangerine-network/go-tangerine/rpc" + "github.com/tangerine-network/go-tangerine/swarm/network" + "github.com/tangerine-network/go-tangerine/swarm/pss" + "github.com/tangerine-network/go-tangerine/swarm/state" + whisper "github.com/tangerine-network/go-tangerine/whisper/whisperv6" ) type protoCtrl struct { diff --git a/swarm/pss/client/doc.go b/swarm/pss/client/doc.go index cd60ec341..efb74453e 100644 --- a/swarm/pss/client/doc.go +++ b/swarm/pss/client/doc.go @@ -28,11 +28,11 @@ // "context" // "fmt" // "os" -// pss "github.com/dexon-foundation/dexon/swarm/pss/client" -// "github.com/dexon-foundation/dexon/p2p/protocols" -// "github.com/dexon-foundation/dexon/p2p" -// "github.com/dexon-foundation/dexon/swarm/pot" -// "github.com/dexon-foundation/dexon/swarm/log" +// pss "github.com/tangerine-network/go-tangerine/swarm/pss/client" +// "github.com/tangerine-network/go-tangerine/p2p/protocols" +// "github.com/tangerine-network/go-tangerine/p2p" +// "github.com/tangerine-network/go-tangerine/swarm/pot" +// "github.com/tangerine-network/go-tangerine/swarm/log" // ) // // type FooMsg struct { diff --git a/swarm/pss/forwarding_test.go b/swarm/pss/forwarding_test.go index 983c69c97..87ad1446d 100644 --- a/swarm/pss/forwarding_test.go +++ b/swarm/pss/forwarding_test.go @@ -6,13 +6,13 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/protocols" - "github.com/dexon-foundation/dexon/swarm/network" - "github.com/dexon-foundation/dexon/swarm/pot" - whisper "github.com/dexon-foundation/dexon/whisper/whisperv6" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/protocols" + "github.com/tangerine-network/go-tangerine/swarm/network" + "github.com/tangerine-network/go-tangerine/swarm/pot" + whisper "github.com/tangerine-network/go-tangerine/whisper/whisperv6" ) type testCase struct { diff --git a/swarm/pss/handshake.go b/swarm/pss/handshake.go index d637042a0..5c2008432 100644 --- a/swarm/pss/handshake.go +++ b/swarm/pss/handshake.go @@ -25,13 +25,13 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/rlp" - "github.com/dexon-foundation/dexon/rpc" - "github.com/dexon-foundation/dexon/swarm/log" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/rlp" + "github.com/tangerine-network/go-tangerine/rpc" + "github.com/tangerine-network/go-tangerine/swarm/log" ) const ( diff --git a/swarm/pss/handshake_test.go b/swarm/pss/handshake_test.go index 25454db0c..f07453c88 100644 --- a/swarm/pss/handshake_test.go +++ b/swarm/pss/handshake_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/swarm/log" + "github.com/tangerine-network/go-tangerine/swarm/log" ) // asymmetrical key exchange between two directly connected peers diff --git a/swarm/pss/keystore.go b/swarm/pss/keystore.go index 72e8ebb30..78dd440df 100644 --- a/swarm/pss/keystore.go +++ b/swarm/pss/keystore.go @@ -22,11 +22,11 @@ import ( "fmt" "sync" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/metrics" - "github.com/dexon-foundation/dexon/swarm/log" - whisper "github.com/dexon-foundation/dexon/whisper/whisperv6" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/metrics" + "github.com/tangerine-network/go-tangerine/swarm/log" + whisper "github.com/tangerine-network/go-tangerine/whisper/whisperv6" ) type KeyStore struct { diff --git a/swarm/pss/notify/notify.go b/swarm/pss/notify/notify.go index 60e429262..bd6813b35 100644 --- a/swarm/pss/notify/notify.go +++ b/swarm/pss/notify/notify.go @@ -5,12 +5,12 @@ import ( "fmt" "sync" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/rlp" - "github.com/dexon-foundation/dexon/swarm/log" - "github.com/dexon-foundation/dexon/swarm/pss" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/rlp" + "github.com/tangerine-network/go-tangerine/swarm/log" + "github.com/tangerine-network/go-tangerine/swarm/pss" ) const ( diff --git a/swarm/pss/notify/notify_test.go b/swarm/pss/notify/notify_test.go index e6a1e17c0..1a882bcc1 100644 --- a/swarm/pss/notify/notify_test.go +++ b/swarm/pss/notify/notify_test.go @@ -9,17 +9,17 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/node" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/simulations" - "github.com/dexon-foundation/dexon/p2p/simulations/adapters" - "github.com/dexon-foundation/dexon/swarm/network" - "github.com/dexon-foundation/dexon/swarm/pss" - "github.com/dexon-foundation/dexon/swarm/state" - whisper "github.com/dexon-foundation/dexon/whisper/whisperv6" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/node" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/simulations" + "github.com/tangerine-network/go-tangerine/p2p/simulations/adapters" + "github.com/tangerine-network/go-tangerine/swarm/network" + "github.com/tangerine-network/go-tangerine/swarm/pss" + "github.com/tangerine-network/go-tangerine/swarm/state" + whisper "github.com/tangerine-network/go-tangerine/whisper/whisperv6" ) var ( diff --git a/swarm/pss/ping.go b/swarm/pss/ping.go index b45bd169b..dd3f23942 100644 --- a/swarm/pss/ping.go +++ b/swarm/pss/ping.go @@ -23,9 +23,9 @@ import ( "errors" "time" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/protocols" - "github.com/dexon-foundation/dexon/swarm/log" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/protocols" + "github.com/tangerine-network/go-tangerine/swarm/log" ) // Generic ping protocol implementation for diff --git a/swarm/pss/protocol.go b/swarm/pss/protocol.go index d3751f157..d73f74af7 100644 --- a/swarm/pss/protocol.go +++ b/swarm/pss/protocol.go @@ -24,10 +24,10 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/protocols" - "github.com/dexon-foundation/dexon/rlp" - "github.com/dexon-foundation/dexon/swarm/log" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/protocols" + "github.com/tangerine-network/go-tangerine/rlp" + "github.com/tangerine-network/go-tangerine/swarm/log" ) const ( diff --git a/swarm/pss/protocol_test.go b/swarm/pss/protocol_test.go index 6d379c067..9ecea4a82 100644 --- a/swarm/pss/protocol_test.go +++ b/swarm/pss/protocol_test.go @@ -25,10 +25,10 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/swarm/log" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/swarm/log" ) type protoCtrl struct { diff --git a/swarm/pss/pss.go b/swarm/pss/pss.go index b371f615e..a007337fe 100644 --- a/swarm/pss/pss.go +++ b/swarm/pss/pss.go @@ -27,18 +27,18 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/metrics" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/protocols" - "github.com/dexon-foundation/dexon/rpc" - "github.com/dexon-foundation/dexon/swarm/log" - "github.com/dexon-foundation/dexon/swarm/network" - "github.com/dexon-foundation/dexon/swarm/pot" - "github.com/dexon-foundation/dexon/swarm/storage" - whisper "github.com/dexon-foundation/dexon/whisper/whisperv6" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/metrics" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/protocols" + "github.com/tangerine-network/go-tangerine/rpc" + "github.com/tangerine-network/go-tangerine/swarm/log" + "github.com/tangerine-network/go-tangerine/swarm/network" + "github.com/tangerine-network/go-tangerine/swarm/pot" + "github.com/tangerine-network/go-tangerine/swarm/storage" + whisper "github.com/tangerine-network/go-tangerine/whisper/whisperv6" "golang.org/x/crypto/sha3" ) diff --git a/swarm/pss/pss_test.go b/swarm/pss/pss_test.go index 2de8988cd..5f7a914ee 100644 --- a/swarm/pss/pss_test.go +++ b/swarm/pss/pss_test.go @@ -34,23 +34,23 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/metrics" - "github.com/dexon-foundation/dexon/metrics/influxdb" - "github.com/dexon-foundation/dexon/node" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/protocols" - "github.com/dexon-foundation/dexon/p2p/simulations" - "github.com/dexon-foundation/dexon/p2p/simulations/adapters" - "github.com/dexon-foundation/dexon/rpc" - "github.com/dexon-foundation/dexon/swarm/network" - "github.com/dexon-foundation/dexon/swarm/pot" - "github.com/dexon-foundation/dexon/swarm/state" - whisper "github.com/dexon-foundation/dexon/whisper/whisperv6" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/metrics" + "github.com/tangerine-network/go-tangerine/metrics/influxdb" + "github.com/tangerine-network/go-tangerine/node" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/protocols" + "github.com/tangerine-network/go-tangerine/p2p/simulations" + "github.com/tangerine-network/go-tangerine/p2p/simulations/adapters" + "github.com/tangerine-network/go-tangerine/rpc" + "github.com/tangerine-network/go-tangerine/swarm/network" + "github.com/tangerine-network/go-tangerine/swarm/pot" + "github.com/tangerine-network/go-tangerine/swarm/state" + whisper "github.com/tangerine-network/go-tangerine/whisper/whisperv6" ) var ( diff --git a/swarm/pss/types.go b/swarm/pss/types.go index d66a2d4e3..1148f4ebb 100644 --- a/swarm/pss/types.go +++ b/swarm/pss/types.go @@ -21,12 +21,12 @@ import ( "fmt" "sync" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/rlp" - "github.com/dexon-foundation/dexon/swarm/storage" - whisper "github.com/dexon-foundation/dexon/whisper/whisperv6" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/rlp" + "github.com/tangerine-network/go-tangerine/swarm/storage" + whisper "github.com/tangerine-network/go-tangerine/whisper/whisperv6" ) const ( diff --git a/swarm/pss/writeup.md b/swarm/pss/writeup.md index 06f72c4d6..283e393d8 100644 --- a/swarm/pss/writeup.md +++ b/swarm/pss/writeup.md @@ -36,22 +36,22 @@ go test -race -v ./swarm/pss -cpu 4 -run TestNetwork 1 ================== 2 WARNING: DATA RACE 3 Read at 0x00c424d456a0 by goroutine 1089: - 4 github.com/dexon-foundation/dexon/swarm/pss.(*Pss).forward.func1() - 5 /Users/nonsense/code/src/github.com/dexon-foundation/dexon/swarm/pss/pss.go:654 +0x44f - 6 github.com/dexon-foundation/dexon/swarm/network.(*Kademlia).eachConn.func1() - 7 /Users/nonsense/code/src/github.com/dexon-foundation/dexon/swarm/network/kademlia.go:350 +0xc9 - 8 github.com/dexon-foundation/dexon/pot.(*Pot).eachNeighbour.func1() - 9 /Users/nonsense/code/src/github.com/dexon-foundation/dexon/pot/pot.go:599 +0x59 + 4 github.com/tangerine-network/go-tangerine/swarm/pss.(*Pss).forward.func1() + 5 /Users/nonsense/code/src/github.com/tangerine-network/go-tangerine/swarm/pss/pss.go:654 +0x44f + 6 github.com/tangerine-network/go-tangerine/swarm/network.(*Kademlia).eachConn.func1() + 7 /Users/nonsense/code/src/github.com/tangerine-network/go-tangerine/swarm/network/kademlia.go:350 +0xc9 + 8 github.com/tangerine-network/go-tangerine/pot.(*Pot).eachNeighbour.func1() + 9 /Users/nonsense/code/src/github.com/tangerine-network/go-tangerine/pot/pot.go:599 +0x59 ... 28 29 Previous write at 0x00c424d456a0 by goroutine 829: - 30 github.com/dexon-foundation/dexon/swarm/pss.(*Pss).Run() - 31 /Users/nonsense/code/src/github.com/dexon-foundation/dexon/swarm/pss/pss.go:192 +0x16a - 32 github.com/dexon-foundation/dexon/swarm/pss.(*Pss).Run-fm() - 33 /Users/nonsense/code/src/github.com/dexon-foundation/dexon/swarm/pss/pss.go:185 +0x63 - 34 github.com/dexon-foundation/dexon/p2p.(*Peer).startProtocols.func1() - 35 /Users/nonsense/code/src/github.com/dexon-foundation/dexon/p2p/peer.go:347 +0x8b + 30 github.com/tangerine-network/go-tangerine/swarm/pss.(*Pss).Run() + 31 /Users/nonsense/code/src/github.com/tangerine-network/go-tangerine/swarm/pss/pss.go:192 +0x16a + 32 github.com/tangerine-network/go-tangerine/swarm/pss.(*Pss).Run-fm() + 33 /Users/nonsense/code/src/github.com/tangerine-network/go-tangerine/swarm/pss/pss.go:185 +0x63 + 34 github.com/tangerine-network/go-tangerine/p2p.(*Peer).startProtocols.func1() + 35 /Users/nonsense/code/src/github.com/tangerine-network/go-tangerine/p2p/peer.go:347 +0x8b ... ``` diff --git a/swarm/services/swap/swap.go b/swarm/services/swap/swap.go index f5de85340..b0ff02fd1 100644 --- a/swarm/services/swap/swap.go +++ b/swarm/services/swap/swap.go @@ -27,14 +27,14 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/accounts/abi/bind" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/contracts/chequebook" - "github.com/dexon-foundation/dexon/contracts/chequebook/contract" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/swarm/log" - "github.com/dexon-foundation/dexon/swarm/services/swap/swap" + "github.com/tangerine-network/go-tangerine/accounts/abi/bind" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/contracts/chequebook" + "github.com/tangerine-network/go-tangerine/contracts/chequebook/contract" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/swarm/log" + "github.com/tangerine-network/go-tangerine/swarm/services/swap/swap" ) // SwAP Swarm Accounting Protocol with diff --git a/swarm/services/swap/swap/swap.go b/swarm/services/swap/swap/swap.go index f0b2405a4..531044d87 100644 --- a/swarm/services/swap/swap/swap.go +++ b/swarm/services/swap/swap/swap.go @@ -22,7 +22,7 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/swarm/log" + "github.com/tangerine-network/go-tangerine/swarm/log" ) // SwAP Swarm Accounting Protocol with diff --git a/swarm/services/swap/swap/swap_test.go b/swarm/services/swap/swap/swap_test.go index 1dc4f4e5a..c209fae78 100644 --- a/swarm/services/swap/swap/swap_test.go +++ b/swarm/services/swap/swap/swap_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/common" + "github.com/tangerine-network/go-tangerine/common" ) type testInPayment struct { diff --git a/swarm/shed/db.go b/swarm/shed/db.go index c420e99ef..5fd55f460 100644 --- a/swarm/shed/db.go +++ b/swarm/shed/db.go @@ -29,11 +29,11 @@ import ( "strings" "time" - "github.com/dexon-foundation/dexon/metrics" - "github.com/dexon-foundation/dexon/swarm/log" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/iterator" "github.com/syndtr/goleveldb/leveldb/opt" + "github.com/tangerine-network/go-tangerine/metrics" + "github.com/tangerine-network/go-tangerine/swarm/log" ) const ( diff --git a/swarm/shed/example_store_test.go b/swarm/shed/example_store_test.go index ca3af80d0..e24b3245a 100644 --- a/swarm/shed/example_store_test.go +++ b/swarm/shed/example_store_test.go @@ -26,9 +26,9 @@ import ( "os" "time" - "github.com/dexon-foundation/dexon/swarm/shed" - "github.com/dexon-foundation/dexon/swarm/storage" "github.com/syndtr/goleveldb/leveldb" + "github.com/tangerine-network/go-tangerine/swarm/shed" + "github.com/tangerine-network/go-tangerine/swarm/storage" ) // Store holds fields and indexes (including their encoding functions) diff --git a/swarm/shed/field_struct.go b/swarm/shed/field_struct.go index e327ec53b..dd4ab593b 100644 --- a/swarm/shed/field_struct.go +++ b/swarm/shed/field_struct.go @@ -17,8 +17,8 @@ package shed import ( - "github.com/dexon-foundation/dexon/rlp" "github.com/syndtr/goleveldb/leveldb" + "github.com/tangerine-network/go-tangerine/rlp" ) // StructField is a helper to store complex structure by diff --git a/swarm/storage/chunker.go b/swarm/storage/chunker.go index 7baed1849..873b8b5aa 100644 --- a/swarm/storage/chunker.go +++ b/swarm/storage/chunker.go @@ -24,12 +24,12 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/metrics" - ch "github.com/dexon-foundation/dexon/swarm/chunk" - "github.com/dexon-foundation/dexon/swarm/log" - "github.com/dexon-foundation/dexon/swarm/spancontext" opentracing "github.com/opentracing/opentracing-go" olog "github.com/opentracing/opentracing-go/log" + "github.com/tangerine-network/go-tangerine/metrics" + ch "github.com/tangerine-network/go-tangerine/swarm/chunk" + "github.com/tangerine-network/go-tangerine/swarm/log" + "github.com/tangerine-network/go-tangerine/swarm/spancontext" ) /* diff --git a/swarm/storage/chunker_test.go b/swarm/storage/chunker_test.go index 90594d8c1..fc22db001 100644 --- a/swarm/storage/chunker_test.go +++ b/swarm/storage/chunker_test.go @@ -24,7 +24,7 @@ import ( "io" "testing" - "github.com/dexon-foundation/dexon/swarm/testutil" + "github.com/tangerine-network/go-tangerine/swarm/testutil" "golang.org/x/crypto/sha3" ) diff --git a/swarm/storage/common_test.go b/swarm/storage/common_test.go index a5da906cc..cb00810b4 100644 --- a/swarm/storage/common_test.go +++ b/swarm/storage/common_test.go @@ -28,9 +28,9 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/log" - ch "github.com/dexon-foundation/dexon/swarm/chunk" "github.com/mattn/go-colorable" + "github.com/tangerine-network/go-tangerine/log" + ch "github.com/tangerine-network/go-tangerine/swarm/chunk" ) var ( diff --git a/swarm/storage/database.go b/swarm/storage/database.go index 81aa37381..ec918c63f 100644 --- a/swarm/storage/database.go +++ b/swarm/storage/database.go @@ -20,10 +20,10 @@ package storage // no need for queueing/caching import ( - "github.com/dexon-foundation/dexon/metrics" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/iterator" "github.com/syndtr/goleveldb/leveldb/opt" + "github.com/tangerine-network/go-tangerine/metrics" ) const openFileLimit = 128 diff --git a/swarm/storage/encryption/encryption_test.go b/swarm/storage/encryption/encryption_test.go index 42ecac870..69bea2d2a 100644 --- a/swarm/storage/encryption/encryption_test.go +++ b/swarm/storage/encryption/encryption_test.go @@ -20,9 +20,9 @@ import ( "bytes" "testing" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/swarm/testutil" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/swarm/testutil" "golang.org/x/crypto/sha3" ) diff --git a/swarm/storage/feed/binaryserializer.go b/swarm/storage/feed/binaryserializer.go index d6a065553..6d5d274ab 100644 --- a/swarm/storage/feed/binaryserializer.go +++ b/swarm/storage/feed/binaryserializer.go @@ -16,7 +16,7 @@ package feed -import "github.com/dexon-foundation/dexon/common/hexutil" +import "github.com/tangerine-network/go-tangerine/common/hexutil" type binarySerializer interface { binaryPut(serializedData []byte) error diff --git a/swarm/storage/feed/binaryserializer_test.go b/swarm/storage/feed/binaryserializer_test.go index a9bdd7b32..da3961a5a 100644 --- a/swarm/storage/feed/binaryserializer_test.go +++ b/swarm/storage/feed/binaryserializer_test.go @@ -21,7 +21,7 @@ import ( "reflect" "testing" - "github.com/dexon-foundation/dexon/common/hexutil" + "github.com/tangerine-network/go-tangerine/common/hexutil" ) // KV mocks a key value store diff --git a/swarm/storage/feed/cacheentry.go b/swarm/storage/feed/cacheentry.go index 5d7ea11d6..46b03bf6c 100644 --- a/swarm/storage/feed/cacheentry.go +++ b/swarm/storage/feed/cacheentry.go @@ -21,7 +21,7 @@ import ( "context" "time" - "github.com/dexon-foundation/dexon/swarm/storage" + "github.com/tangerine-network/go-tangerine/swarm/storage" ) const ( diff --git a/swarm/storage/feed/feed.go b/swarm/storage/feed/feed.go index 93a9958a6..619413a74 100644 --- a/swarm/storage/feed/feed.go +++ b/swarm/storage/feed/feed.go @@ -20,9 +20,9 @@ import ( "hash" "unsafe" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/swarm/storage" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/swarm/storage" ) // Feed represents a particular user's stream of updates on a topic diff --git a/swarm/storage/feed/handler.go b/swarm/storage/feed/handler.go index edfcae91d..aba7b52c6 100644 --- a/swarm/storage/feed/handler.go +++ b/swarm/storage/feed/handler.go @@ -24,10 +24,10 @@ import ( "fmt" "sync" - "github.com/dexon-foundation/dexon/swarm/storage/feed/lookup" + "github.com/tangerine-network/go-tangerine/swarm/storage/feed/lookup" - "github.com/dexon-foundation/dexon/swarm/log" - "github.com/dexon-foundation/dexon/swarm/storage" + "github.com/tangerine-network/go-tangerine/swarm/log" + "github.com/tangerine-network/go-tangerine/swarm/storage" ) type Handler struct { diff --git a/swarm/storage/feed/handler_test.go b/swarm/storage/feed/handler_test.go index eb95c82be..b7f0bc8da 100644 --- a/swarm/storage/feed/handler_test.go +++ b/swarm/storage/feed/handler_test.go @@ -26,11 +26,11 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/swarm/chunk" - "github.com/dexon-foundation/dexon/swarm/storage" - "github.com/dexon-foundation/dexon/swarm/storage/feed/lookup" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/swarm/chunk" + "github.com/tangerine-network/go-tangerine/swarm/storage" + "github.com/tangerine-network/go-tangerine/swarm/storage/feed/lookup" ) var ( diff --git a/swarm/storage/feed/id.go b/swarm/storage/feed/id.go index 52bfe45a3..2bd885b64 100644 --- a/swarm/storage/feed/id.go +++ b/swarm/storage/feed/id.go @@ -21,10 +21,10 @@ import ( "hash" "strconv" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/swarm/storage/feed/lookup" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/swarm/storage/feed/lookup" - "github.com/dexon-foundation/dexon/swarm/storage" + "github.com/tangerine-network/go-tangerine/swarm/storage" ) // ID uniquely identifies an update on the network. diff --git a/swarm/storage/feed/id_test.go b/swarm/storage/feed/id_test.go index ee0b4d0a8..85686107d 100644 --- a/swarm/storage/feed/id_test.go +++ b/swarm/storage/feed/id_test.go @@ -3,7 +3,7 @@ package feed import ( "testing" - "github.com/dexon-foundation/dexon/swarm/storage/feed/lookup" + "github.com/tangerine-network/go-tangerine/swarm/storage/feed/lookup" ) func getTestID() *ID { diff --git a/swarm/storage/feed/lookup/epoch_test.go b/swarm/storage/feed/lookup/epoch_test.go index d9e3e7adb..4bfd7262e 100644 --- a/swarm/storage/feed/lookup/epoch_test.go +++ b/swarm/storage/feed/lookup/epoch_test.go @@ -3,7 +3,7 @@ package lookup_test import ( "testing" - "github.com/dexon-foundation/dexon/swarm/storage/feed/lookup" + "github.com/tangerine-network/go-tangerine/swarm/storage/feed/lookup" ) func TestMarshallers(t *testing.T) { diff --git a/swarm/storage/feed/lookup/lookup_test.go b/swarm/storage/feed/lookup/lookup_test.go index fc2096a4a..49075a5c5 100644 --- a/swarm/storage/feed/lookup/lookup_test.go +++ b/swarm/storage/feed/lookup/lookup_test.go @@ -21,8 +21,8 @@ import ( "math/rand" "testing" - "github.com/dexon-foundation/dexon/swarm/log" - "github.com/dexon-foundation/dexon/swarm/storage/feed/lookup" + "github.com/tangerine-network/go-tangerine/swarm/log" + "github.com/tangerine-network/go-tangerine/swarm/storage/feed/lookup" ) type Data struct { diff --git a/swarm/storage/feed/query.go b/swarm/storage/feed/query.go index 785c2b561..abeafd6e3 100644 --- a/swarm/storage/feed/query.go +++ b/swarm/storage/feed/query.go @@ -20,8 +20,8 @@ import ( "fmt" "strconv" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/swarm/storage/feed/lookup" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/swarm/storage/feed/lookup" ) // Query is used to specify constraints when performing an update lookup diff --git a/swarm/storage/feed/request.go b/swarm/storage/feed/request.go index 9fe3beed0..630718cb3 100644 --- a/swarm/storage/feed/request.go +++ b/swarm/storage/feed/request.go @@ -21,10 +21,10 @@ import ( "encoding/json" "hash" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/swarm/storage" - "github.com/dexon-foundation/dexon/swarm/storage/feed/lookup" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/swarm/storage" + "github.com/tangerine-network/go-tangerine/swarm/storage/feed/lookup" ) // Request represents a request to sign or signed feed update message diff --git a/swarm/storage/feed/request_test.go b/swarm/storage/feed/request_test.go index 33626f7ca..70dcd19ef 100644 --- a/swarm/storage/feed/request_test.go +++ b/swarm/storage/feed/request_test.go @@ -24,9 +24,9 @@ import ( "reflect" "testing" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/swarm/storage" - "github.com/dexon-foundation/dexon/swarm/storage/feed/lookup" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/swarm/storage" + "github.com/tangerine-network/go-tangerine/swarm/storage/feed/lookup" ) func areEqualJSON(s1, s2 string) (bool, error) { diff --git a/swarm/storage/feed/sign.go b/swarm/storage/feed/sign.go index ded0d90b7..c19a63709 100644 --- a/swarm/storage/feed/sign.go +++ b/swarm/storage/feed/sign.go @@ -19,8 +19,8 @@ package feed import ( "crypto/ecdsa" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/crypto" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/crypto" ) const signatureLength = 65 diff --git a/swarm/storage/feed/testutil.go b/swarm/storage/feed/testutil.go index eb709f8ac..f27ebdcb7 100644 --- a/swarm/storage/feed/testutil.go +++ b/swarm/storage/feed/testutil.go @@ -22,8 +22,8 @@ import ( "path/filepath" "sync" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/swarm/storage" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/swarm/storage" ) const ( diff --git a/swarm/storage/feed/topic.go b/swarm/storage/feed/topic.go index 005f54201..35b218de7 100644 --- a/swarm/storage/feed/topic.go +++ b/swarm/storage/feed/topic.go @@ -21,9 +21,9 @@ import ( "encoding/json" "fmt" - "github.com/dexon-foundation/dexon/common/bitutil" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/swarm/storage" + "github.com/tangerine-network/go-tangerine/common/bitutil" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/swarm/storage" ) // TopicLength establishes the max length of a topic string diff --git a/swarm/storage/feed/topic_test.go b/swarm/storage/feed/topic_test.go index 75724b40e..ef023bdad 100644 --- a/swarm/storage/feed/topic_test.go +++ b/swarm/storage/feed/topic_test.go @@ -3,7 +3,7 @@ package feed import ( "testing" - "github.com/dexon-foundation/dexon/common/hexutil" + "github.com/tangerine-network/go-tangerine/common/hexutil" ) func TestTopic(t *testing.T) { diff --git a/swarm/storage/feed/update.go b/swarm/storage/feed/update.go index 5005b4439..e04eba84c 100644 --- a/swarm/storage/feed/update.go +++ b/swarm/storage/feed/update.go @@ -20,7 +20,7 @@ import ( "fmt" "strconv" - "github.com/dexon-foundation/dexon/swarm/chunk" + "github.com/tangerine-network/go-tangerine/swarm/chunk" ) // ProtocolVersion defines the current version of the protocol that will be included in each update message diff --git a/swarm/storage/filestore_test.go b/swarm/storage/filestore_test.go index f0fe5a8a5..4d5cecf87 100644 --- a/swarm/storage/filestore_test.go +++ b/swarm/storage/filestore_test.go @@ -24,7 +24,7 @@ import ( "os" "testing" - "github.com/dexon-foundation/dexon/swarm/testutil" + "github.com/tangerine-network/go-tangerine/swarm/testutil" ) const testDataSize = 0x0001000 diff --git a/swarm/storage/hasherstore.go b/swarm/storage/hasherstore.go index 341756e34..6c7ef1132 100644 --- a/swarm/storage/hasherstore.go +++ b/swarm/storage/hasherstore.go @@ -21,8 +21,8 @@ import ( "fmt" "sync/atomic" - ch "github.com/dexon-foundation/dexon/swarm/chunk" - "github.com/dexon-foundation/dexon/swarm/storage/encryption" + ch "github.com/tangerine-network/go-tangerine/swarm/chunk" + "github.com/tangerine-network/go-tangerine/swarm/storage/encryption" "golang.org/x/crypto/sha3" ) diff --git a/swarm/storage/hasherstore_test.go b/swarm/storage/hasherstore_test.go index 2948024b7..0b9d77653 100644 --- a/swarm/storage/hasherstore_test.go +++ b/swarm/storage/hasherstore_test.go @@ -21,9 +21,9 @@ import ( "context" "testing" - "github.com/dexon-foundation/dexon/swarm/storage/encryption" + "github.com/tangerine-network/go-tangerine/swarm/storage/encryption" - "github.com/dexon-foundation/dexon/common" + "github.com/tangerine-network/go-tangerine/common" ) func TestHasherStore(t *testing.T) { diff --git a/swarm/storage/ldbstore.go b/swarm/storage/ldbstore.go index af39c92fa..130e546db 100644 --- a/swarm/storage/ldbstore.go +++ b/swarm/storage/ldbstore.go @@ -34,11 +34,11 @@ import ( "io/ioutil" "sync" - "github.com/dexon-foundation/dexon/metrics" - "github.com/dexon-foundation/dexon/rlp" - "github.com/dexon-foundation/dexon/swarm/log" - "github.com/dexon-foundation/dexon/swarm/storage/mock" "github.com/syndtr/goleveldb/leveldb" + "github.com/tangerine-network/go-tangerine/metrics" + "github.com/tangerine-network/go-tangerine/rlp" + "github.com/tangerine-network/go-tangerine/swarm/log" + "github.com/tangerine-network/go-tangerine/swarm/storage/mock" ) const ( diff --git a/swarm/storage/ldbstore_test.go b/swarm/storage/ldbstore_test.go index 7d4748a28..aedf5bdd9 100644 --- a/swarm/storage/ldbstore_test.go +++ b/swarm/storage/ldbstore_test.go @@ -28,11 +28,11 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/common" - ch "github.com/dexon-foundation/dexon/swarm/chunk" - "github.com/dexon-foundation/dexon/swarm/log" - "github.com/dexon-foundation/dexon/swarm/storage/mock/mem" ldberrors "github.com/syndtr/goleveldb/leveldb/errors" + "github.com/tangerine-network/go-tangerine/common" + ch "github.com/tangerine-network/go-tangerine/swarm/chunk" + "github.com/tangerine-network/go-tangerine/swarm/log" + "github.com/tangerine-network/go-tangerine/swarm/storage/mock/mem" ) type testDbStore struct { diff --git a/swarm/storage/localstore.go b/swarm/storage/localstore.go index 6020665d6..729654f6e 100644 --- a/swarm/storage/localstore.go +++ b/swarm/storage/localstore.go @@ -21,9 +21,9 @@ import ( "path/filepath" "sync" - "github.com/dexon-foundation/dexon/metrics" - "github.com/dexon-foundation/dexon/swarm/log" - "github.com/dexon-foundation/dexon/swarm/storage/mock" + "github.com/tangerine-network/go-tangerine/metrics" + "github.com/tangerine-network/go-tangerine/swarm/log" + "github.com/tangerine-network/go-tangerine/swarm/storage/mock" ) type LocalStoreParams struct { diff --git a/swarm/storage/localstore/gc.go b/swarm/storage/localstore/gc.go index e53bdabd1..57a7c7cba 100644 --- a/swarm/storage/localstore/gc.go +++ b/swarm/storage/localstore/gc.go @@ -92,9 +92,9 @@ package localstore import ( "time" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/swarm/shed" "github.com/syndtr/goleveldb/leveldb" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/swarm/shed" ) var ( diff --git a/swarm/storage/localstore/gc_test.go b/swarm/storage/localstore/gc_test.go index fa9f39ece..a12b48c69 100644 --- a/swarm/storage/localstore/gc_test.go +++ b/swarm/storage/localstore/gc_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/swarm/storage" + "github.com/tangerine-network/go-tangerine/swarm/storage" ) // TestDB_collectGarbageWorker tests garbage collection runs diff --git a/swarm/storage/localstore/index_test.go b/swarm/storage/localstore/index_test.go index 326b8d9f2..3a9a72f36 100644 --- a/swarm/storage/localstore/index_test.go +++ b/swarm/storage/localstore/index_test.go @@ -21,7 +21,7 @@ import ( "math/rand" "testing" - "github.com/dexon-foundation/dexon/swarm/storage" + "github.com/tangerine-network/go-tangerine/swarm/storage" ) // TestDB_pullIndex validates the ordering of keys in pull index. diff --git a/swarm/storage/localstore/localstore.go b/swarm/storage/localstore/localstore.go index c828deb12..e849316e0 100644 --- a/swarm/storage/localstore/localstore.go +++ b/swarm/storage/localstore/localstore.go @@ -23,10 +23,10 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/swarm/shed" - "github.com/dexon-foundation/dexon/swarm/storage" - "github.com/dexon-foundation/dexon/swarm/storage/mock" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/swarm/shed" + "github.com/tangerine-network/go-tangerine/swarm/storage" + "github.com/tangerine-network/go-tangerine/swarm/storage/mock" ) var ( diff --git a/swarm/storage/localstore/localstore_test.go b/swarm/storage/localstore/localstore_test.go index 77340875b..33899bc28 100644 --- a/swarm/storage/localstore/localstore_test.go +++ b/swarm/storage/localstore/localstore_test.go @@ -28,10 +28,10 @@ import ( "testing" "time" - ch "github.com/dexon-foundation/dexon/swarm/chunk" - "github.com/dexon-foundation/dexon/swarm/shed" - "github.com/dexon-foundation/dexon/swarm/storage" "github.com/syndtr/goleveldb/leveldb" + ch "github.com/tangerine-network/go-tangerine/swarm/chunk" + "github.com/tangerine-network/go-tangerine/swarm/shed" + "github.com/tangerine-network/go-tangerine/swarm/storage" ) // TestDB validates if the chunk can be uploaded and @@ -130,10 +130,10 @@ func TestDB_updateGCSem(t *testing.T) { // Measurements on MacBook Pro (Retina, 15-inch, Mid 2014) show // that New function executes around 1s for database with 1M chunks. // -// # go test -benchmem -run=none github.com/dexon-foundation/dexon/swarm/storage/localstore -bench BenchmarkNew -v -timeout 20m +// # go test -benchmem -run=none github.com/tangerine-network/go-tangerine/swarm/storage/localstore -bench BenchmarkNew -v -timeout 20m // goos: darwin // goarch: amd64 -// pkg: github.com/dexon-foundation/dexon/swarm/storage/localstore +// pkg: github.com/tangerine-network/go-tangerine/swarm/storage/localstore // BenchmarkNew/1000-8 200 11672414 ns/op 9570960 B/op 10008 allocs/op // BenchmarkNew/10000-8 100 14890609 ns/op 10490118 B/op 7759 allocs/op // BenchmarkNew/100000-8 20 58334080 ns/op 17763157 B/op 22978 allocs/op diff --git a/swarm/storage/localstore/mode_get.go b/swarm/storage/localstore/mode_get.go index 16080f4f9..34204e727 100644 --- a/swarm/storage/localstore/mode_get.go +++ b/swarm/storage/localstore/mode_get.go @@ -17,10 +17,10 @@ package localstore import ( - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/swarm/shed" - "github.com/dexon-foundation/dexon/swarm/storage" "github.com/syndtr/goleveldb/leveldb" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/swarm/shed" + "github.com/tangerine-network/go-tangerine/swarm/storage" ) // ModeGet enumerates different Getter modes. diff --git a/swarm/storage/localstore/mode_put.go b/swarm/storage/localstore/mode_put.go index 0052d6c96..7ebcf3d07 100644 --- a/swarm/storage/localstore/mode_put.go +++ b/swarm/storage/localstore/mode_put.go @@ -17,9 +17,9 @@ package localstore import ( - "github.com/dexon-foundation/dexon/swarm/shed" - "github.com/dexon-foundation/dexon/swarm/storage" "github.com/syndtr/goleveldb/leveldb" + "github.com/tangerine-network/go-tangerine/swarm/shed" + "github.com/tangerine-network/go-tangerine/swarm/storage" ) // ModePut enumerates different Putter modes. diff --git a/swarm/storage/localstore/mode_put_test.go b/swarm/storage/localstore/mode_put_test.go index ca034c03e..f90a66e50 100644 --- a/swarm/storage/localstore/mode_put_test.go +++ b/swarm/storage/localstore/mode_put_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/swarm/storage" + "github.com/tangerine-network/go-tangerine/swarm/storage" ) // TestModePutRequest validates ModePutRequest index values on the provided DB. @@ -208,11 +208,11 @@ func TestModePutUpload_parallel(t *testing.T) { // // Measurements on MacBook Pro (Retina, 15-inch, Mid 2014) // -// # go test -benchmem -run=none github.com/dexon-foundation/dexon/swarm/storage/localstore -bench BenchmarkPutUpload -v +// # go test -benchmem -run=none github.com/tangerine-network/go-tangerine/swarm/storage/localstore -bench BenchmarkPutUpload -v // // goos: darwin // goarch: amd64 -// pkg: github.com/dexon-foundation/dexon/swarm/storage/localstore +// pkg: github.com/tangerine-network/go-tangerine/swarm/storage/localstore // BenchmarkPutUpload/count_100_parallel_1-8 300 5107704 ns/op 2081461 B/op 2374 allocs/op // BenchmarkPutUpload/count_100_parallel_2-8 300 5411742 ns/op 2081608 B/op 2364 allocs/op // BenchmarkPutUpload/count_100_parallel_4-8 500 3704964 ns/op 2081696 B/op 2324 allocs/op diff --git a/swarm/storage/localstore/mode_set.go b/swarm/storage/localstore/mode_set.go index 8043af88d..4ce38bfab 100644 --- a/swarm/storage/localstore/mode_set.go +++ b/swarm/storage/localstore/mode_set.go @@ -17,8 +17,8 @@ package localstore import ( - "github.com/dexon-foundation/dexon/swarm/storage" "github.com/syndtr/goleveldb/leveldb" + "github.com/tangerine-network/go-tangerine/swarm/storage" ) // ModeSet enumerates different Setter modes. diff --git a/swarm/storage/localstore/retrieval_index_test.go b/swarm/storage/localstore/retrieval_index_test.go index bccdc6ed9..e4681eb05 100644 --- a/swarm/storage/localstore/retrieval_index_test.go +++ b/swarm/storage/localstore/retrieval_index_test.go @@ -20,7 +20,7 @@ import ( "strconv" "testing" - "github.com/dexon-foundation/dexon/swarm/storage" + "github.com/tangerine-network/go-tangerine/swarm/storage" ) // BenchmarkRetrievalIndexes uploads a number of chunks in order to measure @@ -32,10 +32,10 @@ import ( // Measurements on MacBook Pro (Retina, 15-inch, Mid 2014) show // that two separated indexes perform better. // -// # go test -benchmem -run=none github.com/dexon-foundation/dexon/swarm/storage/localstore -bench BenchmarkRetrievalIndexes -v +// # go test -benchmem -run=none github.com/tangerine-network/go-tangerine/swarm/storage/localstore -bench BenchmarkRetrievalIndexes -v // goos: darwin // goarch: amd64 -// pkg: github.com/dexon-foundation/dexon/swarm/storage/localstore +// pkg: github.com/tangerine-network/go-tangerine/swarm/storage/localstore // BenchmarkRetrievalIndexes/1000-8 20 75556686 ns/op 19033493 B/op 84500 allocs/op // BenchmarkRetrievalIndexes/10000-8 1 1079084922 ns/op 382792064 B/op 1429644 allocs/op // BenchmarkRetrievalIndexes/100000-8 1 16891305737 ns/op 2629165304 B/op 12465019 allocs/op @@ -104,10 +104,10 @@ func benchmarkRetrievalIndexes(b *testing.B, o *Options, count int) { // // Measurements on MacBook Pro (Retina, 15-inch, Mid 2014). // -// go test -benchmem -run=none github.com/dexon-foundation/dexon/swarm/storage/localstore -bench BenchmarkUpload -v +// go test -benchmem -run=none github.com/tangerine-network/go-tangerine/swarm/storage/localstore -bench BenchmarkUpload -v // goos: darwin // goarch: amd64 -// pkg: github.com/dexon-foundation/dexon/swarm/storage/localstore +// pkg: github.com/tangerine-network/go-tangerine/swarm/storage/localstore // BenchmarkUpload/1000-8 20 59437463 ns/op 25205193 B/op 23208 allocs/op // BenchmarkUpload/10000-8 2 580646362 ns/op 216532932 B/op 248090 allocs/op // BenchmarkUpload/100000-8 1 22373390892 ns/op 2323055312 B/op 3995903 allocs/op diff --git a/swarm/storage/localstore/subscription_pull.go b/swarm/storage/localstore/subscription_pull.go index 7c686d31d..00c90552b 100644 --- a/swarm/storage/localstore/subscription_pull.go +++ b/swarm/storage/localstore/subscription_pull.go @@ -23,9 +23,9 @@ import ( "fmt" "sync" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/swarm/shed" - "github.com/dexon-foundation/dexon/swarm/storage" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/swarm/shed" + "github.com/tangerine-network/go-tangerine/swarm/storage" ) // SubscribePull returns a channel that provides chunk addresses and stored times from pull syncing index. diff --git a/swarm/storage/localstore/subscription_pull_test.go b/swarm/storage/localstore/subscription_pull_test.go index 918ec4513..a1137338d 100644 --- a/swarm/storage/localstore/subscription_pull_test.go +++ b/swarm/storage/localstore/subscription_pull_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/swarm/storage" + "github.com/tangerine-network/go-tangerine/swarm/storage" ) // TestDB_SubscribePull uploads some chunks before and after diff --git a/swarm/storage/localstore/subscription_push.go b/swarm/storage/localstore/subscription_push.go index 4b554c38c..edf623fe5 100644 --- a/swarm/storage/localstore/subscription_push.go +++ b/swarm/storage/localstore/subscription_push.go @@ -20,9 +20,9 @@ import ( "context" "sync" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/swarm/shed" - "github.com/dexon-foundation/dexon/swarm/storage" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/swarm/shed" + "github.com/tangerine-network/go-tangerine/swarm/storage" ) // SubscribePush returns a channel that provides storage chunks with ordering from push syncing index. diff --git a/swarm/storage/localstore/subscription_push_test.go b/swarm/storage/localstore/subscription_push_test.go index 52f57f52e..02f3a769c 100644 --- a/swarm/storage/localstore/subscription_push_test.go +++ b/swarm/storage/localstore/subscription_push_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/swarm/storage" + "github.com/tangerine-network/go-tangerine/swarm/storage" ) // TestDB_SubscribePush uploads some chunks before and after diff --git a/swarm/storage/localstore_test.go b/swarm/storage/localstore_test.go index 140ea9bf6..7c5acdf9d 100644 --- a/swarm/storage/localstore_test.go +++ b/swarm/storage/localstore_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - ch "github.com/dexon-foundation/dexon/swarm/chunk" + ch "github.com/tangerine-network/go-tangerine/swarm/chunk" ) var ( diff --git a/swarm/storage/memstore_test.go b/swarm/storage/memstore_test.go index 60557c000..061f5bfa7 100644 --- a/swarm/storage/memstore_test.go +++ b/swarm/storage/memstore_test.go @@ -20,7 +20,7 @@ import ( "context" "testing" - "github.com/dexon-foundation/dexon/swarm/log" + "github.com/tangerine-network/go-tangerine/swarm/log" ) func newTestMemStore() *MemStore { diff --git a/swarm/storage/mock/db/db.go b/swarm/storage/mock/db/db.go index 05415fd92..eacf47685 100644 --- a/swarm/storage/mock/db/db.go +++ b/swarm/storage/mock/db/db.go @@ -27,8 +27,8 @@ import ( "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/util" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/swarm/storage/mock" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/swarm/storage/mock" ) // GlobalStore contains the LevelDB database that is storing diff --git a/swarm/storage/mock/db/db_test.go b/swarm/storage/mock/db/db_test.go index 30caf11a7..252fdbb8e 100644 --- a/swarm/storage/mock/db/db_test.go +++ b/swarm/storage/mock/db/db_test.go @@ -23,7 +23,7 @@ import ( "os" "testing" - "github.com/dexon-foundation/dexon/swarm/storage/mock/test" + "github.com/tangerine-network/go-tangerine/swarm/storage/mock/test" ) // TestDBStore is running a test.MockStore tests diff --git a/swarm/storage/mock/mem/mem.go b/swarm/storage/mock/mem/mem.go index b79d3550f..24bc9bfca 100644 --- a/swarm/storage/mock/mem/mem.go +++ b/swarm/storage/mock/mem/mem.go @@ -27,8 +27,8 @@ import ( "io/ioutil" "sync" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/swarm/storage/mock" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/swarm/storage/mock" ) // GlobalStore stores all chunk data and also keys and node addresses relations. diff --git a/swarm/storage/mock/mem/mem_test.go b/swarm/storage/mock/mem/mem_test.go index c758bef42..22d0cd74b 100644 --- a/swarm/storage/mock/mem/mem_test.go +++ b/swarm/storage/mock/mem/mem_test.go @@ -19,7 +19,7 @@ package mem import ( "testing" - "github.com/dexon-foundation/dexon/swarm/storage/mock/test" + "github.com/tangerine-network/go-tangerine/swarm/storage/mock/test" ) // TestGlobalStore is running test for a GlobalStore diff --git a/swarm/storage/mock/mock.go b/swarm/storage/mock/mock.go index 59c86f584..63ee439cc 100644 --- a/swarm/storage/mock/mock.go +++ b/swarm/storage/mock/mock.go @@ -36,7 +36,7 @@ import ( "errors" "io" - "github.com/dexon-foundation/dexon/common" + "github.com/tangerine-network/go-tangerine/common" ) // ErrNotFound indicates that the chunk is not found. diff --git a/swarm/storage/mock/rpc/rpc.go b/swarm/storage/mock/rpc/rpc.go index ef8320b9a..2e1bb668d 100644 --- a/swarm/storage/mock/rpc/rpc.go +++ b/swarm/storage/mock/rpc/rpc.go @@ -26,10 +26,10 @@ package rpc import ( "fmt" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/rpc" - "github.com/dexon-foundation/dexon/swarm/log" - "github.com/dexon-foundation/dexon/swarm/storage/mock" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/rpc" + "github.com/tangerine-network/go-tangerine/swarm/log" + "github.com/tangerine-network/go-tangerine/swarm/storage/mock" ) // GlobalStore is rpc.Client that connects to a centralized mock store. diff --git a/swarm/storage/mock/rpc/rpc_test.go b/swarm/storage/mock/rpc/rpc_test.go index 0f5430ac8..1cc36ab9f 100644 --- a/swarm/storage/mock/rpc/rpc_test.go +++ b/swarm/storage/mock/rpc/rpc_test.go @@ -19,9 +19,9 @@ package rpc import ( "testing" - "github.com/dexon-foundation/dexon/rpc" - "github.com/dexon-foundation/dexon/swarm/storage/mock/mem" - "github.com/dexon-foundation/dexon/swarm/storage/mock/test" + "github.com/tangerine-network/go-tangerine/rpc" + "github.com/tangerine-network/go-tangerine/swarm/storage/mock/mem" + "github.com/tangerine-network/go-tangerine/swarm/storage/mock/test" ) // TestDBStore is running test for a GlobalStore diff --git a/swarm/storage/mock/test/test.go b/swarm/storage/mock/test/test.go index 764ed1528..a09aa68b6 100644 --- a/swarm/storage/mock/test/test.go +++ b/swarm/storage/mock/test/test.go @@ -25,9 +25,9 @@ import ( "strconv" "testing" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/swarm/storage" - "github.com/dexon-foundation/dexon/swarm/storage/mock" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/swarm/storage" + "github.com/tangerine-network/go-tangerine/swarm/storage/mock" ) // MockStore creates NodeStore instances from provided GlobalStorer, diff --git a/swarm/storage/netstore.go b/swarm/storage/netstore.go index e2734600b..a44f96235 100644 --- a/swarm/storage/netstore.go +++ b/swarm/storage/netstore.go @@ -24,9 +24,9 @@ import ( "sync/atomic" "time" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/swarm/log" lru "github.com/hashicorp/golang-lru" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/swarm/log" ) type ( diff --git a/swarm/storage/netstore_test.go b/swarm/storage/netstore_test.go index ef9715626..ed45617b7 100644 --- a/swarm/storage/netstore_test.go +++ b/swarm/storage/netstore_test.go @@ -27,9 +27,9 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/p2p/enode" - ch "github.com/dexon-foundation/dexon/swarm/chunk" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/p2p/enode" + ch "github.com/tangerine-network/go-tangerine/swarm/chunk" ) var sourcePeerID = enode.HexID("99d8594b52298567d2ca3f4c441a5ba0140ee9245e26460d01102a52773c73b9") diff --git a/swarm/storage/pyramid.go b/swarm/storage/pyramid.go index 0789e75ae..e958dcdfe 100644 --- a/swarm/storage/pyramid.go +++ b/swarm/storage/pyramid.go @@ -25,8 +25,8 @@ import ( "sync" "time" - ch "github.com/dexon-foundation/dexon/swarm/chunk" - "github.com/dexon-foundation/dexon/swarm/log" + ch "github.com/tangerine-network/go-tangerine/swarm/chunk" + "github.com/tangerine-network/go-tangerine/swarm/log" ) /* diff --git a/swarm/storage/types.go b/swarm/storage/types.go index fa0e4e115..d9b07e73f 100644 --- a/swarm/storage/types.go +++ b/swarm/storage/types.go @@ -25,9 +25,9 @@ import ( "fmt" "io" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/swarm/bmt" - ch "github.com/dexon-foundation/dexon/swarm/chunk" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/swarm/bmt" + ch "github.com/tangerine-network/go-tangerine/swarm/chunk" "golang.org/x/crypto/sha3" ) diff --git a/swarm/swap/swap.go b/swarm/swap/swap.go index 60ffdbb87..db3ea79f6 100644 --- a/swarm/swap/swap.go +++ b/swarm/swap/swap.go @@ -22,10 +22,10 @@ import ( "strconv" "sync" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/protocols" - "github.com/dexon-foundation/dexon/swarm/log" - "github.com/dexon-foundation/dexon/swarm/state" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/protocols" + "github.com/tangerine-network/go-tangerine/swarm/log" + "github.com/tangerine-network/go-tangerine/swarm/state" ) // SwAP Swarm Accounting Protocol diff --git a/swarm/swap/swap_test.go b/swarm/swap/swap_test.go index a27300e3c..9a2a0d408 100644 --- a/swarm/swap/swap_test.go +++ b/swarm/swap/swap_test.go @@ -25,12 +25,12 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/protocols" - "github.com/dexon-foundation/dexon/p2p/simulations/adapters" - "github.com/dexon-foundation/dexon/swarm/state" colorable "github.com/mattn/go-colorable" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/protocols" + "github.com/tangerine-network/go-tangerine/p2p/simulations/adapters" + "github.com/tangerine-network/go-tangerine/swarm/state" ) var ( diff --git a/swarm/swarm.go b/swarm/swarm.go index f67390d09..8ac757bcf 100644 --- a/swarm/swarm.go +++ b/swarm/swarm.go @@ -29,30 +29,30 @@ import ( "time" "unicode" - "github.com/dexon-foundation/dexon/accounts/abi/bind" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/contracts/chequebook" - "github.com/dexon-foundation/dexon/contracts/ens" - "github.com/dexon-foundation/dexon/ethclient" - "github.com/dexon-foundation/dexon/metrics" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/protocols" - "github.com/dexon-foundation/dexon/params" - "github.com/dexon-foundation/dexon/rpc" - "github.com/dexon-foundation/dexon/swarm/api" - httpapi "github.com/dexon-foundation/dexon/swarm/api/http" - "github.com/dexon-foundation/dexon/swarm/fuse" - "github.com/dexon-foundation/dexon/swarm/log" - "github.com/dexon-foundation/dexon/swarm/network" - "github.com/dexon-foundation/dexon/swarm/network/stream" - "github.com/dexon-foundation/dexon/swarm/pss" - "github.com/dexon-foundation/dexon/swarm/state" - "github.com/dexon-foundation/dexon/swarm/storage" - "github.com/dexon-foundation/dexon/swarm/storage/feed" - "github.com/dexon-foundation/dexon/swarm/storage/mock" - "github.com/dexon-foundation/dexon/swarm/swap" - "github.com/dexon-foundation/dexon/swarm/tracing" + "github.com/tangerine-network/go-tangerine/accounts/abi/bind" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/contracts/chequebook" + "github.com/tangerine-network/go-tangerine/contracts/ens" + "github.com/tangerine-network/go-tangerine/ethclient" + "github.com/tangerine-network/go-tangerine/metrics" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/protocols" + "github.com/tangerine-network/go-tangerine/params" + "github.com/tangerine-network/go-tangerine/rpc" + "github.com/tangerine-network/go-tangerine/swarm/api" + httpapi "github.com/tangerine-network/go-tangerine/swarm/api/http" + "github.com/tangerine-network/go-tangerine/swarm/fuse" + "github.com/tangerine-network/go-tangerine/swarm/log" + "github.com/tangerine-network/go-tangerine/swarm/network" + "github.com/tangerine-network/go-tangerine/swarm/network/stream" + "github.com/tangerine-network/go-tangerine/swarm/pss" + "github.com/tangerine-network/go-tangerine/swarm/state" + "github.com/tangerine-network/go-tangerine/swarm/storage" + "github.com/tangerine-network/go-tangerine/swarm/storage/feed" + "github.com/tangerine-network/go-tangerine/swarm/storage/mock" + "github.com/tangerine-network/go-tangerine/swarm/swap" + "github.com/tangerine-network/go-tangerine/swarm/tracing" ) var ( diff --git a/swarm/swarm_test.go b/swarm/swarm_test.go index 0fe586634..a005f456a 100644 --- a/swarm/swarm_test.go +++ b/swarm/swarm_test.go @@ -28,10 +28,10 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/rpc" - "github.com/dexon-foundation/dexon/swarm/api" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/rpc" + "github.com/tangerine-network/go-tangerine/swarm/api" ) // TestNewSwarm validates Swarm fields in repsect to the provided configuration. diff --git a/swarm/tracing/tracing.go b/swarm/tracing/tracing.go index 935029651..c98d5eba3 100644 --- a/swarm/tracing/tracing.go +++ b/swarm/tracing/tracing.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/log" jaeger "github.com/uber/jaeger-client-go" jaegercfg "github.com/uber/jaeger-client-go/config" cli "gopkg.in/urfave/cli.v1" diff --git a/test/genesis.json b/test/genesis.json index 05ffe2aab..922d79a7c 100644 --- a/test/genesis.json +++ b/test/genesis.json @@ -11,16 +11,17 @@ "eip158Block": 0, "byzantiumBlock": 0, "constantinopleBlock": 0, + "petersburgBlock": 0, "dexcon": { "genesisCRSText": "In DEXON, we trust.", - "owner": "0xbf8c48a620bacc46907f9b89732d25e47a2d7cf7", + "owner": "0x0D54AF942d6bF13870F5CA65D470954f21D3cBE5", "minStake": "0xd3c21bcecceda1000000", - "lockupPeriod": 259200000, + "lockupPeriod": 600000, "miningVelocity": 0.1875, "nextHalvingSupply": "0x813f3978f89409844000000", "lastHalvedAmount": "0x4d8c55aefb8c05b5c000000", - "minGasPrice": "0x3b9aca00", - "blockGasLimit": 40000000, + "minGasPrice": "0x59682f000", + "blockGasLimit": 210000000, "lambdaBA": 250, "lambdaDKG": 1000, "notaryParamAlpha": 70.5, @@ -30,79 +31,89 @@ "fineValues": [ "0xad78ebc5ac6200000", "0xde0b6b3a7640000", - "0xd3c21bcecceda0000000", - "0xd3c21bcecceda0000000", - "0xd3c21bcecceda0000000" + "0xd3c21bcecceda1000000", + "0xd3c21bcecceda1000000", + "0xd3c21bcecceda1000000" ] }, "recovery": { - "contract": "0xf675c0e9bf4b949f50dcec5b224a70f0361d4680", + "contract": "0x0546d67343df7c68ea3b387de4b35e676e734e4d", "timeout": 30, "confirmation": 1 } }, "nonce": "0x42", - "timestamp": "0x0", - "extraData": "0x3535353535353535353535353535353535353535353535353535353535353535", + "timestamp": "0x16a51cab400", + "extraData": "0xc0d1cc809ea40f65918b4c15a0f43611d3061d5ea61acd725da1c1c51b5097e1", "gasLimit": "0x2625a00", "difficulty": "0x1", "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000", "coinbase": "0x0000000000000000000000000000000000000000", "alloc": { - "0xBF8C48A620bacc46907f9B89732D25E47A2D7Cf7": { - "balance": "100000000000000000000000", - "staked": "0" - }, - "0x1245A8672FA881Cf858eF01D34c42B55D9b263fF": { - "balance": "100000000000000000000000", - "staked": "0" - }, - "0xe0F859340353854693F537ea337106a33E9FeAB0": { - "balance": "100000000000000000000000000", - "staked": "0" + "0d54af942d6bf13870f5ca65d470954f21d3cbe5": { + "balance": "0x52b7d2dcc80cd2e4000000", + "staked": "0x0", + "publicKey": "0x", + "info": { + "name": "", + "email": "", + "location": "", + "url": "" + } }, - "0x361e4958bd8b4d035C68C473193E77FdAb6aEa9D": { + "14a348cec13f7280d31a4f23e6b897f1e14d16c8": { "balance": "0x1a784379d99db42000000", "staked": "0xd3c21bcecceda1000000", - "publicKey": "0x040c2f07cf22966ebaa19dd87de11d04f9a606e83e75a5295574760a5a4dd82807e7d9f28f86cd389871dd931a477cac64e233a6f098d5b257871d8163dc1bddcf", + "publicKey": "0x043e9db0a4f53fc6045df46b9bcd20458ffc38910a2b0a3981c1c9ad217ea3db90b8b81f4f21aa6b8e1a9466e4175ddcd614ffebd06af7302ada0d9f43dfd46b60", "info": { - "name": "DEXON Test Node 0", - "email": "node1@dexon.org", + "name": "Tangerine Test Node 2", + "email": "tangerine2tangerine-network.io", "location": "Taipei, Taiwan", - "url": "https://dexon.org" + "url": "https://tangerine-network.io" } }, - "0xbC71C0F2aeCa46fa0001e765965029b16a06049E": { + "33dcbcd20e021a4dc9bc38704984ae2b0386cb78": { "balance": "0x1a784379d99db42000000", "staked": "0xd3c21bcecceda1000000", - "publicKey": "0x04a12a015f27d98e5305498d23aeacde281e48aad918ae87d7f61784ab43828953db99bf1f44426294cbc21e32cf3a99122f2ce8a35ba718a7c814eec7bae9a3ea", + "publicKey": "0x04c27620945e296715a21a2723c1843a28356c39d14503106199b0356cbdcca66c6785bb8a69e0850d43a00b3dd30e58ac44f9f9dae5075d023627d5a7286685da", "info": { - "name": "DEXON Test Node 1", - "email": "node2@dexon.org", + "name": "Tangerine Test Node 3", + "email": "tangerine3tangerine-network.io", "location": "Taipei, Taiwan", - "url": "https://dexon.org" + "url": "https://tangerine-network.io" } }, - "0xB6a2e270b54F19B4002d6535a71CFDd1CA1f5fC1": { + "8a5018982eb6a14af906c25e08997deee1f0af1c": { "balance": "0x1a784379d99db42000000", "staked": "0xd3c21bcecceda1000000", - "publicKey": "0x0463f78d398f6b042952062a26f3551a4e294a11084b1006c8d6376437b72488d8f3af6b849931c03624ad2d581900e9ad5f3cfeeed040c799e5308cd8012853fb", + "publicKey": "0x04f3a328c3d694cbe15ec62ad8c1eaf23105927a4f6adfaf6b14539063a1059d9b72b4e48482265ba481e576a45a0573dac8fa18dbc6bf0cd0464015d076ba83a8", "info": { - "name": "DEXON Test Node 2", - "email": "node3@dexon.org", + "name": "Tangerine Test Node 1", + "email": "tangerine1tangerine-network.io", "location": "Taipei, Taiwan", - "url": "https://dexon.org" + "url": "https://tangerine-network.io" + } + }, + "aa2fe8d6024682af0540f8ba776b549bb50251ab": { + "balance": "0x52b7d2dcc80cd2e4000000", + "staked": "0x0", + "publicKey": "0x", + "info": { + "name": "", + "email": "", + "location": "", + "url": "" } }, - "0xb6bBBE39033131e428d5a3545856a596cacB7810": { + "ea8093b8d2f0077556db45596bd0823b83ce88ec": { "balance": "0x1a784379d99db42000000", "staked": "0xd3c21bcecceda1000000", - "publicKey": "0x04a1118c8f1c2e293de528e5b45ac5e65167af4cb4d10887924a9f839287d060da26414e971cab75013e560dfec7897b1983eaa631ae2f16ea4062525310edd8ea", + "publicKey": "0x04a9f17f7029e22d4762470509c881f7eb6bf6624657dbc3e947c3d134fc5fcedab4de8f36fa995628f1cfe7eb6de14e5724bc22f09f15a367da56b9645a5e8dcb", "info": { - "name": "DEXON Test Node 3", - "email": "node4@dexon.org", + "name": "Tangerine Test Node 0", + "email": "tangerine0tangerine-network.io", "location": "Taipei, Taiwan", - "url": "https://dexon.org" + "url": "https://tangerine-network.io" } } }, diff --git a/test/keygen.go b/test/keygen.go index 26b8385ed..cb93651ed 100644 --- a/test/keygen.go +++ b/test/keygen.go @@ -8,9 +8,9 @@ import ( "os" "strconv" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/crypto" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/crypto" ) const genesisFile = "genesis.json" @@ -18,9 +18,8 @@ const genesisFile = "genesis.json" var preFundAmount *big.Int = new(big.Int).Mul(big.NewInt(1e18), big.NewInt(1e8)) var preFundAddresss = []string{ - "0x2a9D669e4791845EED01D4c0ffF3B927cC94A884", - "0x1245A8672FA881Cf858eF01D34c42B55D9b263fF", - "0xe0F859340353854693F537ea337106a33E9FeAB0", + "0x0D54AF942d6bF13870F5CA65D470954f21D3cBE5", // Owner + "0xAA2fe8D6024682aF0540F8BA776b549bB50251ab", // Monkey } func main() { @@ -54,10 +53,10 @@ func main() { Staked: new(big.Int).Mul(big.NewInt(1e18), big.NewInt(1e6)), PublicKey: crypto.FromECDSAPub(&privKey.PublicKey), NodeInfo: core.NodeInfo{ - Name: fmt.Sprintf("DEXON Test Node %d", i), - Email: fmt.Sprintf("dexon%d@dexon.org", i), + Name: fmt.Sprintf("Tangerine Test Node %d", i), + Email: fmt.Sprintf("tangerine%dtangerine-network.io", i), Location: "Taipei, Taiwan", - Url: "https://dexon.org", + Url: "https://tangerine-network.io", }, } fmt.Printf("Created account %s\n", address.String()) diff --git a/test/keystore/bootnode.key b/test/keystore/bootnode.key index fadd4b3a2..00f5e6f16 100644 --- a/test/keystore/bootnode.key +++ b/test/keystore/bootnode.key @@ -1 +1 @@ -8fde5e98ab761307a68a5ebd8dee1d9def2f2f4c664a676eaa6896fbf13a58ef
\ No newline at end of file +86cf9c048a611ea7e17f5107952a88a00aedcd310565f37bef9314acf66265f3
\ No newline at end of file diff --git a/test/keystore/monkey.key b/test/keystore/monkey.key index a9fe18413..5cf8b7399 100644 --- a/test/keystore/monkey.key +++ b/test/keystore/monkey.key @@ -1 +1 @@ -fa30b47a7a3d5ab6935d873ffaeb8ca5b9782d102c4094be6da6b7f2fc04b5bd
\ No newline at end of file +a00dd280fd51d288e51234fc852057fca7cd2bacf4e1d58771e03b454df70e5f
\ No newline at end of file diff --git a/test/keystore/test0.key b/test/keystore/test0.key index 5ecbc48a6..8491db511 100644 --- a/test/keystore/test0.key +++ b/test/keystore/test0.key @@ -1 +1 @@ -3cf5bdee098cc34536a7b0e80d85e07a380efca76fc12136299b9e5ba24193c8
\ No newline at end of file +d5491d16cd598b977667278bb5d29d39582c10c15c9e1a2637e41da549a81196
\ No newline at end of file diff --git a/test/keystore/test1.key b/test/keystore/test1.key index c16f73286..25d33fc50 100644 --- a/test/keystore/test1.key +++ b/test/keystore/test1.key @@ -1 +1 @@ -96c9f1435d53577db18d45411326311529a0e8affb19218e27f65769a482c0fb
\ No newline at end of file +7c8fec7b78a87fbfb2f5c990082a6f679e5c063142fefdf973108ade195c5f2f
\ No newline at end of file diff --git a/test/keystore/test2.key b/test/keystore/test2.key index 402577df2..5a5fb63d3 100644 --- a/test/keystore/test2.key +++ b/test/keystore/test2.key @@ -1 +1 @@ -b25e955e30dd87cbaec83287beea6ec9c4c72498bc66905590756bf48da5d1fc
\ No newline at end of file +a29a00b5e63f3d6eaac8b4c6b9be00a0b8aceafe438b5522666a4acfc1645108
\ No newline at end of file diff --git a/test/keystore/test3.key b/test/keystore/test3.key index b706958d6..5f881461e 100644 --- a/test/keystore/test3.key +++ b/test/keystore/test3.key @@ -1 +1 @@ -35577f65312f4a5e0b5391f5385043a6bc7b51fa4851a579e845b5fea33efded
\ No newline at end of file +b7b185c3d3122b298aaa085d7a14dd37b658bf864b847ad06935d4f9c315f431
\ No newline at end of file diff --git a/test/run_test.sh b/test/run_test.sh index 0aecf3b6e..20c3357e0 100755 --- a/test/run_test.sh +++ b/test/run_test.sh @@ -1,9 +1,9 @@ #!/bin/bash -BOOTNODE_FLAGS="--bootnodes enode://0478aa13c91aa0db8e93b668313b7eb0532fbdb24f64772375373b14dbe326c238ad09ab4469f6442c9a9753f1275aeec2e531912c14a958ed1feb4ae7e227ef@127.0.0.1:30301" +BOOTNODE_FLAGS="--bootnodes enode://b0dacdaceb9ce26f89406e8048d279d3aa81c770e967db7e2556e416ca446de0e9327dbdf85eb56c421eeabbc843ceb8f373e7a26dc31d48178620e48cb095c4@127.0.0.1:30301" GENESIS="genesis.json" -GDEX="../build/bin/gdex" +GDEX="../build/bin/gtan" BOOTNODE="../build/bin/bootnode" @@ -31,7 +31,7 @@ fi $BOOTNODE -nodekey keystore/bootnode.key --verbosity=9 > bootnode.log 2>&1 & # Kill all previous instances. -pkill -9 -f gdex +pkill -9 -f gtan logsdir=$PWD/log-$(date '+%Y-%m-%d-%H:%M:%S') mkdir $logsdir @@ -68,7 +68,7 @@ with open('$GENESIS', 'w') as f: __FILE__ # A standalone RPC server for accepting RPC requests. -datadir=$PWD/Dexon.rpc +datadir=$PWD/Tangerine.rpc if ! $CONTINUE; then rm -rf $datadir $GDEX --datadir=$datadir init ${GENESIS} @@ -76,6 +76,7 @@ fi $GDEX \ ${BOOTNODE_FLAGS} \ --verbosity=3 \ + --nat=none \ --gcmode=archive \ --datadir=$datadir --nodekey=keystore/rpc.key \ --rpc --rpcapi=eth,net,web3,debug \ @@ -83,9 +84,9 @@ $GDEX \ --ws --wsapi=eth,net,web3,debug \ --wsaddr=0.0.0.0 --wsport=8546 \ --wsorigins='*' --rpcvhosts='*' --rpccorsdomain="*" \ - > $logsdir/gdex.rpc.log 2>&1 & + > $logsdir/gtan.rpc.log 2>&1 & -NUM_NODES=$(cat ${GENESIS} | grep 'DEXON Test Node' | wc -l) +NUM_NODES=$(cat ${GENESIS} | grep 'Tangerine Test Node' | wc -l) RECOVERY_FLAGS="--recovery.network-rpc=https://rinkeby.infura.io" @@ -96,7 +97,7 @@ fi # Nodes for i in $(seq 0 $(($NUM_NODES - 1))); do - datadir=$PWD/Dexon.$i + datadir=$PWD/Tangerine.$i if ! $CONTINUE; then rm -rf $datadir @@ -106,6 +107,7 @@ for i in $(seq 0 $(($NUM_NODES - 1))); do ${BOOTNODE_FLAGS} \ --bp \ --verbosity=4 \ + --nat=none \ --gcmode=archive \ --datadir=$datadir --nodekey=keystore/test$i.key \ --port=$((30305 + $i)) \ @@ -116,9 +118,9 @@ for i in $(seq 0 $(($NUM_NODES - 1))); do --wsaddr=0.0.0.0 --wsport=$((8548 + $i * 2)) \ --wsorigins='*' --rpcvhosts='*' --rpccorsdomain="*" \ --pprof --pprofaddr=localhost --pprofport=$((6060 + $i)) \ - > $logsdir/gdex.$i.log 2>&1 & + > $logsdir/gtan.$i.log 2>&1 & done if ! $SMOKETEST; then - tail -f $logsdir/gdex.*.log + tail -f $logsdir/gtan.*.log fi diff --git a/test/sync_core.sh b/test/sync_core.sh index d18c7b8f7..544ca854a 100755 --- a/test/sync_core.sh +++ b/test/sync_core.sh @@ -1,3 +1,3 @@ #!/bin/bash -govendor fetch github.com/dexon-foundation/dexon-consensus/...@master +govendor fetch github.com/byzantine-lab/dexon-consensus/...@master diff --git a/test/sync_test.sh b/test/sync_test.sh index 702cc1e32..c12b0e3ae 100755 --- a/test/sync_test.sh +++ b/test/sync_test.sh @@ -1,6 +1,6 @@ #!/bin/bash -GDEX=../build/bin/gdex +GDEX=../build/bin/gtan logsdir=$PWD/sync-log rm -rf $logsdir @@ -8,7 +8,7 @@ mkdir $logsdir # A standalone RPC server for accepting RPC requests. for i in $(seq 0 3); do - datadir=$PWD/Dexon.sync.$i + datadir=$PWD/Tangerine.sync.$i rm -rf $datadir $GDEX --datadir=$datadir init genesis.json $GDEX --testnet --verbosity=4 --gcmode=archive --datadir=$datadir \ @@ -18,7 +18,7 @@ for i in $(seq 0 3); do --wsport=$((8664 + $i * 2)) \ --ws --wsapi=eth,net,web3,debug --wsaddr=0.0.0.0 \ --wsorigins='*' --rpcvhosts='*' --rpccorsdomain="*" \ - > $logsdir/gdex.sync.$i.log 2>&1 & + > $logsdir/gtan.sync.$i.log 2>&1 & done -tail -f $logsdir/gdex.*.log +tail -f $logsdir/gtan.*.log diff --git a/tests/block_test_util.go b/tests/block_test_util.go index e0fdeb9d4..dbcb129c5 100644 --- a/tests/block_test_util.go +++ b/tests/block_test_util.go @@ -24,18 +24,18 @@ import ( "fmt" "math/big" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/common/math" - "github.com/dexon-foundation/dexon/consensus" - "github.com/dexon-foundation/dexon/consensus/ethash" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/state" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/core/vm" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/params" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/common/math" + "github.com/tangerine-network/go-tangerine/consensus" + "github.com/tangerine-network/go-tangerine/consensus/ethash" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/state" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/core/vm" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/params" + "github.com/tangerine-network/go-tangerine/rlp" ) // A BlockTest checks handling of entire blocks. diff --git a/tests/difficulty_test.go b/tests/difficulty_test.go index 954687b46..a91a11665 100644 --- a/tests/difficulty_test.go +++ b/tests/difficulty_test.go @@ -20,8 +20,8 @@ import ( "math/big" "testing" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/params" ) var ( diff --git a/tests/difficulty_test_util.go b/tests/difficulty_test_util.go index aa9115843..cbd9ecab0 100644 --- a/tests/difficulty_test_util.go +++ b/tests/difficulty_test_util.go @@ -20,11 +20,11 @@ import ( "fmt" "math/big" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/math" - "github.com/dexon-foundation/dexon/consensus/ethash" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/math" + "github.com/tangerine-network/go-tangerine/consensus/ethash" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/params" ) //go:generate gencodec -type DifficultyTest -field-override difficultyTestMarshaling -out gen_difficultytest.go diff --git a/tests/gen_btheader.go b/tests/gen_btheader.go index e38eb078d..9aa35f263 100644 --- a/tests/gen_btheader.go +++ b/tests/gen_btheader.go @@ -6,10 +6,10 @@ import ( "encoding/json" "math/big" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/common/math" - "github.com/dexon-foundation/dexon/core/types" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/common/math" + "github.com/tangerine-network/go-tangerine/core/types" ) var _ = (*btHeaderMarshaling)(nil) diff --git a/tests/gen_difficultytest.go b/tests/gen_difficultytest.go index 33f0e6306..d8060180e 100644 --- a/tests/gen_difficultytest.go +++ b/tests/gen_difficultytest.go @@ -6,8 +6,8 @@ import ( "encoding/json" "math/big" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/math" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/math" ) var _ = (*difficultyTestMarshaling)(nil) diff --git a/tests/gen_stenv.go b/tests/gen_stenv.go index 4990ef68b..c2cbd9acc 100644 --- a/tests/gen_stenv.go +++ b/tests/gen_stenv.go @@ -7,8 +7,8 @@ import ( "errors" "math/big" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/math" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/math" ) var _ = (*stEnvMarshaling)(nil) diff --git a/tests/gen_sttransaction.go b/tests/gen_sttransaction.go index e3f2e304c..56ed3a155 100644 --- a/tests/gen_sttransaction.go +++ b/tests/gen_sttransaction.go @@ -6,8 +6,8 @@ import ( "encoding/json" "math/big" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/common/math" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/common/math" ) var _ = (*stTransactionMarshaling)(nil) diff --git a/tests/gen_tttransaction.go b/tests/gen_tttransaction.go index 9a8f01c4e..cb7d0d58e 100644 --- a/tests/gen_tttransaction.go +++ b/tests/gen_tttransaction.go @@ -7,9 +7,9 @@ import ( "errors" "math/big" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/common/math" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/common/math" ) var _ = (*ttTransactionMarshaling)(nil) diff --git a/tests/gen_vmexec.go b/tests/gen_vmexec.go index b8d969870..280b3ea71 100644 --- a/tests/gen_vmexec.go +++ b/tests/gen_vmexec.go @@ -7,9 +7,9 @@ import ( "errors" "math/big" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/common/math" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/common/math" ) var _ = (*vmExecMarshaling)(nil) diff --git a/tests/init.go b/tests/init.go index 45562aabe..195c6da19 100644 --- a/tests/init.go +++ b/tests/init.go @@ -20,7 +20,7 @@ import ( "fmt" "math/big" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/params" ) // Forks table defines supported forks and their chain config. diff --git a/tests/init_test.go b/tests/init_test.go index 048f405d2..31680487c 100644 --- a/tests/init_test.go +++ b/tests/init_test.go @@ -30,7 +30,7 @@ import ( "strings" "testing" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/params" ) var ( diff --git a/tests/rlp_test_util.go b/tests/rlp_test_util.go index e156d1db3..8b8839aef 100644 --- a/tests/rlp_test_util.go +++ b/tests/rlp_test_util.go @@ -24,7 +24,7 @@ import ( "math/big" "strings" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/rlp" ) // RLPTest is the JSON structure of a single RLP test. diff --git a/tests/state_test.go b/tests/state_test.go index e131549b2..df1f76163 100644 --- a/tests/state_test.go +++ b/tests/state_test.go @@ -24,8 +24,8 @@ import ( "reflect" "testing" - "github.com/dexon-foundation/dexon/cmd/utils" - "github.com/dexon-foundation/dexon/core/vm" + "github.com/tangerine-network/go-tangerine/cmd/utils" + "github.com/tangerine-network/go-tangerine/core/vm" ) func TestState(t *testing.T) { diff --git a/tests/state_test_util.go b/tests/state_test_util.go index 310787ed2..9b53bc872 100644 --- a/tests/state_test_util.go +++ b/tests/state_test_util.go @@ -23,17 +23,17 @@ import ( "math/big" "strings" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/common/math" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/state" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/core/vm" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/params" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/common/math" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/state" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/core/vm" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/params" + "github.com/tangerine-network/go-tangerine/rlp" "golang.org/x/crypto/sha3" ) diff --git a/tests/transaction_test.go b/tests/transaction_test.go index a94defd43..de230ff48 100644 --- a/tests/transaction_test.go +++ b/tests/transaction_test.go @@ -20,7 +20,7 @@ import ( "math/big" "testing" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/params" ) func TestTransaction(t *testing.T) { diff --git a/tests/transaction_test_util.go b/tests/transaction_test_util.go index f6e45c056..f0f2dc54f 100644 --- a/tests/transaction_test_util.go +++ b/tests/transaction_test_util.go @@ -22,12 +22,12 @@ import ( "fmt" "math/big" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/common/math" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/params" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/common/math" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/params" + "github.com/tangerine-network/go-tangerine/rlp" ) // TransactionTest checks RLP decoding and sender derivation of transactions. diff --git a/tests/vm_test.go b/tests/vm_test.go index a5d5b2ba5..cc3f2629a 100644 --- a/tests/vm_test.go +++ b/tests/vm_test.go @@ -19,7 +19,7 @@ package tests import ( "testing" - "github.com/dexon-foundation/dexon/core/vm" + "github.com/tangerine-network/go-tangerine/core/vm" ) func TestVM(t *testing.T) { diff --git a/tests/vm_test_util.go b/tests/vm_test_util.go index d79d18fbf..066d83881 100644 --- a/tests/vm_test_util.go +++ b/tests/vm_test_util.go @@ -22,15 +22,15 @@ import ( "fmt" "math/big" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/common/math" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/state" - "github.com/dexon-foundation/dexon/core/vm" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/common/math" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/state" + "github.com/tangerine-network/go-tangerine/core/vm" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/params" ) // VMTest checks EVM execution without block or transaction context. diff --git a/trie/database.go b/trie/database.go index c40ac8b7a..2a793b32d 100644 --- a/trie/database.go +++ b/trie/database.go @@ -24,11 +24,11 @@ import ( "time" "github.com/allegro/bigcache" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/metrics" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/metrics" + "github.com/tangerine-network/go-tangerine/rlp" ) var ( diff --git a/trie/database_test.go b/trie/database_test.go index 5aa0bc375..f11370980 100644 --- a/trie/database_test.go +++ b/trie/database_test.go @@ -19,8 +19,8 @@ package trie import ( "testing" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/ethdb" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/ethdb" ) // Tests that the trie database returns a missing trie node error if attempting diff --git a/trie/errors.go b/trie/errors.go index d35ce3346..ed439e0fe 100644 --- a/trie/errors.go +++ b/trie/errors.go @@ -19,7 +19,7 @@ package trie import ( "fmt" - "github.com/dexon-foundation/dexon/common" + "github.com/tangerine-network/go-tangerine/common" ) // MissingNodeError is returned by the trie functions (TryGet, TryUpdate, TryDelete) diff --git a/trie/hasher.go b/trie/hasher.go index cf520501e..c1dec64e0 100644 --- a/trie/hasher.go +++ b/trie/hasher.go @@ -20,8 +20,8 @@ import ( "hash" "sync" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/rlp" "golang.org/x/crypto/sha3" ) diff --git a/trie/iterator.go b/trie/iterator.go index fb7b43f65..022dd2884 100644 --- a/trie/iterator.go +++ b/trie/iterator.go @@ -21,8 +21,8 @@ import ( "container/heap" "errors" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/rlp" ) // Iterator is a key-value trie iterator that traverses a Trie. diff --git a/trie/iterator_test.go b/trie/iterator_test.go index 4bc4c0d4f..10f94fd4e 100644 --- a/trie/iterator_test.go +++ b/trie/iterator_test.go @@ -22,8 +22,8 @@ import ( "math/rand" "testing" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/ethdb" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/ethdb" ) func TestIterator(t *testing.T) { diff --git a/trie/node.go b/trie/node.go index 2121dbf14..62c4b61ff 100644 --- a/trie/node.go +++ b/trie/node.go @@ -21,8 +21,8 @@ import ( "io" "strings" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/rlp" ) var indices = []string{"0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "a", "b", "c", "d", "e", "f", "[17]"} diff --git a/trie/proof.go b/trie/proof.go index 6fbb71f0f..04d29db24 100644 --- a/trie/proof.go +++ b/trie/proof.go @@ -20,11 +20,11 @@ import ( "bytes" "fmt" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/rlp" ) // Prove constructs a merkle proof for key. The result contains all encoded nodes diff --git a/trie/proof_test.go b/trie/proof_test.go index b20640db0..c580fd766 100644 --- a/trie/proof_test.go +++ b/trie/proof_test.go @@ -23,9 +23,9 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/ethdb" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/ethdb" ) func init() { diff --git a/trie/secure_trie.go b/trie/secure_trie.go index 852629c34..7e398668a 100644 --- a/trie/secure_trie.go +++ b/trie/secure_trie.go @@ -19,8 +19,8 @@ package trie import ( "fmt" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/log" ) // SecureTrie wraps a trie with key hashing. In a secure trie, all diff --git a/trie/secure_trie_test.go b/trie/secure_trie_test.go index a24917d3a..7a0cc32b4 100644 --- a/trie/secure_trie_test.go +++ b/trie/secure_trie_test.go @@ -22,9 +22,9 @@ import ( "sync" "testing" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/ethdb" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/ethdb" ) func newEmptySecure() *SecureTrie { diff --git a/trie/sync.go b/trie/sync.go index d922ff681..0b881fa16 100644 --- a/trie/sync.go +++ b/trie/sync.go @@ -20,9 +20,9 @@ import ( "errors" "fmt" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/prque" - "github.com/dexon-foundation/dexon/ethdb" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/prque" + "github.com/tangerine-network/go-tangerine/ethdb" ) // ErrNotRequested is returned by the trie sync when it's requested to process a diff --git a/trie/sync_test.go b/trie/sync_test.go index e1fa10761..da8f941b0 100644 --- a/trie/sync_test.go +++ b/trie/sync_test.go @@ -20,8 +20,8 @@ import ( "bytes" "testing" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/ethdb" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/ethdb" ) // makeTestTrie create a sample test trie to test node-wise reconstruction. diff --git a/trie/trie.go b/trie/trie.go index d2b3f98fe..c83532e26 100644 --- a/trie/trie.go +++ b/trie/trie.go @@ -21,10 +21,10 @@ import ( "bytes" "fmt" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/metrics" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/metrics" ) var ( diff --git a/trie/trie_test.go b/trie/trie_test.go index 69b596031..3cb8df28c 100644 --- a/trie/trie_test.go +++ b/trie/trie_test.go @@ -30,10 +30,10 @@ import ( "testing/quick" "github.com/davecgh/go-spew/spew" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/rlp" ) func init() { diff --git a/vendor/cloud.google.com/go/storage/storage.go b/vendor/cloud.google.com/go/storage/storage.go index 4b4d62eeb..6c62e3e1d 100644 --- a/vendor/cloud.google.com/go/storage/storage.go +++ b/vendor/cloud.google.com/go/storage/storage.go @@ -813,23 +813,23 @@ func newObject(o *raw.Object) *ObjectAttrs { EventBasedHold: o.EventBasedHold, TemporaryHold: o.TemporaryHold, RetentionExpirationTime: convertTime(o.RetentionExpirationTime), - ACL: toObjectACLRules(o.Acl), - Owner: owner, - ContentEncoding: o.ContentEncoding, - ContentDisposition: o.ContentDisposition, - Size: int64(o.Size), - MD5: md5, - CRC32C: crc32c, - MediaLink: o.MediaLink, - Metadata: o.Metadata, - Generation: o.Generation, - Metageneration: o.Metageneration, - StorageClass: o.StorageClass, - CustomerKeySHA256: sha256, - KMSKeyName: o.KmsKeyName, - Created: convertTime(o.TimeCreated), - Deleted: convertTime(o.TimeDeleted), - Updated: convertTime(o.Updated), + ACL: toObjectACLRules(o.Acl), + Owner: owner, + ContentEncoding: o.ContentEncoding, + ContentDisposition: o.ContentDisposition, + Size: int64(o.Size), + MD5: md5, + CRC32C: crc32c, + MediaLink: o.MediaLink, + Metadata: o.Metadata, + Generation: o.Generation, + Metageneration: o.Metageneration, + StorageClass: o.StorageClass, + CustomerKeySHA256: sha256, + KMSKeyName: o.KmsKeyName, + Created: convertTime(o.TimeCreated), + Deleted: convertTime(o.TimeDeleted), + Updated: convertTime(o.Updated), } } diff --git a/vendor/github.com/dexon-foundation/bls/.gitignore b/vendor/github.com/byzantine-lab/bls/.gitignore index dacdfc906..dacdfc906 100644 --- a/vendor/github.com/dexon-foundation/bls/.gitignore +++ b/vendor/github.com/byzantine-lab/bls/.gitignore diff --git a/vendor/github.com/dexon-foundation/bls/.travis.yml b/vendor/github.com/byzantine-lab/bls/.travis.yml index 71a667a2e..71a667a2e 100644 --- a/vendor/github.com/dexon-foundation/bls/.travis.yml +++ b/vendor/github.com/byzantine-lab/bls/.travis.yml diff --git a/vendor/github.com/dexon-foundation/bls/CMakeLists.txt b/vendor/github.com/byzantine-lab/bls/CMakeLists.txt index 30fb90fd5..30fb90fd5 100644 --- a/vendor/github.com/dexon-foundation/bls/CMakeLists.txt +++ b/vendor/github.com/byzantine-lab/bls/CMakeLists.txt diff --git a/vendor/github.com/dexon-foundation/bls/Makefile b/vendor/github.com/byzantine-lab/bls/Makefile index efea22274..efea22274 100644 --- a/vendor/github.com/dexon-foundation/bls/Makefile +++ b/vendor/github.com/byzantine-lab/bls/Makefile diff --git a/vendor/github.com/dexon-foundation/bls/bin/.emptydir b/vendor/github.com/byzantine-lab/bls/bin/.emptydir index e69de29bb..e69de29bb 100644 --- a/vendor/github.com/dexon-foundation/bls/bin/.emptydir +++ b/vendor/github.com/byzantine-lab/bls/bin/.emptydir diff --git a/vendor/github.com/dexon-foundation/bls/bls.sln b/vendor/github.com/byzantine-lab/bls/bls.sln index 4889ec601..4889ec601 100644 --- a/vendor/github.com/dexon-foundation/bls/bls.sln +++ b/vendor/github.com/byzantine-lab/bls/bls.sln diff --git a/vendor/github.com/dexon-foundation/bls/bls_smpl.py b/vendor/github.com/byzantine-lab/bls/bls_smpl.py index f834d80aa..f834d80aa 100644 --- a/vendor/github.com/dexon-foundation/bls/bls_smpl.py +++ b/vendor/github.com/byzantine-lab/bls/bls_smpl.py diff --git a/vendor/github.com/dexon-foundation/bls/common.props b/vendor/github.com/byzantine-lab/bls/common.props index d6fdbb902..d6fdbb902 100644 --- a/vendor/github.com/dexon-foundation/bls/common.props +++ b/vendor/github.com/byzantine-lab/bls/common.props diff --git a/vendor/github.com/dexon-foundation/bls/debug.props b/vendor/github.com/byzantine-lab/bls/debug.props index 1553ae0dc..1553ae0dc 100644 --- a/vendor/github.com/dexon-foundation/bls/debug.props +++ b/vendor/github.com/byzantine-lab/bls/debug.props diff --git a/vendor/github.com/dexon-foundation/bls/ffi/cs/App.config b/vendor/github.com/byzantine-lab/bls/ffi/cs/App.config index 8d234373a..8d234373a 100644 --- a/vendor/github.com/dexon-foundation/bls/ffi/cs/App.config +++ b/vendor/github.com/byzantine-lab/bls/ffi/cs/App.config diff --git a/vendor/github.com/dexon-foundation/bls/ffi/cs/Properties/AssemblyInfo.cs b/vendor/github.com/byzantine-lab/bls/ffi/cs/Properties/AssemblyInfo.cs index 201222c55..201222c55 100644 --- a/vendor/github.com/dexon-foundation/bls/ffi/cs/Properties/AssemblyInfo.cs +++ b/vendor/github.com/byzantine-lab/bls/ffi/cs/Properties/AssemblyInfo.cs diff --git a/vendor/github.com/dexon-foundation/bls/ffi/cs/bls.cs b/vendor/github.com/byzantine-lab/bls/ffi/cs/bls.cs index 6bcaf07fb..6bcaf07fb 100644 --- a/vendor/github.com/dexon-foundation/bls/ffi/cs/bls.cs +++ b/vendor/github.com/byzantine-lab/bls/ffi/cs/bls.cs diff --git a/vendor/github.com/dexon-foundation/bls/ffi/cs/bls.csproj b/vendor/github.com/byzantine-lab/bls/ffi/cs/bls.csproj index c03afa436..c03afa436 100644 --- a/vendor/github.com/dexon-foundation/bls/ffi/cs/bls.csproj +++ b/vendor/github.com/byzantine-lab/bls/ffi/cs/bls.csproj diff --git a/vendor/github.com/dexon-foundation/bls/ffi/cs/bls.sln b/vendor/github.com/byzantine-lab/bls/ffi/cs/bls.sln index 7c3dfba7b..7c3dfba7b 100644 --- a/vendor/github.com/dexon-foundation/bls/ffi/cs/bls.sln +++ b/vendor/github.com/byzantine-lab/bls/ffi/cs/bls.sln diff --git a/vendor/github.com/dexon-foundation/bls/ffi/cs/bls256.cs b/vendor/github.com/byzantine-lab/bls/ffi/cs/bls256.cs index 3ef5fab9a..3ef5fab9a 100644 --- a/vendor/github.com/dexon-foundation/bls/ffi/cs/bls256.cs +++ b/vendor/github.com/byzantine-lab/bls/ffi/cs/bls256.cs diff --git a/vendor/github.com/dexon-foundation/bls/ffi/cs/bls256.csproj b/vendor/github.com/byzantine-lab/bls/ffi/cs/bls256.csproj index 032a1d347..032a1d347 100644 --- a/vendor/github.com/dexon-foundation/bls/ffi/cs/bls256.csproj +++ b/vendor/github.com/byzantine-lab/bls/ffi/cs/bls256.csproj diff --git a/vendor/github.com/dexon-foundation/bls/ffi/cs/bls256.sln b/vendor/github.com/byzantine-lab/bls/ffi/cs/bls256.sln index eb29af97b..eb29af97b 100644 --- a/vendor/github.com/dexon-foundation/bls/ffi/cs/bls256.sln +++ b/vendor/github.com/byzantine-lab/bls/ffi/cs/bls256.sln diff --git a/vendor/github.com/dexon-foundation/bls/ffi/cs/bls256_test.cs b/vendor/github.com/byzantine-lab/bls/ffi/cs/bls256_test.cs index 989993e0f..989993e0f 100644 --- a/vendor/github.com/dexon-foundation/bls/ffi/cs/bls256_test.cs +++ b/vendor/github.com/byzantine-lab/bls/ffi/cs/bls256_test.cs diff --git a/vendor/github.com/dexon-foundation/bls/ffi/cs/bls_test.cs b/vendor/github.com/byzantine-lab/bls/ffi/cs/bls_test.cs index 2eb451ba9..2eb451ba9 100644 --- a/vendor/github.com/dexon-foundation/bls/ffi/cs/bls_test.cs +++ b/vendor/github.com/byzantine-lab/bls/ffi/cs/bls_test.cs diff --git a/vendor/github.com/dexon-foundation/bls/ffi/cs/readme-ja.md b/vendor/github.com/byzantine-lab/bls/ffi/cs/readme-ja.md index 199135725..199135725 100644 --- a/vendor/github.com/dexon-foundation/bls/ffi/cs/readme-ja.md +++ b/vendor/github.com/byzantine-lab/bls/ffi/cs/readme-ja.md diff --git a/vendor/github.com/dexon-foundation/bls/ffi/cs/readme.md b/vendor/github.com/byzantine-lab/bls/ffi/cs/readme.md index 2b7191871..2b7191871 100644 --- a/vendor/github.com/dexon-foundation/bls/ffi/cs/readme.md +++ b/vendor/github.com/byzantine-lab/bls/ffi/cs/readme.md diff --git a/vendor/github.com/dexon-foundation/bls/ffi/go/bls/bls.go b/vendor/github.com/byzantine-lab/bls/ffi/go/bls/bls.go index 56bf08039..56bf08039 100644 --- a/vendor/github.com/dexon-foundation/bls/ffi/go/bls/bls.go +++ b/vendor/github.com/byzantine-lab/bls/ffi/go/bls/bls.go diff --git a/vendor/github.com/dexon-foundation/bls/ffi/go/bls/callback.go b/vendor/github.com/byzantine-lab/bls/ffi/go/bls/callback.go index ba73a5e15..ba73a5e15 100644 --- a/vendor/github.com/dexon-foundation/bls/ffi/go/bls/callback.go +++ b/vendor/github.com/byzantine-lab/bls/ffi/go/bls/callback.go diff --git a/vendor/github.com/dexon-foundation/bls/ffi/go/bls/dummy.cpp b/vendor/github.com/byzantine-lab/bls/ffi/go/bls/dummy.cpp index a5103a1c5..a5103a1c5 100644 --- a/vendor/github.com/dexon-foundation/bls/ffi/go/bls/dummy.cpp +++ b/vendor/github.com/byzantine-lab/bls/ffi/go/bls/dummy.cpp diff --git a/vendor/github.com/dexon-foundation/bls/ffi/go/bls/mcl.go b/vendor/github.com/byzantine-lab/bls/ffi/go/bls/mcl.go index ca8d7f02b..ca8d7f02b 100644 --- a/vendor/github.com/dexon-foundation/bls/ffi/go/bls/mcl.go +++ b/vendor/github.com/byzantine-lab/bls/ffi/go/bls/mcl.go diff --git a/vendor/github.com/dexon-foundation/bls/images/bls-go-alpine/Dockerfile b/vendor/github.com/byzantine-lab/bls/images/bls-go-alpine/Dockerfile index edd49eb4b..edd49eb4b 100644 --- a/vendor/github.com/dexon-foundation/bls/images/bls-go-alpine/Dockerfile +++ b/vendor/github.com/byzantine-lab/bls/images/bls-go-alpine/Dockerfile diff --git a/vendor/github.com/dexon-foundation/bls/include/bls/bls.h b/vendor/github.com/byzantine-lab/bls/include/bls/bls.h index cb300bc49..cb300bc49 100644 --- a/vendor/github.com/dexon-foundation/bls/include/bls/bls.h +++ b/vendor/github.com/byzantine-lab/bls/include/bls/bls.h diff --git a/vendor/github.com/dexon-foundation/bls/include/bls/bls.hpp b/vendor/github.com/byzantine-lab/bls/include/bls/bls.hpp index 741334555..741334555 100644 --- a/vendor/github.com/dexon-foundation/bls/include/bls/bls.hpp +++ b/vendor/github.com/byzantine-lab/bls/include/bls/bls.hpp diff --git a/vendor/github.com/dexon-foundation/bls/lib/.emptydir b/vendor/github.com/byzantine-lab/bls/lib/.emptydir index e69de29bb..e69de29bb 100644 --- a/vendor/github.com/dexon-foundation/bls/lib/.emptydir +++ b/vendor/github.com/byzantine-lab/bls/lib/.emptydir diff --git a/vendor/github.com/dexon-foundation/bls/mk.bat b/vendor/github.com/byzantine-lab/bls/mk.bat index 9bf8dd9e6..9bf8dd9e6 100644 --- a/vendor/github.com/dexon-foundation/bls/mk.bat +++ b/vendor/github.com/byzantine-lab/bls/mk.bat diff --git a/vendor/github.com/dexon-foundation/bls/mkdll.bat b/vendor/github.com/byzantine-lab/bls/mkdll.bat index 17e934f92..17e934f92 100755 --- a/vendor/github.com/dexon-foundation/bls/mkdll.bat +++ b/vendor/github.com/byzantine-lab/bls/mkdll.bat diff --git a/vendor/github.com/dexon-foundation/bls/mklib.bat b/vendor/github.com/byzantine-lab/bls/mklib.bat index 4a60d7196..4a60d7196 100644 --- a/vendor/github.com/dexon-foundation/bls/mklib.bat +++ b/vendor/github.com/byzantine-lab/bls/mklib.bat diff --git a/vendor/github.com/dexon-foundation/bls/obj/.emptydir b/vendor/github.com/byzantine-lab/bls/obj/.emptydir index e69de29bb..e69de29bb 100644 --- a/vendor/github.com/dexon-foundation/bls/obj/.emptydir +++ b/vendor/github.com/byzantine-lab/bls/obj/.emptydir diff --git a/vendor/github.com/dexon-foundation/bls/readme.md b/vendor/github.com/byzantine-lab/bls/readme.md index b1efb3f36..b1efb3f36 100644 --- a/vendor/github.com/dexon-foundation/bls/readme.md +++ b/vendor/github.com/byzantine-lab/bls/readme.md diff --git a/vendor/github.com/dexon-foundation/bls/release.props b/vendor/github.com/byzantine-lab/bls/release.props index 886ce6890..886ce6890 100644 --- a/vendor/github.com/dexon-foundation/bls/release.props +++ b/vendor/github.com/byzantine-lab/bls/release.props diff --git a/vendor/github.com/dexon-foundation/bls/sample/bls_smpl.cpp b/vendor/github.com/byzantine-lab/bls/sample/bls_smpl.cpp index e812cd500..e812cd500 100644 --- a/vendor/github.com/dexon-foundation/bls/sample/bls_smpl.cpp +++ b/vendor/github.com/byzantine-lab/bls/sample/bls_smpl.cpp diff --git a/vendor/github.com/dexon-foundation/bls/setvar.bat b/vendor/github.com/byzantine-lab/bls/setvar.bat index 0ff286ab8..0ff286ab8 100755 --- a/vendor/github.com/dexon-foundation/bls/setvar.bat +++ b/vendor/github.com/byzantine-lab/bls/setvar.bat diff --git a/vendor/github.com/dexon-foundation/bls/src/bls_c256.cpp b/vendor/github.com/byzantine-lab/bls/src/bls_c256.cpp index a9f3412ea..a9f3412ea 100644 --- a/vendor/github.com/dexon-foundation/bls/src/bls_c256.cpp +++ b/vendor/github.com/byzantine-lab/bls/src/bls_c256.cpp diff --git a/vendor/github.com/dexon-foundation/bls/src/bls_c384.cpp b/vendor/github.com/byzantine-lab/bls/src/bls_c384.cpp index d28f8547b..d28f8547b 100644 --- a/vendor/github.com/dexon-foundation/bls/src/bls_c384.cpp +++ b/vendor/github.com/byzantine-lab/bls/src/bls_c384.cpp diff --git a/vendor/github.com/dexon-foundation/bls/src/bls_c384_256.cpp b/vendor/github.com/byzantine-lab/bls/src/bls_c384_256.cpp index 3dcb3e7d7..3dcb3e7d7 100644 --- a/vendor/github.com/dexon-foundation/bls/src/bls_c384_256.cpp +++ b/vendor/github.com/byzantine-lab/bls/src/bls_c384_256.cpp diff --git a/vendor/github.com/dexon-foundation/bls/src/bls_c_impl.hpp b/vendor/github.com/byzantine-lab/bls/src/bls_c_impl.hpp index b38c1ad06..b38c1ad06 100644 --- a/vendor/github.com/dexon-foundation/bls/src/bls_c_impl.hpp +++ b/vendor/github.com/byzantine-lab/bls/src/bls_c_impl.hpp diff --git a/vendor/github.com/dexon-foundation/bls/src/proj/bls.vcxproj b/vendor/github.com/byzantine-lab/bls/src/proj/bls.vcxproj index b78c97919..b78c97919 100644 --- a/vendor/github.com/dexon-foundation/bls/src/proj/bls.vcxproj +++ b/vendor/github.com/byzantine-lab/bls/src/proj/bls.vcxproj diff --git a/vendor/github.com/dexon-foundation/bls/src/qcoeff-bn254.hpp b/vendor/github.com/byzantine-lab/bls/src/qcoeff-bn254.hpp index 18d169568..18d169568 100644 --- a/vendor/github.com/dexon-foundation/bls/src/qcoeff-bn254.hpp +++ b/vendor/github.com/byzantine-lab/bls/src/qcoeff-bn254.hpp diff --git a/vendor/github.com/dexon-foundation/bls/test/bls256_test.cpp b/vendor/github.com/byzantine-lab/bls/test/bls256_test.cpp index e53a87057..e53a87057 100644 --- a/vendor/github.com/dexon-foundation/bls/test/bls256_test.cpp +++ b/vendor/github.com/byzantine-lab/bls/test/bls256_test.cpp diff --git a/vendor/github.com/dexon-foundation/bls/test/bls384_256_test.cpp b/vendor/github.com/byzantine-lab/bls/test/bls384_256_test.cpp index ea8126567..ea8126567 100644 --- a/vendor/github.com/dexon-foundation/bls/test/bls384_256_test.cpp +++ b/vendor/github.com/byzantine-lab/bls/test/bls384_256_test.cpp diff --git a/vendor/github.com/dexon-foundation/bls/test/bls384_test.cpp b/vendor/github.com/byzantine-lab/bls/test/bls384_test.cpp index 2212f8e6b..2212f8e6b 100644 --- a/vendor/github.com/dexon-foundation/bls/test/bls384_test.cpp +++ b/vendor/github.com/byzantine-lab/bls/test/bls384_test.cpp diff --git a/vendor/github.com/dexon-foundation/bls/test/bls_c256_test.cpp b/vendor/github.com/byzantine-lab/bls/test/bls_c256_test.cpp index 8613720b4..8613720b4 100644 --- a/vendor/github.com/dexon-foundation/bls/test/bls_c256_test.cpp +++ b/vendor/github.com/byzantine-lab/bls/test/bls_c256_test.cpp diff --git a/vendor/github.com/dexon-foundation/bls/test/bls_c384_256_test.cpp b/vendor/github.com/byzantine-lab/bls/test/bls_c384_256_test.cpp index 6f153f9d8..6f153f9d8 100644 --- a/vendor/github.com/dexon-foundation/bls/test/bls_c384_256_test.cpp +++ b/vendor/github.com/byzantine-lab/bls/test/bls_c384_256_test.cpp diff --git a/vendor/github.com/dexon-foundation/bls/test/bls_c384_test.cpp b/vendor/github.com/byzantine-lab/bls/test/bls_c384_test.cpp index b6886dd04..b6886dd04 100644 --- a/vendor/github.com/dexon-foundation/bls/test/bls_c384_test.cpp +++ b/vendor/github.com/byzantine-lab/bls/test/bls_c384_test.cpp diff --git a/vendor/github.com/dexon-foundation/bls/test/bls_c_test.hpp b/vendor/github.com/byzantine-lab/bls/test/bls_c_test.hpp index e9b6e6302..e9b6e6302 100644 --- a/vendor/github.com/dexon-foundation/bls/test/bls_c_test.hpp +++ b/vendor/github.com/byzantine-lab/bls/test/bls_c_test.hpp diff --git a/vendor/github.com/dexon-foundation/bls/test/bls_test.hpp b/vendor/github.com/byzantine-lab/bls/test/bls_test.hpp index 346fafe15..346fafe15 100644 --- a/vendor/github.com/dexon-foundation/bls/test/bls_test.hpp +++ b/vendor/github.com/byzantine-lab/bls/test/bls_test.hpp diff --git a/vendor/github.com/dexon-foundation/bls/test/proj/bls_test/bls_test.vcxproj b/vendor/github.com/byzantine-lab/bls/test/proj/bls_test/bls_test.vcxproj index 1755135fb..1755135fb 100644 --- a/vendor/github.com/dexon-foundation/bls/test/proj/bls_test/bls_test.vcxproj +++ b/vendor/github.com/byzantine-lab/bls/test/proj/bls_test/bls_test.vcxproj diff --git a/vendor/github.com/dexon-foundation/dexon-consensus/LICENSE b/vendor/github.com/byzantine-lab/dexon-consensus/LICENSE index 0a041280b..0a041280b 100644 --- a/vendor/github.com/dexon-foundation/dexon-consensus/LICENSE +++ b/vendor/github.com/byzantine-lab/dexon-consensus/LICENSE diff --git a/vendor/github.com/dexon-foundation/dexon-consensus/common/event.go b/vendor/github.com/byzantine-lab/dexon-consensus/common/event.go index 4e4e23bf3..4e4e23bf3 100644 --- a/vendor/github.com/dexon-foundation/dexon-consensus/common/event.go +++ b/vendor/github.com/byzantine-lab/dexon-consensus/common/event.go diff --git a/vendor/github.com/dexon-foundation/dexon-consensus/common/logger.go b/vendor/github.com/byzantine-lab/dexon-consensus/common/logger.go index 3328e939a..3328e939a 100644 --- a/vendor/github.com/dexon-foundation/dexon-consensus/common/logger.go +++ b/vendor/github.com/byzantine-lab/dexon-consensus/common/logger.go diff --git a/vendor/github.com/dexon-foundation/dexon-consensus/common/types.go b/vendor/github.com/byzantine-lab/dexon-consensus/common/types.go index 883492bf3..883492bf3 100644 --- a/vendor/github.com/dexon-foundation/dexon-consensus/common/types.go +++ b/vendor/github.com/byzantine-lab/dexon-consensus/common/types.go diff --git a/vendor/github.com/dexon-foundation/dexon-consensus/common/utils.go b/vendor/github.com/byzantine-lab/dexon-consensus/common/utils.go index 0e847900f..0e847900f 100644 --- a/vendor/github.com/dexon-foundation/dexon-consensus/common/utils.go +++ b/vendor/github.com/byzantine-lab/dexon-consensus/common/utils.go diff --git a/vendor/github.com/dexon-foundation/dexon-consensus/core/agreement-mgr.go b/vendor/github.com/byzantine-lab/dexon-consensus/core/agreement-mgr.go index 17def6747..cdbfadf13 100644 --- a/vendor/github.com/dexon-foundation/dexon-consensus/core/agreement-mgr.go +++ b/vendor/github.com/byzantine-lab/dexon-consensus/core/agreement-mgr.go @@ -26,10 +26,10 @@ import ( lru "github.com/hashicorp/golang-lru" - "github.com/dexon-foundation/dexon-consensus/common" - "github.com/dexon-foundation/dexon-consensus/core/types" - typesDKG "github.com/dexon-foundation/dexon-consensus/core/types/dkg" - "github.com/dexon-foundation/dexon-consensus/core/utils" + "github.com/byzantine-lab/dexon-consensus/common" + "github.com/byzantine-lab/dexon-consensus/core/types" + typesDKG "github.com/byzantine-lab/dexon-consensus/core/types/dkg" + "github.com/byzantine-lab/dexon-consensus/core/utils" ) // Errors returned from BA modules diff --git a/vendor/github.com/dexon-foundation/dexon-consensus/core/agreement-state.go b/vendor/github.com/byzantine-lab/dexon-consensus/core/agreement-state.go index 0d1ae58bc..fc2b6f3d5 100644 --- a/vendor/github.com/dexon-foundation/dexon-consensus/core/agreement-state.go +++ b/vendor/github.com/byzantine-lab/dexon-consensus/core/agreement-state.go @@ -20,7 +20,7 @@ package core import ( "fmt" - "github.com/dexon-foundation/dexon-consensus/core/types" + "github.com/byzantine-lab/dexon-consensus/core/types" ) // Errors for agreement state module. diff --git a/vendor/github.com/dexon-foundation/dexon-consensus/core/agreement.go b/vendor/github.com/byzantine-lab/dexon-consensus/core/agreement.go index d90afc610..bad6afa2b 100644 --- a/vendor/github.com/dexon-foundation/dexon-consensus/core/agreement.go +++ b/vendor/github.com/byzantine-lab/dexon-consensus/core/agreement.go @@ -24,9 +24,9 @@ import ( "sync/atomic" "time" - "github.com/dexon-foundation/dexon-consensus/common" - "github.com/dexon-foundation/dexon-consensus/core/types" - "github.com/dexon-foundation/dexon-consensus/core/utils" + "github.com/byzantine-lab/dexon-consensus/common" + "github.com/byzantine-lab/dexon-consensus/core/types" + "github.com/byzantine-lab/dexon-consensus/core/utils" ) // closedchan is a reusable closed channel. diff --git a/vendor/github.com/dexon-foundation/dexon-consensus/core/blockchain.go b/vendor/github.com/byzantine-lab/dexon-consensus/core/blockchain.go index 4fae221c7..579ccd44c 100644 --- a/vendor/github.com/dexon-foundation/dexon-consensus/core/blockchain.go +++ b/vendor/github.com/byzantine-lab/dexon-consensus/core/blockchain.go @@ -26,10 +26,10 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon-consensus/common" - "github.com/dexon-foundation/dexon-consensus/core/crypto" - "github.com/dexon-foundation/dexon-consensus/core/types" - "github.com/dexon-foundation/dexon-consensus/core/utils" + "github.com/byzantine-lab/dexon-consensus/common" + "github.com/byzantine-lab/dexon-consensus/core/crypto" + "github.com/byzantine-lab/dexon-consensus/core/types" + "github.com/byzantine-lab/dexon-consensus/core/utils" ) // Errors for sanity check error. diff --git a/vendor/github.com/byzantine-lab/dexon-consensus/core/blockdb/interfaces.go b/vendor/github.com/byzantine-lab/dexon-consensus/core/blockdb/interfaces.go new file mode 100644 index 000000000..c85630775 --- /dev/null +++ b/vendor/github.com/byzantine-lab/dexon-consensus/core/blockdb/interfaces.go @@ -0,0 +1,70 @@ +// Copyright 2018 The dexon-consensus Authors +// This file is part of the dexon-consensus library. +// +// The dexon-consensus library is free software: you can redistribute it +// and/or modify it under the terms of the GNU Lesser General Public License as +// published by the Free Software Foundation, either version 3 of the License, +// or (at your option) any later version. +// +// The dexon-consensus library 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 Lesser +// General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with the dexon-consensus library. If not, see +// <http://www.gnu.org/licenses/>. + +package blockdb + +import ( + "errors" + "fmt" + + "github.com/dexon-foundation/dexon-consensus/common" + "github.com/dexon-foundation/dexon-consensus/core/types" +) + +var ( + // ErrBlockExists is the error when block eixsts. + ErrBlockExists = errors.New("block exists") + // ErrBlockDoesNotExist is the error when block does not eixst. + ErrBlockDoesNotExist = errors.New("block does not exist") + // ErrIterationFinished is the error to check if the iteration is finished. + ErrIterationFinished = errors.New("iteration finished") + // ErrEmptyPath is the error when the required path is empty. + ErrEmptyPath = fmt.Errorf("empty path") + // ErrClosed is the error when using DB after it's closed. + ErrClosed = fmt.Errorf("db closed") + // ErrNotImplemented is the error that some interface is not implemented. + ErrNotImplemented = fmt.Errorf("not implemented") +) + +// BlockDatabase is the interface for a BlockDatabase. +type BlockDatabase interface { + Reader + Writer + + // Close allows database implementation able to + // release resource when finishing. + Close() error +} + +// Reader defines the interface for reading blocks into DB. +type Reader interface { + Has(hash common.Hash) bool + Get(hash common.Hash) (types.Block, error) + GetAll() (BlockIterator, error) +} + +// Writer defines the interface for writing blocks into DB. +type Writer interface { + Update(block types.Block) error + Put(block types.Block) error +} + +// BlockIterator defines an iterator on blocks hold +// in a DB. +type BlockIterator interface { + Next() (types.Block, error) +} diff --git a/vendor/github.com/byzantine-lab/dexon-consensus/core/blockdb/level-db.go b/vendor/github.com/byzantine-lab/dexon-consensus/core/blockdb/level-db.go new file mode 100644 index 000000000..76730fc9c --- /dev/null +++ b/vendor/github.com/byzantine-lab/dexon-consensus/core/blockdb/level-db.go @@ -0,0 +1,127 @@ +// Copyright 2018 The dexon-consensus Authors +// This file is part of the dexon-consensus library. +// +// The dexon-consensus library is free software: you can redistribute it +// and/or modify it under the terms of the GNU Lesser General Public License as +// published by the Free Software Foundation, either version 3 of the License, +// or (at your option) any later version. +// +// The dexon-consensus library 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 Lesser +// General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with the dexon-consensus library. If not, see +// <http://www.gnu.org/licenses/>. + +package blockdb + +import ( + "encoding/json" + + "github.com/syndtr/goleveldb/leveldb" + + "github.com/dexon-foundation/dexon-consensus/common" + "github.com/dexon-foundation/dexon-consensus/core/types" +) + +// LevelDBBackedBlockDB is a leveldb backed BlockDB implementation. +type LevelDBBackedBlockDB struct { + db *leveldb.DB +} + +// NewLevelDBBackedBlockDB initialize a leveldb-backed block database. +func NewLevelDBBackedBlockDB( + path string) (lvl *LevelDBBackedBlockDB, err error) { + + db, err := leveldb.OpenFile(path, nil) + if err != nil { + return + } + lvl = &LevelDBBackedBlockDB{db: db} + return +} + +// Close implement Closer interface, which would release allocated resource. +func (lvl *LevelDBBackedBlockDB) Close() error { + return lvl.db.Close() +} + +// Has implements the Reader.Has method. +func (lvl *LevelDBBackedBlockDB) Has(hash common.Hash) bool { + exists, err := lvl.db.Has([]byte(hash[:]), nil) + if err != nil { + // TODO(missionliao): Modify the interface to return error. + panic(err) + } + return exists +} + +// Get implements the Reader.Get method. +func (lvl *LevelDBBackedBlockDB) Get( + hash common.Hash) (block types.Block, err error) { + + queried, err := lvl.db.Get([]byte(hash[:]), nil) + if err != nil { + if err == leveldb.ErrNotFound { + err = ErrBlockDoesNotExist + } + return + } + err = json.Unmarshal(queried, &block) + if err != nil { + return + } + return +} + +// Update implements the Writer.Update method. +func (lvl *LevelDBBackedBlockDB) Update(block types.Block) (err error) { + // NOTE: we didn't handle changes of block hash (and it + // should not happen). + marshaled, err := json.Marshal(&block) + if err != nil { + return + } + + if !lvl.Has(block.Hash) { + err = ErrBlockDoesNotExist + return + } + err = lvl.db.Put( + []byte(block.Hash[:]), + marshaled, + nil) + if err != nil { + return + } + return +} + +// Put implements the Writer.Put method. +func (lvl *LevelDBBackedBlockDB) Put(block types.Block) (err error) { + marshaled, err := json.Marshal(&block) + if err != nil { + return + } + if lvl.Has(block.Hash) { + err = ErrBlockExists + return + } + err = lvl.db.Put( + []byte(block.Hash[:]), + marshaled, + nil) + if err != nil { + return + } + return +} + +// GetAll implements Reader.GetAll method, which allows callers +// to retrieve all blocks in DB. +func (lvl *LevelDBBackedBlockDB) GetAll() (BlockIterator, error) { + // TODO (mission): Implement this part via goleveldb's iterator. + return nil, ErrNotImplemented +} diff --git a/vendor/github.com/byzantine-lab/dexon-consensus/core/blockdb/memory.go b/vendor/github.com/byzantine-lab/dexon-consensus/core/blockdb/memory.go new file mode 100644 index 000000000..b45af229b --- /dev/null +++ b/vendor/github.com/byzantine-lab/dexon-consensus/core/blockdb/memory.go @@ -0,0 +1,183 @@ +// Copyright 2018 The dexon-consensus Authors +// This file is part of the dexon-consensus library. +// +// The dexon-consensus library is free software: you can redistribute it +// and/or modify it under the terms of the GNU Lesser General Public License as +// published by the Free Software Foundation, either version 3 of the License, +// or (at your option) any later version. +// +// The dexon-consensus library 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 Lesser +// General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with the dexon-consensus library. If not, see +// <http://www.gnu.org/licenses/>. + +package blockdb + +import ( + "encoding/json" + "io/ioutil" + "os" + "sync" + + "github.com/dexon-foundation/dexon-consensus/common" + "github.com/dexon-foundation/dexon-consensus/core/types" +) + +type seqIterator struct { + idx int + db *MemBackedBlockDB +} + +func (seq *seqIterator) Next() (types.Block, error) { + curIdx := seq.idx + seq.idx++ + return seq.db.getByIndex(curIdx) +} + +// MemBackedBlockDB is a memory backed BlockDB implementation. +type MemBackedBlockDB struct { + blocksMutex sync.RWMutex + blockHashSequence common.Hashes + blocksByHash map[common.Hash]*types.Block + persistantFilePath string +} + +// NewMemBackedBlockDB initialize a memory-backed block database. +func NewMemBackedBlockDB(persistantFilePath ...string) (db *MemBackedBlockDB, err error) { + db = &MemBackedBlockDB{ + blockHashSequence: common.Hashes{}, + blocksByHash: make(map[common.Hash]*types.Block), + } + if len(persistantFilePath) == 0 || len(persistantFilePath[0]) == 0 { + return + } + db.persistantFilePath = persistantFilePath[0] + buf, err := ioutil.ReadFile(db.persistantFilePath) + if err != nil { + if !os.IsNotExist(err) { + // Something unexpected happened. + return + } + // It's expected behavior that file doesn't exists, we should not + // report error on it. + err = nil + return + } + + // Init this instance by file content, it's a temporary way + // to export those private field for JSON encoding. + toLoad := struct { + Sequence common.Hashes + ByHash map[common.Hash]*types.Block + }{} + err = json.Unmarshal(buf, &toLoad) + if err != nil { + return + } + db.blockHashSequence = toLoad.Sequence + db.blocksByHash = toLoad.ByHash + return +} + +// Has returns wheter or not the DB has a block identified with the hash. +func (m *MemBackedBlockDB) Has(hash common.Hash) bool { + m.blocksMutex.RLock() + defer m.blocksMutex.RUnlock() + + _, ok := m.blocksByHash[hash] + return ok +} + +// Get returns a block given a hash. +func (m *MemBackedBlockDB) Get(hash common.Hash) (types.Block, error) { + m.blocksMutex.RLock() + defer m.blocksMutex.RUnlock() + + return m.internalGet(hash) +} + +func (m *MemBackedBlockDB) internalGet(hash common.Hash) (types.Block, error) { + b, ok := m.blocksByHash[hash] + if !ok { + return types.Block{}, ErrBlockDoesNotExist + } + return *b, nil +} + +// Put inserts a new block into the database. +func (m *MemBackedBlockDB) Put(block types.Block) error { + if m.Has(block.Hash) { + return ErrBlockExists + } + + m.blocksMutex.Lock() + defer m.blocksMutex.Unlock() + + m.blockHashSequence = append(m.blockHashSequence, block.Hash) + m.blocksByHash[block.Hash] = &block + return nil +} + +// Update updates a block in the database. +func (m *MemBackedBlockDB) Update(block types.Block) error { + if !m.Has(block.Hash) { + return ErrBlockDoesNotExist + } + + m.blocksMutex.Lock() + defer m.blocksMutex.Unlock() + + m.blocksByHash[block.Hash] = &block + return nil +} + +// Close implement Closer interface, which would release allocated resource. +func (m *MemBackedBlockDB) Close() (err error) { + // Save internal state to a pretty-print json file. It's a temporary way + // to dump private file via JSON encoding. + if len(m.persistantFilePath) == 0 { + return + } + + m.blocksMutex.RLock() + defer m.blocksMutex.RUnlock() + + toDump := struct { + Sequence common.Hashes + ByHash map[common.Hash]*types.Block + }{ + Sequence: m.blockHashSequence, + ByHash: m.blocksByHash, + } + + // Dump to JSON with 2-space indent. + buf, err := json.Marshal(&toDump) + if err != nil { + return + } + + err = ioutil.WriteFile(m.persistantFilePath, buf, 0644) + return +} + +func (m *MemBackedBlockDB) getByIndex(idx int) (types.Block, error) { + m.blocksMutex.RLock() + defer m.blocksMutex.RUnlock() + + if idx >= len(m.blockHashSequence) { + return types.Block{}, ErrIterationFinished + } + + hash := m.blockHashSequence[idx] + return m.internalGet(hash) +} + +// GetAll implement Reader.GetAll method, which allows caller +// to retrieve all blocks in DB. +func (m *MemBackedBlockDB) GetAll() (BlockIterator, error) { + return &seqIterator{db: m}, nil +} diff --git a/vendor/github.com/dexon-foundation/dexon-consensus/core/configuration-chain.go b/vendor/github.com/byzantine-lab/dexon-consensus/core/configuration-chain.go index 3b4cdbbc8..0f1400cb5 100644 --- a/vendor/github.com/dexon-foundation/dexon-consensus/core/configuration-chain.go +++ b/vendor/github.com/byzantine-lab/dexon-consensus/core/configuration-chain.go @@ -23,12 +23,12 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon-consensus/common" - "github.com/dexon-foundation/dexon-consensus/core/crypto" - "github.com/dexon-foundation/dexon-consensus/core/db" - "github.com/dexon-foundation/dexon-consensus/core/types" - typesDKG "github.com/dexon-foundation/dexon-consensus/core/types/dkg" - "github.com/dexon-foundation/dexon-consensus/core/utils" + "github.com/byzantine-lab/dexon-consensus/common" + "github.com/byzantine-lab/dexon-consensus/core/crypto" + "github.com/byzantine-lab/dexon-consensus/core/db" + "github.com/byzantine-lab/dexon-consensus/core/types" + typesDKG "github.com/byzantine-lab/dexon-consensus/core/types/dkg" + "github.com/byzantine-lab/dexon-consensus/core/utils" ) // Errors for configuration chain.. diff --git a/vendor/github.com/dexon-foundation/dexon-consensus/core/consensus.go b/vendor/github.com/byzantine-lab/dexon-consensus/core/consensus.go index fd8456487..8b2b9a048 100644 --- a/vendor/github.com/dexon-foundation/dexon-consensus/core/consensus.go +++ b/vendor/github.com/byzantine-lab/dexon-consensus/core/consensus.go @@ -24,13 +24,13 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon-consensus/common" - "github.com/dexon-foundation/dexon-consensus/core/crypto" - cryptoDKG "github.com/dexon-foundation/dexon-consensus/core/crypto/dkg" - "github.com/dexon-foundation/dexon-consensus/core/db" - "github.com/dexon-foundation/dexon-consensus/core/types" - typesDKG "github.com/dexon-foundation/dexon-consensus/core/types/dkg" - "github.com/dexon-foundation/dexon-consensus/core/utils" + "github.com/byzantine-lab/dexon-consensus/common" + "github.com/byzantine-lab/dexon-consensus/core/crypto" + cryptoDKG "github.com/byzantine-lab/dexon-consensus/core/crypto/dkg" + "github.com/byzantine-lab/dexon-consensus/core/db" + "github.com/byzantine-lab/dexon-consensus/core/types" + typesDKG "github.com/byzantine-lab/dexon-consensus/core/types/dkg" + "github.com/byzantine-lab/dexon-consensus/core/utils" ) // Errors for consensus core. diff --git a/vendor/github.com/dexon-foundation/dexon-consensus/core/constant.go b/vendor/github.com/byzantine-lab/dexon-consensus/core/constant.go index 29dae8b73..51b95a3c0 100644 --- a/vendor/github.com/dexon-foundation/dexon-consensus/core/constant.go +++ b/vendor/github.com/byzantine-lab/dexon-consensus/core/constant.go @@ -17,7 +17,7 @@ package core -import "github.com/dexon-foundation/dexon-consensus/core/utils" +import "github.com/byzantine-lab/dexon-consensus/core/utils" // ConfigRoundShift refers to the difference between block's round and config // round derived from its state. diff --git a/vendor/github.com/dexon-foundation/dexon-consensus/core/crypto/dkg/constant.go b/vendor/github.com/byzantine-lab/dexon-consensus/core/crypto/dkg/constant.go index 37d873d6f..3f6627b92 100644 --- a/vendor/github.com/dexon-foundation/dexon-consensus/core/crypto/dkg/constant.go +++ b/vendor/github.com/byzantine-lab/dexon-consensus/core/crypto/dkg/constant.go @@ -18,7 +18,7 @@ package dkg import ( - "github.com/dexon-foundation/bls/ffi/go/bls" + "github.com/byzantine-lab/bls/ffi/go/bls" ) const ( diff --git a/vendor/github.com/dexon-foundation/dexon-consensus/core/crypto/dkg/dkg.go b/vendor/github.com/byzantine-lab/dexon-consensus/core/crypto/dkg/dkg.go index ab43f5130..b9dd038ce 100644 --- a/vendor/github.com/dexon-foundation/dexon-consensus/core/crypto/dkg/dkg.go +++ b/vendor/github.com/byzantine-lab/dexon-consensus/core/crypto/dkg/dkg.go @@ -24,11 +24,11 @@ import ( "sync" "sync/atomic" - "github.com/dexon-foundation/bls/ffi/go/bls" - "github.com/dexon-foundation/dexon/rlp" + "github.com/byzantine-lab/bls/ffi/go/bls" + "github.com/byzantine-lab/go-tangerine/rlp" - "github.com/dexon-foundation/dexon-consensus/common" - "github.com/dexon-foundation/dexon-consensus/core/crypto" + "github.com/byzantine-lab/dexon-consensus/common" + "github.com/byzantine-lab/dexon-consensus/core/crypto" ) var ( diff --git a/vendor/github.com/dexon-foundation/dexon-consensus/core/crypto/dkg/utils.go b/vendor/github.com/byzantine-lab/dexon-consensus/core/crypto/dkg/utils.go index 9e470f0cf..589480a3b 100644 --- a/vendor/github.com/dexon-foundation/dexon-consensus/core/crypto/dkg/utils.go +++ b/vendor/github.com/byzantine-lab/dexon-consensus/core/crypto/dkg/utils.go @@ -22,9 +22,9 @@ import ( "fmt" "math/rand" - "github.com/dexon-foundation/bls/ffi/go/bls" + "github.com/byzantine-lab/bls/ffi/go/bls" - "github.com/dexon-foundation/dexon-consensus/core/crypto" + "github.com/byzantine-lab/dexon-consensus/core/crypto" ) // PartialSignature is a partial signature in DKG+TSIG protocol. diff --git a/vendor/github.com/dexon-foundation/dexon-consensus/core/crypto/ecdsa/ecdsa.go b/vendor/github.com/byzantine-lab/dexon-consensus/core/crypto/ecdsa/ecdsa.go index 9da5f4fb5..5c3bf96bb 100644 --- a/vendor/github.com/dexon-foundation/dexon-consensus/core/crypto/ecdsa/ecdsa.go +++ b/vendor/github.com/byzantine-lab/dexon-consensus/core/crypto/ecdsa/ecdsa.go @@ -20,10 +20,10 @@ package ecdsa import ( "crypto/ecdsa" - dexCrypto "github.com/dexon-foundation/dexon/crypto" + dexCrypto "github.com/byzantine-lab/go-tangerine/crypto" - "github.com/dexon-foundation/dexon-consensus/common" - "github.com/dexon-foundation/dexon-consensus/core/crypto" + "github.com/byzantine-lab/dexon-consensus/common" + "github.com/byzantine-lab/dexon-consensus/core/crypto" ) const cryptoType = "ecdsa" diff --git a/vendor/github.com/dexon-foundation/dexon-consensus/core/crypto/interfaces.go b/vendor/github.com/byzantine-lab/dexon-consensus/core/crypto/interfaces.go index f3e01e42c..9fe47f7dc 100644 --- a/vendor/github.com/dexon-foundation/dexon-consensus/core/crypto/interfaces.go +++ b/vendor/github.com/byzantine-lab/dexon-consensus/core/crypto/interfaces.go @@ -18,7 +18,7 @@ package crypto import ( - "github.com/dexon-foundation/dexon-consensus/common" + "github.com/byzantine-lab/dexon-consensus/common" ) // Signature is the basic signature type in DEXON. diff --git a/vendor/github.com/dexon-foundation/dexon-consensus/core/crypto/utils.go b/vendor/github.com/byzantine-lab/dexon-consensus/core/crypto/utils.go index 59e91f5a5..744be3e5f 100644 --- a/vendor/github.com/dexon-foundation/dexon-consensus/core/crypto/utils.go +++ b/vendor/github.com/byzantine-lab/dexon-consensus/core/crypto/utils.go @@ -21,9 +21,9 @@ import ( "encoding/hex" "fmt" - "github.com/dexon-foundation/dexon/crypto" + "github.com/byzantine-lab/go-tangerine/crypto" - "github.com/dexon-foundation/dexon-consensus/common" + "github.com/byzantine-lab/dexon-consensus/common" ) var ( diff --git a/vendor/github.com/dexon-foundation/dexon-consensus/core/db/interfaces.go b/vendor/github.com/byzantine-lab/dexon-consensus/core/db/interfaces.go index a571a8021..1d15c68a0 100644 --- a/vendor/github.com/dexon-foundation/dexon-consensus/core/db/interfaces.go +++ b/vendor/github.com/byzantine-lab/dexon-consensus/core/db/interfaces.go @@ -21,9 +21,9 @@ import ( "errors" "fmt" - "github.com/dexon-foundation/dexon-consensus/common" - "github.com/dexon-foundation/dexon-consensus/core/crypto/dkg" - "github.com/dexon-foundation/dexon-consensus/core/types" + "github.com/byzantine-lab/dexon-consensus/common" + "github.com/byzantine-lab/dexon-consensus/core/crypto/dkg" + "github.com/byzantine-lab/dexon-consensus/core/types" ) var ( diff --git a/vendor/github.com/dexon-foundation/dexon-consensus/core/db/level-db.go b/vendor/github.com/byzantine-lab/dexon-consensus/core/db/level-db.go index da8bc0bc1..9e3564b50 100644 --- a/vendor/github.com/dexon-foundation/dexon-consensus/core/db/level-db.go +++ b/vendor/github.com/byzantine-lab/dexon-consensus/core/db/level-db.go @@ -23,10 +23,10 @@ import ( "github.com/syndtr/goleveldb/leveldb" - "github.com/dexon-foundation/dexon-consensus/common" - "github.com/dexon-foundation/dexon-consensus/core/crypto/dkg" - "github.com/dexon-foundation/dexon-consensus/core/types" - "github.com/dexon-foundation/dexon/rlp" + "github.com/byzantine-lab/dexon-consensus/common" + "github.com/byzantine-lab/dexon-consensus/core/crypto/dkg" + "github.com/byzantine-lab/dexon-consensus/core/types" + "github.com/byzantine-lab/go-tangerine/rlp" ) var ( diff --git a/vendor/github.com/dexon-foundation/dexon-consensus/core/db/memory.go b/vendor/github.com/byzantine-lab/dexon-consensus/core/db/memory.go index 6555de855..2ad5cda9e 100644 --- a/vendor/github.com/dexon-foundation/dexon-consensus/core/db/memory.go +++ b/vendor/github.com/byzantine-lab/dexon-consensus/core/db/memory.go @@ -23,9 +23,9 @@ import ( "os" "sync" - "github.com/dexon-foundation/dexon-consensus/common" - "github.com/dexon-foundation/dexon-consensus/core/crypto/dkg" - "github.com/dexon-foundation/dexon-consensus/core/types" + "github.com/byzantine-lab/dexon-consensus/common" + "github.com/byzantine-lab/dexon-consensus/core/crypto/dkg" + "github.com/byzantine-lab/dexon-consensus/core/types" ) type blockSeqIterator struct { diff --git a/vendor/github.com/dexon-foundation/dexon-consensus/core/dkg-tsig-protocol.go b/vendor/github.com/byzantine-lab/dexon-consensus/core/dkg-tsig-protocol.go index ce5c89c47..38739da4e 100644 --- a/vendor/github.com/dexon-foundation/dexon-consensus/core/dkg-tsig-protocol.go +++ b/vendor/github.com/byzantine-lab/dexon-consensus/core/dkg-tsig-protocol.go @@ -21,13 +21,13 @@ import ( "fmt" "sync" - "github.com/dexon-foundation/dexon-consensus/common" - "github.com/dexon-foundation/dexon-consensus/core/crypto" - "github.com/dexon-foundation/dexon-consensus/core/crypto/dkg" - "github.com/dexon-foundation/dexon-consensus/core/db" - "github.com/dexon-foundation/dexon-consensus/core/types" - typesDKG "github.com/dexon-foundation/dexon-consensus/core/types/dkg" - "github.com/dexon-foundation/dexon-consensus/core/utils" + "github.com/byzantine-lab/dexon-consensus/common" + "github.com/byzantine-lab/dexon-consensus/core/crypto" + "github.com/byzantine-lab/dexon-consensus/core/crypto/dkg" + "github.com/byzantine-lab/dexon-consensus/core/db" + "github.com/byzantine-lab/dexon-consensus/core/types" + typesDKG "github.com/byzantine-lab/dexon-consensus/core/types/dkg" + "github.com/byzantine-lab/dexon-consensus/core/utils" ) // Errors for dkg module. diff --git a/vendor/github.com/dexon-foundation/dexon-consensus/core/interfaces.go b/vendor/github.com/byzantine-lab/dexon-consensus/core/interfaces.go index c88b3dcb4..3adcf78c9 100644 --- a/vendor/github.com/dexon-foundation/dexon-consensus/core/interfaces.go +++ b/vendor/github.com/byzantine-lab/dexon-consensus/core/interfaces.go @@ -20,10 +20,10 @@ package core import ( "time" - "github.com/dexon-foundation/dexon-consensus/common" - "github.com/dexon-foundation/dexon-consensus/core/crypto" - "github.com/dexon-foundation/dexon-consensus/core/types" - typesDKG "github.com/dexon-foundation/dexon-consensus/core/types/dkg" + "github.com/byzantine-lab/dexon-consensus/common" + "github.com/byzantine-lab/dexon-consensus/core/crypto" + "github.com/byzantine-lab/dexon-consensus/core/types" + typesDKG "github.com/byzantine-lab/dexon-consensus/core/types/dkg" ) // Application describes the application interface that interacts with DEXON diff --git a/vendor/github.com/dexon-foundation/dexon-consensus/core/leader-selector.go b/vendor/github.com/byzantine-lab/dexon-consensus/core/leader-selector.go index 91b2e9979..9e3d406a7 100644 --- a/vendor/github.com/dexon-foundation/dexon-consensus/core/leader-selector.go +++ b/vendor/github.com/byzantine-lab/dexon-consensus/core/leader-selector.go @@ -21,9 +21,9 @@ import ( "math/big" "sync" - "github.com/dexon-foundation/dexon-consensus/common" - "github.com/dexon-foundation/dexon-consensus/core/crypto" - "github.com/dexon-foundation/dexon-consensus/core/types" + "github.com/byzantine-lab/dexon-consensus/common" + "github.com/byzantine-lab/dexon-consensus/core/crypto" + "github.com/byzantine-lab/dexon-consensus/core/types" ) type validLeaderFn func(block *types.Block, crs common.Hash) (bool, error) diff --git a/vendor/github.com/dexon-foundation/dexon-consensus/core/nonblocking.go b/vendor/github.com/byzantine-lab/dexon-consensus/core/nonblocking.go index 10b47b822..516138a63 100644 --- a/vendor/github.com/dexon-foundation/dexon-consensus/core/nonblocking.go +++ b/vendor/github.com/byzantine-lab/dexon-consensus/core/nonblocking.go @@ -21,8 +21,8 @@ import ( "fmt" "sync" - "github.com/dexon-foundation/dexon-consensus/common" - "github.com/dexon-foundation/dexon-consensus/core/types" + "github.com/byzantine-lab/dexon-consensus/common" + "github.com/byzantine-lab/dexon-consensus/core/types" ) type blockConfirmedEvent struct { diff --git a/vendor/github.com/dexon-foundation/dexon-consensus/core/syncer/agreement.go b/vendor/github.com/byzantine-lab/dexon-consensus/core/syncer/agreement.go index d39c24627..274cbfc79 100644 --- a/vendor/github.com/dexon-foundation/dexon-consensus/core/syncer/agreement.go +++ b/vendor/github.com/byzantine-lab/dexon-consensus/core/syncer/agreement.go @@ -23,11 +23,11 @@ import ( "fmt" "time" - "github.com/dexon-foundation/dexon-consensus/common" - "github.com/dexon-foundation/dexon-consensus/core" - "github.com/dexon-foundation/dexon-consensus/core/crypto" - "github.com/dexon-foundation/dexon-consensus/core/types" - "github.com/dexon-foundation/dexon-consensus/core/utils" + "github.com/byzantine-lab/dexon-consensus/common" + "github.com/byzantine-lab/dexon-consensus/core" + "github.com/byzantine-lab/dexon-consensus/core/crypto" + "github.com/byzantine-lab/dexon-consensus/core/types" + "github.com/byzantine-lab/dexon-consensus/core/utils" ) // Struct agreement implements struct of BA (Byzantine Agreement) protocol diff --git a/vendor/github.com/dexon-foundation/dexon-consensus/core/syncer/consensus.go b/vendor/github.com/byzantine-lab/dexon-consensus/core/syncer/consensus.go index 496c0f9a8..d12dc4863 100644 --- a/vendor/github.com/dexon-foundation/dexon-consensus/core/syncer/consensus.go +++ b/vendor/github.com/byzantine-lab/dexon-consensus/core/syncer/consensus.go @@ -24,12 +24,12 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon-consensus/common" - "github.com/dexon-foundation/dexon-consensus/core" - "github.com/dexon-foundation/dexon-consensus/core/crypto" - "github.com/dexon-foundation/dexon-consensus/core/db" - "github.com/dexon-foundation/dexon-consensus/core/types" - "github.com/dexon-foundation/dexon-consensus/core/utils" + "github.com/byzantine-lab/dexon-consensus/common" + "github.com/byzantine-lab/dexon-consensus/core" + "github.com/byzantine-lab/dexon-consensus/core/crypto" + "github.com/byzantine-lab/dexon-consensus/core/db" + "github.com/byzantine-lab/dexon-consensus/core/types" + "github.com/byzantine-lab/dexon-consensus/core/utils" ) var ( diff --git a/vendor/github.com/dexon-foundation/dexon-consensus/core/syncer/watch-cat.go b/vendor/github.com/byzantine-lab/dexon-consensus/core/syncer/watch-cat.go index f2e197ebe..e5ba911a7 100644 --- a/vendor/github.com/dexon-foundation/dexon-consensus/core/syncer/watch-cat.go +++ b/vendor/github.com/byzantine-lab/dexon-consensus/core/syncer/watch-cat.go @@ -21,10 +21,10 @@ import ( "context" "time" - "github.com/dexon-foundation/dexon-consensus/common" - "github.com/dexon-foundation/dexon-consensus/core" - "github.com/dexon-foundation/dexon-consensus/core/types" - "github.com/dexon-foundation/dexon-consensus/core/utils" + "github.com/byzantine-lab/dexon-consensus/common" + "github.com/byzantine-lab/dexon-consensus/core" + "github.com/byzantine-lab/dexon-consensus/core/types" + "github.com/byzantine-lab/dexon-consensus/core/utils" ) type configReader interface { diff --git a/vendor/github.com/dexon-foundation/dexon-consensus/core/ticker.go b/vendor/github.com/byzantine-lab/dexon-consensus/core/ticker.go index 636fb8c49..aba56ef9f 100644 --- a/vendor/github.com/dexon-foundation/dexon-consensus/core/ticker.go +++ b/vendor/github.com/byzantine-lab/dexon-consensus/core/ticker.go @@ -23,7 +23,7 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon-consensus/core/utils" + "github.com/byzantine-lab/dexon-consensus/core/utils" ) // TickerType is the type of ticker. diff --git a/vendor/github.com/dexon-foundation/dexon-consensus/core/types/block-randomness.go b/vendor/github.com/byzantine-lab/dexon-consensus/core/types/block-randomness.go index 1c7454398..b97188705 100644 --- a/vendor/github.com/dexon-foundation/dexon-consensus/core/types/block-randomness.go +++ b/vendor/github.com/byzantine-lab/dexon-consensus/core/types/block-randomness.go @@ -21,7 +21,7 @@ import ( "encoding/hex" "fmt" - "github.com/dexon-foundation/dexon-consensus/common" + "github.com/byzantine-lab/dexon-consensus/common" ) // AgreementResult describes an agremeent result. diff --git a/vendor/github.com/dexon-foundation/dexon-consensus/core/types/block.go b/vendor/github.com/byzantine-lab/dexon-consensus/core/types/block.go index 1dcd41b9e..bc92211b9 100644 --- a/vendor/github.com/dexon-foundation/dexon-consensus/core/types/block.go +++ b/vendor/github.com/byzantine-lab/dexon-consensus/core/types/block.go @@ -25,10 +25,10 @@ import ( "io" "time" - "github.com/dexon-foundation/dexon/rlp" + "github.com/byzantine-lab/go-tangerine/rlp" - "github.com/dexon-foundation/dexon-consensus/common" - "github.com/dexon-foundation/dexon-consensus/core/crypto" + "github.com/byzantine-lab/dexon-consensus/common" + "github.com/byzantine-lab/dexon-consensus/core/crypto" ) // GenesisHeight refers to the initial height the genesis block should be. diff --git a/vendor/github.com/dexon-foundation/dexon-consensus/core/types/config.go b/vendor/github.com/byzantine-lab/dexon-consensus/core/types/config.go index dce38369e..dce38369e 100644 --- a/vendor/github.com/dexon-foundation/dexon-consensus/core/types/config.go +++ b/vendor/github.com/byzantine-lab/dexon-consensus/core/types/config.go diff --git a/vendor/github.com/dexon-foundation/dexon-consensus/core/types/dkg/dkg.go b/vendor/github.com/byzantine-lab/dexon-consensus/core/types/dkg/dkg.go index cb921e586..6c2b777cd 100644 --- a/vendor/github.com/dexon-foundation/dexon-consensus/core/types/dkg/dkg.go +++ b/vendor/github.com/byzantine-lab/dexon-consensus/core/types/dkg/dkg.go @@ -23,12 +23,12 @@ import ( "fmt" "io" - "github.com/dexon-foundation/dexon/rlp" + "github.com/byzantine-lab/go-tangerine/rlp" - "github.com/dexon-foundation/dexon-consensus/common" - "github.com/dexon-foundation/dexon-consensus/core/crypto" - cryptoDKG "github.com/dexon-foundation/dexon-consensus/core/crypto/dkg" - "github.com/dexon-foundation/dexon-consensus/core/types" + "github.com/byzantine-lab/dexon-consensus/common" + "github.com/byzantine-lab/dexon-consensus/core/crypto" + cryptoDKG "github.com/byzantine-lab/dexon-consensus/core/crypto/dkg" + "github.com/byzantine-lab/dexon-consensus/core/types" ) // Errors for typesDKG package. diff --git a/vendor/github.com/dexon-foundation/dexon-consensus/core/types/message.go b/vendor/github.com/byzantine-lab/dexon-consensus/core/types/message.go index 0335cfaae..0335cfaae 100644 --- a/vendor/github.com/dexon-foundation/dexon-consensus/core/types/message.go +++ b/vendor/github.com/byzantine-lab/dexon-consensus/core/types/message.go diff --git a/vendor/github.com/dexon-foundation/dexon-consensus/core/types/node.go b/vendor/github.com/byzantine-lab/dexon-consensus/core/types/node.go index 18b6831e0..84b38a3b1 100644 --- a/vendor/github.com/dexon-foundation/dexon-consensus/core/types/node.go +++ b/vendor/github.com/byzantine-lab/dexon-consensus/core/types/node.go @@ -21,8 +21,8 @@ import ( "bytes" "encoding/hex" - "github.com/dexon-foundation/dexon-consensus/common" - "github.com/dexon-foundation/dexon-consensus/core/crypto" + "github.com/byzantine-lab/dexon-consensus/common" + "github.com/byzantine-lab/dexon-consensus/core/crypto" ) // NodeID is the ID type for nodes. diff --git a/vendor/github.com/dexon-foundation/dexon-consensus/core/types/nodeset.go b/vendor/github.com/byzantine-lab/dexon-consensus/core/types/nodeset.go index 806000763..522bcb224 100644 --- a/vendor/github.com/dexon-foundation/dexon-consensus/core/types/nodeset.go +++ b/vendor/github.com/byzantine-lab/dexon-consensus/core/types/nodeset.go @@ -22,8 +22,8 @@ import ( "encoding/binary" "math/big" - "github.com/dexon-foundation/dexon-consensus/common" - "github.com/dexon-foundation/dexon-consensus/core/crypto" + "github.com/byzantine-lab/dexon-consensus/common" + "github.com/byzantine-lab/dexon-consensus/core/crypto" ) // NodeSet is the node set structure as defined in DEXON consensus core. diff --git a/vendor/github.com/dexon-foundation/dexon-consensus/core/types/position.go b/vendor/github.com/byzantine-lab/dexon-consensus/core/types/position.go index 81d23c266..81d23c266 100644 --- a/vendor/github.com/dexon-foundation/dexon-consensus/core/types/position.go +++ b/vendor/github.com/byzantine-lab/dexon-consensus/core/types/position.go diff --git a/vendor/github.com/dexon-foundation/dexon-consensus/core/types/vote.go b/vendor/github.com/byzantine-lab/dexon-consensus/core/types/vote.go index 8bc0c78c2..def09293a 100644 --- a/vendor/github.com/dexon-foundation/dexon-consensus/core/types/vote.go +++ b/vendor/github.com/byzantine-lab/dexon-consensus/core/types/vote.go @@ -20,9 +20,9 @@ package types import ( "fmt" - "github.com/dexon-foundation/dexon-consensus/common" - "github.com/dexon-foundation/dexon-consensus/core/crypto" - cryptoDKG "github.com/dexon-foundation/dexon-consensus/core/crypto/dkg" + "github.com/byzantine-lab/dexon-consensus/common" + "github.com/byzantine-lab/dexon-consensus/core/crypto" + cryptoDKG "github.com/byzantine-lab/dexon-consensus/core/crypto/dkg" ) // VoteType is the type of vote. diff --git a/vendor/github.com/dexon-foundation/dexon-consensus/core/utils.go b/vendor/github.com/byzantine-lab/dexon-consensus/core/utils.go index c4d7b0fc3..4cb3bf18a 100644 --- a/vendor/github.com/dexon-foundation/dexon-consensus/core/utils.go +++ b/vendor/github.com/byzantine-lab/dexon-consensus/core/utils.go @@ -25,10 +25,10 @@ import ( "sort" "time" - "github.com/dexon-foundation/dexon-consensus/common" - "github.com/dexon-foundation/dexon-consensus/core/crypto" - "github.com/dexon-foundation/dexon-consensus/core/types" - "github.com/dexon-foundation/dexon-consensus/core/utils" + "github.com/byzantine-lab/dexon-consensus/common" + "github.com/byzantine-lab/dexon-consensus/core/crypto" + "github.com/byzantine-lab/dexon-consensus/core/types" + "github.com/byzantine-lab/dexon-consensus/core/utils" ) // Errors for utils. diff --git a/vendor/github.com/dexon-foundation/dexon-consensus/core/utils/crypto.go b/vendor/github.com/byzantine-lab/dexon-consensus/core/utils/crypto.go index 42ee6122e..161c1d495 100644 --- a/vendor/github.com/dexon-foundation/dexon-consensus/core/utils/crypto.go +++ b/vendor/github.com/byzantine-lab/dexon-consensus/core/utils/crypto.go @@ -21,10 +21,10 @@ import ( "bytes" "encoding/binary" - "github.com/dexon-foundation/dexon-consensus/common" - "github.com/dexon-foundation/dexon-consensus/core/crypto" - "github.com/dexon-foundation/dexon-consensus/core/types" - typesDKG "github.com/dexon-foundation/dexon-consensus/core/types/dkg" + "github.com/byzantine-lab/dexon-consensus/common" + "github.com/byzantine-lab/dexon-consensus/core/crypto" + "github.com/byzantine-lab/dexon-consensus/core/types" + typesDKG "github.com/byzantine-lab/dexon-consensus/core/types/dkg" ) func hashWitness(witness *types.Witness) (common.Hash, error) { diff --git a/vendor/github.com/dexon-foundation/dexon-consensus/core/utils/nodeset-cache.go b/vendor/github.com/byzantine-lab/dexon-consensus/core/utils/nodeset-cache.go index 89dcfc86b..028690e18 100644 --- a/vendor/github.com/dexon-foundation/dexon-consensus/core/utils/nodeset-cache.go +++ b/vendor/github.com/byzantine-lab/dexon-consensus/core/utils/nodeset-cache.go @@ -21,9 +21,9 @@ import ( "errors" "sync" - "github.com/dexon-foundation/dexon-consensus/common" - "github.com/dexon-foundation/dexon-consensus/core/crypto" - "github.com/dexon-foundation/dexon-consensus/core/types" + "github.com/byzantine-lab/dexon-consensus/common" + "github.com/byzantine-lab/dexon-consensus/core/crypto" + "github.com/byzantine-lab/dexon-consensus/core/types" ) var ( diff --git a/vendor/github.com/dexon-foundation/dexon-consensus/core/utils/penalty-helper.go b/vendor/github.com/byzantine-lab/dexon-consensus/core/utils/penalty-helper.go index 0b38474a6..658fe79a9 100644 --- a/vendor/github.com/dexon-foundation/dexon-consensus/core/utils/penalty-helper.go +++ b/vendor/github.com/byzantine-lab/dexon-consensus/core/utils/penalty-helper.go @@ -20,8 +20,8 @@ package utils import ( "errors" - "github.com/dexon-foundation/dexon-consensus/core/types" - typesDKG "github.com/dexon-foundation/dexon-consensus/core/types/dkg" + "github.com/byzantine-lab/dexon-consensus/core/types" + typesDKG "github.com/byzantine-lab/dexon-consensus/core/types/dkg" ) var ( diff --git a/vendor/github.com/dexon-foundation/dexon-consensus/core/utils/round-based-config.go b/vendor/github.com/byzantine-lab/dexon-consensus/core/utils/round-based-config.go index 4c83d046b..88842cacf 100644 --- a/vendor/github.com/dexon-foundation/dexon-consensus/core/utils/round-based-config.go +++ b/vendor/github.com/byzantine-lab/dexon-consensus/core/utils/round-based-config.go @@ -20,7 +20,7 @@ package utils import ( "fmt" - "github.com/dexon-foundation/dexon-consensus/core/types" + "github.com/byzantine-lab/dexon-consensus/core/types" ) // RoundBasedConfig is based config for rounds and provide boundary checking diff --git a/vendor/github.com/dexon-foundation/dexon-consensus/core/utils/round-event.go b/vendor/github.com/byzantine-lab/dexon-consensus/core/utils/round-event.go index bda4383fa..4f4b04542 100644 --- a/vendor/github.com/dexon-foundation/dexon-consensus/core/utils/round-event.go +++ b/vendor/github.com/byzantine-lab/dexon-consensus/core/utils/round-event.go @@ -22,9 +22,9 @@ import ( "fmt" "sync" - "github.com/dexon-foundation/dexon-consensus/common" - "github.com/dexon-foundation/dexon-consensus/core/types" - typesDKG "github.com/dexon-foundation/dexon-consensus/core/types/dkg" + "github.com/byzantine-lab/dexon-consensus/common" + "github.com/byzantine-lab/dexon-consensus/core/types" + typesDKG "github.com/byzantine-lab/dexon-consensus/core/types/dkg" ) // ErrUnmatchedBlockHeightWithConfig is for invalid parameters for NewRoundEvent. diff --git a/vendor/github.com/dexon-foundation/dexon-consensus/core/utils/signer.go b/vendor/github.com/byzantine-lab/dexon-consensus/core/utils/signer.go index ff767437f..9128e264c 100644 --- a/vendor/github.com/dexon-foundation/dexon-consensus/core/utils/signer.go +++ b/vendor/github.com/byzantine-lab/dexon-consensus/core/utils/signer.go @@ -20,10 +20,10 @@ package utils import ( "errors" - "github.com/dexon-foundation/dexon-consensus/common" - "github.com/dexon-foundation/dexon-consensus/core/crypto" - "github.com/dexon-foundation/dexon-consensus/core/types" - typesDKG "github.com/dexon-foundation/dexon-consensus/core/types/dkg" + "github.com/byzantine-lab/dexon-consensus/common" + "github.com/byzantine-lab/dexon-consensus/core/crypto" + "github.com/byzantine-lab/dexon-consensus/core/types" + typesDKG "github.com/byzantine-lab/dexon-consensus/core/types/dkg" ) // Errors for signer. diff --git a/vendor/github.com/dexon-foundation/dexon-consensus/core/utils/utils.go b/vendor/github.com/byzantine-lab/dexon-consensus/core/utils/utils.go index f259f34bb..6ff5bb62f 100644 --- a/vendor/github.com/dexon-foundation/dexon-consensus/core/utils/utils.go +++ b/vendor/github.com/byzantine-lab/dexon-consensus/core/utils/utils.go @@ -21,9 +21,9 @@ import ( "context" "fmt" - "github.com/dexon-foundation/dexon-consensus/common" - "github.com/dexon-foundation/dexon-consensus/core/types" - typesDKG "github.com/dexon-foundation/dexon-consensus/core/types/dkg" + "github.com/byzantine-lab/dexon-consensus/common" + "github.com/byzantine-lab/dexon-consensus/core/types" + typesDKG "github.com/byzantine-lab/dexon-consensus/core/types/dkg" ) var dkgDelayRound uint64 diff --git a/vendor/github.com/dexon-foundation/dexon-consensus/core/utils/vote-filter.go b/vendor/github.com/byzantine-lab/dexon-consensus/core/utils/vote-filter.go index 446d88a64..556c2489a 100644 --- a/vendor/github.com/dexon-foundation/dexon-consensus/core/utils/vote-filter.go +++ b/vendor/github.com/byzantine-lab/dexon-consensus/core/utils/vote-filter.go @@ -18,7 +18,7 @@ package utils import ( - "github.com/dexon-foundation/dexon-consensus/core/types" + "github.com/byzantine-lab/dexon-consensus/core/types" ) // VoteFilter filters votes that are useless for now. diff --git a/vendor/github.com/dexon-foundation/mcl/.gitignore b/vendor/github.com/byzantine-lab/mcl/.gitignore index f5edb3706..f5edb3706 100644 --- a/vendor/github.com/dexon-foundation/mcl/.gitignore +++ b/vendor/github.com/byzantine-lab/mcl/.gitignore diff --git a/vendor/github.com/dexon-foundation/mcl/.travis.yml b/vendor/github.com/byzantine-lab/mcl/.travis.yml index 73a97e6aa..73a97e6aa 100644 --- a/vendor/github.com/dexon-foundation/mcl/.travis.yml +++ b/vendor/github.com/byzantine-lab/mcl/.travis.yml diff --git a/vendor/github.com/dexon-foundation/mcl/CMakeLists.txt b/vendor/github.com/byzantine-lab/mcl/CMakeLists.txt index aaa0a8cf2..aaa0a8cf2 100644 --- a/vendor/github.com/dexon-foundation/mcl/CMakeLists.txt +++ b/vendor/github.com/byzantine-lab/mcl/CMakeLists.txt diff --git a/vendor/github.com/dexon-foundation/mcl/COPYRIGHT b/vendor/github.com/byzantine-lab/mcl/COPYRIGHT index 90e49b4bc..90e49b4bc 100644 --- a/vendor/github.com/dexon-foundation/mcl/COPYRIGHT +++ b/vendor/github.com/byzantine-lab/mcl/COPYRIGHT diff --git a/vendor/github.com/dexon-foundation/mcl/Makefile b/vendor/github.com/byzantine-lab/mcl/Makefile index 7df1dd300..7df1dd300 100644 --- a/vendor/github.com/dexon-foundation/mcl/Makefile +++ b/vendor/github.com/byzantine-lab/mcl/Makefile diff --git a/vendor/github.com/dexon-foundation/mcl/bench.txt b/vendor/github.com/byzantine-lab/mcl/bench.txt index 35e47dca5..35e47dca5 100644 --- a/vendor/github.com/dexon-foundation/mcl/bench.txt +++ b/vendor/github.com/byzantine-lab/mcl/bench.txt diff --git a/vendor/github.com/dexon-foundation/mcl/common.mk b/vendor/github.com/byzantine-lab/mcl/common.mk index 5c749e1a6..5c749e1a6 100644 --- a/vendor/github.com/dexon-foundation/mcl/common.mk +++ b/vendor/github.com/byzantine-lab/mcl/common.mk diff --git a/vendor/github.com/dexon-foundation/mcl/common.props b/vendor/github.com/byzantine-lab/mcl/common.props index 912f39e30..912f39e30 100644 --- a/vendor/github.com/dexon-foundation/mcl/common.props +++ b/vendor/github.com/byzantine-lab/mcl/common.props diff --git a/vendor/github.com/dexon-foundation/mcl/debug.props b/vendor/github.com/byzantine-lab/mcl/debug.props index 1553ae0dc..1553ae0dc 100644 --- a/vendor/github.com/dexon-foundation/mcl/debug.props +++ b/vendor/github.com/byzantine-lab/mcl/debug.props diff --git a/vendor/github.com/dexon-foundation/mcl/ffi/cs/App.config b/vendor/github.com/byzantine-lab/mcl/ffi/cs/App.config index 88fa4027b..88fa4027b 100644 --- a/vendor/github.com/dexon-foundation/mcl/ffi/cs/App.config +++ b/vendor/github.com/byzantine-lab/mcl/ffi/cs/App.config diff --git a/vendor/github.com/dexon-foundation/mcl/ffi/cs/Properties/AssemblyInfo.cs b/vendor/github.com/byzantine-lab/mcl/ffi/cs/Properties/AssemblyInfo.cs index c87e1d44b..c87e1d44b 100644 --- a/vendor/github.com/dexon-foundation/mcl/ffi/cs/Properties/AssemblyInfo.cs +++ b/vendor/github.com/byzantine-lab/mcl/ffi/cs/Properties/AssemblyInfo.cs diff --git a/vendor/github.com/dexon-foundation/mcl/ffi/cs/bn256.cs b/vendor/github.com/byzantine-lab/mcl/ffi/cs/bn256.cs index 0e1ed032c..0e1ed032c 100644 --- a/vendor/github.com/dexon-foundation/mcl/ffi/cs/bn256.cs +++ b/vendor/github.com/byzantine-lab/mcl/ffi/cs/bn256.cs diff --git a/vendor/github.com/dexon-foundation/mcl/ffi/cs/bn256.csproj b/vendor/github.com/byzantine-lab/mcl/ffi/cs/bn256.csproj index 21a049f01..21a049f01 100644 --- a/vendor/github.com/dexon-foundation/mcl/ffi/cs/bn256.csproj +++ b/vendor/github.com/byzantine-lab/mcl/ffi/cs/bn256.csproj diff --git a/vendor/github.com/dexon-foundation/mcl/ffi/cs/bn256.sln b/vendor/github.com/byzantine-lab/mcl/ffi/cs/bn256.sln index 6e6aa67ee..6e6aa67ee 100644 --- a/vendor/github.com/dexon-foundation/mcl/ffi/cs/bn256.sln +++ b/vendor/github.com/byzantine-lab/mcl/ffi/cs/bn256.sln diff --git a/vendor/github.com/dexon-foundation/mcl/ffi/cs/bn256_test.cs b/vendor/github.com/byzantine-lab/mcl/ffi/cs/bn256_test.cs index cad8c03d3..cad8c03d3 100644 --- a/vendor/github.com/dexon-foundation/mcl/ffi/cs/bn256_test.cs +++ b/vendor/github.com/byzantine-lab/mcl/ffi/cs/bn256_test.cs diff --git a/vendor/github.com/dexon-foundation/mcl/ffi/go/mcl/mcl.go b/vendor/github.com/byzantine-lab/mcl/ffi/go/mcl/mcl.go index a0c8bb4d3..a0c8bb4d3 100644 --- a/vendor/github.com/dexon-foundation/mcl/ffi/go/mcl/mcl.go +++ b/vendor/github.com/byzantine-lab/mcl/ffi/go/mcl/mcl.go diff --git a/vendor/github.com/dexon-foundation/mcl/ffi/go/mcl/mcl_test.go b/vendor/github.com/byzantine-lab/mcl/ffi/go/mcl/mcl_test.go index 16bb6910f..16bb6910f 100644 --- a/vendor/github.com/dexon-foundation/mcl/ffi/go/mcl/mcl_test.go +++ b/vendor/github.com/byzantine-lab/mcl/ffi/go/mcl/mcl_test.go diff --git a/vendor/github.com/dexon-foundation/mcl/ffi/java/Bn256Test.java b/vendor/github.com/byzantine-lab/mcl/ffi/java/Bn256Test.java index b1f9f6f34..b1f9f6f34 100644 --- a/vendor/github.com/dexon-foundation/mcl/ffi/java/Bn256Test.java +++ b/vendor/github.com/byzantine-lab/mcl/ffi/java/Bn256Test.java diff --git a/vendor/github.com/dexon-foundation/mcl/ffi/java/ElgamalTest.java b/vendor/github.com/byzantine-lab/mcl/ffi/java/ElgamalTest.java index 0cf49e144..0cf49e144 100644 --- a/vendor/github.com/dexon-foundation/mcl/ffi/java/ElgamalTest.java +++ b/vendor/github.com/byzantine-lab/mcl/ffi/java/ElgamalTest.java diff --git a/vendor/github.com/dexon-foundation/mcl/ffi/java/Makefile b/vendor/github.com/byzantine-lab/mcl/ffi/java/Makefile index d69c043fb..d69c043fb 100644 --- a/vendor/github.com/dexon-foundation/mcl/ffi/java/Makefile +++ b/vendor/github.com/byzantine-lab/mcl/ffi/java/Makefile diff --git a/vendor/github.com/dexon-foundation/mcl/ffi/java/bn256.i b/vendor/github.com/byzantine-lab/mcl/ffi/java/bn256.i index 94a8edb7a..94a8edb7a 100644 --- a/vendor/github.com/dexon-foundation/mcl/ffi/java/bn256.i +++ b/vendor/github.com/byzantine-lab/mcl/ffi/java/bn256.i diff --git a/vendor/github.com/dexon-foundation/mcl/ffi/java/bn256_impl.hpp b/vendor/github.com/byzantine-lab/mcl/ffi/java/bn256_impl.hpp index c4caaf3ca..c4caaf3ca 100644 --- a/vendor/github.com/dexon-foundation/mcl/ffi/java/bn256_impl.hpp +++ b/vendor/github.com/byzantine-lab/mcl/ffi/java/bn256_impl.hpp diff --git a/vendor/github.com/dexon-foundation/mcl/ffi/java/bn256_wrap.cxx b/vendor/github.com/byzantine-lab/mcl/ffi/java/bn256_wrap.cxx index 0c8257af5..0c8257af5 100644 --- a/vendor/github.com/dexon-foundation/mcl/ffi/java/bn256_wrap.cxx +++ b/vendor/github.com/byzantine-lab/mcl/ffi/java/bn256_wrap.cxx diff --git a/vendor/github.com/dexon-foundation/mcl/ffi/java/elgamal.i b/vendor/github.com/byzantine-lab/mcl/ffi/java/elgamal.i index 410723174..410723174 100644 --- a/vendor/github.com/dexon-foundation/mcl/ffi/java/elgamal.i +++ b/vendor/github.com/byzantine-lab/mcl/ffi/java/elgamal.i diff --git a/vendor/github.com/dexon-foundation/mcl/ffi/java/elgamal_impl.hpp b/vendor/github.com/byzantine-lab/mcl/ffi/java/elgamal_impl.hpp index dbf2ba64e..dbf2ba64e 100644 --- a/vendor/github.com/dexon-foundation/mcl/ffi/java/elgamal_impl.hpp +++ b/vendor/github.com/byzantine-lab/mcl/ffi/java/elgamal_impl.hpp diff --git a/vendor/github.com/dexon-foundation/mcl/ffi/java/elgamal_wrap.cxx b/vendor/github.com/byzantine-lab/mcl/ffi/java/elgamal_wrap.cxx index 38d05f489..38d05f489 100644 --- a/vendor/github.com/dexon-foundation/mcl/ffi/java/elgamal_wrap.cxx +++ b/vendor/github.com/byzantine-lab/mcl/ffi/java/elgamal_wrap.cxx diff --git a/vendor/github.com/dexon-foundation/mcl/ffi/java/java.md b/vendor/github.com/byzantine-lab/mcl/ffi/java/java.md index 3fe861351..3fe861351 100644 --- a/vendor/github.com/dexon-foundation/mcl/ffi/java/java.md +++ b/vendor/github.com/byzantine-lab/mcl/ffi/java/java.md diff --git a/vendor/github.com/dexon-foundation/mcl/ffi/java/make_wrap.bat b/vendor/github.com/byzantine-lab/mcl/ffi/java/make_wrap.bat index b7008bc02..b7008bc02 100644 --- a/vendor/github.com/dexon-foundation/mcl/ffi/java/make_wrap.bat +++ b/vendor/github.com/byzantine-lab/mcl/ffi/java/make_wrap.bat diff --git a/vendor/github.com/dexon-foundation/mcl/ffi/java/run-bn256.bat b/vendor/github.com/byzantine-lab/mcl/ffi/java/run-bn256.bat index 903876ec6..903876ec6 100644 --- a/vendor/github.com/dexon-foundation/mcl/ffi/java/run-bn256.bat +++ b/vendor/github.com/byzantine-lab/mcl/ffi/java/run-bn256.bat diff --git a/vendor/github.com/dexon-foundation/mcl/ffi/java/run-elgamal.bat b/vendor/github.com/byzantine-lab/mcl/ffi/java/run-elgamal.bat index 8b889a64c..8b889a64c 100644 --- a/vendor/github.com/dexon-foundation/mcl/ffi/java/run-elgamal.bat +++ b/vendor/github.com/byzantine-lab/mcl/ffi/java/run-elgamal.bat diff --git a/vendor/github.com/dexon-foundation/mcl/ffi/java/set-java-path.bat b/vendor/github.com/byzantine-lab/mcl/ffi/java/set-java-path.bat index c66f81830..c66f81830 100644 --- a/vendor/github.com/dexon-foundation/mcl/ffi/java/set-java-path.bat +++ b/vendor/github.com/byzantine-lab/mcl/ffi/java/set-java-path.bat diff --git a/vendor/github.com/dexon-foundation/mcl/ffi/js/export-functions.py b/vendor/github.com/byzantine-lab/mcl/ffi/js/export-functions.py index 2a929564b..2a929564b 100644 --- a/vendor/github.com/dexon-foundation/mcl/ffi/js/export-functions.py +++ b/vendor/github.com/byzantine-lab/mcl/ffi/js/export-functions.py diff --git a/vendor/github.com/dexon-foundation/mcl/ffi/js/pre-mcl.js b/vendor/github.com/byzantine-lab/mcl/ffi/js/pre-mcl.js index ebc93e581..ebc93e581 100644 --- a/vendor/github.com/dexon-foundation/mcl/ffi/js/pre-mcl.js +++ b/vendor/github.com/byzantine-lab/mcl/ffi/js/pre-mcl.js diff --git a/vendor/github.com/dexon-foundation/mcl/ffi/python/pairing.py b/vendor/github.com/byzantine-lab/mcl/ffi/python/pairing.py index 88b729176..88b729176 100644 --- a/vendor/github.com/dexon-foundation/mcl/ffi/python/pairing.py +++ b/vendor/github.com/byzantine-lab/mcl/ffi/python/pairing.py diff --git a/vendor/github.com/dexon-foundation/mcl/ffi/python/she.py b/vendor/github.com/byzantine-lab/mcl/ffi/python/she.py index ab8975274..ab8975274 100644 --- a/vendor/github.com/dexon-foundation/mcl/ffi/python/she.py +++ b/vendor/github.com/byzantine-lab/mcl/ffi/python/she.py diff --git a/vendor/github.com/dexon-foundation/mcl/include/cybozu/array.hpp b/vendor/github.com/byzantine-lab/mcl/include/cybozu/array.hpp index 30df3667d..30df3667d 100644 --- a/vendor/github.com/dexon-foundation/mcl/include/cybozu/array.hpp +++ b/vendor/github.com/byzantine-lab/mcl/include/cybozu/array.hpp diff --git a/vendor/github.com/dexon-foundation/mcl/include/cybozu/atoi.hpp b/vendor/github.com/byzantine-lab/mcl/include/cybozu/atoi.hpp index a22853a17..a22853a17 100644 --- a/vendor/github.com/dexon-foundation/mcl/include/cybozu/atoi.hpp +++ b/vendor/github.com/byzantine-lab/mcl/include/cybozu/atoi.hpp diff --git a/vendor/github.com/dexon-foundation/mcl/include/cybozu/benchmark.hpp b/vendor/github.com/byzantine-lab/mcl/include/cybozu/benchmark.hpp index 4c02f1869..4c02f1869 100644 --- a/vendor/github.com/dexon-foundation/mcl/include/cybozu/benchmark.hpp +++ b/vendor/github.com/byzantine-lab/mcl/include/cybozu/benchmark.hpp diff --git a/vendor/github.com/dexon-foundation/mcl/include/cybozu/bit_operation.hpp b/vendor/github.com/byzantine-lab/mcl/include/cybozu/bit_operation.hpp index 865c1e47d..865c1e47d 100644 --- a/vendor/github.com/dexon-foundation/mcl/include/cybozu/bit_operation.hpp +++ b/vendor/github.com/byzantine-lab/mcl/include/cybozu/bit_operation.hpp diff --git a/vendor/github.com/dexon-foundation/mcl/include/cybozu/critical_section.hpp b/vendor/github.com/byzantine-lab/mcl/include/cybozu/critical_section.hpp index 13d7f3a0e..13d7f3a0e 100644 --- a/vendor/github.com/dexon-foundation/mcl/include/cybozu/critical_section.hpp +++ b/vendor/github.com/byzantine-lab/mcl/include/cybozu/critical_section.hpp diff --git a/vendor/github.com/dexon-foundation/mcl/include/cybozu/crypto.hpp b/vendor/github.com/byzantine-lab/mcl/include/cybozu/crypto.hpp index d427179d9..d427179d9 100644 --- a/vendor/github.com/dexon-foundation/mcl/include/cybozu/crypto.hpp +++ b/vendor/github.com/byzantine-lab/mcl/include/cybozu/crypto.hpp diff --git a/vendor/github.com/dexon-foundation/mcl/include/cybozu/endian.hpp b/vendor/github.com/byzantine-lab/mcl/include/cybozu/endian.hpp index 3f1575c46..3f1575c46 100644 --- a/vendor/github.com/dexon-foundation/mcl/include/cybozu/endian.hpp +++ b/vendor/github.com/byzantine-lab/mcl/include/cybozu/endian.hpp diff --git a/vendor/github.com/dexon-foundation/mcl/include/cybozu/exception.hpp b/vendor/github.com/byzantine-lab/mcl/include/cybozu/exception.hpp index 247ba4de0..247ba4de0 100644 --- a/vendor/github.com/dexon-foundation/mcl/include/cybozu/exception.hpp +++ b/vendor/github.com/byzantine-lab/mcl/include/cybozu/exception.hpp diff --git a/vendor/github.com/dexon-foundation/mcl/include/cybozu/hash.hpp b/vendor/github.com/byzantine-lab/mcl/include/cybozu/hash.hpp index 3fd246fa1..3fd246fa1 100644 --- a/vendor/github.com/dexon-foundation/mcl/include/cybozu/hash.hpp +++ b/vendor/github.com/byzantine-lab/mcl/include/cybozu/hash.hpp diff --git a/vendor/github.com/dexon-foundation/mcl/include/cybozu/inttype.hpp b/vendor/github.com/byzantine-lab/mcl/include/cybozu/inttype.hpp index 62856bdb3..62856bdb3 100644 --- a/vendor/github.com/dexon-foundation/mcl/include/cybozu/inttype.hpp +++ b/vendor/github.com/byzantine-lab/mcl/include/cybozu/inttype.hpp diff --git a/vendor/github.com/dexon-foundation/mcl/include/cybozu/itoa.hpp b/vendor/github.com/byzantine-lab/mcl/include/cybozu/itoa.hpp index 072e5b8b4..072e5b8b4 100644 --- a/vendor/github.com/dexon-foundation/mcl/include/cybozu/itoa.hpp +++ b/vendor/github.com/byzantine-lab/mcl/include/cybozu/itoa.hpp diff --git a/vendor/github.com/dexon-foundation/mcl/include/cybozu/link_libeay32.hpp b/vendor/github.com/byzantine-lab/mcl/include/cybozu/link_libeay32.hpp index d83f1b6ea..d83f1b6ea 100644 --- a/vendor/github.com/dexon-foundation/mcl/include/cybozu/link_libeay32.hpp +++ b/vendor/github.com/byzantine-lab/mcl/include/cybozu/link_libeay32.hpp diff --git a/vendor/github.com/dexon-foundation/mcl/include/cybozu/link_mpir.hpp b/vendor/github.com/byzantine-lab/mcl/include/cybozu/link_mpir.hpp index d20d7b1a9..d20d7b1a9 100644 --- a/vendor/github.com/dexon-foundation/mcl/include/cybozu/link_mpir.hpp +++ b/vendor/github.com/byzantine-lab/mcl/include/cybozu/link_mpir.hpp diff --git a/vendor/github.com/dexon-foundation/mcl/include/cybozu/link_ssleay32.hpp b/vendor/github.com/byzantine-lab/mcl/include/cybozu/link_ssleay32.hpp index 60c2361ae..60c2361ae 100644 --- a/vendor/github.com/dexon-foundation/mcl/include/cybozu/link_ssleay32.hpp +++ b/vendor/github.com/byzantine-lab/mcl/include/cybozu/link_ssleay32.hpp diff --git a/vendor/github.com/dexon-foundation/mcl/include/cybozu/mutex.hpp b/vendor/github.com/byzantine-lab/mcl/include/cybozu/mutex.hpp index acde6bcbf..acde6bcbf 100644 --- a/vendor/github.com/dexon-foundation/mcl/include/cybozu/mutex.hpp +++ b/vendor/github.com/byzantine-lab/mcl/include/cybozu/mutex.hpp diff --git a/vendor/github.com/dexon-foundation/mcl/include/cybozu/option.hpp b/vendor/github.com/byzantine-lab/mcl/include/cybozu/option.hpp index a5dfd137d..a5dfd137d 100644 --- a/vendor/github.com/dexon-foundation/mcl/include/cybozu/option.hpp +++ b/vendor/github.com/byzantine-lab/mcl/include/cybozu/option.hpp diff --git a/vendor/github.com/dexon-foundation/mcl/include/cybozu/random_generator.hpp b/vendor/github.com/byzantine-lab/mcl/include/cybozu/random_generator.hpp index ff4a78da5..ff4a78da5 100644 --- a/vendor/github.com/dexon-foundation/mcl/include/cybozu/random_generator.hpp +++ b/vendor/github.com/byzantine-lab/mcl/include/cybozu/random_generator.hpp diff --git a/vendor/github.com/dexon-foundation/mcl/include/cybozu/serializer.hpp b/vendor/github.com/byzantine-lab/mcl/include/cybozu/serializer.hpp index 1e23c8f42..1e23c8f42 100644 --- a/vendor/github.com/dexon-foundation/mcl/include/cybozu/serializer.hpp +++ b/vendor/github.com/byzantine-lab/mcl/include/cybozu/serializer.hpp diff --git a/vendor/github.com/dexon-foundation/mcl/include/cybozu/sha2.hpp b/vendor/github.com/byzantine-lab/mcl/include/cybozu/sha2.hpp index 1830936f0..1830936f0 100644 --- a/vendor/github.com/dexon-foundation/mcl/include/cybozu/sha2.hpp +++ b/vendor/github.com/byzantine-lab/mcl/include/cybozu/sha2.hpp diff --git a/vendor/github.com/dexon-foundation/mcl/include/cybozu/stream.hpp b/vendor/github.com/byzantine-lab/mcl/include/cybozu/stream.hpp index bc110bdb0..bc110bdb0 100644 --- a/vendor/github.com/dexon-foundation/mcl/include/cybozu/stream.hpp +++ b/vendor/github.com/byzantine-lab/mcl/include/cybozu/stream.hpp diff --git a/vendor/github.com/dexon-foundation/mcl/include/cybozu/test.hpp b/vendor/github.com/byzantine-lab/mcl/include/cybozu/test.hpp index 7dfffab96..7dfffab96 100644 --- a/vendor/github.com/dexon-foundation/mcl/include/cybozu/test.hpp +++ b/vendor/github.com/byzantine-lab/mcl/include/cybozu/test.hpp diff --git a/vendor/github.com/dexon-foundation/mcl/include/cybozu/unordered_map.hpp b/vendor/github.com/byzantine-lab/mcl/include/cybozu/unordered_map.hpp index 89f8f8774..89f8f8774 100644 --- a/vendor/github.com/dexon-foundation/mcl/include/cybozu/unordered_map.hpp +++ b/vendor/github.com/byzantine-lab/mcl/include/cybozu/unordered_map.hpp diff --git a/vendor/github.com/dexon-foundation/mcl/include/cybozu/xorshift.hpp b/vendor/github.com/byzantine-lab/mcl/include/cybozu/xorshift.hpp index 08c6a04f9..08c6a04f9 100644 --- a/vendor/github.com/dexon-foundation/mcl/include/cybozu/xorshift.hpp +++ b/vendor/github.com/byzantine-lab/mcl/include/cybozu/xorshift.hpp diff --git a/vendor/github.com/dexon-foundation/mcl/include/mcl/aggregate_sig.hpp b/vendor/github.com/byzantine-lab/mcl/include/mcl/aggregate_sig.hpp index f31405705..f31405705 100644 --- a/vendor/github.com/dexon-foundation/mcl/include/mcl/aggregate_sig.hpp +++ b/vendor/github.com/byzantine-lab/mcl/include/mcl/aggregate_sig.hpp diff --git a/vendor/github.com/dexon-foundation/mcl/include/mcl/ahe.hpp b/vendor/github.com/byzantine-lab/mcl/include/mcl/ahe.hpp index 239319d0d..239319d0d 100644 --- a/vendor/github.com/dexon-foundation/mcl/include/mcl/ahe.hpp +++ b/vendor/github.com/byzantine-lab/mcl/include/mcl/ahe.hpp diff --git a/vendor/github.com/dexon-foundation/mcl/include/mcl/array.hpp b/vendor/github.com/byzantine-lab/mcl/include/mcl/array.hpp index a6d2a8fa3..a6d2a8fa3 100644 --- a/vendor/github.com/dexon-foundation/mcl/include/mcl/array.hpp +++ b/vendor/github.com/byzantine-lab/mcl/include/mcl/array.hpp diff --git a/vendor/github.com/dexon-foundation/mcl/include/mcl/bls12_381.hpp b/vendor/github.com/byzantine-lab/mcl/include/mcl/bls12_381.hpp index 316e142af..316e142af 100644 --- a/vendor/github.com/dexon-foundation/mcl/include/mcl/bls12_381.hpp +++ b/vendor/github.com/byzantine-lab/mcl/include/mcl/bls12_381.hpp diff --git a/vendor/github.com/dexon-foundation/mcl/include/mcl/bn.h b/vendor/github.com/byzantine-lab/mcl/include/mcl/bn.h index 0a31d5501..0a31d5501 100644 --- a/vendor/github.com/dexon-foundation/mcl/include/mcl/bn.h +++ b/vendor/github.com/byzantine-lab/mcl/include/mcl/bn.h diff --git a/vendor/github.com/dexon-foundation/mcl/include/mcl/bn.hpp b/vendor/github.com/byzantine-lab/mcl/include/mcl/bn.hpp index 5ebe5d956..5ebe5d956 100644 --- a/vendor/github.com/dexon-foundation/mcl/include/mcl/bn.hpp +++ b/vendor/github.com/byzantine-lab/mcl/include/mcl/bn.hpp diff --git a/vendor/github.com/dexon-foundation/mcl/include/mcl/bn256.hpp b/vendor/github.com/byzantine-lab/mcl/include/mcl/bn256.hpp index 7a5da7a05..7a5da7a05 100644 --- a/vendor/github.com/dexon-foundation/mcl/include/mcl/bn256.hpp +++ b/vendor/github.com/byzantine-lab/mcl/include/mcl/bn256.hpp diff --git a/vendor/github.com/dexon-foundation/mcl/include/mcl/bn384.hpp b/vendor/github.com/byzantine-lab/mcl/include/mcl/bn384.hpp index 8aa14fe5c..8aa14fe5c 100644 --- a/vendor/github.com/dexon-foundation/mcl/include/mcl/bn384.hpp +++ b/vendor/github.com/byzantine-lab/mcl/include/mcl/bn384.hpp diff --git a/vendor/github.com/dexon-foundation/mcl/include/mcl/bn512.hpp b/vendor/github.com/byzantine-lab/mcl/include/mcl/bn512.hpp index c87ad9035..c87ad9035 100644 --- a/vendor/github.com/dexon-foundation/mcl/include/mcl/bn512.hpp +++ b/vendor/github.com/byzantine-lab/mcl/include/mcl/bn512.hpp diff --git a/vendor/github.com/dexon-foundation/mcl/include/mcl/conversion.hpp b/vendor/github.com/byzantine-lab/mcl/include/mcl/conversion.hpp index 7a04b7fa2..7a04b7fa2 100644 --- a/vendor/github.com/dexon-foundation/mcl/include/mcl/conversion.hpp +++ b/vendor/github.com/byzantine-lab/mcl/include/mcl/conversion.hpp diff --git a/vendor/github.com/dexon-foundation/mcl/include/mcl/curve_type.h b/vendor/github.com/byzantine-lab/mcl/include/mcl/curve_type.h index 9e4a941a0..9e4a941a0 100644 --- a/vendor/github.com/dexon-foundation/mcl/include/mcl/curve_type.h +++ b/vendor/github.com/byzantine-lab/mcl/include/mcl/curve_type.h diff --git a/vendor/github.com/dexon-foundation/mcl/include/mcl/ec.hpp b/vendor/github.com/byzantine-lab/mcl/include/mcl/ec.hpp index b8eb10be3..b8eb10be3 100644 --- a/vendor/github.com/dexon-foundation/mcl/include/mcl/ec.hpp +++ b/vendor/github.com/byzantine-lab/mcl/include/mcl/ec.hpp diff --git a/vendor/github.com/dexon-foundation/mcl/include/mcl/ecdsa.h b/vendor/github.com/byzantine-lab/mcl/include/mcl/ecdsa.h index daeb6be53..daeb6be53 100644 --- a/vendor/github.com/dexon-foundation/mcl/include/mcl/ecdsa.h +++ b/vendor/github.com/byzantine-lab/mcl/include/mcl/ecdsa.h diff --git a/vendor/github.com/dexon-foundation/mcl/include/mcl/ecdsa.hpp b/vendor/github.com/byzantine-lab/mcl/include/mcl/ecdsa.hpp index cf3ed3f65..cf3ed3f65 100644 --- a/vendor/github.com/dexon-foundation/mcl/include/mcl/ecdsa.hpp +++ b/vendor/github.com/byzantine-lab/mcl/include/mcl/ecdsa.hpp diff --git a/vendor/github.com/dexon-foundation/mcl/include/mcl/ecparam.hpp b/vendor/github.com/byzantine-lab/mcl/include/mcl/ecparam.hpp index 087bf8b6c..087bf8b6c 100644 --- a/vendor/github.com/dexon-foundation/mcl/include/mcl/ecparam.hpp +++ b/vendor/github.com/byzantine-lab/mcl/include/mcl/ecparam.hpp diff --git a/vendor/github.com/dexon-foundation/mcl/include/mcl/elgamal.hpp b/vendor/github.com/byzantine-lab/mcl/include/mcl/elgamal.hpp index 431148508..431148508 100644 --- a/vendor/github.com/dexon-foundation/mcl/include/mcl/elgamal.hpp +++ b/vendor/github.com/byzantine-lab/mcl/include/mcl/elgamal.hpp diff --git a/vendor/github.com/dexon-foundation/mcl/include/mcl/fp.hpp b/vendor/github.com/byzantine-lab/mcl/include/mcl/fp.hpp index 2e69729dd..2e69729dd 100644 --- a/vendor/github.com/dexon-foundation/mcl/include/mcl/fp.hpp +++ b/vendor/github.com/byzantine-lab/mcl/include/mcl/fp.hpp diff --git a/vendor/github.com/dexon-foundation/mcl/include/mcl/fp_tower.hpp b/vendor/github.com/byzantine-lab/mcl/include/mcl/fp_tower.hpp index 95722e2d5..95722e2d5 100644 --- a/vendor/github.com/dexon-foundation/mcl/include/mcl/fp_tower.hpp +++ b/vendor/github.com/byzantine-lab/mcl/include/mcl/fp_tower.hpp diff --git a/vendor/github.com/dexon-foundation/mcl/include/mcl/gmp_util.hpp b/vendor/github.com/byzantine-lab/mcl/include/mcl/gmp_util.hpp index bcbd91a1e..bcbd91a1e 100644 --- a/vendor/github.com/dexon-foundation/mcl/include/mcl/gmp_util.hpp +++ b/vendor/github.com/byzantine-lab/mcl/include/mcl/gmp_util.hpp diff --git a/vendor/github.com/dexon-foundation/mcl/include/mcl/impl/bn_c_impl.hpp b/vendor/github.com/byzantine-lab/mcl/include/mcl/impl/bn_c_impl.hpp index bec2466dd..bec2466dd 100644 --- a/vendor/github.com/dexon-foundation/mcl/include/mcl/impl/bn_c_impl.hpp +++ b/vendor/github.com/byzantine-lab/mcl/include/mcl/impl/bn_c_impl.hpp diff --git a/vendor/github.com/dexon-foundation/mcl/include/mcl/lagrange.hpp b/vendor/github.com/byzantine-lab/mcl/include/mcl/lagrange.hpp index 18e0597ec..18e0597ec 100644 --- a/vendor/github.com/dexon-foundation/mcl/include/mcl/lagrange.hpp +++ b/vendor/github.com/byzantine-lab/mcl/include/mcl/lagrange.hpp diff --git a/vendor/github.com/dexon-foundation/mcl/include/mcl/op.hpp b/vendor/github.com/byzantine-lab/mcl/include/mcl/op.hpp index 36d37035e..36d37035e 100644 --- a/vendor/github.com/dexon-foundation/mcl/include/mcl/op.hpp +++ b/vendor/github.com/byzantine-lab/mcl/include/mcl/op.hpp diff --git a/vendor/github.com/dexon-foundation/mcl/include/mcl/operator.hpp b/vendor/github.com/byzantine-lab/mcl/include/mcl/operator.hpp index e9bc506df..e9bc506df 100644 --- a/vendor/github.com/dexon-foundation/mcl/include/mcl/operator.hpp +++ b/vendor/github.com/byzantine-lab/mcl/include/mcl/operator.hpp diff --git a/vendor/github.com/dexon-foundation/mcl/include/mcl/paillier.hpp b/vendor/github.com/byzantine-lab/mcl/include/mcl/paillier.hpp index 03e44cb16..03e44cb16 100644 --- a/vendor/github.com/dexon-foundation/mcl/include/mcl/paillier.hpp +++ b/vendor/github.com/byzantine-lab/mcl/include/mcl/paillier.hpp diff --git a/vendor/github.com/dexon-foundation/mcl/include/mcl/randgen.hpp b/vendor/github.com/byzantine-lab/mcl/include/mcl/randgen.hpp index 30502fc10..30502fc10 100644 --- a/vendor/github.com/dexon-foundation/mcl/include/mcl/randgen.hpp +++ b/vendor/github.com/byzantine-lab/mcl/include/mcl/randgen.hpp diff --git a/vendor/github.com/dexon-foundation/mcl/include/mcl/she.h b/vendor/github.com/byzantine-lab/mcl/include/mcl/she.h index 60b399c65..60b399c65 100644 --- a/vendor/github.com/dexon-foundation/mcl/include/mcl/she.h +++ b/vendor/github.com/byzantine-lab/mcl/include/mcl/she.h diff --git a/vendor/github.com/dexon-foundation/mcl/include/mcl/she.hpp b/vendor/github.com/byzantine-lab/mcl/include/mcl/she.hpp index 3ce361454..3ce361454 100644 --- a/vendor/github.com/dexon-foundation/mcl/include/mcl/she.hpp +++ b/vendor/github.com/byzantine-lab/mcl/include/mcl/she.hpp diff --git a/vendor/github.com/dexon-foundation/mcl/include/mcl/util.hpp b/vendor/github.com/byzantine-lab/mcl/include/mcl/util.hpp index edef971cb..edef971cb 100644 --- a/vendor/github.com/dexon-foundation/mcl/include/mcl/util.hpp +++ b/vendor/github.com/byzantine-lab/mcl/include/mcl/util.hpp diff --git a/vendor/github.com/dexon-foundation/mcl/include/mcl/vint.hpp b/vendor/github.com/byzantine-lab/mcl/include/mcl/vint.hpp index b087688c3..b087688c3 100644 --- a/vendor/github.com/dexon-foundation/mcl/include/mcl/vint.hpp +++ b/vendor/github.com/byzantine-lab/mcl/include/mcl/vint.hpp diff --git a/vendor/github.com/dexon-foundation/mcl/include/mcl/window_method.hpp b/vendor/github.com/byzantine-lab/mcl/include/mcl/window_method.hpp index cb4fad37e..cb4fad37e 100644 --- a/vendor/github.com/dexon-foundation/mcl/include/mcl/window_method.hpp +++ b/vendor/github.com/byzantine-lab/mcl/include/mcl/window_method.hpp diff --git a/vendor/github.com/dexon-foundation/mcl/lib/.emptydir b/vendor/github.com/byzantine-lab/mcl/lib/.emptydir index e69de29bb..e69de29bb 100644 --- a/vendor/github.com/dexon-foundation/mcl/lib/.emptydir +++ b/vendor/github.com/byzantine-lab/mcl/lib/.emptydir diff --git a/vendor/github.com/dexon-foundation/mcl/mcl.sln b/vendor/github.com/byzantine-lab/mcl/mcl.sln index 7c4fe8f0c..7c4fe8f0c 100644 --- a/vendor/github.com/dexon-foundation/mcl/mcl.sln +++ b/vendor/github.com/byzantine-lab/mcl/mcl.sln diff --git a/vendor/github.com/dexon-foundation/mcl/misc/bench.txt b/vendor/github.com/byzantine-lab/mcl/misc/bench.txt index 3e18e6b44..3e18e6b44 100644 --- a/vendor/github.com/dexon-foundation/mcl/misc/bench.txt +++ b/vendor/github.com/byzantine-lab/mcl/misc/bench.txt diff --git a/vendor/github.com/dexon-foundation/mcl/misc/karatsuba.cpp b/vendor/github.com/byzantine-lab/mcl/misc/karatsuba.cpp index 7c150c6e3..7c150c6e3 100644 --- a/vendor/github.com/dexon-foundation/mcl/misc/karatsuba.cpp +++ b/vendor/github.com/byzantine-lab/mcl/misc/karatsuba.cpp diff --git a/vendor/github.com/dexon-foundation/mcl/misc/mul.cpp b/vendor/github.com/byzantine-lab/mcl/misc/mul.cpp index 146ac33a9..146ac33a9 100644 --- a/vendor/github.com/dexon-foundation/mcl/misc/mul.cpp +++ b/vendor/github.com/byzantine-lab/mcl/misc/mul.cpp diff --git a/vendor/github.com/dexon-foundation/mcl/misc/precompute.cpp b/vendor/github.com/byzantine-lab/mcl/misc/precompute.cpp index 63cdd663b..63cdd663b 100644 --- a/vendor/github.com/dexon-foundation/mcl/misc/precompute.cpp +++ b/vendor/github.com/byzantine-lab/mcl/misc/precompute.cpp diff --git a/vendor/github.com/dexon-foundation/mcl/misc/she/bench.sh b/vendor/github.com/byzantine-lab/mcl/misc/she/bench.sh index ced87b4db..ced87b4db 100644 --- a/vendor/github.com/dexon-foundation/mcl/misc/she/bench.sh +++ b/vendor/github.com/byzantine-lab/mcl/misc/she/bench.sh diff --git a/vendor/github.com/dexon-foundation/mcl/misc/she/bench4.txt b/vendor/github.com/byzantine-lab/mcl/misc/she/bench4.txt index 99b2593c4..99b2593c4 100644 --- a/vendor/github.com/dexon-foundation/mcl/misc/she/bench4.txt +++ b/vendor/github.com/byzantine-lab/mcl/misc/she/bench4.txt diff --git a/vendor/github.com/dexon-foundation/mcl/misc/she/bench6.txt b/vendor/github.com/byzantine-lab/mcl/misc/she/bench6.txt index 863f7129a..863f7129a 100644 --- a/vendor/github.com/dexon-foundation/mcl/misc/she/bench6.txt +++ b/vendor/github.com/byzantine-lab/mcl/misc/she/bench6.txt diff --git a/vendor/github.com/dexon-foundation/mcl/misc/she/bench8.txt b/vendor/github.com/byzantine-lab/mcl/misc/she/bench8.txt index f8fe8fd75..f8fe8fd75 100644 --- a/vendor/github.com/dexon-foundation/mcl/misc/she/bench8.txt +++ b/vendor/github.com/byzantine-lab/mcl/misc/she/bench8.txt diff --git a/vendor/github.com/dexon-foundation/mcl/misc/she/nizkp.pdf b/vendor/github.com/byzantine-lab/mcl/misc/she/nizkp.pdf Binary files differindex 7e61b5a64..7e61b5a64 100644 --- a/vendor/github.com/dexon-foundation/mcl/misc/she/nizkp.pdf +++ b/vendor/github.com/byzantine-lab/mcl/misc/she/nizkp.pdf diff --git a/vendor/github.com/dexon-foundation/mcl/misc/she/she-api-ja.md b/vendor/github.com/byzantine-lab/mcl/misc/she/she-api-ja.md index 850f11ff3..850f11ff3 100644 --- a/vendor/github.com/dexon-foundation/mcl/misc/she/she-api-ja.md +++ b/vendor/github.com/byzantine-lab/mcl/misc/she/she-api-ja.md diff --git a/vendor/github.com/dexon-foundation/mcl/misc/she/she-api.md b/vendor/github.com/byzantine-lab/mcl/misc/she/she-api.md index af54311e9..af54311e9 100644 --- a/vendor/github.com/dexon-foundation/mcl/misc/she/she-api.md +++ b/vendor/github.com/byzantine-lab/mcl/misc/she/she-api.md diff --git a/vendor/github.com/dexon-foundation/mcl/misc/she/she.pdf b/vendor/github.com/byzantine-lab/mcl/misc/she/she.pdf Binary files differindex 355a308b3..355a308b3 100644 --- a/vendor/github.com/dexon-foundation/mcl/misc/she/she.pdf +++ b/vendor/github.com/byzantine-lab/mcl/misc/she/she.pdf diff --git a/vendor/github.com/dexon-foundation/mcl/mk.bat b/vendor/github.com/byzantine-lab/mcl/mk.bat index 19eb84197..19eb84197 100644 --- a/vendor/github.com/dexon-foundation/mcl/mk.bat +++ b/vendor/github.com/byzantine-lab/mcl/mk.bat diff --git a/vendor/github.com/dexon-foundation/mcl/mklib.bat b/vendor/github.com/byzantine-lab/mcl/mklib.bat index 389b69009..389b69009 100644 --- a/vendor/github.com/dexon-foundation/mcl/mklib.bat +++ b/vendor/github.com/byzantine-lab/mcl/mklib.bat diff --git a/vendor/github.com/dexon-foundation/mcl/obj/.emptydir b/vendor/github.com/byzantine-lab/mcl/obj/.emptydir index e69de29bb..e69de29bb 100644 --- a/vendor/github.com/dexon-foundation/mcl/obj/.emptydir +++ b/vendor/github.com/byzantine-lab/mcl/obj/.emptydir diff --git a/vendor/github.com/dexon-foundation/mcl/readme.md b/vendor/github.com/byzantine-lab/mcl/readme.md index 39b3d4d42..39b3d4d42 100644 --- a/vendor/github.com/dexon-foundation/mcl/readme.md +++ b/vendor/github.com/byzantine-lab/mcl/readme.md diff --git a/vendor/github.com/dexon-foundation/mcl/release.props b/vendor/github.com/byzantine-lab/mcl/release.props index 886ce6890..886ce6890 100644 --- a/vendor/github.com/dexon-foundation/mcl/release.props +++ b/vendor/github.com/byzantine-lab/mcl/release.props diff --git a/vendor/github.com/dexon-foundation/mcl/sample/bench.cpp b/vendor/github.com/byzantine-lab/mcl/sample/bench.cpp index 0f865b189..0f865b189 100644 --- a/vendor/github.com/dexon-foundation/mcl/sample/bench.cpp +++ b/vendor/github.com/byzantine-lab/mcl/sample/bench.cpp diff --git a/vendor/github.com/dexon-foundation/mcl/sample/bls_sig.cpp b/vendor/github.com/byzantine-lab/mcl/sample/bls_sig.cpp index d75f7d427..d75f7d427 100644 --- a/vendor/github.com/dexon-foundation/mcl/sample/bls_sig.cpp +++ b/vendor/github.com/byzantine-lab/mcl/sample/bls_sig.cpp diff --git a/vendor/github.com/dexon-foundation/mcl/sample/ecdh.cpp b/vendor/github.com/byzantine-lab/mcl/sample/ecdh.cpp index d5c4a31b2..d5c4a31b2 100644 --- a/vendor/github.com/dexon-foundation/mcl/sample/ecdh.cpp +++ b/vendor/github.com/byzantine-lab/mcl/sample/ecdh.cpp diff --git a/vendor/github.com/dexon-foundation/mcl/sample/large.cpp b/vendor/github.com/byzantine-lab/mcl/sample/large.cpp index 60b2ac900..60b2ac900 100644 --- a/vendor/github.com/dexon-foundation/mcl/sample/large.cpp +++ b/vendor/github.com/byzantine-lab/mcl/sample/large.cpp diff --git a/vendor/github.com/dexon-foundation/mcl/sample/pairing.cpp b/vendor/github.com/byzantine-lab/mcl/sample/pairing.cpp index 230583b6e..230583b6e 100644 --- a/vendor/github.com/dexon-foundation/mcl/sample/pairing.cpp +++ b/vendor/github.com/byzantine-lab/mcl/sample/pairing.cpp diff --git a/vendor/github.com/dexon-foundation/mcl/sample/pairing_c.c b/vendor/github.com/byzantine-lab/mcl/sample/pairing_c.c index 5c2cd222a..5c2cd222a 100644 --- a/vendor/github.com/dexon-foundation/mcl/sample/pairing_c.c +++ b/vendor/github.com/byzantine-lab/mcl/sample/pairing_c.c diff --git a/vendor/github.com/dexon-foundation/mcl/sample/random.cpp b/vendor/github.com/byzantine-lab/mcl/sample/random.cpp index a2a3619ad..a2a3619ad 100644 --- a/vendor/github.com/dexon-foundation/mcl/sample/random.cpp +++ b/vendor/github.com/byzantine-lab/mcl/sample/random.cpp diff --git a/vendor/github.com/dexon-foundation/mcl/sample/rawbench.cpp b/vendor/github.com/byzantine-lab/mcl/sample/rawbench.cpp index 4d7506ef5..4d7506ef5 100644 --- a/vendor/github.com/dexon-foundation/mcl/sample/rawbench.cpp +++ b/vendor/github.com/byzantine-lab/mcl/sample/rawbench.cpp diff --git a/vendor/github.com/dexon-foundation/mcl/sample/she_make_dlp_table.cpp b/vendor/github.com/byzantine-lab/mcl/sample/she_make_dlp_table.cpp index 41f18e225..41f18e225 100644 --- a/vendor/github.com/dexon-foundation/mcl/sample/she_make_dlp_table.cpp +++ b/vendor/github.com/byzantine-lab/mcl/sample/she_make_dlp_table.cpp diff --git a/vendor/github.com/dexon-foundation/mcl/sample/she_smpl.cpp b/vendor/github.com/byzantine-lab/mcl/sample/she_smpl.cpp index e01b9c130..e01b9c130 100644 --- a/vendor/github.com/dexon-foundation/mcl/sample/she_smpl.cpp +++ b/vendor/github.com/byzantine-lab/mcl/sample/she_smpl.cpp diff --git a/vendor/github.com/dexon-foundation/mcl/sample/tri-dh.cpp b/vendor/github.com/byzantine-lab/mcl/sample/tri-dh.cpp index 8b720edbf..8b720edbf 100644 --- a/vendor/github.com/dexon-foundation/mcl/sample/tri-dh.cpp +++ b/vendor/github.com/byzantine-lab/mcl/sample/tri-dh.cpp diff --git a/vendor/github.com/dexon-foundation/mcl/sample/vote.cpp b/vendor/github.com/byzantine-lab/mcl/sample/vote.cpp index 88137187c..88137187c 100644 --- a/vendor/github.com/dexon-foundation/mcl/sample/vote.cpp +++ b/vendor/github.com/byzantine-lab/mcl/sample/vote.cpp diff --git a/vendor/github.com/dexon-foundation/mcl/setvar.bat b/vendor/github.com/byzantine-lab/mcl/setvar.bat index 1d57fa69e..1d57fa69e 100644 --- a/vendor/github.com/dexon-foundation/mcl/setvar.bat +++ b/vendor/github.com/byzantine-lab/mcl/setvar.bat diff --git a/vendor/github.com/dexon-foundation/mcl/src/asm/aarch64.s b/vendor/github.com/byzantine-lab/mcl/src/asm/aarch64.s index a49a36e3a..a49a36e3a 100644 --- a/vendor/github.com/dexon-foundation/mcl/src/asm/aarch64.s +++ b/vendor/github.com/byzantine-lab/mcl/src/asm/aarch64.s diff --git a/vendor/github.com/dexon-foundation/mcl/src/asm/arm.s b/vendor/github.com/byzantine-lab/mcl/src/asm/arm.s index 2df9bfb92..2df9bfb92 100644 --- a/vendor/github.com/dexon-foundation/mcl/src/asm/arm.s +++ b/vendor/github.com/byzantine-lab/mcl/src/asm/arm.s diff --git a/vendor/github.com/dexon-foundation/mcl/src/asm/low_arm.s b/vendor/github.com/byzantine-lab/mcl/src/asm/low_arm.s index 1ed2a1233..1ed2a1233 100644 --- a/vendor/github.com/dexon-foundation/mcl/src/asm/low_arm.s +++ b/vendor/github.com/byzantine-lab/mcl/src/asm/low_arm.s diff --git a/vendor/github.com/dexon-foundation/mcl/src/asm/low_x86-64.asm b/vendor/github.com/byzantine-lab/mcl/src/asm/low_x86-64.asm index b09b9dcd3..b09b9dcd3 100644 --- a/vendor/github.com/dexon-foundation/mcl/src/asm/low_x86-64.asm +++ b/vendor/github.com/byzantine-lab/mcl/src/asm/low_x86-64.asm diff --git a/vendor/github.com/dexon-foundation/mcl/src/asm/low_x86.asm b/vendor/github.com/byzantine-lab/mcl/src/asm/low_x86.asm index e69de29bb..e69de29bb 100644 --- a/vendor/github.com/dexon-foundation/mcl/src/asm/low_x86.asm +++ b/vendor/github.com/byzantine-lab/mcl/src/asm/low_x86.asm diff --git a/vendor/github.com/dexon-foundation/mcl/src/asm/x86-64.bmi2.s b/vendor/github.com/byzantine-lab/mcl/src/asm/x86-64.bmi2.s index e12174ac6..e12174ac6 100644 --- a/vendor/github.com/dexon-foundation/mcl/src/asm/x86-64.bmi2.s +++ b/vendor/github.com/byzantine-lab/mcl/src/asm/x86-64.bmi2.s diff --git a/vendor/github.com/dexon-foundation/mcl/src/asm/x86-64.s b/vendor/github.com/byzantine-lab/mcl/src/asm/x86-64.s index aa677d2ea..aa677d2ea 100644 --- a/vendor/github.com/dexon-foundation/mcl/src/asm/x86-64.s +++ b/vendor/github.com/byzantine-lab/mcl/src/asm/x86-64.s diff --git a/vendor/github.com/dexon-foundation/mcl/src/asm/x86-64mac.bmi2.s b/vendor/github.com/byzantine-lab/mcl/src/asm/x86-64mac.bmi2.s index 849c66649..849c66649 100644 --- a/vendor/github.com/dexon-foundation/mcl/src/asm/x86-64mac.bmi2.s +++ b/vendor/github.com/byzantine-lab/mcl/src/asm/x86-64mac.bmi2.s diff --git a/vendor/github.com/dexon-foundation/mcl/src/asm/x86-64mac.s b/vendor/github.com/byzantine-lab/mcl/src/asm/x86-64mac.s index 0dc7014a3..0dc7014a3 100644 --- a/vendor/github.com/dexon-foundation/mcl/src/asm/x86-64mac.s +++ b/vendor/github.com/byzantine-lab/mcl/src/asm/x86-64mac.s diff --git a/vendor/github.com/dexon-foundation/mcl/src/asm/x86.bmi2.s b/vendor/github.com/byzantine-lab/mcl/src/asm/x86.bmi2.s index 77729c530..77729c530 100644 --- a/vendor/github.com/dexon-foundation/mcl/src/asm/x86.bmi2.s +++ b/vendor/github.com/byzantine-lab/mcl/src/asm/x86.bmi2.s diff --git a/vendor/github.com/dexon-foundation/mcl/src/asm/x86.s b/vendor/github.com/byzantine-lab/mcl/src/asm/x86.s index cdd988ad3..cdd988ad3 100644 --- a/vendor/github.com/dexon-foundation/mcl/src/asm/x86.s +++ b/vendor/github.com/byzantine-lab/mcl/src/asm/x86.s diff --git a/vendor/github.com/dexon-foundation/mcl/src/bn_c256.cpp b/vendor/github.com/byzantine-lab/mcl/src/bn_c256.cpp index 2f975a287..2f975a287 100644 --- a/vendor/github.com/dexon-foundation/mcl/src/bn_c256.cpp +++ b/vendor/github.com/byzantine-lab/mcl/src/bn_c256.cpp diff --git a/vendor/github.com/dexon-foundation/mcl/src/bn_c384.cpp b/vendor/github.com/byzantine-lab/mcl/src/bn_c384.cpp index 934a078ae..934a078ae 100644 --- a/vendor/github.com/dexon-foundation/mcl/src/bn_c384.cpp +++ b/vendor/github.com/byzantine-lab/mcl/src/bn_c384.cpp diff --git a/vendor/github.com/dexon-foundation/mcl/src/bn_c384_256.cpp b/vendor/github.com/byzantine-lab/mcl/src/bn_c384_256.cpp index ecd968efd..ecd968efd 100644 --- a/vendor/github.com/dexon-foundation/mcl/src/bn_c384_256.cpp +++ b/vendor/github.com/byzantine-lab/mcl/src/bn_c384_256.cpp diff --git a/vendor/github.com/dexon-foundation/mcl/src/bn_c512.cpp b/vendor/github.com/byzantine-lab/mcl/src/bn_c512.cpp index 7c1029522..7c1029522 100644 --- a/vendor/github.com/dexon-foundation/mcl/src/bn_c512.cpp +++ b/vendor/github.com/byzantine-lab/mcl/src/bn_c512.cpp diff --git a/vendor/github.com/dexon-foundation/mcl/src/bn_c_impl.hpp b/vendor/github.com/byzantine-lab/mcl/src/bn_c_impl.hpp index bb0b4ba8e..bb0b4ba8e 100644 --- a/vendor/github.com/dexon-foundation/mcl/src/bn_c_impl.hpp +++ b/vendor/github.com/byzantine-lab/mcl/src/bn_c_impl.hpp diff --git a/vendor/github.com/dexon-foundation/mcl/src/ecdsa_c.cpp b/vendor/github.com/byzantine-lab/mcl/src/ecdsa_c.cpp index f2222a224..f2222a224 100644 --- a/vendor/github.com/dexon-foundation/mcl/src/ecdsa_c.cpp +++ b/vendor/github.com/byzantine-lab/mcl/src/ecdsa_c.cpp diff --git a/vendor/github.com/dexon-foundation/mcl/src/fp.cpp b/vendor/github.com/byzantine-lab/mcl/src/fp.cpp index df72d6d07..df72d6d07 100644 --- a/vendor/github.com/dexon-foundation/mcl/src/fp.cpp +++ b/vendor/github.com/byzantine-lab/mcl/src/fp.cpp diff --git a/vendor/github.com/dexon-foundation/mcl/src/fp_generator.hpp b/vendor/github.com/byzantine-lab/mcl/src/fp_generator.hpp index b496bc4d4..b496bc4d4 100644 --- a/vendor/github.com/dexon-foundation/mcl/src/fp_generator.hpp +++ b/vendor/github.com/byzantine-lab/mcl/src/fp_generator.hpp diff --git a/vendor/github.com/dexon-foundation/mcl/src/gen.cpp b/vendor/github.com/byzantine-lab/mcl/src/gen.cpp index 763f64b98..763f64b98 100644 --- a/vendor/github.com/dexon-foundation/mcl/src/gen.cpp +++ b/vendor/github.com/byzantine-lab/mcl/src/gen.cpp diff --git a/vendor/github.com/dexon-foundation/mcl/src/llvm_gen.hpp b/vendor/github.com/byzantine-lab/mcl/src/llvm_gen.hpp index bbc5b9030..bbc5b9030 100644 --- a/vendor/github.com/dexon-foundation/mcl/src/llvm_gen.hpp +++ b/vendor/github.com/byzantine-lab/mcl/src/llvm_gen.hpp diff --git a/vendor/github.com/dexon-foundation/mcl/src/low_func.hpp b/vendor/github.com/byzantine-lab/mcl/src/low_func.hpp index 57c63cfa3..57c63cfa3 100644 --- a/vendor/github.com/dexon-foundation/mcl/src/low_func.hpp +++ b/vendor/github.com/byzantine-lab/mcl/src/low_func.hpp diff --git a/vendor/github.com/dexon-foundation/mcl/src/low_func_llvm.hpp b/vendor/github.com/byzantine-lab/mcl/src/low_func_llvm.hpp index 8a44c2277..8a44c2277 100644 --- a/vendor/github.com/dexon-foundation/mcl/src/low_func_llvm.hpp +++ b/vendor/github.com/byzantine-lab/mcl/src/low_func_llvm.hpp diff --git a/vendor/github.com/dexon-foundation/mcl/src/proj/mcl.vcxproj b/vendor/github.com/byzantine-lab/mcl/src/proj/mcl.vcxproj index b247982ab..b247982ab 100644 --- a/vendor/github.com/dexon-foundation/mcl/src/proj/mcl.vcxproj +++ b/vendor/github.com/byzantine-lab/mcl/src/proj/mcl.vcxproj diff --git a/vendor/github.com/dexon-foundation/mcl/src/proto.hpp b/vendor/github.com/byzantine-lab/mcl/src/proto.hpp index 97c331194..97c331194 100644 --- a/vendor/github.com/dexon-foundation/mcl/src/proto.hpp +++ b/vendor/github.com/byzantine-lab/mcl/src/proto.hpp diff --git a/vendor/github.com/dexon-foundation/mcl/src/she_c256.cpp b/vendor/github.com/byzantine-lab/mcl/src/she_c256.cpp index 84873e4ca..84873e4ca 100644 --- a/vendor/github.com/dexon-foundation/mcl/src/she_c256.cpp +++ b/vendor/github.com/byzantine-lab/mcl/src/she_c256.cpp diff --git a/vendor/github.com/dexon-foundation/mcl/src/she_c384.cpp b/vendor/github.com/byzantine-lab/mcl/src/she_c384.cpp index bfc456a05..bfc456a05 100644 --- a/vendor/github.com/dexon-foundation/mcl/src/she_c384.cpp +++ b/vendor/github.com/byzantine-lab/mcl/src/she_c384.cpp diff --git a/vendor/github.com/dexon-foundation/mcl/src/she_c_impl.hpp b/vendor/github.com/byzantine-lab/mcl/src/she_c_impl.hpp index 073bc2b34..073bc2b34 100644 --- a/vendor/github.com/dexon-foundation/mcl/src/she_c_impl.hpp +++ b/vendor/github.com/byzantine-lab/mcl/src/she_c_impl.hpp diff --git a/vendor/github.com/dexon-foundation/mcl/src/xbyak/xbyak.h b/vendor/github.com/byzantine-lab/mcl/src/xbyak/xbyak.h index bcfeb34bf..bcfeb34bf 100644 --- a/vendor/github.com/dexon-foundation/mcl/src/xbyak/xbyak.h +++ b/vendor/github.com/byzantine-lab/mcl/src/xbyak/xbyak.h diff --git a/vendor/github.com/dexon-foundation/mcl/src/xbyak/xbyak_mnemonic.h b/vendor/github.com/byzantine-lab/mcl/src/xbyak/xbyak_mnemonic.h index 766f2f6ec..766f2f6ec 100644 --- a/vendor/github.com/dexon-foundation/mcl/src/xbyak/xbyak_mnemonic.h +++ b/vendor/github.com/byzantine-lab/mcl/src/xbyak/xbyak_mnemonic.h diff --git a/vendor/github.com/dexon-foundation/mcl/src/xbyak/xbyak_util.h b/vendor/github.com/byzantine-lab/mcl/src/xbyak/xbyak_util.h index 01544501d..01544501d 100644 --- a/vendor/github.com/dexon-foundation/mcl/src/xbyak/xbyak_util.h +++ b/vendor/github.com/byzantine-lab/mcl/src/xbyak/xbyak_util.h diff --git a/vendor/github.com/dexon-foundation/mcl/test/aggregate_sig_test.cpp b/vendor/github.com/byzantine-lab/mcl/test/aggregate_sig_test.cpp index c3a0e758d..c3a0e758d 100644 --- a/vendor/github.com/dexon-foundation/mcl/test/aggregate_sig_test.cpp +++ b/vendor/github.com/byzantine-lab/mcl/test/aggregate_sig_test.cpp diff --git a/vendor/github.com/dexon-foundation/mcl/test/array_test.cpp b/vendor/github.com/byzantine-lab/mcl/test/array_test.cpp index 2168a28fa..2168a28fa 100644 --- a/vendor/github.com/dexon-foundation/mcl/test/array_test.cpp +++ b/vendor/github.com/byzantine-lab/mcl/test/array_test.cpp diff --git a/vendor/github.com/dexon-foundation/mcl/test/base_test.cpp b/vendor/github.com/byzantine-lab/mcl/test/base_test.cpp index 2733d17ca..2733d17ca 100644 --- a/vendor/github.com/dexon-foundation/mcl/test/base_test.cpp +++ b/vendor/github.com/byzantine-lab/mcl/test/base_test.cpp diff --git a/vendor/github.com/dexon-foundation/mcl/test/bench.hpp b/vendor/github.com/byzantine-lab/mcl/test/bench.hpp index cc1639e6e..cc1639e6e 100644 --- a/vendor/github.com/dexon-foundation/mcl/test/bench.hpp +++ b/vendor/github.com/byzantine-lab/mcl/test/bench.hpp diff --git a/vendor/github.com/dexon-foundation/mcl/test/bls12_test.cpp b/vendor/github.com/byzantine-lab/mcl/test/bls12_test.cpp index 7011516bd..7011516bd 100644 --- a/vendor/github.com/dexon-foundation/mcl/test/bls12_test.cpp +++ b/vendor/github.com/byzantine-lab/mcl/test/bls12_test.cpp diff --git a/vendor/github.com/dexon-foundation/mcl/test/bn384_test.cpp b/vendor/github.com/byzantine-lab/mcl/test/bn384_test.cpp index b5674a918..b5674a918 100644 --- a/vendor/github.com/dexon-foundation/mcl/test/bn384_test.cpp +++ b/vendor/github.com/byzantine-lab/mcl/test/bn384_test.cpp diff --git a/vendor/github.com/dexon-foundation/mcl/test/bn512_test.cpp b/vendor/github.com/byzantine-lab/mcl/test/bn512_test.cpp index 905bfd3db..905bfd3db 100644 --- a/vendor/github.com/dexon-foundation/mcl/test/bn512_test.cpp +++ b/vendor/github.com/byzantine-lab/mcl/test/bn512_test.cpp diff --git a/vendor/github.com/dexon-foundation/mcl/test/bn_c256_test.cpp b/vendor/github.com/byzantine-lab/mcl/test/bn_c256_test.cpp index 2ce85162d..2ce85162d 100644 --- a/vendor/github.com/dexon-foundation/mcl/test/bn_c256_test.cpp +++ b/vendor/github.com/byzantine-lab/mcl/test/bn_c256_test.cpp diff --git a/vendor/github.com/dexon-foundation/mcl/test/bn_c384_256_test.cpp b/vendor/github.com/byzantine-lab/mcl/test/bn_c384_256_test.cpp index e7bbefda9..e7bbefda9 100644 --- a/vendor/github.com/dexon-foundation/mcl/test/bn_c384_256_test.cpp +++ b/vendor/github.com/byzantine-lab/mcl/test/bn_c384_256_test.cpp diff --git a/vendor/github.com/dexon-foundation/mcl/test/bn_c384_test.cpp b/vendor/github.com/byzantine-lab/mcl/test/bn_c384_test.cpp index a9f20243a..a9f20243a 100644 --- a/vendor/github.com/dexon-foundation/mcl/test/bn_c384_test.cpp +++ b/vendor/github.com/byzantine-lab/mcl/test/bn_c384_test.cpp diff --git a/vendor/github.com/dexon-foundation/mcl/test/bn_c512_test.cpp b/vendor/github.com/byzantine-lab/mcl/test/bn_c512_test.cpp index c6af3989f..c6af3989f 100644 --- a/vendor/github.com/dexon-foundation/mcl/test/bn_c512_test.cpp +++ b/vendor/github.com/byzantine-lab/mcl/test/bn_c512_test.cpp diff --git a/vendor/github.com/dexon-foundation/mcl/test/bn_c_test.hpp b/vendor/github.com/byzantine-lab/mcl/test/bn_c_test.hpp index e9dc59393..e9dc59393 100644 --- a/vendor/github.com/dexon-foundation/mcl/test/bn_c_test.hpp +++ b/vendor/github.com/byzantine-lab/mcl/test/bn_c_test.hpp diff --git a/vendor/github.com/dexon-foundation/mcl/test/bn_test.cpp b/vendor/github.com/byzantine-lab/mcl/test/bn_test.cpp index 071ec706c..071ec706c 100644 --- a/vendor/github.com/dexon-foundation/mcl/test/bn_test.cpp +++ b/vendor/github.com/byzantine-lab/mcl/test/bn_test.cpp diff --git a/vendor/github.com/dexon-foundation/mcl/test/conversion_test.cpp b/vendor/github.com/byzantine-lab/mcl/test/conversion_test.cpp index ec11fe900..ec11fe900 100644 --- a/vendor/github.com/dexon-foundation/mcl/test/conversion_test.cpp +++ b/vendor/github.com/byzantine-lab/mcl/test/conversion_test.cpp diff --git a/vendor/github.com/dexon-foundation/mcl/test/ec_test.cpp b/vendor/github.com/byzantine-lab/mcl/test/ec_test.cpp index ec49adbfe..ec49adbfe 100644 --- a/vendor/github.com/dexon-foundation/mcl/test/ec_test.cpp +++ b/vendor/github.com/byzantine-lab/mcl/test/ec_test.cpp diff --git a/vendor/github.com/dexon-foundation/mcl/test/ecdsa_c_test.cpp b/vendor/github.com/byzantine-lab/mcl/test/ecdsa_c_test.cpp index e0af38182..e0af38182 100644 --- a/vendor/github.com/dexon-foundation/mcl/test/ecdsa_c_test.cpp +++ b/vendor/github.com/byzantine-lab/mcl/test/ecdsa_c_test.cpp diff --git a/vendor/github.com/dexon-foundation/mcl/test/ecdsa_test.cpp b/vendor/github.com/byzantine-lab/mcl/test/ecdsa_test.cpp index 332c9ee27..332c9ee27 100644 --- a/vendor/github.com/dexon-foundation/mcl/test/ecdsa_test.cpp +++ b/vendor/github.com/byzantine-lab/mcl/test/ecdsa_test.cpp diff --git a/vendor/github.com/dexon-foundation/mcl/test/elgamal_test.cpp b/vendor/github.com/byzantine-lab/mcl/test/elgamal_test.cpp index 9532fc597..9532fc597 100644 --- a/vendor/github.com/dexon-foundation/mcl/test/elgamal_test.cpp +++ b/vendor/github.com/byzantine-lab/mcl/test/elgamal_test.cpp diff --git a/vendor/github.com/dexon-foundation/mcl/test/fp_generator_test.cpp b/vendor/github.com/byzantine-lab/mcl/test/fp_generator_test.cpp index 60ec5cd41..60ec5cd41 100644 --- a/vendor/github.com/dexon-foundation/mcl/test/fp_generator_test.cpp +++ b/vendor/github.com/byzantine-lab/mcl/test/fp_generator_test.cpp diff --git a/vendor/github.com/dexon-foundation/mcl/test/fp_test.cpp b/vendor/github.com/byzantine-lab/mcl/test/fp_test.cpp index dc1b01ef4..dc1b01ef4 100644 --- a/vendor/github.com/dexon-foundation/mcl/test/fp_test.cpp +++ b/vendor/github.com/byzantine-lab/mcl/test/fp_test.cpp diff --git a/vendor/github.com/dexon-foundation/mcl/test/fp_tower_test.cpp b/vendor/github.com/byzantine-lab/mcl/test/fp_tower_test.cpp index a7123f7a5..a7123f7a5 100644 --- a/vendor/github.com/dexon-foundation/mcl/test/fp_tower_test.cpp +++ b/vendor/github.com/byzantine-lab/mcl/test/fp_tower_test.cpp diff --git a/vendor/github.com/dexon-foundation/mcl/test/fp_util_test.cpp b/vendor/github.com/byzantine-lab/mcl/test/fp_util_test.cpp index e8a9f9aa5..e8a9f9aa5 100644 --- a/vendor/github.com/dexon-foundation/mcl/test/fp_util_test.cpp +++ b/vendor/github.com/byzantine-lab/mcl/test/fp_util_test.cpp diff --git a/vendor/github.com/dexon-foundation/mcl/test/glv_test.cpp b/vendor/github.com/byzantine-lab/mcl/test/glv_test.cpp index a917f51f4..a917f51f4 100644 --- a/vendor/github.com/dexon-foundation/mcl/test/glv_test.cpp +++ b/vendor/github.com/byzantine-lab/mcl/test/glv_test.cpp diff --git a/vendor/github.com/dexon-foundation/mcl/test/gmp_test.cpp b/vendor/github.com/byzantine-lab/mcl/test/gmp_test.cpp index 1fe9d4eb6..1fe9d4eb6 100644 --- a/vendor/github.com/dexon-foundation/mcl/test/gmp_test.cpp +++ b/vendor/github.com/byzantine-lab/mcl/test/gmp_test.cpp diff --git a/vendor/github.com/dexon-foundation/mcl/test/low_test.cpp b/vendor/github.com/byzantine-lab/mcl/test/low_test.cpp index f5e72a0b3..f5e72a0b3 100644 --- a/vendor/github.com/dexon-foundation/mcl/test/low_test.cpp +++ b/vendor/github.com/byzantine-lab/mcl/test/low_test.cpp diff --git a/vendor/github.com/dexon-foundation/mcl/test/mk32.sh b/vendor/github.com/byzantine-lab/mcl/test/mk32.sh index 4d5f60711..4d5f60711 100644 --- a/vendor/github.com/dexon-foundation/mcl/test/mk32.sh +++ b/vendor/github.com/byzantine-lab/mcl/test/mk32.sh diff --git a/vendor/github.com/dexon-foundation/mcl/test/modp_test.cpp b/vendor/github.com/byzantine-lab/mcl/test/modp_test.cpp index bf9da38bf..bf9da38bf 100644 --- a/vendor/github.com/dexon-foundation/mcl/test/modp_test.cpp +++ b/vendor/github.com/byzantine-lab/mcl/test/modp_test.cpp diff --git a/vendor/github.com/dexon-foundation/mcl/test/mont_fp_test.cpp b/vendor/github.com/byzantine-lab/mcl/test/mont_fp_test.cpp index e41e77a53..e41e77a53 100644 --- a/vendor/github.com/dexon-foundation/mcl/test/mont_fp_test.cpp +++ b/vendor/github.com/byzantine-lab/mcl/test/mont_fp_test.cpp diff --git a/vendor/github.com/dexon-foundation/mcl/test/paillier_test.cpp b/vendor/github.com/byzantine-lab/mcl/test/paillier_test.cpp index 31d2b26fc..31d2b26fc 100644 --- a/vendor/github.com/dexon-foundation/mcl/test/paillier_test.cpp +++ b/vendor/github.com/byzantine-lab/mcl/test/paillier_test.cpp diff --git a/vendor/github.com/dexon-foundation/mcl/test/proj/bn_test/bn_test.vcxproj b/vendor/github.com/byzantine-lab/mcl/test/proj/bn_test/bn_test.vcxproj index 936e075aa..936e075aa 100644 --- a/vendor/github.com/dexon-foundation/mcl/test/proj/bn_test/bn_test.vcxproj +++ b/vendor/github.com/byzantine-lab/mcl/test/proj/bn_test/bn_test.vcxproj diff --git a/vendor/github.com/dexon-foundation/mcl/test/proj/ec_test/ec_test.vcxproj b/vendor/github.com/byzantine-lab/mcl/test/proj/ec_test/ec_test.vcxproj index 4bdfda2cb..4bdfda2cb 100644 --- a/vendor/github.com/dexon-foundation/mcl/test/proj/ec_test/ec_test.vcxproj +++ b/vendor/github.com/byzantine-lab/mcl/test/proj/ec_test/ec_test.vcxproj diff --git a/vendor/github.com/dexon-foundation/mcl/test/proj/fp_test/fp_test.vcxproj b/vendor/github.com/byzantine-lab/mcl/test/proj/fp_test/fp_test.vcxproj index f705982bf..f705982bf 100644 --- a/vendor/github.com/dexon-foundation/mcl/test/proj/fp_test/fp_test.vcxproj +++ b/vendor/github.com/byzantine-lab/mcl/test/proj/fp_test/fp_test.vcxproj diff --git a/vendor/github.com/dexon-foundation/mcl/test/proj/fp_tower_test/fp_tower_test.vcxproj b/vendor/github.com/byzantine-lab/mcl/test/proj/fp_tower_test/fp_tower_test.vcxproj index d5720678f..d5720678f 100644 --- a/vendor/github.com/dexon-foundation/mcl/test/proj/fp_tower_test/fp_tower_test.vcxproj +++ b/vendor/github.com/byzantine-lab/mcl/test/proj/fp_tower_test/fp_tower_test.vcxproj diff --git a/vendor/github.com/dexon-foundation/mcl/test/she_c256_test.cpp b/vendor/github.com/byzantine-lab/mcl/test/she_c256_test.cpp index 3e458b623..3e458b623 100644 --- a/vendor/github.com/dexon-foundation/mcl/test/she_c256_test.cpp +++ b/vendor/github.com/byzantine-lab/mcl/test/she_c256_test.cpp diff --git a/vendor/github.com/dexon-foundation/mcl/test/she_c384_test.cpp b/vendor/github.com/byzantine-lab/mcl/test/she_c384_test.cpp index 5c7bd9882..5c7bd9882 100644 --- a/vendor/github.com/dexon-foundation/mcl/test/she_c384_test.cpp +++ b/vendor/github.com/byzantine-lab/mcl/test/she_c384_test.cpp diff --git a/vendor/github.com/dexon-foundation/mcl/test/she_c_test.hpp b/vendor/github.com/byzantine-lab/mcl/test/she_c_test.hpp index 8287c0e0a..8287c0e0a 100644 --- a/vendor/github.com/dexon-foundation/mcl/test/she_c_test.hpp +++ b/vendor/github.com/byzantine-lab/mcl/test/she_c_test.hpp diff --git a/vendor/github.com/dexon-foundation/mcl/test/she_test.cpp b/vendor/github.com/byzantine-lab/mcl/test/she_test.cpp index 9292c35f4..9292c35f4 100644 --- a/vendor/github.com/dexon-foundation/mcl/test/she_test.cpp +++ b/vendor/github.com/byzantine-lab/mcl/test/she_test.cpp diff --git a/vendor/github.com/dexon-foundation/mcl/test/sq_test.cpp b/vendor/github.com/byzantine-lab/mcl/test/sq_test.cpp index 4c386d23b..4c386d23b 100644 --- a/vendor/github.com/dexon-foundation/mcl/test/sq_test.cpp +++ b/vendor/github.com/byzantine-lab/mcl/test/sq_test.cpp diff --git a/vendor/github.com/dexon-foundation/mcl/test/vint_test.cpp b/vendor/github.com/byzantine-lab/mcl/test/vint_test.cpp index 15e14266a..15e14266a 100644 --- a/vendor/github.com/dexon-foundation/mcl/test/vint_test.cpp +++ b/vendor/github.com/byzantine-lab/mcl/test/vint_test.cpp diff --git a/vendor/github.com/dexon-foundation/mcl/test/window_method_test.cpp b/vendor/github.com/byzantine-lab/mcl/test/window_method_test.cpp index 1b0f702af..1b0f702af 100644 --- a/vendor/github.com/dexon-foundation/mcl/test/window_method_test.cpp +++ b/vendor/github.com/byzantine-lab/mcl/test/window_method_test.cpp diff --git a/vendor/github.com/dexon-foundation/bls/ffi/go/bls/bls_test.go b/vendor/github.com/dexon-foundation/bls/ffi/go/bls/bls_test.go deleted file mode 100644 index a13ee02f4..000000000 --- a/vendor/github.com/dexon-foundation/bls/ffi/go/bls/bls_test.go +++ /dev/null @@ -1,690 +0,0 @@ -package bls - -import "testing" -import "strconv" -import "crypto/sha256" -import "crypto/sha512" -import "fmt" -import "crypto/rand" - -var unitN = 0 - -// Tests (for Benchmarks see below) - -func testPre(t *testing.T) { - t.Log("init") - { - var id ID - err := id.SetLittleEndian([]byte{6, 5, 4, 3, 2, 1}) - if err != nil { - t.Error(err) - } - t.Log("id :", id.GetHexString()) - var id2 ID - err = id2.SetHexString(id.GetHexString()) - if err != nil { - t.Fatal(err) - } - if !id.IsEqual(&id2) { - t.Errorf("not same id\n%s\n%s", id.GetHexString(), id2.GetHexString()) - } - err = id2.SetDecString(id.GetDecString()) - if err != nil { - t.Fatal(err) - } - if !id.IsEqual(&id2) { - t.Errorf("not same id\n%s\n%s", id.GetDecString(), id2.GetDecString()) - } - } - { - var sec SecretKey - err := sec.SetLittleEndian([]byte{1, 2, 3, 4, 5, 6}) - if err != nil { - t.Error(err) - } - t.Log("sec=", sec.GetHexString()) - } - - t.Log("create secret key") - m := "this is a bls sample for go" - var sec SecretKey - sec.SetByCSPRNG() - t.Log("sec:", sec.GetHexString()) - t.Log("create public key") - pub := sec.GetPublicKey() - t.Log("pub:", pub.GetHexString()) - sign := sec.Sign(m) - t.Log("sign:", sign.GetHexString()) - if !sign.Verify(pub, m) { - t.Error("Signature does not verify") - } - - // How to make array of SecretKey - { - sec := make([]SecretKey, 3) - for i := 0; i < len(sec); i++ { - sec[i].SetByCSPRNG() - t.Log("sec=", sec[i].GetHexString()) - } - } -} - -func testStringConversion(t *testing.T) { - t.Log("testRecoverSecretKey") - var sec SecretKey - var s string - if unitN == 6 { - s = "16798108731015832284940804142231733909759579603404752749028378864165570215949" - } else { - s = "40804142231733909759579603404752749028378864165570215949" - } - err := sec.SetDecString(s) - if err != nil { - t.Fatal(err) - } - if s != sec.GetDecString() { - t.Error("not equal") - } - s = sec.GetHexString() - var sec2 SecretKey - err = sec2.SetHexString(s) - if err != nil { - t.Fatal(err) - } - if !sec.IsEqual(&sec2) { - t.Error("not equal") - } -} - -func testRecoverSecretKey(t *testing.T) { - t.Log("testRecoverSecretKey") - k := 3000 - var sec SecretKey - sec.SetByCSPRNG() - t.Logf("sec=%s\n", sec.GetHexString()) - - // make master secret key - msk := sec.GetMasterSecretKey(k) - - n := k - secVec := make([]SecretKey, n) - idVec := make([]ID, n) - for i := 0; i < n; i++ { - err := idVec[i].SetLittleEndian([]byte{byte(i & 255), byte(i >> 8), 2, 3, 4, 5}) - if err != nil { - t.Error(err) - } - err = secVec[i].Set(msk, &idVec[i]) - if err != nil { - t.Error(err) - } - // t.Logf("idVec[%d]=%s\n", i, idVec[i].GetHexString()) - } - // recover sec2 from secVec and idVec - var sec2 SecretKey - err := sec2.Recover(secVec, idVec) - if err != nil { - t.Error(err) - } - if !sec.IsEqual(&sec2) { - t.Errorf("Mismatch in recovered secret key:\n %s\n %s.", sec.GetHexString(), sec2.GetHexString()) - } -} - -func testEachSign(t *testing.T, m string, msk []SecretKey, mpk []PublicKey) ([]ID, []SecretKey, []PublicKey, []Sign) { - idTbl := []byte{3, 5, 193, 22, 15} - n := len(idTbl) - - secVec := make([]SecretKey, n) - pubVec := make([]PublicKey, n) - signVec := make([]Sign, n) - idVec := make([]ID, n) - - for i := 0; i < n; i++ { - err := idVec[i].SetLittleEndian([]byte{idTbl[i], 0, 0, 0, 0, 0}) - if err != nil { - t.Error(err) - } - t.Logf("idVec[%d]=%s\n", i, idVec[i].GetHexString()) - - err = secVec[i].Set(msk, &idVec[i]) - if err != nil { - t.Error(err) - } - - err = pubVec[i].Set(mpk, &idVec[i]) - if err != nil { - t.Error(err) - } - t.Logf("pubVec[%d]=%s\n", i, pubVec[i].GetHexString()) - - if !pubVec[i].IsEqual(secVec[i].GetPublicKey()) { - t.Errorf("Pubkey derivation does not match\n%s\n%s", pubVec[i].GetHexString(), secVec[i].GetPublicKey().GetHexString()) - } - - signVec[i] = *secVec[i].Sign(m) - if !signVec[i].Verify(&pubVec[i], m) { - t.Error("Pubkey derivation does not match") - } - } - return idVec, secVec, pubVec, signVec -} -func testSign(t *testing.T) { - m := "testSign" - t.Log(m) - - var sec0 SecretKey - sec0.SetByCSPRNG() - pub0 := sec0.GetPublicKey() - s0 := sec0.Sign(m) - if !s0.Verify(pub0, m) { - t.Error("Signature does not verify") - } - - k := 3 - msk := sec0.GetMasterSecretKey(k) - mpk := GetMasterPublicKey(msk) - idVec, secVec, pubVec, signVec := testEachSign(t, m, msk, mpk) - - var sec1 SecretKey - err := sec1.Recover(secVec, idVec) - if err != nil { - t.Error(err) - } - if !sec0.IsEqual(&sec1) { - t.Error("Mismatch in recovered seckey.") - } - var pub1 PublicKey - err = pub1.Recover(pubVec, idVec) - if err != nil { - t.Error(err) - } - if !pub0.IsEqual(&pub1) { - t.Error("Mismatch in recovered pubkey.") - } - var s1 Sign - err = s1.Recover(signVec, idVec) - if err != nil { - t.Error(err) - } - if !s0.IsEqual(&s1) { - t.Error("Mismatch in recovered signature.") - } -} - -func testAdd(t *testing.T) { - t.Log("testAdd") - var sec1 SecretKey - var sec2 SecretKey - sec1.SetByCSPRNG() - sec2.SetByCSPRNG() - - pub1 := sec1.GetPublicKey() - pub2 := sec2.GetPublicKey() - - m := "test test" - sign1 := sec1.Sign(m) - sign2 := sec2.Sign(m) - - t.Log("sign1 :", sign1.GetHexString()) - sign1.Add(sign2) - t.Log("sign1 add:", sign1.GetHexString()) - pub1.Add(pub2) - if !sign1.Verify(pub1, m) { - t.Fail() - } -} - -func testPop(t *testing.T) { - t.Log("testPop") - var sec SecretKey - sec.SetByCSPRNG() - pop := sec.GetPop() - if !pop.VerifyPop(sec.GetPublicKey()) { - t.Errorf("Valid Pop does not verify") - } - sec.SetByCSPRNG() - if pop.VerifyPop(sec.GetPublicKey()) { - t.Errorf("Invalid Pop verifies") - } -} - -func testData(t *testing.T) { - t.Log("testData") - var sec1, sec2 SecretKey - sec1.SetByCSPRNG() - b := sec1.GetLittleEndian() - err := sec2.SetLittleEndian(b) - if err != nil { - t.Fatal(err) - } - if !sec1.IsEqual(&sec2) { - t.Error("SecretKey not same") - } - pub1 := sec1.GetPublicKey() - b = pub1.Serialize() - var pub2 PublicKey - err = pub2.Deserialize(b) - if err != nil { - t.Fatal(err) - } - if !pub1.IsEqual(&pub2) { - t.Error("PublicKey not same") - } - m := "doremi" - sign1 := sec1.Sign(m) - b = sign1.Serialize() - var sign2 Sign - err = sign2.Deserialize(b) - if err != nil { - t.Fatal(err) - } - if !sign1.IsEqual(&sign2) { - t.Error("Sign not same") - } -} - -func testSerializeToHexStr(t *testing.T) { - t.Log("testSerializeToHexStr") - var sec1, sec2 SecretKey - sec1.SetByCSPRNG() - s := sec1.SerializeToHexStr() - err := sec2.DeserializeHexStr(s) - if err != nil { - t.Fatal(err) - } - if !sec1.IsEqual(&sec2) { - t.Error("SecretKey not same") - } - pub1 := sec1.GetPublicKey() - s = pub1.SerializeToHexStr() - var pub2 PublicKey - err = pub2.DeserializeHexStr(s) - if err != nil { - t.Fatal(err) - } - if !pub1.IsEqual(&pub2) { - t.Error("PublicKey not same") - } - m := "doremi" - sign1 := sec1.Sign(m) - s = sign1.SerializeToHexStr() - var sign2 Sign - err = sign2.DeserializeHexStr(s) - if err != nil { - t.Fatal(err) - } - if !sign1.IsEqual(&sign2) { - t.Error("Sign not same") - } -} - -func testOrder(t *testing.T, c int) { - var curve string - var field string - if c == CurveFp254BNb { - curve = "16798108731015832284940804142231733909759579603404752749028378864165570215949" - field = "16798108731015832284940804142231733909889187121439069848933715426072753864723" - } else if c == CurveFp382_1 { - curve = "5540996953667913971058039301942914304734176495422447785042938606876043190415948413757785063597439175372845535461389" - field = "5540996953667913971058039301942914304734176495422447785045292539108217242186829586959562222833658991069414454984723" - } else if c == CurveFp382_2 { - curve = "5541245505022739011583672869577435255026888277144126952448297309161979278754528049907713682488818304329661351460877" - field = "5541245505022739011583672869577435255026888277144126952450651294188487038640194767986566260919128250811286032482323" - } else if c == BLS12_381 { - curve = "52435875175126190479447740508185965837690552500527637822603658699938581184513" - field = "4002409555221667393417789825735904156556882819939007885332058136124031650490837864442687629129015664037894272559787" - } else { - t.Fatal("bad c", c) - } - s := GetCurveOrder() - if s != curve { - t.Errorf("bad curve order\n%s\n%s\n", s, curve) - } - s = GetFieldOrder() - if s != field { - t.Errorf("bad field order\n%s\n%s\n", s, field) - } -} - -func testDHKeyExchange(t *testing.T) { - var sec1, sec2 SecretKey - sec1.SetByCSPRNG() - sec2.SetByCSPRNG() - pub1 := sec1.GetPublicKey() - pub2 := sec2.GetPublicKey() - out1 := DHKeyExchange(&sec1, pub2) - out2 := DHKeyExchange(&sec2, pub1) - if !out1.IsEqual(&out2) { - t.Errorf("DH key is not equal") - } -} - -func testPairing(t *testing.T) { - var sec SecretKey - sec.SetByCSPRNG() - pub := sec.GetPublicKey() - m := "abc" - sig1 := sec.Sign(m) - sig2 := HashAndMapToSignature([]byte(m)) - if !VerifyPairing(sig1, sig2, pub) { - t.Errorf("VerifyPairing") - } -} - -func testAggregate(t *testing.T) { - var sec SecretKey - sec.SetByCSPRNG() - pub := sec.GetPublicKey() - msgTbl := []string{"abc", "def", "123"} - n := len(msgTbl) - sigVec := make([]*Sign, n) - for i := 0; i < n; i++ { - m := msgTbl[i] - sigVec[i] = sec.Sign(m) - } - aggSign := sigVec[0] - for i := 1; i < n; i++ { - aggSign.Add(sigVec[i]) - } - hashPt := HashAndMapToSignature([]byte(msgTbl[0])) - for i := 1; i < n; i++ { - hashPt.Add(HashAndMapToSignature([]byte(msgTbl[i]))) - } - if !VerifyPairing(aggSign, hashPt, pub) { - t.Errorf("aggregate2") - } -} - -func Hash(buf []byte) []byte { - if GetOpUnitSize() == 4 { - d := sha256.Sum256([]byte(buf)) - return d[:] - } else { - // use SHA512 if bitSize > 256 - d := sha512.Sum512([]byte(buf)) - return d[:] - } -} - -func testHash(t *testing.T) { - var sec SecretKey - sec.SetByCSPRNG() - pub := sec.GetPublicKey() - m := "abc" - h := Hash([]byte(m)) - sig1 := sec.Sign(m) - sig2 := sec.SignHash(h) - if !sig1.IsEqual(sig2) { - t.Errorf("SignHash") - } - if !sig1.Verify(pub, m) { - t.Errorf("sig1.Verify") - } - if !sig2.VerifyHash(pub, h) { - t.Errorf("sig2.VerifyHash") - } -} - -func testAggregateHashes(t *testing.T) { - n := 1000 - pubVec := make([]PublicKey, n) - sigVec := make([]*Sign, n) - h := make([][]byte, n) - for i := 0; i < n; i++ { - sec := new(SecretKey) - sec.SetByCSPRNG() - pubVec[i] = *sec.GetPublicKey() - m := fmt.Sprintf("abc-%d", i) - h[i] = Hash([]byte(m)) - sigVec[i] = sec.SignHash(h[i]) - } - // aggregate sig - sig := sigVec[0] - for i := 1; i < n; i++ { - sig.Add(sigVec[i]) - } - if !sig.VerifyAggregateHashes(pubVec, h) { - t.Errorf("sig.VerifyAggregateHashes") - } -} - -type SeqRead struct { -} - -func (self *SeqRead) Read(buf []byte) (int, error) { - n := len(buf) - for i := 0; i < n; i++ { - buf[i] = byte(i) - } - return n, nil -} - -func testReadRand(t *testing.T) { - s1 := new(SeqRead) - SetRandFunc(s1) - var sec SecretKey - sec.SetByCSPRNG() - buf := sec.GetLittleEndian() - fmt.Printf("(SeqRead) buf=%x\n", buf) - for i := 0; i < len(buf)-1; i++ { - // ommit buf[len(buf) - 1] because it may be masked - if buf[i] != byte(i) { - t.Fatal("buf") - } - } - SetRandFunc(rand.Reader) - sec.SetByCSPRNG() - buf = sec.GetLittleEndian() - fmt.Printf("(rand.Reader) buf=%x\n", buf) - SetRandFunc(nil) - sec.SetByCSPRNG() - buf = sec.GetLittleEndian() - fmt.Printf("(default) buf=%x\n", buf) -} - -func test(t *testing.T, c int) { - err := Init(c) - if err != nil { - t.Fatal(err) - } - unitN = GetOpUnitSize() - t.Logf("unitN=%d\n", unitN) - testReadRand(t) - testPre(t) - testRecoverSecretKey(t) - testAdd(t) - testSign(t) - testPop(t) - testData(t) - testStringConversion(t) - testOrder(t, c) - testDHKeyExchange(t) - testSerializeToHexStr(t) - testPairing(t) - testAggregate(t) - testHash(t) - testAggregateHashes(t) -} - -func TestMain(t *testing.T) { - t.Logf("GetMaxOpUnitSize() = %d\n", GetMaxOpUnitSize()) - t.Log("CurveFp254BNb") - test(t, CurveFp254BNb) - if GetMaxOpUnitSize() == 6 { - if GetFrUnitSize() == 6 { - t.Log("CurveFp382_1") - test(t, CurveFp382_1) - } - t.Log("BLS12_381") - test(t, BLS12_381) - } -} - -// Benchmarks - -var curve = CurveFp382_1 - -//var curve = CurveFp254BNb - -func BenchmarkPubkeyFromSeckey(b *testing.B) { - b.StopTimer() - err := Init(curve) - if err != nil { - b.Fatal(err) - } - var sec SecretKey - for n := 0; n < b.N; n++ { - sec.SetByCSPRNG() - b.StartTimer() - sec.GetPublicKey() - b.StopTimer() - } -} - -func BenchmarkSigning(b *testing.B) { - b.StopTimer() - err := Init(curve) - if err != nil { - b.Fatal(err) - } - var sec SecretKey - for n := 0; n < b.N; n++ { - sec.SetByCSPRNG() - b.StartTimer() - sec.Sign(strconv.Itoa(n)) - b.StopTimer() - } -} - -func BenchmarkValidation(b *testing.B) { - b.StopTimer() - err := Init(curve) - if err != nil { - b.Fatal(err) - } - var sec SecretKey - for n := 0; n < b.N; n++ { - sec.SetByCSPRNG() - pub := sec.GetPublicKey() - m := strconv.Itoa(n) - sig := sec.Sign(m) - b.StartTimer() - sig.Verify(pub, m) - b.StopTimer() - } -} - -func benchmarkDeriveSeckeyShare(k int, b *testing.B) { - b.StopTimer() - err := Init(curve) - if err != nil { - b.Fatal(err) - } - var sec SecretKey - sec.SetByCSPRNG() - msk := sec.GetMasterSecretKey(k) - var id ID - for n := 0; n < b.N; n++ { - err = id.SetLittleEndian([]byte{1, 2, 3, 4, 5, byte(n)}) - if err != nil { - b.Error(err) - } - b.StartTimer() - err := sec.Set(msk, &id) - b.StopTimer() - if err != nil { - b.Error(err) - } - } -} - -//func BenchmarkDeriveSeckeyShare100(b *testing.B) { benchmarkDeriveSeckeyShare(100, b) } -//func BenchmarkDeriveSeckeyShare200(b *testing.B) { benchmarkDeriveSeckeyShare(200, b) } -func BenchmarkDeriveSeckeyShare500(b *testing.B) { benchmarkDeriveSeckeyShare(500, b) } - -//func BenchmarkDeriveSeckeyShare1000(b *testing.B) { benchmarkDeriveSeckeyShare(1000, b) } - -func benchmarkRecoverSeckey(k int, b *testing.B) { - b.StopTimer() - err := Init(curve) - if err != nil { - b.Fatal(err) - } - var sec SecretKey - sec.SetByCSPRNG() - msk := sec.GetMasterSecretKey(k) - - // derive n shares - n := k - secVec := make([]SecretKey, n) - idVec := make([]ID, n) - for i := 0; i < n; i++ { - err := idVec[i].SetLittleEndian([]byte{1, 2, 3, 4, 5, byte(i)}) - if err != nil { - b.Error(err) - } - err = secVec[i].Set(msk, &idVec[i]) - if err != nil { - b.Error(err) - } - } - - // recover from secVec and idVec - var sec2 SecretKey - b.StartTimer() - for n := 0; n < b.N; n++ { - err := sec2.Recover(secVec, idVec) - if err != nil { - b.Errorf("%s\n", err) - } - } -} - -func BenchmarkRecoverSeckey100(b *testing.B) { benchmarkRecoverSeckey(100, b) } -func BenchmarkRecoverSeckey200(b *testing.B) { benchmarkRecoverSeckey(200, b) } -func BenchmarkRecoverSeckey500(b *testing.B) { benchmarkRecoverSeckey(500, b) } -func BenchmarkRecoverSeckey1000(b *testing.B) { benchmarkRecoverSeckey(1000, b) } - -func benchmarkRecoverSignature(k int, b *testing.B) { - b.StopTimer() - err := Init(curve) - if err != nil { - b.Fatal(err) - } - var sec SecretKey - sec.SetByCSPRNG() - msk := sec.GetMasterSecretKey(k) - - // derive n shares - n := k - idVec := make([]ID, n) - secVec := make([]SecretKey, n) - signVec := make([]Sign, n) - for i := 0; i < n; i++ { - err := idVec[i].SetLittleEndian([]byte{1, 2, 3, 4, 5, byte(i)}) - if err != nil { - b.Error(err) - } - err = secVec[i].Set(msk, &idVec[i]) - if err != nil { - b.Error(err) - } - signVec[i] = *secVec[i].Sign("test message") - } - - // recover signature - var sig Sign - b.StartTimer() - for n := 0; n < b.N; n++ { - err := sig.Recover(signVec, idVec) - if err != nil { - b.Error(err) - } - } -} - -func BenchmarkRecoverSignature100(b *testing.B) { benchmarkRecoverSignature(100, b) } -func BenchmarkRecoverSignature200(b *testing.B) { benchmarkRecoverSignature(200, b) } -func BenchmarkRecoverSignature500(b *testing.B) { benchmarkRecoverSignature(500, b) } -func BenchmarkRecoverSignature1000(b *testing.B) { benchmarkRecoverSignature(1000, b) } diff --git a/vendor/github.com/dexon-foundation/bls/ffi/go/bls/config.h b/vendor/github.com/dexon-foundation/bls/ffi/go/bls/config.h deleted file mode 100644 index 07e148137..000000000 --- a/vendor/github.com/dexon-foundation/bls/ffi/go/bls/config.h +++ /dev/null @@ -1,6 +0,0 @@ -#pragma -// use bn384 unless tags is specified -#ifndef MCLBN_FP_UNIT_SIZE - #define MCLBN_FP_UNIT_SIZE 6 -#endif - diff --git a/vendor/github.com/ethereum/go-ethereum/common/big.go b/vendor/github.com/ethereum/go-ethereum/common/big.go new file mode 100644 index 000000000..65d4377bf --- /dev/null +++ b/vendor/github.com/ethereum/go-ethereum/common/big.go @@ -0,0 +1,30 @@ +// Copyright 2014 The go-ethereum Authors +// This file is part of the go-ethereum library. +// +// The go-ethereum library is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// The go-ethereum library 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 Lesser General Public License for more details. +// +// 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/>. + +package common + +import "math/big" + +// Common big integers often used +var ( + Big1 = big.NewInt(1) + Big2 = big.NewInt(2) + Big3 = big.NewInt(3) + Big0 = big.NewInt(0) + Big32 = big.NewInt(32) + Big256 = big.NewInt(256) + Big257 = big.NewInt(257) +) diff --git a/vendor/github.com/ethereum/go-ethereum/common/bytes.go b/vendor/github.com/ethereum/go-ethereum/common/bytes.go new file mode 100644 index 000000000..c82e61624 --- /dev/null +++ b/vendor/github.com/ethereum/go-ethereum/common/bytes.go @@ -0,0 +1,138 @@ +// Copyright 2014 The go-ethereum Authors +// This file is part of the go-ethereum library. +// +// The go-ethereum library is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// The go-ethereum library 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 Lesser General Public License for more details. +// +// 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/>. + +// Package common contains various helper functions. +package common + +import "encoding/hex" + +// ToHex returns the hex representation of b, prefixed with '0x'. +// For empty slices, the return value is "0x0". +// +// Deprecated: use hexutil.Encode instead. +func ToHex(b []byte) string { + hex := Bytes2Hex(b) + if len(hex) == 0 { + hex = "0" + } + return "0x" + hex +} + +// ToHexArray creates a array of hex-string based on []byte +func ToHexArray(b [][]byte) []string { + r := make([]string, len(b)) + for i := range b { + r[i] = ToHex(b[i]) + } + return r +} + +// FromHex returns the bytes represented by the hexadecimal string s. +// s may be prefixed with "0x". +func FromHex(s string) []byte { + if len(s) > 1 { + if s[0:2] == "0x" || s[0:2] == "0X" { + s = s[2:] + } + } + if len(s)%2 == 1 { + s = "0" + s + } + return Hex2Bytes(s) +} + +// CopyBytes returns an exact copy of the provided bytes. +func CopyBytes(b []byte) (copiedBytes []byte) { + if b == nil { + return nil + } + copiedBytes = make([]byte, len(b)) + copy(copiedBytes, b) + + return +} + +// hasHexPrefix validates str begins with '0x' or '0X'. +func hasHexPrefix(str string) bool { + return len(str) >= 2 && str[0] == '0' && (str[1] == 'x' || str[1] == 'X') +} + +// isHexCharacter returns bool of c being a valid hexadecimal. +func isHexCharacter(c byte) bool { + return ('0' <= c && c <= '9') || ('a' <= c && c <= 'f') || ('A' <= c && c <= 'F') +} + +// isHex validates whether each byte is valid hexadecimal string. +func isHex(str string) bool { + if len(str)%2 != 0 { + return false + } + for _, c := range []byte(str) { + if !isHexCharacter(c) { + return false + } + } + return true +} + +// Bytes2Hex returns the hexadecimal encoding of d. +func Bytes2Hex(d []byte) string { + return hex.EncodeToString(d) +} + +// Hex2Bytes returns the bytes represented by the hexadecimal string str. +func Hex2Bytes(str string) []byte { + h, _ := hex.DecodeString(str) + return h +} + +// Hex2BytesFixed returns bytes of a specified fixed length flen. +func Hex2BytesFixed(str string, flen int) []byte { + h, _ := hex.DecodeString(str) + if len(h) == flen { + return h + } + if len(h) > flen { + return h[len(h)-flen:] + } + hh := make([]byte, flen) + copy(hh[flen-len(h):flen], h) + return hh +} + +// RightPadBytes zero-pads slice to the right up to length l. +func RightPadBytes(slice []byte, l int) []byte { + if l <= len(slice) { + return slice + } + + padded := make([]byte, l) + copy(padded, slice) + + return padded +} + +// LeftPadBytes zero-pads slice to the left up to length l. +func LeftPadBytes(slice []byte, l int) []byte { + if l <= len(slice) { + return slice + } + + padded := make([]byte, l) + copy(padded[l-len(slice):], slice) + + return padded +} diff --git a/vendor/github.com/ethereum/go-ethereum/common/debug.go b/vendor/github.com/ethereum/go-ethereum/common/debug.go new file mode 100644 index 000000000..61acd8ce7 --- /dev/null +++ b/vendor/github.com/ethereum/go-ethereum/common/debug.go @@ -0,0 +1,52 @@ +// Copyright 2015 The go-ethereum Authors +// This file is part of the go-ethereum library. +// +// The go-ethereum library is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// The go-ethereum library 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 Lesser General Public License for more details. +// +// 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/>. + +package common + +import ( + "fmt" + "os" + "runtime" + "runtime/debug" + "strings" +) + +// Report gives off a warning requesting the user to submit an issue to the github tracker. +func Report(extra ...interface{}) { + fmt.Fprintln(os.Stderr, "You've encountered a sought after, hard to reproduce bug. Please report this to the developers <3 https://github.com/ethereum/go-ethereum/issues") + fmt.Fprintln(os.Stderr, extra...) + + _, file, line, _ := runtime.Caller(1) + fmt.Fprintf(os.Stderr, "%v:%v\n", file, line) + + debug.PrintStack() + + fmt.Fprintln(os.Stderr, "#### BUG! PLEASE REPORT ####") +} + +// PrintDepricationWarning prinst the given string in a box using fmt.Println. +func PrintDepricationWarning(str string) { + line := strings.Repeat("#", len(str)+4) + emptyLine := strings.Repeat(" ", len(str)) + fmt.Printf(` +%s +# %s # +# %s # +# %s # +%s + +`, line, emptyLine, str, emptyLine, line) +} diff --git a/vendor/github.com/ethereum/go-ethereum/common/format.go b/vendor/github.com/ethereum/go-ethereum/common/format.go new file mode 100644 index 000000000..6fc21af71 --- /dev/null +++ b/vendor/github.com/ethereum/go-ethereum/common/format.go @@ -0,0 +1,82 @@ +// Copyright 2016 The go-ethereum Authors +// This file is part of the go-ethereum library. +// +// The go-ethereum library is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// The go-ethereum library 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 Lesser General Public License for more details. +// +// 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/>. + +package common + +import ( + "fmt" + "regexp" + "strings" + "time" +) + +// PrettyDuration is a pretty printed version of a time.Duration value that cuts +// the unnecessary precision off from the formatted textual representation. +type PrettyDuration time.Duration + +var prettyDurationRe = regexp.MustCompile(`\.[0-9]+`) + +// String implements the Stringer interface, allowing pretty printing of duration +// values rounded to three decimals. +func (d PrettyDuration) String() string { + label := fmt.Sprintf("%v", time.Duration(d)) + if match := prettyDurationRe.FindString(label); len(match) > 4 { + label = strings.Replace(label, match, match[:4], 1) + } + return label +} + +// PrettyAge is a pretty printed version of a time.Duration value that rounds +// the values up to a single most significant unit, days/weeks/years included. +type PrettyAge time.Time + +// ageUnits is a list of units the age pretty printing uses. +var ageUnits = []struct { + Size time.Duration + Symbol string +}{ + {12 * 30 * 24 * time.Hour, "y"}, + {30 * 24 * time.Hour, "mo"}, + {7 * 24 * time.Hour, "w"}, + {24 * time.Hour, "d"}, + {time.Hour, "h"}, + {time.Minute, "m"}, + {time.Second, "s"}, +} + +// String implements the Stringer interface, allowing pretty printing of duration +// values rounded to the most significant time unit. +func (t PrettyAge) String() string { + // Calculate the time difference and handle the 0 cornercase + diff := time.Since(time.Time(t)) + if diff < time.Second { + return "0" + } + // Accumulate a precision of 3 components before returning + result, prec := "", 0 + + for _, unit := range ageUnits { + if diff > unit.Size { + result = fmt.Sprintf("%s%d%s", result, diff/unit.Size, unit.Symbol) + diff %= unit.Size + + if prec += 1; prec >= 3 { + break + } + } + } + return result +} diff --git a/vendor/github.com/ethereum/go-ethereum/common/hexutil/hexutil.go b/vendor/github.com/ethereum/go-ethereum/common/hexutil/hexutil.go new file mode 100644 index 000000000..46223a281 --- /dev/null +++ b/vendor/github.com/ethereum/go-ethereum/common/hexutil/hexutil.go @@ -0,0 +1,240 @@ +// Copyright 2016 The go-ethereum Authors +// This file is part of the go-ethereum library. +// +// The go-ethereum library is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// The go-ethereum library 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 Lesser General Public License for more details. +// +// 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/>. + +/* +Package hexutil implements hex encoding with 0x prefix. +This encoding is used by the Ethereum RPC API to transport binary data in JSON payloads. + +Encoding Rules + +All hex data must have prefix "0x". + +For byte slices, the hex data must be of even length. An empty byte slice +encodes as "0x". + +Integers are encoded using the least amount of digits (no leading zero digits). Their +encoding may be of uneven length. The number zero encodes as "0x0". +*/ +package hexutil + +import ( + "encoding/hex" + "fmt" + "math/big" + "strconv" +) + +const uintBits = 32 << (uint64(^uint(0)) >> 63) + +// Errors +var ( + ErrEmptyString = &decError{"empty hex string"} + ErrSyntax = &decError{"invalid hex string"} + ErrMissingPrefix = &decError{"hex string without 0x prefix"} + ErrOddLength = &decError{"hex string of odd length"} + ErrEmptyNumber = &decError{"hex string \"0x\""} + ErrLeadingZero = &decError{"hex number with leading zero digits"} + ErrUint64Range = &decError{"hex number > 64 bits"} + ErrUintRange = &decError{fmt.Sprintf("hex number > %d bits", uintBits)} + ErrBig256Range = &decError{"hex number > 256 bits"} +) + +type decError struct{ msg string } + +func (err decError) Error() string { return err.msg } + +// Decode decodes a hex string with 0x prefix. +func Decode(input string) ([]byte, error) { + if len(input) == 0 { + return nil, ErrEmptyString + } + if !has0xPrefix(input) { + return nil, ErrMissingPrefix + } + b, err := hex.DecodeString(input[2:]) + if err != nil { + err = mapError(err) + } + return b, err +} + +// MustDecode decodes a hex string with 0x prefix. It panics for invalid input. +func MustDecode(input string) []byte { + dec, err := Decode(input) + if err != nil { + panic(err) + } + return dec +} + +// Encode encodes b as a hex string with 0x prefix. +func Encode(b []byte) string { + enc := make([]byte, len(b)*2+2) + copy(enc, "0x") + hex.Encode(enc[2:], b) + return string(enc) +} + +// DecodeUint64 decodes a hex string with 0x prefix as a quantity. +func DecodeUint64(input string) (uint64, error) { + raw, err := checkNumber(input) + if err != nil { + return 0, err + } + dec, err := strconv.ParseUint(raw, 16, 64) + if err != nil { + err = mapError(err) + } + return dec, err +} + +// MustDecodeUint64 decodes a hex string with 0x prefix as a quantity. +// It panics for invalid input. +func MustDecodeUint64(input string) uint64 { + dec, err := DecodeUint64(input) + if err != nil { + panic(err) + } + return dec +} + +// EncodeUint64 encodes i as a hex string with 0x prefix. +func EncodeUint64(i uint64) string { + enc := make([]byte, 2, 10) + copy(enc, "0x") + return string(strconv.AppendUint(enc, i, 16)) +} + +var bigWordNibbles int + +func init() { + // This is a weird way to compute the number of nibbles required for big.Word. + // The usual way would be to use constant arithmetic but go vet can't handle that. + b, _ := new(big.Int).SetString("FFFFFFFFFF", 16) + switch len(b.Bits()) { + case 1: + bigWordNibbles = 16 + case 2: + bigWordNibbles = 8 + default: + panic("weird big.Word size") + } +} + +// DecodeBig decodes a hex string with 0x prefix as a quantity. +// Numbers larger than 256 bits are not accepted. +func DecodeBig(input string) (*big.Int, error) { + raw, err := checkNumber(input) + if err != nil { + return nil, err + } + if len(raw) > 64 { + return nil, ErrBig256Range + } + words := make([]big.Word, len(raw)/bigWordNibbles+1) + end := len(raw) + for i := range words { + start := end - bigWordNibbles + if start < 0 { + start = 0 + } + for ri := start; ri < end; ri++ { + nib := decodeNibble(raw[ri]) + if nib == badNibble { + return nil, ErrSyntax + } + words[i] *= 16 + words[i] += big.Word(nib) + } + end = start + } + dec := new(big.Int).SetBits(words) + return dec, nil +} + +// MustDecodeBig decodes a hex string with 0x prefix as a quantity. +// It panics for invalid input. +func MustDecodeBig(input string) *big.Int { + dec, err := DecodeBig(input) + if err != nil { + panic(err) + } + return dec +} + +// EncodeBig encodes bigint as a hex string with 0x prefix. +// The sign of the integer is ignored. +func EncodeBig(bigint *big.Int) string { + nbits := bigint.BitLen() + if nbits == 0 { + return "0x0" + } + return fmt.Sprintf("%#x", bigint) +} + +func has0xPrefix(input string) bool { + return len(input) >= 2 && input[0] == '0' && (input[1] == 'x' || input[1] == 'X') +} + +func checkNumber(input string) (raw string, err error) { + if len(input) == 0 { + return "", ErrEmptyString + } + if !has0xPrefix(input) { + return "", ErrMissingPrefix + } + input = input[2:] + if len(input) == 0 { + return "", ErrEmptyNumber + } + if len(input) > 1 && input[0] == '0' { + return "", ErrLeadingZero + } + return input, nil +} + +const badNibble = ^uint64(0) + +func decodeNibble(in byte) uint64 { + switch { + case in >= '0' && in <= '9': + return uint64(in - '0') + case in >= 'A' && in <= 'F': + return uint64(in - 'A' + 10) + case in >= 'a' && in <= 'f': + return uint64(in - 'a' + 10) + default: + return badNibble + } +} + +func mapError(err error) error { + if err, ok := err.(*strconv.NumError); ok { + switch err.Err { + case strconv.ErrRange: + return ErrUint64Range + case strconv.ErrSyntax: + return ErrSyntax + } + } + if _, ok := err.(hex.InvalidByteError); ok { + return ErrSyntax + } + if err == hex.ErrLength { + return ErrOddLength + } + return err +} diff --git a/vendor/github.com/ethereum/go-ethereum/common/hexutil/json.go b/vendor/github.com/ethereum/go-ethereum/common/hexutil/json.go new file mode 100644 index 000000000..777b08eca --- /dev/null +++ b/vendor/github.com/ethereum/go-ethereum/common/hexutil/json.go @@ -0,0 +1,376 @@ +// Copyright 2016 The go-ethereum Authors +// This file is part of the go-ethereum library. +// +// The go-ethereum library is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// The go-ethereum library 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 Lesser General Public License for more details. +// +// 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/>. + +package hexutil + +import ( + "encoding/hex" + "encoding/json" + "fmt" + "math/big" + "reflect" + "strconv" +) + +var ( + bytesT = reflect.TypeOf(Bytes(nil)) + bigT = reflect.TypeOf((*Big)(nil)) + uintT = reflect.TypeOf(Uint(0)) + uint64T = reflect.TypeOf(Uint64(0)) +) + +// Bytes marshals/unmarshals as a JSON string with 0x prefix. +// The empty slice marshals as "0x". +type Bytes []byte + +// MarshalText implements encoding.TextMarshaler +func (b Bytes) MarshalText() ([]byte, error) { + result := make([]byte, len(b)*2+2) + copy(result, `0x`) + hex.Encode(result[2:], b) + return result, nil +} + +// UnmarshalJSON implements json.Unmarshaler. +func (b *Bytes) UnmarshalJSON(input []byte) error { + if !isString(input) { + return errNonString(bytesT) + } + return wrapTypeError(b.UnmarshalText(input[1:len(input)-1]), bytesT) +} + +// UnmarshalText implements encoding.TextUnmarshaler. +func (b *Bytes) UnmarshalText(input []byte) error { + raw, err := checkText(input, true) + if err != nil { + return err + } + dec := make([]byte, len(raw)/2) + if _, err = hex.Decode(dec, raw); err != nil { + err = mapError(err) + } else { + *b = dec + } + return err +} + +// String returns the hex encoding of b. +func (b Bytes) String() string { + return Encode(b) +} + +// ImplementsGraphQLType returns true if Bytes implements the specified GraphQL type. +func (b Bytes) ImplementsGraphQLType(name string) bool { return name == "Bytes" } + +// UnmarshalGraphQL unmarshals the provided GraphQL query data. +func (b *Bytes) UnmarshalGraphQL(input interface{}) error { + var err error + switch input := input.(type) { + case string: + data, err := Decode(input) + if err != nil { + return err + } + *b = data + default: + err = fmt.Errorf("Unexpected type for Bytes: %v", input) + } + return err +} + +// UnmarshalFixedJSON decodes the input as a string with 0x prefix. The length of out +// determines the required input length. This function is commonly used to implement the +// UnmarshalJSON method for fixed-size types. +func UnmarshalFixedJSON(typ reflect.Type, input, out []byte) error { + if !isString(input) { + return errNonString(typ) + } + return wrapTypeError(UnmarshalFixedText(typ.String(), input[1:len(input)-1], out), typ) +} + +// UnmarshalFixedText decodes the input as a string with 0x prefix. The length of out +// determines the required input length. This function is commonly used to implement the +// UnmarshalText method for fixed-size types. +func UnmarshalFixedText(typname string, input, out []byte) error { + raw, err := checkText(input, true) + if err != nil { + return err + } + if len(raw)/2 != len(out) { + return fmt.Errorf("hex string has length %d, want %d for %s", len(raw), len(out)*2, typname) + } + // Pre-verify syntax before modifying out. + for _, b := range raw { + if decodeNibble(b) == badNibble { + return ErrSyntax + } + } + hex.Decode(out, raw) + return nil +} + +// UnmarshalFixedUnprefixedText decodes the input as a string with optional 0x prefix. The +// length of out determines the required input length. This function is commonly used to +// implement the UnmarshalText method for fixed-size types. +func UnmarshalFixedUnprefixedText(typname string, input, out []byte) error { + raw, err := checkText(input, false) + if err != nil { + return err + } + if len(raw)/2 != len(out) { + return fmt.Errorf("hex string has length %d, want %d for %s", len(raw), len(out)*2, typname) + } + // Pre-verify syntax before modifying out. + for _, b := range raw { + if decodeNibble(b) == badNibble { + return ErrSyntax + } + } + hex.Decode(out, raw) + return nil +} + +// Big marshals/unmarshals as a JSON string with 0x prefix. +// The zero value marshals as "0x0". +// +// Negative integers are not supported at this time. Attempting to marshal them will +// return an error. Values larger than 256bits are rejected by Unmarshal but will be +// marshaled without error. +type Big big.Int + +// MarshalText implements encoding.TextMarshaler +func (b Big) MarshalText() ([]byte, error) { + return []byte(EncodeBig((*big.Int)(&b))), nil +} + +// UnmarshalJSON implements json.Unmarshaler. +func (b *Big) UnmarshalJSON(input []byte) error { + if !isString(input) { + return errNonString(bigT) + } + return wrapTypeError(b.UnmarshalText(input[1:len(input)-1]), bigT) +} + +// UnmarshalText implements encoding.TextUnmarshaler +func (b *Big) UnmarshalText(input []byte) error { + raw, err := checkNumberText(input) + if err != nil { + return err + } + if len(raw) > 64 { + return ErrBig256Range + } + words := make([]big.Word, len(raw)/bigWordNibbles+1) + end := len(raw) + for i := range words { + start := end - bigWordNibbles + if start < 0 { + start = 0 + } + for ri := start; ri < end; ri++ { + nib := decodeNibble(raw[ri]) + if nib == badNibble { + return ErrSyntax + } + words[i] *= 16 + words[i] += big.Word(nib) + } + end = start + } + var dec big.Int + dec.SetBits(words) + *b = (Big)(dec) + return nil +} + +// ToInt converts b to a big.Int. +func (b *Big) ToInt() *big.Int { + return (*big.Int)(b) +} + +// String returns the hex encoding of b. +func (b *Big) String() string { + return EncodeBig(b.ToInt()) +} + +// ImplementsGraphQLType returns true if Big implements the provided GraphQL type. +func (b Big) ImplementsGraphQLType(name string) bool { return name == "BigInt" } + +// UnmarshalGraphQL unmarshals the provided GraphQL query data. +func (b *Big) UnmarshalGraphQL(input interface{}) error { + var err error + switch input := input.(type) { + case string: + return b.UnmarshalText([]byte(input)) + case int32: + var num big.Int + num.SetInt64(int64(input)) + *b = Big(num) + default: + err = fmt.Errorf("Unexpected type for BigInt: %v", input) + } + return err +} + +// Uint64 marshals/unmarshals as a JSON string with 0x prefix. +// The zero value marshals as "0x0". +type Uint64 uint64 + +// MarshalText implements encoding.TextMarshaler. +func (b Uint64) MarshalText() ([]byte, error) { + buf := make([]byte, 2, 10) + copy(buf, `0x`) + buf = strconv.AppendUint(buf, uint64(b), 16) + return buf, nil +} + +// UnmarshalJSON implements json.Unmarshaler. +func (b *Uint64) UnmarshalJSON(input []byte) error { + if !isString(input) { + return errNonString(uint64T) + } + return wrapTypeError(b.UnmarshalText(input[1:len(input)-1]), uint64T) +} + +// UnmarshalText implements encoding.TextUnmarshaler +func (b *Uint64) UnmarshalText(input []byte) error { + raw, err := checkNumberText(input) + if err != nil { + return err + } + if len(raw) > 16 { + return ErrUint64Range + } + var dec uint64 + for _, byte := range raw { + nib := decodeNibble(byte) + if nib == badNibble { + return ErrSyntax + } + dec *= 16 + dec += nib + } + *b = Uint64(dec) + return nil +} + +// String returns the hex encoding of b. +func (b Uint64) String() string { + return EncodeUint64(uint64(b)) +} + +// ImplementsGraphQLType returns true if Uint64 implements the provided GraphQL type. +func (b Uint64) ImplementsGraphQLType(name string) bool { return name == "Long" } + +// UnmarshalGraphQL unmarshals the provided GraphQL query data. +func (b *Uint64) UnmarshalGraphQL(input interface{}) error { + var err error + switch input := input.(type) { + case string: + return b.UnmarshalText([]byte(input)) + case int32: + *b = Uint64(input) + default: + err = fmt.Errorf("Unexpected type for Long: %v", input) + } + return err +} + +// Uint marshals/unmarshals as a JSON string with 0x prefix. +// The zero value marshals as "0x0". +type Uint uint + +// MarshalText implements encoding.TextMarshaler. +func (b Uint) MarshalText() ([]byte, error) { + return Uint64(b).MarshalText() +} + +// UnmarshalJSON implements json.Unmarshaler. +func (b *Uint) UnmarshalJSON(input []byte) error { + if !isString(input) { + return errNonString(uintT) + } + return wrapTypeError(b.UnmarshalText(input[1:len(input)-1]), uintT) +} + +// UnmarshalText implements encoding.TextUnmarshaler. +func (b *Uint) UnmarshalText(input []byte) error { + var u64 Uint64 + err := u64.UnmarshalText(input) + if u64 > Uint64(^uint(0)) || err == ErrUint64Range { + return ErrUintRange + } else if err != nil { + return err + } + *b = Uint(u64) + return nil +} + +// String returns the hex encoding of b. +func (b Uint) String() string { + return EncodeUint64(uint64(b)) +} + +func isString(input []byte) bool { + return len(input) >= 2 && input[0] == '"' && input[len(input)-1] == '"' +} + +func bytesHave0xPrefix(input []byte) bool { + return len(input) >= 2 && input[0] == '0' && (input[1] == 'x' || input[1] == 'X') +} + +func checkText(input []byte, wantPrefix bool) ([]byte, error) { + if len(input) == 0 { + return nil, nil // empty strings are allowed + } + if bytesHave0xPrefix(input) { + input = input[2:] + } else if wantPrefix { + return nil, ErrMissingPrefix + } + if len(input)%2 != 0 { + return nil, ErrOddLength + } + return input, nil +} + +func checkNumberText(input []byte) (raw []byte, err error) { + if len(input) == 0 { + return nil, nil // empty strings are allowed + } + if !bytesHave0xPrefix(input) { + return nil, ErrMissingPrefix + } + input = input[2:] + if len(input) == 0 { + return nil, ErrEmptyNumber + } + if len(input) > 1 && input[0] == '0' { + return nil, ErrLeadingZero + } + return input, nil +} + +func wrapTypeError(err error, typ reflect.Type) error { + if _, ok := err.(*decError); ok { + return &json.UnmarshalTypeError{Value: err.Error(), Type: typ} + } + return err +} + +func errNonString(typ reflect.Type) error { + return &json.UnmarshalTypeError{Value: "non-string", Type: typ} +} diff --git a/vendor/github.com/ethereum/go-ethereum/common/math/big.go b/vendor/github.com/ethereum/go-ethereum/common/math/big.go new file mode 100644 index 000000000..d31c59af1 --- /dev/null +++ b/vendor/github.com/ethereum/go-ethereum/common/math/big.go @@ -0,0 +1,219 @@ +// Copyright 2017 The go-ethereum Authors +// This file is part of the go-ethereum library. +// +// The go-ethereum library is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// The go-ethereum library 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 Lesser General Public License for more details. +// +// 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/>. + +// Package math provides integer math utilities. +package math + +import ( + "fmt" + "math/big" +) + +// Various big integer limit values. +var ( + tt255 = BigPow(2, 255) + tt256 = BigPow(2, 256) + tt256m1 = new(big.Int).Sub(tt256, big.NewInt(1)) + tt63 = BigPow(2, 63) + MaxBig256 = new(big.Int).Set(tt256m1) + MaxBig63 = new(big.Int).Sub(tt63, big.NewInt(1)) +) + +const ( + // number of bits in a big.Word + wordBits = 32 << (uint64(^big.Word(0)) >> 63) + // number of bytes in a big.Word + wordBytes = wordBits / 8 +) + +// HexOrDecimal256 marshals big.Int as hex or decimal. +type HexOrDecimal256 big.Int + +// NewHexOrDecimal256 creates a new HexOrDecimal256 +func NewHexOrDecimal256(x int64) *HexOrDecimal256 { + b := big.NewInt(x) + h := HexOrDecimal256(*b) + return &h +} + +// UnmarshalText implements encoding.TextUnmarshaler. +func (i *HexOrDecimal256) UnmarshalText(input []byte) error { + bigint, ok := ParseBig256(string(input)) + if !ok { + return fmt.Errorf("invalid hex or decimal integer %q", input) + } + *i = HexOrDecimal256(*bigint) + return nil +} + +// MarshalText implements encoding.TextMarshaler. +func (i *HexOrDecimal256) MarshalText() ([]byte, error) { + if i == nil { + return []byte("0x0"), nil + } + return []byte(fmt.Sprintf("%#x", (*big.Int)(i))), nil +} + +// ParseBig256 parses s as a 256 bit integer in decimal or hexadecimal syntax. +// Leading zeros are accepted. The empty string parses as zero. +func ParseBig256(s string) (*big.Int, bool) { + if s == "" { + return new(big.Int), true + } + var bigint *big.Int + var ok bool + if len(s) >= 2 && (s[:2] == "0x" || s[:2] == "0X") { + bigint, ok = new(big.Int).SetString(s[2:], 16) + } else { + bigint, ok = new(big.Int).SetString(s, 10) + } + if ok && bigint.BitLen() > 256 { + bigint, ok = nil, false + } + return bigint, ok +} + +// MustParseBig256 parses s as a 256 bit big integer and panics if the string is invalid. +func MustParseBig256(s string) *big.Int { + v, ok := ParseBig256(s) + if !ok { + panic("invalid 256 bit integer: " + s) + } + return v +} + +// BigPow returns a ** b as a big integer. +func BigPow(a, b int64) *big.Int { + r := big.NewInt(a) + return r.Exp(r, big.NewInt(b), nil) +} + +// BigMax returns the larger of x or y. +func BigMax(x, y *big.Int) *big.Int { + if x.Cmp(y) < 0 { + return y + } + return x +} + +// BigMin returns the smaller of x or y. +func BigMin(x, y *big.Int) *big.Int { + if x.Cmp(y) > 0 { + return y + } + return x +} + +// FirstBitSet returns the index of the first 1 bit in v, counting from LSB. +func FirstBitSet(v *big.Int) int { + for i := 0; i < v.BitLen(); i++ { + if v.Bit(i) > 0 { + return i + } + } + return v.BitLen() +} + +// PaddedBigBytes encodes a big integer as a big-endian byte slice. The length +// of the slice is at least n bytes. +func PaddedBigBytes(bigint *big.Int, n int) []byte { + if bigint.BitLen()/8 >= n { + return bigint.Bytes() + } + ret := make([]byte, n) + ReadBits(bigint, ret) + return ret +} + +// bigEndianByteAt returns the byte at position n, +// in Big-Endian encoding +// So n==0 returns the least significant byte +func bigEndianByteAt(bigint *big.Int, n int) byte { + words := bigint.Bits() + // Check word-bucket the byte will reside in + i := n / wordBytes + if i >= len(words) { + return byte(0) + } + word := words[i] + // Offset of the byte + shift := 8 * uint(n%wordBytes) + + return byte(word >> shift) +} + +// Byte returns the byte at position n, +// with the supplied padlength in Little-Endian encoding. +// n==0 returns the MSB +// Example: bigint '5', padlength 32, n=31 => 5 +func Byte(bigint *big.Int, padlength, n int) byte { + if n >= padlength { + return byte(0) + } + return bigEndianByteAt(bigint, padlength-1-n) +} + +// ReadBits encodes the absolute value of bigint as big-endian bytes. Callers must ensure +// that buf has enough space. If buf is too short the result will be incomplete. +func ReadBits(bigint *big.Int, buf []byte) { + i := len(buf) + for _, d := range bigint.Bits() { + for j := 0; j < wordBytes && i > 0; j++ { + i-- + buf[i] = byte(d) + d >>= 8 + } + } +} + +// U256 encodes as a 256 bit two's complement number. This operation is destructive. +func U256(x *big.Int) *big.Int { + return x.And(x, tt256m1) +} + +// S256 interprets x as a two's complement number. +// x must not exceed 256 bits (the result is undefined if it does) and is not modified. +// +// S256(0) = 0 +// S256(1) = 1 +// S256(2**255) = -2**255 +// S256(2**256-1) = -1 +func S256(x *big.Int) *big.Int { + if x.Cmp(tt255) < 0 { + return x + } + return new(big.Int).Sub(x, tt256) +} + +// Exp implements exponentiation by squaring. +// Exp returns a newly-allocated big integer and does not change +// base or exponent. The result is truncated to 256 bits. +// +// Courtesy @karalabe and @chfast +func Exp(base, exponent *big.Int) *big.Int { + result := big.NewInt(1) + + for _, word := range exponent.Bits() { + for i := 0; i < wordBits; i++ { + if word&1 == 1 { + U256(result.Mul(result, base)) + } + U256(base.Mul(base, base)) + word >>= 1 + } + } + return result +} diff --git a/vendor/github.com/ethereum/go-ethereum/common/math/integer.go b/vendor/github.com/ethereum/go-ethereum/common/math/integer.go new file mode 100644 index 000000000..93b1d036d --- /dev/null +++ b/vendor/github.com/ethereum/go-ethereum/common/math/integer.go @@ -0,0 +1,99 @@ +// Copyright 2017 The go-ethereum Authors +// This file is part of the go-ethereum library. +// +// The go-ethereum library is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// The go-ethereum library 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 Lesser General Public License for more details. +// +// 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/>. + +package math + +import ( + "fmt" + "strconv" +) + +// Integer limit values. +const ( + MaxInt8 = 1<<7 - 1 + MinInt8 = -1 << 7 + MaxInt16 = 1<<15 - 1 + MinInt16 = -1 << 15 + MaxInt32 = 1<<31 - 1 + MinInt32 = -1 << 31 + MaxInt64 = 1<<63 - 1 + MinInt64 = -1 << 63 + MaxUint8 = 1<<8 - 1 + MaxUint16 = 1<<16 - 1 + MaxUint32 = 1<<32 - 1 + MaxUint64 = 1<<64 - 1 +) + +// HexOrDecimal64 marshals uint64 as hex or decimal. +type HexOrDecimal64 uint64 + +// UnmarshalText implements encoding.TextUnmarshaler. +func (i *HexOrDecimal64) UnmarshalText(input []byte) error { + int, ok := ParseUint64(string(input)) + if !ok { + return fmt.Errorf("invalid hex or decimal integer %q", input) + } + *i = HexOrDecimal64(int) + return nil +} + +// MarshalText implements encoding.TextMarshaler. +func (i HexOrDecimal64) MarshalText() ([]byte, error) { + return []byte(fmt.Sprintf("%#x", uint64(i))), nil +} + +// ParseUint64 parses s as an integer in decimal or hexadecimal syntax. +// Leading zeros are accepted. The empty string parses as zero. +func ParseUint64(s string) (uint64, bool) { + if s == "" { + return 0, true + } + if len(s) >= 2 && (s[:2] == "0x" || s[:2] == "0X") { + v, err := strconv.ParseUint(s[2:], 16, 64) + return v, err == nil + } + v, err := strconv.ParseUint(s, 10, 64) + return v, err == nil +} + +// MustParseUint64 parses s as an integer and panics if the string is invalid. +func MustParseUint64(s string) uint64 { + v, ok := ParseUint64(s) + if !ok { + panic("invalid unsigned 64 bit integer: " + s) + } + return v +} + +// NOTE: The following methods need to be optimised using either bit checking or asm + +// SafeSub returns subtraction result and whether overflow occurred. +func SafeSub(x, y uint64) (uint64, bool) { + return x - y, x < y +} + +// SafeAdd returns the result and whether overflow occurred. +func SafeAdd(x, y uint64) (uint64, bool) { + return x + y, y > MaxUint64-x +} + +// SafeMul returns multiplication result and whether overflow occurred. +func SafeMul(x, y uint64) (uint64, bool) { + if x == 0 || y == 0 { + return 0, false + } + return x * y, y > MaxUint64/x +} diff --git a/vendor/github.com/ethereum/go-ethereum/common/path.go b/vendor/github.com/ethereum/go-ethereum/common/path.go new file mode 100644 index 000000000..69820cfe5 --- /dev/null +++ b/vendor/github.com/ethereum/go-ethereum/common/path.go @@ -0,0 +1,49 @@ +// Copyright 2014 The go-ethereum Authors +// This file is part of the go-ethereum library. +// +// The go-ethereum library is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// The go-ethereum library 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 Lesser General Public License for more details. +// +// 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/>. + +package common + +import ( + "fmt" + "os" + "path/filepath" + "runtime" +) + +// MakeName creates a node name that follows the ethereum convention +// for such names. It adds the operation system name and Go runtime version +// the name. +func MakeName(name, version string) string { + return fmt.Sprintf("%s/v%s/%s/%s", name, version, runtime.GOOS, runtime.Version()) +} + +// FileExist checks if a file exists at filePath. +func FileExist(filePath string) bool { + _, err := os.Stat(filePath) + if err != nil && os.IsNotExist(err) { + return false + } + + return true +} + +// AbsolutePath returns datadir + filename, or filename if it is absolute. +func AbsolutePath(datadir string, filename string) string { + if filepath.IsAbs(filename) { + return filename + } + return filepath.Join(datadir, filename) +} diff --git a/vendor/github.com/ethereum/go-ethereum/common/size.go b/vendor/github.com/ethereum/go-ethereum/common/size.go new file mode 100644 index 000000000..097b6304a --- /dev/null +++ b/vendor/github.com/ethereum/go-ethereum/common/size.go @@ -0,0 +1,56 @@ +// Copyright 2014 The go-ethereum Authors +// This file is part of the go-ethereum library. +// +// The go-ethereum library is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// The go-ethereum library 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 Lesser General Public License for more details. +// +// 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/>. + +package common + +import ( + "fmt" +) + +// StorageSize is a wrapper around a float value that supports user friendly +// formatting. +type StorageSize float64 + +// String implements the stringer interface. +func (s StorageSize) String() string { + if s > 1099511627776 { + return fmt.Sprintf("%.2f TiB", s/1099511627776) + } else if s > 1073741824 { + return fmt.Sprintf("%.2f GiB", s/1073741824) + } else if s > 1048576 { + return fmt.Sprintf("%.2f MiB", s/1048576) + } else if s > 1024 { + return fmt.Sprintf("%.2f KiB", s/1024) + } else { + return fmt.Sprintf("%.2f B", s) + } +} + +// TerminalString implements log.TerminalStringer, formatting a string for console +// output during logging. +func (s StorageSize) TerminalString() string { + if s > 1099511627776 { + return fmt.Sprintf("%.2fTiB", s/1099511627776) + } else if s > 1073741824 { + return fmt.Sprintf("%.2fGiB", s/1073741824) + } else if s > 1048576 { + return fmt.Sprintf("%.2fMiB", s/1048576) + } else if s > 1024 { + return fmt.Sprintf("%.2fKiB", s/1024) + } else { + return fmt.Sprintf("%.2fB", s) + } +} diff --git a/vendor/github.com/ethereum/go-ethereum/common/test_utils.go b/vendor/github.com/ethereum/go-ethereum/common/test_utils.go new file mode 100644 index 000000000..a848642f7 --- /dev/null +++ b/vendor/github.com/ethereum/go-ethereum/common/test_utils.go @@ -0,0 +1,53 @@ +// Copyright 2015 The go-ethereum Authors +// This file is part of the go-ethereum library. +// +// The go-ethereum library is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// The go-ethereum library 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 Lesser General Public License for more details. +// +// 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/>. + +package common + +import ( + "encoding/json" + "fmt" + "io/ioutil" +) + +// LoadJSON reads the given file and unmarshals its content. +func LoadJSON(file string, val interface{}) error { + content, err := ioutil.ReadFile(file) + if err != nil { + return err + } + if err := json.Unmarshal(content, val); err != nil { + if syntaxerr, ok := err.(*json.SyntaxError); ok { + line := findLine(content, syntaxerr.Offset) + return fmt.Errorf("JSON syntax error at %v:%v: %v", file, line, err) + } + return fmt.Errorf("JSON unmarshal error in %v: %v", file, err) + } + return nil +} + +// findLine returns the line number for the given offset into data. +func findLine(data []byte, offset int64) (line int) { + line = 1 + for i, r := range string(data) { + if int64(i) >= offset { + return + } + if r == '\n' { + line++ + } + } + return +} diff --git a/vendor/github.com/ethereum/go-ethereum/common/types.go b/vendor/github.com/ethereum/go-ethereum/common/types.go new file mode 100644 index 000000000..98c83edd4 --- /dev/null +++ b/vendor/github.com/ethereum/go-ethereum/common/types.go @@ -0,0 +1,369 @@ +// Copyright 2015 The go-ethereum Authors +// This file is part of the go-ethereum library. +// +// The go-ethereum library is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// The go-ethereum library 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 Lesser General Public License for more details. +// +// 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/>. + +package common + +import ( + "database/sql/driver" + "encoding/hex" + "encoding/json" + "fmt" + "math/big" + "math/rand" + "reflect" + "strings" + + "github.com/ethereum/go-ethereum/common/hexutil" + "golang.org/x/crypto/sha3" +) + +// Lengths of hashes and addresses in bytes. +const ( + // HashLength is the expected length of the hash + HashLength = 32 + // AddressLength is the expected length of the address + AddressLength = 20 +) + +var ( + hashT = reflect.TypeOf(Hash{}) + addressT = reflect.TypeOf(Address{}) +) + +// Hash represents the 32 byte Keccak256 hash of arbitrary data. +type Hash [HashLength]byte + +// BytesToHash sets b to hash. +// If b is larger than len(h), b will be cropped from the left. +func BytesToHash(b []byte) Hash { + var h Hash + h.SetBytes(b) + return h +} + +// BigToHash sets byte representation of b to hash. +// If b is larger than len(h), b will be cropped from the left. +func BigToHash(b *big.Int) Hash { return BytesToHash(b.Bytes()) } + +// HexToHash sets byte representation of s to hash. +// If b is larger than len(h), b will be cropped from the left. +func HexToHash(s string) Hash { return BytesToHash(FromHex(s)) } + +// Bytes gets the byte representation of the underlying hash. +func (h Hash) Bytes() []byte { return h[:] } + +// Big converts a hash to a big integer. +func (h Hash) Big() *big.Int { return new(big.Int).SetBytes(h[:]) } + +// Hex converts a hash to a hex string. +func (h Hash) Hex() string { return hexutil.Encode(h[:]) } + +// TerminalString implements log.TerminalStringer, formatting a string for console +// output during logging. +func (h Hash) TerminalString() string { + return fmt.Sprintf("%x…%x", h[:3], h[29:]) +} + +// String implements the stringer interface and is used also by the logger when +// doing full logging into a file. +func (h Hash) String() string { + return h.Hex() +} + +// Format implements fmt.Formatter, forcing the byte slice to be formatted as is, +// without going through the stringer interface used for logging. +func (h Hash) Format(s fmt.State, c rune) { + fmt.Fprintf(s, "%"+string(c), h[:]) +} + +// UnmarshalText parses a hash in hex syntax. +func (h *Hash) UnmarshalText(input []byte) error { + return hexutil.UnmarshalFixedText("Hash", input, h[:]) +} + +// UnmarshalJSON parses a hash in hex syntax. +func (h *Hash) UnmarshalJSON(input []byte) error { + return hexutil.UnmarshalFixedJSON(hashT, input, h[:]) +} + +// MarshalText returns the hex representation of h. +func (h Hash) MarshalText() ([]byte, error) { + return hexutil.Bytes(h[:]).MarshalText() +} + +// SetBytes sets the hash to the value of b. +// If b is larger than len(h), b will be cropped from the left. +func (h *Hash) SetBytes(b []byte) { + if len(b) > len(h) { + b = b[len(b)-HashLength:] + } + + copy(h[HashLength-len(b):], b) +} + +// Generate implements testing/quick.Generator. +func (h Hash) Generate(rand *rand.Rand, size int) reflect.Value { + m := rand.Intn(len(h)) + for i := len(h) - 1; i > m; i-- { + h[i] = byte(rand.Uint32()) + } + return reflect.ValueOf(h) +} + +// Scan implements Scanner for database/sql. +func (h *Hash) Scan(src interface{}) error { + srcB, ok := src.([]byte) + if !ok { + return fmt.Errorf("can't scan %T into Hash", src) + } + if len(srcB) != HashLength { + return fmt.Errorf("can't scan []byte of len %d into Hash, want %d", len(srcB), HashLength) + } + copy(h[:], srcB) + return nil +} + +// Value implements valuer for database/sql. +func (h Hash) Value() (driver.Value, error) { + return h[:], nil +} + +// ImplementsGraphQLType returns true if Hash implements the specified GraphQL type. +func (_ Hash) ImplementsGraphQLType(name string) bool { return name == "Bytes32" } + +// UnmarshalGraphQL unmarshals the provided GraphQL query data. +func (h *Hash) UnmarshalGraphQL(input interface{}) error { + var err error + switch input := input.(type) { + case string: + *h = HexToHash(input) + default: + err = fmt.Errorf("Unexpected type for Bytes32: %v", input) + } + return err +} + +// UnprefixedHash allows marshaling a Hash without 0x prefix. +type UnprefixedHash Hash + +// UnmarshalText decodes the hash from hex. The 0x prefix is optional. +func (h *UnprefixedHash) UnmarshalText(input []byte) error { + return hexutil.UnmarshalFixedUnprefixedText("UnprefixedHash", input, h[:]) +} + +// MarshalText encodes the hash as hex. +func (h UnprefixedHash) MarshalText() ([]byte, error) { + return []byte(hex.EncodeToString(h[:])), nil +} + +/////////// Address + +// Address represents the 20 byte address of an Ethereum account. +type Address [AddressLength]byte + +// BytesToAddress returns Address with value b. +// If b is larger than len(h), b will be cropped from the left. +func BytesToAddress(b []byte) Address { + var a Address + a.SetBytes(b) + return a +} + +// BigToAddress returns Address with byte values of b. +// If b is larger than len(h), b will be cropped from the left. +func BigToAddress(b *big.Int) Address { return BytesToAddress(b.Bytes()) } + +// HexToAddress returns Address with byte values of s. +// If s is larger than len(h), s will be cropped from the left. +func HexToAddress(s string) Address { return BytesToAddress(FromHex(s)) } + +// IsHexAddress verifies whether a string can represent a valid hex-encoded +// Ethereum address or not. +func IsHexAddress(s string) bool { + if hasHexPrefix(s) { + s = s[2:] + } + return len(s) == 2*AddressLength && isHex(s) +} + +// Bytes gets the string representation of the underlying address. +func (a Address) Bytes() []byte { return a[:] } + +// Hash converts an address to a hash by left-padding it with zeros. +func (a Address) Hash() Hash { return BytesToHash(a[:]) } + +// Hex returns an EIP55-compliant hex string representation of the address. +func (a Address) Hex() string { + unchecksummed := hex.EncodeToString(a[:]) + sha := sha3.NewLegacyKeccak256() + sha.Write([]byte(unchecksummed)) + hash := sha.Sum(nil) + + result := []byte(unchecksummed) + for i := 0; i < len(result); i++ { + hashByte := hash[i/2] + if i%2 == 0 { + hashByte = hashByte >> 4 + } else { + hashByte &= 0xf + } + if result[i] > '9' && hashByte > 7 { + result[i] -= 32 + } + } + return "0x" + string(result) +} + +// String implements fmt.Stringer. +func (a Address) String() string { + return a.Hex() +} + +// Format implements fmt.Formatter, forcing the byte slice to be formatted as is, +// without going through the stringer interface used for logging. +func (a Address) Format(s fmt.State, c rune) { + fmt.Fprintf(s, "%"+string(c), a[:]) +} + +// SetBytes sets the address to the value of b. +// If b is larger than len(a) it will panic. +func (a *Address) SetBytes(b []byte) { + if len(b) > len(a) { + b = b[len(b)-AddressLength:] + } + copy(a[AddressLength-len(b):], b) +} + +// MarshalText returns the hex representation of a. +func (a Address) MarshalText() ([]byte, error) { + return hexutil.Bytes(a[:]).MarshalText() +} + +// UnmarshalText parses a hash in hex syntax. +func (a *Address) UnmarshalText(input []byte) error { + return hexutil.UnmarshalFixedText("Address", input, a[:]) +} + +// UnmarshalJSON parses a hash in hex syntax. +func (a *Address) UnmarshalJSON(input []byte) error { + return hexutil.UnmarshalFixedJSON(addressT, input, a[:]) +} + +// Scan implements Scanner for database/sql. +func (a *Address) Scan(src interface{}) error { + srcB, ok := src.([]byte) + if !ok { + return fmt.Errorf("can't scan %T into Address", src) + } + if len(srcB) != AddressLength { + return fmt.Errorf("can't scan []byte of len %d into Address, want %d", len(srcB), AddressLength) + } + copy(a[:], srcB) + return nil +} + +// Value implements valuer for database/sql. +func (a Address) Value() (driver.Value, error) { + return a[:], nil +} + +// ImplementsGraphQLType returns true if Hash implements the specified GraphQL type. +func (a Address) ImplementsGraphQLType(name string) bool { return name == "Address" } + +// UnmarshalGraphQL unmarshals the provided GraphQL query data. +func (a *Address) UnmarshalGraphQL(input interface{}) error { + var err error + switch input := input.(type) { + case string: + *a = HexToAddress(input) + default: + err = fmt.Errorf("Unexpected type for Address: %v", input) + } + return err +} + +// UnprefixedAddress allows marshaling an Address without 0x prefix. +type UnprefixedAddress Address + +// UnmarshalText decodes the address from hex. The 0x prefix is optional. +func (a *UnprefixedAddress) UnmarshalText(input []byte) error { + return hexutil.UnmarshalFixedUnprefixedText("UnprefixedAddress", input, a[:]) +} + +// MarshalText encodes the address as hex. +func (a UnprefixedAddress) MarshalText() ([]byte, error) { + return []byte(hex.EncodeToString(a[:])), nil +} + +// MixedcaseAddress retains the original string, which may or may not be +// correctly checksummed +type MixedcaseAddress struct { + addr Address + original string +} + +// NewMixedcaseAddress constructor (mainly for testing) +func NewMixedcaseAddress(addr Address) MixedcaseAddress { + return MixedcaseAddress{addr: addr, original: addr.Hex()} +} + +// NewMixedcaseAddressFromString is mainly meant for unit-testing +func NewMixedcaseAddressFromString(hexaddr string) (*MixedcaseAddress, error) { + if !IsHexAddress(hexaddr) { + return nil, fmt.Errorf("Invalid address") + } + a := FromHex(hexaddr) + return &MixedcaseAddress{addr: BytesToAddress(a), original: hexaddr}, nil +} + +// UnmarshalJSON parses MixedcaseAddress +func (ma *MixedcaseAddress) UnmarshalJSON(input []byte) error { + if err := hexutil.UnmarshalFixedJSON(addressT, input, ma.addr[:]); err != nil { + return err + } + return json.Unmarshal(input, &ma.original) +} + +// MarshalJSON marshals the original value +func (ma *MixedcaseAddress) MarshalJSON() ([]byte, error) { + if strings.HasPrefix(ma.original, "0x") || strings.HasPrefix(ma.original, "0X") { + return json.Marshal(fmt.Sprintf("0x%s", ma.original[2:])) + } + return json.Marshal(fmt.Sprintf("0x%s", ma.original)) +} + +// Address returns the address +func (ma *MixedcaseAddress) Address() Address { + return ma.addr +} + +// String implements fmt.Stringer +func (ma *MixedcaseAddress) String() string { + if ma.ValidChecksum() { + return fmt.Sprintf("%s [chksum ok]", ma.original) + } + return fmt.Sprintf("%s [chksum INVALID]", ma.original) +} + +// ValidChecksum returns true if the address has valid checksum +func (ma *MixedcaseAddress) ValidChecksum() bool { + return ma.original == ma.addr.Hex() +} + +// Original returns the mixed-case input string +func (ma *MixedcaseAddress) Original() string { + return ma.original +} diff --git a/vendor/github.com/ethereum/go-ethereum/rlp/decode.go b/vendor/github.com/ethereum/go-ethereum/rlp/decode.go new file mode 100644 index 000000000..4f29f2fb0 --- /dev/null +++ b/vendor/github.com/ethereum/go-ethereum/rlp/decode.go @@ -0,0 +1,1049 @@ +// Copyright 2014 The go-ethereum Authors +// This file is part of the go-ethereum library. +// +// The go-ethereum library is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// The go-ethereum library 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 Lesser General Public License for more details. +// +// 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/>. + +package rlp + +import ( + "bufio" + "bytes" + "encoding/binary" + "errors" + "fmt" + "io" + "math/big" + "reflect" + "strings" + "sync" +) + +var ( + // EOL is returned when the end of the current list + // has been reached during streaming. + EOL = errors.New("rlp: end of list") + + // Actual Errors + ErrExpectedString = errors.New("rlp: expected String or Byte") + ErrExpectedList = errors.New("rlp: expected List") + ErrCanonInt = errors.New("rlp: non-canonical integer format") + ErrCanonSize = errors.New("rlp: non-canonical size information") + ErrElemTooLarge = errors.New("rlp: element is larger than containing list") + ErrValueTooLarge = errors.New("rlp: value size exceeds available input length") + ErrMoreThanOneValue = errors.New("rlp: input contains more than one value") + + // internal errors + errNotInList = errors.New("rlp: call of ListEnd outside of any list") + errNotAtEOL = errors.New("rlp: call of ListEnd not positioned at EOL") + errUintOverflow = errors.New("rlp: uint overflow") + errNoPointer = errors.New("rlp: interface given to Decode must be a pointer") + errDecodeIntoNil = errors.New("rlp: pointer given to Decode must not be nil") + + streamPool = sync.Pool{ + New: func() interface{} { return new(Stream) }, + } +) + +// Decoder is implemented by types that require custom RLP +// decoding rules or need to decode into private fields. +// +// The DecodeRLP method should read one value from the given +// Stream. It is not forbidden to read less or more, but it might +// be confusing. +type Decoder interface { + DecodeRLP(*Stream) error +} + +// Decode parses RLP-encoded data from r and stores the result in the +// value pointed to by val. Val must be a non-nil pointer. If r does +// not implement ByteReader, Decode will do its own buffering. +// +// Decode uses the following type-dependent decoding rules: +// +// If the type implements the Decoder interface, decode calls +// DecodeRLP. +// +// To decode into a pointer, Decode will decode into the value pointed +// to. If the pointer is nil, a new value of the pointer's element +// type is allocated. If the pointer is non-nil, the existing value +// will be reused. +// +// To decode into a struct, Decode expects the input to be an RLP +// list. The decoded elements of the list are assigned to each public +// field in the order given by the struct's definition. The input list +// must contain an element for each decoded field. Decode returns an +// error if there are too few or too many elements. +// +// The decoding of struct fields honours certain struct tags, "tail", +// "nil" and "-". +// +// The "-" tag ignores fields. +// +// For an explanation of "tail", see the example. +// +// The "nil" tag applies to pointer-typed fields and changes the decoding +// rules for the field such that input values of size zero decode as a nil +// pointer. This tag can be useful when decoding recursive types. +// +// type StructWithEmptyOK struct { +// Foo *[20]byte `rlp:"nil"` +// } +// +// To decode into a slice, the input must be a list and the resulting +// slice will contain the input elements in order. For byte slices, +// the input must be an RLP string. Array types decode similarly, with +// the additional restriction that the number of input elements (or +// bytes) must match the array's length. +// +// To decode into a Go string, the input must be an RLP string. The +// input bytes are taken as-is and will not necessarily be valid UTF-8. +// +// To decode into an unsigned integer type, the input must also be an RLP +// string. The bytes are interpreted as a big endian representation of +// the integer. If the RLP string is larger than the bit size of the +// type, Decode will return an error. Decode also supports *big.Int. +// There is no size limit for big integers. +// +// To decode into a boolean, the input must contain an unsigned integer +// of value zero (false) or one (true). +// +// To decode into an interface value, Decode stores one of these +// in the value: +// +// []interface{}, for RLP lists +// []byte, for RLP strings +// +// Non-empty interface types are not supported, nor are signed integers, +// floating point numbers, maps, channels and functions. +// +// Note that Decode does not set an input limit for all readers +// and may be vulnerable to panics cause by huge value sizes. If +// you need an input limit, use +// +// NewStream(r, limit).Decode(val) +func Decode(r io.Reader, val interface{}) error { + stream := streamPool.Get().(*Stream) + defer streamPool.Put(stream) + + stream.Reset(r, 0) + return stream.Decode(val) +} + +// DecodeBytes parses RLP data from b into val. +// Please see the documentation of Decode for the decoding rules. +// The input must contain exactly one value and no trailing data. +func DecodeBytes(b []byte, val interface{}) error { + r := bytes.NewReader(b) + + stream := streamPool.Get().(*Stream) + defer streamPool.Put(stream) + + stream.Reset(r, uint64(len(b))) + if err := stream.Decode(val); err != nil { + return err + } + if r.Len() > 0 { + return ErrMoreThanOneValue + } + return nil +} + +type decodeError struct { + msg string + typ reflect.Type + ctx []string +} + +func (err *decodeError) Error() string { + ctx := "" + if len(err.ctx) > 0 { + ctx = ", decoding into " + for i := len(err.ctx) - 1; i >= 0; i-- { + ctx += err.ctx[i] + } + } + return fmt.Sprintf("rlp: %s for %v%s", err.msg, err.typ, ctx) +} + +func wrapStreamError(err error, typ reflect.Type) error { + switch err { + case ErrCanonInt: + return &decodeError{msg: "non-canonical integer (leading zero bytes)", typ: typ} + case ErrCanonSize: + return &decodeError{msg: "non-canonical size information", typ: typ} + case ErrExpectedList: + return &decodeError{msg: "expected input list", typ: typ} + case ErrExpectedString: + return &decodeError{msg: "expected input string or byte", typ: typ} + case errUintOverflow: + return &decodeError{msg: "input string too long", typ: typ} + case errNotAtEOL: + return &decodeError{msg: "input list has too many elements", typ: typ} + } + return err +} + +func addErrorContext(err error, ctx string) error { + if decErr, ok := err.(*decodeError); ok { + decErr.ctx = append(decErr.ctx, ctx) + } + return err +} + +var ( + decoderInterface = reflect.TypeOf(new(Decoder)).Elem() + bigInt = reflect.TypeOf(big.Int{}) +) + +func makeDecoder(typ reflect.Type, tags tags) (dec decoder, err error) { + kind := typ.Kind() + switch { + case typ == rawValueType: + return decodeRawValue, nil + case typ.Implements(decoderInterface): + return decodeDecoder, nil + case kind != reflect.Ptr && reflect.PtrTo(typ).Implements(decoderInterface): + return decodeDecoderNoPtr, nil + case typ.AssignableTo(reflect.PtrTo(bigInt)): + return decodeBigInt, nil + case typ.AssignableTo(bigInt): + return decodeBigIntNoPtr, nil + case isUint(kind): + return decodeUint, nil + case kind == reflect.Bool: + return decodeBool, nil + case kind == reflect.String: + return decodeString, nil + case kind == reflect.Slice || kind == reflect.Array: + return makeListDecoder(typ, tags) + case kind == reflect.Struct: + return makeStructDecoder(typ) + case kind == reflect.Ptr: + if tags.nilOK { + return makeOptionalPtrDecoder(typ) + } + return makePtrDecoder(typ) + case kind == reflect.Interface: + return decodeInterface, nil + default: + return nil, fmt.Errorf("rlp: type %v is not RLP-serializable", typ) + } +} + +func decodeRawValue(s *Stream, val reflect.Value) error { + r, err := s.Raw() + if err != nil { + return err + } + val.SetBytes(r) + return nil +} + +func decodeUint(s *Stream, val reflect.Value) error { + typ := val.Type() + num, err := s.uint(typ.Bits()) + if err != nil { + return wrapStreamError(err, val.Type()) + } + val.SetUint(num) + return nil +} + +func decodeBool(s *Stream, val reflect.Value) error { + b, err := s.Bool() + if err != nil { + return wrapStreamError(err, val.Type()) + } + val.SetBool(b) + return nil +} + +func decodeString(s *Stream, val reflect.Value) error { + b, err := s.Bytes() + if err != nil { + return wrapStreamError(err, val.Type()) + } + val.SetString(string(b)) + return nil +} + +func decodeBigIntNoPtr(s *Stream, val reflect.Value) error { + return decodeBigInt(s, val.Addr()) +} + +func decodeBigInt(s *Stream, val reflect.Value) error { + b, err := s.Bytes() + if err != nil { + return wrapStreamError(err, val.Type()) + } + i := val.Interface().(*big.Int) + if i == nil { + i = new(big.Int) + val.Set(reflect.ValueOf(i)) + } + // Reject leading zero bytes + if len(b) > 0 && b[0] == 0 { + return wrapStreamError(ErrCanonInt, val.Type()) + } + i.SetBytes(b) + return nil +} + +func makeListDecoder(typ reflect.Type, tag tags) (decoder, error) { + etype := typ.Elem() + if etype.Kind() == reflect.Uint8 && !reflect.PtrTo(etype).Implements(decoderInterface) { + if typ.Kind() == reflect.Array { + return decodeByteArray, nil + } + return decodeByteSlice, nil + } + etypeinfo := cachedTypeInfo1(etype, tags{}) + if etypeinfo.decoderErr != nil { + return nil, etypeinfo.decoderErr + } + var dec decoder + switch { + case typ.Kind() == reflect.Array: + dec = func(s *Stream, val reflect.Value) error { + return decodeListArray(s, val, etypeinfo.decoder) + } + case tag.tail: + // A slice with "tail" tag can occur as the last field + // of a struct and is supposed to swallow all remaining + // list elements. The struct decoder already called s.List, + // proceed directly to decoding the elements. + dec = func(s *Stream, val reflect.Value) error { + return decodeSliceElems(s, val, etypeinfo.decoder) + } + default: + dec = func(s *Stream, val reflect.Value) error { + return decodeListSlice(s, val, etypeinfo.decoder) + } + } + return dec, nil +} + +func decodeListSlice(s *Stream, val reflect.Value, elemdec decoder) error { + size, err := s.List() + if err != nil { + return wrapStreamError(err, val.Type()) + } + if size == 0 { + val.Set(reflect.MakeSlice(val.Type(), 0, 0)) + return s.ListEnd() + } + if err := decodeSliceElems(s, val, elemdec); err != nil { + return err + } + return s.ListEnd() +} + +func decodeSliceElems(s *Stream, val reflect.Value, elemdec decoder) error { + i := 0 + for ; ; i++ { + // grow slice if necessary + if i >= val.Cap() { + newcap := val.Cap() + val.Cap()/2 + if newcap < 4 { + newcap = 4 + } + newv := reflect.MakeSlice(val.Type(), val.Len(), newcap) + reflect.Copy(newv, val) + val.Set(newv) + } + if i >= val.Len() { + val.SetLen(i + 1) + } + // decode into element + if err := elemdec(s, val.Index(i)); err == EOL { + break + } else if err != nil { + return addErrorContext(err, fmt.Sprint("[", i, "]")) + } + } + if i < val.Len() { + val.SetLen(i) + } + return nil +} + +func decodeListArray(s *Stream, val reflect.Value, elemdec decoder) error { + if _, err := s.List(); err != nil { + return wrapStreamError(err, val.Type()) + } + vlen := val.Len() + i := 0 + for ; i < vlen; i++ { + if err := elemdec(s, val.Index(i)); err == EOL { + break + } else if err != nil { + return addErrorContext(err, fmt.Sprint("[", i, "]")) + } + } + if i < vlen { + return &decodeError{msg: "input list has too few elements", typ: val.Type()} + } + return wrapStreamError(s.ListEnd(), val.Type()) +} + +func decodeByteSlice(s *Stream, val reflect.Value) error { + b, err := s.Bytes() + if err != nil { + return wrapStreamError(err, val.Type()) + } + val.SetBytes(b) + return nil +} + +func decodeByteArray(s *Stream, val reflect.Value) error { + kind, size, err := s.Kind() + if err != nil { + return err + } + vlen := val.Len() + switch kind { + case Byte: + if vlen == 0 { + return &decodeError{msg: "input string too long", typ: val.Type()} + } + if vlen > 1 { + return &decodeError{msg: "input string too short", typ: val.Type()} + } + bv, _ := s.Uint() + val.Index(0).SetUint(bv) + case String: + if uint64(vlen) < size { + return &decodeError{msg: "input string too long", typ: val.Type()} + } + if uint64(vlen) > size { + return &decodeError{msg: "input string too short", typ: val.Type()} + } + slice := val.Slice(0, vlen).Interface().([]byte) + if err := s.readFull(slice); err != nil { + return err + } + // Reject cases where single byte encoding should have been used. + if size == 1 && slice[0] < 128 { + return wrapStreamError(ErrCanonSize, val.Type()) + } + case List: + return wrapStreamError(ErrExpectedString, val.Type()) + } + return nil +} + +func makeStructDecoder(typ reflect.Type) (decoder, error) { + fields, err := structFields(typ) + if err != nil { + return nil, err + } + dec := func(s *Stream, val reflect.Value) (err error) { + if _, err := s.List(); err != nil { + return wrapStreamError(err, typ) + } + for _, f := range fields { + err := f.info.decoder(s, val.Field(f.index)) + if err == EOL { + return &decodeError{msg: "too few elements", typ: typ} + } else if err != nil { + return addErrorContext(err, "."+typ.Field(f.index).Name) + } + } + return wrapStreamError(s.ListEnd(), typ) + } + return dec, nil +} + +// makePtrDecoder creates a decoder that decodes into +// the pointer's element type. +func makePtrDecoder(typ reflect.Type) (decoder, error) { + etype := typ.Elem() + etypeinfo := cachedTypeInfo1(etype, tags{}) + if etypeinfo.decoderErr != nil { + return nil, etypeinfo.decoderErr + } + dec := func(s *Stream, val reflect.Value) (err error) { + newval := val + if val.IsNil() { + newval = reflect.New(etype) + } + if err = etypeinfo.decoder(s, newval.Elem()); err == nil { + val.Set(newval) + } + return err + } + return dec, nil +} + +// makeOptionalPtrDecoder creates a decoder that decodes empty values +// as nil. Non-empty values are decoded into a value of the element type, +// just like makePtrDecoder does. +// +// This decoder is used for pointer-typed struct fields with struct tag "nil". +func makeOptionalPtrDecoder(typ reflect.Type) (decoder, error) { + etype := typ.Elem() + etypeinfo := cachedTypeInfo1(etype, tags{}) + if etypeinfo.decoderErr != nil { + return nil, etypeinfo.decoderErr + } + dec := func(s *Stream, val reflect.Value) (err error) { + kind, size, err := s.Kind() + if err != nil || size == 0 && kind != Byte { + // rearm s.Kind. This is important because the input + // position must advance to the next value even though + // we don't read anything. + s.kind = -1 + // set the pointer to nil. + val.Set(reflect.Zero(typ)) + return err + } + newval := val + if val.IsNil() { + newval = reflect.New(etype) + } + if err = etypeinfo.decoder(s, newval.Elem()); err == nil { + val.Set(newval) + } + return err + } + return dec, nil +} + +var ifsliceType = reflect.TypeOf([]interface{}{}) + +func decodeInterface(s *Stream, val reflect.Value) error { + if val.Type().NumMethod() != 0 { + return fmt.Errorf("rlp: type %v is not RLP-serializable", val.Type()) + } + kind, _, err := s.Kind() + if err != nil { + return err + } + if kind == List { + slice := reflect.New(ifsliceType).Elem() + if err := decodeListSlice(s, slice, decodeInterface); err != nil { + return err + } + val.Set(slice) + } else { + b, err := s.Bytes() + if err != nil { + return err + } + val.Set(reflect.ValueOf(b)) + } + return nil +} + +// This decoder is used for non-pointer values of types +// that implement the Decoder interface using a pointer receiver. +func decodeDecoderNoPtr(s *Stream, val reflect.Value) error { + return val.Addr().Interface().(Decoder).DecodeRLP(s) +} + +func decodeDecoder(s *Stream, val reflect.Value) error { + // Decoder instances are not handled using the pointer rule if the type + // implements Decoder with pointer receiver (i.e. always) + // because it might handle empty values specially. + // We need to allocate one here in this case, like makePtrDecoder does. + if val.Kind() == reflect.Ptr && val.IsNil() { + val.Set(reflect.New(val.Type().Elem())) + } + return val.Interface().(Decoder).DecodeRLP(s) +} + +// Kind represents the kind of value contained in an RLP stream. +type Kind int + +const ( + Byte Kind = iota + String + List +) + +func (k Kind) String() string { + switch k { + case Byte: + return "Byte" + case String: + return "String" + case List: + return "List" + default: + return fmt.Sprintf("Unknown(%d)", k) + } +} + +// ByteReader must be implemented by any input reader for a Stream. It +// is implemented by e.g. bufio.Reader and bytes.Reader. +type ByteReader interface { + io.Reader + io.ByteReader +} + +// Stream can be used for piecemeal decoding of an input stream. This +// is useful if the input is very large or if the decoding rules for a +// type depend on the input structure. Stream does not keep an +// internal buffer. After decoding a value, the input reader will be +// positioned just before the type information for the next value. +// +// When decoding a list and the input position reaches the declared +// length of the list, all operations will return error EOL. +// The end of the list must be acknowledged using ListEnd to continue +// reading the enclosing list. +// +// Stream is not safe for concurrent use. +type Stream struct { + r ByteReader + + // number of bytes remaining to be read from r. + remaining uint64 + limited bool + + // auxiliary buffer for integer decoding + uintbuf []byte + + kind Kind // kind of value ahead + size uint64 // size of value ahead + byteval byte // value of single byte in type tag + kinderr error // error from last readKind + stack []listpos +} + +type listpos struct{ pos, size uint64 } + +// NewStream creates a new decoding stream reading from r. +// +// If r implements the ByteReader interface, Stream will +// not introduce any buffering. +// +// For non-toplevel values, Stream returns ErrElemTooLarge +// for values that do not fit into the enclosing list. +// +// Stream supports an optional input limit. If a limit is set, the +// size of any toplevel value will be checked against the remaining +// input length. Stream operations that encounter a value exceeding +// the remaining input length will return ErrValueTooLarge. The limit +// can be set by passing a non-zero value for inputLimit. +// +// If r is a bytes.Reader or strings.Reader, the input limit is set to +// the length of r's underlying data unless an explicit limit is +// provided. +func NewStream(r io.Reader, inputLimit uint64) *Stream { + s := new(Stream) + s.Reset(r, inputLimit) + return s +} + +// NewListStream creates a new stream that pretends to be positioned +// at an encoded list of the given length. +func NewListStream(r io.Reader, len uint64) *Stream { + s := new(Stream) + s.Reset(r, len) + s.kind = List + s.size = len + return s +} + +// Bytes reads an RLP string and returns its contents as a byte slice. +// If the input does not contain an RLP string, the returned +// error will be ErrExpectedString. +func (s *Stream) Bytes() ([]byte, error) { + kind, size, err := s.Kind() + if err != nil { + return nil, err + } + switch kind { + case Byte: + s.kind = -1 // rearm Kind + return []byte{s.byteval}, nil + case String: + b := make([]byte, size) + if err = s.readFull(b); err != nil { + return nil, err + } + if size == 1 && b[0] < 128 { + return nil, ErrCanonSize + } + return b, nil + default: + return nil, ErrExpectedString + } +} + +// Raw reads a raw encoded value including RLP type information. +func (s *Stream) Raw() ([]byte, error) { + kind, size, err := s.Kind() + if err != nil { + return nil, err + } + if kind == Byte { + s.kind = -1 // rearm Kind + return []byte{s.byteval}, nil + } + // the original header has already been read and is no longer + // available. read content and put a new header in front of it. + start := headsize(size) + buf := make([]byte, uint64(start)+size) + if err := s.readFull(buf[start:]); err != nil { + return nil, err + } + if kind == String { + puthead(buf, 0x80, 0xB7, size) + } else { + puthead(buf, 0xC0, 0xF7, size) + } + return buf, nil +} + +// Uint reads an RLP string of up to 8 bytes and returns its contents +// as an unsigned integer. If the input does not contain an RLP string, the +// returned error will be ErrExpectedString. +func (s *Stream) Uint() (uint64, error) { + return s.uint(64) +} + +func (s *Stream) uint(maxbits int) (uint64, error) { + kind, size, err := s.Kind() + if err != nil { + return 0, err + } + switch kind { + case Byte: + if s.byteval == 0 { + return 0, ErrCanonInt + } + s.kind = -1 // rearm Kind + return uint64(s.byteval), nil + case String: + if size > uint64(maxbits/8) { + return 0, errUintOverflow + } + v, err := s.readUint(byte(size)) + switch { + case err == ErrCanonSize: + // Adjust error because we're not reading a size right now. + return 0, ErrCanonInt + case err != nil: + return 0, err + case size > 0 && v < 128: + return 0, ErrCanonSize + default: + return v, nil + } + default: + return 0, ErrExpectedString + } +} + +// Bool reads an RLP string of up to 1 byte and returns its contents +// as a boolean. If the input does not contain an RLP string, the +// returned error will be ErrExpectedString. +func (s *Stream) Bool() (bool, error) { + num, err := s.uint(8) + if err != nil { + return false, err + } + switch num { + case 0: + return false, nil + case 1: + return true, nil + default: + return false, fmt.Errorf("rlp: invalid boolean value: %d", num) + } +} + +// List starts decoding an RLP list. If the input does not contain a +// list, the returned error will be ErrExpectedList. When the list's +// end has been reached, any Stream operation will return EOL. +func (s *Stream) List() (size uint64, err error) { + kind, size, err := s.Kind() + if err != nil { + return 0, err + } + if kind != List { + return 0, ErrExpectedList + } + s.stack = append(s.stack, listpos{0, size}) + s.kind = -1 + s.size = 0 + return size, nil +} + +// ListEnd returns to the enclosing list. +// The input reader must be positioned at the end of a list. +func (s *Stream) ListEnd() error { + if len(s.stack) == 0 { + return errNotInList + } + tos := s.stack[len(s.stack)-1] + if tos.pos != tos.size { + return errNotAtEOL + } + s.stack = s.stack[:len(s.stack)-1] // pop + if len(s.stack) > 0 { + s.stack[len(s.stack)-1].pos += tos.size + } + s.kind = -1 + s.size = 0 + return nil +} + +// Decode decodes a value and stores the result in the value pointed +// to by val. Please see the documentation for the Decode function +// to learn about the decoding rules. +func (s *Stream) Decode(val interface{}) error { + if val == nil { + return errDecodeIntoNil + } + rval := reflect.ValueOf(val) + rtyp := rval.Type() + if rtyp.Kind() != reflect.Ptr { + return errNoPointer + } + if rval.IsNil() { + return errDecodeIntoNil + } + decoder, err := cachedDecoder(rtyp.Elem()) + if err != nil { + return err + } + + err = decoder(s, rval.Elem()) + if decErr, ok := err.(*decodeError); ok && len(decErr.ctx) > 0 { + // add decode target type to error so context has more meaning + decErr.ctx = append(decErr.ctx, fmt.Sprint("(", rtyp.Elem(), ")")) + } + return err +} + +// Reset discards any information about the current decoding context +// and starts reading from r. This method is meant to facilitate reuse +// of a preallocated Stream across many decoding operations. +// +// If r does not also implement ByteReader, Stream will do its own +// buffering. +func (s *Stream) Reset(r io.Reader, inputLimit uint64) { + if inputLimit > 0 { + s.remaining = inputLimit + s.limited = true + } else { + // Attempt to automatically discover + // the limit when reading from a byte slice. + switch br := r.(type) { + case *bytes.Reader: + s.remaining = uint64(br.Len()) + s.limited = true + case *strings.Reader: + s.remaining = uint64(br.Len()) + s.limited = true + default: + s.limited = false + } + } + // Wrap r with a buffer if it doesn't have one. + bufr, ok := r.(ByteReader) + if !ok { + bufr = bufio.NewReader(r) + } + s.r = bufr + // Reset the decoding context. + s.stack = s.stack[:0] + s.size = 0 + s.kind = -1 + s.kinderr = nil + if s.uintbuf == nil { + s.uintbuf = make([]byte, 8) + } + s.byteval = 0 +} + +// Kind returns the kind and size of the next value in the +// input stream. +// +// The returned size is the number of bytes that make up the value. +// For kind == Byte, the size is zero because the value is +// contained in the type tag. +// +// The first call to Kind will read size information from the input +// reader and leave it positioned at the start of the actual bytes of +// the value. Subsequent calls to Kind (until the value is decoded) +// will not advance the input reader and return cached information. +func (s *Stream) Kind() (kind Kind, size uint64, err error) { + var tos *listpos + if len(s.stack) > 0 { + tos = &s.stack[len(s.stack)-1] + } + if s.kind < 0 { + s.kinderr = nil + // Don't read further if we're at the end of the + // innermost list. + if tos != nil && tos.pos == tos.size { + return 0, 0, EOL + } + s.kind, s.size, s.kinderr = s.readKind() + if s.kinderr == nil { + if tos == nil { + // At toplevel, check that the value is smaller + // than the remaining input length. + if s.limited && s.size > s.remaining { + s.kinderr = ErrValueTooLarge + } + } else { + // Inside a list, check that the value doesn't overflow the list. + if s.size > tos.size-tos.pos { + s.kinderr = ErrElemTooLarge + } + } + } + } + // Note: this might return a sticky error generated + // by an earlier call to readKind. + return s.kind, s.size, s.kinderr +} + +func (s *Stream) readKind() (kind Kind, size uint64, err error) { + b, err := s.readByte() + if err != nil { + if len(s.stack) == 0 { + // At toplevel, Adjust the error to actual EOF. io.EOF is + // used by callers to determine when to stop decoding. + switch err { + case io.ErrUnexpectedEOF: + err = io.EOF + case ErrValueTooLarge: + err = io.EOF + } + } + return 0, 0, err + } + s.byteval = 0 + switch { + case b < 0x80: + // For a single byte whose value is in the [0x00, 0x7F] range, that byte + // is its own RLP encoding. + s.byteval = b + return Byte, 0, nil + case b < 0xB8: + // Otherwise, if a string is 0-55 bytes long, + // the RLP encoding consists of a single byte with value 0x80 plus the + // length of the string followed by the string. The range of the first + // byte is thus [0x80, 0xB7]. + return String, uint64(b - 0x80), nil + case b < 0xC0: + // If a string is more than 55 bytes long, the + // RLP encoding consists of a single byte with value 0xB7 plus the length + // of the length of the string in binary form, followed by the length of + // the string, followed by the string. For example, a length-1024 string + // would be encoded as 0xB90400 followed by the string. The range of + // the first byte is thus [0xB8, 0xBF]. + size, err = s.readUint(b - 0xB7) + if err == nil && size < 56 { + err = ErrCanonSize + } + return String, size, err + case b < 0xF8: + // If the total payload of a list + // (i.e. the combined length of all its items) is 0-55 bytes long, the + // RLP encoding consists of a single byte with value 0xC0 plus the length + // of the list followed by the concatenation of the RLP encodings of the + // items. The range of the first byte is thus [0xC0, 0xF7]. + return List, uint64(b - 0xC0), nil + default: + // If the total payload of a list is more than 55 bytes long, + // the RLP encoding consists of a single byte with value 0xF7 + // plus the length of the length of the payload in binary + // form, followed by the length of the payload, followed by + // the concatenation of the RLP encodings of the items. The + // range of the first byte is thus [0xF8, 0xFF]. + size, err = s.readUint(b - 0xF7) + if err == nil && size < 56 { + err = ErrCanonSize + } + return List, size, err + } +} + +func (s *Stream) readUint(size byte) (uint64, error) { + switch size { + case 0: + s.kind = -1 // rearm Kind + return 0, nil + case 1: + b, err := s.readByte() + return uint64(b), err + default: + start := int(8 - size) + for i := 0; i < start; i++ { + s.uintbuf[i] = 0 + } + if err := s.readFull(s.uintbuf[start:]); err != nil { + return 0, err + } + if s.uintbuf[start] == 0 { + // Note: readUint is also used to decode integer + // values. The error needs to be adjusted to become + // ErrCanonInt in this case. + return 0, ErrCanonSize + } + return binary.BigEndian.Uint64(s.uintbuf), nil + } +} + +func (s *Stream) readFull(buf []byte) (err error) { + if err := s.willRead(uint64(len(buf))); err != nil { + return err + } + var nn, n int + for n < len(buf) && err == nil { + nn, err = s.r.Read(buf[n:]) + n += nn + } + if err == io.EOF { + err = io.ErrUnexpectedEOF + } + return err +} + +func (s *Stream) readByte() (byte, error) { + if err := s.willRead(1); err != nil { + return 0, err + } + b, err := s.r.ReadByte() + if err == io.EOF { + err = io.ErrUnexpectedEOF + } + return b, err +} + +func (s *Stream) willRead(n uint64) error { + s.kind = -1 // rearm Kind + + if len(s.stack) > 0 { + // check list overflow + tos := s.stack[len(s.stack)-1] + if n > tos.size-tos.pos { + return ErrElemTooLarge + } + s.stack[len(s.stack)-1].pos += n + } + if s.limited { + if n > s.remaining { + return ErrValueTooLarge + } + s.remaining -= n + } + return nil +} diff --git a/vendor/github.com/ethereum/go-ethereum/rlp/doc.go b/vendor/github.com/ethereum/go-ethereum/rlp/doc.go new file mode 100644 index 000000000..b3a81fe23 --- /dev/null +++ b/vendor/github.com/ethereum/go-ethereum/rlp/doc.go @@ -0,0 +1,33 @@ +// Copyright 2014 The go-ethereum Authors +// This file is part of the go-ethereum library. +// +// The go-ethereum library is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// The go-ethereum library 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 Lesser General Public License for more details. +// +// 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/>. + +/* +Package rlp implements the RLP serialization format. + +The purpose of RLP (Recursive Linear Prefix) is to encode arbitrarily +nested arrays of binary data, and RLP is the main encoding method used +to serialize objects in Ethereum. The only purpose of RLP is to encode +structure; encoding specific atomic data types (eg. strings, ints, +floats) is left up to higher-order protocols; in Ethereum integers +must be represented in big endian binary form with no leading zeroes +(thus making the integer value zero equivalent to the empty byte +array). + +RLP values are distinguished by a type tag. The type tag precedes the +value in the input stream and defines the size and kind of the bytes +that follow. +*/ +package rlp diff --git a/vendor/github.com/ethereum/go-ethereum/rlp/encode.go b/vendor/github.com/ethereum/go-ethereum/rlp/encode.go new file mode 100644 index 000000000..f255c38a9 --- /dev/null +++ b/vendor/github.com/ethereum/go-ethereum/rlp/encode.go @@ -0,0 +1,651 @@ +// Copyright 2014 The go-ethereum Authors +// This file is part of the go-ethereum library. +// +// The go-ethereum library is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// The go-ethereum library 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 Lesser General Public License for more details. +// +// 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/>. + +package rlp + +import ( + "fmt" + "io" + "math/big" + "reflect" + "sync" +) + +var ( + // Common encoded values. + // These are useful when implementing EncodeRLP. + EmptyString = []byte{0x80} + EmptyList = []byte{0xC0} +) + +// Encoder is implemented by types that require custom +// encoding rules or want to encode private fields. +type Encoder interface { + // EncodeRLP should write the RLP encoding of its receiver to w. + // If the implementation is a pointer method, it may also be + // called for nil pointers. + // + // Implementations should generate valid RLP. The data written is + // not verified at the moment, but a future version might. It is + // recommended to write only a single value but writing multiple + // values or no value at all is also permitted. + EncodeRLP(io.Writer) error +} + +// Encode writes the RLP encoding of val to w. Note that Encode may +// perform many small writes in some cases. Consider making w +// buffered. +// +// Encode uses the following type-dependent encoding rules: +// +// If the type implements the Encoder interface, Encode calls +// EncodeRLP. This is true even for nil pointers, please see the +// documentation for Encoder. +// +// To encode a pointer, the value being pointed to is encoded. For nil +// pointers, Encode will encode the zero value of the type. A nil +// pointer to a struct type always encodes as an empty RLP list. +// A nil pointer to an array encodes as an empty list (or empty string +// if the array has element type byte). +// +// Struct values are encoded as an RLP list of all their encoded +// public fields. Recursive struct types are supported. +// +// To encode slices and arrays, the elements are encoded as an RLP +// list of the value's elements. Note that arrays and slices with +// element type uint8 or byte are always encoded as an RLP string. +// +// A Go string is encoded as an RLP string. +// +// An unsigned integer value is encoded as an RLP string. Zero always +// encodes as an empty RLP string. Encode also supports *big.Int. +// +// Boolean values are encoded as unsigned integers zero (false) and one (true). +// +// An interface value encodes as the value contained in the interface. +// +// Signed integers are not supported, nor are floating point numbers, maps, +// channels and functions. +func Encode(w io.Writer, val interface{}) error { + if outer, ok := w.(*encbuf); ok { + // Encode was called by some type's EncodeRLP. + // Avoid copying by writing to the outer encbuf directly. + return outer.encode(val) + } + eb := encbufPool.Get().(*encbuf) + defer encbufPool.Put(eb) + eb.reset() + if err := eb.encode(val); err != nil { + return err + } + return eb.toWriter(w) +} + +// EncodeToBytes returns the RLP encoding of val. +// Please see the documentation of Encode for the encoding rules. +func EncodeToBytes(val interface{}) ([]byte, error) { + eb := encbufPool.Get().(*encbuf) + defer encbufPool.Put(eb) + eb.reset() + if err := eb.encode(val); err != nil { + return nil, err + } + return eb.toBytes(), nil +} + +// EncodeToReader returns a reader from which the RLP encoding of val +// can be read. The returned size is the total size of the encoded +// data. +// +// Please see the documentation of Encode for the encoding rules. +func EncodeToReader(val interface{}) (size int, r io.Reader, err error) { + eb := encbufPool.Get().(*encbuf) + eb.reset() + if err := eb.encode(val); err != nil { + return 0, nil, err + } + return eb.size(), &encReader{buf: eb}, nil +} + +type encbuf struct { + str []byte // string data, contains everything except list headers + lheads []*listhead // all list headers + lhsize int // sum of sizes of all encoded list headers + sizebuf []byte // 9-byte auxiliary buffer for uint encoding +} + +type listhead struct { + offset int // index of this header in string data + size int // total size of encoded data (including list headers) +} + +// encode writes head to the given buffer, which must be at least +// 9 bytes long. It returns the encoded bytes. +func (head *listhead) encode(buf []byte) []byte { + return buf[:puthead(buf, 0xC0, 0xF7, uint64(head.size))] +} + +// headsize returns the size of a list or string header +// for a value of the given size. +func headsize(size uint64) int { + if size < 56 { + return 1 + } + return 1 + intsize(size) +} + +// puthead writes a list or string header to buf. +// buf must be at least 9 bytes long. +func puthead(buf []byte, smalltag, largetag byte, size uint64) int { + if size < 56 { + buf[0] = smalltag + byte(size) + return 1 + } + sizesize := putint(buf[1:], size) + buf[0] = largetag + byte(sizesize) + return sizesize + 1 +} + +// encbufs are pooled. +var encbufPool = sync.Pool{ + New: func() interface{} { return &encbuf{sizebuf: make([]byte, 9)} }, +} + +func (w *encbuf) reset() { + w.lhsize = 0 + if w.str != nil { + w.str = w.str[:0] + } + if w.lheads != nil { + w.lheads = w.lheads[:0] + } +} + +// encbuf implements io.Writer so it can be passed it into EncodeRLP. +func (w *encbuf) Write(b []byte) (int, error) { + w.str = append(w.str, b...) + return len(b), nil +} + +func (w *encbuf) encode(val interface{}) error { + rval := reflect.ValueOf(val) + writer, err := cachedWriter(rval.Type()) + if err != nil { + return err + } + return writer(rval, w) +} + +func (w *encbuf) encodeStringHeader(size int) { + if size < 56 { + w.str = append(w.str, 0x80+byte(size)) + } else { + // TODO: encode to w.str directly + sizesize := putint(w.sizebuf[1:], uint64(size)) + w.sizebuf[0] = 0xB7 + byte(sizesize) + w.str = append(w.str, w.sizebuf[:sizesize+1]...) + } +} + +func (w *encbuf) encodeString(b []byte) { + if len(b) == 1 && b[0] <= 0x7F { + // fits single byte, no string header + w.str = append(w.str, b[0]) + } else { + w.encodeStringHeader(len(b)) + w.str = append(w.str, b...) + } +} + +func (w *encbuf) list() *listhead { + lh := &listhead{offset: len(w.str), size: w.lhsize} + w.lheads = append(w.lheads, lh) + return lh +} + +func (w *encbuf) listEnd(lh *listhead) { + lh.size = w.size() - lh.offset - lh.size + if lh.size < 56 { + w.lhsize++ // length encoded into kind tag + } else { + w.lhsize += 1 + intsize(uint64(lh.size)) + } +} + +func (w *encbuf) size() int { + return len(w.str) + w.lhsize +} + +func (w *encbuf) toBytes() []byte { + out := make([]byte, w.size()) + strpos := 0 + pos := 0 + for _, head := range w.lheads { + // write string data before header + n := copy(out[pos:], w.str[strpos:head.offset]) + pos += n + strpos += n + // write the header + enc := head.encode(out[pos:]) + pos += len(enc) + } + // copy string data after the last list header + copy(out[pos:], w.str[strpos:]) + return out +} + +func (w *encbuf) toWriter(out io.Writer) (err error) { + strpos := 0 + for _, head := range w.lheads { + // write string data before header + if head.offset-strpos > 0 { + n, err := out.Write(w.str[strpos:head.offset]) + strpos += n + if err != nil { + return err + } + } + // write the header + enc := head.encode(w.sizebuf) + if _, err = out.Write(enc); err != nil { + return err + } + } + if strpos < len(w.str) { + // write string data after the last list header + _, err = out.Write(w.str[strpos:]) + } + return err +} + +// encReader is the io.Reader returned by EncodeToReader. +// It releases its encbuf at EOF. +type encReader struct { + buf *encbuf // the buffer we're reading from. this is nil when we're at EOF. + lhpos int // index of list header that we're reading + strpos int // current position in string buffer + piece []byte // next piece to be read +} + +func (r *encReader) Read(b []byte) (n int, err error) { + for { + if r.piece = r.next(); r.piece == nil { + // Put the encode buffer back into the pool at EOF when it + // is first encountered. Subsequent calls still return EOF + // as the error but the buffer is no longer valid. + if r.buf != nil { + encbufPool.Put(r.buf) + r.buf = nil + } + return n, io.EOF + } + nn := copy(b[n:], r.piece) + n += nn + if nn < len(r.piece) { + // piece didn't fit, see you next time. + r.piece = r.piece[nn:] + return n, nil + } + r.piece = nil + } +} + +// next returns the next piece of data to be read. +// it returns nil at EOF. +func (r *encReader) next() []byte { + switch { + case r.buf == nil: + return nil + + case r.piece != nil: + // There is still data available for reading. + return r.piece + + case r.lhpos < len(r.buf.lheads): + // We're before the last list header. + head := r.buf.lheads[r.lhpos] + sizebefore := head.offset - r.strpos + if sizebefore > 0 { + // String data before header. + p := r.buf.str[r.strpos:head.offset] + r.strpos += sizebefore + return p + } + r.lhpos++ + return head.encode(r.buf.sizebuf) + + case r.strpos < len(r.buf.str): + // String data at the end, after all list headers. + p := r.buf.str[r.strpos:] + r.strpos = len(r.buf.str) + return p + + default: + return nil + } +} + +var ( + encoderInterface = reflect.TypeOf(new(Encoder)).Elem() + big0 = big.NewInt(0) +) + +// makeWriter creates a writer function for the given type. +func makeWriter(typ reflect.Type, ts tags) (writer, error) { + kind := typ.Kind() + switch { + case typ == rawValueType: + return writeRawValue, nil + case typ.Implements(encoderInterface): + return writeEncoder, nil + case kind != reflect.Ptr && reflect.PtrTo(typ).Implements(encoderInterface): + return writeEncoderNoPtr, nil + case kind == reflect.Interface: + return writeInterface, nil + case typ.AssignableTo(reflect.PtrTo(bigInt)): + return writeBigIntPtr, nil + case typ.AssignableTo(bigInt): + return writeBigIntNoPtr, nil + case isUint(kind): + return writeUint, nil + case kind == reflect.Bool: + return writeBool, nil + case kind == reflect.String: + return writeString, nil + case kind == reflect.Slice && isByte(typ.Elem()): + return writeBytes, nil + case kind == reflect.Array && isByte(typ.Elem()): + return writeByteArray, nil + case kind == reflect.Slice || kind == reflect.Array: + return makeSliceWriter(typ, ts) + case kind == reflect.Struct: + return makeStructWriter(typ) + case kind == reflect.Ptr: + return makePtrWriter(typ) + default: + return nil, fmt.Errorf("rlp: type %v is not RLP-serializable", typ) + } +} + +func isByte(typ reflect.Type) bool { + return typ.Kind() == reflect.Uint8 && !typ.Implements(encoderInterface) +} + +func writeRawValue(val reflect.Value, w *encbuf) error { + w.str = append(w.str, val.Bytes()...) + return nil +} + +func writeUint(val reflect.Value, w *encbuf) error { + i := val.Uint() + if i == 0 { + w.str = append(w.str, 0x80) + } else if i < 128 { + // fits single byte + w.str = append(w.str, byte(i)) + } else { + // TODO: encode int to w.str directly + s := putint(w.sizebuf[1:], i) + w.sizebuf[0] = 0x80 + byte(s) + w.str = append(w.str, w.sizebuf[:s+1]...) + } + return nil +} + +func writeBool(val reflect.Value, w *encbuf) error { + if val.Bool() { + w.str = append(w.str, 0x01) + } else { + w.str = append(w.str, 0x80) + } + return nil +} + +func writeBigIntPtr(val reflect.Value, w *encbuf) error { + ptr := val.Interface().(*big.Int) + if ptr == nil { + w.str = append(w.str, 0x80) + return nil + } + return writeBigInt(ptr, w) +} + +func writeBigIntNoPtr(val reflect.Value, w *encbuf) error { + i := val.Interface().(big.Int) + return writeBigInt(&i, w) +} + +func writeBigInt(i *big.Int, w *encbuf) error { + if cmp := i.Cmp(big0); cmp == -1 { + return fmt.Errorf("rlp: cannot encode negative *big.Int") + } else if cmp == 0 { + w.str = append(w.str, 0x80) + } else { + w.encodeString(i.Bytes()) + } + return nil +} + +func writeBytes(val reflect.Value, w *encbuf) error { + w.encodeString(val.Bytes()) + return nil +} + +func writeByteArray(val reflect.Value, w *encbuf) error { + if !val.CanAddr() { + // Slice requires the value to be addressable. + // Make it addressable by copying. + copy := reflect.New(val.Type()).Elem() + copy.Set(val) + val = copy + } + size := val.Len() + slice := val.Slice(0, size).Bytes() + w.encodeString(slice) + return nil +} + +func writeString(val reflect.Value, w *encbuf) error { + s := val.String() + if len(s) == 1 && s[0] <= 0x7f { + // fits single byte, no string header + w.str = append(w.str, s[0]) + } else { + w.encodeStringHeader(len(s)) + w.str = append(w.str, s...) + } + return nil +} + +func writeEncoder(val reflect.Value, w *encbuf) error { + return val.Interface().(Encoder).EncodeRLP(w) +} + +// writeEncoderNoPtr handles non-pointer values that implement Encoder +// with a pointer receiver. +func writeEncoderNoPtr(val reflect.Value, w *encbuf) error { + if !val.CanAddr() { + // We can't get the address. It would be possible to make the + // value addressable by creating a shallow copy, but this + // creates other problems so we're not doing it (yet). + // + // package json simply doesn't call MarshalJSON for cases like + // this, but encodes the value as if it didn't implement the + // interface. We don't want to handle it that way. + return fmt.Errorf("rlp: game over: unadressable value of type %v, EncodeRLP is pointer method", val.Type()) + } + return val.Addr().Interface().(Encoder).EncodeRLP(w) +} + +func writeInterface(val reflect.Value, w *encbuf) error { + if val.IsNil() { + // Write empty list. This is consistent with the previous RLP + // encoder that we had and should therefore avoid any + // problems. + w.str = append(w.str, 0xC0) + return nil + } + eval := val.Elem() + writer, err := cachedWriter(eval.Type()) + if err != nil { + return err + } + return writer(eval, w) +} + +func makeSliceWriter(typ reflect.Type, ts tags) (writer, error) { + etypeinfo := cachedTypeInfo1(typ.Elem(), tags{}) + if etypeinfo.writerErr != nil { + return nil, etypeinfo.writerErr + } + writer := func(val reflect.Value, w *encbuf) error { + if !ts.tail { + defer w.listEnd(w.list()) + } + vlen := val.Len() + for i := 0; i < vlen; i++ { + if err := etypeinfo.writer(val.Index(i), w); err != nil { + return err + } + } + return nil + } + return writer, nil +} + +func makeStructWriter(typ reflect.Type) (writer, error) { + fields, err := structFields(typ) + if err != nil { + return nil, err + } + writer := func(val reflect.Value, w *encbuf) error { + lh := w.list() + for _, f := range fields { + if err := f.info.writer(val.Field(f.index), w); err != nil { + return err + } + } + w.listEnd(lh) + return nil + } + return writer, nil +} + +func makePtrWriter(typ reflect.Type) (writer, error) { + etypeinfo := cachedTypeInfo1(typ.Elem(), tags{}) + if etypeinfo.writerErr != nil { + return nil, etypeinfo.writerErr + } + + // determine nil pointer handler + var nilfunc func(*encbuf) error + kind := typ.Elem().Kind() + switch { + case kind == reflect.Array && isByte(typ.Elem().Elem()): + nilfunc = func(w *encbuf) error { + w.str = append(w.str, 0x80) + return nil + } + case kind == reflect.Struct || kind == reflect.Array: + nilfunc = func(w *encbuf) error { + // encoding the zero value of a struct/array could trigger + // infinite recursion, avoid that. + w.listEnd(w.list()) + return nil + } + default: + zero := reflect.Zero(typ.Elem()) + nilfunc = func(w *encbuf) error { + return etypeinfo.writer(zero, w) + } + } + + writer := func(val reflect.Value, w *encbuf) error { + if val.IsNil() { + return nilfunc(w) + } + return etypeinfo.writer(val.Elem(), w) + } + return writer, nil +} + +// putint writes i to the beginning of b in big endian byte +// order, using the least number of bytes needed to represent i. +func putint(b []byte, i uint64) (size int) { + switch { + case i < (1 << 8): + b[0] = byte(i) + return 1 + case i < (1 << 16): + b[0] = byte(i >> 8) + b[1] = byte(i) + return 2 + case i < (1 << 24): + b[0] = byte(i >> 16) + b[1] = byte(i >> 8) + b[2] = byte(i) + return 3 + case i < (1 << 32): + b[0] = byte(i >> 24) + b[1] = byte(i >> 16) + b[2] = byte(i >> 8) + b[3] = byte(i) + return 4 + case i < (1 << 40): + b[0] = byte(i >> 32) + b[1] = byte(i >> 24) + b[2] = byte(i >> 16) + b[3] = byte(i >> 8) + b[4] = byte(i) + return 5 + case i < (1 << 48): + b[0] = byte(i >> 40) + b[1] = byte(i >> 32) + b[2] = byte(i >> 24) + b[3] = byte(i >> 16) + b[4] = byte(i >> 8) + b[5] = byte(i) + return 6 + case i < (1 << 56): + b[0] = byte(i >> 48) + b[1] = byte(i >> 40) + b[2] = byte(i >> 32) + b[3] = byte(i >> 24) + b[4] = byte(i >> 16) + b[5] = byte(i >> 8) + b[6] = byte(i) + return 7 + default: + b[0] = byte(i >> 56) + b[1] = byte(i >> 48) + b[2] = byte(i >> 40) + b[3] = byte(i >> 32) + b[4] = byte(i >> 24) + b[5] = byte(i >> 16) + b[6] = byte(i >> 8) + b[7] = byte(i) + return 8 + } +} + +// intsize computes the minimum number of bytes required to store i. +func intsize(i uint64) (size int) { + for size = 1; ; size++ { + if i >>= 8; i == 0 { + return size + } + } +} diff --git a/vendor/github.com/ethereum/go-ethereum/rlp/raw.go b/vendor/github.com/ethereum/go-ethereum/rlp/raw.go new file mode 100644 index 000000000..2b3f328f6 --- /dev/null +++ b/vendor/github.com/ethereum/go-ethereum/rlp/raw.go @@ -0,0 +1,156 @@ +// Copyright 2015 The go-ethereum Authors +// This file is part of the go-ethereum library. +// +// The go-ethereum library is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// The go-ethereum library 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 Lesser General Public License for more details. +// +// 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/>. + +package rlp + +import ( + "io" + "reflect" +) + +// RawValue represents an encoded RLP value and can be used to delay +// RLP decoding or to precompute an encoding. Note that the decoder does +// not verify whether the content of RawValues is valid RLP. +type RawValue []byte + +var rawValueType = reflect.TypeOf(RawValue{}) + +// ListSize returns the encoded size of an RLP list with the given +// content size. +func ListSize(contentSize uint64) uint64 { + return uint64(headsize(contentSize)) + contentSize +} + +// Split returns the content of first RLP value and any +// bytes after the value as subslices of b. +func Split(b []byte) (k Kind, content, rest []byte, err error) { + k, ts, cs, err := readKind(b) + if err != nil { + return 0, nil, b, err + } + return k, b[ts : ts+cs], b[ts+cs:], nil +} + +// SplitString splits b into the content of an RLP string +// and any remaining bytes after the string. +func SplitString(b []byte) (content, rest []byte, err error) { + k, content, rest, err := Split(b) + if err != nil { + return nil, b, err + } + if k == List { + return nil, b, ErrExpectedString + } + return content, rest, nil +} + +// SplitList splits b into the content of a list and any remaining +// bytes after the list. +func SplitList(b []byte) (content, rest []byte, err error) { + k, content, rest, err := Split(b) + if err != nil { + return nil, b, err + } + if k != List { + return nil, b, ErrExpectedList + } + return content, rest, nil +} + +// CountValues counts the number of encoded values in b. +func CountValues(b []byte) (int, error) { + i := 0 + for ; len(b) > 0; i++ { + _, tagsize, size, err := readKind(b) + if err != nil { + return 0, err + } + b = b[tagsize+size:] + } + return i, nil +} + +func readKind(buf []byte) (k Kind, tagsize, contentsize uint64, err error) { + if len(buf) == 0 { + return 0, 0, 0, io.ErrUnexpectedEOF + } + b := buf[0] + switch { + case b < 0x80: + k = Byte + tagsize = 0 + contentsize = 1 + case b < 0xB8: + k = String + tagsize = 1 + contentsize = uint64(b - 0x80) + // Reject strings that should've been single bytes. + if contentsize == 1 && len(buf) > 1 && buf[1] < 128 { + return 0, 0, 0, ErrCanonSize + } + case b < 0xC0: + k = String + tagsize = uint64(b-0xB7) + 1 + contentsize, err = readSize(buf[1:], b-0xB7) + case b < 0xF8: + k = List + tagsize = 1 + contentsize = uint64(b - 0xC0) + default: + k = List + tagsize = uint64(b-0xF7) + 1 + contentsize, err = readSize(buf[1:], b-0xF7) + } + if err != nil { + return 0, 0, 0, err + } + // Reject values larger than the input slice. + if contentsize > uint64(len(buf))-tagsize { + return 0, 0, 0, ErrValueTooLarge + } + return k, tagsize, contentsize, err +} + +func readSize(b []byte, slen byte) (uint64, error) { + if int(slen) > len(b) { + return 0, io.ErrUnexpectedEOF + } + var s uint64 + switch slen { + case 1: + s = uint64(b[0]) + case 2: + s = uint64(b[0])<<8 | uint64(b[1]) + case 3: + s = uint64(b[0])<<16 | uint64(b[1])<<8 | uint64(b[2]) + case 4: + s = uint64(b[0])<<24 | uint64(b[1])<<16 | uint64(b[2])<<8 | uint64(b[3]) + case 5: + s = uint64(b[0])<<32 | uint64(b[1])<<24 | uint64(b[2])<<16 | uint64(b[3])<<8 | uint64(b[4]) + case 6: + s = uint64(b[0])<<40 | uint64(b[1])<<32 | uint64(b[2])<<24 | uint64(b[3])<<16 | uint64(b[4])<<8 | uint64(b[5]) + case 7: + s = uint64(b[0])<<48 | uint64(b[1])<<40 | uint64(b[2])<<32 | uint64(b[3])<<24 | uint64(b[4])<<16 | uint64(b[5])<<8 | uint64(b[6]) + case 8: + s = uint64(b[0])<<56 | uint64(b[1])<<48 | uint64(b[2])<<40 | uint64(b[3])<<32 | uint64(b[4])<<24 | uint64(b[5])<<16 | uint64(b[6])<<8 | uint64(b[7]) + } + // Reject sizes < 56 (shouldn't have separate size) and sizes with + // leading zero bytes. + if s < 56 || b[0] == 0 { + return 0, ErrCanonSize + } + return s, nil +} diff --git a/vendor/github.com/ethereum/go-ethereum/rlp/typecache.go b/vendor/github.com/ethereum/go-ethereum/rlp/typecache.go new file mode 100644 index 000000000..ab5ee3da7 --- /dev/null +++ b/vendor/github.com/ethereum/go-ethereum/rlp/typecache.go @@ -0,0 +1,165 @@ +// Copyright 2014 The go-ethereum Authors +// This file is part of the go-ethereum library. +// +// The go-ethereum library is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// The go-ethereum library 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 Lesser General Public License for more details. +// +// 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/>. + +package rlp + +import ( + "fmt" + "reflect" + "strings" + "sync" +) + +var ( + typeCacheMutex sync.RWMutex + typeCache = make(map[typekey]*typeinfo) +) + +type typeinfo struct { + decoder decoder + decoderErr error // error from makeDecoder + writer writer + writerErr error // error from makeWriter +} + +// represents struct tags +type tags struct { + // rlp:"nil" controls whether empty input results in a nil pointer. + nilOK bool + // rlp:"tail" controls whether this field swallows additional list + // elements. It can only be set for the last field, which must be + // of slice type. + tail bool + // rlp:"-" ignores fields. + ignored bool +} + +type typekey struct { + reflect.Type + // the key must include the struct tags because they + // might generate a different decoder. + tags +} + +type decoder func(*Stream, reflect.Value) error + +type writer func(reflect.Value, *encbuf) error + +func cachedDecoder(typ reflect.Type) (decoder, error) { + info := cachedTypeInfo(typ, tags{}) + return info.decoder, info.decoderErr +} + +func cachedWriter(typ reflect.Type) (writer, error) { + info := cachedTypeInfo(typ, tags{}) + return info.writer, info.writerErr +} + +func cachedTypeInfo(typ reflect.Type, tags tags) *typeinfo { + typeCacheMutex.RLock() + info := typeCache[typekey{typ, tags}] + typeCacheMutex.RUnlock() + if info != nil { + return info + } + // not in the cache, need to generate info for this type. + typeCacheMutex.Lock() + defer typeCacheMutex.Unlock() + return cachedTypeInfo1(typ, tags) +} + +func cachedTypeInfo1(typ reflect.Type, tags tags) *typeinfo { + key := typekey{typ, tags} + info := typeCache[key] + if info != nil { + // another goroutine got the write lock first + return info + } + // put a dummy value into the cache before generating. + // if the generator tries to lookup itself, it will get + // the dummy value and won't call itself recursively. + info = new(typeinfo) + typeCache[key] = info + info.generate(typ, tags) + return info +} + +type field struct { + index int + info *typeinfo +} + +func structFields(typ reflect.Type) (fields []field, err error) { + lastPublic := lastPublicField(typ) + for i := 0; i < typ.NumField(); i++ { + if f := typ.Field(i); f.PkgPath == "" { // exported + tags, err := parseStructTag(typ, i, lastPublic) + if err != nil { + return nil, err + } + if tags.ignored { + continue + } + info := cachedTypeInfo1(f.Type, tags) + fields = append(fields, field{i, info}) + } + } + return fields, nil +} + +func parseStructTag(typ reflect.Type, fi, lastPublic int) (tags, error) { + f := typ.Field(fi) + var ts tags + for _, t := range strings.Split(f.Tag.Get("rlp"), ",") { + switch t = strings.TrimSpace(t); t { + case "": + case "-": + ts.ignored = true + case "nil": + ts.nilOK = true + case "tail": + ts.tail = true + if fi != lastPublic { + return ts, fmt.Errorf(`rlp: invalid struct tag "tail" for %v.%s (must be on last field)`, typ, f.Name) + } + if f.Type.Kind() != reflect.Slice { + return ts, fmt.Errorf(`rlp: invalid struct tag "tail" for %v.%s (field type is not slice)`, typ, f.Name) + } + default: + return ts, fmt.Errorf("rlp: unknown struct tag %q on %v.%s", t, typ, f.Name) + } + } + return ts, nil +} + +func lastPublicField(typ reflect.Type) int { + last := 0 + for i := 0; i < typ.NumField(); i++ { + if typ.Field(i).PkgPath == "" { + last = i + } + } + return last +} + +func (i *typeinfo) generate(typ reflect.Type, tags tags) { + i.decoder, i.decoderErr = makeDecoder(typ, tags) + i.writer, i.writerErr = makeWriter(typ, tags) +} + +func isUint(k reflect.Kind) bool { + return k >= reflect.Uint && k <= reflect.Uintptr +} diff --git a/vendor/vendor.json b/vendor/vendor.json index ff47da121..789eb8ab2 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -99,138 +99,133 @@ "revisionTime": "2017-11-28T15:02:46Z" }, { - "checksumSHA1": "cDMtzKmdTx4CcIpP4broa+16X9g=", - "path": "github.com/cespare/cp", - "revision": "165db2f241fd235aec29ba6d9b1ccd5f1c14637c", - "revisionTime": "2015-01-22T07:26:53Z" - }, - { - "checksumSHA1": "7gK+lSShSu1NRw83/A95BcgMqsI=", - "path": "github.com/codahale/hdrhistogram", - "revision": "3a0bb77429bd3a61596f5e8a3172445844342120", - "revisionTime": "2016-10-10T02:54:55Z" - }, - { - "checksumSHA1": "dvabztWVQX8f6oMLRyv4dLH+TGY=", - "path": "github.com/davecgh/go-spew/spew", - "revision": "346938d642f2ec3594ed81d874461961cd0faa76", - "revisionTime": "2016-10-29T20:57:26Z" - }, - { - "checksumSHA1": "1xK7ycc1ICRInk/S9iiyB9Rpv50=", - "path": "github.com/deckarep/golang-set", - "revision": "504e848d77ea4752b3057b8fb46da0e7f746ccf3", - "revisionTime": "2018-06-03T19:32:48Z" - }, - { - "checksumSHA1": "jqxT0OeSE30j5pVqR+ia/AxtdAI=", - "path": "github.com/dexon-foundation/bls", - "revision": "dda43effd59cb08b3e99198c6d066a723e10a86b", - "revisionTime": "2018-12-27T09:54:38Z", - "version": "dev", - "versionExact": "dev" + "checksumSHA1": "Rls1USg65f0XKk3xOEo23d79nTs=", + "path": "github.com/byzantine-lab/bls/ffi/go/bls", + "revision": "5e8e1cd9adf37e993a5bea2ad116e107652f0301", + "revisionTime": "2019-04-12T05:24:20Z" }, { - "checksumSHA1": "yPWDIKToXWyTkkq3ZU8M461UFJI=", - "path": "github.com/dexon-foundation/bls/ffi/go/bls", - "revision": "dda43effd59cb08b3e99198c6d066a723e10a86b", - "revisionTime": "2018-12-27T09:54:38Z", - "version": "dev", - "versionExact": "dev" - }, - { - "checksumSHA1": "In6vBHYUsX7DUIGiFN2hQggBgvI=", - "path": "github.com/dexon-foundation/dexon-consensus/common", - "revision": "42d585f1e5c9420f15b1d7333e7874a04345cc36", - "revisionTime": "2019-05-06T04:02:43Z", + "checksumSHA1": "YNFLm0hecMirCfnG+yC1hwrq63w=", + "origin": "gitlab.com/byzantine-lab/dexon-consensus/common", + "path": "github.com/byzantine-lab/dexon-consensus/common", + "revision": "f05d9c34d6595ebced2de25d9b436f3aac35a53f", + "revisionTime": "2019-06-10T16:05:10Z", "version": "master", "versionExact": "master" }, { - "checksumSHA1": "3/fzuY8PZ1Fd1dw6Fol6hbvZXWk=", - "path": "github.com/dexon-foundation/dexon-consensus/core", - "revision": "42d585f1e5c9420f15b1d7333e7874a04345cc36", - "revisionTime": "2019-05-06T04:02:43Z", + "checksumSHA1": "mVmTRuUjdKaeLKOIPDr9WlrWbM8=", + "origin": "gitlab.com/byzantine-lab/dexon-consensus/core", + "path": "github.com/byzantine-lab/dexon-consensus/core", + "revision": "f05d9c34d6595ebced2de25d9b436f3aac35a53f", + "revisionTime": "2019-06-10T16:05:10Z", "version": "master", "versionExact": "master" }, { - "checksumSHA1": "v4fKR7uhoyufi6hAVO44cFEb+tY=", - "path": "github.com/dexon-foundation/dexon-consensus/core/blockdb", + "checksumSHA1": "giMmtUvHD7fKNXEyYpXL1bWhZms=", + "origin": "gitlab.com/byzantine-lab/dexon-consensus/core/blockdb", + "path": "github.com/byzantine-lab/dexon-consensus/core/blockdb", "revision": "56e872f84131348adbc0861afb3554bba4a8e5db", "revisionTime": "2018-12-05T06:29:54Z", "version": "master", "versionExact": "master" }, { - "checksumSHA1": "tQSbYCu5P00lUhKsx3IbBZCuSLY=", - "path": "github.com/dexon-foundation/dexon-consensus/core/crypto", - "revision": "42d585f1e5c9420f15b1d7333e7874a04345cc36", - "revisionTime": "2019-05-06T04:02:43Z", + "checksumSHA1": "Ta8d9OKIAYDXuh32bHFyqdAzhEM=", + "origin": "gitlab.com/byzantine-lab/dexon-consensus/core/crypto", + "path": "github.com/byzantine-lab/dexon-consensus/core/crypto", + "revision": "f05d9c34d6595ebced2de25d9b436f3aac35a53f", + "revisionTime": "2019-06-10T16:05:10Z", "version": "master", "versionExact": "master" }, { - "checksumSHA1": "4besQaa0rm8jRUAJjpEaLZ/ZOYs=", - "path": "github.com/dexon-foundation/dexon-consensus/core/crypto/dkg", - "revision": "42d585f1e5c9420f15b1d7333e7874a04345cc36", - "revisionTime": "2019-05-06T04:02:43Z", + "checksumSHA1": "haQqxxRfx8Tk8dhuilDmDMZ6rO8=", + "origin": "gitlab.com/byzantine-lab/dexon-consensus/core/crypto/dkg", + "path": "github.com/byzantine-lab/dexon-consensus/core/crypto/dkg", + "revision": "f05d9c34d6595ebced2de25d9b436f3aac35a53f", + "revisionTime": "2019-06-10T16:05:10Z", "version": "master", "versionExact": "master" }, { - "checksumSHA1": "BhLKK8RveoLaeXc9UyUKMwQqchU=", - "path": "github.com/dexon-foundation/dexon-consensus/core/crypto/ecdsa", - "revision": "42d585f1e5c9420f15b1d7333e7874a04345cc36", - "revisionTime": "2019-05-06T04:02:43Z", + "checksumSHA1": "0Tj49Z4zfOogG6lEnMaZae11/1s=", + "origin": "gitlab.com/byzantine-lab/dexon-consensus/core/crypto/ecdsa", + "path": "github.com/byzantine-lab/dexon-consensus/core/crypto/ecdsa", + "revision": "f05d9c34d6595ebced2de25d9b436f3aac35a53f", + "revisionTime": "2019-06-10T16:05:10Z", "version": "master", "versionExact": "master" }, { - "checksumSHA1": "3Ludp/1V4dMBZH/c1oIVjHj0CqY=", - "path": "github.com/dexon-foundation/dexon-consensus/core/db", - "revision": "42d585f1e5c9420f15b1d7333e7874a04345cc36", - "revisionTime": "2019-05-06T04:02:43Z", + "checksumSHA1": "J2Lgj2veHRGtHlfXFyzrM4qnKow=", + "origin": "gitlab.com/byzantine-lab/dexon-consensus/core/db", + "path": "github.com/byzantine-lab/dexon-consensus/core/db", + "revision": "f05d9c34d6595ebced2de25d9b436f3aac35a53f", + "revisionTime": "2019-06-10T16:05:10Z", "version": "master", "versionExact": "master" }, { - "checksumSHA1": "oi/m368rTLcDsKxpP3RnYLnHVqg=", - "path": "github.com/dexon-foundation/dexon-consensus/core/syncer", - "revision": "42d585f1e5c9420f15b1d7333e7874a04345cc36", - "revisionTime": "2019-05-06T04:02:43Z", + "checksumSHA1": "6VjD99+YZ1DN86I3qg/nKklpT58=", + "origin": "gitlab.com/byzantine-lab/dexon-consensus/core/syncer", + "path": "github.com/byzantine-lab/dexon-consensus/core/syncer", + "revision": "f05d9c34d6595ebced2de25d9b436f3aac35a53f", + "revisionTime": "2019-06-10T16:05:10Z", "version": "master", "versionExact": "master" }, { - "checksumSHA1": "0BY+E0E2cM7IHIMqunXwoolDS5Y=", - "path": "github.com/dexon-foundation/dexon-consensus/core/types", - "revision": "42d585f1e5c9420f15b1d7333e7874a04345cc36", - "revisionTime": "2019-05-06T04:02:43Z", + "checksumSHA1": "gSe2rW85N3hdJ8B10xcHboUJq8g=", + "origin": "gitlab.com/byzantine-lab/dexon-consensus/core/types", + "path": "github.com/byzantine-lab/dexon-consensus/core/types", + "revision": "f05d9c34d6595ebced2de25d9b436f3aac35a53f", + "revisionTime": "2019-06-10T16:05:10Z", "version": "master", "versionExact": "master" }, { - "checksumSHA1": "yEPSfn48GaJmDbd2OFY+QRhjJ0w=", - "path": "github.com/dexon-foundation/dexon-consensus/core/types/dkg", - "revision": "42d585f1e5c9420f15b1d7333e7874a04345cc36", - "revisionTime": "2019-05-06T04:02:43Z", + "checksumSHA1": "R6k6vmgePKuYJlQgA05kh9HqCx8=", + "origin": "gitlab.com/byzantine-lab/dexon-consensus/core/types/dkg", + "path": "github.com/byzantine-lab/dexon-consensus/core/types/dkg", + "revision": "f05d9c34d6595ebced2de25d9b436f3aac35a53f", + "revisionTime": "2019-06-10T16:05:10Z", "version": "master", "versionExact": "master" }, { - "checksumSHA1": "51hQ5Wl/n9A5cu8t2yNIqfUuIR8=", - "path": "github.com/dexon-foundation/dexon-consensus/core/utils", - "revision": "42d585f1e5c9420f15b1d7333e7874a04345cc36", - "revisionTime": "2019-05-06T04:02:43Z", + "checksumSHA1": "orcvISLeKABwd4AGsC2jAMQkd04=", + "origin": "gitlab.com/byzantine-lab/dexon-consensus/core/utils", + "path": "github.com/byzantine-lab/dexon-consensus/core/utils", + "revision": "f05d9c34d6595ebced2de25d9b436f3aac35a53f", + "revisionTime": "2019-06-10T16:05:10Z", "version": "master", "versionExact": "master" }, { - "checksumSHA1": "TAkwduKZqLyimyTPPWIllZWYFuE=", - "path": "github.com/dexon-foundation/mcl", - "revision": "151f876c92eaa7705f1203791a16cc517bd2d940", - "revisionTime": "2018-10-23T00:43:37Z" + "checksumSHA1": "cDMtzKmdTx4CcIpP4broa+16X9g=", + "path": "github.com/cespare/cp", + "revision": "165db2f241fd235aec29ba6d9b1ccd5f1c14637c", + "revisionTime": "2015-01-22T07:26:53Z" + }, + { + "checksumSHA1": "7gK+lSShSu1NRw83/A95BcgMqsI=", + "path": "github.com/codahale/hdrhistogram", + "revision": "3a0bb77429bd3a61596f5e8a3172445844342120", + "revisionTime": "2016-10-10T02:54:55Z" + }, + { + "checksumSHA1": "dvabztWVQX8f6oMLRyv4dLH+TGY=", + "path": "github.com/davecgh/go-spew/spew", + "revision": "346938d642f2ec3594ed81d874461961cd0faa76", + "revisionTime": "2016-10-29T20:57:26Z" + }, + { + "checksumSHA1": "1xK7ycc1ICRInk/S9iiyB9Rpv50=", + "path": "github.com/deckarep/golang-set", + "revision": "504e848d77ea4752b3057b8fb46da0e7f746ccf3", + "revisionTime": "2018-06-03T19:32:48Z" }, { "checksumSHA1": "2Fy1Y6Z3lRRX1891WF/+HT4XS2I=", @@ -263,10 +258,34 @@ "revisionTime": "2018-01-22T22:25:45Z" }, { + "checksumSHA1": "dZshPS4Pesrg9ubQ+1jT/MAfF9o=", + "path": "github.com/ethereum/go-ethereum/common", + "revision": "50e3795eef884ce8c5ae41ee31c7a4fa40196755", + "revisionTime": "2019-06-12T07:22:34Z" + }, + { + "checksumSHA1": "tvdkin+xdCuyH0IPqxbrHYGL1gc=", + "path": "github.com/ethereum/go-ethereum/common/hexutil", + "revision": "50e3795eef884ce8c5ae41ee31c7a4fa40196755", + "revisionTime": "2019-06-12T07:22:34Z" + }, + { + "checksumSHA1": "DHETzc73aN40YHhMczku7MQV1iE=", + "path": "github.com/ethereum/go-ethereum/common/math", + "revision": "50e3795eef884ce8c5ae41ee31c7a4fa40196755", + "revisionTime": "2019-06-12T07:22:34Z" + }, + { "checksumSHA1": "09V3eE1EhOkdfksyjsH+03c5fQg=", "path": "github.com/ethereum/go-ethereum/crypto/secp256k1", - "revision": "78ec90717aaa34c6ac981e791ca7fb04077cca33", - "revisionTime": "2019-04-17T12:50:41Z" + "revision": "32dafea1f0aeae72a424126195d1a3bb1d832eea", + "revisionTime": "2019-06-12T10:08:42Z" + }, + { + "checksumSHA1": "QNmhEac8r360UlJqrw8w9cJioVI=", + "path": "github.com/ethereum/go-ethereum/rlp", + "revision": "50e3795eef884ce8c5ae41ee31c7a4fa40196755", + "revisionTime": "2019-06-12T07:22:34Z" }, { "checksumSHA1": "7oFpbmDfGobwKsFLIf6wMUvVoKw=", @@ -655,7 +674,7 @@ "revisionTime": "2018-10-09T18:43:15Z" }, { - "checksumSHA1": "k6zbR5hiI10hkWtiK91rIY5s5/E=", + "checksumSHA1": "LV0VMVON7xY1ttV+s2ph83ntmDQ=", "path": "github.com/syndtr/goleveldb/leveldb", "revision": "b001fa50d6b27f3f0bb175a87d0cb55426d0a0ae", "revisionTime": "2018-11-28T10:09:59Z" @@ -1632,5 +1651,5 @@ "revisionTime": "2017-08-11T01:42:03Z" } ], - "rootPath": "github.com/dexon-foundation/dexon" + "rootPath": "github.com/tangerine-network/go-tangerine" } diff --git a/whisper/mailserver/mailserver.go b/whisper/mailserver/mailserver.go index e2b8ce581..5b16093a1 100644 --- a/whisper/mailserver/mailserver.go +++ b/whisper/mailserver/mailserver.go @@ -21,14 +21,14 @@ import ( "encoding/binary" "fmt" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/rlp" - whisper "github.com/dexon-foundation/dexon/whisper/whisperv6" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/opt" "github.com/syndtr/goleveldb/leveldb/util" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/rlp" + whisper "github.com/tangerine-network/go-tangerine/whisper/whisperv6" ) // WMailServer represents the state data of the mailserver. diff --git a/whisper/mailserver/server_test.go b/whisper/mailserver/server_test.go index 3844868a6..94c960899 100644 --- a/whisper/mailserver/server_test.go +++ b/whisper/mailserver/server_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/crypto" - whisper "github.com/dexon-foundation/dexon/whisper/whisperv6" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/crypto" + whisper "github.com/tangerine-network/go-tangerine/whisper/whisperv6" ) const powRequirement = 0.00001 diff --git a/whisper/shhclient/client.go b/whisper/shhclient/client.go index 921115d00..7615be1da 100644 --- a/whisper/shhclient/client.go +++ b/whisper/shhclient/client.go @@ -19,10 +19,10 @@ package shhclient import ( "context" - "github.com/dexon-foundation/dexon" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/rpc" - whisper "github.com/dexon-foundation/dexon/whisper/whisperv6" + ethereum "github.com/tangerine-network/go-tangerine" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/rpc" + whisper "github.com/tangerine-network/go-tangerine/whisper/whisperv6" ) // Client defines typed wrappers for the Whisper v6 RPC API. diff --git a/whisper/whisperv5/api.go b/whisper/whisperv5/api.go index 463f16839..035f207fc 100644 --- a/whisper/whisperv5/api.go +++ b/whisper/whisperv5/api.go @@ -24,12 +24,12 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/rpc" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/rpc" ) var ( diff --git a/whisper/whisperv5/benchmarks_test.go b/whisper/whisperv5/benchmarks_test.go index aec56dc67..af64b3cde 100644 --- a/whisper/whisperv5/benchmarks_test.go +++ b/whisper/whisperv5/benchmarks_test.go @@ -19,7 +19,7 @@ package whisperv5 import ( "testing" - "github.com/dexon-foundation/dexon/crypto" + "github.com/tangerine-network/go-tangerine/crypto" ) func BenchmarkDeriveKeyMaterial(b *testing.B) { diff --git a/whisper/whisperv5/envelope.go b/whisper/whisperv5/envelope.go index 8a83c55c4..3f6008d55 100644 --- a/whisper/whisperv5/envelope.go +++ b/whisper/whisperv5/envelope.go @@ -26,11 +26,11 @@ import ( "math/big" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/math" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/crypto/ecies" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/math" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/crypto/ecies" + "github.com/tangerine-network/go-tangerine/rlp" ) // Envelope represents a clear-text data packet to transmit through the Whisper diff --git a/whisper/whisperv5/filter.go b/whisper/whisperv5/filter.go index feb614da2..311c12365 100644 --- a/whisper/whisperv5/filter.go +++ b/whisper/whisperv5/filter.go @@ -21,9 +21,9 @@ import ( "fmt" "sync" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/log" ) type Filter struct { diff --git a/whisper/whisperv5/filter_test.go b/whisper/whisperv5/filter_test.go index aa341dd38..3967890dc 100644 --- a/whisper/whisperv5/filter_test.go +++ b/whisper/whisperv5/filter_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/crypto" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/crypto" ) var seed int64 diff --git a/whisper/whisperv5/gen_criteria_json.go b/whisper/whisperv5/gen_criteria_json.go index d521076af..16c10a89f 100644 --- a/whisper/whisperv5/gen_criteria_json.go +++ b/whisper/whisperv5/gen_criteria_json.go @@ -5,7 +5,7 @@ package whisperv5 import ( "encoding/json" - "github.com/dexon-foundation/dexon/common/hexutil" + "github.com/tangerine-network/go-tangerine/common/hexutil" ) var _ = (*criteriaOverride)(nil) diff --git a/whisper/whisperv5/gen_message_json.go b/whisper/whisperv5/gen_message_json.go index e807d7442..2dad21ca5 100644 --- a/whisper/whisperv5/gen_message_json.go +++ b/whisper/whisperv5/gen_message_json.go @@ -5,7 +5,7 @@ package whisperv5 import ( "encoding/json" - "github.com/dexon-foundation/dexon/common/hexutil" + "github.com/tangerine-network/go-tangerine/common/hexutil" ) var _ = (*messageOverride)(nil) diff --git a/whisper/whisperv5/gen_newmessage_json.go b/whisper/whisperv5/gen_newmessage_json.go index 937be126c..6c1534d26 100644 --- a/whisper/whisperv5/gen_newmessage_json.go +++ b/whisper/whisperv5/gen_newmessage_json.go @@ -5,7 +5,7 @@ package whisperv5 import ( "encoding/json" - "github.com/dexon-foundation/dexon/common/hexutil" + "github.com/tangerine-network/go-tangerine/common/hexutil" ) var _ = (*newMessageOverride)(nil) diff --git a/whisper/whisperv5/message.go b/whisper/whisperv5/message.go index 80e477d9a..dffa2bfc4 100644 --- a/whisper/whisperv5/message.go +++ b/whisper/whisperv5/message.go @@ -27,10 +27,10 @@ import ( "errors" "strconv" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/crypto/ecies" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/crypto/ecies" + "github.com/tangerine-network/go-tangerine/log" ) // MessageParams specifies the exact way a message should be wrapped into an Envelope. diff --git a/whisper/whisperv5/message_test.go b/whisper/whisperv5/message_test.go index a0f8837fe..a90eb2513 100644 --- a/whisper/whisperv5/message_test.go +++ b/whisper/whisperv5/message_test.go @@ -21,8 +21,8 @@ import ( mrand "math/rand" "testing" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/rlp" ) func generateMessageParams() (*MessageParams, error) { diff --git a/whisper/whisperv5/peer.go b/whisper/whisperv5/peer.go index 47bdbd91a..a2f16c9a8 100644 --- a/whisper/whisperv5/peer.go +++ b/whisper/whisperv5/peer.go @@ -21,10 +21,10 @@ import ( "time" mapset "github.com/deckarep/golang-set" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/rlp" ) // Peer represents a whisper protocol peer connection. diff --git a/whisper/whisperv5/peer_test.go b/whisper/whisperv5/peer_test.go index 37f457445..67ba59bba 100644 --- a/whisper/whisperv5/peer_test.go +++ b/whisper/whisperv5/peer_test.go @@ -24,11 +24,11 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/nat" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/nat" ) var keys = []string{ diff --git a/whisper/whisperv5/topic.go b/whisper/whisperv5/topic.go index ea768c400..c96de193f 100644 --- a/whisper/whisperv5/topic.go +++ b/whisper/whisperv5/topic.go @@ -19,8 +19,8 @@ package whisperv5 import ( - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" ) // TopicType represents a cryptographically secure, probabilistic partial diff --git a/whisper/whisperv5/whisper.go b/whisper/whisperv5/whisper.go index 9731317bc..40ee4187c 100644 --- a/whisper/whisperv5/whisper.go +++ b/whisper/whisperv5/whisper.go @@ -27,12 +27,12 @@ import ( "time" mapset "github.com/deckarep/golang-set" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/rpc" "github.com/syndtr/goleveldb/leveldb/errors" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/rpc" "golang.org/x/crypto/pbkdf2" "golang.org/x/sync/syncmap" ) diff --git a/whisper/whisperv5/whisper_test.go b/whisper/whisperv5/whisper_test.go index 5209f1c8f..ab89c0673 100644 --- a/whisper/whisperv5/whisper_test.go +++ b/whisper/whisperv5/whisper_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/common" + "github.com/tangerine-network/go-tangerine/common" ) func TestWhisperBasic(t *testing.T) { diff --git a/whisper/whisperv6/api.go b/whisper/whisperv6/api.go index 64fa33a96..2d6efc526 100644 --- a/whisper/whisperv6/api.go +++ b/whisper/whisperv6/api.go @@ -24,12 +24,12 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/rpc" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/rpc" ) // List of errors diff --git a/whisper/whisperv6/benchmarks_test.go b/whisper/whisperv6/benchmarks_test.go index ded4c3558..6cbd69759 100644 --- a/whisper/whisperv6/benchmarks_test.go +++ b/whisper/whisperv6/benchmarks_test.go @@ -20,7 +20,7 @@ import ( "crypto/sha256" "testing" - "github.com/dexon-foundation/dexon/crypto" + "github.com/tangerine-network/go-tangerine/crypto" "golang.org/x/crypto/pbkdf2" ) diff --git a/whisper/whisperv6/envelope.go b/whisper/whisperv6/envelope.go index b5bfa02cf..d80256af9 100644 --- a/whisper/whisperv6/envelope.go +++ b/whisper/whisperv6/envelope.go @@ -26,11 +26,11 @@ import ( "math/big" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/math" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/crypto/ecies" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/math" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/crypto/ecies" + "github.com/tangerine-network/go-tangerine/rlp" ) // Envelope represents a clear-text data packet to transmit through the Whisper diff --git a/whisper/whisperv6/envelope_test.go b/whisper/whisperv6/envelope_test.go index 02c060942..f3c9ed62a 100644 --- a/whisper/whisperv6/envelope_test.go +++ b/whisper/whisperv6/envelope_test.go @@ -22,7 +22,7 @@ import ( mrand "math/rand" "testing" - "github.com/dexon-foundation/dexon/crypto" + "github.com/tangerine-network/go-tangerine/crypto" ) func TestEnvelopeOpenAcceptsOnlyOneKeyTypeInFilter(t *testing.T) { diff --git a/whisper/whisperv6/filter.go b/whisper/whisperv6/filter.go index 85d38af82..f00e54ab3 100644 --- a/whisper/whisperv6/filter.go +++ b/whisper/whisperv6/filter.go @@ -21,9 +21,9 @@ import ( "fmt" "sync" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/log" ) // Filter represents a Whisper message filter diff --git a/whisper/whisperv6/filter_test.go b/whisper/whisperv6/filter_test.go index 0eb4ae467..998cdd8c2 100644 --- a/whisper/whisperv6/filter_test.go +++ b/whisper/whisperv6/filter_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/crypto" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/crypto" ) var seed int64 diff --git a/whisper/whisperv6/gen_criteria_json.go b/whisper/whisperv6/gen_criteria_json.go index eab6e6e6d..46753bbc9 100644 --- a/whisper/whisperv6/gen_criteria_json.go +++ b/whisper/whisperv6/gen_criteria_json.go @@ -5,7 +5,7 @@ package whisperv6 import ( "encoding/json" - "github.com/dexon-foundation/dexon/common/hexutil" + "github.com/tangerine-network/go-tangerine/common/hexutil" ) var _ = (*criteriaOverride)(nil) diff --git a/whisper/whisperv6/gen_message_json.go b/whisper/whisperv6/gen_message_json.go index 0be4a2f77..8e279e328 100644 --- a/whisper/whisperv6/gen_message_json.go +++ b/whisper/whisperv6/gen_message_json.go @@ -5,7 +5,7 @@ package whisperv6 import ( "encoding/json" - "github.com/dexon-foundation/dexon/common/hexutil" + "github.com/tangerine-network/go-tangerine/common/hexutil" ) var _ = (*messageOverride)(nil) diff --git a/whisper/whisperv6/gen_newmessage_json.go b/whisper/whisperv6/gen_newmessage_json.go index 26228387e..24eb2be1d 100644 --- a/whisper/whisperv6/gen_newmessage_json.go +++ b/whisper/whisperv6/gen_newmessage_json.go @@ -5,7 +5,7 @@ package whisperv6 import ( "encoding/json" - "github.com/dexon-foundation/dexon/common/hexutil" + "github.com/tangerine-network/go-tangerine/common/hexutil" ) var _ = (*newMessageOverride)(nil) diff --git a/whisper/whisperv6/message.go b/whisper/whisperv6/message.go index 66a7846eb..8af5d77a1 100644 --- a/whisper/whisperv6/message.go +++ b/whisper/whisperv6/message.go @@ -28,10 +28,10 @@ import ( mrand "math/rand" "strconv" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/crypto/ecies" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/crypto/ecies" + "github.com/tangerine-network/go-tangerine/log" ) // MessageParams specifies the exact way a message should be wrapped diff --git a/whisper/whisperv6/message_test.go b/whisper/whisperv6/message_test.go index 8dbbf27a7..78f29007f 100644 --- a/whisper/whisperv6/message_test.go +++ b/whisper/whisperv6/message_test.go @@ -23,9 +23,9 @@ import ( mrand "math/rand" "testing" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/rlp" ) func generateMessageParams() (*MessageParams, error) { diff --git a/whisper/whisperv6/peer.go b/whisper/whisperv6/peer.go index fa3160254..6e8d1a8ca 100644 --- a/whisper/whisperv6/peer.go +++ b/whisper/whisperv6/peer.go @@ -23,10 +23,10 @@ import ( "time" mapset "github.com/deckarep/golang-set" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/rlp" ) // Peer represents a whisper protocol peer connection. diff --git a/whisper/whisperv6/peer_test.go b/whisper/whisperv6/peer_test.go index 313471294..dd4a36436 100644 --- a/whisper/whisperv6/peer_test.go +++ b/whisper/whisperv6/peer_test.go @@ -28,13 +28,13 @@ import ( "net" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/nat" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/nat" + "github.com/tangerine-network/go-tangerine/rlp" ) var keys = []string{ diff --git a/whisper/whisperv6/topic.go b/whisper/whisperv6/topic.go index b12aef98f..7aecece0a 100644 --- a/whisper/whisperv6/topic.go +++ b/whisper/whisperv6/topic.go @@ -19,8 +19,8 @@ package whisperv6 import ( - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" ) // TopicType represents a cryptographically secure, probabilistic partial diff --git a/whisper/whisperv6/whisper.go b/whisper/whisperv6/whisper.go index 4e2d6abb0..66735cc52 100644 --- a/whisper/whisperv6/whisper.go +++ b/whisper/whisperv6/whisper.go @@ -27,13 +27,13 @@ import ( "time" mapset "github.com/deckarep/golang-set" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/rlp" - "github.com/dexon-foundation/dexon/rpc" "github.com/syndtr/goleveldb/leveldb/errors" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/rlp" + "github.com/tangerine-network/go-tangerine/rpc" "golang.org/x/crypto/pbkdf2" "golang.org/x/sync/syncmap" ) diff --git a/whisper/whisperv6/whisper_test.go b/whisper/whisperv6/whisper_test.go index 713cf56f9..9576ea296 100644 --- a/whisper/whisperv6/whisper_test.go +++ b/whisper/whisperv6/whisper_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/common" + "github.com/tangerine-network/go-tangerine/common" "golang.org/x/crypto/pbkdf2" ) |