Skip to content

Commit 47ec19b

Browse files
leventeliuleventeliu
committed
Merge remote-tracking branch 'origin/develop' into feature/rpc_improve
2 parents 9e42626 + 5c4f71d commit 47ec19b

File tree

561 files changed

+4977
-54661
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

561 files changed

+4977
-54661
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
title: "[BUG]"
5+
labels: bug
6+
assignees: ''
7+
8+
---
9+
10+
**Describe the bug**
11+
A clear and concise description of what the bug is.
12+
13+
**To Reproduce**
14+
Commands to reproduce the behavior:
15+
1. cd to '...'
16+
2. run 'cql ...'
17+
3. See error
18+
19+
**Expected behavior**
20+
A clear and concise description of what you expected to happen.
21+
22+
**Screenshots**
23+
If applicable, add screenshots to help explain your problem.
24+
25+
**Desktop (please complete the following information):**
26+
- OS: [e.g. Linux/MacOS]
27+
- Docker [e.g. chrome, safari]
28+
- Go Version [e.g. 22]
29+
- Cql Version
30+
31+
**Config**
32+
- Your cql config, Typically "~/.cql/config.yaml"
33+
34+
**Additional context**
35+
Add any other context about the problem here.

‎.github/ISSUE_TEMPLATE/feature_request.md‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this project
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
**Is your feature request related to a problem? Please describe.**
11+
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
12+
13+
**Describe the solution you'd like**
14+
A clear and concise description of what you want to happen.
15+
16+
**Describe alternatives you've considered**
17+
A clear and concise description of any alternative solutions or features you've considered.
18+
19+
**Additional context**
20+
Add any other context or screenshots about the feature request here.

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ idminer
1010
coverage.txt
1111
analysisVendor.png
1212
vendor/**/.gitignore
13-
*.keystore
13+
*.keystore*
1414
node_*/
1515
kayak_test
1616
*.conf

‎.gitlab-ci.yml‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ variables:
1313
CACHE_DIR: /CovenantSQL_bins
1414
PIPELINE_CACHE: $CACHE_DIR/$CI_PIPELINE_IID
1515
BIN_CACHE: $CACHE_DIR/$CI_PIPELINE_IID/bin
16-
PREV_VERSION: v0.4.0
16+
PREV_VERSION: v0.5.0
1717
# gitlabci bins: 192.168.2.100:/srv/gitlab-runner/config/CovenantSQL_bins
1818

1919
before_script:
@@ -69,6 +69,9 @@ old-client-compatibility:
6969
- set -o errexit
7070
- set -o pipefail
7171
- set -x
72+
- commit=$(git rev-parse --short HEAD)
73+
- branch=$(git branch -rv |grep $commit | awk '{print $1}')
74+
- if [[ $branch =~ "/beta_" ]]; then exit 0; fi
7275
- make clean
7376
- cp ${BIN_CACHE}/* bin/
7477
- ./test/compatibility/specific_old.sh client
@@ -79,6 +82,9 @@ old-bp-compatibility:
7982
- set -o errexit
8083
- set -o pipefail
8184
- set -x
85+
- commit=$(git rev-parse --short HEAD)
86+
- branch=$(git branch -rv |grep $commit | awk '{print $1}')
87+
- if [[ $branch =~ "/beta_" ]]; then exit 0; fi
8288
- make clean
8389
- cp ${BIN_CACHE}/* bin/
8490
- ./test/compatibility/specific_old.sh bp
@@ -89,6 +95,9 @@ old-miner-compatibility:
8995
- set -o errexit
9096
- set -o pipefail
9197
- set -x
98+
- commit=$(git rev-parse --short HEAD)
99+
- branch=$(git branch -rv |grep $commit | awk '{print $1}')
100+
- if [[ $branch =~ "/beta_" ]]; then exit 0; fi
92101
- make clean
93102
- cp ${BIN_CACHE}/* bin/
94103
- ./test/compatibility/specific_old.sh miner

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ before_deploy:
3737
- make clean
3838
- make use_all_cores
3939
- mkdir -p build
40-
- 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
40+
- tar czvf build/CovenantSQL-$TRAVIS_TAG.$TRAVIS_OS_NAME-amd64.tar.gz bin/cql bin/cql-fuse bin/cql-minerd bin/cql-mysql-adapter
4141

4242
deploy:
4343
provider: releases

‎CHANGELOG.md‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,46 @@
11
# Changelog
22

3+
## [v0.5.0](https://github.com/CovenantSQL/CovenantSQL/tree/v0.5.0) (2019-03-28)
4+
5+
[Full Changelog](https://github.com/CovenantSQL/CovenantSQL/compare/v0.4.0...v0.5.0)
6+
7+
**Closed issues:**
8+
9+
- 生成的钱包地址无效 [\#282](https://github.com/CovenantSQL/CovenantSQL/issues/282)
10+
- I have developed an Excel add-in for this project [\#281](https://github.com/CovenantSQL/CovenantSQL/issues/281)
11+
- get stable coin balance failed [\#245](https://github.com/CovenantSQL/CovenantSQL/issues/245)
12+
- cql cannot parse covenantsql url with params [\#148](https://github.com/CovenantSQL/CovenantSQL/issues/148)
13+
- Error with fio test on cql-fuse [\#123](https://github.com/CovenantSQL/CovenantSQL/issues/123)
14+
- testnet.covenantsql.io上facebook发完有检测不到的情况 [\#107](https://github.com/CovenantSQL/CovenantSQL/issues/107)
15+
- Master key should not be input with env or args [\#106](https://github.com/CovenantSQL/CovenantSQL/issues/106)
16+
17+
**Merged pull requests:**
18+
19+
- Support version upgrade in update billing tx header [\#299](https://github.com/CovenantSQL/CovenantSQL/pull/299) ([xq262144](https://github.com/xq262144))
20+
- Promote beta branch [\#298](https://github.com/CovenantSQL/CovenantSQL/pull/298) ([leventeliu](https://github.com/leventeliu))
21+
- Revert a transaction type removal [\#297](https://github.com/CovenantSQL/CovenantSQL/pull/297) ([leventeliu](https://github.com/leventeliu))
22+
- Merge beta upstream [\#296](https://github.com/CovenantSQL/CovenantSQL/pull/296) ([leventeliu](https://github.com/leventeliu))
23+
- Reduce meta key length using byte version database id [\#294](https://github.com/CovenantSQL/CovenantSQL/pull/294) ([xq262144](https://github.com/xq262144))
24+
- Move all cql-utils functions to cql command [\#291](https://github.com/CovenantSQL/CovenantSQL/pull/291) ([laodouya](https://github.com/laodouya))
25+
- Simplify cql config and use IPv6 for bootstrap [\#290](https://github.com/CovenantSQL/CovenantSQL/pull/290) ([auxten](https://github.com/auxten))
26+
- Use a global leveldb instance for multiple chains [\#289](https://github.com/CovenantSQL/CovenantSQL/pull/289) ([leventeliu](https://github.com/leventeliu))
27+
- Support read-only local mirror [\#288](https://github.com/CovenantSQL/CovenantSQL/pull/288) ([xq262144](https://github.com/xq262144))
28+
- Use sqlite for dht key store [\#287](https://github.com/CovenantSQL/CovenantSQL/pull/287) ([xq262144](https://github.com/xq262144))
29+
- Refactor faucet for new testnet logic [\#286](https://github.com/CovenantSQL/CovenantSQL/pull/286) ([xq262144](https://github.com/xq262144))
30+
- Refactor benchmark codes and scripts [\#285](https://github.com/CovenantSQL/CovenantSQL/pull/285) ([leventeliu](https://github.com/leventeliu))
31+
- Refactor cql command [\#284](https://github.com/CovenantSQL/CovenantSQL/pull/284) ([laodouya](https://github.com/laodouya))
32+
- Support content-type header in cors [\#280](https://github.com/CovenantSQL/CovenantSQL/pull/280) ([xq262144](https://github.com/xq262144))
33+
- Add end to end decrypt encrypt func [\#279](https://github.com/CovenantSQL/CovenantSQL/pull/279) ([auxten](https://github.com/auxten))
34+
- Trim release pkg [\#278](https://github.com/CovenantSQL/CovenantSQL/pull/278) ([auxten](https://github.com/auxten))
35+
- Use host default name server in docker [\#276](https://github.com/CovenantSQL/CovenantSQL/pull/276) ([auxten](https://github.com/auxten))
36+
- Skip empty block producing and add read queries [\#275](https://github.com/CovenantSQL/CovenantSQL/pull/275) ([leventeliu](https://github.com/leventeliu))
37+
- Update beta branch [\#274](https://github.com/CovenantSQL/CovenantSQL/pull/274) ([leventeliu](https://github.com/leventeliu))
38+
- Combine cql-adapter command into cql command. [\#273](https://github.com/CovenantSQL/CovenantSQL/pull/273) ([laodouya](https://github.com/laodouya))
39+
- Add http log level switcher for debug purpose [\#272](https://github.com/CovenantSQL/CovenantSQL/pull/272) ([xq262144](https://github.com/xq262144))
40+
- Fix isolation level auto rollback bug [\#271](https://github.com/CovenantSQL/CovenantSQL/pull/271) ([xq262144](https://github.com/xq262144))
41+
- Fix transaction directives, add commit to query sanitizer ignore list [\#270](https://github.com/CovenantSQL/CovenantSQL/pull/270) ([xq262144](https://github.com/xq262144))
42+
- Add previous version compatibility test [\#269](https://github.com/CovenantSQL/CovenantSQL/pull/269) ([laodouya](https://github.com/laodouya))
43+
344
## [v0.4.0](https://github.com/CovenantSQL/CovenantSQL/tree/v0.4.0) (2019-02-25)
445

546
[Full Changelog](https://github.com/CovenantSQL/CovenantSQL/compare/v0.3.0...v0.4.0)

‎Gopkg.lock‎

Lines changed: 11 additions & 47 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Gopkg.toml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,3 +89,7 @@
8989
[[constraint]]
9090
name = "github.com/rakyll/statik"
9191
version = "0.1.5"
92+
93+
[[constraint]]
94+
branch = "master"
95+
name = "github.com/CovenantSQL/beacon"

‎Makefile‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -140,12 +140,6 @@ bin/cql-minerd:
140140
-o bin/cql-minerd \
141141
github.com/CovenantSQL/CovenantSQL/cmd/cql-minerd
142142

143-
bin/cql-utils:
144-
$(GOBUILD) \
145-
-ldflags "$(ldflags_role_client_simple_log)" \
146-
-o bin/cql-utils \
147-
github.com/CovenantSQL/CovenantSQL/cmd/cql-utils
148-
149143
bin/cql:
150144
$(GOBUILD) \
151145
-ldflags "$(ldflags_role_client_simple_log)" \
@@ -181,7 +175,7 @@ bp: bin/cqld.test bin/cqld
181175

182176
miner: bin/cql-minerd.test bin/cql-minerd
183177

184-
client: bin/cql-utils bin/cql bin/cql.test bin/cql-fuse bin/cql-mysql-adapter bin/cql-faucet
178+
client: bin/cql bin/cql.test bin/cql-fuse bin/cql-mysql-adapter bin/cql-faucet
185179

186180
all: bp miner client
187181

@@ -191,5 +185,5 @@ clean:
191185
rm -f coverage.txt
192186

193187
.PHONY: status start stop logs push push_testnet clean \
194-
bin/cqld.test bin/cqld bin/cql-minerd.test bin/cql-minerd bin/cql-utils \
188+
bin/cqld.test bin/cqld bin/cql-minerd.test bin/cql-minerd \
195189
bin/cql bin/cql.test bin/cql-fuse bin/cql-mysql-adapter bin/cql-faucet

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ CovenantSQL is still under construction and Testnet is already released, [have a
110110

111111
- [Golang](client/)
112112
- [Java](https://github.com/CovenantSQL/covenant-connector)
113-
- [NodeJS](https://github.com/CovenantSQL/node-covenantsql)
113+
- [NodeJS](https://github.com/CovenantSQL/covenantsql-proxy-js)
114114
- [Python](https://github.com/CovenantSQL/python-driver)
115115
- Coding for more……
116116

0 commit comments

Comments
 (0)