Merge pull request #944 from cyberway/develop

Merge develop -> master

.buildkite/steps/deploy-test.sh

@@ -15,7 +15,7 @@ docker-compose up -d
 
 # Run unit-tests
 sleep 10s
-docker run --network golos-tests_contracts-net -ti cyberway/golos.contracts:$IMAGETAG  /bin/bash -c 'export MONGO_URL=mongodb://mongo:27017; /opt/golos.contracts/unit_test -l message -r detailed && /opt/cyberway.contracts/unit_test -l message -r detailed'
+docker run --network golos-tests_contracts-net -ti cyberway/golos.contracts:$IMAGETAG  /bin/bash -c 'export MONGO_URL=mongodb://mongo:27017; /opt/golos.contracts/unit_test -l message -r detailed'
 result=$?
 
 docker-compose down

CMakeLists.txt

@@ -34,7 +34,7 @@ endif()
 
 macro(add_contract_with_abi TARGET ABIFILE)
    add_executable( ${TARGET}.wasm ${ARGN} )
-   target_compile_options( ${TARGET}.wasm PUBLIC -abigen -std=c++17)
+   target_compile_options( ${TARGET}.wasm PUBLIC -std=c++17)
    configure_file(${ABIFILE} ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}.abi COPYONLY)
    install (TARGETS ${TARGET}.wasm DESTINATION ${CMAKE_INSTALL_PREFIX}/${TARGET}/)
    install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}.abi DESTINATION ${CMAKE_INSTALL_PREFIX}/${TARGET}/)

README.md

@@ -1,23 +1,37 @@
 <img width="400" src="./docs/logo.jpg" />  
 
 *****  
-[![buildkite](https://badge.buildkite.com/cbc4061f218d570917e365bfff8a251c03996f43f35f4deb66.svg?branch=master)](https://buildkite.com/golos.contracts)  
-[![GitHub](https://img.shields.io/github/license/goloschain/golos.contracts.svg)](https://github.com/cyberway/golos.contracts/blob/master/LICENSE)
+[![buildkite](https://badge.buildkite.com/cbc4061f218d570917e365bfff8a251c03996f43f35f4deb66.svg?branch=master)](https://buildkite.com/golos.contracts)
+[![GitHub](https://img.shields.io/github/license/cyberway/cyberway.contracts.svg)](https://github.com/cyberway/cyberway.contracts/blob/master/LICENSE) 
 
 # golos dapp prototype contracts
 
 Build `cyberway.contracts` submodule first, it's wasm/abi files required for tests.
 
 Dependencies:
-* [eosio v1.x.x](https://github.com/EOSIO/eos/releases/tag/v1.3.0)
-* [eosio.cdt v1.x.x](https://github.com/EOSIO/eosio.cdt/releases/tag/v1.2.1)
-
-## Golos Contracts Description
-* [golos.charge contract](https://cyberway.gitbook.io/en/devportal/golos_contracts/golos.charge_contract)
-* [golos.ctrl contract](https://cyberway.gitbook.io/en/devportal/golos_contracts/golos.ctrl_contract)
-* [golos.emit contract](https://cyberway.gitbook.io/en/devportal/golos_contracts/golos.emit_contract)
-* [golos.referral contract](https://cyberway.gitbook.io/en/devportal/golos_contracts/golos.referral_contract)
-* [golos.publication contract](https://cyberway.gitbook.io/en/devportal/golos_contracts/golos.publication_contract)
-* [golos.social contract](https://cyberway.gitbook.io/en/devportal/golos_contracts/golos.social_contract)
-* [golos.vesting contract](https://cyberway.gitbook.io/en/devportal/golos_contracts/golos.vesting_contract)
-* [Determinig rewards for a post](https://cyberway.gitbook.io/en/devportal/golos_contracts/rewards_definition)
+* [cyberway v2.0.x](https://github.com/cyberway/cyberway/releases)
+* [cyberway.cdt v2.0.x](https://github.com/cyberway/cyberway.cdt/tags)
+
+## Golos Contracts Description in English
+* [golos.charge](https://cyberway.gitbook.io/en/devportal/application_contracts/golos_contracts/golos.charge_contract)
+* [golos.ctrl](https://cyberway.gitbook.io/en/devportal/application_contracts/golos_contracts/golos.ctrl_contract)
+* [golos.emit](https://cyberway.gitbook.io/en/devportal/application_contracts/golos_contracts/golos.emit_contract)
+* [golos.referral](https://cyberway.gitbook.io/en/devportal/application_contracts/golos_contracts/golos.referral_contract)
+* [golos.publication](https://cyberway.gitbook.io/en/devportal/application_contracts/golos_contracts/golos.publication_contract)
+* [golos.social](https://cyberway.gitbook.io/en/devportal/application_contracts/golos_contracts/golos.social_contract)
+* [golos.vesting](https://cyberway.gitbook.io/en/devportal/application_contracts/golos_contracts/golos.vesting_contract)
+* [Determinig rewards for a post](https://cyberway.gitbook.io/en/devportal/application_contracts/golos_contracts/rewards_definition)
+
+## Golos Contracts Description in Russian
+* [golos.charge](https://cyberway.gitbook.io/ru/v/devel-ru/developers/golos_contracts/golos.charge_contract)
+* [golos.ctrl](https://cyberway.gitbook.io/ru/v/devel-ru/developers/golos_contracts/golos.ctrl_contract)
+* [golos.emit](https://cyberway.gitbook.io/ru/v/devel-ru/developers/golos_contracts/golos.emit_contract)
+* [golos.referral](https://cyberway.gitbook.io/ru/v/devel-ru/developers/golos_contracts/golos.referral_contract)
+* [golos.publication](https://cyberway.gitbook.io/ru/v/devel-ru/developers/golos_contracts/golos.publication_contract)
+* [golos.social](https://cyberway.gitbook.io/ru/v/devel-ru/developers/golos_contracts/golos.social_contract)
+* [golos.vesting](https://cyberway.gitbook.io/ru/v/devel-ru/developers/golos_contracts/golos.vesting_contract)
+* [Determinig rewards for a post](https://cyberway.gitbook.io/ru/v/devel-ru/developers/golos_contracts/rewards_definition)
+
+## Important
+
+See LICENSE for copyright and license terms. Block.one makes its contribution on a voluntary basis as a member of the CyberWay community and is not responsible for ensuring the overall performance of the software or any related applications. We make no representation, warranty, guarantee or undertaking in respect of the software or any related documentation, whether expressed or implied, including but not limited to the warranties or merchantability, fitness for a particular purpose and noninfringement. In no event shall we be liable for any claim, damages or other liability, whether in an action of contract, tort or otherwise, arising from, out of or in connection with the software or documentation or the use or other dealings in the software or documentation.  Any test results or performance figures are indicative and will not reflect performance under all conditions.  Any reference to any third party or third-party product, service or other resource is not an endorsement or recommendation by Block.one.  We are not responsible, and disclaim any and all responsibility and liability, for your use of or reliance on any of these resources. Third-party resources may be updated, changed or terminated at any time, so the information here may be out of date or inaccurate.

common/config.hpp.in

@@ -45,6 +45,7 @@ static const auto invoice_name = "invoice"_n;          // for golos.vesting:reti
 static const auto issue_name = "issue"_n;              // for golos.emit:emit
 static const auto issuer_name = "issuer"_n;
 static const auto changevest_name = "changevest"_n;    // for golos.ctrl:changevest
+static const auto one_name = "witn.one"_n;
 static const auto super_majority_name = "witn.smajor"_n;
 static const auto majority_name = "witn.major"_n;
 static const auto minority_name = "witn.minor"_n;