Skip to content

Y
YTBP

YottaChain / YTBP

通知 0
Star 0
Fork 0
Y
YTBP

体验新版 GitCode，发现更多精彩内容 >>

提交 fea36880 编写于 作者: B Bill Hamilton
浏览文件
操作

Merge branch 'master' into eosio_build_centos 

Merging master into eosio_build_centos
上级 e918f019 e528e5fb
隐藏空白更改
内联 并排
Showing with 53 addition and 56 deletion
.buildkite/coverage.yml
浏览文件 @ fea36880
......@@ -21,7 +21,7 @@ steps:
mounts:
- /etc/buildkite-agent/config:/config
environment:
- BOOST_ROOT=/root/opt/boost_1_66_0
- BOOST_ROOT=/root/opt/boost_1_67_0
- OPENSSL_ROOT_DIR=/usr/include/openssl
- WASM_ROOT=/root/opt/wasm
- PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/root/opt/wasm/bin
......
contracts/eosio.system/delegate_bandwidth.cpp
浏览文件 @ fea36880
......@@ -112,12 +112,10 @@ namespace eosiosystem {
auto quant_after_fee = quant;
quant_after_fee.amount -= fee.amount;
if( payer != N(eosio) ) {
INLINE_ACTION_SENDER(eosio::token, transfer)( N(eosio.token), {payer,N(active)},
{ payer, N(eosio.ram), quant_after_fee, std::string("buy ram") } );
}
INLINE_ACTION_SENDER(eosio::token, transfer)( N(eosio.token), {payer,N(active)},
{ payer, N(eosio.ram), quant_after_fee, std::string("buy ram") } );
if( payer != N(eosio) && fee.amount > 0 ) {
if( fee.amount > 0 ) {
INLINE_ACTION_SENDER(eosio::token, transfer)( N(eosio.token), {payer,N(active)},
{ payer, N(eosio.ramfee), fee, std::string("ram fee") } );
}
......@@ -182,14 +180,12 @@ namespace eosiosystem {
});
set_resource_limits( res_itr->owner, res_itr->ram_bytes, res_itr->net_weight.amount, res_itr->cpu_weight.amount );
if( N(eosio) != account ) {
INLINE_ACTION_SENDER(eosio::token, transfer)( N(eosio.token), {N(eosio.ram),N(active)},
INLINE_ACTION_SENDER(eosio::token, transfer)( N(eosio.token), {N(eosio.ram),N(active)},
{ N(eosio.ram), account, asset(tokens_out), std::string("sell ram") } );
auto fee = tokens_out.amount / 200;
if( fee > 0 ) {
INLINE_ACTION_SENDER(eosio::token, transfer)( N(eosio.token), {account,N(active)},
{ account, N(eosio.ramfee), asset(fee), std::string("sell ram fee") } );
}
auto fee = tokens_out.amount / 200;
if( fee > 0 ) {
INLINE_ACTION_SENDER(eosio::token, transfer)( N(eosio.token), {account,N(active)},
{ account, N(eosio.ramfee), asset(fee), std::string("sell ram fee") } );
}
}
......
eosio_build.sh
浏览文件 @ fea36880
......@@ -143,7 +143,7 @@
export LLVM_DIR=${HOME}/opt/wasm/lib/cmake/llvm
export CMAKE=${HOME}/opt/cmake/bin/cmake
export PATH=${HOME}/opt/mongodb/bin:$PATH
export BOOST_ROOT="${HOME}/opt/boost_1_66_0"
export BOOST_ROOT="${HOME}/opt/boost_1_67_0"
;;
"CentOS Linux")
FILE="${PWD}/scripts/eosio_build_centos.sh"
......@@ -161,7 +161,7 @@
C_COMPILER=clang-4.0
MONGOD_CONF=${HOME}/opt/mongodb/mongod.conf
export PATH=${HOME}/opt/mongodb/bin:$PATH
export BOOST_ROOT="${HOME}/opt/boost_1_66_0"
export BOOST_ROOT="${HOME}/opt/boost_1_67_0"
;;
"Fedora")
FILE="${PWD}/scripts/eosio_build_fedora.sh"
......@@ -169,7 +169,7 @@
C_COMPILER=gcc
MONGOD_CONF=/etc/mongod.conf
export LLVM_DIR=${HOME}/opt/wasm/lib/cmake/llvm
export BOOST_ROOT="${HOME}/opt/boost_1_66_0"
export BOOST_ROOT="${HOME}/opt/boost_1_67_0"
;;
"Linux Mint")
FILE="${PWD}/scripts/eosio_build_ubuntu.sh"
......
scripts/eosio_build_amazon.sh
浏览文件 @ fea36880
......@@ -214,9 +214,9 @@
printf "\\n\\tChecking boost library installation.\\n"
BVERSION=$( grep "BOOST_LIB_VERSION" "${BOOST_ROOT}/include/boost/version.hpp" 2>/dev/null \
| tail -1 | tr -s ' ' | cut -d\ -f3 | sed 's/[^0-9\._]//gI' )
if [ "${BVERSION}" != "1_66" ]; then
if [ "${BVERSION}" != "1_67" ]; then
printf "\\tRemoving existing boost libraries in %s/opt/boost*.\\n" "${HOME}"
if ! rm -rf "${HOME}/opt/boost*"
if ! rm -rf "${HOME}"/opt/boost*
then
printf "\\n\\tUnable to remove deprecated boost libraries at this time.\\n"
printf "\\n\\tExiting now.\\n"
......@@ -230,50 +230,51 @@
exit 1
fi
STATUS=$(curl -LO -w '%{http_code}' --connect-timeout 30 \
"https://dl.bintray.com/boostorg/release/1.66.0/source/boost_1_66_0.tar.bz2" )
"https://dl.bintray.com/boostorg/release/1.67.0/source/boost_1_67_0.tar.bz2" )
if [ "${STATUS}" -ne 200 ]; then
printf "\\tUnable to download Boost libraries at this time.\\n"
printf "\\tExiting now.\\n\\n"
exit 1;
fi
if ! tar xf "${TEMP_DIR}/boost_1_66_0.tar.bz2"
if ! tar xf "${TEMP_DIR}/boost_1_67_0.tar.bz2"
then
printf "\\tUnable to decompress Boost libraries @ %s/boost_1_66_0.tar.bz2 at this time.\\n" "${TEMP_DIR}"
printf "\\tUnable to decompress Boost libraries @ %s/boost_1_67_0.tar.bz2 at this time.\\n" "${TEMP_DIR}"
printf "\\tExiting now.\\n\\n"
exit 1;
fi
if ! rm -f "${TEMP_DIR}/boost_1_66_0.tar.bz2"
if ! rm -f "${TEMP_DIR}/boost_1_67_0.tar.bz2"
then
printf "\\tUnable to remove Boost libraries @ %s/boost_1_66_0.tar.bz2 at this time.\\n" "${TEMP_DIR}"
printf "\\tUnable to remove Boost libraries @ %s/boost_1_67_0.tar.bz2 at this time.\\n" "${TEMP_DIR}"
printf "\\tExiting now.\\n\\n"
exit 1;
fi
if ! cd "${TEMP_DIR}/boost_1_66_0/"
if ! cd "${TEMP_DIR}/boost_1_67_0/"
then
printf "\\tUnable to change directory into %s/boost_1_66_0/ at this time.\\n" "${TEMP_DIR}"
printf "\\tUnable to change directory into %s/boost_1_67_0/ at this time.\\n" "${TEMP_DIR}"
printf "\\tExiting now.\\n\\n"
exit 1;
fi
if ! ./bootstrap.sh "--prefix=$BOOST_ROOT"
if ! ./bootstrap.sh "--prefix=${BOOST_ROOT}"
then
printf "\\n\\tInstallation of boost libraries failed. 0\\n"
printf "\\n\\tExiting now.\\n"
exit 1
fi
if ! ./b2 install
if ! "${TEMP_DIR}"/boost_1_67_0/b2 install
then
printf "\\n\\tInstallation of boost libraries failed. 1\\n"
printf "\\n\\tExiting now.\\n"
exit 1
fi
if ! rm -rf "${TEMP_DIR}/boost_1_66_0/"
if ! rm -rf "${TEMP_DIR}/boost_1_67_0/"
then
printf "\\n\\tUnable to remove boost libraries directory @ %s/boost_1_66_0/.\\n" "${TEMP_DIR}"
printf "\\n\\tUnable to remove boost libraries directory @ %s/boost_1_67_0/.\\n" "${TEMP_DIR}"
printf "\\n\\tExiting now.\\n"
exit 1
fi
printf "\\tBoost successfully installed @ %s/opt/boost_1_67_0.\\n" "${HOME}"
else
printf "\\tBoost 1.66.0 found at %s/opt/boost_1_66_0.\\n" "${HOME}"
printf "\\tBoost 1.67.0 found at %s/opt/boost_1_67_0.\\n" "${HOME}"
fi
printf "\\n\\tChecking MongoDB installation.\\n"
......
scripts/eosio_build_darwin.sh
浏览文件 @ fea36880
......@@ -180,7 +180,7 @@
if [ "${BVERSION}" != "106700" ]; then
if [ ! -z "${BVERSION}" ]; then
printf "\\tFound Boost Version %s.\\n" "${BVERSION}"
printf "\\tEOS.IO requires Boost version 1.66.\\n"
printf "\\tEOS.IO requires Boost version 1.67.\\n"
printf "\\tWould you like to uninstall version %s and install Boost version 1.67.\\n" "${BVERSION}"
select yn in "Yes" "No"; do
case $yn in
......@@ -202,7 +202,7 @@
printf "\\tExiting now.\\n\\n"
exit 1;
fi
if ! sudo rm -rf "/usr/local/lib/libboost*"
if ! sudo rm -rf /usr/local/lib/libboost*
then
printf "\\tUnable to remove boost libraries at this time. 2\\n"
printf "\\tExiting now.\\n\\n"
......
scripts/eosio_build_fedora.sh
浏览文件 @ fea36880
......@@ -58,8 +58,8 @@
fi
DEP_ARRAY=( git gcc.x86_64 gcc-c++.x86_64 autoconf automake libtool make cmake.x86_64 \
bzip2-devel.x86_64 openssl-devel.x86_64 gmp-devel.x86_64 libstdc++-devel.x86_64 \
python3-devel.x86_64 mongodb.x86_64 mongodb-server.x86_64 libedit.x86_64 \
bzip2.x86_64 bzip2-devel.x86_64 openssl-devel.x86_64 gmp-devel.x86_64 libstdc++-devel.x86_64 \
python2-devel.x86_64 python3-devel.x86_64 mongodb.x86_64 mongodb-server.x86_64 libedit.x86_64 \
graphviz.x86_64 doxygen.x86_64 )
COUNT=1
DISPLAY=""
......@@ -158,9 +158,9 @@
printf "\\n\\tChecking boost library installation.\\n"
BVERSION=$( grep "BOOST_LIB_VERSION" "${BOOST_ROOT}/include/boost/version.hpp" 2>/dev/null \
| tail -1 | tr -s ' ' | cut -d\ -f3 | sed 's/[^0-9\._]//gI' )
if [ "${BVERSION}" != "1_66" ]; then
if [ "${BVERSION}" != "1_67" ]; then
printf "\\tRemoving existing boost libraries in %s/opt/boost* .\\n" "${HOME}"
if ! rm -rf "${HOME}/opt/boost*"
if ! rm -rf "${HOME}"/opt/boost*
then
printf "\\n\\tUnable to remove deprecated boost libraries at this time.\\n"
printf "\\tExiting now.\\n\\n"
......@@ -173,51 +173,51 @@
printf "\\tExiting now.\\n\\n"
exit 1;
fi
STATUS=$( curl -LO -w '%{http_code}' --connect-timeout 30 https://dl.bintray.com/boostorg/release/1.66.0/source/boost_1_66_0.tar.bz2 )
STATUS=$( curl -LO -w '%{http_code}' --connect-timeout 30 https://dl.bintray.com/boostorg/release/1.67.0/source/boost_1_67_0.tar.bz2 )
if [ "${STATUS}" -ne 200 ]; then
printf "\\tUnable to download Boost libraries at this time.\\n"
printf "\\tExiting now.\\n\\n"
exit 1;
fi
if ! tar xf "${TEMP_DIR}/boost_1_66_0.tar.bz2"
if ! tar xf "${TEMP_DIR}/boost_1_67_0.tar.bz2"
then
printf "\\n\\tUnable to unarchive file %s/boost_1_66_0.tar.bz2.\\n" "${TEMP_DIR}"
printf "\\n\\tUnable to unarchive file %s/boost_1_67_0.tar.bz2.\\n" "${TEMP_DIR}"
printf "\\tExiting now.\\n\\n"
exit 1;
fi
if ! rm -f "${TEMP_DIR}/boost_1_66_0.tar.bz2"
if ! rm -f "${TEMP_DIR}/boost_1_67_0.tar.bz2"
then
printf "\\n\\tUnable to remove file %s/boost_1_66_0.tar.bz2.\\n" "${TEMP_DIR}"
printf "\\n\\tUnable to remove file %s/boost_1_67_0.tar.bz2.\\n" "${TEMP_DIR}"
printf "\\tExiting now.\\n\\n"
exit 1;
fi
if ! cd "${TEMP_DIR}/boost_1_66_0/"
if ! cd "${TEMP_DIR}/boost_1_67_0/"
then
printf "\\n\\tUnable to enter directory %s/boost_1_66_0.\\n" "${TEMP_DIR}"
printf "\\n\\tUnable to enter directory %s/boost_1_67_0.\\n" "${TEMP_DIR}"
printf "\\tExiting now.\\n\\n"
exit 1;
fi
if ! "${TEMP_DIR}/boost_1_66_0/bootstrap.sh" "--prefix=$BOOST_ROOT"
if ! "${TEMP_DIR}"/boost_1_67_0/bootstrap.sh "--prefix=${BOOST_ROOT}"
then
printf "\\n\\tInstallation of boost libraries failed. 0\\n"
printf "\\tExiting now.\\n\\n"
exit 1;
fi
if ! "${TEMP_DIR}/boost_1_66_0/b2" install
if ! "${TEMP_DIR}"/boost_1_67_0/b2 install
then
printf "\\n\\tInstallation of boost libraries failed. 1\\n"
printf "\\tExiting now.\\n\\n"
exit 1;
fi
if ! rm -rf "${TEMP_DIR}/boost_1_66_0"
if ! rm -rf "${TEMP_DIR}/boost_1_67_0"
then
printf "\\n\\tUnable to remove directory %s/boost_1_66_0. 1\\n" "${TEMP_DIR}"
printf "\\n\\tUnable to remove directory %s/boost_1_67_0. 1\\n" "${TEMP_DIR}"
printf "\\tExiting now.\\n\\n"
exit 1;
fi
printf "\\n\\tBoost 1.66.0 successfully installed at %s/opt/boost_1_66_0.\\n\\n" "${HOME}"
printf "\\n\\tBoost 1.67.0 successfully installed at %s/opt/boost_1_67_0.\\n\\n" "${HOME}"
else
printf "\\tBoost 1.66.0 found at %s/opt/boost_1_66_0.\\n" "${HOME}"
printf "\\tBoost 1.67.0 found at %s/opt/boost_1_67_0.\\n" "${HOME}"
fi
printf "\\n\\tChecking MongoDB C++ driver installation.\\n"
......
unittests/eosio.system_tests.cpp
浏览文件 @ fea36880
......@@ -20,7 +20,6 @@ BOOST_AUTO_TEST_SUITE(eosio_system_tests)
BOOST_FIXTURE_TEST_CASE( buysell, eosio_system_tester ) try {
BOOST_REQUIRE_EQUAL( core_from_string("1000000000.0000"), get_balance( "eosio" ) + get_balance( "eosio.ramfee" ) + get_balance( "eosio.stake" ) );
BOOST_REQUIRE_EQUAL( core_from_string("0.0000"), get_balance( "alice1111111" ) );
transfer( "eosio", "alice1111111", core_from_string("1000.0000"), "eosio" );
......@@ -119,7 +118,6 @@ BOOST_FIXTURE_TEST_CASE( buysell, eosio_system_tester ) try {
BOOST_FIXTURE_TEST_CASE( stake_unstake, eosio_system_tester ) try {
BOOST_REQUIRE_EQUAL( core_from_string("1000000000.0000"), get_balance( "eosio" ) + get_balance( "eosio.ramfee" ) + get_balance( "eosio.stake" ) );
BOOST_REQUIRE_EQUAL( core_from_string("0.0000"), get_balance( "alice1111111" ) );
transfer( "eosio", "alice1111111", core_from_string("1000.0000"), "eosio" );
......
unittests/eosio_system_tester.hpp
浏览文件 @ fea36880
......@@ -82,8 +82,7 @@ public:
create_account_with_resources( N(bob111111111), config::system_account_name, core_from_string("0.4500"), false );
create_account_with_resources( N(carol1111111), config::system_account_name, core_from_string("1.0000"), false );
BOOST_REQUIRE_EQUAL( core_from_string("1000000000.0000"), get_balance("eosio") + get_balance("eosio.ramfee") + get_balance("eosio.stake"));
BOOST_REQUIRE_EQUAL( core_from_string("1000000000.0000"), get_balance("eosio") + get_balance("eosio.ramfee") + get_balance("eosio.stake") + get_balance("eosio.ram") );
}
......
unittests/multisig_tests.cpp
浏览文件 @ fea36880
......@@ -420,7 +420,8 @@ BOOST_FIXTURE_TEST_CASE( update_system_contract_all_approve, eosio_msig_tester )
create_currency( N(eosio.token), config::system_account_name, core_from_string("10000000000.0000") );
issue(config::system_account_name, core_from_string("1000000000.0000"));
BOOST_REQUIRE_EQUAL( core_from_string("1000000000.0000"), get_balance("eosio") + get_balance("eosio.ramfee") + get_balance("eosio.stake") );
BOOST_REQUIRE_EQUAL( core_from_string("1000000000.0000"),
get_balance("eosio") + get_balance("eosio.ramfee") + get_balance("eosio.stake") + get_balance("eosio.ram") );
set_code( config::system_account_name, eosio_system_wast );
set_abi( config::system_account_name, eosio_system_abi );
......@@ -431,7 +432,8 @@ BOOST_FIXTURE_TEST_CASE( update_system_contract_all_approve, eosio_msig_tester )
create_account_with_resources( N(bob111111111), N(eosio), core_from_string("0.4500"), false );
create_account_with_resources( N(carol1111111), N(eosio), core_from_string("1.0000"), false );
BOOST_REQUIRE_EQUAL( core_from_string("1000000000.0000"), get_balance("eosio") + get_balance("eosio.ramfee") + get_balance("eosio.stake") );
BOOST_REQUIRE_EQUAL( core_from_string("1000000000.0000"),
get_balance("eosio") + get_balance("eosio.ramfee") + get_balance("eosio.stake") + get_balance("eosio.ram") );
vector<permission_level> perm = { { N(alice), config::active_name }, { N(bob), config::active_name },
{N(carol), config::active_name} };
......@@ -541,7 +543,8 @@ BOOST_FIXTURE_TEST_CASE( update_system_contract_major_approve, eosio_msig_tester
create_account_with_resources( N(bob111111111), N(eosio), core_from_string("0.4500"), false );
create_account_with_resources( N(carol1111111), N(eosio), core_from_string("1.0000"), false );
BOOST_REQUIRE_EQUAL( core_from_string("1000000000.0000"), get_balance("eosio") + get_balance("eosio.ramfee") + get_balance("eosio.stake") );
BOOST_REQUIRE_EQUAL( core_from_string("1000000000.0000"),
get_balance("eosio") + get_balance("eosio.ramfee") + get_balance("eosio.stake") + get_balance("eosio.ram") );
vector<permission_level> perm = { { N(alice), config::active_name }, { N(bob), config::active_name },
{N(carol), config::active_name}, {N(apple), config::active_name}};
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或