Skip to content

Commit

Permalink
fix issues (neo-project#986)
Browse files Browse the repository at this point in the history
  • Loading branch information
Celia18305 authored Dec 24, 2019
1 parent 9406cc3 commit 143c0d6
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 11 deletions.
15 changes: 10 additions & 5 deletions docs/en-us/network/private-chain/neolocal.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
# Local Blockchain
You can choose to use a local network for development purposes. To do this, we recommend you to check [NEO-Local](https://github.com/CityOfZion/neo-local).

**Note:** This is used for development purposes only, neo components used in these docker images may not be the latest available. **Always test your smart-contract using the Testnet.**
> [!Note]
>
> This is used for development purposes only, neo components used in these docker images may not be the latest available. **Always test your smart-contract using the Testnet.**
**Docker Required**

This projects uses Docker and Docker-compose. It works on MacOS, Linux and Windows machines.
Fore more information related to Docker, check their [official website](https://www.docker.com/).

Expand All @@ -13,7 +16,9 @@ Fore more information related to Docker, check their [official website](https://

## Neo-local content
NEO-local will start several containers, being:
- 4 consensus nodes - a fully working network;

- 4 consensus nodes
- A fully working network;
- Block explorer \(Neoscan\);
- Notification server \(Neo-python\);
- Development tools \(Neo-python\);
Expand All @@ -22,10 +27,10 @@ NEO-local will start several containers, being:

## Simple setup
Having docker and docker-compose installed:

1. Clone the repository: https://github.com/CityOfZion/neo-local
2. From terminal or powershell change to the newly cloned directory on your machine: ```cd ./neo-local ```.
3. Run ```docker-compose up ```.
2. From terminal or powershell change to the newly cloned directory on your machine: ```cd ./neo-local```.
3. Run ```docker-compose up```.
4. After the setup is done, check if everything is running by accessing `http://localhost:4000` using your browser.


Please check [Neo-local wiki](https://github.com/CityOfZion/neo-local/wiki) for more information.
2 changes: 1 addition & 1 deletion docs/en-us/network/private-chain/solo.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Build a private chain with one node

NEO-CLI 2.10.2 supports generating blocks without consensus nodes, which means you can set up a private chain with one node.
NEO-CLI 2.10.2 and the later supports generating blocks without consensus nodes, which means you can set up a private chain with one node.

You can directly download the project [NEO-Private-Net](https://github.com/chenzhitong/NEO-Private-Net) to run a private chain quickly. Note that this project assumes you use Windows 10 and has [.NetFramework 4.7.1](https://www.microsoft.com/net/download/dotnet-framework-runtime) installed.

Expand Down
4 changes: 3 additions & 1 deletion docs/en-us/network/testnet.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ After a day or so you will be sent an email containing a "Multi-party signed add

### 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)
Expand All @@ -91,9 +92,10 @@ You will see the quantity of NEO and/or GAS shown beside the Contact address.

2. From NEO-GUI menu, select `Transaction` -> `Transfer`

![image](../assets/neo_gas_3.png)
![image](../assets/neo_gas_3.png)

3. Select the Asset and the amount to send and the account you want to transfer the asset to.

## Alternatives to the TestNet

Testing your Smart Contract on the TestNet is a good idea before publishing it on the LIVE network but earlier in your development cycle you should consider using other methods to test your Smart Contacts such as running you own PRIVATE Testnet.
2 changes: 1 addition & 1 deletion docs/en-us/node/gui/wallet.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ You can also do the following operations by right-clicking an address of the acc
| Function | Description |
| ----------------- | ------------------------------------------------------------ |
| Create New Add. | Creates a new address in the wallet |
| Import | `Import from WIF`: Imports the corresponding address into the wallet<br>`Import from Certificate:` Imports the certification <br>`Import Watch-Only Address`:After importing the address of the other party as the watch-only address, you can monitor the assets at that address. |
| Import | `Import from WIF`: Imports the corresponding address into the wallet<br>`Import from Certificate` Imports the certification <br>`Import Watch-Only Address`:After importing the address of the other party as the watch-only address, you can monitor the assets at that address. |
| Copy to Clipboard | Copies the address |
| Delete | Removes the address |

Expand Down
2 changes: 0 additions & 2 deletions docs/en-us/node/syncblocks.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ Place the downloaded package (chain.acc.zip or chain.xxx.acc.zip) under the fold

> [!Warning]
>
> #### 警告
>
> You must not change the default offline package file name (chain.acc.zip or chain.xxx.acc.zip) , otherwise it will not work for synchronization.
![](../assets/syncblocks_3.png)
Expand Down
3 changes: 2 additions & 1 deletion docs/en-us/sc/devenv/getting-started-java.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ We currently recommend C# for developing smart contracts. The Java compiler is s

This section contains a tutorial that guides you in configuring the Java development environment for NEO smart contracts. It also gives you an idea of how to create a smart contract project and how to compile it.

The process involves the following steps:
The process involves the following steps:

1. Write Java code (.java) for classes that extend FunctionCode or VerificationCode which is part of the Neo Framework Library (JAR)
2. Use the normal Java compiler to compile code into Java bytecode (.class)
3. Build the neoj (C#) compiler that converts JVM code into AVM code (neoj.exe on Windows)
Expand Down

0 comments on commit 143c0d6

Please sign in to comment.