test support ontology v2 version

.travis.script.bash

@@ -17,6 +17,6 @@ elif [ $TRAVIS_OS_NAME == 'osx' ]; then
 	env GO111MODULE=on make all
 else
 	echo "win sys"
-	env GO111MODULE=on CGO_ENABLED=1 go build  -ldflags "-X github.com/ontio/ontology/common/config.Version=${VERSION}" -o ontology-windows-amd64 main.go
-	env GO111MODULE=on go build  -ldflags "-X github.com/ontio/ontology/common/config.Version=${VERSION}" -o sigsvr-windows-amd64 sigsvr.go
+	env GO111MODULE=on CGO_ENABLED=1 go build  -ldflags "-X github.com/xiemylogos/ontology/v2/common/config.Version=${VERSION}" -o ontology-windows-amd64 main.go
+	env GO111MODULE=on go build  -ldflags "-X github.com/xiemylogos/ontology/v2/common/config.Version=${VERSION}" -o sigsvr-windows-amd64 sigsvr.go
 fi

Makefile

@@ -1,7 +1,7 @@
 GOFMT=gofmt
 GC=go build
 VERSION := $(shell git describe --always --tags --long)
-BUILD_NODE_PAR = -ldflags "-w -X github.com/ontio/ontology/common/config.Version=$(VERSION)" #-race
+BUILD_NODE_PAR = -ldflags "-w -X github.com/xiemylogos/ontology/v2/common/config.Version=$(VERSION)" #-race
 
 ARCH=$(shell uname -m)
 DBUILD=docker build
@@ -77,7 +77,7 @@ docker/build/bin/%: Makefile
 		-v $(abspath docker/build/bin):/go/bin \
 		-v $(abspath docker/build/pkg):/go/pkg \
 		-v $(GOPATH)/src:/go/src \
-		-w /go/src/github.com/ontio/ontology \
+		-w /go/src/github.com/xiemylogos/ontology/v2 \
 		golang:1.9.5-stretch \
 		$(GC)  $(BUILD_NODE_PAR) -o docker/build/bin/ontology main.go
 	@touch $@

README.md

@@ -15,7 +15,7 @@ Ontology is a high-performance public blockchain project and distributed trust c
 
 As a public blockchain project, Ontology is currently maintained by both the Ontology core tech team and community members who can all support you in development. There are many available tools for use for development - SDKs, the SmartX IDE, Ontology blockchain explorer and more.
 
-New features are still being rapidly developed, therefore the master branch may be unstable. Stable versions can be found in the [releases section](https://github.com/ontio/ontology/releases).
+New features are still being rapidly developed, therefore the master branch may be unstable. Stable versions can be found in the [releases section](https://github.com/xiemylogos/ontology/v2/releases).
 
 ## Features
 
@@ -33,7 +33,7 @@ New features are still being rapidly developed, therefore the master branch may
 You can download a stable compiled version of the Ontology node software by either:
 
 - Downloading the latest Ontology binary file with `curl https://dev.ont.io/ontology_install | sh`.
-- Downloading a specific version from the [release section](https://github.com/ontio/ontology/releases).
+- Downloading a specific version from the [release section](https://github.com/xiemylogos/ontology/v2/releases).
 
 ## Build From Source
 
@@ -59,7 +59,7 @@ After building the source code successfully, you should see two executable progr
 
 ## Run Ontology
 
-The Ontology CLI can run nodes for the MainNet, TestNet and local PrivateNet. Check out the [Ontology CLI user guide](https://github.com/ontio/ontology/blob/master/docs/specifications/cli_user_guide.md) for a full list of commands.
+The Ontology CLI can run nodes for the MainNet, TestNet and local PrivateNet. Check out the [Ontology CLI user guide](https://github.com/xiemylogos/ontology/v2/blob/master/docs/specifications/cli_user_guide.md) for a full list of commands.
 
 ### MainNet Sync Node
 
@@ -214,7 +214,7 @@ For further examples, please refer to the [CLI User Guide](https://ontio.github.
 
 ## Contributions
 
-Contributors to Ontology are very welcome! Before beginning, please take a look at our [contributing guidelines](CONTRIBUTING.md). You can open an issue by [clicking here](https://github.com/ontio/ontology/issues/new).
+Contributors to Ontology are very welcome! Before beginning, please take a look at our [contributing guidelines](CONTRIBUTING.md). You can open an issue by [clicking here](https://github.com/xiemylogos/ontology/v2/issues/new).
 
 If you have any issues getting setup, open an issue or reach out in the [Ontology Discord](https://discordapp.com/invite/4TQujHj).
 

README_CN.md

@@ -14,7 +14,7 @@
 Ontology致力于创建一个组件化、可自由配置、跨链支持、高性能、横向可扩展的区块链底层基础设施。 让部署及调用去中心化应用变得更加非常简单。
 
 Ontology MainNet 已经在2018年6月30日成功上线。<br>
-但很多新的功能还处于快速的开发过程中，master分支的代码可能是不稳定的，稳定的版本可以在[releases](https://github.com/ontio/ontology/releases)中下载。
+但很多新的功能还处于快速的开发过程中，master分支的代码可能是不稳定的，稳定的版本可以在[releases](https://github.com/xiemylogos/ontology/v2/releases)中下载。
 
 公开的主网和测试网都可以在下面找到，也非常欢迎及希望能有更多的开发者加入到Ontology中来。
 
@@ -60,7 +60,7 @@ Ontology MainNet 已经在2018年6月30日成功上线。<br>
 
 ### 从release获取
 - 你可以通过命令 ` curl https://dev.ont.io/ontology_install | sh ` 获取最新的ontology版本
-- 你也可以从[下载页面](https://github.com/ontio/ontology/releases)获取.
+- 你也可以从[下载页面](https://github.com/xiemylogos/ontology/v2/releases)获取.
 
 ### 从源码获取
 

account/account.go

@@ -21,9 +21,9 @@ package account
 import (
 	"github.com/ontio/ontology-crypto/keypair"
 	s "github.com/ontio/ontology-crypto/signature"
-	"github.com/ontio/ontology/common"
-	"github.com/ontio/ontology/common/log"
-	"github.com/ontio/ontology/core/types"
+	"github.com/xiemylogos/ontology/v2/common"
+	"github.com/xiemylogos/ontology/v2/common/log"
+	"github.com/xiemylogos/ontology/v2/core/types"
 )
 
 /* crypto object */

account/account_test.go

@@ -21,7 +21,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/ontio/ontology/core/types"
+	"github.com/xiemylogos/ontology/v2/core/types"
 	"github.com/stretchr/testify/assert"
 )
 

account/client.go

@@ -28,8 +28,8 @@ import (
 
 	"github.com/ontio/ontology-crypto/keypair"
 	s "github.com/ontio/ontology-crypto/signature"
-	"github.com/ontio/ontology/common"
-	"github.com/ontio/ontology/core/types"
+	"github.com/xiemylogos/ontology/v2/common"
+	"github.com/xiemylogos/ontology/v2/core/types"
 )
 
 //Client of wallet

account/file_store.go

@@ -26,7 +26,7 @@ import (
 	"os"
 
 	"github.com/ontio/ontology-crypto/keypair"
-	"github.com/ontio/ontology/common"
+	"github.com/xiemylogos/ontology/v2/common"
 )
 
 /** AccountData - for wallet read and save, no crypto object included **/

account/file_store_test.go

@@ -24,7 +24,7 @@ import (
 	"testing"
 
 	"github.com/ontio/ontology-crypto/keypair"
-	"github.com/ontio/ontology/core/types"
+	"github.com/xiemylogos/ontology/v2/core/types"
 	"github.com/stretchr/testify/assert"
 )
 

account/identity.go

@@ -28,7 +28,7 @@ import (
 
 	"github.com/itchyny/base58-go"
 	"github.com/ontio/ontology-crypto/keypair"
-	"github.com/ontio/ontology/core/types"
+	"github.com/xiemylogos/ontology/v2/core/types"
 	"golang.org/x/crypto/ripemd160"
 )
 

account/store.go

@@ -19,7 +19,7 @@
 package account
 
 import (
-	"github.com/ontio/ontology/common"
+	"github.com/xiemylogos/ontology/v2/common"
 )
 
 type ClientStore interface {

cmd-tools/sigsvr/sigsvr.go

@@ -23,14 +23,14 @@ import (
 	"runtime"
 	"syscall"
 
-	"github.com/ontio/ontology/cmd"
-	"github.com/ontio/ontology/cmd/abi"
-	cmdsvr "github.com/ontio/ontology/cmd/sigsvr"
-	clisvrcom "github.com/ontio/ontology/cmd/sigsvr/common"
-	"github.com/ontio/ontology/cmd/sigsvr/store"
-	"github.com/ontio/ontology/cmd/utils"
-	"github.com/ontio/ontology/common/config"
-	"github.com/ontio/ontology/common/log"
+	"github.com/xiemylogos/ontology/v2/cmd"
+	"github.com/xiemylogos/ontology/v2/cmd/abi"
+	cmdsvr "github.com/xiemylogos/ontology/v2/cmd/sigsvr"
+	clisvrcom "github.com/xiemylogos/ontology/v2/cmd/sigsvr/common"
+	"github.com/xiemylogos/ontology/v2/cmd/sigsvr/store"
+	"github.com/xiemylogos/ontology/v2/cmd/utils"
+	"github.com/xiemylogos/ontology/v2/common/config"
+	"github.com/xiemylogos/ontology/v2/common/log"
 	"github.com/urfave/cli"
 )
 

cmd/abi/abi_mgr.go

@@ -24,7 +24,7 @@ import (
 	"io/ioutil"
 	"strings"
 
-	"github.com/ontio/ontology/common/log"
+	"github.com/xiemylogos/ontology/v2/common/log"
 )
 
 var DefAbiMgr = NewAbiMgr()

cmd/account.go

@@ -25,9 +25,9 @@ import (
 
 	"github.com/ontio/ontology-crypto/keypair"
 	s "github.com/ontio/ontology-crypto/signature"
-	"github.com/ontio/ontology/cmd/common"
-	"github.com/ontio/ontology/cmd/utils"
-	"github.com/ontio/ontology/common/config"
+	"github.com/xiemylogos/ontology/v2/cmd/common"
+	"github.com/xiemylogos/ontology/v2/cmd/utils"
+	"github.com/xiemylogos/ontology/v2/common/config"
 	"github.com/urfave/cli"
 )
 

cmd/account_cmd.go

@@ -26,11 +26,11 @@ import (
 
 	"github.com/ontio/ontology-crypto/keypair"
 	"github.com/ontio/ontology-crypto/signature"
-	"github.com/ontio/ontology/account"
-	"github.com/ontio/ontology/cmd/common"
-	"github.com/ontio/ontology/cmd/utils"
-	"github.com/ontio/ontology/common/password"
-	"github.com/ontio/ontology/core/types"
+	"github.com/xiemylogos/ontology/v2/account"
+	"github.com/xiemylogos/ontology/v2/cmd/common"
+	"github.com/xiemylogos/ontology/v2/cmd/utils"
+	"github.com/xiemylogos/ontology/v2/common/password"
+	"github.com/xiemylogos/ontology/v2/core/types"
 	"github.com/urfave/cli"
 )
 

cmd/asset_cmd.go

@@ -23,11 +23,11 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/ontio/ontology/account"
-	cmdcom "github.com/ontio/ontology/cmd/common"
-	"github.com/ontio/ontology/cmd/utils"
-	"github.com/ontio/ontology/common/config"
-	nutils "github.com/ontio/ontology/smartcontract/service/native/utils"
+	"github.com/xiemylogos/ontology/v2/account"
+	cmdcom "github.com/xiemylogos/ontology/v2/cmd/common"
+	"github.com/xiemylogos/ontology/v2/cmd/utils"
+	"github.com/xiemylogos/ontology/v2/common/config"
+	nutils "github.com/xiemylogos/ontology/v2/smartcontract/service/native/utils"
 	"github.com/urfave/cli"
 )
 

cmd/common/common.go

@@ -22,11 +22,11 @@ import (
 	"fmt"
 	"strconv"
 
-	"github.com/ontio/ontology/account"
-	"github.com/ontio/ontology/cmd/utils"
-	"github.com/ontio/ontology/common"
-	"github.com/ontio/ontology/common/config"
-	"github.com/ontio/ontology/common/password"
+	"github.com/xiemylogos/ontology/v2/account"
+	"github.com/xiemylogos/ontology/v2/cmd/utils"
+	"github.com/xiemylogos/ontology/v2/common"
+	"github.com/xiemylogos/ontology/v2/common/config"
+	"github.com/xiemylogos/ontology/v2/common/password"
 	"github.com/urfave/cli"
 )
 

cmd/config.go

@@ -21,11 +21,11 @@ package cmd
 import (
 	"fmt"
 
-	"github.com/ontio/ontology/cmd/utils"
-	"github.com/ontio/ontology/common"
-	"github.com/ontio/ontology/common/config"
-	"github.com/ontio/ontology/common/log"
-	"github.com/ontio/ontology/smartcontract/service/native/governance"
+	"github.com/xiemylogos/ontology/v2/cmd/utils"
+	"github.com/xiemylogos/ontology/v2/common"
+	"github.com/xiemylogos/ontology/v2/common/config"
+	"github.com/xiemylogos/ontology/v2/common/log"
+	"github.com/xiemylogos/ontology/v2/smartcontract/service/native/governance"
 	"github.com/urfave/cli"
 )
 

cmd/contract_cmd.go

@@ -24,12 +24,12 @@ import (
 	"io/ioutil"
 	"strings"
 
-	cmdcom "github.com/ontio/ontology/cmd/common"
-	"github.com/ontio/ontology/cmd/utils"
-	"github.com/ontio/ontology/common"
-	"github.com/ontio/ontology/common/config"
-	"github.com/ontio/ontology/core/payload"
-	httpcom "github.com/ontio/ontology/http/base/common"
+	cmdcom "github.com/xiemylogos/ontology/v2/cmd/common"
+	"github.com/xiemylogos/ontology/v2/cmd/utils"
+	"github.com/xiemylogos/ontology/v2/common"
+	"github.com/xiemylogos/ontology/v2/common/config"
+	"github.com/xiemylogos/ontology/v2/core/payload"
+	httpcom "github.com/xiemylogos/ontology/v2/http/base/common"
 	"github.com/urfave/cli"
 )
 

cmd/export_cmd.go

@@ -27,8 +27,8 @@ import (
 	"github.com/gosuri/uiprogress"
 	"github.com/urfave/cli"
 
-	"github.com/ontio/ontology/cmd/utils"
-	"github.com/ontio/ontology/common/serialization"
+	"github.com/xiemylogos/ontology/v2/cmd/utils"
+	"github.com/xiemylogos/ontology/v2/common/serialization"
 )
 
 var ExportCommand = cli.Command{

cmd/import_cmd.go

@@ -27,14 +27,14 @@ import (
 	"github.com/gosuri/uiprogress"
 	"github.com/urfave/cli"
 
-	"github.com/ontio/ontology/cmd/utils"
-	"github.com/ontio/ontology/common"
-	"github.com/ontio/ontology/common/config"
-	"github.com/ontio/ontology/common/log"
-	"github.com/ontio/ontology/common/serialization"
-	"github.com/ontio/ontology/core/genesis"
-	"github.com/ontio/ontology/core/ledger"
-	"github.com/ontio/ontology/core/types"
+	"github.com/xiemylogos/ontology/v2/cmd/utils"
+	"github.com/xiemylogos/ontology/v2/common"
+	"github.com/xiemylogos/ontology/v2/common/config"
+	"github.com/xiemylogos/ontology/v2/common/log"
+	"github.com/xiemylogos/ontology/v2/common/serialization"
+	"github.com/xiemylogos/ontology/v2/core/genesis"
+	"github.com/xiemylogos/ontology/v2/core/ledger"
+	"github.com/xiemylogos/ontology/v2/core/types"
 )
 
 var ImportCommand = cli.Command{

cmd/info_cmd.go

@@ -23,9 +23,9 @@ import (
 	"fmt"
 	"strconv"
 
-	"github.com/ontio/ontology/cmd/utils"
-	"github.com/ontio/ontology/core/types"
-	httpcom "github.com/ontio/ontology/http/base/common"
+	"github.com/xiemylogos/ontology/v2/cmd/utils"
+	"github.com/xiemylogos/ontology/v2/core/types"
+	httpcom "github.com/xiemylogos/ontology/v2/http/base/common"
 	"github.com/urfave/cli"
 )
 

cmd/sig_tx_cmd.go

@@ -23,11 +23,11 @@ import (
 	"strings"
 
 	"github.com/ontio/ontology-crypto/keypair"
-	cmdcom "github.com/ontio/ontology/cmd/common"
-	"github.com/ontio/ontology/cmd/utils"
-	"github.com/ontio/ontology/common"
-	"github.com/ontio/ontology/common/constants"
-	"github.com/ontio/ontology/core/types"
+	cmdcom "github.com/xiemylogos/ontology/v2/cmd/common"
+	"github.com/xiemylogos/ontology/v2/cmd/utils"
+	"github.com/xiemylogos/ontology/v2/common"
+	"github.com/xiemylogos/ontology/v2/common/constants"
+	"github.com/xiemylogos/ontology/v2/core/types"
 	"github.com/urfave/cli"
 )
 

cmd/sigsvr/common/common.go

@@ -22,8 +22,8 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/ontio/ontology/account"
-	"github.com/ontio/ontology/cmd/sigsvr/store"
+	"github.com/xiemylogos/ontology/v2/account"
+	"github.com/xiemylogos/ontology/v2/cmd/sigsvr/store"
 )
 
 var DefWalletStore *store.WalletStore

cmd/sigsvr/handler.go

@@ -18,7 +18,7 @@
 
 package sigsvr
 
-import "github.com/ontio/ontology/cmd/sigsvr/handlers"
+import "github.com/xiemylogos/ontology/v2/cmd/sigsvr/handlers"
 
 func init() {
 	DefCliRpcSvr.RegHandler("createaccount", handlers.CreateAccount)

cmd/sigsvr/handlers/create_account.go

@@ -22,8 +22,8 @@ import (
 
 	"github.com/ontio/ontology-crypto/keypair"
 	s "github.com/ontio/ontology-crypto/signature"
-	clisvrcom "github.com/ontio/ontology/cmd/sigsvr/common"
-	"github.com/ontio/ontology/common/log"
+	clisvrcom "github.com/xiemylogos/ontology/v2/cmd/sigsvr/common"
+	"github.com/xiemylogos/ontology/v2/common/log"
 )
 
 type CreateAccountReq struct {

cmd/sigsvr/handlers/create_account_test.go

@@ -20,7 +20,7 @@ package handlers
 import (
 	"testing"
 
-	clisvrcom "github.com/ontio/ontology/cmd/sigsvr/common"
+	clisvrcom "github.com/xiemylogos/ontology/v2/cmd/sigsvr/common"
 )
 
 func TestCreateAccount(t *testing.T) {