Merge branch 'dev_master' into testnet

gxchain · Nov 30, 2018 · 5068f14 · 5068f14
2 parents 545ecc2 + b9304b3
commit 5068f14
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/libraries/app/database_api_impl.cpp b/libraries/app/database_api_impl.cpp
@@ -1283,6 +1283,12 @@ vector< fc::variant > database_api_impl::get_required_fees( const vector<operati
        return result;
    }
 
+
+   transaction trx;
+   for( operation& op : _ops )
+	   trx.operations.push_back(op);
+   _db.set_cur_trx(&trx);
+
    for( operation& op : _ops )
    {
        if (op.which() == operation::tag<contract_call_operation>::value) {
@@ -1327,6 +1333,8 @@ vector< fc::variant > database_api_impl::get_required_fees( const vector<operati
            result.push_back(helper.set_op_fees(op));
       }
    }
+
+   _db.set_cur_trx(nullptr);
    return result;
 }
 

diff --git a/libraries/chain/wasm_interface.cpp b/libraries/chain/wasm_interface.cpp
@@ -1083,7 +1083,7 @@ class context_free_transaction_api : public context_aware_api {
       int read_transaction(array_ptr<char> data, size_t buffer_size)
       {
           const transaction* cur_trx = context.db().get_cur_trx();
-          FC_ASSERT(nullptr != cur_trx, "cur_trx is null");
+          FC_ASSERT(nullptr != cur_trx, "current transaction not set");
           bytes trx = fc::raw::pack(*cur_trx);
 
           auto s = trx.size();
@@ -1097,6 +1097,7 @@ class context_free_transaction_api : public context_aware_api {
 
       int transaction_size() {
           const transaction* trx = context.db().get_cur_trx();
+          FC_ASSERT(nullptr != trx, "current transaction not set");
           return fc::raw::pack(*trx).size();
       }