Merge pull request #50 from pmconrad/release_candidate

Release candidate
themuseblockchain · Jan 1, 2018 · 88b1349 · 88b1349
2 parents 983f120 + bf74545
commit 88b1349
Show file tree

Hide file tree

Showing 42 changed files with 3,550 additions and 1,374 deletions.
diff --git a/libraries/app/application.cpp b/libraries/app/application.cpp
@@ -854,6 +854,9 @@ application::~application()
    }
 }
 
+static const string DEFAULT_SEED       = "138.197.68.175:33333";
+static const string DEFAULT_CHECKPOINT = "[3900000,\"003b8260970ee1d4e97f7a18aac40d51d0882365\"]";
+
 void application::set_program_options(boost::program_options::options_description& command_line_options,
                                       boost::program_options::options_description& configuration_file_options) const
 {
@@ -870,8 +873,8 @@ void application::set_program_options(boost::program_options::options_descriptio
    configuration_file_options.add_options()
          ("p2p-endpoint", bpo::value<string>(), "Endpoint for P2P node to listen on")
          ("p2p-max-connections", bpo::value<uint32_t>(), "Maxmimum number of incoming connections on P2P endpoint")
-         ("seed-node,s", bpo::value<vector<string>>()->composing(), "P2P nodes to connect to on startup (may specify multiple times)")
-         ("checkpoint,c", bpo::value<vector<string>>()->composing(), "Pairs of [BLOCK_NUM,BLOCK_ID] that should be enforced as checkpoints.")
+         ("seed-node,s", bpo::value<vector<string>>()->composing()->default_value(vector<string>(1,DEFAULT_SEED), DEFAULT_SEED), "P2P nodes to connect to on startup (may specify multiple times)")
+         ("checkpoint,c", bpo::value<vector<string>>()->composing()->default_value(vector<string>(1,DEFAULT_CHECKPOINT), DEFAULT_CHECKPOINT), "Pairs of [BLOCK_NUM,BLOCK_ID] that should be enforced as checkpoints.")
          ("rpc-endpoint", bpo::value<string>()->implicit_value("127.0.0.1:8090"), "Endpoint for websocket RPC to listen on")
          ("rpc-tls-endpoint", bpo::value<string>()->implicit_value("127.0.0.1:8089"), "Endpoint for TLS websocket RPC to listen on")
          ("server-pem,p", bpo::value<string>()->implicit_value("server.pem"), "The TLS certificate file for this server")

diff --git a/libraries/chain/base_evaluator.cpp b/libraries/chain/base_evaluator.cpp
@@ -93,11 +93,11 @@ void account_create_evaluator::do_apply( const account_create_operation& o )
       FC_ASSERT( o.fee >= wso.median_props.account_creation_fee, "Insufficient Fee: ${f} required, ${p} provided",
               ("f", wso.median_props.account_creation_fee)
               ("p", o.fee) );
+   }
 
-      db().modify( creator, [&]( account_object& c ){
-         c.balance -= o.fee;
-      });
-   }   
+   db().modify( creator, [&o]( account_object& c ){
+      c.balance -= o.fee;
+   });
 
    const auto& new_account = db().create< account_object >( [&]( account_object& acc )
    {