Merge pull request #110 from EOSIO/master

Pull from upstream
EOS-Mainnet · Jan 16, 2019 · 603895d · 603895d
2 parents a4d4f02 + 3fddb72
commit 603895d
Show file tree

Hide file tree

Showing 224 changed files with 2,128 additions and 1,115 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -29,4 +29,4 @@
 	url = https://github.com/EOSIO/fc
 [submodule "libraries/wabt"]
 	path = libraries/wabt
-	url = http://github.com/EOSIO/wabt
+	url = https://github.com/EOSIO/wabt
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -34,8 +34,8 @@ set( CMAKE_CXX_EXTENSIONS ON )
 set( CXX_STANDARD_REQUIRED ON)
 
 set(VERSION_MAJOR 1)
-set(VERSION_MINOR 5)
-set(VERSION_PATCH 1)
+set(VERSION_MINOR 6)
+set(VERSION_PATCH 0)
 
 if(VERSION_SUFFIX)
     set(VERSION_FULL "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}-${VERSION_SUFFIX}")

diff --git a/Docker/README.md b/Docker/README.md
@@ -20,10 +20,10 @@ cd eos/Docker
 docker build . -t eosio/eos
 ```
 
-The above will build off the most recent commit to the master branch by default. If you would like to target a specific branch/tag, you may use a build argument. For example, if you wished to generate a docker image based off of the v1.5.1 tag, you could do the following:
+The above will build off the most recent commit to the master branch by default. If you would like to target a specific branch/tag, you may use a build argument. For example, if you wished to generate a docker image based off of the 1.6.0 tag, you could do the following:
 
 ```bash
-docker build -t eosio/eos:v1.5.1 --build-arg branch=v1.5.1 .
+docker build -t eosio/eos:1.6.0 --build-arg branch=1.6.0 .
 ```
 
 By default, the symbol in eosio.system is set to SYS. You can override this using the symbol argument while building the docker image.

diff --git a/Docker/config.ini b/Docker/config.ini
@@ -110,9 +110,6 @@ network-version-match = 0
 # number of blocks to retrieve in a chunk from any individual peer during synchronization (eosio::net_plugin)
 sync-fetch-span = 100
 
-# maximum sizes of transaction or block messages that are sent without first sending a notice (eosio::net_plugin)
-max-implicit-request = 1500
-
 # Enable block production, even if the chain is stale. (eosio::producer_plugin)
 enable-stale-production = false
 

diff --git a/README.md b/README.md
@@ -39,31 +39,31 @@ $ brew remove eosio
 ```
 #### Ubuntu 18.04 Debian Package Install
 ```sh
-$ wget https://github.com/eosio/eos/releases/download/v1.5.1/eosio_1.5.1-1-ubuntu-18.04_amd64.deb
-$ sudo apt install ./eosio_1.5.1-1-ubuntu-18.04_amd64.deb
+$ wget https://github.com/eosio/eos/releases/download/v1.6.0/eosio_1.6.0-1-ubuntu-18.04_amd64.deb
+$ sudo apt install ./eosio_1.6.0-1-ubuntu-18.04_amd64.deb
 ```
 #### Ubuntu 16.04 Debian Package Install
 ```sh
-$ wget https://github.com/eosio/eos/releases/download/v1.5.1/eosio_1.5.1-1-ubuntu-16.04_amd64.deb
-$ sudo apt install ./eosio_1.5.1-1-ubuntu-16.04_amd64.deb
+$ wget https://github.com/eosio/eos/releases/download/v1.6.0/eosio_1.6.0-1-ubuntu-16.04_amd64.deb
+$ sudo apt install ./eosio_1.6.0-1-ubuntu-16.04_amd64.deb
 ```
 #### Debian Package Uninstall
 ```sh
 $ sudo apt remove eosio
 ```
 #### Centos RPM Package Install
 ```sh
-$ wget https://github.com/eosio/eos/releases/download/v1.5.1/eosio-1.5.1-1.el7.x86_64.rpm
-$ sudo yum install ./eosio-1.5.1-1.el7.x86_64.rpm
+$ wget https://github.com/eosio/eos/releases/download/v1.6.0/eosio-1.6.0-1.el7.x86_64.rpm
+$ sudo yum install ./eosio-1.6.0-1.el7.x86_64.rpm
 ```
 #### Centos RPM Package Uninstall
 ```sh
 $ sudo yum remove eosio.cdt
 ```
 #### Fedora RPM Package Install
 ```sh
-$ wget https://github.com/eosio/eos/releases/download/v1.5.1/eosio-1.5.1-1.fc27.x86_64.rpm
-$ sudo yum install ./eosio-1.5.1-1.fc27.x86_64.rpm
+$ wget https://github.com/eosio/eos/releases/download/v1.6.0/eosio-1.6.0-1.fc27.x86_64.rpm
+$ sudo yum install ./eosio-1.6.0-1.fc27.x86_64.rpm
 ```
 #### Fedora RPM Package Uninstall
 ```sh
@@ -92,4 +92,4 @@ EOSIO currently supports the following operating systems:
 
 <a name="gettingstarted"></a>
 ## Getting Started
-Instructions detailing the process of getting the software, building it, running a simple test network that produces blocks, account creation and uploading a sample contract to the blockchain can be found in [Getting Started](https://developers.eos.io/eosio-nodeos/docs/overview-1) on the [EOSIO Developer Portal](https://developers.eos.io).
+Instructions detailing the process of getting the software, building it, running a simple test network that produces blocks, account creation and uploading a sample contract to the blockchain can be found in [Getting Started](https://developers.eos.io/eosio-home/docs) on the [EOSIO Developer Portal](https://developers.eos.io).
diff --git a/contracts/asserter/asserter.cpp b/contracts/asserter/asserter.cpp
@@ -1,6 +1,6 @@
 /**
  *  @file
- *  @copyright defined in eos/LICENSE.txt
+ *  @copyright defined in eos/LICENSE
  */
 
 #include <asserter/asserter.hpp> /// defines assert_def struct (abi)

diff --git a/contracts/asserter/asserter.hpp b/contracts/asserter/asserter.hpp
@@ -1,6 +1,6 @@
 /**
  *  @file
- *  @copyright defined in eos/LICENSE.txt
+ *  @copyright defined in eos/LICENSE
  */
 
 #include <eosiolib/eosio.hpp>

diff --git a/contracts/eosio.system/delegate_bandwidth.cpp b/contracts/eosio.system/delegate_bandwidth.cpp
@@ -1,6 +1,6 @@
 /**
  *  @file
- *  @copyright defined in eos/LICENSE.txt
+ *  @copyright defined in eos/LICENSE
  */
 #include "eosio.system.hpp"
 

diff --git a/contracts/eosio.system/eosio.system.hpp b/contracts/eosio.system/eosio.system.hpp
@@ -1,6 +1,6 @@
 /**
  *  @file
- *  @copyright defined in eos/LICENSE.txt
+ *  @copyright defined in eos/LICENSE
  */
 #pragma once
 

diff --git a/contracts/eosio.system/native.hpp b/contracts/eosio.system/native.hpp
@@ -1,6 +1,6 @@
 /**
  *  @file
- *  @copyright defined in eos/LICENSE.txt
+ *  @copyright defined in eos/LICENSE
  */
 #pragma once
 

diff --git a/contracts/eosio.system/voting.cpp b/contracts/eosio.system/voting.cpp
@@ -1,6 +1,6 @@
 /**
  *  @file
- *  @copyright defined in eos/LICENSE.txt
+ *  @copyright defined in eos/LICENSE
  */
 #include "eosio.system.hpp"
 

diff --git a/contracts/eosio.token/eosio.token.cpp b/contracts/eosio.token/eosio.token.cpp
@@ -1,6 +1,6 @@
 /**
  *  @file
- *  @copyright defined in eos/LICENSE.txt
+ *  @copyright defined in eos/LICENSE
  */
 
 #include "eosio.token.hpp"

diff --git a/contracts/eosio.token/eosio.token.hpp b/contracts/eosio.token/eosio.token.hpp
@@ -1,6 +1,6 @@
 /**
  *  @file
- *  @copyright defined in eos/LICENSE.txt
+ *  @copyright defined in eos/LICENSE
  */
 #pragma once
 

diff --git a/contracts/eosiolib/action.h b/contracts/eosiolib/action.h
@@ -1,6 +1,6 @@
 /**
  *  @file
- *  @copyright defined in eos/LICENSE.txt
+ *  @copyright defined in eos/LICENSE
  */
 #pragma once
 #include <eosiolib/system.h>

diff --git a/contracts/eosiolib/action.hpp b/contracts/eosiolib/action.hpp
@@ -1,6 +1,6 @@
 /**
  *  @file
- *  @copyright defined in eos/LICENSE.txt
+ *  @copyright defined in eos/LICENSE
  */
 #pragma once
 #include <eosiolib/action.h>

diff --git a/contracts/eosiolib/chain.h b/contracts/eosiolib/chain.h
@@ -1,6 +1,6 @@
 /**
  *  @file
- *  @copyright defined in eos/LICENSE.txt
+ *  @copyright defined in eos/LICENSE
  */
 #pragma once
 

diff --git a/contracts/eosiolib/compiler_builtins.h b/contracts/eosiolib/compiler_builtins.h
@@ -1,6 +1,6 @@
 /**
  *  @file
- *  @copyright defined in eos/LICENSE.txt
+ *  @copyright defined in eos/LICENSE
  */
 #pragma once
 

diff --git a/contracts/eosiolib/core_symbol.hpp.in b/contracts/eosiolib/core_symbol.hpp.in
@@ -1,5 +1,5 @@
 /** @file 
- *    @copyright defined in eos/LICENSE.txt 
+ *    @copyright defined in eos/LICENSE 
  *
  * \warning This file is machine generated. DO NOT EDIT.  See core_symbol.hpp.in for changes.
  */

diff --git a/contracts/eosiolib/crypto.h b/contracts/eosiolib/crypto.h
@@ -1,6 +1,6 @@
 /**
  *  @file
- *  @copyright defined in eos/LICENSE.txt
+ *  @copyright defined in eos/LICENSE
  */
 #pragma once
 #include <eosiolib/types.h>

diff --git a/contracts/eosiolib/datastream.hpp b/contracts/eosiolib/datastream.hpp
@@ -1,6 +1,6 @@
 /**
  *  @file datastream.hpp
- *  @copyright defined in eos/LICENSE.txt
+ *  @copyright defined in eos/LICENSE
  */
 #pragma once
 #include <eosiolib/system.h>

diff --git a/contracts/eosiolib/db.h b/contracts/eosiolib/db.h
@@ -1,6 +1,6 @@
 /**
  *  @file db.h
- *  @copyright defined in eos/LICENSE.txt
+ *  @copyright defined in eos/LICENSE
  *  @brief Defines C API for interfacing with blockchain database
  */
 #pragma once

diff --git a/contracts/eosiolib/eosio.hpp b/contracts/eosiolib/eosio.hpp
@@ -1,6 +1,6 @@
 /**
  *  @file
- *  @copyright defined in eos/LICENSE.txt
+ *  @copyright defined in eos/LICENSE
  */
 #pragma once
 #include <eosiolib/types.hpp>

diff --git a/contracts/eosiolib/fixed_key.hpp b/contracts/eosiolib/fixed_key.hpp
@@ -1,6 +1,6 @@
 /**
  *  @file
- *  @copyright defined in eos/LICENSE.txt
+ *  @copyright defined in eos/LICENSE
  */
 #pragma once
 

diff --git a/contracts/eosiolib/memory.h b/contracts/eosiolib/memory.h
@@ -1,6 +1,6 @@
 /**
  *  @file
- *  @copyright defined in eos/LICENSE.txt
+ *  @copyright defined in eos/LICENSE
  */
 #pragma once
 

diff --git a/contracts/eosiolib/memory.hpp b/contracts/eosiolib/memory.hpp
@@ -1,6 +1,6 @@
 /**
  *  @file
- *  @copyright defined in eos/LICENSE.txt
+ *  @copyright defined in eos/LICENSE
  */
 #pragma once
 

diff --git a/contracts/eosiolib/multi_index.hpp b/contracts/eosiolib/multi_index.hpp
@@ -1,6 +1,6 @@
 /**
  *  @file
- *  @copyright defined in eos/LICENSE.txt
+ *  @copyright defined in eos/LICENSE
  */
 #pragma once
 

diff --git a/contracts/eosiolib/permission.h b/contracts/eosiolib/permission.h
@@ -1,6 +1,6 @@
 /**
  *  @file
- *  @copyright defined in eos/LICENSE.txt
+ *  @copyright defined in eos/LICENSE
  */
 #pragma once
 #include <eosiolib/types.h>

diff --git a/contracts/eosiolib/permission.hpp b/contracts/eosiolib/permission.hpp
@@ -1,6 +1,6 @@
 /**
  *  @file
- *  @copyright defined in eos/LICENSE.txt
+ *  @copyright defined in eos/LICENSE
  */
 #pragma once
 

diff --git a/contracts/eosiolib/print.h b/contracts/eosiolib/print.h
@@ -1,6 +1,6 @@
 /**
  *  @file
- *  @copyright defined in eos/LICENSE.txt
+ *  @copyright defined in eos/LICENSE
  */
 #pragma once
 

diff --git a/contracts/eosiolib/print.hpp b/contracts/eosiolib/print.hpp
@@ -1,6 +1,6 @@
 /**
  *  @file
- *  @copyright defined in eos/LICENSE.txt
+ *  @copyright defined in eos/LICENSE
  */
 #pragma once
 #include <eosiolib/print.h>

diff --git a/contracts/eosiolib/system.h b/contracts/eosiolib/system.h
@@ -1,6 +1,6 @@
 /**
  *  @file
- *  @copyright defined in eos/LICENSE.txt
+ *  @copyright defined in eos/LICENSE
  */
 #pragma once
 #include <eosiolib/types.h>

diff --git a/contracts/eosiolib/transaction.h b/contracts/eosiolib/transaction.h
@@ -1,6 +1,6 @@
 /**
  *  @file
- *  @copyright defined in eos/LICENSE.txt
+ *  @copyright defined in eos/LICENSE
  */
 #pragma once
 #include <eosiolib/types.h>

diff --git a/contracts/eosiolib/transaction.hpp b/contracts/eosiolib/transaction.hpp
@@ -1,6 +1,6 @@
 /**
  *  @file
- *  @copyright defined in eos/LICENSE.txt
+ *  @copyright defined in eos/LICENSE
  */
 #pragma once
 #include <eosiolib/transaction.h>

diff --git a/contracts/eosiolib/types.h b/contracts/eosiolib/types.h
@@ -1,6 +1,6 @@
 /**
  *  @file
- *  @copyright defined in eos/LICENSE.txt
+ *  @copyright defined in eos/LICENSE
  */
 #pragma once
 

diff --git a/contracts/eosiolib/types.hpp b/contracts/eosiolib/types.hpp
@@ -1,6 +1,6 @@
 /**
  *  @file
- *  @copyright defined in eos/LICENSE.txt
+ *  @copyright defined in eos/LICENSE
  */
 #pragma once
 #include <eosiolib/types.h>

diff --git a/contracts/eosiolib/varint.hpp b/contracts/eosiolib/varint.hpp
@@ -1,6 +1,6 @@
 /**
  *  @file
- *  @copyright defined in eos/LICENSE.txt
+ *  @copyright defined in eos/LICENSE
  */
 #pragma once
 

diff --git a/contracts/noop/noop.cpp b/contracts/noop/noop.cpp
@@ -1,6 +1,6 @@
 /**
  *  @file
- *  @copyright defined in eos/LICENSE.txt
+ *  @copyright defined in eos/LICENSE
  */
 
 #include <eosiolib/eosio.hpp>

diff --git a/contracts/proxy/proxy.cpp b/contracts/proxy/proxy.cpp
@@ -1,6 +1,6 @@
 /**
  *  @file
- *  @copyright defined in eos/LICENSE.txt
+ *  @copyright defined in eos/LICENSE
  */
 #include <proxy/proxy.hpp>
 #include <eosiolib/transaction.hpp>

diff --git a/contracts/proxy/proxy.hpp b/contracts/proxy/proxy.hpp
@@ -1,6 +1,6 @@
 /**
  *  @file
- *  @copyright defined in eos/LICENSE.txt
+ *  @copyright defined in eos/LICENSE
  */
 #pragma once
 

diff --git a/contracts/skeleton/skeleton.hpp b/contracts/skeleton/skeleton.hpp
@@ -1,6 +1,6 @@
 /**
  *  @file
- *  @copyright defined in eos/LICENSE.txt
+ *  @copyright defined in eos/LICENSE
  */
 #include <eosiolib/eosio.hpp>
 

diff --git a/contracts/stltest/stltest.cpp b/contracts/stltest/stltest.cpp
@@ -1,6 +1,6 @@
 /**
  *  @file
- *  @copyright defined in eos/LICENSE.txt
+ *  @copyright defined in eos/LICENSE
  */
 // include entire libc
 #include <alloca.h>

diff --git a/contracts/test_api/test_action.cpp b/contracts/test_api/test_action.cpp
@@ -1,6 +1,6 @@
 /**
  * @file action_test.cpp
- * @copyright defined in eos/LICENSE.txt
+ * @copyright defined in eos/LICENSE
  */
 #include <eosiolib/action.hpp>
 #include <eosiolib/transaction.hpp>

diff --git a/contracts/test_api/test_api.cpp b/contracts/test_api/test_api.cpp
@@ -1,6 +1,6 @@
 /**
  *  @file
- *  @copyright defined in eos/LICENSE.txt
+ *  @copyright defined in eos/LICENSE
  */
 #include <eosiolib/eosio.hpp>
 #include <eosiolib/transaction.hpp>

diff --git a/contracts/test_api/test_api.hpp b/contracts/test_api/test_api.hpp
@@ -1,6 +1,6 @@
 /**
  *  @file
- *  @copyright defined in eos/LICENSE.txt
+ *  @copyright defined in eos/LICENSE
  */
 #pragma once
 #include "test_api_common.hpp"