Merge branch 'develop'

docs/02_getting-started/01_try-eosio.md

@@ -7,5 +7,9 @@ If you do not want to install `EOSIO` binaries on your local machine, or if you
 
 You can give it a try in a matter of seconds [right now](https://gitpod.io/#https://github.com/EOSIO/eosio-web-ide) and you can read more details about it [on the eosio-web-ide project page](https://github.com/EOSIO/eosio-web-ide).
 
+## EOSIO Testnet
+
+Experiment on the EOSIO Testnet with the latest stable release of the EOSIO software. Deploy your smart contracts, push actions, inspect your transactions and much more from an easy to use web interface. To start testing, [register](https://testnet.eos.io/user?utm_source=devportal#signup) for an EOSIO Developer Account.
+
 ## What's Next?
 - [Get Started](./02_development-environment/02_introduction.md): Install EOSIO in your local development environment.

docs/02_getting-started/03_smart-contract-development/01_hello-world.md

@@ -58,7 +58,7 @@ using namespace eosio;
 class [[eosio::contract]] hello : public contract {
   public:
       using contract::contract;
-
+      [[eosio::action]]
       void hi( name user ) {
          print( "Hello, ", user);
       }

docs/02_getting-started/03_smart-contract-development/05_secondary-indices.md

@@ -37,9 +37,9 @@ indexed_by<"byage"_n, const_mem_fun<person, uint64_t, &person::get_secondary_1>>
   > address_index;
 ```
 
-In the third parameter, we pass a `index_by` struct which is used to instantiate a index.
+In the third parameter, we pass a `indexed_by` struct which is used to instantiate a index.
 
-In that `index_by` struct, we specify the name of index as `"byage"` and the second type parameter as a function call operator which extracts a const value as an index key. In this case, we point it to the getter we created earlier so this multiple index table will index records by the `age` variable.
+In that `indexed_by` struct, we specify the name of index as `"byage"` and the second type parameter as a function call operator which extracts a const value as an index key. In this case, we point it to the getter we created earlier so this multiple index table will index records by the `age` variable.
 
 ```cpp
 indexed_by<"byage"_n, const_mem_fun<person, uint64_t, &person::get_secondary_1>>

docs/02_getting-started/03_smart-contract-development/10_payable_actions.md

@@ -151,7 +151,7 @@ The party action will only allow withdrawals after the configured `the_party` ti
 
 * check the withdrawing account is the account which made the deposit initially
 * find the locked balance
-* transfer the token on behalf of the account to the account itself
+* transfer the token from the `hodl` contract to the account itself
 ```cpp
 [[eosio::action]]
 void party(name hodler)

docs/02_getting-started/index.md

@@ -1,6 +1,6 @@
 ---
 content_title: "Getting Started"
-link_text: "Get Started"
+link_text: "Getting Started"
 ---
 
 - Installing eosio.cdt

docs/03_tutorials/bios-boot-sequence.md

@@ -111,7 +111,7 @@ y
 
 To start the genesis node:
 
-1. Create a `genesis_start.sh` shell script file in the `~/biosnode/genesis/` directory and open the file with your preferred editor (demonstrated with nano editor here):
+1. Create a `genesis_start.sh` shell script file in the `~/biosboot/genesis/` directory and open the file with your preferred editor (demonstrated with nano editor here):
 ```shell
 cd ~/biosboot/genesis
 touch genesis_start.sh
@@ -193,7 +193,7 @@ chmod 755 genesis_start.sh
 
 To stop `nodeos`:
 
-1. Create a `stop.sh` shell script file in the `~/biosnode/genesis/` directory and copy the following stop.sh script to it.
+1. Create a `stop.sh` shell script file in the `~/biosboot/genesis/` directory and copy the following stop.sh script to it.
 
 ```shell
 #!/bin/bash
@@ -685,11 +685,11 @@ accountnum11  EOS8mUftJXepGzdQ2TaCduNuSPAfXJHf22uex4u41ab1EVv9EAhWt  https://acc
 
 We will set up now a new producer using the previously created `accountnum11` account. To set up the new producer, execute these steps to create a dedicated folder for it:
 ```text
-cd ~/netbios/
+cd ~/biosboot/
 mkdir accountnum11
 cd accountnum11
-copy ~/netbios/genesis/stop.sh
-copy ~/netbios/genesis/clean.sh
+copy ~/biosboot/genesis/stop.sh
+copy ~/biosboot/genesis/clean.sh
 
 ```
 Create the following three shell script files and assign execution permission to them: `genesis_start.sh`, `start.sh`, `hard_start.sh`.

docs/03_tutorials/index.md

@@ -1,2 +1,3 @@
-1. [BIOS Boot Sequence](bios-boot-sequence.md): Demonstrates how to bootstrap a new EOSIO blockchain
-2. [Tic Tac Toe Game Contract](tic-tac-toe-game-contract.md): Build a sample Tic Tac Toe game on EOSIO to apply the knowledge you acquired earlier
+1. [BIOS Boot Sequence](bios-boot-sequence.md): Demonstrates how to bootstrap a new EOSIO blockchain.
+2. [Tic Tac Toe Game Contract](tic-tac-toe-game-contract.md): Build a sample Tic Tac Toe game on EOSIO to apply the knowledge you acquired earlier.
+3. [Elemental Battles](https://battles.eos.io?utm_source=devportal): Created for developers new to blockchain, Elemental Battles is part-tutorial, part-game development. You’ll play in a fantasy world and harness the powers of wood, water, and fire to learn blockchain basics and build your first game on EOSIO.

docs/04_protocol/01_consensus_protocol.md

@@ -160,7 +160,7 @@ Name | Type | Description
 `producer_signature` | `signature_type` | digital signature by producer that created and signed block
 `transactions` | array of `transaction_receipt` | list of valid transaction receipts included in block
 `block_extensions` | `extension_type` | extends block fields to support additional features (NOT included in block ID calculation)
-`id` | `uint64_t` | UUID of this block ID (a function of block header and block number); can be used to query block for validation/retrieval purposes
+`id` | `block_id_type` | UUID of this block ID (a function of block header and block number); can be used to query block for validation/retrieval purposes
 `block_num` | `uint32_t` | block number (sequential counter value since genesis block 0); can be used to query block for validation/retrieval purposes
 `ref_block_prefix` | `uint32_t` | lower 32 bits of block ID; used to prevent replay attacks
 
@@ -238,4 +238,4 @@ Block finality is the final outcome of EOSIO consensus. It is achieved after a s
 
 ### 5.4.1. Goal of Finality
 
-The main point of finality is to give users confidence that transactions that were applied prior and up to the LIB block cannot be modified, rolled back, or dropped. The LIB block can also be useful for active nodes to determine quickly and efficiently which branch to build off from, regardless of which is the longest one. This is because a given branch might be longer without containing the most recent LIB, in which case a shorter branch with the most recent LIB must be selected.
+The main point of finality is to give users confidence that transactions that were applied prior and up to the LIB block cannot be modified, rolled back, or dropped. The LIB block can also be useful for active nodes to determine quickly and efficiently which branch to build off from, regardless of which is the longest one. This is because a given branch might be longer without containing the most recent LIB, in which case a shorter branch with the most recent LIB must be selected.

docs/05_community-developer-tools/index.md

@@ -9,6 +9,8 @@ If you would like to submit a tool to be added to the list, please fill in [this
 
 ### Testing Tools and Frameworks
 
+* [EOSlime](https://github.com/LimeChain/eoslime): EOS Javascript development, testing and deployment framework based on eosjs.js. The framework's main purpose is to help developers quickly onboard and start building with confidence.
+
 * [Azakazam](https://github.com/azarusio/azakazam): A development, testing, and deployment framework for EOSIO, aiming to make life easier for developers.
 
 * [Lamington](https://github.com/CoinageCrypto/lamington): The Lamington library includes CLI tools and JavaScript utilities to streamline the EOSIO smart contract building, testing and deployment pipeline.
@@ -46,5 +48,7 @@ If you would like to submit a tool to be added to the list, please fill in [this
 ## Software Development Kits (SDKs)
 * [Zeus SDK](https://github.com/liquidapps-io/zeus-sdk): The Zeus SDK offers a number of functionalities including a command line tool, templates, and a package manager.
 
+* [EOSlime](https://github.com/LimeChain/eoslime): EOSlime could be used as the EOS Javascript SDK. It integrates eosjs and adds on top of that a lot of functionality. Which otherwise a developer should implement himself
+
 [[info | Disclaimer]]
 | The information, links and other material on the website relating to third-party software, hardware, services, networks, blockchains (whether public or private), websites or other resources are provided on an “as-is” basis for your convenience only.  Such resources may be updated, changed or terminated at any time so the information included may be out of date or inaccurate.  The inclusion of any third-party resources does not constitute approval, endorsement or recommendation by us and we disclaim all responsibility and liability for your use of any such third-party resources.