CovenantSQL · auxten · Mar 6, 2019 · Feb 26, 2019 · Feb 26, 2019 · Feb 26, 2019
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -1,10 +1,20 @@
 image: covenantsql/build
 
+stages:
+  - build
+  - test
+  - cleanup
+
 variables:
   REVIEWDOG_VERSION: 0.9.11
   REVIEWDOG_GITLAB_API_TOKEN: $REVIEWDOG_TOKEN
   CODECOV_TOKEN: $CODECOV_TOKEN
   UNITTESTTAGS: linux sqlite_omit_load_extension
+  CACHE_DIR: /CovenantSQL_bins
+  PIPELINE_CACHE: $CACHE_DIR/$CI_PIPELINE_IID
+  BIN_CACHE: $CACHE_DIR/$CI_PIPELINE_IID/bin
+  PREV_VERSION: v0.4.0
+  # gitlabci bins: 192.168.2.100:/srv/gitlab-runner/config/CovenantSQL_bins
 
 before_script:
   # Setup dependency management tool
@@ -23,12 +33,23 @@ before_script:
   - ulimit -n 8192
 #  - curl -fSL https://github.com/haya14busa/reviewdog/releases/download/$REVIEWDOG_VERSION/reviewdog_linux_amd64 -o ~/bin/reviewdog && chmod +x ~/bin/reviewdog
 
-test-my-project:
+build:
+  stage: build
+  script:
+    - set -x
+    - make clean
+    - make use_all_cores
+    - mkdir -p ${BIN_CACHE}
+    - cp bin/* ${BIN_CACHE}/
+
+unit-test:
   stage: test
   script: 
+    - make clean
+    - cp ${BIN_CACHE}/* bin/
     - ./alltest.sh
 
-compatibility-testnet:
+testnet-compatibility:
   stage: test
   script:
     - set -o errexit
@@ -37,7 +58,43 @@ compatibility-testnet:
     - branch=$(git branch -rv |grep $commit | awk '{print $1}')
     - if [[ $branch =~ "/beta_" ]]; then exit 0; fi
     - make clean
-    - make -j8 client
+    - cp ${BIN_CACHE}/* bin/
     - go test -tags "$UNITTESTTAGS" -bench=^BenchmarkTestnetMiner2$ -benchtime=5s -run ^$ ./cmd/cql-minerd/
     - set -x
     - ./test/testnet_client/run.sh
+
+old-client-compatibility:
+  stage: test
+  script:
+    - set -o errexit
+    - set -o pipefail
+    - set -x
+    - make clean
+    - cp ${BIN_CACHE}/* bin/
+    - ./test/compatibility/specific_old.sh client
+
+old-bp-compatibility:
+  stage: test
+  script:
+    - set -o errexit
+    - set -o pipefail
+    - set -x
+    - make clean
+    - cp ${BIN_CACHE}/* bin/
+    - ./test/compatibility/specific_old.sh bp
+
+old-miner-compatibility:
+  stage: test
+  script:
+    - set -o errexit
+    - set -o pipefail
+    - set -x
+    - make clean
+    - cp ${BIN_CACHE}/* bin/
+    - ./test/compatibility/specific_old.sh miner
+
+cleanup_cache:
+  stage: cleanup
+  script:
+    - rm -r ${PIPELINE_CACHE}
+  when: on_success
diff --git a/.travis.yml b/.travis.yml
@@ -7,7 +7,7 @@ env:
     - REVIEWDOG_VERSION=0.9.11
 language: go
 go:
-  - '1.10.x'
+  - '1.11.x'
 
 os:
   - linux

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,30 @@
 # Changelog
 
+## [v0.4.0](https://github.com/CovenantSQL/CovenantSQL/tree/v0.4.0) (2019-02-25)
+
+[Full Changelog](https://github.com/CovenantSQL/CovenantSQL/compare/v0.3.0...v0.4.0)
+
+**Merged pull requests:**
+
+- Use minimum assertion instead of exact version [\#265](https://github.com/CovenantSQL/CovenantSQL/pull/265) ([leventeliu](https://github.com/leventeliu))
+- Promote beta branch [\#264](https://github.com/CovenantSQL/CovenantSQL/pull/264) ([leventeliu](https://github.com/leventeliu))
+- Add imports format script and format all codes [\#263](https://github.com/CovenantSQL/CovenantSQL/pull/263) ([leventeliu](https://github.com/leventeliu))
+- Add listen flag for adapter [\#262](https://github.com/CovenantSQL/CovenantSQL/pull/262) ([auxten](https://github.com/auxten))
+- Use rpc broadcast for dht node info synchronization instead of kayak [\#261](https://github.com/CovenantSQL/CovenantSQL/pull/261) ([xq262144](https://github.com/xq262144))
+- Merge observer and explorer into cql [\#260](https://github.com/CovenantSQL/CovenantSQL/pull/260) ([auxten](https://github.com/auxten))
+-  Add transaction hash as return value in create/drop [\#259](https://github.com/CovenantSQL/CovenantSQL/pull/259) ([leventeliu](https://github.com/leventeliu))
+- Combine createRandomBlock functions into one. [\#258](https://github.com/CovenantSQL/CovenantSQL/pull/258) ([laodouya](https://github.com/laodouya))
+- Improve unit test cover ratio [\#257](https://github.com/CovenantSQL/CovenantSQL/pull/257) ([laodouya](https://github.com/laodouya))
+- Refactor observer synchronization to pull mode [\#256](https://github.com/CovenantSQL/CovenantSQL/pull/256) ([xq262144](https://github.com/xq262144))
+- Refactor observer synchronization to pull mode [\#255](https://github.com/CovenantSQL/CovenantSQL/pull/255) ([xq262144](https://github.com/xq262144))
+- Fix SQLChain forks [\#254](https://github.com/CovenantSQL/CovenantSQL/pull/254) ([xq262144](https://github.com/xq262144))
+- Update beta with develop updates [\#253](https://github.com/CovenantSQL/CovenantSQL/pull/253) ([xq262144](https://github.com/xq262144))
+- Improve unit test cover ratio. [\#251](https://github.com/CovenantSQL/CovenantSQL/pull/251) ([laodouya](https://github.com/laodouya))
+- Add blocks cache limit for block producers [\#249](https://github.com/CovenantSQL/CovenantSQL/pull/249) ([leventeliu](https://github.com/leventeliu))
+- Support pprof http handler in BlockProducer [\#248](https://github.com/CovenantSQL/CovenantSQL/pull/248) ([xq262144](https://github.com/xq262144))
+- Unit all docker client config to same private.key [\#247](https://github.com/CovenantSQL/CovenantSQL/pull/247) ([laodouya](https://github.com/laodouya))
+- Make observer API writeTimeout = 10 \* readTimeout [\#246](https://github.com/CovenantSQL/CovenantSQL/pull/246) ([auxten](https://github.com/auxten))
+
 ## [v0.3.0](https://github.com/CovenantSQL/CovenantSQL/tree/v0.3.0) (2019-01-30)
 
 [Full Changelog](https://github.com/CovenantSQL/CovenantSQL/compare/v0.2.0...v0.3.0)

diff --git a/Makefile b/Makefile
@@ -17,7 +17,6 @@ use_all_cores:
 
 BUILDER := covenantsql/covenantsql-builder
 IMAGE := covenantsql/covenantsql
-OB_IMAGE := covenantsql/covenantsql-observer
 
 GIT_COMMIT ?= $(shell git rev-parse --short HEAD)
 GIT_DIRTY ?= $(shell test -n "`git status --porcelain`" && echo "+CHANGES" || true)
@@ -41,7 +40,7 @@ builder: status
 		-f docker/builder.Dockerfile \
 		.
 
-runner: builder
+docker: builder
 	docker build \
 		--tag $(IMAGE):$(VERSION) \
 		--tag $(IMAGE):latest \
@@ -50,24 +49,11 @@ runner: builder
 		-f docker/Dockerfile \
 		.
 
-observer_docker: builder
-	docker build \
-		--tag $(OB_IMAGE):$(VERSION) \
-		--tag $(OB_IMAGE):latest \
-		--build-arg COMMIT=$(COMMIT) \
-		--build-arg VERSION=$(VERSION) \
-		-f docker/observer.Dockerfile \
-		.
-
-docker: runner observer_docker
-
 docker_clean: status
 	docker rmi -f $(BUILDER):latest
 	docker rmi -f $(IMAGE):latest
-	docker rmi -f $(OB_IMAGE):latest
 	docker rmi -f $(BUILDER):$(VERSION)
 	docker rmi -f $(IMAGE):$(VERSION)
-	docker rmi -f $(OB_IMAGE):$(VERSION)
 
 
 save: status
@@ -89,27 +75,19 @@ logs:
 	docker-compose logs -f --tail=10
 
 push_testnet:
-	docker tag $(OB_IMAGE):$(VERSION) $(OB_IMAGE):testnet
-	docker push $(OB_IMAGE):testnet
 	docker tag $(IMAGE):$(VERSION) $(IMAGE):testnet
 	docker push $(IMAGE):testnet
 
 push_bench:
-	docker tag $(OB_IMAGE):$(VERSION) $(OB_IMAGE):bench
-	docker push $(OB_IMAGE):bench
 	docker tag $(IMAGE):$(VERSION) $(IMAGE):bench
 	docker push $(IMAGE):bench
 
 push_staging:
-	docker tag $(OB_IMAGE):$(VERSION) $(OB_IMAGE):staging
-	docker push $(OB_IMAGE):staging
 	docker tag $(IMAGE):$(VERSION) $(IMAGE):staging
 	docker push $(IMAGE):staging
 
 
 push:
-	docker push $(OB_IMAGE):$(VERSION)
-	docker push $(OB_IMAGE):latest
 	docker push $(IMAGE):$(VERSION)
 	docker push $(IMAGE):latest
 
@@ -162,18 +140,6 @@ bin/cql-minerd:
 		-o bin/cql-minerd \
 		github.com/CovenantSQL/CovenantSQL/cmd/cql-minerd
 
-bin/cql-observer.test:
-	$(GOTEST) \
-		-ldflags "$(ldflags_role_client)" \
-		-o bin/cql-observer.test \
-		github.com/CovenantSQL/CovenantSQL/cmd/cql-observer
-
-bin/cql-observer:
-	$(GOBUILD) \
-		-ldflags "$(ldflags_role_client)" \
-		-o bin/cql-observer \
-		github.com/CovenantSQL/CovenantSQL/cmd/cql-observer
-
 bin/cql-utils:
 	$(GOBUILD) \
 		-ldflags "$(ldflags_role_client_simple_log)" \
@@ -186,18 +152,19 @@ bin/cql:
 		-o bin/cql \
 		github.com/CovenantSQL/CovenantSQL/cmd/cql
 
+bin/cql.test:
+	$(GOTEST) \
+		-ldflags "$(ldflags_role_client)" \
+		-o bin/cql.test \
+		github.com/CovenantSQL/CovenantSQL/cmd/cql
+
+
 bin/cql-fuse:
 	$(GOBUILD) \
 		-ldflags "$(ldflags_role_client_simple_log)" \
 		-o bin/cql-fuse \
 		github.com/CovenantSQL/CovenantSQL/cmd/cql-fuse
 
-bin/cql-adapter:
-	$(GOBUILD) \
-		-ldflags "$(ldflags_role_client)" \
-		-o bin/cql-adapter \
-		github.com/CovenantSQL/CovenantSQL/cmd/cql-adapter
-
 bin/cql-mysql-adapter:
 	$(GOBUILD) \
 		-ldflags "$(ldflags_role_client)" \
@@ -210,27 +177,19 @@ bin/cql-faucet:
 		-o bin/cql-faucet \
 		github.com/CovenantSQL/CovenantSQL/cmd/cql-faucet
 
-bin/cql-explorer:
-	$(GOBUILD) \
-		-ldflags "$(ldflags_role_client)" \
-		-o bin/cql-explorer \
-		github.com/CovenantSQL/CovenantSQL/cmd/cql-explorer
-
 bp: bin/cqld.test bin/cqld
 
 miner: bin/cql-minerd.test bin/cql-minerd
 
-observer: bin/cql-observer.test bin/cql-observer
-
-client: bin/cql-utils bin/cql bin/cql-fuse bin/cql-adapter bin/cql-mysql-adapter bin/cql-faucet bin/cql-explorer
+client: bin/cql-utils bin/cql bin/cql.test bin/cql-fuse bin/cql-mysql-adapter bin/cql-faucet
 
-all: bp miner observer client
+all: bp miner client
 
 clean:
 	rm -rf bin/cql*
 	rm -f *.cover.out
 	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/cql-observer bin/cql-observer.test \
-	bin/cql bin/cql-fuse bin/cql-adapter bin/cql-mysql-adapter bin/cql-faucet bin/cql-explorer
+	bin/cqld.test bin/cqld bin/cql-minerd.test bin/cql-minerd bin/cql-utils \
+	bin/cql bin/cql.test bin/cql-fuse bin/cql-mysql-adapter bin/cql-faucet
diff --git a/README.md b/README.md
@@ -28,8 +28,9 @@
 
 [中文简介](https://github.com/CovenantSQL/CovenantSQL/blob/develop/README-zh.md)
 
-CovenantSQL is a decentralized, crowdsourcing SQL database on blockchain with features:
+CovenantSQL is a GDPR-compliant SQL database running on Open Internet without central coordination:
 
+- **GDPR-compliant**: Zero pain to be GDPR-compliant.
 - **SQL**: most SQL-92 support.
 - **Decentralize**: decentralize with our consensus algorithm DH-RPC & Kayak.
 - **Privacy**: access with granted permission and Encryption Pass.
@@ -107,10 +108,14 @@ Watch us or [![follow on Twitter](https://img.shields.io/twitter/url/https/twitt
 ## TestNet
 
 - [Quick Start](https://developers.covenantsql.io)
+- [MainChain Explorer](http://scan.covenantsql.io)
+- [SQLChain Explorer](https://explorer.dbhub.org)
+- [Demo & Forum](https://demo.covenantsql.io/forum/)
 
 ## Contact
 
-- [mail us](mailto:[email protected])
+- [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>

diff --git a/alltest.sh b/alltest.sh
@@ -5,9 +5,6 @@ set -o pipefail
 set -o nounset
 
 main() {
-  make clean
-  make -j6 bp miner observer
-
   go test -tags "$UNITTESTTAGS" -race -failfast -parallel 16 -cpu 16 -coverprofile main.cover.out $(go list ./... | grep -v CovenantSQL/api)
   go test -tags "$UNITTESTTAGS" -race -failfast -parallel 16 -cpu 16 -coverpkg ./api/...,./rpc/jsonrpc -coverprofile api.cover.out ./api/...
 

diff --git a/bin/docker-entry.sh b/bin/docker-entry.sh
@@ -12,12 +12,10 @@ blockproducer)
     exec /app/cqld -config "${COVENANT_CONF}" -metric-web "${METRIC_WEB_ADDR}" "${@}"
     ;;
 observer)
-    MAGIC_DOLLAR='$' envsubst < /etc/nginx/conf.d/servers/explorer.conf.template > /etc/nginx/conf.d/default.conf
-    nginx -g 'daemon off;' </dev/null &
-    exec /app/cql-observer -config "${COVENANT_CONF}" -listen "${COVENANTSQL_OBSERVER_ADDR}"
+    exec /app/cql -config "${COVENANT_CONF}" -web "${COVENANTSQL_OBSERVER_ADDR}" "${@}"
     ;;
 adapter)
-    exec /app/cql-adapter -config "${COVENANT_CONF}" "${@}"
+    exec /app/cql -config "${COVENANT_CONF}" -adapter "${COVENANTSQL_ADAPTER_ADDR}" "${@}"
     ;;
 mysql-adapter)
     exec /app/cql-mysql-adapter -config "${COVENANT_CONF}" "${@}"
@@ -28,8 +26,5 @@ cli)
 faucet)
     exec /app/cql-faucet -config ${COVENANT_CONF} "${@}"
     ;;
-explorer)
-    exec /app/cql-explorer -config ${COVENANT_CONF} "${@}"
-    ;;
 esac