Skip to content

Commit 5522e5e

Browse files
leventeliuleventeliu
committed
Merge remote-tracking branch 'origin/develop' into feature/bpRefactor
2 parents e34e9c9 + 6fcb7a2 commit 5522e5e

30 files changed

Lines changed: 171 additions & 27 deletions

File tree

‎.travis.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ before_script:
2828
- echo $TRAVIS_PULL_REQUEST_SHA
2929
- echo $TRAVIS_REPO_SLUG
3030
- echo $TRAVIS_SECURE_ENV_VARS
31+
- ulimit -n 8192
3132
script:
3233
- bash build.sh
3334
- go test -v -race -failfast -parallel 16 -cpu 16 $(go list ./... | grep -v "/vendor/") -coverprofile cover.out

‎CHANGELOG.md‎

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

3+
## [v0.0.6](https://github.com/CovenantSQL/CovenantSQL/tree/v0.0.6) (2018-12-18)
4+
5+
[Full Changelog](https://github.com/CovenantSQL/CovenantSQL/compare/v0.0.5...v0.0.6)
6+
7+
**Closed issues:**
8+
9+
- Could not run in docker based alpine image [\#134](https://github.com/CovenantSQL/CovenantSQL/issues/134)
10+
- Quickstart cli document 404 [\#97](https://github.com/CovenantSQL/CovenantSQL/issues/97)
11+
- Any plan to NodeJS support? [\#80](https://github.com/CovenantSQL/CovenantSQL/issues/80)
12+
13+
**Merged pull requests:**
14+
15+
- Add a Gitter chat badge to README.md [\#137](https://github.com/CovenantSQL/CovenantSQL/pull/137) ([gitter-badger](https://github.com/gitter-badger))
16+
- Add DSN options to enable SQL queries on follower nodes [\#136](https://github.com/CovenantSQL/CovenantSQL/pull/136) ([ggicci](https://github.com/ggicci))
17+
- If smux session dead, cancel the context passed to RPC through Envelope [\#133](https://github.com/CovenantSQL/CovenantSQL/pull/133) ([auxten](https://github.com/auxten))
18+
- Add new cloudflare.com DNSKEY [\#132](https://github.com/CovenantSQL/CovenantSQL/pull/132) ([auxten](https://github.com/auxten))
19+
- Prepare for auto bench in jenkins environment. [\#131](https://github.com/CovenantSQL/CovenantSQL/pull/131) ([laodouya](https://github.com/laodouya))
20+
321
## [v0.0.5](https://github.com/CovenantSQL/CovenantSQL/tree/v0.0.5) (2018-11-23)
422

523
[Full Changelog](https://github.com/CovenantSQL/CovenantSQL/compare/v0.0.4...v0.0.5)

‎README-zh.md‎

Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
1+
<p align="center">
2+
<img src="logo/covenantsql_horizontal.png"
3+
height="130">
4+
</p>
5+
<p align="center">
6+
<a href="https://goreportcard.com/report/github.com/CovenantSQL/CovenantSQL">
7+
<img src="https://goreportcard.com/badge/github.com/CovenantSQL/CovenantSQL?style=flat-square"
8+
alt="Go Report Card"></a>
9+
<a href="https://codecov.io/gh/CovenantSQL/CovenantSQL">
10+
<img src="https://codecov.io/gh/CovenantSQL/CovenantSQL/branch/develop/graph/badge.svg"
11+
alt="Coverage"></a>
12+
<a href="https://travis-ci.org/CovenantSQL/CovenantSQL">
13+
<img src="https://travis-ci.org/CovenantSQL/CovenantSQL.png?branch=develop"
14+
alt="Build Status"/></a>
15+
<a href="https://opensource.org/licenses/Apache-2.0">
16+
<img src="https://img.shields.io/badge/License-Apache%202.0-blue.svg"
17+
alt="License"></a>
18+
<a href="https://godoc.org/github.com/CovenantSQL/CovenantSQL">
19+
<img src="https://img.shields.io/badge/godoc-reference-blue.svg"
20+
alt="GoDoc"></a>
21+
<a href="https://twitter.com/intent/follow?screen_name=CovenantLabs">
22+
<img src="https://img.shields.io/twitter/url/https/twitter.com/fold_left.svg?style=social&label=Follow%20%40CovenantLabs"
23+
alt="follow on Twitter"></a>
24+
<a href="https://gitter.im/CovenantSQL/CovenantSQL?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge">
25+
<img src="https://badges.gitter.im/CovenantSQL/CovenantSQL.svg"
26+
alt="Join the chat at https://gitter.im/CovenantSQL/CovenantSQL"></a>
27+
</p>
28+
29+
30+
CovenantSQL 是一个基于区块链技术的去中心化众筹式 SQL 数据库，并具备以下特点：
31+
32+
- **SQL**: 支持 SQL-92 标准
33+
- **去中心化**: 基于独有的高效共识算法 DH-RPC 和 Kayak 实现的中心化
34+
- **隐私**: 通过加密和授权许可进行访问
35+
- **不可篡改**: CovenantSQL 中的查询历史记录是不可变且可跟踪的
36+
37+
我们相信[在下一个互联网时代，每个人都应该有完整的**数据权利**](https://medium.com/@covenant_labs/covenantsql-the-sql-database-on-blockchain-db027aaf1e0e)
38+
39+
#### 一行代码接入区块链数据
40+
```go
41+
sql.Open("CovenantSQL", dbURI)
42+
```
43+
44+
##
45+
46+
![CovenantSQL 3 Layer design](logo/arch.png)
47+
48+
- 第一层: **全局共识层**(主链，架构图中的中间环):
49+
- 整个网络中只有一个主链。
50+
- 主要负责数据库矿工与用户的合同匹配，交易结算，反作弊，子链哈希锁定等全局共识事宜。
51+
- 第二层: **SQL 共识层**(子链，架构图中的两边环):
52+
- 每个数据库都有自己独立的子链。
53+
- 主要负责数据库各种事务的签名，交付和一致性。这里主要实现永久可追溯性的数据历史，并且在主链中执行哈希锁定。
54+
- 第三层: **数据储存层**(支持 SQL-92 的数据库引擎):
55+
- 每个数据库都有自己独立的分布式引擎。
56+
- 主要负责：数据库存储和加密；查询处理和签名；高效索引。
57+
58+
## 文章
59+
团队成员发表过的论文
60+
61+
- [迅雷水晶：一种新颖的基于众筹的内容分发平台](https://dl.acm.org/citation.cfm?id=2736085)
62+
- [基于众筹的视频服务系统性能分析](https://ieeexplore.ieee.org/abstract/document/7114727/)
63+
- [迅雷水晶性能分析：基于众筹的视频分发平台](https://ieeexplore.ieee.org/abstract/document/7762143/)
64+
65+
这些启发了我们：
66+
67+
- [比特币：P2P电子现金系统](https://bitcoin.org/bitcoin.pdf)
68+
- [S/Kademlia](https://github.com/thunderdb/research/wiki/Secure-Kademlia)
69+
- [S/Kademlia: 一种针对密钥的实用方法](https://ieeexplore.ieee.org/document/4447808/)
70+
- [vSQL: 验证动态外包数据库上的任意SQL查询](https://ieeexplore.ieee.org/abstract/document/7958614/)
71+
72+
## Libs
73+
74+
### 网络栈
75+
76+
[DH-RPC](rpc/) := TLS - Cert + DHT
77+
78+
| 层 | 应用 |
79+
|:-------------------|:--------------:|
80+
| 远程调用协议 | `net/rpc` |
81+
| 寻址 | [**C**onsistent **S**ecure **DHT**](https://godoc.org/github.com/CovenantSQL/CovenantSQL/consistent) |
82+
| 会话池 | Session Pool |
83+
| 多路复用 | [smux](https://github.com/xtaci/smux) |
84+
| 传输安全 | [**E**nhanced **TLS**](https://github.com/CovenantSQL/research/wiki/ETLS(Enhanced-Transport-Layer-Security)) |
85+
| 网络 | TCP or KCP for optional later |
86+
87+
88+
#### 测试工具
89+
- [全球网络拓扑模拟器(GNTE)](https://github.com/CovenantSQL/GNTE) 用于网络模拟
90+
- [线性一致性测试](https://github.com/anishathalye/porcupine)
91+
92+
93+
#### 接口
94+
95+
CovenantSQL仍在建设中，测试网已经发布，[尝试一下](https://testnet.covenantsql.io/).
96+
97+
98+
- [Golang](client/)
99+
- [Java](https://github.com/CovenantSQL/covenant-connector)
100+
- [NodeJS](https://github.com/CovenantSQL/node-covenantsql)
101+
- [Python](https://github.com/CovenantSQL/python-driver)
102+
- Coding for more……
103+
104+
关注我们或[![follow on Twitter](https://img.shields.io/twitter/url/https/twitter.com/fold_left.svg?style=social&label=Follow%20%40CovenantLabs)](https://twitter.com/intent/follow?screen_name=CovenantLabs) 保持更新
105+
106+
## 测试网
107+
108+
- [快捷入口](https://testnet.covenantsql.io/quickstart)
109+
- [测试网水龙头](https://testnet.covenantsql.io/)
110+
111+
## 联系我们
112+
113+
- [邮箱地址](mailto:webmaster@covenantsql.io)
114+
- <a href="https://twitter.com/intent/follow?screen_name=CovenantLabs">
115+
<img src="https://img.shields.io/twitter/url/https/twitter.com/fold_left.svg?style=social&label=Follow%20%40CovenantLabs"
116+
alt="follow on Twitter"></a>
117+
118+
- [![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)

‎README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
alt="Join the chat at https://gitter.im/CovenantSQL/CovenantSQL"></a>
2727
</p>
2828

29+
[中文简介](https://github.com/CovenantSQL/CovenantSQL/blob/develop/README-zh.md)
2930

3031
CovenantSQL is a decentralized, crowdsourcing SQL database on blockchain with features:
3132

@@ -80,7 +81,7 @@ that inspired us:
8081
| RPC | `net/rpc` |
8182
| Naming | [**C**onsistent **S**ecure **DHT**](https://godoc.org/github.com/CovenantSQL/CovenantSQL/consistent) |
8283
| Pooling | Session Pool |
83-
| Multiplex | Yamux |
84+
| Multiplex | [smux](https://github.com/xtaci/smux) |
8485
| Transport Security | [**E**nhanced **TLS**](https://github.com/CovenantSQL/research/wiki/ETLS(Enhanced-Transport-Layer-Security)) |
8586
| Network | TCP or KCP for optional later |
8687

‎cmd/cql-adapter/config/config.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
"github.com/CovenantSQL/CovenantSQL/cmd/cql-adapter/storage"
3030
"github.com/CovenantSQL/CovenantSQL/conf"
3131
"github.com/CovenantSQL/CovenantSQL/utils/log"
32-
"gopkg.in/yaml.v2"
32+
yaml "gopkg.in/yaml.v2"
3333
)
3434

3535
var (

‎cmd/cql-adapter/storage/sqlite3.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import (
2424
"math/rand"
2525
"os"
2626
"path/filepath"
27+
2728
// Import sqlite3 manually.
2829
_ "github.com/CovenantSQL/go-sqlite3-encrypt"
2930
)

‎cmd/cql-faucet/config.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"time"
2222

2323
"github.com/CovenantSQL/CovenantSQL/utils/log"
24-
"gopkg.in/yaml.v2"
24+
yaml "gopkg.in/yaml.v2"
2525
)
2626

2727
// Config defines the configurable options for faucet application backend.

‎cmd/cql-faucet/persistence.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ import (
2525
"github.com/CovenantSQL/CovenantSQL/client"
2626
"github.com/CovenantSQL/CovenantSQL/conf"
2727
"github.com/CovenantSQL/CovenantSQL/utils/log"
28-
"github.com/satori/go.uuid"
28+
uuid "github.com/satori/go.uuid"
29+
2930
// Load sqlite3 database driver.
3031
_ "github.com/CovenantSQL/go-sqlite3-encrypt"
3132
)

‎cmd/cql-minerd/integration_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ import (
4141
"github.com/CovenantSQL/CovenantSQL/rpc"
4242
"github.com/CovenantSQL/CovenantSQL/utils"
4343
"github.com/CovenantSQL/CovenantSQL/utils/log"
44-
"github.com/CovenantSQL/go-sqlite3-encrypt"
44+
sqlite3 "github.com/CovenantSQL/go-sqlite3-encrypt"
4545
. "github.com/smartystreets/goconvey/convey"
4646
)
4747

‎cmd/cql-minerd/main.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import (
2626
"os"
2727
"os/signal"
2828
"runtime"
29+
2930
//"runtime/trace"
3031
"syscall"
3132
"time"
@@ -39,8 +40,8 @@ import (
3940
"github.com/CovenantSQL/CovenantSQL/utils"
4041
"github.com/CovenantSQL/CovenantSQL/utils/log"
4142
"github.com/CovenantSQL/CovenantSQL/worker"
42-
"github.com/cyberdelia/go-metrics-graphite"
43-
"github.com/rcrowley/go-metrics"
43+
graphite "github.com/cyberdelia/go-metrics-graphite"
44+
metrics "github.com/rcrowley/go-metrics"
4445
)
4546

4647
const logo = `

0 commit comments

Comments
 (0)