Merge branch 'dev_binaryen_into_source' into dev_cmake_using_finds

.gitmodules

@@ -17,3 +17,6 @@
 	path = contracts/libc++/upstream
 	url = https://github.com/EOSIO/libcxx.git
 	branch = eosio
+[submodule "external/binaryen"]
+	path = external/binaryen
+	url = https://github.com/WebAssembly/binaryen.git

CMakeLists.txt

@@ -164,6 +164,8 @@ if(ENABLE_COVERAGE_TESTING)
   find_program( GENHTML_PATH NAMES genhtml)
 endif()
 
+add_subdirectory(external)
+
 include(wasm)
 if(WASM_TOOLCHAIN_FOUND)
   message(STATUS "Using WASM clang => " ${WASM_CLANG})

external/CMakeLists.txt

+add_subdirectory(binaryen)

binaryen @ 7179572c

+Subproject commit 7179572c7fe842df688bcf6b2a1c08e7623ab284

libraries/chain/chain_controller.cpp

@@ -55,8 +55,12 @@ chain_controller::chain_controller( const chain_controller::controller_config& c
 {
    _initialize_indexes();
 
+   for (auto& f : cfg.applied_block_callbacks)
+      applied_block.connect(f);
    for (auto& f : cfg.applied_irreversible_block_callbacks)
       applied_irreversible_block.connect(f);
+   for (auto& f : cfg.on_pending_transaction_callbacks)
+      on_pending_transaction.connect(f);
 
    contracts::chain_initializer starter(cfg.genesis);
    starter.register_types(*this, _db);

libraries/chain/include/eosio/chain/chain_controller.hpp

@@ -72,12 +72,14 @@ namespace eosio { namespace chain {
             path                           shared_memory_dir   =  config::default_shared_memory_dir;
             uint64_t                       shared_memory_size  =  config::default_shared_memory_size;
             bool                           read_only           =  false;
+            std::vector<signal<void(const block_trace&)>::slot_type> applied_block_callbacks;
             std::vector<signal<void(const signed_block&)>::slot_type> applied_irreversible_block_callbacks;
+            std::vector<signal<void(const transaction_metadata&, const packed_transaction&)>::slot_type> on_pending_transaction_callbacks;
             contracts::genesis_state_type  genesis;
             runtime_limits                 limits;
          };
 
-         chain_controller( const controller_config& cfg );
+         explicit chain_controller( const controller_config& cfg );
          ~chain_controller();
 
 

libraries/chain/include/eosio/chain/config.hpp

@@ -24,8 +24,6 @@ const static uint64_t eosio_all_scope        = N(eosio.all);
 const static uint64_t active_name = N(active);
 const static uint64_t owner_name  = N(owner);
 
-const static share_type initial_token_supply = asset::from_string("1000000000.0000 EOS").amount;
-
 const static int      block_interval_ms = 500;
 const static int      block_interval_us = block_interval_ms*1000;
 const static uint64_t block_timestamp_epoch = 946684800000ll; // epoch is year 2000.

programs/eosioc/main.cpp

@@ -978,9 +978,9 @@ int main( int argc, char** argv ) {
    trxsSubcommand->set_callback([&] {
       fc::variant trx_var;
       try {
-         trx_var = fc::json::from_string(trxJson);
+         trx_var = fc::json::from_string(trxsJson);
       } EOS_CAPTURE_AND_RETHROW(transaction_type_exception, "Fail to parse transaction JSON")
-      auto trxs_result = call(push_txn_func, trx_var);
+      auto trxs_result = call(push_txns_func, trx_var);
       std::cout << fc::json::to_pretty_string(trxs_result) << std::endl;
    });
 

tests/testUtils.py

@@ -331,7 +331,7 @@ class Node(object):
         else:
             for i in range(2):
                 cmd="%s %s" % (Utils.MongoPath, self.mongoEndpointArgs)
-                subcommand='db.Transactions.findOne( { "transaction_id": "%s" } )' % (transId)
+                subcommand='db.Transactions.findOne( { $and : [ { "transaction_id": "%s" }, {"pending":false} ] } )' % (transId)
                 Utils.Debug and Utils.Print("cmd: echo '%s' | %s" % (subcommand, cmd))
                 try:
                     trans=Node.runMongoCmdReturnJson(cmd.split(), subcommand)
@@ -452,6 +452,12 @@ class Node(object):
         transId=Node.getTransId(trans[1])
         self.waitForTransIdOnNode(transId)
 
+        expectedAmount=10000000000000
+        Utils.Print("Verify eosio issue, Expected: %d" % (expectedAmount))
+        actualAmount=self.getAccountBalance(eosio.name)
+        if expectedAmount != actualAmount:
+            Utils.errorExit("Issue verification failed. Excepted %d, actual: %d" % (expectedAmount, actualAmount))
+
         initx = copy.copy(Cluster.initaAccount)
         self.createAccount(Cluster.initaAccount, eosio, 0)
         for i in range(2, 21):