Merge pull request #29 from EOSIO/release/1.1.x

merge 1.1.1 into master

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.5)
-project(eosio_contracts VERSION 1.1.0)
+project(eosio_contracts VERSION 1.1.1)
 
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
    set(TEST_BUILD_TYPE "Debug")

README.md

@@ -1,17 +1,16 @@
 # eosio.contracts
 
-## Version : 1.1.0
+## Version : 1.1.1
 
 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 sudo contracts.
 
-This repository contains examples of these priviledged contracts that are useful when depoying, managing, and/or using an EOSIO blockchain.  They are provided for reference purposes:
+This repository contains examples of these privileged contracts that are useful when deploying, managing, and/or using an EOSIO blockchain.  They are provided for reference purposes:
 
    * [eosio.system](https://github.com/eosio/eosio.contracts/tree/master/eosio.system)
-
    * [eosio.msig](https://github.com/eosio/eosio.contracts/tree/master/eosio.msig)
    * [eosio.sudo](https://github.com/eosio/eosio.contracts/tree/master/eosio.sudo)
-   
-The following unpriviledged contract(s) are also part of the system. 
+
+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.system/src/producer_pay.cpp

@@ -50,7 +50,7 @@ namespace eosiosystem {
          if( (timestamp.slot - _gstate.last_name_close.slot) > blocks_per_day ) {
             name_bid_table bids(_self,_self);
             auto idx = bids.get_index<N(highbid)>();
-            auto highest = idx.begin();
+            auto highest = idx.lower_bound( std::numeric_limits<uint64_t>::max()/2 );
             if( highest != idx.end() &&
                 highest->high_bid > 0 &&
                 highest->last_bid_time < (current_time() - useconds_per_day) &&

tests/eosio.system_tester.hpp

@@ -518,6 +518,7 @@ class eosio_system_tester : public TESTER {
          trx.sign( get_private_key( config::system_account_name, "active" ), control->get_chain_id()  );
          trx.sign( get_private_key( N(producer1111), "active" ), control->get_chain_id()  );
          push_transaction( trx );
+         produce_block();
       }
    }
 

tests/eosio.system_tests.cpp

@@ -2367,6 +2367,21 @@ BOOST_FIXTURE_TEST_CASE( multiple_namebids, eosio_system_tester ) try {
 
 } FC_LOG_AND_RETHROW()
 
+BOOST_FIXTURE_TEST_CASE( namebid_pending_winner, eosio_system_tester ) try {
+   cross_15_percent_threshold();
+   produce_block( fc::hours(14*24) );    //wait 14 day for name auction activation
+   transfer( config::system_account_name, N(alice1111111), core_from_string("10000.0000") );
+   transfer( config::system_account_name, N(bob111111111), core_from_string("10000.0000") );
+
+   BOOST_REQUIRE_EQUAL( success(), bidname( "alice1111111", "prefa", core_from_string( "50.0000" ) ));
+   BOOST_REQUIRE_EQUAL( success(), bidname( "bob111111111", "prefb", core_from_string( "30.0000" ) ));
+   produce_block( fc::hours(100) ); //should close "perfa"
+   produce_block( fc::hours(100) ); //should close "perfb"
+
+   //despite "perfa" account hasn't been created, we should be able to create "perfb" account
+   create_account_with_resources( N(prefb), N(bob111111111) );
+} FC_LOG_AND_RETHROW()
+
 BOOST_FIXTURE_TEST_CASE( vote_producers_in_and_out, eosio_system_tester ) try {
 
    const asset net = core_from_string("80.0000");