Skip to content

Commit 7ebc90f

Browse files
authored
Merge pull request #91 from neo-project/dev
master < dev
2 parents f9f8802 + e57c773 commit 7ebc90f

File tree

18 files changed

+164
-50
lines changed

18 files changed

+164
-50
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Neo Developer Portal is built using [Docusaurus](https://docusaurus.io/) v2.
1818
1. Neo developer portal team will review your PR
1919
2. Acceptable PRs will be approved and merged into `dev` branch
2020
5. Release
21-
1. Neo developer portal team will periodically merge `dev` into `main` branch and it will automatically deploy to [docs.neo.org](http://docs.neo.org)
21+
1. Neo developer portal team will periodically merge `dev` into `main` branch and it will automatically deploy to [developers.neo.org](https://developers.neo.org/docs)
2222
2. View history of releases on Github
2323

2424

docs/n3/develop/deploy/deploy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ From the programming language perspective, only when a smart contract will be us
1616

1717
Smart contracts are deployed by invoking APIs. Usually we use Neo-CLI or Neo-GUI to deploy smart contracts.
1818

19-
Deploying and invoking smart contracts cost fees. For more information, refer to [Fees](../../reference/fees.md).
19+
Deploying and invoking smart contracts cost fees. For more information, refer to [Fees](../../fees.md).
2020

2121
## Before you start
2222
Make sure you have done the following:

docs/n3/develop/deploy/invoke.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ The key statement is `Contract.Call(scriptHash, method, flags, params)`, where:
103103

104104
- `scriptHash` is the script hash of the contract invoked. It is ByteArray type and little endian.
105105
- `method` is the method of the contract invoked, such as `name`, `balanceOf`, or `transfer`. String type.
106-
- `flags` defines special behaviors allowed when invoking smart contracts. See [CallFlags Enumerator](https://docs.neo.org/docs/zh-cn/reference/scapi/framework/services/CallFlags.html#%E5%8F%82%E6%95%B0%E8%AF%B4%E6%98%8E) for details.
106+
- `flags` defines special behaviors allowed when invoking smart contracts. See [CallFlags Enumerator](../../reference/scapi/framework/services/CallFlags.md) for details.
107107
- `params` is the parameter list of the method of the invoked contract. Array type.
108108

109109
### Invocation permission

docs/n3/develop/write/framework.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ Neo.SmartContract.Framework mainly provides the following API methods:
66

77
- A series of native contract methods that can be invoked in the smart contract,see [Neo.SmartContract.Framework.Native](https://developers.neo.org/docs/n3/reference/scapi/framework/native).
88
- Interoperability services layer methods, see [Neo.SmartContract.Framework.Service](https://developers.neo.org/docs/n3/reference/scapi/framework/services).
9-
- Methods provided by the framework,see [Neo.SmartContract.Framework](https://developers.neo.org/docs/n3/reference/scapi/framework/framework).
9+
- Methods provided by the framework,see [Neo.SmartContract.Framework](https://developers.neo.org/docs/n3/reference/scapi/framework).
1010

docs/n3/exchange/transaction.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -664,6 +664,6 @@ After sending the request, you will get the following response:
664664

665665
## See Also
666666

667-
[NEP17 Token Standard](https://github.com/neo-project/proposals/blob/nep-17/nep-17.mediawiki)
667+
[NEP17 Token Standard](https://github.com/neo-project/proposals/blob/master/nep-17.mediawiki)
668668

669669
[Neo3 Data Conversion](https://neo.org/converter/index)

docs/n3/fees.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ System fees include:
4343
| 0.00000001 | ASSERT, NOP, PUSH0, PUSH1, PUSH10, PUSH11, PUSH12, PUSH13, PUSH14, PUSH15, PUSH16, PUSH2, PUSH3, PUSH4, PUSH5, PUSH6, PUSH7, PUSH8, PUSH9, PUSHINT16, PUSHINT32, PUSHINT64, PUSHINT8, PUSHM1, PUSHNULL, PUSHT, PUSHF |
4444
| 0 | ABORT, RET, SYSCALL |
4545

46-
Reference: [ApplicationEngine.OpCodePrices.cs](https://github.com/neo-project/neo/blob/master/src/neo/SmartContract/ApplicationEngine.OpCodePrices.cs)
46+
Reference: [ApplicationEngine.OpCodePrices.cs](https://github.com/neo-project/neo/blob/master/src/Neo/SmartContract/ApplicationEngine.OpCodePrices.cs)
4747

4848
### System call fee
4949

@@ -76,17 +76,17 @@ Reference: [ApplicationEngine.OpCodePrices.cs](https://github.com/neo-project/ne
7676

7777
Reference:
7878

79-
[ApplicationEngine.Contract.cs](https://github.com/neo-project/neo/blob/master/src/neo/SmartContract/ApplicationEngine.Contract.cs)
79+
[ApplicationEngine.Contract.cs](https://github.com/neo-project/neo/blob/master/src/Neo/SmartContract/ApplicationEngine.Contract.cs)
8080

81-
[ApplicationEngine.Crypto.cs](https://github.com/neo-project/neo/blob/master/src/neo/SmartContract/ApplicationEngine.Crypto.cs)
81+
[ApplicationEngine.Crypto.cs](https://github.com/neo-project/neo/blob/master/src/Neo/SmartContract/ApplicationEngine.Crypto.cs)
8282

83-
[ApplicationEngine.Contract.cs](https://github.com/neo-project/neo/blob/master/src/neo/SmartContract/ApplicationEngine.Contract.cs)
83+
[ApplicationEngine.Contract.cs](https://github.com/neo-project/neo/blob/master/src/Neo/SmartContract/ApplicationEngine.Contract.cs)
8484

85-
[ApplicationEngine.Iterator.cs](https://github.com/neo-project/neo/blob/master/src/neo/SmartContract/ApplicationEngine.Iterator.cs)
85+
[ApplicationEngine.Iterator.cs](https://github.com/neo-project/neo/blob/master/src/Neo/SmartContract/ApplicationEngine.Iterator.cs)
8686

87-
[ApplicationEngine.Runtime.cs](https://github.com/neo-project/neo/blob/master/src/neo/SmartContract/ApplicationEngine.Runtime.cs)
87+
[ApplicationEngine.Runtime.cs](https://github.com/neo-project/neo/blob/master/src/Neo/SmartContract/ApplicationEngine.Runtime.cs)
8888

89-
[ApplicationEngine.Storage.cs](https://github.com/neo-project/neo/blob/master/src/neo/SmartContract/ApplicationEngine.Storage.cs)
89+
[ApplicationEngine.Storage.cs](https://github.com/neo-project/neo/blob/master/src/Neo/SmartContract/ApplicationEngine.Storage.cs)
9090

9191
### Native contract execution fee
9292

@@ -110,7 +110,7 @@ Reference:
110110

111111
The fee for other native contract methods not listed is 0.00032768 GAS.
112112

113-
Reference: [neo/SmartContract/Native](https://github.com/neo-project/neo/tree/master/src/neo/SmartContract/Native)
113+
Reference: [neo/SmartContract/Native](https://github.com/neo-project/neo/tree/master/src/Neo/SmartContract/Native)
114114

115115
### Storage fee
116116

@@ -126,7 +126,7 @@ For the key data written to the storage, the fee charged for the first time writ
126126
| Subsequent write in. New data size > Old data size | The same as above line | The value modified as `hello neo3.0 preview5`, totally 21 bytes | 0.005 + (21-12)×0.001 = **0.014** GAS |
127127
| The value removed | 0 | The value removed | **0** GAS |
128128

129-
Reference: [ApplicationEngine.Storage.cs](https://github.com/neo-project/neo/blob/master/src/neo/SmartContract/ApplicationEngine.Storage.cs)
129+
Reference: [ApplicationEngine.Storage.cs](https://github.com/neo-project/neo/blob/master/src/Neo/SmartContract/ApplicationEngine.Storage.cs)
130130

131131
## Network fee
132132

@@ -141,9 +141,9 @@ By default the network byte fee is 0.00001 GAS / Byte. Committee members can dyn
141141

142142
Reference:
143143

144-
[PolicyContract.cs](https://github.com/neo-project/neo/blob/master/src/neo/SmartContract/Native/PolicyContract.cs)
144+
[PolicyContract.cs](https://github.com/neo-project/neo/blob/master/src/Neo/SmartContract/Native/PolicyContract.cs)
145145

146-
[Transaction.cs#L302](https://github.com/neo-project/neo/blob/ee898bf41667cdbe3b836b3bd08c2d3199046c2e/src/neo/Network/P2P/Payloads/Transaction.cs#L302)
146+
[Transaction.cs#L302](https://github.com/neo-project/neo/blob/master/src/Neo/Network/P2P/Payloads/Transaction.cs#L302)
147147

148148
### Script verification fee
149149

@@ -165,7 +165,7 @@ The script verification fee for a standard address is (OpCode.PUSHDATA1 + OpCode
165165

166166
Reference:
167167

168-
[PolicyContract.cs](https://github.com/neo-project/neo/blob/master/src/neo/SmartContract/Native/PolicyContract.cs)
168+
[PolicyContract.cs](https://github.com/neo-project/neo/blob/master/src/Neo/SmartContract/Native/PolicyContract.cs)
169169

170-
[Transaction.cs#L302](https://github.com/neo-project/neo/blob/ee898bf41667cdbe3b836b3bd08c2d3199046c2e/src/neo/Network/P2P/Payloads/Transaction.cs#L302)
170+
[Transaction.cs#L302](https://github.com/neo-project/neo/blob/master/src/Neo/Network/P2P/Payloads/Transaction.cs#L302)
171171

docs/n3/foundation/Transactions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ The system fee depends on the transaction's script, i.e., its size, number and t
4646

4747
![](images/transaction/system_fee.png)
4848

49-
where *OpcodeSet* is opcode set, *OpcodePrice<sub>i</sub>* is the cost of opcode i, *n<sub>i</sub>* is the execution times of instruction i in the contract script. For each opcode fee refer to [Fees for Instructions](../../reference/fees.md#fees-for-instructions).
49+
where *OpcodeSet* is opcode set, *OpcodePrice<sub>i</sub>* is the cost of opcode i, *n<sub>i</sub>* is the execution times of instruction i in the contract script. For each opcode fee refer to [Fees for Instructions](../Advances/Neo VM instructions.md).
5050

5151
### netfee
5252

@@ -88,7 +88,7 @@ By repeating this step, the invocation script can push multiple signatures for t
8888

8989
#### Verification Script
9090

91-
Verification script, commonly known as address script, includes normal address script and multi-signature address script. The address script can be directly obtained from the wallet account. For information about the construction refer to [Wallets](wallets.md#address).
91+
Verification script, commonly known as address script, includes normal address script and multi-signature address script. The address script can be directly obtained from the wallet account. For information about the construction refer to [Wallets](Wallets.md).
9292

9393
It can also be used as a custom authentication contract script.
9494

docs/n3/glossary.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ The script hash is generated from the smart contract script with the RIPEMD-160
3939

4040
#### Opcode
4141

42-
Opcodes are similar to instructions in assembly language. For all OpCode, refer to [OpCode source](https://github.com/neo-project/neo-vm/blob/master/src/neo-vm/OpCode.cs).
42+
Opcodes are similar to instructions in assembly language. For all OpCode, refer to [OpCode source](https://github.com/neo-project/neo/blob/master/src/Neo.VM/OpCode.cs).
4343

4444
#### Cryptographic private key
4545

@@ -55,15 +55,15 @@ The NEP-17 proposal outlines a token standard for the Neo blockchain that will p
5555

5656
#### SysCall
5757

58-
The system call is a special operation code, through which you can call the interoperable service layer interface. By calling the interoperable service layer interface, NeoVM can access data such as block, transaction , contract, and asset information that are required for running smart contracts. For more information refer to the files in [Neo smart contract module](https://github.com/neo-project/neo/tree/master/src/neo/SmartContract) starting with `ApplicationEngine.` , such as `ApplicationEngine.Contract.cs`, `ApplicationEngine.Blockchain.cs`.
58+
The system call is a special operation code, through which you can call the interoperable service layer interface. By calling the interoperable service layer interface, NeoVM can access data such as block, transaction , contract, and asset information that are required for running smart contracts. For more information refer to the files in [Neo smart contract module](https://github.com/neo-project/neo/tree/master/src/Neo/SmartContract) starting with `ApplicationEngine.` , such as `ApplicationEngine.Contract.cs`, `ApplicationEngine.Blockchain.cs`.
5959

6060
#### Dynamic Call
6161

6262
A special system call that invokes another contract within a contract. It can be wrote as `Contract.Call(scriptHash, method, params)`. For more information refer to [Invoking Smart Contracts](develop/deploy/invoke).
6363

6464
#### Storage
6565

66-
Each smart contract deployed on the Neo blockchain has a private storage area for storing application data. When creating a smart contract or transaction to use this contract, the contract code needs to read and write its storage. Each contract can declare a storage area. For more information refer to [Storage](../reference/scapi/framework/services/storage).
66+
Each smart contract deployed on the Neo blockchain has a private storage area for storing application data. When creating a smart contract or transaction to use this contract, the contract code needs to read and write its storage. Each contract can declare a storage area. For more information refer to [Storage](reference/scapi/framework/services/Storage.md).
6767

6868
#### NEF
6969

docs/n3/node/cli/setup.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ The following table lists the minimum and recommended hardware requirements for
1313

1414
| | Minimum | Recommended |
1515
| --------- | ---------------------------------------------------- | ---------------------------------------------------- |
16-
| System | Windows 10<br/>Ubuntu 16.04/18.04<br/>CentOS 7.4/7.6 | Windows 10<br/>Ubuntu 16.04/18.04<br/>CentOS 7.4/7.6 |
16+
| System | Windows 10/11<br/>Ubuntu 16.04/18.04/20.04<br/>CentOS 7.4/7.6/7.7 | Windows 10/11<br/>Ubuntu 16.04/18.04/20.04<br/>CentOS 7.4/7.6/7.7 |
1717
| CPU | Dual core | Quad core |
1818
| Memory | 8G | 16G |
1919
| Hard Disk | 50G SSD hard drive | 100G SSD hard drive |
@@ -33,16 +33,17 @@ The following table lists the minimum and recommended hardware requirements for
3333
**CentOS:**
3434

3535
```
36-
sudo wget http://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
37-
sudo yum -y install epel-release-latest-7.noarch.rpm
36+
sudo wget http://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm
37+
sudo yum -y install epel-release-latest-9.noarch.rpm
3838
sudo yum -y install leveldb-devel libunwind-devel libsqlite3x-devel sqlite3*
3939
```
4040

4141
If you use RocksDB as the storage, modify config.json, as shown below:
4242

4343
```
4444
"Storage": {
45-
"Engine": "RocksDBStore"
45+
"Engine": "RocksDBStore",
46+
"Path": "Data_RocksDB_{0}"
4647
},
4748
```
4849

@@ -72,7 +73,7 @@ You can download and compile the Neo-CLI source directly from Github.
7273

7374
### Publishing using Visual Studio (Windows)
7475

75-
If you has Visual Studio 2019 installed on your Windows system, this way is recommended:
76+
If you has Visual Studio 2019 or later version installed on your Windows system, this way is recommended:
7677

7778
1. In Visual Studio, open the project file neo-node.sln.
7879
2. In the Solution panel, right click `neo-cli` and select `Publish`.

docs/n3/node/gui/blockchain.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ You can view the following information by switching tabs in this page:
4747
- **Transaction**: Displays the basic information of the transaction, such as the block, size, time stamp, as well as the transaction transfer record and the witness of the transaction.
4848
- **Notifications**: Displays the execution log of the smart contract in the transaction, including information such as whether the NEP-17 transfer was successful.
4949

50-
For information about the basic concept of transactions refer to [Transaction](../../basic/concept/transaction.md).
50+
For information about the basic concept of transactions refer to [Transaction](../../foundation/Transactions.md).
5151

5252
## Assets
5353

0 commit comments

Comments
 (0)