Merge pull request #123 from EOSIO/develop

version 1.5.0

Author: arhag

CMakeLists.txt

@@ -1,12 +1,10 @@
 cmake_minimum_required(VERSION 3.5)
-project(eosio_contracts VERSION 1.4.0)
+project(eosio_contracts VERSION 1.5.0)
 
-set(EOSIO_CDT_VERSION_MIN "1.3")
-set(EOSIO_CDT_VERSION_SOFT_MAX "1.3")
+set(EOSIO_CDT_VERSION_MIN "1.4")
+set(EOSIO_CDT_VERSION_SOFT_MAX "1.4")
 #set(EOSIO_CDT_VERSION_HARD_MAX "")
 
-include(CheckVersion.txt)
-
 find_package(eosio.cdt)
 
 ### Check the version of eosio.cdt

CheckVersion.txt

@@ -1,6 +1,6 @@
 # eosio.contracts
 
-## Version : 1.4.0
+## Version : 1.5.0
 
 The design of the EOSIO blockchain calls for a number of smart contracts that are run at a privileged permission level in order to support functions such as block producer registration and voting, token staking for CPU and network bandwidth, RAM purchasing, multi-sig, etc.  These smart contracts are referred to as the system, token, msig and wrap (formerly known as sudo) contracts.
 
@@ -14,8 +14,8 @@ The following unprivileged contract(s) are also part of the system.
    * [eosio.token](https://github.com/eosio/eosio.contracts/tree/master/eosio.token)
 
 Dependencies:
-* [eosio v1.3.x](https://github.com/EOSIO/eos/releases/tag/v1.3.2)
-* [eosio.cdt v1.3.x](https://github.com/EOSIO/eosio.cdt/releases/tag/v1.3.0)
+* [eosio v1.4.x](https://github.com/EOSIO/eos/releases/tag/v1.4.3)
+* [eosio.cdt v1.4.x](https://github.com/EOSIO/eosio.cdt/releases/tag/v1.4.0)
 
 To build the contracts and the unit tests:
 * First, ensure that your __eosio__ is compiled to the core symbol for the EOSIO blockchain that intend to deploy to.

README.md

@@ -2,9 +2,13 @@ include(ExternalProject)
 find_package(Git REQUIRED)
 include(GNUInstallDirs)
 
+string(REPLACE ";" "|" TEST_FRAMEWORK_PATH "${CMAKE_FRAMEWORK_PATH}")
+string(REPLACE ";" "|" TEST_MODULE_PATH "${CMAKE_MODULE_PATH}")
+
 ExternalProject_Add(
   contracts_unit_tests
-  CMAKE_ARGS -DCMAKE_BUILD_TYPE=${TEST_BUILD_TYPE} -DEOSIO_ROOT=${EOSIO_ROOT}
+  LIST_SEPARATOR | # Use the alternate list separator
+  CMAKE_ARGS -DCMAKE_BUILD_TYPE=${TEST_BUILD_TYPE} -DCMAKE_FRAMEWORK_PATH=${TEST_FRAMEWORK_PATH} -DCMAKE_MODULE_PATH=${TEST_MODULE_PATH} -DEOSIO_ROOT=${EOSIO_ROOT}
   SOURCE_DIR ${CMAKE_SOURCE_DIR}/tests
   BINARY_DIR ${CMAKE_BINARY_DIR}/tests
   BUILD_ALWAYS 1

UnitTestsExternalProject.txt

@@ -13,7 +13,8 @@ namespace eosio {
          void propose(ignore<name> proposer, ignore<name> proposal_name,
                ignore<std::vector<permission_level>> requested, ignore<transaction> trx);
          [[eosio::action]]
-         void approve( name proposer, name proposal_name, permission_level level );
+         void approve( name proposer, name proposal_name, permission_level level,
+                       const eosio::binary_extension<eosio::checksum256>& proposal_hash );
          [[eosio::action]]
          void unapprove( name proposer, name proposal_name, permission_level level );
          [[eosio::action]]

eosio.msig/include/eosio.msig/eosio.msig.hpp

@@ -1,6 +1,7 @@
 #include <eosio.msig/eosio.msig.hpp>
 #include <eosiolib/action.hpp>
 #include <eosiolib/permission.hpp>
+#include <eosiolib/crypto.hpp>
 
 namespace eosio {
 
@@ -57,9 +58,17 @@ void multisig::propose( ignore<name> proposer,
    });
 }
 
-void multisig::approve( name proposer, name proposal_name, permission_level level ) {
+void multisig::approve( name proposer, name proposal_name, permission_level level,
+                        const eosio::binary_extension<eosio::checksum256>& proposal_hash )
+{
    require_auth( level );
 
+   if( proposal_hash ) {
+      proposals proptable( _self, proposer.value );
+      auto& prop = proptable.get( proposal_name.value, "proposal not found" );
+      assert_sha256( prop.packed_transaction.data(), prop.packed_transaction.size(), *proposal_hash );
+   }
+
    approvals apptable(  _self, proposer.value );
    auto apps_it = apptable.find( proposal_name.value );
    if ( apps_it != apptable.end() ) {

eosio.msig/src/eosio.msig.cpp

@@ -291,16 +291,15 @@ namespace eosiosystem {
       auto system_token_supply   = eosio::token::get_supply(token_account, core.code() );
       eosio_assert( system_token_supply.symbol == core, "specified core symbol does not exist (precision mismatch)" );
 
-      if( system_token_supply.amount > 0 ) {
-         _rammarket.emplace( _self, [&]( auto& m ) {
-            m.supply.amount = 100000000000000ll;
-            m.supply.symbol = ramcore_symbol;
-            m.base.balance.amount = int64_t(_gstate.free_ram());
-            m.base.balance.symbol = ram_symbol;
-            m.quote.balance.amount = system_token_supply.amount / 1000;
-            m.quote.balance.symbol = core;
-         });
-      }
+      eosio_assert( system_token_supply.amount > 0, "system token supply must be greater than 0" );
+      _rammarket.emplace( _self, [&]( auto& m ) {
+         m.supply.amount = 100000000000000ll;
+         m.supply.symbol = ramcore_symbol;
+         m.base.balance.amount = int64_t(_gstate.free_ram());
+         m.base.balance.symbol = ram_symbol;
+         m.quote.balance.amount = system_token_supply.amount / 1000;
+         m.quote.balance.symbol = core;
+      });
    }
 } /// eosio.system
 

eosio.system/src/eosio.system.cpp

@@ -1,17 +1,10 @@
 cmake_minimum_required( VERSION 3.5 )
 
-set(EOSIO_VERSION_MIN "1.3")
-set(EOSIO_VERSION_SOFT_MAX "1.3")
+set(EOSIO_VERSION_MIN "1.4")
+set(EOSIO_VERSION_SOFT_MAX "1.4")
 #set(EOSIO_VERSION_HARD_MAX "")
 
-include(../CheckVersion.txt)
-
-if(EOSIO_ROOT STREQUAL "" OR NOT EOSIO_ROOT)
-   set(EOSIO_ROOT "/usr/local/eosio")
-endif()
-
-list(APPEND CMAKE_MODULE_PATH ${EOSIO_ROOT}/lib/cmake)
-include(EosioTester)
+find_package(eosio)
 
 ### Check the version of eosio
 set(VERSION_MATCH_ERROR_MSG "")

tests/CMakeLists.txt

@@ -861,4 +861,90 @@ BOOST_FIXTURE_TEST_CASE( approve_by_two_old, eosio_msig_tester ) try {
 
 } FC_LOG_AND_RETHROW()
 
+BOOST_FIXTURE_TEST_CASE( approve_with_hash, eosio_msig_tester ) try {
+   auto trx = reqauth("alice", {permission_level{N(alice), config::active_name}}, abi_serializer_max_time );
+   auto trx_hash = fc::sha256::hash( trx );
+   auto not_trx_hash = fc::sha256::hash( trx_hash );
+
+   push_action( N(alice), N(propose), mvo()
+                  ("proposer",      "alice")
+                  ("proposal_name", "first")
+                  ("trx",           trx)
+                  ("requested", vector<permission_level>{{ N(alice), config::active_name }})
+   );
+
+   //fail to approve with incorrect hash
+   BOOST_REQUIRE_EXCEPTION( push_action( N(alice), N(approve), mvo()
+                                          ("proposer",      "alice")
+                                          ("proposal_name", "first")
+                                          ("level",         permission_level{ N(alice), config::active_name })
+                                          ("proposal_hash", not_trx_hash)
+                            ),
+                            eosio::chain::crypto_api_exception,
+                            fc_exception_message_is("hash mismatch")
+   );
+
+   //approve and execute
+   push_action( N(alice), N(approve), mvo()
+                  ("proposer",      "alice")
+                  ("proposal_name", "first")
+                  ("level",         permission_level{ N(alice), config::active_name })
+                  ("proposal_hash", trx_hash)
+   );
+
+   transaction_trace_ptr trace;
+   control->applied_transaction.connect([&]( const transaction_trace_ptr& t) { if (t->scheduled) { trace = t; } } );
+   push_action( N(alice), N(exec), mvo()
+                  ("proposer",      "alice")
+                  ("proposal_name", "first")
+                  ("executer",      "alice")
+   );
+
+   BOOST_REQUIRE( bool(trace) );
+   BOOST_REQUIRE_EQUAL( 1, trace->action_traces.size() );
+   BOOST_REQUIRE_EQUAL( transaction_receipt::executed, trace->receipt->status );
+} FC_LOG_AND_RETHROW()
+
+BOOST_FIXTURE_TEST_CASE( switch_proposal_and_fail_approve_with_hash, eosio_msig_tester ) try {
+   auto trx1 = reqauth("alice", {permission_level{N(alice), config::active_name}}, abi_serializer_max_time );
+   auto trx1_hash = fc::sha256::hash( trx1 );
+
+   push_action( N(alice), N(propose), mvo()
+                  ("proposer",      "alice")
+                  ("proposal_name", "first")
+                  ("trx",           trx1)
+                  ("requested", vector<permission_level>{{ N(alice), config::active_name }})
+   );
+
+   auto trx2 = reqauth("alice",
+                       { permission_level{N(alice), config::active_name},
+                         permission_level{N(alice), config::owner_name}  },
+                       abi_serializer_max_time );
+
+   push_action( N(alice), N(cancel), mvo()
+                  ("proposer",      "alice")
+                  ("proposal_name", "first")
+                  ("canceler",       "alice")
+   );
+
+   push_action( N(alice), N(propose), mvo()
+                  ("proposer",      "alice")
+                  ("proposal_name", "first")
+                  ("trx",           trx2)
+                  ("requested", vector<permission_level>{ { N(alice), config::active_name },
+                                                          { N(alice), config::owner_name } })
+   );
+
+   //fail to approve with hash meant for old proposal
+   BOOST_REQUIRE_EXCEPTION( push_action( N(alice), N(approve), mvo()
+                                          ("proposer",      "alice")
+                                          ("proposal_name", "first")
+                                          ("level",         permission_level{ N(alice), config::active_name })
+                                          ("proposal_hash", trx1_hash)
+                            ),
+                            eosio::chain::crypto_api_exception,
+                            fc_exception_message_is("hash mismatch")
+   );
+} FC_LOG_AND_RETHROW()
+
 BOOST_AUTO_TEST_SUITE_END()