Merge pull request #1828 from Bytom/prod

Merge prod to master
BytomDAO · Feb 5, 2020 · 210e21c · 210e21c
2 parents 19d90c0 + e49a099
commit 210e21c
Show file tree

Hide file tree

Showing 292 changed files with 1,107 additions and 6,973 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,5 @@
 language: go
-go_import_path: github.com/bytom
+go_import_path: github.com/bytom/bytom
 dist: trusty
 sudo: false
 

diff --git a/Dockerfile b/Dockerfile
@@ -3,14 +3,14 @@ FROM golang:1.9-alpine as builder
 
 RUN apk add --no-cache make git
 
-ADD . /go/src/github.com/bytom
-RUN cd /go/src/github.com/bytom && make bytomd && make bytomcli
+ADD . /go/src/github.com/bytom/bytom
+RUN cd /go/src/github.com/bytom/bytom && make bytomd && make bytomcli
 
 # Pull Bytom into a second stage deploy alpine container
 FROM alpine:latest
 
 RUN apk add --no-cache ca-certificates
-COPY --from=builder /go/src/github.com/bytom/cmd/bytomd/bytomd /usr/local/bin/
-COPY --from=builder /go/src/github.com/bytom/cmd/bytomcli/bytomcli /usr/local/bin/
+COPY --from=builder /go/src/github.com/bytom/bytom/cmd/bytomd/bytomd /usr/local/bin/
+COPY --from=builder /go/src/github.com/bytom/bytom/cmd/bytomcli/bytomcli /usr/local/bin/
 
 EXPOSE 1999 46656 46657 9888
diff --git a/Makefile b/Makefile
@@ -10,9 +10,9 @@ endif
 endif
 
 PACKAGES    := $(shell go list ./... | grep -v '/vendor/' | grep -v '/crypto/ed25519/chainkd' | grep -v '/mining/tensority')
-PACKAGES += 'github.com/bytom/mining/tensority/go_algorithm'
+PACKAGES += 'github.com/bytom/bytom/mining/tensority/go_algorithm'
 
-BUILD_FLAGS := -ldflags "-X github.com/bytom/version.GitCommit=`git rev-parse HEAD`"
+BUILD_FLAGS := -ldflags "-X github.com/bytom/bytom/version.GitCommit=`git rev-parse HEAD`"
 
 MINER_BINARY32 := miner-$(GOOS)_386
 MINER_BINARY64 := miner-$(GOOS)_amd64

diff --git a/README.md b/README.md
@@ -40,18 +40,18 @@ $ go env GOROOT GOPATH
 - Get the source code
 
 ``` bash
-$ git clone https://github.com/Bytom/bytom.git $GOPATH/src/github.com/bytom
+$ git clone https://github.com/Bytom/bytom.git $GOPATH/src/github.com/bytom/bytom
 ```
 
 - Build source code
 
 ``` bash
-$ cd $GOPATH/src/github.com/bytom
+$ cd $GOPATH/src/github.com/bytom/bytom
 $ make bytomd    # build bytomd
 $ make bytomcli  # build bytomcli
 ```
 
-When successfully building the project, the `bytom` and `bytomcli` binary should be present in `cmd/bytomd` and `cmd/bytomcli` directory, respectively.
+When successfully building the project, the `bytomd` and `bytomcli` binary should be present in `cmd/bytomd` and `cmd/bytomcli` directory, respectively.
 
 ### Executables
 

diff --git a/accesstoken/accesstoken.go b/accesstoken/accesstoken.go
@@ -10,9 +10,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/bytom/crypto/sha3pool"
-	"github.com/bytom/errors"
-	dbm "github.com/bytom/database/leveldb"
+	"github.com/bytom/bytom/crypto/sha3pool"
+	"github.com/bytom/bytom/errors"
+	dbm "github.com/bytom/bytom/database/leveldb"
 )
 
 const tokenSize = 32

diff --git a/accesstoken/accesstoken_test.go b/accesstoken/accesstoken_test.go
@@ -6,8 +6,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/bytom/errors"
-	dbm "github.com/bytom/database/leveldb"
+	"github.com/bytom/bytom/errors"
+	dbm "github.com/bytom/bytom/database/leveldb"
 )
 
 func TestCreate(t *testing.T) {

diff --git a/account/accounts.go b/account/accounts.go
@@ -11,19 +11,19 @@ import (
 	"github.com/golang/groupcache/lru"
 	log "github.com/sirupsen/logrus"
 
-	"github.com/bytom/blockchain/signers"
-	"github.com/bytom/blockchain/txbuilder"
-	"github.com/bytom/common"
-	"github.com/bytom/consensus"
-	"github.com/bytom/consensus/segwit"
-	"github.com/bytom/crypto"
-	"github.com/bytom/crypto/ed25519/chainkd"
-	"github.com/bytom/crypto/sha3pool"
-	"github.com/bytom/errors"
-	"github.com/bytom/protocol"
-	"github.com/bytom/protocol/bc"
-	"github.com/bytom/protocol/vm/vmutil"
-	dbm "github.com/bytom/database/leveldb"
+	"github.com/bytom/bytom/blockchain/signers"
+	"github.com/bytom/bytom/blockchain/txbuilder"
+	"github.com/bytom/bytom/common"
+	"github.com/bytom/bytom/consensus"
+	"github.com/bytom/bytom/consensus/segwit"
+	"github.com/bytom/bytom/crypto"
+	"github.com/bytom/bytom/crypto/ed25519/chainkd"
+	"github.com/bytom/bytom/crypto/sha3pool"
+	"github.com/bytom/bytom/errors"
+	"github.com/bytom/bytom/protocol"
+	"github.com/bytom/bytom/protocol/bc"
+	"github.com/bytom/bytom/protocol/vm/vmutil"
+	dbm "github.com/bytom/bytom/database/leveldb"
 )
 
 const (

diff --git a/account/accounts_test.go b/account/accounts_test.go
@@ -7,15 +7,15 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/bytom/blockchain/pseudohsm"
-	"github.com/bytom/blockchain/signers"
-	"github.com/bytom/crypto/ed25519/chainkd"
-	"github.com/bytom/database"
-	"github.com/bytom/errors"
-	"github.com/bytom/event"
-	"github.com/bytom/protocol"
-	"github.com/bytom/testutil"
-	dbm "github.com/bytom/database/leveldb"
+	"github.com/bytom/bytom/blockchain/pseudohsm"
+	"github.com/bytom/bytom/blockchain/signers"
+	"github.com/bytom/bytom/crypto/ed25519/chainkd"
+	"github.com/bytom/bytom/database"
+	"github.com/bytom/bytom/errors"
+	"github.com/bytom/bytom/event"
+	"github.com/bytom/bytom/protocol"
+	"github.com/bytom/bytom/testutil"
+	dbm "github.com/bytom/bytom/database/leveldb"
 )
 
 func TestCreateAccountWithUppercase(t *testing.T) {

diff --git a/account/builder.go b/account/builder.go
@@ -4,15 +4,15 @@ import (
 	"context"
 	"encoding/json"
 
-	"github.com/bytom/blockchain/signers"
-	"github.com/bytom/blockchain/txbuilder"
-	"github.com/bytom/common"
-	"github.com/bytom/consensus"
-	"github.com/bytom/crypto/ed25519/chainkd"
-	"github.com/bytom/errors"
-	"github.com/bytom/protocol/bc"
-	"github.com/bytom/protocol/bc/types"
-	"github.com/bytom/protocol/vm/vmutil"
+	"github.com/bytom/bytom/blockchain/signers"
+	"github.com/bytom/bytom/blockchain/txbuilder"
+	"github.com/bytom/bytom/common"
+	"github.com/bytom/bytom/consensus"
+	"github.com/bytom/bytom/crypto/ed25519/chainkd"
+	"github.com/bytom/bytom/errors"
+	"github.com/bytom/bytom/protocol/bc"
+	"github.com/bytom/bytom/protocol/bc/types"
+	"github.com/bytom/bytom/protocol/vm/vmutil"
 )
 
 //DecodeSpendAction unmarshal JSON-encoded data of spend action

diff --git a/account/builder_test.go b/account/builder_test.go
@@ -5,12 +5,12 @@ import (
 	"testing"
 	"time"
 
-	"github.com/bytom/blockchain/signers"
-	"github.com/bytom/blockchain/txbuilder"
-	"github.com/bytom/consensus"
-	"github.com/bytom/crypto/ed25519/chainkd"
-	"github.com/bytom/protocol/bc"
-	"github.com/bytom/testutil"
+	"github.com/bytom/bytom/blockchain/signers"
+	"github.com/bytom/bytom/blockchain/txbuilder"
+	"github.com/bytom/bytom/consensus"
+	"github.com/bytom/bytom/crypto/ed25519/chainkd"
+	"github.com/bytom/bytom/protocol/bc"
+	"github.com/bytom/bytom/testutil"
 )
 
 func TestReserveBtmUtxoChain(t *testing.T) {

diff --git a/account/indexer.go b/account/indexer.go
@@ -1,8 +1,8 @@
 package account
 
 import (
-	"github.com/bytom/blockchain/query"
-	"github.com/bytom/protocol/bc"
+	"github.com/bytom/bytom/blockchain/query"
+	"github.com/bytom/bytom/protocol/bc"
 )
 
 const (

diff --git a/account/utxo_keeper.go b/account/utxo_keeper.go
@@ -10,9 +10,9 @@ import (
 
 	log "github.com/sirupsen/logrus"
 
-	"github.com/bytom/errors"
-	"github.com/bytom/protocol/bc"
-	dbm "github.com/bytom/database/leveldb"
+	"github.com/bytom/bytom/errors"
+	"github.com/bytom/bytom/protocol/bc"
+	dbm "github.com/bytom/bytom/database/leveldb"
 )
 
 const desireUtxoCount = 5

diff --git a/account/utxo_keeper_test.go b/account/utxo_keeper_test.go
@@ -6,9 +6,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/bytom/protocol/bc"
-	"github.com/bytom/testutil"
-	dbm "github.com/bytom/database/leveldb"
+	"github.com/bytom/bytom/protocol/bc"
+	"github.com/bytom/bytom/testutil"
+	dbm "github.com/bytom/bytom/database/leveldb"
 )
 
 func TestAddUnconfirmedUtxo(t *testing.T) {

diff --git a/api/accounts.go b/api/accounts.go
@@ -7,12 +7,12 @@ import (
 
 	log "github.com/sirupsen/logrus"
 
-	"github.com/bytom/account"
-	"github.com/bytom/blockchain/signers"
-	"github.com/bytom/common"
-	"github.com/bytom/consensus"
-	"github.com/bytom/crypto/ed25519/chainkd"
-	"github.com/bytom/protocol/vm/vmutil"
+	"github.com/bytom/bytom/account"
+	"github.com/bytom/bytom/blockchain/signers"
+	"github.com/bytom/bytom/common"
+	"github.com/bytom/bytom/consensus"
+	"github.com/bytom/bytom/crypto/ed25519/chainkd"
+	"github.com/bytom/bytom/protocol/vm/vmutil"
 )
 
 // POST /create-account

diff --git a/api/api.go b/api/api.go
@@ -11,24 +11,24 @@ import (
 	log "github.com/sirupsen/logrus"
 	cmn "github.com/tendermint/tmlibs/common"
 
-	"github.com/bytom/accesstoken"
-	"github.com/bytom/blockchain/txfeed"
-	cfg "github.com/bytom/config"
-	"github.com/bytom/dashboard/dashboard"
-	"github.com/bytom/dashboard/equity"
-	"github.com/bytom/errors"
-	"github.com/bytom/event"
-	"github.com/bytom/mining/cpuminer"
-	"github.com/bytom/mining/miningpool"
-	"github.com/bytom/net/http/authn"
-	"github.com/bytom/net/http/gzip"
-	"github.com/bytom/net/http/httpjson"
-	"github.com/bytom/net/http/static"
-	"github.com/bytom/net/websocket"
-	"github.com/bytom/netsync"
-	"github.com/bytom/p2p"
-	"github.com/bytom/protocol"
-	"github.com/bytom/wallet"
+	"github.com/bytom/bytom/accesstoken"
+	"github.com/bytom/bytom/blockchain/txfeed"
+	cfg "github.com/bytom/bytom/config"
+	"github.com/bytom/bytom/dashboard/dashboard"
+	"github.com/bytom/bytom/dashboard/equity"
+	"github.com/bytom/bytom/errors"
+	"github.com/bytom/bytom/event"
+	"github.com/bytom/bytom/mining/cpuminer"
+	"github.com/bytom/bytom/mining/miningpool"
+	"github.com/bytom/bytom/net/http/authn"
+	"github.com/bytom/bytom/net/http/gzip"
+	"github.com/bytom/bytom/net/http/httpjson"
+	"github.com/bytom/bytom/net/http/static"
+	"github.com/bytom/bytom/net/websocket"
+	"github.com/bytom/bytom/netsync"
+	"github.com/bytom/bytom/p2p"
+	"github.com/bytom/bytom/protocol"
+	"github.com/bytom/bytom/wallet"
 )
 
 var (

diff --git a/api/api_test.go b/api/api_test.go
@@ -6,10 +6,10 @@ import (
 	"os"
 	"testing"
 
-	"github.com/bytom/accesstoken"
-	"github.com/bytom/blockchain/rpc"
-	dbm "github.com/bytom/database/leveldb"
-	"github.com/bytom/testutil"
+	"github.com/bytom/bytom/accesstoken"
+	"github.com/bytom/bytom/blockchain/rpc"
+	dbm "github.com/bytom/bytom/database/leveldb"
+	"github.com/bytom/bytom/testutil"
 )
 
 func TestAPIHandler(t *testing.T) {

diff --git a/api/assets.go b/api/assets.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"strings"
 
-	"github.com/bytom/asset"
-	"github.com/bytom/crypto/ed25519/chainkd"
-	chainjson "github.com/bytom/encoding/json"
+	"github.com/bytom/bytom/asset"
+	"github.com/bytom/bytom/crypto/ed25519/chainkd"
+	chainjson "github.com/bytom/bytom/encoding/json"
 
 	log "github.com/sirupsen/logrus"
 )

diff --git a/api/block_retrieve.go b/api/block_retrieve.go
@@ -5,12 +5,12 @@ import (
 
 	"gopkg.in/fatih/set.v0"
 
-	"github.com/bytom/blockchain/query"
-	"github.com/bytom/consensus/difficulty"
-	chainjson "github.com/bytom/encoding/json"
-	"github.com/bytom/errors"
-	"github.com/bytom/protocol/bc"
-	"github.com/bytom/protocol/bc/types"
+	"github.com/bytom/bytom/blockchain/query"
+	"github.com/bytom/bytom/consensus/difficulty"
+	chainjson "github.com/bytom/bytom/encoding/json"
+	"github.com/bytom/bytom/errors"
+	"github.com/bytom/bytom/protocol/bc"
+	"github.com/bytom/bytom/protocol/bc/types"
 )
 
 // return best block hash

diff --git a/api/compile.go b/api/compile.go
@@ -3,10 +3,10 @@ package api
 import (
 	"strings"
 
-	chainjson "github.com/bytom/encoding/json"
-	"github.com/bytom/equity/compiler"
-	"github.com/bytom/errors"
-	"github.com/bytom/protocol/vm"
+	chainjson "github.com/bytom/bytom/encoding/json"
+	"github.com/bytom/bytom/equity/compiler"
+	"github.com/bytom/bytom/errors"
+	"github.com/bytom/bytom/protocol/vm"
 )
 
 // pre-define contract error types

diff --git a/api/errors.go b/api/errors.go
@@ -3,17 +3,17 @@ package api
 import (
 	"context"
 
-	"github.com/bytom/account"
-	"github.com/bytom/asset"
-	"github.com/bytom/blockchain/pseudohsm"
-	"github.com/bytom/blockchain/rpc"
-	"github.com/bytom/blockchain/signers"
-	"github.com/bytom/blockchain/txbuilder"
-	"github.com/bytom/errors"
-	"github.com/bytom/net/http/httperror"
-	"github.com/bytom/net/http/httpjson"
-	"github.com/bytom/protocol/validation"
-	"github.com/bytom/protocol/vm"
+	"github.com/bytom/bytom/account"
+	"github.com/bytom/bytom/asset"
+	"github.com/bytom/bytom/blockchain/pseudohsm"
+	"github.com/bytom/bytom/blockchain/rpc"
+	"github.com/bytom/bytom/blockchain/signers"
+	"github.com/bytom/bytom/blockchain/txbuilder"
+	"github.com/bytom/bytom/errors"
+	"github.com/bytom/bytom/net/http/httperror"
+	"github.com/bytom/bytom/net/http/httpjson"
+	"github.com/bytom/bytom/protocol/validation"
+	"github.com/bytom/bytom/protocol/vm"
 )
 
 var (

diff --git a/api/hsm.go b/api/hsm.go
@@ -5,8 +5,8 @@ import (
 
 	log "github.com/sirupsen/logrus"
 
-	"github.com/bytom/blockchain/txbuilder"
-	"github.com/bytom/crypto/ed25519/chainkd"
+	"github.com/bytom/bytom/blockchain/txbuilder"
+	"github.com/bytom/bytom/crypto/ed25519/chainkd"
 )
 
 type createKeyResp struct {