Merge branch 'master' into issues-multisig-rpc-test

Makefile

@@ -20,17 +20,19 @@ MKDIR=$(dir $(MKPATH))
 proj := "build"
 .PHONY: default dep all build release cli linter race test fmt vet bench msan coverage coverhtml docker docker-compose protobuf clean help autotest
 
-default: build depends
+default: depends build
 
 build:
 	go build $(BUILD_FLAGS) -v -i -o $(APP)
 	go build $(BUILD_FLAGS) -v -i -o $(CLI) $(SRC_CLI)
 	@cp chain33.toml $(CHAIN33_PATH)/build/system-test-rpc.sh build/
+	@cp chain33.para.toml build/ci/paracross/
 
 build_ci: depends ## Build the binary file for CI
 	@go build -v -i -o $(CLI) $(SRC_CLI)
 	@go build $(BUILD_FLAGS) -v -o $(APP)
 	@cp chain33.toml $(CHAIN33_PATH)/build/system-test-rpc.sh build/
+	@cp chain33.para.toml build/ci/paracross/
 
 para:
 	@go build -v -o build/$(NAME) -ldflags "-X $(SRC_CLI)/buildflags.ParaName=user.p.$(NAME). -X $(SRC_CLI)/buildflags.RPCAddr=http://localhost:8901" $(SRC_CLI)

chain33.toml

@@ -63,12 +63,12 @@ grpcFuncWhitelist=["*"]
 
 
 [mempool]
-name="timeline"
+name="price"
 poolCacheSize=10240
 minTxFee=100000
 maxTxNumPerAccount=100
 maxTxFee=1000000000
-
+isLevelFee=true
 [mempool.sub.timeline]
 poolCacheSize=10240