Skip to content
This repository has been archived by the owner on Nov 13, 2024. It is now read-only.

Commit

Permalink
Release preview5 (#1162)
Browse files Browse the repository at this point in the history
* Update RPC (#1150)

* update(1/2)

* update(2/2)

* update

* updated api.md

* updated English version

* updated English files

Co-authored-by: Celia18305 <[email protected]>

* opcode price (#1151)

* price

* Update neo_vm.md

Co-authored-by: Celia18305 <[email protected]>

* update neo-cli docs for preview5 (#1154)

* update neo-cli docs

* update neo-cli docs

* update neo-cli docs

* Update cli.md

Co-authored-by: Celia18305 <[email protected]>

* Release preview5 (#1156)

* price

* Update neo_vm.md

* remove

* updated

Co-authored-by: Celia18305 <[email protected]>

* Preview5 smartcontract API and framework (#1152)

* update(1/3)

* update(2/3)

* update

* update (3/3)

* update (4/3)

* finish

* updated English

Co-authored-by: Celia18305 <[email protected]>
Co-authored-by: Celia18305 <[email protected]>

* update neo node docs (#1157)

* update neo node docs

* add maxGAS

* update

* updated

Co-authored-by: Celia18305 <[email protected]>

* add name service api (#1155)

* add name service api

* update

* add english edition of the nns

* minor fix

* fix issues

* Fix precision (#1160)

* update(1/3)

* update(2/3)

* update

* update (3/3)

* update (4/3)

* finish

* update

* fixed

Co-authored-by: Celia18305 <[email protected]>
Co-authored-by: Celia18305 <[email protected]>

* add state root rpc api (#1159)

* add state root rpc api

* update

* update

* updated

Co-authored-by: Celia18305 <[email protected]>
Co-authored-by: Celia18305 <[email protected]>

* update contract framework (#1161)

* update

* Update Transfer.md

* Update Transfer.md

Co-authored-by: Celia18305 <[email protected]>

Co-authored-by: 陈志同 <[email protected]>
Co-authored-by: Shine Li <[email protected]>
Co-authored-by: HaoqiangZhang <[email protected]>
Co-authored-by: cn1010 <[email protected]>
  • Loading branch information
5 people authored Feb 9, 2021
1 parent 487b6ee commit 6c403bb
Show file tree
Hide file tree
Showing 331 changed files with 8,728 additions and 4,677 deletions.
3 changes: 1 addition & 2 deletions docs/en-us/basic/neovm.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,10 @@ ExecutionEngine is the core of NeoVM, mainly responsible for loading scripts and

#### Stack

NeoVM is a stack-based virtual machine. NeoVM has four types of stack:InvocationStack, EvaluationStack, AltStack and ResultStack.
NeoVM is a stack-based virtual machine. NeoVM has three types of stack: InvocationStack, EvaluationStack, and ResultStack.

- InvocationStack is used to store all execution contexts of current NeoVM, which are isolated from each other in the stack. Context switching is performed based on the current context and entry context. The current context points to the top element of invocation stack, which is ExecutionContext0 in the architecture figure. And the entry context points to the tail element of invocation stack, which is ExecutionContextN in the architecture figure.
- EvaluationStack is for storing the data used by the instruction in execution process. Each execution context has its own evaluation stack.
- AltStack is for storing the temporary data used by the instruction in execution process. Each execution context has its own alt stack.
- ResultStack is used to store execution result after all scripts are executed.

#### Interoperation Service Layer
Expand Down
16 changes: 8 additions & 8 deletions docs/en-us/exchange/transaction.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,12 @@ After sending the request you will get the following response:
"result": {
"balance": [
{
"asset_hash": "0xde5f57d430d3dece511cf975a8d37848cb9e0525",
"asset_hash": "0xf61eebf573ea36593fd43aa150c055ad7906ab83",
"amount": "2",
"last_updated_block": 52675
},
{
"asset_hash": "0x668e0c1f9d7b70a99dd9e06eadd4c784d641afbc",
"asset_hash": "0x70e2301955bf1e74cbb31d18c2f96972abadb328",
"amount": "700000000",
"last_updated_block": 52675
}
Expand Down Expand Up @@ -120,8 +120,8 @@ You need to replace these strings when querying the user's balance:

The script hash of the NEP-5 asset you are querying. For example:

- NEO is *0xde5f57d430d3dece511cf975a8d37848cb9e0525*
- GAS is *0x668e0c1f9d7b70a99dd9e06eadd4c784d641afbc*
- NEO is *0xf61eebf573ea36593fd43aa150c055ad7906ab83*
- GAS is *0x70e2301955bf1e74cbb31d18c2f96972abadb328*


- method name
Expand Down Expand Up @@ -530,7 +530,7 @@ Request body:
{
"jsonrpc": "2.0",
"method": "sendfrom",
"params": ["0xde5f57d430d3dece511cf975a8d37848cb9e0525","NcphtjgTye3c3ZL5J5nDZhsf3UJMGAjd7o","Nhiuh11SHF4n9FE6G5LuFHHYc7Lgws9U1z", 10],
"params": ["0xf61eebf573ea36593fd43aa150c055ad7906ab83","NcphtjgTye3c3ZL5J5nDZhsf3UJMGAjd7o","Nhiuh11SHF4n9FE6G5LuFHHYc7Lgws9U1z", 10],
"id": 1
}
```
Expand Down Expand Up @@ -582,7 +582,7 @@ Request Body:
{
"jsonrpc": "2.0",
"method": "sendtoaddress",
"params": ["0x668e0c1f9d7b70a99dd9e06eadd4c784d641afbc", "Nhiuh11SHF4n9FE6G5LuFHHYc7Lgws9U1z", 1000],
"params": ["0x70e2301955bf1e74cbb31d18c2f96972abadb328", "Nhiuh11SHF4n9FE6G5LuFHHYc7Lgws9U1z", 1000],
"id": 1
}
```
Expand Down Expand Up @@ -638,12 +638,12 @@ Request Body:
"NcphtjgTye3c3ZL5J5nDZhsf3UJMGAjd7o",
[
{
"asset": "0xde5f57d430d3dece511cf975a8d37848cb9e0525",
"asset": "0xf61eebf573ea36593fd43aa150c055ad7906ab83",
"value": 100,
"address": "Nhiuh11SHF4n9FE6G5LuFHHYc7Lgws9U1z"
},
{
"asset": "0x668e0c1f9d7b70a99dd9e06eadd4c784d641afbc",
"asset": "0x70e2301955bf1e74cbb31d18c2f96972abadb328",
"value": 1000,
"address": "Nhiuh11SHF4n9FE6G5LuFHHYc7Lgws9U1z"
}
Expand Down
210 changes: 130 additions & 80 deletions docs/en-us/node/cli/cli.md

Large diffs are not rendered by default.

51 changes: 39 additions & 12 deletions docs/en-us/node/cli/config.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,16 @@ Before you can invoke the wallet related API, you need to configure a wallet in
Here is an example:

```json
{
{
"ApplicationConfiguration": {
"Logger": {
"Path": "Logs_{0}",
"ConsoleOutput": true,
"Active": true
},
"Storage": {
"Engine": "LevelDBStore"
"Engine": "LevelDBStore",
"Path": "Data_LevelDB_{0}"
},
"P2P": {
"Port": 20333,
Expand All @@ -34,7 +35,6 @@ Here is an example:
"UnlockWallet": {
"Path": "wallet.json",
"Password": "11111111",
"StartConsensus": false,
"IsActive": true
},
"PluginURL": "https://github.com/neo-project/neo-modules/releases/download/v{1}/{0}.zip"
Expand Down Expand Up @@ -80,39 +80,39 @@ Download the plugins you need from the following table.
<tbody>
<tr>
<td><a
href="https://github.com/neo-project/neo-modules/releases/download/v3.0.0-preview4/LevelDBStore.zip">LevelDBStore</a>
href="https://github.com/neo-project/neo-modules/releases/download/v3.0.0-preview5/LevelDBStore.zip">LevelDBStore</a>
</td>
<td>Uses LevelDB to store the blockchain data</td>
<td></td>
<td>Mandatory</td>
</tr>
<tr>
<td><a
href="https://github.com/neo-project/neo-modules/releases/download/v3.0.0-preview4/RocksDBStore.zip">RocksDBStore</a>
href="https://github.com/neo-project/neo-modules/releases/download/v3.0.0-preview5/RocksDBStore.zip">RocksDBStore</a>
</td>
<td>Uses RocksDBStore to store the blockchain data</td>
<td></td>
<td>An alternative to LevelDBStore</td>
</tr>
<tr>
<td><a
href="https://github.com/neo-project/neo-modules/releases/download/v3.0.0-preview4/RpcServer.zip">RpcServer</a>
href="https://github.com/neo-project/neo-modules/releases/download/v3.0.0-preview5/RpcServer.zip">RpcServer</a>
</td>
<td>Enables RPC for the node</td>
<td><a href="../../reference/rpc/latest-version/api.html"> RPC API </a></td>
<td>Mandatory</td>
</tr>
<tr>
<td><a
href="https://github.com/neo-project/neo-modules/releases/download/v3.0.0-preview4/ApplicationLogs.zip">ApplicationLogs</a>
href="https://github.com/neo-project/neo-modules/releases/download/v3.0.0-preview5/ApplicationLogs.zip">ApplicationLogs</a>
</td>
<td>Synchronizes the smart contract log with the NativeContract log (Notify)</td>
<td><a href="../../reference/rpc/latest-version/api/getapplicationlog.html">getapplicationlog</a></td>
<td>Recommended</td>
</tr>
<tr>
<td><a
href="https://github.com/neo-project/neo-modules/releases/download/v3.0.0-preview4/RpcNep17Tracker.zip">RpcNep17Tracker</a>
href="https://github.com/neo-project/neo-modules/releases/download/v3.0.0-preview5/RpcNep17Tracker.zip">RpcNep17Tracker</a>
</td>
<td>Enquiries NEP17 balance and transactions history of accounts through RPC</td>
<td><a href="../../reference/rpc/latest-version/api/getnep17balances.html">getnep17balances</a><br><a
Expand All @@ -121,17 +121,44 @@ Download the plugins you need from the following table.
</tr>
<tr>
<td><a
href="https://github.com/neo-project/neo-modules/releases/download/v3.0.0-preview4/StatesDumper.zip">StatesDumper</a>
href="https://github.com/neo-project/neo-modules/releases/download/v3.0.0-preview5/StatesDumper.zip">StatesDumper</a>
</td>
<td>Exports Neo-CLI status data.</td>
<td></td>
<td>Optional</td>
</tr>
<tr>
<td><a
href="https://github.com/neo-project/neo-modules/releases/download/v3.0.0-preview5/DBFTPlugin.zip">DBFTPlugin</a>
</td>
<td>dBFT consensus plugin</td>
<td></td>
<td>Mandatory when served as a consensus node</td>
</tr>
<tr>
<td><a
href="https://github.com/neo-project/neo-modules/releases/download/v3.0.0-preview5/OracleService.zip">OracleService</a>
</td>
<td>Oracle service plugin</td>
<td></td>
<td>Mandatory when served as an Oracle node</td>
</tr>
</tr>
<tr>
<td><a
href="https://github.com/neo-project/neo-modules/releases/download/v3.0.0-preview5/StateService.zip">StateService</a>
</td>
<td>StateRoot consensus service plugin</td>
<td><a href="../../reference/rpc/latest-version/api/getstateroot.html">getstateroot</a><br>
<a href="../../reference/rpc/latest-version/api/getproof.html">getproof</a><br>
<a href="../../reference/rpc/latest-version/api/verifyproof.html">verifyproof</a><br>
<a href="../../reference/rpc/latest-version/api/getstateheight.html">getstateheight</a>
</td>
<td>Mandatory when served as a StateRoot consensus node</td>
</tr>
</tbody>
</table>



To install plugins, unzip plugin packages under the the Neo-CLI root directory, as shown below:

![](../../../zh-cn/assets/PluginsForExchange.png)
Expand All @@ -142,7 +169,7 @@ It is easier to automatically install or uninstall the plugin using commands, fo

```
neo> install StatesDumper
Downloading from https://github.com/neo-project/neo-modules/releases/download/v3.0.0-preview4/StatesDumper.zip
Downloading from https://github.com/neo-project/neo-modules/releases/download/v3.0.0-preview5/StatesDumper.zip
Install successful, please restart neo-cli.
```

Expand Down
5 changes: 4 additions & 1 deletion docs/en-us/node/cli/seedlist.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ You can find the SeedList in `protcol.json`, under the neo-cli directory.
"ProtocolConfiguration": {
"Magic": ...,
"MillisecondsPerBlock": ...,
"MaxTraceableBlocks": ···,
"ValidatorsCount":...,
"StandbyCommittee": [
...
Expand Down Expand Up @@ -71,7 +72,9 @@ To let Neo-CLI know the new SeedList, we will paste the addresses chosen before
"ProtocolConfiguration": {
"Magic": 7630401,
"MillisecondsPerBlock": 15000,
"StandbyValidators": [
"MaxTraceableBlocks": 2102400,
"ValidatorsCount": 7,
"StandbyCommittee": [
"03b209fd4f53a7170ea4444e0cb0a6bb6a53c2bd016926989cf85f9b0fba17a70c",
"02df48f60e8f3e01c48ff40b9b7f1310d7a8b2a193188befe1c2e3df740e895093",
"03b8d9d5771d8f513aa0869b9cc8d50986403b78c6da36890638c3d46a5adce04a",
Expand Down
8 changes: 4 additions & 4 deletions docs/en-us/reference/governance_api.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ GAS is the fuel token for the realization of Neo network resource control, with

| Native Contract | Contract Hash |
| ------------ | ------------------------------------------ |
| `NeoToken` | 0xde5f57d430d3dece511cf975a8d37848cb9e0525 |
| `GasToken` | 0x668e0c1f9d7b70a99dd9e06eadd4c784d641afbc |
| `Policy` | 0xce06595079cd69583126dbfd1d2e25cca74cffe9 |
| `NeoToken` | 0xf61eebf573ea36593fd43aa150c055ad7906ab83 |
| `GasToken` | 0x70e2301955bf1e74cbb31d18c2f96972abadb328 |
| `Policy` | 0x79bcd398505eb779df6e67e4be6c14cded08e2f2 |

The way to call the native contract methods is the same as calling other ordinary contracts. `Contract.Call(NEO.hash, method, params)`

Expand Down Expand Up @@ -109,7 +109,7 @@ Committee members will be refreshed every block.

#### Function & Scope

Validators are nodes which are able to start or vote to new block proposals. Detailed description can be found in Neo3 write paper.
Validators are nodes which are able to start or vote to new block proposals.

#### How Are Validators Elected

Expand Down
Loading

0 comments on commit 6c403bb

Please sign in to comment.