Merge pull request #212 from Bytom/Makefile

Change Makefile and directory for vapor

diff --git a/Makefile b/Makefile
index b81530d..8c85059 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -13,28 +13,24 @@ PACKAGES    := $(shell go list ./... | grep -v '/vendor/' | grep -v '/crypto/ed2
 
 BUILD_FLAGS := -ldflags "-X github.com/vapor/version.GitCommit=`git rev-parse HEAD`"
 
-MINER_BINARY32 := miner-$(GOOS)_386
-MINER_BINARY64 := miner-$(GOOS)_amd64
 
-BYTOMD_BINARY32 := bytomd-$(GOOS)_386
-BYTOMD_BINARY64 := bytomd-$(GOOS)_amd64
+VAPORD_BINARY32 := vapord-$(GOOS)_386
+VAPORD_BINARY64 := vapord-$(GOOS)_amd64
 
-BYTOMCLI_BINARY32 := bytomcli-$(GOOS)_386
-BYTOMCLI_BINARY64 := bytomcli-$(GOOS)_amd64
+VAPORCLI_BINARY32 := vaporcli-$(GOOS)_386
+VAPORCLI_BINARY64 := vaporcli-$(GOOS)_amd64
 
 VERSION := $(shell awk -F= '/Version =/ {print $$2}' version/version.go | tr -d "\" ")
 
-MINER_RELEASE32 := miner-$(VERSION)-$(GOOS)_386
-MINER_RELEASE64 := miner-$(VERSION)-$(GOOS)_amd64
 
-BYTOMD_RELEASE32 := bytomd-$(VERSION)-$(GOOS)_386
-BYTOMD_RELEASE64 := bytomd-$(VERSION)-$(GOOS)_amd64
+VAPORD_RELEASE32 := vapord-$(VERSION)-$(GOOS)_386
+VAPORD_RELEASE64 := vapord-$(VERSION)-$(GOOS)_amd64
 
-BYTOMCLI_RELEASE32 := bytomcli-$(VERSION)-$(GOOS)_386
-BYTOMCLI_RELEASE64 := bytomcli-$(VERSION)-$(GOOS)_amd64
+VAPORCLI_RELEASE32 := vaporcli-$(VERSION)-$(GOOS)_386
+VAPORCLI_RELEASE64 := vaporcli-$(VERSION)-$(GOOS)_amd64
 
-BYTOM_RELEASE32 := bytom-$(VERSION)-$(GOOS)_386
-BYTOM_RELEASE64 := bytom-$(VERSION)-$(GOOS)_amd64
+VAPOR_RELEASE32 := vapor-$(VERSION)-$(GOOS)_386
+VAPOR_RELEASE64 := vapor-$(VERSION)-$(GOOS)_amd64
 
 all: test target release-all install
 
@@ -42,51 +38,44 @@ fedd:
        @echo "Building fedd to cmd/fedd/fedd"
        @go build $(BUILD_FLAGS) -o cmd/fedd/fedd cmd/fedd/main.go
 
-bytomd:
-       @echo "Building bytomd to cmd/bytomd/bytomd"
-       @go build $(BUILD_FLAGS) -o cmd/bytomd/bytomd cmd/bytomd/main.go
+vapord:
+       @echo "Building vapord to cmd/vapord/vapord"
+       @go build $(BUILD_FLAGS) -o cmd/vapord/vapord cmd/vapord/main.go
 
-bytomd-simd:
-       @echo "Building SIMD version bytomd to cmd/bytomd/bytomd"
-       @cd mining/tensority/cgo_algorithm/lib/ && make
-       @go build -tags="simd" $(BUILD_FLAGS) -o cmd/bytomd/bytomd cmd/bytomd/main.go
-
-bytomcli:
-       @echo "Building bytomcli to cmd/bytomcli/bytomcli"
-       @go build $(BUILD_FLAGS) -o cmd/bytomcli/bytomcli cmd/bytomcli/main.go
+vaporcli:
+       @echo "Building vaporcli to cmd/vaporcli/vaporcli"
+       @go build $(BUILD_FLAGS) -o cmd/vaporcli/vaporcli cmd/vaporcli/main.go
 
 install:
-       @echo "Installing bytomd and bytomcli to $(GOPATH)/bin"
-       @go install ./cmd/bytomd
-       @go install ./cmd/bytomcli
+       @echo "Installing vapord and vaporcli to $(GOPATH)/bin"
+       @go install ./cmd/vapord
+       @go install ./cmd/vaporcli
 
 target:
        mkdir -p $@
 
-binary: target/$(BYTOMD_BINARY32) target/$(BYTOMD_BINARY64) target/$(BYTOMCLI_BINARY32) target/$(BYTOMCLI_BINARY64) target/$(MINER_BINARY32) target/$(MINER_BINARY64)
+binary: target/$(VAPORD_BINARY32) target/$(VAPORD_BINARY64) target/$(VAPORCLI_BINARY32) target/$(VAPORCLI_BINARY64)
 
 ifeq ($(GOOS),windows)
 release: binary
-       cd target && cp -f $(MINER_BINARY32) $(MINER_BINARY32).exe
-       cd target && cp -f $(BYTOMD_BINARY32) $(BYTOMD_BINARY32).exe
-       cd target && cp -f $(BYTOMCLI_BINARY32) $(BYTOMCLI_BINARY32).exe
-       cd target && md5sum $(MINER_BINARY32).exe $(BYTOMD_BINARY32).exe $(BYTOMCLI_BINARY32).exe >$(BYTOM_RELEASE32).md5
-       cd target && zip $(BYTOM_RELEASE32).zip $(MINER_BINARY32).exe $(BYTOMD_BINARY32).exe $(BYTOMCLI_BINARY32).exe $(BYTOM_RELEASE32).md5
-       cd target && rm -f $(MINER_BINARY32) $(BYTOMD_BINARY32) $(BYTOMCLI_BINARY32) $(MINER_BINARY32).exe $(BYTOMD_BINARY32).exe $(BYTOMCLI_BINARY32).exe $(BYTOM_RELEASE32).md5
-       cd target && cp -f $(MINER_BINARY64) $(MINER_BINARY64).exe
-       cd target && cp -f $(BYTOMD_BINARY64) $(BYTOMD_BINARY64).exe
-       cd target && cp -f $(BYTOMCLI_BINARY64) $(BYTOMCLI_BINARY64).exe
-       cd target && md5sum $(MINER_BINARY64).exe $(BYTOMD_BINARY64).exe $(BYTOMCLI_BINARY64).exe >$(BYTOM_RELEASE64).md5
-       cd target && zip $(BYTOM_RELEASE64).zip $(MINER_BINARY64).exe $(BYTOMD_BINARY64).exe $(BYTOMCLI_BINARY64).exe $(BYTOM_RELEASE64).md5
-       cd target && rm -f $(MINER_BINARY64) $(BYTOMD_BINARY64) $(BYTOMCLI_BINARY64) $(MINER_BINARY64).exe $(BYTOMD_BINARY64).exe $(BYTOMCLI_BINARY64).exe $(BYTOM_RELEASE64).md5
+       cd target && cp -f $(VAPORD_BINARY32) $(VAPORD_BINARY32).exe
+       cd target && cp -f $(VAPORCLI_BINARY32) $(VAPORCLI_BINARY32).exe
+       cd target && md5sum $(VAPORD_BINARY32).exe $(VAPORCLI_BINARY32).exe >$(VAPOR_RELEASE32).md5
+       cd target && zip $(VAPOR_RELEASE32).zip $(VAPORD_BINARY32).exe $(VAPORCLI_BINARY32).exe $(VAPOR_RELEASE32).md5
+       cd target && rm -f $(VAPORD_BINARY32) $(VAPORCLI_BINARY32) $(VAPORD_BINARY32).exe $(VAPORCLI_BINARY32).exe $(VAPOR_RELEASE32).md5
+       cd target && cp -f $(VAPORD_BINARY64) $(VAPORD_BINARY64).exe
+       cd target && cp -f $(VAPORCLI_BINARY64) $(VAPORCLI_BINARY64).exe
+       cd target && md5sum $(VAPORD_BINARY64).exe $(VAPORCLI_BINARY64).exe >$(VAPOR_RELEASE64).md5
+       cd target && zip $(VAPOR_RELEASE64).zip $(VAPORD_BINARY64).exe $(VAPORCLI_BINARY64).exe $(VAPOR_RELEASE64).md5
+       cd target && rm -f $(VAPORD_BINARY64) $(VAPORCLI_BINARY64) $(VAPORD_BINARY64).exe $(VAPORCLI_BINARY64).exe $(VAPOR_RELEASE64).md5
 else
 release: binary
-       cd target && md5sum $(MINER_BINARY32) $(BYTOMD_BINARY32) $(BYTOMCLI_BINARY32) >$(BYTOM_RELEASE32).md5
-       cd target && tar -czf $(BYTOM_RELEASE32).tgz $(MINER_BINARY32) $(BYTOMD_BINARY32) $(BYTOMCLI_BINARY32) $(BYTOM_RELEASE32).md5
-       cd target && rm -f $(MINER_BINARY32) $(BYTOMD_BINARY32) $(BYTOMCLI_BINARY32) $(BYTOM_RELEASE32).md5
-       cd target && md5sum $(MINER_BINARY64) $(BYTOMD_BINARY64) $(BYTOMCLI_BINARY64) >$(BYTOM_RELEASE64).md5
-       cd target && tar -czf $(BYTOM_RELEASE64).tgz $(MINER_BINARY64) $(BYTOMD_BINARY64) $(BYTOMCLI_BINARY64) $(BYTOM_RELEASE64).md5
-       cd target && rm -f $(MINER_BINARY64) $(BYTOMD_BINARY64) $(BYTOMCLI_BINARY64) $(BYTOM_RELEASE64).md5
+       cd target && md5sum $(VAPORD_BINARY32) $(VAPORCLI_BINARY32) >$(VAPOR_RELEASE32).md5
+       cd target && tar -czf $(VAPOR_RELEASE32).tgz $(VAPORD_BINARY32) $(VAPORCLI_BINARY32) $(VAPOR_RELEASE32).md5
+       cd target && rm -f $(VAPORD_BINARY32) $(VAPORCLI_BINARY32) $(VAPOR_RELEASE32).md5
+       cd target && md5sum $(VAPORD_BINARY64) $(VAPORCLI_BINARY64) >$(VAPOR_RELEASE64).md5
+       cd target && tar -czf $(VAPOR_RELEASE64).tgz $(VAPORD_BINARY64) $(VAPORCLI_BINARY64) $(VAPOR_RELEASE64).md5
+       cd target && rm -f $(VAPORD_BINARY64) $(VAPORCLI_BINARY64) $(VAPOR_RELEASE64).md5
 endif
 
 release-all: clean
@@ -96,12 +85,11 @@ release-all: clean
 
 clean:
        @echo "Cleaning binaries built..."
-       @rm -rf cmd/bytomd/bytomd
-       @rm -rf cmd/bytomcli/bytomcli
-       @rm -rf cmd/miner/miner
+       @rm -rf cmd/vapord/vapord
+       @rm -rf cmd/vaporcli/vaporcli
        @rm -rf target
-       @rm -rf $(GOPATH)/bin/bytomd
-       @rm -rf $(GOPATH)/bin/bytomcli
+       @rm -rf $(GOPATH)/bin/vapord
+       @rm -rf $(GOPATH)/bin/vaporcli
        @echo "Cleaning temp test data..."
        @rm -rf test/pseudo_hsm*
        @rm -rf blockchain/pseudohsm/testdata/pseudo/
@@ -109,23 +97,18 @@ clean:
        @rm -rf crypto/sm2/*.pem
        @echo "Done."
 
-target/$(BYTOMD_BINARY32):
-       CGO_ENABLED=0 GOARCH=386 go build $(BUILD_FLAGS) -o $@ cmd/bytomd/main.go
-
-target/$(BYTOMD_BINARY64):
-       CGO_ENABLED=0 GOARCH=amd64 go build $(BUILD_FLAGS) -o $@ cmd/bytomd/main.go
+target/$(VAPORD_BINARY32):
+       CGO_ENABLED=0 GOARCH=386 go build $(BUILD_FLAGS) -o $@ cmd/vapord/main.go
 
-target/$(BYTOMCLI_BINARY32):
-       CGO_ENABLED=0 GOARCH=386 go build $(BUILD_FLAGS) -o $@ cmd/bytomcli/main.go
+target/$(VAPORD_BINARY64):
+       CGO_ENABLED=0 GOARCH=amd64 go build $(BUILD_FLAGS) -o $@ cmd/vapord/main.go
 
-target/$(BYTOMCLI_BINARY64):
-       CGO_ENABLED=0 GOARCH=amd64 go build $(BUILD_FLAGS) -o $@ cmd/bytomcli/main.go
+target/$(VAPORCLI_BINARY32):
+       CGO_ENABLED=0 GOARCH=386 go build $(BUILD_FLAGS) -o $@ cmd/vaporcli/main.go
 
-target/$(MINER_BINARY32):
-       CGO_ENABLED=0 GOARCH=386 go build $(BUILD_FLAGS) -o $@ cmd/miner/main.go
+target/$(VAPORCLI_BINARY64):
+       CGO_ENABLED=0 GOARCH=amd64 go build $(BUILD_FLAGS) -o $@ cmd/vaporcli/main.go
 
-target/$(MINER_BINARY64):
-       CGO_ENABLED=0 GOARCH=amd64 go build $(BUILD_FLAGS) -o $@ cmd/miner/main.go
 
 test:
        @echo "====> Running go test"

diff --git a/README.md b/README.md
index 8c71257..50644f8 100644 (file)
--- a/README.md
+++ b/README.md
@@ -32,19 +32,19 @@ $ make install
 Firstly, you need initialize node:
 
 ```
-$ bytomd init --chain_id=vapor --home <vapor-data-path>
+$ vapord init --chain_id=vapor --home <vapor-data-path>
 ```
 
 For example, you can store vapor data in `$HOME/bytom/vapor`:
 
 ```
-$ bytomd init --chain_id=vapor --home $HOME/bytom/vapor
+$ vapord init --chain_id=vapor --home $HOME/bytom/vapor
 ```
 
 Then, start your node:
 
 ```
-$ bytomd node --home <vapor-data-path>
+$ vapord node --home <vapor-data-path>
 ```
 
 ## Running in Docker
@@ -68,8 +68,6 @@ vapor data directory has three config files:
 - `federation.json`
 - `node_key.txt`
 
-Then you can use bytomd and bytomcli following [Bytom Wiki](https://github.com/Bytom/bytom/wiki/Command-Line-Options).
-
 Use `exit` to exit Docker's iterative mode.
 
 ### Daemon mode
@@ -77,7 +75,7 @@ Use `exit` to exit Docker's iterative mode.
 For example,
 
 ```bash
-$ docker run -d --net=host -v <vapor/data/directory/on/host/machine>:/root/.vapor vapor:latest bytomd node --web.closed --auth.disable
+$ docker run -d --net=host -v <vapor/data/directory/on/host/machine>:/root/.vapor vapor:latest vapord node --web.closed --auth.disable
 ```
 
 To list the running containners and check their container id, image, corresponding command, created time, status, name and ports being used:
@@ -95,7 +93,7 @@ $ docker ps
 To execute a command inside a containner, for example:
 
 ```
-$ docker exec -it <containerId> bytomcli create-access-token <tokenId>
+$ docker exec -it <containerId> vaporcli create-access-token <tokenId>
 ```
 
 To stop a running containner:

diff --git a/cmd/bytomcli/commands/accesstoken.go b/cmd/vaporcli/commands/accesstoken.go
similarity index 100%
rename from cmd/bytomcli/commands/accesstoken.go
rename to cmd/vaporcli/commands/accesstoken.go

diff --git a/cmd/bytomcli/commands/account.go b/cmd/vaporcli/commands/account.go
similarity index 100%
rename from cmd/bytomcli/commands/account.go
rename to cmd/vaporcli/commands/account.go

diff --git a/cmd/bytomcli/commands/asset.go b/cmd/vaporcli/commands/asset.go
similarity index 100%
rename from cmd/bytomcli/commands/asset.go
rename to cmd/vaporcli/commands/asset.go

diff --git a/cmd/bytomcli/commands/block.go b/cmd/vaporcli/commands/block.go
similarity index 100%
rename from cmd/bytomcli/commands/block.go
rename to cmd/vaporcli/commands/block.go

diff --git a/cmd/bytomcli/commands/bytomcli.go b/cmd/vaporcli/commands/bytomcli.go
similarity index 100%
rename from cmd/bytomcli/commands/bytomcli.go
rename to cmd/vaporcli/commands/bytomcli.go

diff --git a/cmd/bytomcli/commands/key.go b/cmd/vaporcli/commands/key.go
similarity index 100%
rename from cmd/bytomcli/commands/key.go
rename to cmd/vaporcli/commands/key.go

diff --git a/cmd/bytomcli/commands/mining.go b/cmd/vaporcli/commands/mining.go
similarity index 100%
rename from cmd/bytomcli/commands/mining.go
rename to cmd/vaporcli/commands/mining.go

diff --git a/cmd/bytomcli/commands/net.go b/cmd/vaporcli/commands/net.go
similarity index 100%
rename from cmd/bytomcli/commands/net.go
rename to cmd/vaporcli/commands/net.go

diff --git a/cmd/bytomcli/commands/program.go b/cmd/vaporcli/commands/program.go
similarity index 100%
rename from cmd/bytomcli/commands/program.go
rename to cmd/vaporcli/commands/program.go

diff --git a/cmd/bytomcli/commands/template.go b/cmd/vaporcli/commands/template.go
similarity index 100%
rename from cmd/bytomcli/commands/template.go
rename to cmd/vaporcli/commands/template.go

diff --git a/cmd/bytomcli/commands/transaction.go b/cmd/vaporcli/commands/transaction.go
similarity index 100%
rename from cmd/bytomcli/commands/transaction.go
rename to cmd/vaporcli/commands/transaction.go

diff --git a/cmd/bytomcli/commands/txfeed.go b/cmd/vaporcli/commands/txfeed.go
similarity index 100%
rename from cmd/bytomcli/commands/txfeed.go
rename to cmd/vaporcli/commands/txfeed.go

diff --git a/cmd/bytomcli/commands/util.go b/cmd/vaporcli/commands/util.go
similarity index 100%
rename from cmd/bytomcli/commands/util.go
rename to cmd/vaporcli/commands/util.go

diff --git a/cmd/bytomcli/commands/version.go b/cmd/vaporcli/commands/version.go
similarity index 100%
rename from cmd/bytomcli/commands/version.go
rename to cmd/vaporcli/commands/version.go

diff --git a/cmd/bytomcli/commands/wallet.go b/cmd/vaporcli/commands/wallet.go
similarity index 100%
rename from cmd/bytomcli/commands/wallet.go
rename to cmd/vaporcli/commands/wallet.go

diff --git a/cmd/bytomcli/main.go b/cmd/vaporcli/main.go
similarity index 69%
rename from cmd/bytomcli/main.go
rename to cmd/vaporcli/main.go
index ca0655a..afb61ec 100644 (file)
--- a/cmd/bytomcli/main.go
+++ b/cmd/vaporcli/main.go
@@ -3,7 +3,7 @@ package main
 import (
        "runtime"
 
-       cmd "github.com/vapor/cmd/bytomcli/commands"
+       cmd "github.com/vapor/cmd/vaporcli/commands"
 )
 
 func main() {

diff --git a/cmd/bytomd/commands/init.go b/cmd/vapord/commands/init.go
similarity index 100%
rename from cmd/bytomd/commands/init.go
rename to cmd/vapord/commands/init.go

diff --git a/cmd/bytomd/commands/root.go b/cmd/vapord/commands/root.go
similarity index 100%
rename from cmd/bytomd/commands/root.go
rename to cmd/vapord/commands/root.go

diff --git a/cmd/bytomd/commands/run_node.go b/cmd/vapord/commands/run_node.go
similarity index 100%
rename from cmd/bytomd/commands/run_node.go
rename to cmd/vapord/commands/run_node.go

diff --git a/cmd/bytomd/commands/version.go b/cmd/vapord/commands/version.go
similarity index 100%
rename from cmd/bytomd/commands/version.go
rename to cmd/vapord/commands/version.go

diff --git a/cmd/bytomd/main.go b/cmd/vapord/main.go
similarity index 96%
rename from cmd/bytomd/main.go
rename to cmd/vapord/main.go
index 430d1eb..9d6efb2 100644 (file)
--- a/cmd/bytomd/main.go
+++ b/cmd/vapord/main.go
@@ -10,7 +10,7 @@ import (
        log "github.com/sirupsen/logrus"
        "github.com/tendermint/tmlibs/cli"
 
-       "github.com/vapor/cmd/bytomd/commands"
+       "github.com/vapor/cmd/vapord/commands"
        "github.com/vapor/config"
 )
 

diff --git a/wallet/annotated.go b/wallet/annotated.go
index 6604876..746ac5a 100644 (file)
--- a/wallet/annotated.go
+++ b/wallet/annotated.go
@@ -33,6 +33,7 @@ func annotateTxsAsset(w *Wallet, txs []*query.AnnotatedTx) {
 }
 
 func (w *Wallet) getExternalDefinition(assetID *bc.AssetID) json.RawMessage {
+       // definitionByte := w.DB.Get(asset.ExtAssetKey(assetID))
        definitionByte := w.DB.Get(asset.ExtAssetKey(assetID))
        if definitionByte == nil {
                return nil