diff --git a/docs/en-us/network/private-chain/private-chain.md b/docs/en-us/network/private-chain/private-chain.md index d8be40a861..46d7ce7d42 100644 --- a/docs/en-us/network/private-chain/private-chain.md +++ b/docs/en-us/network/private-chain/private-chain.md @@ -4,7 +4,7 @@ This section guides you to build a private chain using four virtual machines and ## Configuring the virtual machine -The deployment of an NEO private chain requires at least four servers to reach a consensus, where each server corresponds to a consensus node and a dedicated NEO wallet. Here we created four Windows virtual machines on Azure, the size is Standard DS1 v2 (1 core, 3.5 GB RAM). +The deployment of an Neo private chain requires at least four servers to reach a consensus, where each server corresponds to a consensus node and a dedicated Neo wallet. Here we created four Windows virtual machines on Azure, the size is Standard DS1 v2 (1 core, 3.5 GB RAM). ![image](../../assets/privatechain_1.png) @@ -16,16 +16,16 @@ After creating the four virtual machines, open the port 10331-10334 by adding ne Record the IP addresses after the four virtual machines have been created. -## Installing NEO-CLI +## Installing Neo-CLI Do the following on four virtual machines: -1. Refer to [Installation of NEO-CLI](../../node/cli/setup.md) and install NEO-CLI. +1. Refer to [Installation of Neo-CLI](../../node/cli/setup.md) and install Neo-CLI. 2. Download [SimplePolicy](https://github.com/neo-project/neo-plugins/releases/download/v2.9.2/SimplePolicy.zip). Extract the file and place the Plugins folder under the neo-cli root directory. ## Creating wallet files -1. Create four wallet files, wallet1.db3 - wallet4.db3, using NEO-CLI or NEO-GUI. The following screenshot shows the creation with NEO-CLI. +1. Create four wallet files, wallet1.db3 - wallet4.db3, using Neo-CLI or Neo-GUI. The following screenshot shows the creation with Neo-CLI. 2. Record the public keys of four wallets, i.e. directly copy them on the screen and save to a txt file or use `list key` in [CLI Command](../../node/cli/cli.md) to view the public key, and then copy it. 3. Copy the four wallet files into each of the four virtual machines neo-cli folder. @@ -35,7 +35,7 @@ Do the following on four virtual machines: 1. Under each neo-cli directory of the four nodes, open the file `protocol.json` and modify the following: - - `Magic`: Magic is used to identify the source network of the message, and specifying a different Magic ensures that different network information in the NEO block are not sent to other networks, during transmission. The type of Magic is unit, so note that the value you fill in is in the range [0 - 4294967295]. + - `Magic`: Magic is used to identify the source network of the message, and specifying a different Magic ensures that different network information in the Neo block are not sent to other networks, during transmission. The type of Magic is unit, so note that the value you fill in is in the range [0 - 4294967295]. - `StandbyValidators`: Enter the four wallet public keys recorded before. - `SeedList`: Enter the four virtual machines IP addresses recorded before. Leave the port number as it is. @@ -97,19 +97,19 @@ Four nodes can still achieve consensus, even if one machine is turned off, as sh In the genesis block of the NEO network, 100 million NEOs are generated. Additionally, GAS is generated with the generation of new blocks. When the private chain is set up, you can withdraw those NEO and GAS from a multi-party address with NEO-GUI, to facilitate your blockchain development and testing. -### Installing and configuring NEO-GUI +### Installing and configuring Neo-GUI -1. Download [NEO-GUI](https://github.com/neo-project/neo-gui/releases) from Github and extract the file. -2. Configure the file protocol.json under the neo-gui folder to connect the client to the private chain: +1. Download [Neo-GUI](https://github.com/neo-project/neo-gui/releases) from Github and extract the file. +2. Configure the file protocol.json under the Neo-gui folder to connect the client to the private chain: - StandbyValidators`：enter the public keys of four wallets created before. - `SeedList`：enter the four virtual machines IP addresses here and leave the port number as it is. -3. Configure the file config.json to make sure the NEO-GUI port is not conflict with the ports of other four nodes. If using the same port, NEO-GUI cannot work as NEO-CLI is running. +3. Configure the file config.json to make sure the Neo-GUI port is not conflict with the ports of other four nodes. If using the same port, Neo-GUI cannot work as Neo-CLI is running. -Start NEO-GUI and open any of the wallets, if you see the connection number in the lower left corner is not 0 and the client has been downloading the blocks, the client has been successfully connected to the private chain. +Start Neo-GUI and open any of the wallets, if you see the connection number in the lower left corner is not 0 and the client has been downloading the blocks, the client has been successfully connected to the private chain. ### Creating multi-party signature addresses -From NEO-GUI, open four wallets in turn and do the following: +From Neo-GUI, open four wallets in turn and do the following: 1. Right-click on the blank area of account page, click `Create Contract Address` -> `Multi-Signature`. @@ -123,7 +123,7 @@ From NEO-GUI, open four wallets in turn and do the following: > > You must create the multi-party signature address in each wallet so that the transfer transaction can be signed successfully . -Now you should see the contract address has 100 million NEO shares. +Now you should see the contract address has 100 million Neo shares. ![image](../../assets/privatechain_14.png) diff --git a/docs/en-us/network/private-chain/private-chain2.md b/docs/en-us/network/private-chain/private-chain2.md index 034fb2144c..53fac04cb1 100644 --- a/docs/en-us/network/private-chain/private-chain2.md +++ b/docs/en-us/network/private-chain/private-chain2.md @@ -2,11 +2,11 @@ In previous document we described the standard way to build a private chain using four computers or virtual machines. In this document we will introduce an easier way to build a private chain on a windows system computer. -## Installing NEO node +## Installing Neo node -Install NEO-CLI and make four copies of the node folder with the name of node1, node2, node3, and node4, successively. +Install Neo-CLI and make four copies of the node folder with the name of node1, node2, node3, and node4, successively. -For more information refer to [Installation of NEO-CLI](../../node/cli/setup.md). +For more information refer to [Installation of Neo-CLI](../../node/cli/setup.md). ## Installing plug-in @@ -14,7 +14,7 @@ Install [SimplePolicy](https://github.com/neo-project/neo-plugins/releases/) the ## Creating wallet files -From NEO-CLI or NEO-GUI create four wallets, 1.json, 2.json, 3.json, and 4.json, and place each in the folder of four nodes. +From Neo-CLI or Neo-GUI create four wallets, 1.json, 2.json, 3.json, and 4.json, and place each in the folder of four nodes. ## Modifying config.json @@ -226,4 +226,4 @@ Refer to [Withdrawing NEO and GAS](private-chain.md#withdrawing-neo-and-gas). Tips： -[Here](https://github.com/chenzhitong/NEO-Private-Net) is a private chain which is all set for you to use directly. The NEO and GAS have been withdrawn. The NEO node version is 2.9.4. \ No newline at end of file +[Here](https://github.com/chenzhitong/NEO-Private-Net) is a private chain which is all set for you to use directly. The NEO and GAS have been withdrawn. The Neo node version is 2.9.4. \ No newline at end of file diff --git a/docs/en-us/network/private-chain/solo.md b/docs/en-us/network/private-chain/solo.md index f60adaa346..9e0d93ca35 100644 --- a/docs/en-us/network/private-chain/solo.md +++ b/docs/en-us/network/private-chain/solo.md @@ -115,21 +115,21 @@ You can refer to the following example： Run the command line and enter the NEO-CLI directory. Then enter `neo-cli.exe` to start the private chain. The private chain is set up successfully when it goes as shown below: -![img](https://github.com/chenzhitong/NEO-Private-Net/raw/master/img/privatechain_demo.png) +![img](../../assets/privatechain_demo.png) The private chain is terminated if you close the window. ## Withdrawing NEO and GAS -In the genesis block of the NEO network, 100 million NEOs are generated. Additionally, GAS is generated with the generation of new blocks. When the private chain is set up, you can withdraw those NEO and GAS from a multi-party address with NEO-GUI, to facilitate your blockchain development and testing. +In the genesis block of the Neo network, 100 million NEOs are generated. Additionally, GAS is generated with the generation of new blocks. When the private chain is set up, you can withdraw those NEO and GAS from a multi-party address with Neo-GUI, to facilitate your blockchain development and testing. -### Installing and configuring NEO-GUI +### Installing and configuring Neo-GUI -1. Download [NEO-GUI](https://github.com/neo-project/neo-gui/releases) from Github and extract the file. +1. Download [Neo-GUI](https://github.com/neo-project/neo-gui/releases) from Github and extract the file. -2. Replace the protocol.json in the NEO-GUI folder with the one configured before. +2. Replace the protocol.json in the Neo-GUI folder with the one configured before. -3. Configure the file config.json to make sure the NEO-GUI port is not conflict with the one of NEO-CLI; otherwise, NEO-GUI cannot work as NEO-CLI is running. +3. Configure the file config.json to make sure the Neo-GUI port is not conflict with the one of Neo-CLI; otherwise, Neo-GUI cannot work as Neo-CLI is running. ```json { @@ -152,7 +152,7 @@ In the genesis block of the NEO network, 100 million NEOs are generated. Additio } ``` -Start NEO-GUI and open a.json, if you see the connection number in the lower left corner is not 0 and the client has been downloading the blocks, the client has been successfully connected to the private chain. +Start Neo-GUI and open a.json, if you see the connection number in the lower left corner is not 0 and the client has been downloading the blocks, the client has been successfully connected to the private chain. ### Transferring NEO/GAS diff --git a/docs/en-us/network/testnet.md b/docs/en-us/network/testnet.md index d8b357f0a0..327364263e 100644 --- a/docs/en-us/network/testnet.md +++ b/docs/en-us/network/testnet.md @@ -1,10 +1,10 @@ # Main Net and Test Net -The NEO node runs on the main net by default. The Main net is a block chain network that has been officially launched and operates independently. +The Neo node runs on the main net by default. The Main net is a block chain network that has been officially launched and operates independently. The Test net is an environment where the user can develop, commission and test programs. Testing programs on the testnet incurs the network fee of testnet GAS (not real GAS!). Testnet NEO and GAS can be applied free of charge, on the official website, detailed instruction are below. -All the blockchain of the test network are independent of the main network. If you develop a simple smart contract or try to register assets, the use of testnet should suffice. After the testing is complete, the development can be moved to the NEO mainnet online operation. +All the blockchain of the test network are independent of the main network. If you develop a simple smart contract or try to register assets, the use of testnet should suffice. After the testing is complete, the development can be moved to the Neo mainnet online operation. ## TestNet characteristics @@ -14,24 +14,13 @@ All the blockchain of the test network are independent of the main network. If y 4. Smart contract deployment in the test environment, where anyone in the world can employ it. 5. Test network can not be used as commercial application of an actual landing environment. -## Client Downloads +## Switching between test net and main net -The test network client is the same as the primary network client. By modifying the client's configuration file, the client can be switched between the primary and test networks. - -Reference: [Introduction of NEO node](../node/introduction.md). - -| | Neo-GUI | Neo-CLI | -| ---- | ---------------------------------------- | ---------------------------------------- | -| Releases | [Official website](https://www.neo.org/download) or [Github](https://github.com/neo-project/neo-gui/releases) | [Github](https://github.com/neo-project/neo-cli/releases) | -| Source code | [Github](https://github.com/neo-project/neo-gui) | [Github](https://github.com/neo-project/neo-cli) | - -## Method of switching to test network - -After downloading NEO client, you can switch the client to connect to test net by modifying the client configuration file. Here we take NEO-GUI for an example: +After downloading Neo client, you can switch the client to connect to test net by modifying the client configuration file. Here we take Neo-GUI for an example: > [!Note] > -> NEO3 clients can only connect to test net for the moment as the NEO3 main net has not launched yet. +> Neo3 clients can only connect to test net for the moment as the Neo3 main net has not launched yet. 1. Copy the contents of the program directory under the `protocol.testnet.json` into ` protocol.json` as shown. @@ -41,37 +30,36 @@ After downloading NEO client, you can switch the client to connect to test net b ![image](../assets/testnet_2_v2.png) +## Applying for Test GAS and Test NEO +If you are a developer, you can ask for Neo and GAS on the TestNet. You will need 500 Test GAS to deploy a contract to the TestNet. -## Method of getting TEST GAS and TEST NEO +### Obtaining test coin automatically -If you are a developer, you can ask for NEO and GAS on the TestNet. You will need 500 Test GAS to deploy a contract to the TestNet. +Up to 1000 GAS and 1000 Neo per day can be requested via the [NGD faucet](https://neowish.ngd.network/). -Up to 1000 GAS and 1000 NEO per day can be requested via the [NGD faucet](https://neowish.ngd.network/). If you need more than that, you'll have to request it manually: +### Applying for test coin from Neo website -- Fill in the request form (https://www.neo.org/Testnet/Create) specifying your PUBLIC key and EMAIL. -- A day or so later you will receive an email with an Contract Address and a second PUBLIC KEY. -- Create/Add a multi-sig address in your wallet. -- Select the new address and transfer the assets from the multi-part signed address to your own address. +If you need more than that, you'll have to request it from Neo website manually. -### STEP 1 - Look up your PUBLIC key -In NEO the address and PUBLIC key are different. +#### Step 1 - Look up your public key +In Neo the address and PUBLIC key are different. The PUBLIC KEY is shown when you view the PRIVATE KEY. (Never share your PRIVATE key.) ![image](../assets/neo_gas_0.jpg) -### STEP 2 - Fill in the request +#### Step 2 - Fill in the request Complete the form here: https://neo.org/testcoin/apply specifying your EMAIL and PUBLIC key. -After a day or so you will be sent an email containing a "Multi-party signed address" and the PUBLIC key of the sender. See Advanced Features, Multi-party signed address. +After a day or so you will be sent an email containing a "Multi-party signed address" and the PUBLIC key of the sender. See [Multi-party signed address](../node/gui/sc.md). -### STEP 3 - Create a multi-party signed address +#### Step 3 - Create a multi-party signed address To access the assets, in your neo-gui you will create a "Multi-party signed address" in your wallet using - The "Multi-party signed address" (from the email) - The PUBLIC KEY of the sender (from the email) - Your PUBLIC KEY (from STEP 1 above) -1. From NEO-GUI, right-click on the account area and select `Create Contract Address` -> `Multi-Signature`. +1. From Neo-GUI, right-click on the account area and select `Create Contract Address` -> `Multi-Signature`. ![image](../assets/neo_gas_1.jpg) @@ -83,14 +71,14 @@ The contract address specified in the email is created and displayed in the acco ![image](../assets/neo_gas_2.jpg) -You will see the quantity of NEO and/or GAS shown beside the Contact address. +You will see the quantity of Neo and/or GAS shown beside the Contact address. -### STEP 4 - Transfer the assets to another account +#### Step 4 - Transfer the assets to another account 1. Select the `Contact address` by clicking on it. -2. From NEO-GUI menu, select `Transaction` -> `Transfer` +2. From Neo-GUI menu, select `Transaction` -> `Transfer` ![image](../assets/neo_gas_3.png) diff --git a/docs/zh-cn/network/private-chain/neolocal.md b/docs/zh-cn/network/private-chain/neolocal.md index 8022529d31..23075e812a 100644 --- a/docs/zh-cn/network/private-chain/neolocal.md +++ b/docs/zh-cn/network/private-chain/neolocal.md @@ -1,19 +1,19 @@ # 快速搭建本地网络 -你可以在本地搭建个人的区块链网络用于协助开发。使用 [NEO-Local](https://github.com/CityOfZion/neo-local) 项目可以帮助你快速完成搭建，你可以使用它运行测试、执行命令和检查状态，同时控制链的操作。 +你可以在本地搭建个人的区块链网络用于协助开发。使用 [Neo-Local](https://github.com/CityOfZion/neo-local) 项目可以帮助你快速完成搭建，你可以使用它运行测试、执行命令和检查状态，同时控制链的操作。 > [!Note] > -> 该项目仅用于开发目的，其 docker 镜像中使用的 NEO 组件可能不是最新的。所以请始终使用测试网测试你所编写的智能合约。 +> 该项目仅用于开发目的，其 docker 镜像中使用的 Neo 组件可能不是最新的。所以请始终使用测试网测试你所编写的智能合约。 **使用 Docker** 该项目使用 Docker 和 Docker-compose，可运行在 MacOS、Linux 和 Windows 系统上。关于 Docker 的更多信息，请参见其 [官网](https://www.docker.com/)。 -[![img](https://github.com/neo-project/docs/raw/df3f3750862af288a789f05df456d2ce77175d04/assets/neolocal.png)](https://github.com/neo-project/docs/blob/df3f3750862af288a789f05df456d2ce77175d04/assets/neolocal.png) +![](../../assets/neolocal.png) ## Neo-local 组件 - NEO-local 将启动以下容器： + Neo-local 将启动以下容器： - 4 个共识节点 - 一个完整的工作网络 - 区块浏览器 - Neoscan diff --git a/docs/zh-cn/network/private-chain/private-chain.md b/docs/zh-cn/network/private-chain/private-chain.md index 6841bee7d8..42f0011f16 100644 --- a/docs/zh-cn/network/private-chain/private-chain.md +++ b/docs/zh-cn/network/private-chain/private-chain.md @@ -1,10 +1,10 @@ # 用虚拟机搭建私有链 -本文将介绍如何使用四台虚拟机来搭建私有链，以及如何从自己的私有链中提取 NEO 和 GAS。 +本文将介绍如何使用四台虚拟机来搭建私有链，以及如何从自己的私有链中提取 Neo 和 GAS。 ## 配置虚拟机 -NEO 私有链的部署至少需要 4 台服务器才能取得共识，每台服务器对应一个共识节点。为了演示，我们在 Azure 上创建了 4 台 Windows 虚拟机，大小为 Standard DS1 v2 (1 核心，3.5 GB 内存)，你也可以在局域网中或虚拟机中部署私有链。 +Neo 私有链的部署至少需要 4 台服务器才能取得共识，每台服务器对应一个共识节点。为了演示，我们在 Azure 上创建了 4 台 Windows 虚拟机，大小为 Standard DS1 v2 (1 核心，3.5 GB 内存)，你也可以在局域网中或虚拟机中部署私有链。 ![](../assets/privatechain_1.jpg) @@ -18,16 +18,16 @@ NEO 私有链的部署至少需要 4 台服务器才能取得共识，每台服 创建好虚拟机后，将四台虚拟机的 IP 地址保存下来以备后用。 -## 安装 NEO-CLI +## 安装 Neo-CLI 分别在四台虚拟机上进行如下操作： -1. 参考 [安装 NEO-CLI](../../node/cli/setup.md) ，安装 NEO 客户端。 +1. 参考 [安装 Neo-CLI](../../node/cli/setup.md) ，安装 Neo 客户端。 2. 下载 [SimplePolicy](https://github.com/neo-project/neo-plugins/releases/download/v2.9.2/SimplePolicy.zip) 插件并将解压后的 Plugins 文件夹拷贝到 neo-cli 目录下。 ## 创建钱包 -1. 在任意一台虚拟机上使用 NEO-CLI 或 NEO-GUI 创建四个钱包文件，下图以在 NEO-CLI 上创建为例。 +1. 在任意一台虚拟机上使用 Neo-CLI 或 Neo-GUI 创建四个钱包文件，下图以在 Neo-CLI 上创建为例。 ![](../assets/privatechain_3.jpg) @@ -39,7 +39,7 @@ NEO 私有链的部署至少需要 4 台服务器才能取得共识，每台服 1. 配置每个节点的 `protocol.json `文件 ，修改以下参数： - - `Magic` ：Magic 用于识别消息的来源网络，指定不同的 Magic 确保 NEO 区块链中的不同网络信息在传输过程中不会发送到其它网络。Magic 的类型为 uint，注意填写的数值要在 [0 - 4294967295] 区间内。 + - `Magic` ：Magic 用于识别消息的来源网络，指定不同的 Magic 确保 Neo 区块链中的不同网络信息在传输过程中不会发送到其它网络。Magic 的类型为 uint，注意填写的数值要在 [0 - 4294967295] 区间内。 - `StandbyValidators`：将创建好的四个钱包的公钥填写在这里。 - `SeedList`：将四台虚拟机的 IP 地址填写在这里，端口号保持不变。 @@ -96,23 +96,23 @@ NEO 私有链的部署至少需要 4 台服务器才能取得共识，每台服 ![](../../assets/privatechain_9.png) -## 提取 NEO 和 GAS +## 提取 Neo 和 GAS -在 NEO 网络的创世块中存放着 1 亿份 NEO，当私链搭建起来后，Gas 也将伴着新区块的生成而生成。你可以使用 NEO-GUI 从多方签名合约中提取出这部分 NEO 和 GAS 以便内部开发测试使用。 +在 Neo 网络的创世块中存放着 1 亿份 Neo，当私链搭建起来后，Gas 也将伴着新区块的生成而生成。你可以使用 Neo-GUI 从多方签名合约中提取出这部分 Neo 和 GAS 以便内部开发测试使用。 -### 安装并配置 NEO-GUI +### 安装并配置 Neo-GUI -1. 从 Github 上下载 [NEO-GUI](https://github.com/neo-project/neo-gui/releases) 并解压。 -2. 修改 NEO-GUI 配置文件 protocol.json 使其连接到私有链中： +1. 从 Github 上下载 [Neo-GUI](https://github.com/neo-project/neo-gui/releases) 并解压。 +2. 修改 Neo-GUI 配置文件 protocol.json 使其连接到私有链中： - StandbyValidators`：将前面创建的四个钱包的公钥填写在这里。 - `SeedList`：将四台虚拟机的 IP 地址填写在这里，端口号保持不变。 -3. 配置 config.json 文件，设置端口与其它四个节点端口不冲突。如果端口冲突，NEO-GUI 将无法与 NEO-CLI 同时运行。 +3. 配置 config.json 文件，设置端口与其它四个节点端口不冲突。如果端口冲突，Neo-GUI 将无法与 Neo-CLI 同时运行。 -运行 NEO-GUI，打开任意钱包，如果左下角有连接数不为零，而且一直在同步区块，表示该客户端已经成功地连接到了私有链中。 +运行 Neo-GUI，打开任意钱包，如果左下角有连接数不为零，而且一直在同步区块，表示该客户端已经成功地连接到了私有链中。 ### 创建多方签名地址 -在 NEO-GUI 中依次打开四个钱包，进行以下操作： +在 Neo-GUI 中依次打开四个钱包，进行以下操作： 1. 右键单击账户页面空白处，选择`创建合约地址` -> `多方签名`在每个钱包里添加多方签名地址。 @@ -126,17 +126,17 @@ NEO 私有链的部署至少需要 4 台服务器才能取得共识，每台服 > > 四个钱包都要添加多方签名地址，否则签名会失败。 -你将看到合约地址中出现了 1 亿 NEO，如图所示。 +你将看到合约地址中出现了 1 亿 Neo，如图所示。 ![](../assets/privatechain_14.jpg) -### 提取 NEO 到标准地址 +### 提取 Neo 到标准地址 -进行如下操作，将 NEO 从合约地址转到标准地址中： +进行如下操作，将 Neo 从合约地址转到标准地址中： 1. 打开四个钱包中的任意一个，点击 `交易`-> `转账`。 -2. 输入要转入的标准地址，将 1 亿 NEO 转到这个地址中。 +2. 输入要转入的标准地址，将 1 亿 Neo 转到这个地址中。 3. 系统会提示“交易构造完成，但没有足够的签名”，将代码复制下来。 @@ -150,7 +150,7 @@ NEO 私有链的部署至少需要 4 台服务器才能取得共识，每台服 7. 点击 `广播` 完成转账交易。 - 等待片刻后将看到 1 亿 NEO 成功转入了标准地址。 + 等待片刻后将看到 1 亿 Neo 成功转入了标准地址。 ![](../assets/privatechain_20.jpg) @@ -160,8 +160,8 @@ NEO 私有链的部署至少需要 4 台服务器才能取得共识，每台服 > [!Note] > -> GAS 有两种状态，可提取和不可提取。当账户中的 NEO 花费后（即转出），其产生的 GAS 会转变成可提取状态。你可以通过给自己转账将 GAS 变为可提取状态，即使钱包里只有一个地址也可以。 +> GAS 有两种状态，可提取和不可提取。当账户中的 Neo 花费后（即转出），其产生的 GAS 会转变成可提取状态。你可以通过给自己转账将 GAS 变为可提取状态，即使钱包里只有一个地址也可以。 -接下来的操作与转账 NEO 类似，将没有足够签名的代码复制下来，依次打开第二个和第三个钱包，完成交易签名和广播。提取成功后如下图所示。 +接下来的操作与转账 Neo 类似，将没有足够签名的代码复制下来，依次打开第二个和第三个钱包，完成交易签名和广播。提取成功后如下图所示。 ![](../assets/privatechain_26.jpg) diff --git a/docs/zh-cn/network/private-chain/private-chain2.md b/docs/zh-cn/network/private-chain/private-chain2.md index b4318785ff..ebcd0bc985 100644 --- a/docs/zh-cn/network/private-chain/private-chain2.md +++ b/docs/zh-cn/network/private-chain/private-chain2.md @@ -4,9 +4,9 @@ ## 安装节点 -首先安装 NEO-CLI，并将节点文件复制为 4 份，文件夹名分别命名为 node1、node2、node3、node4。 +首先安装 Neo-CLI，并将节点文件复制为 4 份，文件夹名分别命名为 node1、node2、node3、node4。 -安装过程请参考 [NEO 节点的安装部署](../../node/cli/setup.md)。 +安装过程请参考 [Neo 节点的安装部署](../../node/cli/setup.md)。 ## 安装插件 @@ -17,7 +17,7 @@ ## 创建钱包文件 -使用 NEO-CLI 或 NEO-GUI 创建四个不同的钱包文件，命名为 1.json、2.json、3.json、4.json，分别放置于四个节点的文件夹中。 +使用 Neo-CLI 或 Neo-GUI 创建四个不同的钱包文件，命名为 1.json、2.json、3.json、4.json，分别放置于四个节点的文件夹中。 ## 修改 config.json @@ -223,7 +223,7 @@ 如果关闭所有窗口，将停止私有链。 -## 提取私有链中的 NEO/GAS +## 提取私有链中的 Neo/GAS 请参考 [提取 NEO 和 GAS](private-chain.md#提取-neo-和-gas)。 diff --git a/docs/zh-cn/network/private-chain/solo.md b/docs/zh-cn/network/private-chain/solo.md index 3767878740..ce48f985fb 100644 --- a/docs/zh-cn/network/private-chain/solo.md +++ b/docs/zh-cn/network/private-chain/solo.md @@ -1,18 +1,18 @@ # 使用单节点搭建私有链 -NEO-CLI 2.10.2 支持单节点模式下正常生成区块，只需一个节点即可正常运行私有链。 +Neo-CLI 2.10.2 支持单节点模式下正常生成区块，只需一个节点即可正常运行私有链。 -[NEO-Private-Net](https://github.com/chenzhitong/NEO-Private-Net) 项目是一个已配置好的私有链，下载后可以直接运行。此项目基于 Windows 10，且运行 NEO-GUI 需要安装 [.NetFramework 4.7.1](https://www.microsoft.com/net/download/dotnet-framework-runtime)。 +[NEO-Private-Net](https://github.com/chenzhitong/NEO-Private-Net) 项目是一个已配置好的私有链，下载后可以直接运行。此项目基于 Windows 10，且运行 Neo-GUI 需要安装 [.NetFramework 4.7.1](https://www.microsoft.com/net/download/dotnet-framework-runtime)。 你也可以自己配置私有链，下文将介绍具体方法。 ## 安装节点 -首先安装 NEO-CLI 2.10.2，安装过程请参考 [NEO 节点的安装部署](../../node/cli/setup.md)。 +首先安装 Neo-CLI 2.10.2，安装过程请参考 [Neo 节点的安装部署](../../node/cli/setup.md)。 ## 安装插件 -要使节点达成共识，需要安装 SimplePolicy 插件启用共识策略。下载 [SimplePolicy](https://github.com/neo-project/neo-plugins/releases/) 插件并解压，放到 NEO-CLI 程序的 Plugins 文件夹中。 +要使节点达成共识，需要安装 SimplePolicy 插件启用共识策略。下载 [SimplePolicy](https://github.com/neo-project/neo-plugins/releases/) 插件并解压，放到 Neo-CLI 程序的 Plugins 文件夹中。 也可根据需要安装其它插件，可参考如下配置： @@ -38,7 +38,7 @@ NEO-CLI 2.10.2 支持单节点模式下正常生成区块，只需一个节点 ## 创建钱包文件 -使用 NEO-CLI 或 NEO-GUI 创建一个钱包文件，命名为 a.json 放置于节点的文件夹中。 +使用 Neo-CLI 或 Neo-GUI 创建一个钱包文件，命名为 a.json 放置于节点的文件夹中。 ## 修改 config.json @@ -80,7 +80,7 @@ NEO-CLI 2.10.2 支持单节点模式下正常生成区块，只需一个节点 ## 修改 protocol.json -修改 NEO-CLI 下的 protocol.json 文件，对以下参数进行修改。如果之后要配置其它普通节点，请保证所有节点的配置一致。 +修改 Neo-CLI 下的 protocol.json 文件，对以下参数进行修改。如果之后要配置其它普通节点，请保证所有节点的配置一致。 - Magic ：私有链 ID，可设置为 [0 - 4294967295] 区间内的任意整数。 - StandbyValidators ：备用共识节点的公钥，这里输入 a.json 钱包中的公钥（StandbyValidators 中只有一个公钥的时候为单节点模式）。 @@ -115,7 +115,7 @@ NEO-CLI 2.10.2 支持单节点模式下正常生成区块，只需一个节点 运行命令行，进入 neo-cli 目录，输入 `neo-cli.exe`。成功建立的私链如下图所示。 -![img](https://github.com/chenzhitong/NEO-Private-Net/raw/master/img/privatechain_demo.png) +![](../../assets/privatechain_demo.png) 如果关闭窗口，将停止私有链。 diff --git a/docs/zh-cn/network/testnet.md b/docs/zh-cn/network/testnet.md index 7ddb52229c..5ff8b6b453 100644 --- a/docs/zh-cn/network/testnet.md +++ b/docs/zh-cn/network/testnet.md @@ -1,10 +1,10 @@ # 主网与测试网 -NEO 的节点默认运行在主网，主网是正式上线，独立运行的区块链网络。 +Neo 的节点默认运行在主网，主网是正式上线，独立运行的区块链网络。 -NEO 的测试网（Test Net）是官方提供的，专供用户来开发、调试和测试的。测试网上面的系统费用是测试网中的 NeoGas，并非真实的 NeoGas，测试网的 NEO 和 NeoGas 可以在官网上免费申请。 +Neo 也提供了测试网（Test Net）供开发者进行开发、调试和测试。测试网上花费的手续费是测试网中的 GAS，并非真实的 GAS，测试网的 NEO 和 GAS 可以在官网上免费申请。 -测试网的所有区块数据都是独立于主网的。如果开发简单的智能合约或者尝试注册资产的话，用测试网就足够了，待开发完成后可以迁移到 NEO 的主网上运行。 +测试网的所有区块数据都是独立于主网的。如果开发简单的智能合约或者尝试注册资产的话，用测试网就足够了，待开发完成后可以迁移到 Neo 的主网上运行。 ## 测试网的特点 @@ -16,14 +16,14 @@ NEO 的测试网（Test Net）是官方提供的，专供用户来开发、调 ## 切换到测试网 -下载NEO客户端后，可以通过修改客户端的配置文件来让客户端在主网和测试网中切换。以下步骤以 NEO-GUI为例，NEO-CLI操作相同。 +下载 Neo 节点客户端后，可以通过修改客户端的配置文件来让客户端在主网和测试网中切换。以下步骤以 Neo-GUI 为例，Neo-CLI 操作相同。 -1. 将客户端目录下的 `protocol.testnet.json` 里的内容复制到 `protocol.json`（替换原有配置文件），如图。 +1. 将客户端目录下的 `protocol.testnet.json` 里的内容复制到 `protocol.json`（替换原有配置文件），如图所示： ![](../assets/testnet_1_v2.png) -2. 将客户端（GUI）目录下的 `config.testnet.json` 里的内容复制到 `config.json`（替换原有配置文件），如图 +2. 将客户端（GUI）目录下的 `config.testnet.json` 里的内容复制到 `config.json`（替换原有配置文件），如图所示： ![](../assets/testnet_2_v2.png) @@ -32,40 +32,38 @@ NEO 的测试网（Test Net）是官方提供的，专供用户来开发、调 > > - 旧版客户端此步是将 `neo-gui.testnet.config` 里的内容复制到 `neo-gui.exe.config`（替换原有配置文件）。 > -> - NEO3客户端目前只能接入测试网，主网尚未上线。 +> - Neo3 客户端目前只能接入测试网，主网尚未上线。 ## 申请测试网 GAS 和 NEO -如果你是开发人员，可以申请用于测试网的 NEO 和 GAS。 在测试网部署一条合约需要花费500个测试 GAS。 +如果你是开发人员，可以申请用于测试网的 Neo 和 GAS。 在测试网部署一条合约需要花费500个测试 GAS。 -你可以在 [NGD faucet](https://neowish.ngd.network/) 上每天自动领取最多1000 个 GAS 和 1000 个 NEO。如果需要更多测试币，可以通过以下方式申请： +### 自动领取测试币 -1. 填写申请表 (https://neo.org/testcoin/apply) ，指定你的公钥和Email。 +你可以在 [NGD faucet](https://neowish.ngd.network/) 上每天自动领取最多1000 个 GAS 和 1000 个 NEO。 -   大约三天后，你将收到一封电子邮件。其中包含合约地址和另一个公钥。 +### 通过 Neo 官网申请 -2. 在钱包中创建一个多方签名地址。 +如果需要更多测试币，可以通过 Neo 官网申请。 -3. 将多方签名地址中的资产转账到你自己的地址。 +#### 第 1 步 - 获取你的 Neo 公钥 -### 第 1 步 - 查看您的公钥 +在 Neo 中，地址和公钥不同。要查看公钥，在 Neo-GUI 客户端中右键单击您的钱包地址，选择 `查看私钥`，出现的对话框中会显示公钥。 -在NEO中，地址和公钥不同。要查看公钥，在NEO-GUI客户端中右键单击您的钱包地址，选择 `查看私钥`，出现的对话框中会显示公钥。 +#### 第 2 步 - 填写申请 -### 第 2 步 - 填写申请 - -填写申请表：https://www.neo.org/Testnet/Create ，需要指定你的邮箱和公钥。 +填写申请表：https://neo.org/testcoin/apply ，需要指定你的邮箱和公钥。 一般一天后将收到邮件回复，包含一个多方签名地址和发件人的公钥。关于多方签名地址，请参见 [多方签名地址](../node/gui/sc.md)。 -### 第 3 步 - 创建多方签名地址 +#### 第 3 步 - 创建多方签名地址 -要获取资产，你需要在 NEO-GUI 中创建一个多方签名地址，将用到以下信息： +要获取资产，你需要在 Neo-GUI 中创建一个多方签名地址，将用到以下信息： - 邮件中的多方签名地址 - 邮件中的发件人公钥 - 第一步中获取的你自己的公钥 -1. 在 NEO-GUI 中，右键单击地址账户并选择 `创建合约地址` -> `多方签名地址`。 +1. 在 Neo-GUI 中，右键单击地址账户并选择 `创建合约地址` -> `多方签名地址`。 2. 在公钥列表中输入用于签名的公钥，即发件人的公钥和你自己的公钥。 @@ -77,18 +75,18 @@ NEO 的测试网（Test Net）是官方提供的，专供用户来开发、调 ![image](assets/neogas.png) -可以在合约地址处看到获取的 NEO/GAS 数量。 +可以在合约地址处看到获取的 Neo/GAS 数量。 -### 第 4 步 - 将资产转账到另一个账户 +#### 第 4 步 - 将资产转账到另一个账户 -1. 在NEO-GUI中选中合约地址，点击 `交易` -> `转账` +1. 在 Neo-GUI 中选中合约地址，点击 `交易` -> `转账` 2. 选择要转账的资产并设置转账金额和转入账户。 ## 其它测试方法 -在发布智能合约到主网前，使用测试网进行试验无疑是个好办法，但是在开发初期，您还可以考虑其他测试方式，例如运行您自己的私人测试网。 +在发布智能合约到主网前，使用测试网进行试验无疑是个好办法，但是在开发初期，还可以考虑其他测试方式，例如搭建你自己的私链。 diff --git a/docs/zh-cn/node/assets/gui_44.png b/docs/zh-cn/node/assets/gui_44.png deleted file mode 100644 index e1a5a91dcd..0000000000 Binary files a/docs/zh-cn/node/assets/gui_44.png and /dev/null differ diff --git a/docs/zh-cn/node/gui/asset.md b/docs/zh-cn/node/gui/asset.md index 5862b2219c..40ad18b3df 100644 --- a/docs/zh-cn/node/gui/asset.md +++ b/docs/zh-cn/node/gui/asset.md @@ -18,14 +18,12 @@ ![](../assets/gui_43.png) -2. 注册资产通过调用智能合约来完成，如下图所示，点击`试运行`，即可看到所需手续费详情： +2. 注册资产通过调用智能合约来完成，在出现的调用合约窗口中点击`试运行`，即可看到所需手续费详情： 同时，您也可以选择加载本地写好的智能合约文档。 需要注意的是，注册资产需花费大量手续费（目前为 4990 GAS），请谨慎操作。 - ![](../assets/gui_44.png) - 3. 确认注册资产，点击 `调用`。 4. 返回交易成功结果，复制交易ID并粘贴到记事本，以备资产分发时使用。