Skip to content

Commit

Permalink
update transaction parallel header
Browse files Browse the repository at this point in the history
  • Loading branch information
JimmyShi22 committed Jul 30, 2019
1 parent c9f2e6b commit f8d75ba
Show file tree
Hide file tree
Showing 4 changed files with 67 additions and 5 deletions.
4 changes: 2 additions & 2 deletions docs/manual/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@

- `智能合约开发 <./smart_contract.html>`_
+ 普通智能合约开发、预编译合约开发、CRUD合约开发
- `并行交易 <./transaction_parallel.html>`_
- `并行合约 <./transaction_parallel.html>`_
+ 写并行合约,满足高并发场景


Expand All @@ -86,5 +86,5 @@

* 核心特性
+ `多群组部署 <./group_use_cases.html>`_
+ `并行交易 <./transaction_parallel.html>`_
+ `并行合约 <./transaction_parallel.html>`_
+ `分布式存储 <./distributed_storage.html>`_
2 changes: 1 addition & 1 deletion docs/manual/transaction_parallel.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# 并行交易
# 并行合约

FISCO BCOS提供了可并行合约开发框架,开发者按照框架规范编写的合约,能够被FISCO BCOS节点并行地执行。并行合约的优势有:

Expand Down
62 changes: 62 additions & 0 deletions en/docs/manual/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ Manual (Revision in progress)
This chapter provides an operation tutorial of FISCO BCOS platform to introduce its functions and operation methods.

.. toctree::
:hidden:
:maxdepth: 1

get_executable.md
Expand All @@ -23,3 +24,64 @@ This chapter provides an operation tutorial of FISCO BCOS platform to introduce
amop_protocol.md
storage_security.md
guomi_crypto.md


.. admonition:: Setup and deploy blockchain

- `Getting Executables <./get_executable.html>`_
+ Download binary, use docker images and complie source code.
- `Chain building script <./build_chain.html>`_
+ Options and node directory
- `Certificate description <./certificates.html>`_
+ Certificate format, role and generating process.
- `Configuration files and configuration items <./configuration.html>`_
+ All configure files' options
- `Deploy Multi-Group Blockchain System <./group_use_cases.html>`_
+ The guide of deploying Multi-Group Blockchain
- `Distributed storage <./distributed_storage.html>`_
+ The guide of using distributed storage feature


.. admonition:: Use Blockchain

- `Console <./console.html>`_
+ Configuration and options
- `Manage blockchain accounts <./account.html>`_
+ Account generation and using guide.
- `SDK <../sdk.html>`_
+ The SDK to call smart from outside
- `AMOP <./amop_protocol.html>`_
+ Send messages between SDKs


.. admonition:: Write samrt contracts

- `Smart contract development <./smart_contract.html>`_
+ Solidity smart contract, precompiled contract and CRUD contract
- `Parallel contract <./transaction_parallel.html>`_
+ The guide of writing parallel contract


.. admonition:: Management and Security

- `Group members management <./node_management.html>`_
+ Add/Remove members(nodes) of group
- `Permission control <./permission_control.html>`_
+ Access control among accounts.
- `CA blacklist <./certificate_blacklist.html>`_
+ Deny connection from certain node.
- `Storage security <./storage_security.html>`_
+ Encrypt data during writing into disk


.. admonition:: Others

- `OSCCA-approved cryptography <./guomi_crypto.html>`_
+ OSCCA-approved cryptography node and SDK

.. important::

* Important features
+ `Deploy Multi-Group Blockchain System <./group_use_cases.html>`_
+ `Parallel contract <./transaction_parallel.html>`_
+ `Distributed storage <./distributed_storage.html>`_
4 changes: 2 additions & 2 deletions en/docs/manual/transaction_parallel.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Parallel transaction
# Parallel contract

FISCO BCOS provides development structure for parallelable contract. Contract developed under the structure regulation can be parallelly executed by nodes of FISCO BCOS. The advantages of parallel contract include:
FISCO BCOS provides development structure for parallel contract. Contract developed under the structure regulation can be parallelly executed by nodes of FISCO BCOS. The advantages of parallel contract include:

- high TPS: multiple independent transaction being executed at the same time can utilize the CPU resources to the most extent and reach high TPS

Expand Down

0 comments on commit f8d75ba

Please sign in to comment.