CovenantSQL · leventeliu · Jan 3, 2019 · Jan 3, 2019 · Jan 3, 2019 · Jan 3, 2019
diff --git a/Makefile b/Makefile
@@ -120,6 +120,7 @@ test_flags := -coverpkg github.com/CovenantSQL/CovenantSQL/... -cover -race -c
 ldflags_role_bp := -X main.version=$(version) -X github.com/CovenantSQL/CovenantSQL/conf.RoleTag=B $$GOLDFLAGS
 ldflags_role_miner := -X main.version=$(version) -X github.com/CovenantSQL/CovenantSQL/conf.RoleTag=M $$GOLDFLAGS
 ldflags_role_client := -X main.version=$(version) -X github.com/CovenantSQL/CovenantSQL/conf.RoleTag=C $$GOLDFLAGS
+ldflags_role_client_simple_log := $(ldflags_role_client) -X github.com/CovenantSQL/CovenantSQL/utils/log.SimpleLog=Y
 
 GOTEST := CGO_ENABLED=1 go test $(test_flags) -tags "$(testtags)"
 GOBUILD := CGO_ENABLED=1 go build -tags "$(tags)"
@@ -162,19 +163,19 @@ bin/cql-observer:
 
 bin/cql-utils:
 	$(GOBUILD) \
-		-ldflags "$(ldflags_role_client)" \
+		-ldflags "$(ldflags_role_client_simple_log)" \
 		-o bin/cql-utils \
 		github.com/CovenantSQL/CovenantSQL/cmd/cql-utils
 
 bin/cql:
 	$(GOBUILD) \
-		-ldflags "$(ldflags_role_client)" \
+		-ldflags "$(ldflags_role_client_simple_log)" \
 		-o bin/cql \
 		github.com/CovenantSQL/CovenantSQL/cmd/cql
 
 bin/cql-fuse:
 	$(GOBUILD) \
-		-ldflags "$(ldflags_role_client)" \
+		-ldflags "$(ldflags_role_client_simple_log)" \
 		-o bin/cql-fuse \
 		github.com/CovenantSQL/CovenantSQL/cmd/cql-fuse
 
@@ -215,4 +216,6 @@ all: bp miner observer client
 clean:
 	rm -rf bin/cql*
 
-.PHONY: status start stop logs push push_testnet clean bin/cqld.test bin/cqld bin/cql-minerd.test bin/cql-minerd bin/cql-utils bin/cql bin/cql-fuse bin/cql-adapter bin/cql-mysql-adapter bin/cql-faucet bin/cql-explorer 
+.PHONY: status start stop logs push push_testnet clean \
+	bin/cqld.test bin/cqld bin/cql-minerd.test bin/cql-minerd bin/cql-utils \
+	bin/cql bin/cql-fuse bin/cql-adapter bin/cql-mysql-adapter bin/cql-faucet bin/cql-explorer
diff --git a/blockproducer/metastate.go b/blockproducer/metastate.go
@@ -1168,5 +1168,5 @@ func (s *metaState) makeCopy() *metaState {
 
 func minDeposit(gasPrice uint64, minerNumber uint64) uint64 {
 	return gasPrice * uint64(conf.GConf.QPS) *
-		uint64(conf.GConf.BillingPeriod) * minerNumber
+		conf.GConf.BillingBlockCount * minerNumber
 }
diff --git a/blockproducer/metastate_test.go b/blockproducer/metastate_test.go
@@ -689,7 +689,7 @@ func TestMetaState(t *testing.T) {
 							Node:         1,
 						},
 						GasPrice:       1,
-						AdvancePayment: uint64(conf.GConf.QPS) * uint64(conf.GConf.BillingPeriod) * 1,
+						AdvancePayment: uint64(conf.GConf.QPS) * conf.GConf.BillingBlockCount * 1,
 						TokenType:      types.Particle,
 						Nonce:          1,
 					},
@@ -731,7 +731,7 @@ func TestMetaState(t *testing.T) {
 						},
 						Nonce:          1,
 						GasPrice:       1,
-						AdvancePayment: uint64(conf.GConf.QPS) * uint64(conf.GConf.BillingPeriod) * 2,
+						AdvancePayment: uint64(conf.GConf.QPS) * conf.GConf.BillingBlockCount * 2,
 					},
 				}
 				err = invalidCd5.Sign(privKey3)
@@ -745,7 +745,7 @@ func TestMetaState(t *testing.T) {
 						},
 						Nonce:          1,
 						GasPrice:       1,
-						AdvancePayment: uint64(conf.GConf.QPS) * uint64(conf.GConf.BillingPeriod) * 1,
+						AdvancePayment: uint64(conf.GConf.QPS) * conf.GConf.BillingBlockCount * 1,
 					},
 				}
 				err = invalidCd6.Sign(privKey3)
@@ -764,7 +764,7 @@ func TestMetaState(t *testing.T) {
 						},
 						Nonce:          1,
 						GasPrice:       1,
-						AdvancePayment: uint64(conf.GConf.QPS) * uint64(conf.GConf.BillingPeriod) * 10,
+						AdvancePayment: uint64(conf.GConf.QPS) * conf.GConf.BillingBlockCount * 10,
 					},
 				}
 				err = invalidCd7.Sign(privKey3)
@@ -894,7 +894,7 @@ func TestMetaState(t *testing.T) {
 				b2, loaded = ms.loadAccountStableBalance(addr1)
 				So(loaded, ShouldBeTrue)
 				minAdvancePayment := uint64(cd2.GasPrice) * uint64(conf.GConf.QPS) *
-					uint64(conf.GConf.BillingPeriod) * uint64(len(cd2.ResourceMeta.TargetMiners))
+					conf.GConf.BillingBlockCount * uint64(len(cd2.ResourceMeta.TargetMiners))
 				So(b1-b2, ShouldEqual, cd1.AdvancePayment+minAdvancePayment)
 				dbID := proto.FromAccountAndNonce(cd1.Owner, uint32(cd1.Nonce))
 				co, loaded = ms.loadSQLChainObject(dbID)

diff --git a/cmd/cql/main.go b/cmd/cql/main.go
@@ -29,16 +29,17 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/CovenantSQL/CovenantSQL/client"
-	"github.com/CovenantSQL/CovenantSQL/crypto/asymmetric"
-	"github.com/CovenantSQL/CovenantSQL/utils/log"
 	sqlite3 "github.com/CovenantSQL/go-sqlite3-encrypt"
 	"github.com/xo/dburl"
 	"github.com/xo/usql/drivers"
 	"github.com/xo/usql/env"
 	"github.com/xo/usql/handler"
 	"github.com/xo/usql/rline"
 	"github.com/xo/usql/text"
+
+	"github.com/CovenantSQL/CovenantSQL/client"
+	"github.com/CovenantSQL/CovenantSQL/crypto/asymmetric"
+	"github.com/CovenantSQL/CovenantSQL/utils/log"
 )
 
 const name = "cql"

diff --git a/conf/config.go b/conf/config.go
@@ -139,7 +139,7 @@ type Config struct {
 	SeedBPNodes []proto.Node `yaml:"-"`
 
 	QPS                uint32        `yaml:"QPS"`
-	BillingPeriod      uint32        `yaml:"BillingPeriod"` // BillingPeriod is for sql chain miners syncing billing with main chain
+	BillingBlockCount  uint64        `yaml:"BillingBlockCount"` // BillingBlockCount is for sql chain miners syncing billing with main chain
 	BPPeriod           time.Duration `yaml:"BPPeriod"`
 	BPTick             time.Duration `yaml:"BPTick"`
 	SQLChainPeriod     time.Duration `yaml:"SQLChainPeriod"`

diff --git a/conf/testnet/parameters.go b/conf/testnet/parameters.go
@@ -34,7 +34,7 @@ DHTFileName: "dht.db"
 ListenAddr: "0.0.0.0:15151"
 ThisNodeID: "00000f3b43288fe99831eb533ab77ec455d13e11fc38ec35a42d4edd17aa320d"
 QPS: 1000
-BillingPeriod: 60
+BillingBlockCount: 60
 BPPeriod: 10s
 BPTick: 3s
 SQLChainPeriod: 60s

diff --git a/test/GNTE/conf/node_0/config.yaml b/test/GNTE/conf/node_0/config.yaml
@@ -6,7 +6,7 @@ DHTFileName: "dht.db"
 ListenAddr: "10.250.1.2:4661"
 ThisNodeID: "00000bef611d346c0cbe1beaa76e7f0ed705a194fdf9ac3a248ec70e9c198bf9"
 QPS: 1000
-BillingPeriod: 3600
+BillingBlockCount: 3600
 BPPeriod: 3s
 BPTick: 1s
 SQLChainPeriod: 3s

diff --git a/test/GNTE/conf/node_1/config.yaml b/test/GNTE/conf/node_1/config.yaml
@@ -6,7 +6,7 @@ DHTFileName: "dht.db"
 ListenAddr: "10.250.1.3:4661"
 ThisNodeID: "00000381d46fd6cf7742d7fb94e2422033af989c0e348b5781b3219599a3af35"
 QPS: 1000
-BillingPeriod: 3600
+BillingBlockCount: 3600
 BPPeriod: 3s
 BPTick: 1s
 SQLChainPeriod: 3s

diff --git a/test/GNTE/conf/node_2/config.yaml b/test/GNTE/conf/node_2/config.yaml
@@ -6,7 +6,7 @@ DHTFileName: "dht.db"
 ListenAddr: "10.250.1.4:4661"
 ThisNodeID: "000000172580063ded88e010556b0aca2851265be8845b1ef397e8fce6ab5582"
 QPS: 1000
-BillingPeriod: 3600
+BillingBlockCount: 3600
 BPPeriod: 3s
 BPTick: 1s
 SQLChainPeriod: 3s

diff --git a/test/GNTE/conf/node_c/config.yaml b/test/GNTE/conf/node_c/config.yaml
@@ -6,7 +6,7 @@ DHTFileName: "dht.db"
 ListenAddr: "10.250.0.254:4661"
 ThisNodeID: "00000f3b43288fe99831eb533ab77ec455d13e11fc38ec35a42d4edd17aa320d"
 QPS: 1000
-BillingPeriod: 3600
+BillingBlockCount: 3600
 BPPeriod: 3s
 BPTick: 1s
 SQLChainPeriod: 3s

diff --git a/test/GNTE/conf/node_miner_10.250.100.2/config.yaml b/test/GNTE/conf/node_miner_10.250.100.2/config.yaml
@@ -6,7 +6,7 @@ DHTFileName: "dht.db"
 ListenAddr: "10.250.100.2:4661"
 ThisNodeID: "000005aa62048f85da4ae9698ed59c14ec0d48a88a07c15a32265634e7e64ade"
 QPS: 1000
-BillingPeriod: 3600
+BillingBlockCount: 3600
 BPPeriod: 3s
 BPTick: 1s
 SQLChainPeriod: 3s

diff --git a/test/GNTE/conf/node_miner_10.250.100.3/config.yaml b/test/GNTE/conf/node_miner_10.250.100.3/config.yaml
@@ -6,7 +6,7 @@ DHTFileName: "dht.db"
 ListenAddr: "10.250.100.3:4661"
 ThisNodeID: "000005f4f22c06f76c43c4f48d5a7ec1309cc94030cbf9ebae814172884ac8b5"
 QPS: 1000
-BillingPeriod: 3600
+BillingBlockCount: 3600
 BPPeriod: 3s
 BPTick: 1s
 SQLChainPeriod: 3s

diff --git a/test/GNTE/conf/node_miner_10.250.100.4/config.yaml b/test/GNTE/conf/node_miner_10.250.100.4/config.yaml
@@ -6,7 +6,7 @@ DHTFileName: "dht.db"
 ListenAddr: "10.250.100.4:4661"
 ThisNodeID: "000003f49592f83d0473bddb70d543f1096b4ffed5e5f942a3117e256b7052b8"
 QPS: 1000
-BillingPeriod: 3600
+BillingBlockCount: 3600
 BPPeriod: 3s
 BPTick: 1s
 SQLChainPeriod: 3s

diff --git a/test/GNTE/conf/node_miner_10.250.100.5/config.yaml b/test/GNTE/conf/node_miner_10.250.100.5/config.yaml
@@ -6,7 +6,7 @@ DHTFileName: "dht.db"
 ListenAddr: "10.250.100.5:4661"
 ThisNodeID: "00eda359cd2aa0920cdd37b083b896cb18cd26b3bd51744d1b4f127830f820f2"
 QPS: 1000
-BillingPeriod: 3600
+BillingBlockCount: 3600
 BPPeriod: 3s
 BPTick: 1s
 SQLChainPeriod: 3s

diff --git a/test/GNTE/conf/node_miner_10.250.100.6/config.yaml b/test/GNTE/conf/node_miner_10.250.100.6/config.yaml
@@ -6,7 +6,7 @@ DHTFileName: "dht.db"
 ListenAddr: "10.250.100.6:4661"
 ThisNodeID: "0017017845ff9f9f7e8599d308652eb8ce480e689fbd49afb6b44cc9726cf84b"
 QPS: 1000
-BillingPeriod: 3600
+BillingBlockCount: 3600
 BPPeriod: 3s
 BPTick: 1s
 SQLChainPeriod: 3s

diff --git a/test/GNTE/conf/node_miner_10.250.100.7/config.yaml b/test/GNTE/conf/node_miner_10.250.100.7/config.yaml
@@ -6,7 +6,7 @@ DHTFileName: "dht.db"
 ListenAddr: "10.250.100.7:4661"
 ThisNodeID: "0075b97519d0a5cf9f7269a61b82bb3e082a5e7d796604e877ee28d08491979a"
 QPS: 1000
-BillingPeriod: 3600
+BillingBlockCount: 3600
 BPPeriod: 3s
 BPTick: 1s
 SQLChainPeriod: 3s

diff --git a/test/GNTE/conf/node_miner_10.250.100.8/config.yaml b/test/GNTE/conf/node_miner_10.250.100.8/config.yaml
@@ -6,7 +6,7 @@ DHTFileName: "dht.db"
 ListenAddr: "10.250.100.8:4661"
 ThisNodeID: "0060bb3394f5185f760af690b0c124a70acbaf952fd79d794a0d394c37d7c0bc"
 QPS: 1000
-BillingPeriod: 3600
+BillingBlockCount: 3600
 BPPeriod: 3s
 BPTick: 1s
 SQLChainPeriod: 3s

diff --git a/test/GNTE/conf/node_miner_10.250.100.9/config.yaml b/test/GNTE/conf/node_miner_10.250.100.9/config.yaml
@@ -6,7 +6,7 @@ DHTFileName: "dht.db"
 ListenAddr: "10.250.100.9:4661"
 ThisNodeID: "004e5cf49e88f6e35e344f35d73ffe6232d4ebe93a63a825e171b8f6f2a88859"
 QPS: 1000
-BillingPeriod: 3600
+BillingBlockCount: 3600
 BPPeriod: 3s
 BPTick: 1s
 SQLChainPeriod: 3s

diff --git a/test/fuse/node_0/config.yaml b/test/fuse/node_0/config.yaml
@@ -6,7 +6,7 @@ DHTFileName: "dht.db"
 ListenAddr: "127.0.0.1:6122"
 ThisNodeID: "00000bef611d346c0cbe1beaa76e7f0ed705a194fdf9ac3a248ec70e9c198bf9"
 QPS: 1000
-BillingPeriod: 3600
+BillingBlockCount: 3600
 BPPeriod: 3s
 BPTick: 1s
 SQLChainPeriod: 3s

diff --git a/test/fuse/node_1/config.yaml b/test/fuse/node_1/config.yaml
@@ -6,7 +6,7 @@ DHTFileName: "dht.db"
 ListenAddr: "127.0.0.1:6121"
 ThisNodeID: "00000381d46fd6cf7742d7fb94e2422033af989c0e348b5781b3219599a3af35"
 QPS: 1000
-BillingPeriod: 3600
+BillingBlockCount: 3600
 BPPeriod: 3s
 BPTick: 1s
 SQLChainPeriod: 3s

diff --git a/test/fuse/node_2/config.yaml b/test/fuse/node_2/config.yaml
@@ -6,7 +6,7 @@ DHTFileName: "dht.db"
 ListenAddr: "127.0.0.1:6120"
 ThisNodeID: "000000172580063ded88e010556b0aca2851265be8845b1ef397e8fce6ab5582"
 QPS: 1000
-BillingPeriod: 3600
+BillingBlockCount: 3600
 BPPeriod: 3s
 BPTick: 1s
 SQLChainPeriod: 3s

diff --git a/test/fuse/node_c/config.yaml b/test/fuse/node_c/config.yaml
@@ -6,7 +6,7 @@ DHTFileName: "dht.db"
 ListenAddr: "127.0.0.1:6120"
 ThisNodeID: "00000f3b43288fe99831eb533ab77ec455d13e11fc38ec35a42d4edd17aa320d"
 QPS: 1000
-BillingPeriod: 3600
+BillingBlockCount: 3600
 BPPeriod: 3s
 BPTick: 1s
 SQLChainPeriod: 3s

diff --git a/test/fuse/node_miner_0/config.yaml b/test/fuse/node_miner_0/config.yaml
@@ -6,7 +6,7 @@ DHTFileName: "dht.db"
 ListenAddr: "127.0.0.1:3144"
 ThisNodeID: "000005aa62048f85da4ae9698ed59c14ec0d48a88a07c15a32265634e7e64ade"
 QPS: 1000
-BillingPeriod: 3600
+BillingBlockCount: 3600
 BPPeriod: 3s
 BPTick: 1s
 SQLChainPeriod: 3s

diff --git a/test/fuse/node_miner_1/config.yaml b/test/fuse/node_miner_1/config.yaml
@@ -6,7 +6,7 @@ DHTFileName: "dht.db"
 ListenAddr: "127.0.0.1:3145"
 ThisNodeID: "000005f4f22c06f76c43c4f48d5a7ec1309cc94030cbf9ebae814172884ac8b5"
 QPS: 1000
-BillingPeriod: 3600
+BillingBlockCount: 3600
 BPPeriod: 3s
 BPTick: 1s
 SQLChainPeriod: 3s

diff --git a/test/fuse/node_miner_2/config.yaml b/test/fuse/node_miner_2/config.yaml
@@ -6,7 +6,7 @@ DHTFileName: "dht.db"
 ListenAddr: "127.0.0.1:3146"
 ThisNodeID: "000003f49592f83d0473bddb70d543f1096b4ffed5e5f942a3117e256b7052b8"
 QPS: 1000
-BillingPeriod: 3600
+BillingBlockCount: 3600
 BPPeriod: 3s
 BPTick: 1s
 SQLChainPeriod: 3s

diff --git a/test/integration/node_0/config.yaml b/test/integration/node_0/config.yaml
@@ -6,7 +6,7 @@ DHTFileName: "dht.db"
 ListenAddr: "127.0.0.1:3122"
 ThisNodeID: "00000bef611d346c0cbe1beaa76e7f0ed705a194fdf9ac3a248ec70e9c198bf9"
 QPS: 1000
-BillingPeriod: 2
+BillingBlockCount: 2
 BPPeriod: 3s
 BPTick: 1s
 SQLChainPeriod: 3s

diff --git a/test/integration/node_1/config.yaml b/test/integration/node_1/config.yaml
@@ -6,7 +6,7 @@ DHTFileName: "dht.db"
 ListenAddr: "127.0.0.1:3121"
 ThisNodeID: "00000381d46fd6cf7742d7fb94e2422033af989c0e348b5781b3219599a3af35"
 QPS: 1000
-BillingPeriod: 2
+BillingBlockCount: 2
 BPPeriod: 3s
 BPTick: 1s
 SQLChainPeriod: 3s

diff --git a/test/integration/node_2/config.yaml b/test/integration/node_2/config.yaml
@@ -6,7 +6,7 @@ DHTFileName: "dht.db"
 ListenAddr: "127.0.0.1:3120"
 ThisNodeID: "000000172580063ded88e010556b0aca2851265be8845b1ef397e8fce6ab5582"
 QPS: 1000
-BillingPeriod: 2
+BillingBlockCount: 2
 BPPeriod: 3s
 BPTick: 1s
 SQLChainPeriod: 3s

diff --git a/test/integration/node_c/config.yaml b/test/integration/node_c/config.yaml
@@ -6,7 +6,7 @@ DHTFileName: "dht.db"
 ListenAddr: "127.0.0.1:3120"
 ThisNodeID: "00000f3b43288fe99831eb533ab77ec455d13e11fc38ec35a42d4edd17aa320d"
 QPS: 1000
-BillingPeriod: 2
+BillingBlockCount: 2
 BPPeriod: 3s
 BPTick: 1s
 SQLChainPeriod: 3s

diff --git a/test/integration/node_miner_0/config.yaml b/test/integration/node_miner_0/config.yaml
@@ -6,7 +6,7 @@ DHTFileName: "dht.db"
 ListenAddr: "127.0.0.1:2144"
 ThisNodeID: "000005aa62048f85da4ae9698ed59c14ec0d48a88a07c15a32265634e7e64ade"
 QPS: 1000
-BillingPeriod: 2
+BillingBlockCount: 2
 BPPeriod: 3s
 BPTick: 1s
 SQLChainPeriod: 3s

diff --git a/test/integration/node_miner_1/config.yaml b/test/integration/node_miner_1/config.yaml
@@ -6,7 +6,7 @@ DHTFileName: "dht.db"
 ListenAddr: "127.0.0.1:2145"
 ThisNodeID: "000005f4f22c06f76c43c4f48d5a7ec1309cc94030cbf9ebae814172884ac8b5"
 QPS: 1000
-BillingPeriod: 2
+BillingBlockCount: 2
 BPPeriod: 3s
 BPTick: 1s
 SQLChainPeriod: 3s

diff --git a/test/integration/node_miner_2/config.yaml b/test/integration/node_miner_2/config.yaml
@@ -6,7 +6,7 @@ DHTFileName: "dht.db"
 ListenAddr: "127.0.0.1:2146"
 ThisNodeID: "000003f49592f83d0473bddb70d543f1096b4ffed5e5f942a3117e256b7052b8"
 QPS: 1000
-BillingPeriod: 2
+BillingBlockCount: 2
 BPPeriod: 3s
 BPTick: 1s
 SQLChainPeriod: 3s

diff --git a/test/leak/leader.yaml b/test/leak/leader.yaml
@@ -6,7 +6,7 @@ DHTFileName: "./leader/dht.db"
 ListenAddr: "127.0.0.1:2331"
 ThisNodeID: "00000bef611d346c0cbe1beaa76e7f0ed705a194fdf9ac3a248ec70e9c198bf9"
 QPS: 1000
-BillingPeriod: 3600
+BillingBlockCount: 3600
 BPPeriod: 3s
 BPTick: 1s
 SQLChainPeriod: 3s

diff --git a/test/mainchain/node_0/config.yaml b/test/mainchain/node_0/config.yaml
@@ -6,7 +6,7 @@ DHTFileName: "dht.db"
 ListenAddr: "127.0.0.1:5122"
 ThisNodeID: "00000bef611d346c0cbe1beaa76e7f0ed705a194fdf9ac3a248ec70e9c198bf9"
 QPS: 1000
-BillingPeriod: 3600
+BillingBlockCount: 3600
 BPPeriod: 3s
 BPTick: 1s
 SQLChainPeriod: 3s

diff --git a/test/mainchain/node_1/config.yaml b/test/mainchain/node_1/config.yaml
@@ -6,7 +6,7 @@ DHTFileName: "dht.db"
 ListenAddr: "127.0.0.1:5121"
 ThisNodeID: "00000381d46fd6cf7742d7fb94e2422033af989c0e348b5781b3219599a3af35"
 QPS: 1000
-BillingPeriod: 3600
+BillingBlockCount: 3600
 BPPeriod: 3s
 BPTick: 1s
 SQLChainPeriod: 3s

diff --git a/test/mainchain/node_2/config.yaml b/test/mainchain/node_2/config.yaml
@@ -6,7 +6,7 @@ DHTFileName: "dht.db"
 ListenAddr: "127.0.0.1:5120"
 ThisNodeID: "000000172580063ded88e010556b0aca2851265be8845b1ef397e8fce6ab5582"
 QPS: 1000
-BillingPeriod: 3600
+BillingBlockCount: 3600
 BPPeriod: 3s
 BPTick: 1s
 SQLChainPeriod: 3s