Skip to content

Commit

Permalink
Merge pull request #643 from ywy2090/dev
Browse files Browse the repository at this point in the history
sync code from master
  • Loading branch information
ywy2090 authored Jul 11, 2022
2 parents 7bba01e + c98af73 commit cdd10f3
Show file tree
Hide file tree
Showing 85 changed files with 4,747 additions and 3,282 deletions.
92 changes: 92 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,95 @@
## v3.0.0-rc4
(2022-7-1)

请阅读Java SDK v3.x+文档:

- [中文用户手册](https://fisco-bcos-doc.readthedocs.io/zh_CN/latest/docs/develop/sdk/java_sdk/index.html)

### 新增

* 新增Table CRUD的命令:`select`,`update`,`insert`,`remove`,`alter`
* 新增共识节点变更提案、系统配置变更提案、升级计算逻辑提案等的命令
* 新增冻结、解冻合约功能命令
* 获取提案命令支持批量获取

### 更新

* 升级`fisco-bcos-java-sdk``3.0.0-rc4`
* 升级`evm-static-analysis``1.0.0-rc2`

### 修复

* 修复非交互式控制台的调用问题
* 重构命令代码,将所有命令抽象成`BasicCategoryCommand`,实际分类可参考`./src/main/java/console/command/category`

### 兼容性说明

- 不兼容 FISCO BCOS 2.0+ 版本
- 兼容java-sdk v3.x的历史版本
- 支持[3.0.0-rc4](https://github.com/FISCO-BCOS/FISCO-BCOS/releases/tag/v3.0.0-rc4)版本

### v3.0.0-rc3
(2022-03-31)

* 新增
1. 默认使用Solidity 0.8
2. 支持编译合约进行Solidity并行字段冲突分析
3. 添加`listABI`命令
4. BFS支持软链操作
5. 支持 call link操作,控制台支持调用所有链上部署的合约


* 更新
1. 适配[FISCO BCOS v3.0.0-rc3](https://github.com/FISCO-BCOS/FISCO-BCOS/releases/tag/v3.0.0-rc3)
2. 适配[FISCO BCOS Java SDK v3.0.0-rc3](https://github.com/FISCO-BCOS/java-sdk/releases/tag/v3.0.0-rc3)
3. 使用BFS软链取代CNS


* 修复
1. 修复BFS `cd``pwd`命令的bug

* 兼容性说明
- 沿用2.0+版本的大部分功能, 不兼容 FISCO BCOS 2.0+ 版本。FISCO BCOS 2.0+ 版本请使用对应版本的Console
- 不兼容[3.0.0-rc1](https://github.com/FISCO-BCOS/FISCO-BCOS/releases/tag/v3.0.0-rc1)版本的FISCO BCOS区块链
- 支持[3.0.0-rc3](https://github.com/FISCO-BCOS/FISCO-BCOS/releases/tag/v3.0.0-rc3)版本和[3.0.0-rc2](https://github.com/FISCO-BCOS/FISCO-BCOS/releases/tag/v3.0.0-rc2)版本的FISCO BCOS区块链

### v3.0.0-rc2
(2022-02-23)

* 更新
1. 适配[FISCO BCOS v3.0.0-rc2](https://github.com/FISCO-BCOS/FISCO-BCOS/releases/tag/v3.0.0-rc2)
2. 适配[FISCO BCOS Java SDK v3.0.0-rc2](https://github.com/FISCO-BCOS/java-sdk/releases/tag/v3.0.0-rc2)
3. 更新log4j2依赖到2.17.1版本


* 修复
1. 修复权限初始化失败的问题
2. 修复BFS和KVTable相关的部分命令补全的问题

* 兼容性说明
- 沿用2.0+版本的大部分功能, 不兼容 FISCO BCOS 2.0+ 版本。FISCO BCOS 2.0+ 版本请使用对应版本的Console
- 不兼容[3.0.0-rc1](https://github.com/FISCO-BCOS/FISCO-BCOS/releases/tag/v3.0.0-rc1)版本的FISCO BCOS区块链
- 仅支持[3.0.0-rc2](https://github.com/FISCO-BCOS/FISCO-BCOS/releases/tag/v3.0.0-rc2)版本的FISCO BCOS区块链

### v3.0.0-rc1
(2021-12-10)

* 更新
1. 适配[FISCO BCOS v3.0.0-rc1](https://github.com/FISCO-BCOS/FISCO-BCOS/releases/tag/v3.0.0-rc1)
2. 适配[FISCO BCOS Java SDK v3.0.0-rc1](https://github.com/FISCO-BCOS/java-sdk/releases/tag/v3.0.0-rc1)


* 新增
1. 新增BFS、权限管理相关命令
2. 支持WBC-Liquid合约,包含部署和调用WBC-Liquid合约
3. 新增WBC-Liquid编译后的WASM和ABI文件转换成Java合约文件的脚本


* 兼容性说明
- 沿用2.0+版本的大部分功能, 不兼容 FISCO BCOS 2.0+ 版本。FISCO BCOS 2.0+ 版本请使用对应版本的Console
- 仅支持[3.0.0-rc1](https://github.com/FISCO-BCOS/FISCO-BCOS/releases/tag/v3.0.0-rc1)版本的FISCO BCOS区块链


### v2.8.0
(2021-07-28)

Expand Down
129 changes: 75 additions & 54 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,54 +1,75 @@
![](https://github.com/FISCO-BCOS/FISCO-BCOS/raw/master/docs/images/FISCO_BCOS_Logo.svg?sanitize=true)

English / [中文](doc/README_CN.md)

# console
[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com)
[![Build Status](https://travis-ci.org/FISCO-BCOS/console.svg?branch=master)](https://travis-ci.org/FISCO-BCOS/console)
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/a2a6c2eb499e42739d066ff775d1b288)](https://www.codacy.com/app/fisco/console?utm_source=github.com&utm_medium=referral&utm_content=FISCO-BCOS/console&utm_campaign=Badge_Grade)
[![GitHub All Releases](https://img.shields.io/github/downloads/FISCO-BCOS/console/total.svg)](https://github.com/FISCO-BCOS/console)
---

The console is an important interactive client tool of [FISCO BCOS 3.0+](https://fisco-bcos-doc.readthedocs.io/zh_CN/latest/). The console has a wealth of commands, including querying blockchain status, managing blockchain nodes, deploying and invoking contracts.

## Features

- Provide a lot of query commands for blockchain.
- Provide the easiest way to deploy and invoke contracts.
- Provide some commands which can manage blockchain node.
- Provide a contract compilation tool that allows users to easily and quickly compile Solidity contract files into Java contract files.
- Provide an easy way to transfer compiled Liquid contract material, such as WASM and ABI, into Java contract files.

## Usage

- You can download a tar file and decompress it to enjoy console. See [console manual](https://fisco-bcos-doc.readthedocs.io/zh_CN/latest/docs/develop/console/index.html) for more details.

## Source Installation
```
$ git clone https://github.com/FISCO-BCOS/console.git
$ cd console
$ bash gradlew build
```

If you install successfully, it produces the `dist` directory.

## Configuration
Please see the [documentation](https://fisco-bcos-doc.readthedocs.io/zh_CN/latest/docs/develop/console/console_config.html) about configuration for the console. Have fun :)

## Code Contribution
- Star our GitHub.
- Pull requests. See [CONTRIBUTING](CONTRIBUTING.md).
- [Ask questions](https://github.com/FISCO-BCOS/console/issues).


## Join Our Community

The FISCO BCOS community is one of the most active open-source blockchain communities in China. It provides long-term technical support for both institutional and individual developers and users of FISCO BCOS. Thousands of technical enthusiasts from numerous industry sectors have joined this community, studying and using FISCO BCOS platform. If you are also interested, you are most welcome to join us for more support and fun.

![](https://media.githubusercontent.com/media/FISCO-BCOS/LargeFiles/master/images/QR_image_en.png)

## License
![license](https://img.shields.io/badge/license-Apache%20v2-blue.svg)


All contributions are made under the [Apache License 2.0](http://www.apache.org/licenses/). See [LICENSE](LICENSE).
![](https://github.com/FISCO-BCOS/FISCO-BCOS/raw/master/docs/images/FISCO_BCOS_Logo.svg?sanitize=true)

中文 / [English](doc/README_EN.md)

# 控制台

[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com)
[![Build Status](https://travis-ci.org/FISCO-BCOS/console.svg?branch=master)](https://travis-ci.org/FISCO-BCOS/console)
[![GitHub All Releases](https://img.shields.io/github/downloads/FISCO-BCOS/console/total.svg)](https://github.com/FISCO-BCOS/console)
---

控制台是FISCO BCOS的重要交互式客户端工具。控制台拥有丰富的命令,包括查询区块链状态、管理区块链节点、部署并调用合约等。

## 版本及兼容性说明

**v3.x版本控制台仅适用于FISCO BCOS v3.x,不兼容FISCO BCOS v2.x**

### **v2.x控制台**

- [部署文档](https://fisco-bcos-documentation.readthedocs.io/zh_CN/latest/docs/installation.html)

- **代码**: [GitHub](https://github.com/FISCO-BCOS/console/tree/master-2.0), [Gitee](https://gitee.com/FISCO-BCOS/console/tree/master-2.0/)

- **FISCO BCOS v2.x**: [GitHub](https://github.com/FISCO-BCOS/FISCO-BCOS/tree/master-2.0), [Gitee](https://gitee.com/FISCO-BCOS/FISCO-BCOS/tree/master-2.0/)

### **v3.x控制台**

- [部署文档](https://fisco-bcos-doc.readthedocs.io/zh_CN/latest/docs/quick_start/air_installation.html)

- **代码**: [GitHub](https://github.com/FISCO-BCOS/console/tree/master), [Gitee](https://gitee.com/FISCO-BCOS/console/tree/master)

- **FISCO BCOS v3.x**: [GitHub](https://github.com/FISCO-BCOS/FISCO-BCOS/tree/master), [Gitee](https://gitee.com/FISCO-BCOS/FISCO-BCOS/tree/master)


## 关键特性

- 提供大量的区块链状态查询命令。
- 提供简单易用的部署和调用合约命令。
- 提供一些可以管理区块链节点的命令。
- 提供一个合约编译工具,用户可以方便快捷的将Solidity合约文件编译为Java合约文件。
- 提供一个合约转换工具,用户可将编译好的Liquid合约的物料包,例如WASM文件和ABI文件,转换成Java合约文件。

## 使用
- 可以直接下载控制台压缩包,然后解压控制台压缩包使用控制台。具体参考 [控制台手册](https://fisco-bcos-doc.readthedocs.io/zh_CN/latest/docs/develop/console/index.html)

## 源码安装
```
$ git clone https://github.com/FISCO-BCOS/console.git
$ cd console
$ bash gradlew build
```
如果安装成功,将在当前目录生成一个`dist`目录。

## 配置
控制台具体配置参考[这里](https://fisco-bcos-doc.readthedocs.io/zh_CN/latest/docs/develop/console/console_config.html)

## 贡献代码
欢迎参与FISCO BCOS的社区建设:
- 点亮我们的小星星(点击项目左上方Star按钮)。
- 提交代码(Pull requests),参考我们的[代码贡献流程](CONTRIBUTING_CN.md)
- [提问和提交BUG](https://github.com/FISCO-BCOS/console/issues)

## 加入我们的社区

FISCO BCOS开源社区是国内活跃的开源社区,社区长期为机构和个人开发者提供各类支持与帮助。已有来自各行业的数千名技术爱好者在研究和使用FISCO BCOS。如您对FISCO BCOS开源技术及应用感兴趣,欢迎加入社区获得更多支持与帮助。


![](https://media.githubusercontent.com/media/FISCO-BCOS/LargeFiles/master/images/QR_image.png)


## License

![license](https://img.shields.io/badge/license-Apache%20v2-blue.svg)

Web3SDK的开源协议为[Apache License 2.0](http://www.apache.org/licenses/). 详情参考[LICENSE](LICENSE)
111 changes: 0 additions & 111 deletions build-hsm.gradle

This file was deleted.

11 changes: 7 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ googleJavaFormat {
include '**/*.java'
}

def log4j_version="2.15.0"
def log4j_version="2.17.1"
List logger = [
"org.apache.logging.log4j:log4j-api:$log4j_version",
"org.apache.logging.log4j:log4j-core:$log4j_version",
Expand All @@ -36,11 +36,14 @@ List logger = [
dependencies {
compile logger
//compile 'org.fisco-bcos:solcJ:0.4.25.1'
compile 'org.fisco-bcos:solcJ:0.6.10.3-SNAPSHOT'
//compile 'org.fisco-bcos:solcJ:0.5.2.3-SNAPSHTOT'
//compile 'org.fisco-bcos:solcJ:0.6.10.1'
//compile 'org.fisco-bcos:solcJ:0.5.2.1'
compile 'org.fisco-bcos:solcJ:0.8.11.0'

compile ('org.fisco-bcos.java-sdk:fisco-bcos-java-sdk:3.0.1-rc1-SNAPSHOT')
// compile 'org.fisco-bcos:solcJ:0.6.10.2-SNAPSHOT'

compile ('org.fisco-bcos.java-sdk:fisco-bcos-java-sdk:3.0.0-rc4')
compile ('org.fisco-bcos:evm-static-analysis:1.0.0-rc2')
compile ('io.netty:netty-common:4.1.70.Final')
compile ('commons-cli:commons-cli:1.3.1')
compile ('org.jline:jline:3.12.0')
Expand Down
Loading

0 comments on commit cdd10f3

Please sign in to comment.