CovenantSQL · auxten · Mar 27, 2019 · Mar 6, 2019 · Mar 7, 2019 · Mar 7, 2019
diff --git a/.dockerignore b/.dockerignore
@@ -1,3 +1,4 @@
 test/
 bin/cql*
+conf/testnet*/*.keystore
 *.cover.out
diff --git a/.gitignore b/.gitignore
@@ -10,7 +10,7 @@ idminer
 coverage.txt
 analysisVendor.png
 vendor/**/.gitignore
-*.keystore
+*.keystore*
 node_*/
 kayak_test
 *.conf

diff --git a/.travis.yml b/.travis.yml
@@ -37,7 +37,7 @@ before_deploy:
   - make clean
   - make use_all_cores
   - mkdir -p build
-  - tar czvf build/CovenantSQL-$TRAVIS_TAG.$TRAVIS_OS_NAME-amd64.tar.gz $(ls bin/cql* | grep -v test)
+  - tar czvf build/CovenantSQL-$TRAVIS_TAG.$TRAVIS_OS_NAME-amd64.tar.gz bin/cql bin/cql-fuse bin/cql-minerd bin/cql-mysql-adapter bin/cql-utils
 
 deploy:
   provider: releases

diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -89,3 +89,7 @@
 [[constraint]]
   name = "github.com/rakyll/statik"
   version = "0.1.5"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/CovenantSQL/beacon"
diff --git a/Makefile b/Makefile
@@ -140,12 +140,6 @@ bin/cql-minerd:
 		-o bin/cql-minerd \
 		github.com/CovenantSQL/CovenantSQL/cmd/cql-minerd
 
-bin/cql-utils:
-	$(GOBUILD) \
-		-ldflags "$(ldflags_role_client_simple_log)" \
-		-o bin/cql-utils \
-		github.com/CovenantSQL/CovenantSQL/cmd/cql-utils
-
 bin/cql:
 	$(GOBUILD) \
 		-ldflags "$(ldflags_role_client_simple_log)" \
@@ -181,7 +175,7 @@ bp: bin/cqld.test bin/cqld
 
 miner: bin/cql-minerd.test bin/cql-minerd
 
-client: bin/cql-utils bin/cql bin/cql.test bin/cql-fuse bin/cql-mysql-adapter bin/cql-faucet
+client: bin/cql bin/cql.test bin/cql-fuse bin/cql-mysql-adapter bin/cql-faucet
 
 all: bp miner client
 
@@ -191,5 +185,5 @@ clean:
 	rm -f coverage.txt
 
 .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/cqld.test bin/cqld bin/cql-minerd.test bin/cql-minerd \
 	bin/cql bin/cql.test bin/cql-fuse bin/cql-mysql-adapter bin/cql-faucet
diff --git a/README.md b/README.md
@@ -57,6 +57,17 @@ sql.Open("CovenantSQL", dbURI)
     - Each Database has its own independent distributed engine.
     - Mainly responsible for: database storage & encryption, query processing & signature, efficient indexing.
 
+## How it works
+[How CovenantSQL works(video)](https://youtu.be/2Mz5POxxaQM?t=106)
+
+## Demos
+
+- [CovenantForum](https://demo.covenantsql.io/forum/)
+- [Twitter Bot @iBlockPin](https://twitter.com/iblockpin)
+- [Weibo Bot @BlockPin](https://weibo.com/BlockPin)
+- [Markdown Editor with CovenantSQL sync](https://github.com/CovenantSQL/stackedit)
+- [Web Admin for CovenantSQL](https://github.com/CovenantSQL/adminer)
+
 ## Papers
 Our team members published:
 
@@ -114,10 +125,8 @@ Watch us or [![follow on Twitter](https://img.shields.io/twitter/url/https/twitt
 
 ## Contact
 
+- [Blog](https://medium.com/@covenant_labs)
+- [YouTube](https://www.youtube.com/channel/UCe9P_TMiexSHW2GGV5qBmZw)
 - [Mail](mailto:[email protected])
 - [Forum](https://demo.covenantsql.io/forum/)
-- <a href="https://twitter.com/intent/follow?screen_name=CovenantLabs">
-          <img src="https://img.shields.io/twitter/url/https/twitter.com/fold_left.svg?style=social&label=Follow%20%40CovenantLabs"
-              alt="follow on Twitter"></a>
-
-- [![Join the chat at https://gitter.im/CovenantSQL/CovenantSQL](https://badges.gitter.im/CovenantSQL/CovenantSQL.svg)](https://gitter.im/CovenantSQL/CovenantSQL?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+- <a href="https://twitter.com/intent/follow?screen_name=CovenantLabs"><img src="https://img.shields.io/twitter/url/https/twitter.com/fold_left.svg?style=social&label=Follow%20%40CovenantLabs" alt="follow on Twitter"></a>
diff --git a/alltest.sh b/alltest.sh
@@ -15,7 +15,7 @@ main() {
   # some benchmarks
   go test -tags "${UNITTESTTAGS:-}" -bench=^BenchmarkPersistentCaller_Call$ -run ^$ ./rpc/
   bash cleanupDB.sh || true
-  go test -tags "${UNITTESTTAGS:-}" -bench=^BenchmarkMinerTwo$ -benchtime=5s -run ^$ ./cmd/cql-minerd/
+  go test -tags "${UNITTESTTAGS:-}" -bench=^BenchmarkMiner$ -benchtime=5s -run ^$ ./cmd/cql-minerd/ -bench-miner-count=2
   bash cleanupDB.sh || true
 }
 

diff --git a/bin/docker-entry.sh b/bin/docker-entry.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-echo nameserver 114.114.114.114 > /etc/resolv.conf
+# echo nameserver 114.114.114.114 > /etc/resolv.conf
 
 [ -s "${COVENANT_ALERT}" ] && [ -x "${COVENANT_ALERT}" ] && (eval "${COVENANT_ALERT}")
 
@@ -12,16 +12,16 @@ blockproducer)
     exec /app/cqld -config "${COVENANT_CONF}" -metric-web "${METRIC_WEB_ADDR}" "${@}"
     ;;
 observer)
-    exec /app/cql -config "${COVENANT_CONF}" -web "${COVENANTSQL_OBSERVER_ADDR}" "${@}"
+    exec /app/cql web -config "${COVENANT_CONF}" -no-password "${COVENANTSQL_OBSERVER_ADDR}" "${@}"
     ;;
 adapter)
-    exec /app/cql -config "${COVENANT_CONF}" -adapter "${COVENANTSQL_ADAPTER_ADDR}" "${@}"
+    exec /app/cql adapter -config "${COVENANT_CONF}" -no-password "${COVENANTSQL_ADAPTER_ADDR}" "${@}"
     ;;
 mysql-adapter)
     exec /app/cql-mysql-adapter -config "${COVENANT_CONF}" "${@}"
     ;;
 cli)
-    exec /app/cql -config ${COVENANT_CONF} "${@}"
+    exec /app/cql console -config ${COVENANT_CONF} -no-password "${@}"
     ;;
 faucet)
     exec /app/cql-faucet -config ${COVENANT_CONF} "${@}"

diff --git a/blockproducer/metastate.go b/blockproducer/metastate.go
@@ -810,13 +810,6 @@ func (s *metaState) updatePermission(tx *types.UpdatePermission) (err error) {
 		}).WithError(ErrDatabaseNotFound).Error("unexpected error in updatePermission")
 		return ErrDatabaseNotFound
 	}
-	if !tx.Permission.IsValid() {
-		log.WithFields(log.Fields{
-			"permission": tx.Permission,
-			"dbID":       tx.TargetSQLChain.DatabaseID(),
-		}).WithError(ErrInvalidPermission).Error("unexpected error in updatePermission")
-		return ErrInvalidPermission
-	}
 
 	// check whether sender has super privilege and find targetUser
 	numOfSuperUsers := 0

diff --git a/blockproducer/metastate_test.go b/blockproducer/metastate_test.go
@@ -1016,10 +1016,11 @@ func TestMetaState(t *testing.T) {
 				err = up.Sign(privKey1)
 				So(err, ShouldBeNil)
 				err = ms.apply(&up)
-				So(errors.Cause(err), ShouldEqual, ErrInvalidPermission)
+				So(err, ShouldBeNil)
 				// test permission update
 				// addr1(admin) update addr3 as admin
 				up.TargetUser = addr3
+				up.Nonce++
 				up.Permission = types.UserPermissionFromRole(types.Admin)
 				err = up.Sign(privKey1)
 				So(err, ShouldBeNil)
@@ -1052,7 +1053,7 @@ func TestMetaState(t *testing.T) {
 				err = ms.apply(&up)
 				So(errors.Cause(err), ShouldEqual, ErrNoSuperUserLeft)
 				// addr1(read) update addr3(admin) fail
-				up.Nonce = cd1.Nonce + 2
+				up.Nonce = cd1.Nonce + 3
 				err = up.Sign(privKey1)
 				So(err, ShouldBeNil)
 				err = ms.apply(&up)
@@ -1296,7 +1297,7 @@ func TestMetaState(t *testing.T) {
 					invalidIk3 := &types.IssueKeys{
 						IssueKeysHeader: types.IssueKeysHeader{
 							TargetSQLChain: dbAccount,
-							Nonce:          3,
+							Nonce:          4,
 						},
 					}
 					err = invalidIk3.Sign(privKey1)

diff --git a/cleanupDB.sh b/cleanupDB.sh
@@ -6,6 +6,6 @@ cd ${PROJECT_DIR} && find . -name '*.db' -exec rm -vf {} \;
 cd ${PROJECT_DIR} && find . -name '*.db-shm' -exec rm -vf {} \;
 cd ${PROJECT_DIR} && find . -name '*.db-wal' -exec rm -vf {} \;
 cd ${PROJECT_DIR} && find . -name 'db.meta' -exec rm -vf {} \;
-cd ${PROJECT_DIR} && find . -name 'public.keystore' -exec rm -vf {} \;
-cd ${PROJECT_DIR} && find . -name '*.public.keystore' -exec rm -vf {} \;
+cd ${PROJECT_DIR} && find . -name 'public.keystore*' -exec rm -vf {} \;
+cd ${PROJECT_DIR} && find . -name '*.public.keystore*' -exec rm -vf {} \;
 cd ${PROJECT_DIR} && find . -type d -name '*.ldb' -prune -exec rm -vrf {} \;
diff --git a/client/README-zh.md b/client/README-zh.md
@@ -6,7 +6,7 @@
 
 ```bash
 $ go get github.com/CovenantSQL/CovenantSQL/client
-$ go get github.com/CovenantSQL/CovenantSQL/cmd/cql-utils
+$ go get github.com/CovenantSQL/CovenantSQL/cmd/cql
 ```
 
 然后在你的 go 代码中 import 第一个 `client` 包。
@@ -18,14 +18,14 @@ $ go get github.com/CovenantSQL/CovenantSQL/cmd/cql-utils
 
 ### 生成默认的配置文件
 
-运行以下 `cql-utils` 命令，输入 master key（类似密码）来生成本地密钥对。等待几十秒，会在 `conf` 文件夹中，生成一个私钥文件和一个名为 `config.yaml` 的配置文件。
+运行以下 `cql` 命令，输入 master key（类似密码）来生成本地密钥对。等待几十秒，会在 `~/.cql` 文件夹中，生成一个私钥文件和一个名为 `config.yaml` 的配置文件。
 
 ```bash
-$ cql-utils -tool confgen -root conf
+$ cql generate config
 Generating key pair...
 Enter master key(press Enter for default: ""):
 ⏎
-Private key file: conf/private.key
+Private key file: ~/.cql/private.key
 Public key's hex: 025abec9b0072615170f4acf4a2fa1162a13864bb66bc3f140b29f6bf50ceafc75
 Generated key pair.
 Generating nonce...
@@ -35,7 +35,7 @@ nonce: {{1450338416 0 0 0} 26 0000002dd8bdb50ba0270642e4c4bc593c1630ef7784653f31
 node id: 0000002dd8bdb50ba0270642e4c4bc593c1630ef7784653f311b3c3d6374e514
 Generated nonce.
 Generating config file...
-Generated nonce.
+Generated config.
 ```
 
 有了配置文件之后，可以通过以下 go 代码来初始化 CovenantSQL 客户端：
@@ -100,4 +100,4 @@ dsn, err = client.Create(meta)
 
 ### 完整示例
 
-在以下目录中有一个简单示例和复杂示例可以参考 [示例](https://github.com/CovenantSQL/CovenantSQL/tree/develop/client/_example)
+在以下目录中有一个简单示例和复杂示例可以参考 [示例](https://github.com/CovenantSQL/CovenantSQL/tree/develop/client/_example)
diff --git a/client/README.md b/client/README.md
@@ -6,7 +6,7 @@ Make sure that `$GOPATH/bin` is in your `$PATH`
 
 ```bash
 $ go get github.com/CovenantSQL/CovenantSQL/client
-$ go get github.com/CovenantSQL/CovenantSQL/cmd/cql-utils
+$ go get github.com/CovenantSQL/CovenantSQL/cmd/cql
 ```
 
 and import `client` package if you want to use it in your code.
@@ -18,14 +18,14 @@ You need to provide a config and a master key for initialization. The master key
 
 ### Generating Default Config File
 
-Run `cql-utils` like below. Enter a master key (like a password) for generating local key pair. After that, it may take a few seconds with a private key file and config.yaml file generated in `conf` folder.
+Run `cql` like below. Enter a master key (like a password) for generating local key pair. After that, it may take a few seconds with a private key file and config.yaml file generated in `~/.cql/` folder.
 
 ```bash
-$ cql-utils -tool confgen -root conf
+$ cql generate config
 Generating key pair...
 Enter master key(press Enter for default: ""):
 ⏎
-Private key file: conf/private.key
+Private key file: ~/.cql/private.key
 Public key's hex: 025abec9b0072615170f4acf4a2fa1162a13864bb66bc3f140b29f6bf50ceafc75
 Generated key pair.
 Generating nonce...
@@ -35,7 +35,7 @@ nonce: {{1450338416 0 0 0} 26 0000002dd8bdb50ba0270642e4c4bc593c1630ef7784653f31
 node id: 0000002dd8bdb50ba0270642e4c4bc593c1630ef7784653f311b3c3d6374e514
 Generated nonce.
 Generating config file...
-Generated nonce.
+Generated config.
 ```
 
 After you prepare your master key and config file, CovenantSQL client can be initialized by: