Merge master into slim

CMakeLists.txt

@@ -18,7 +18,7 @@ set( CMAKE_CXX_STANDARD 14 )
 set( CMAKE_CXX_EXTENSIONS ON )
 set( CXX_STANDARD_REQUIRED ON)
 
-set(VERSION_MAJOR 3)
+set(VERSION_MAJOR 4)
 set(VERSION_MINOR 0)
 set(VERSION_PATCH 0)
 

Docker/README.md

@@ -9,7 +9,8 @@ Simple and fast setup of EOS.IO on Docker is also available.
 
 ## Docker Requirement
 
-- At least 8GB RAM (Docker -> Preferences -> Advanced -> Memory -> 8GB or above)
+- At least 7GB RAM (Docker -> Preferences -> Advanced -> Memory -> 7GB or above)
+- If the build below fails, make sure you've adjusted Docker Memory settings and try again.
 
 ## Build eos image
 
@@ -53,14 +54,14 @@ docker volume create --name=keosd-data-volume
 docker-compose up -d
 ```
 
-After `docker-compose up -d`, two services named `nodeosd` and `keosd` will be started. nodeos service would expose ports 8888 and 9876 to the host. keosd service does not expose any port to the host, it is only accessible to cleos when runing cleos is running inside the keosd container as described in "Execute cleos commands" section.
+After `docker-compose up -d`, two services named `nodeosd` and `keosd` will be started. nodeos service would expose ports 8888 and 9876 to the host. keosd service does not expose any port to the host, it is only accessible to cleos when running cleos is running inside the keosd container as described in "Execute cleos commands" section.
 
 ### Execute cleos commands
 
 You can run the `cleos` commands via a bash alias.
 
 ```bash
-alias cleos='docker-compose exec keosd /opt/eosio/bin/cleos -H nodeosd'
+alias cleos='docker-compose exec keosd /opt/eosio/bin/cleos -u http://nodeosd:8888'
 cleos get info
 cleos get account inita
 ```
@@ -77,6 +78,31 @@ If you don't need keosd afterwards, you can stop the keosd service using
 docker-compose stop keosd
 ```
 
+### Develop/Build custom contracts
+
+Due to the fact that the eosio/eos image does not contain the required dependencies for contract development (this is by design, to keep the image size small), you will need to utilize eosio/builder. However, eosio/builder does not contain eosiocpp. As such, you will need to run eosio/builder interactively, and clone, build and install EOS. Once this is complete, you can then utilize eosiocpp to compile your contracts.
+
+You can also create a Dockerfile that will do this for you.
+
+```
+FROM eosio/builder
+
+RUN git clone -b master --depth 1 https://github.com/EOSIO/eos.git --recursive \
+    && cd eos \
+    && cmake -H. -B"/tmp/build" -GNinja -DCMAKE_BUILD_TYPE=Release -DWASM_ROOT=/opt/wasm -DCMAKE_CXX_COMPILER=clang++ \
+       -DCMAKE_C_COMPILER=clang -DSecp256k1_ROOT_DIR=/usr/local -DBUILD_MONGO_DB_PLUGIN=true \
+    && cmake --build /tmp/build --target install && rm -rf /tmp/build /eos
+```
+
+Then, from the same directory as the Dockerfile, simply run:
+
+```bash
+docker build -t eosio/contracts .
+docker run -it -v /path/to/custom/contracts:/contracts eosio/contracts /bin/bash
+```
+
+At this time you should be at a bash shell. You can navigate into the /contracts directory and use eosiocpp to compile your custom contracts.
+
 ### Change default configuration
 
 You can use docker compose override file to change the default configurations. For example, create an alternate config file `config2.ini` and a `docker-compose.override.yml` with the following content.
@@ -143,15 +169,15 @@ volumes:
 
 ```
 
-*NOTE:* the defalut version is the latest, you can change it to what you want
+*NOTE:* the default version is the latest, you can change it to what you want
 
-run `docker pull eosio/eos:latest` 
+run `docker pull eosio/eos:latest`
 
 run `docker-compose up`
 
-### Dawn3.0 Testnet
+### Dawn 4.0 Testnet
 
-We can easliy set up a dawn3.0 local testnet using docker images. Just run the following commands:
+We can easily set up a Dawn 4.0 local testnet using docker images. Just run the following commands:
 
 Note: if you want to use the mongo db plugin, you have to enable it in your `data-dir/config.ini` first.
 
@@ -164,17 +190,17 @@ docker volume create --name=nodeos-data-volume
 docker volume create --name=keosd-data-volume
 docker volume create --name=mongo-data-volume
 # start containers
-docker-compose -f docker-compose-dawn3.0.yaml up -d
+docker-compose -f docker-compose-dawn4.0.yaml up -d
 # get chain info
 curl http://127.0.0.1:8888/v1/chain/get_info
 # get logs
 docker-compose logs nodeosd
 # stop containers
-docker-compose -f docker-compose-dawn3.0.yaml down
+docker-compose -f docker-compose-dawn4.0.yaml down
 ```
 
 The `blocks` data are stored under `--data-dir` by default, and the wallet files are stored under `--wallet-dir` by default, of course you can change these as you want.
 
 ### About MongoDB Plugin
 
-Currently, the mongodb plugin is disabled in `config.ini` by default, you have to change it manually in `config.ini` or you can mount a `config.ini` file to `/opt/eosio/bin/data-dir/config.ini` in the docker-compose file.
+Currently, the mongodb plugin is disabled in `config.ini` by default, you have to change it manually in `config.ini` or you can mount a `config.ini` file to `/opt/eosio/bin/data-dir/config.ini` in the docker-compose file.

Docker/nodeosd.sh

@@ -7,12 +7,6 @@ if [ -f '/opt/eosio/bin/data-dir/config.ini' ]; then
     cp /config.ini /opt/eosio/bin/data-dir
 fi
 
-if [ -f '/opt/eosio/bin/data-dir/genesis.json' ]; then
-    echo
-  else
-    cp /genesis.json /opt/eosio/bin/data-dir
-fi
-
 if [ -d '/opt/eosio/bin/data-dir/contracts' ]; then
     echo
   else

README.md

@@ -22,6 +22,7 @@ EOSIO currently supports the following operating systems:
 3. [EOSIO Blog](https://medium.com/eosio)
 8. [EOSIO Documentation Wiki](https://github.com/EOSIO/eos/wiki)
 2. [EOSIO API Documentation](https://eosio.github.io/eos/)
+1. [EOSIO StackExchange for Q&A](https://eosio.stackexchange.com/)
 4. [Community Telegram Group](https://t.me/EOSProject)
 5. [Developer Telegram Group](https://t.me/joinchat/EaEnSUPktgfoI-XPfMYtcQ)
 6. [White Paper](https://github.com/EOSIO/Documentation/blob/master/TechnicalWhitePaper.md)