Merge branch 'release/v2.0.x' into release/2.0.x

eosiosg · Feb 28, 2019 · 739034c · 739034c
2 parents f84de85 + c8f2607
commit 739034c
Show file tree

Hide file tree

Showing 234 changed files with 2,702 additions and 1,410 deletions.
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -398,6 +398,7 @@ steps:
       - "os=high-sierra"
     artifact_paths:
       - "build/packages/*.tar.gz"
+      - "build/packages/*.rb"
     timeout: 60
 
   - command: |
@@ -412,6 +413,7 @@ steps:
       - "os=mojave"
     artifact_paths:
       - "build/packages/*.tar.gz"
+      - "build/packages/*.rb"
     timeout: 60
 
   - command: |
@@ -507,3 +509,18 @@ steps:
       OS: "el7"
       PKGTYPE: "rpm"
     timeout: 60
+
+  - wait
+
+  - command: |
+        echo "--- :arrow_down: Downloading brew files" && \
+        buildkite-agent artifact download "build/packages/eosio.rb" . --step ":darwin: High Sierra Package Builder" && \
+        mv build/packages/eosio.rb build/packages/eosio_highsierra.rb && \
+        buildkite-agent artifact download "build/packages/eosio.rb" . --step ":darwin: Mojave Package Builder"
+    label: ":darwin: Brew Updater"
+    agents:
+      queue: "automation-large-builder-fleet"
+    artifact_paths:
+      - "build/packages/eosio_highsierra.rb"
+      - "build/packages/eosio.rb"
+    timeout: 60
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
@@ -17,7 +17,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules")
 if (UNIX)
    if (APPLE)
       if (LLVM_DIR STREQUAL "" OR NOT LLVM_DIR)
-         set(LLVM_DIR "/usr/local/Cellar/llvm@4/4.0.1/lib/cmake/llvm")
+         set(LLVM_DIR "/usr/local/opt/llvm@4/lib/cmake/llvm/")
       endif()
    endif()
 endif()
@@ -35,7 +35,7 @@ set( CXX_STANDARD_REQUIRED ON)
 
 set(VERSION_MAJOR 2)
 set(VERSION_MINOR 0)
-set(VERSION_PATCH 1)
+set(VERSION_PATCH 2)
 
 if(VERSION_SUFFIX)
     set(VERSION_FULL "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}-${VERSION_SUFFIX}")

diff --git a/Docker/README.md b/Docker/README.md
@@ -23,7 +23,7 @@ docker build . -t boscore/bos -s BOS
 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 v2.0.1 tag, you could do the following:
 
 ```bash
-docker build -t boscore/bos:v2.0.1 --build-arg branch=v2.0.1 .
+docker build -t boscore/bos:v2.0.2 --build-arg branch=v2.0.2 .
 
 ```
 
@@ -133,46 +133,7 @@ docker volume rm keosd-data-volume
 ```
 
 ### Docker Hub
-
-Docker Hub image available from [docker hub](https://hub.docker.com/r/boscore/bos/).
-Create a new `docker-compose.yaml` file with the content below
-
-```bash
-version: "3"
-
-services:
-  nodeosd:
-    image: boscore/bos:latest
-    command: /opt/eosio/bin/nodeosd.sh --data-dir /opt/eosio/bin/data-dir -e --http-alias=nodeosd:8888 --http-alias=127.0.0.1:8888 --http-alias=localhost:8888
-    hostname: nodeosd
-    ports:
-      - 8888:8888
-      - 9876:9876
-    expose:
-      - "8888"
-    volumes:
-      - nodeos-data-volume:/opt/eosio/bin/data-dir
-
-  keosd:
-    image: boscore/bos:latest
-    command: /opt/eosio/bin/keosd --wallet-dir /opt/eosio/bin/data-dir --http-server-address=127.0.0.1:8900 --http-alias=localhost:8900 --http-alias=keosd:8900
-    hostname: keosd
-    links:
-      - nodeosd
-    volumes:
-      - keosd-data-volume:/opt/eosio/bin/data-dir
-
-volumes:
-  nodeos-data-volume:
-  keosd-data-volume:
-
-```
-
-*NOTE:* the default version is the latest, you can change it to what you want
-
-run `docker pull boscore/bos:latest`
-
-run `docker-compose up`
+Docker Hub images are now deprecated. New build images were discontinued on January 1st, 2019. The existing old images will be removed on June 1st, 2019.
 
 ### BOSCore Testnet
 

diff --git a/Docker/config.ini b/Docker/config.ini
@@ -113,9 +113,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
@@ -32,8 +32,51 @@ As BOS continues to develop, developer rewards will be appropriately adjusted to
 
 BOSCore bases on EOSIO, so you can also referer:
 
-[Getting Started](https://developers.eos.io/eosio-nodeos/docs/overview-1)  
 
-[EOSIO Developer Portal](https://developers.eos.io).
+#### Mac OS X Brew Install
+```sh
+$ brew tap eosio/eosio
+$ brew install eosio
+```
+#### Mac OS X Brew Uninstall
+```sh
+$ brew remove eosio
+```
+#### Ubuntu 18.04 Debian Package Install
+```sh
+$ wget https://github.com/eosio/eos/releases/download/v1.6.2/eosio_1.6.2-1-ubuntu-18.04_amd64.deb
+$ sudo apt install ./eosio_1.6.2-1-ubuntu-18.04_amd64.deb
+```
+#### Ubuntu 16.04 Debian Package Install
+```sh
+$ wget https://github.com/eosio/eos/releases/download/v1.6.2/eosio_1.6.2-1-ubuntu-16.04_amd64.deb
+$ sudo apt install ./eosio_1.6.2-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.6.2/eosio-1.6.2-1.el7.x86_64.rpm
+$ sudo yum install ./eosio-1.6.2-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.6.2/eosio-1.6.2-1.fc27.x86_64.rpm
+$ sudo yum install ./eosio-1.6.2-1.fc27.x86_64.rpm
+```
+#### Fedora RPM Package Uninstall
+```sh
+$ sudo yum remove eosio.cdt
+```
 
+[EOSIO Developer Portal](https://developers.eos.io).
 
+<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-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>