Skip to content

Y
YTBP

YottaChain / YTBP

通知 0
Star 0
Fork 0
Y
YTBP

体验新版 GitCode，发现更多精彩内容 >>

提交 18009d1e 编写于 作者: D Daniel Larimer
浏览文件
操作

Add delay_sec field, not yet using it #2001

上级 ddb1756b
隐藏空白更改
内联 并排
Showing with 71 addition and 40 deletion
contracts/eosiolib/transaction.hpp
浏览文件 @ 18009d1e
......@@ -38,12 +38,13 @@ namespace eosio {
uint16_t ref_block_num;
uint32_t ref_block_prefix;
unsigned_int net_usage_words = 0UL; /// number of 8 byte words this transaction can serialize into after compressions
unsigned_int context_free_kilo_cpu_usage = 0UL; /// number of CPU usage units to bill transaction for
unsigned_int kcpu_usage = 0UL; /// number of CPU usage units to bill transaction for
unsigned_int delay_sec = 0UL; /// number of CPU usage units to bill transaction for
vector<action> context_free_actions;
vector<action> actions;
EOSLIB_SERIALIZE( transaction, (expiration)(region)(ref_block_num)(ref_block_prefix)(net_usage_words)(context_free_kilo_cpu_usage)(context_free_actions)(actions) )
EOSLIB_SERIALIZE( transaction, (expiration)(region)(ref_block_num)(ref_block_prefix)(net_usage_words)(kcpu_usage)(delay_sec)(context_free_actions)(actions) )
};
class deferred_transaction : public transaction {
......
contracts/test_api/test_transaction.cpp
浏览文件 @ 18009d1e
......@@ -157,6 +157,7 @@ void test_transaction::test_transaction_size() {
using namespace eosio;
uint32_t trans_size = 0;
read_action_data( (char*)&trans_size, sizeof(uint32_t) );
print( "size: ", transaction_size() );
eosio_assert( trans_size == transaction_size(), "transaction size does not match" );
}
......
libraries/chain/chain_controller.cpp
浏览文件 @ 18009d1e
......@@ -272,8 +272,10 @@ transaction_trace chain_controller::push_transaction(const packed_transaction& t
transaction_trace chain_controller::_push_transaction(const packed_transaction& packed_trx)
{ try {
//edump((transaction_header(packed_trx.get_transaction())));
auto start = fc::time_point::now();
transaction_metadata mtrx( packed_trx, get_chain_id(), head_block_time());
//idump((transaction_header(mtrx.trx())));
const auto delay = check_transaction_authorization(mtrx.trx(), packed_trx.signatures, packed_trx.context_free_data);
auto setup_us = fc::time_point::now() - start;
......@@ -331,7 +333,7 @@ transaction_trace chain_controller::_push_transaction(const packed_transaction&
return result;
};
result = wrap_transaction_processing(std::forward<transaction_metadata>(mtrx), delayed_transaction_processing);
result = wrap_transaction_processing( move(mtrx), delayed_transaction_processing);
}
// notify anyone listening to pending transactions
......@@ -341,7 +343,7 @@ transaction_trace chain_controller::_push_transaction(const packed_transaction&
return result;
} FC_CAPTURE_AND_RETHROW() }
} FC_CAPTURE_AND_RETHROW( (transaction_header(packed_trx.get_transaction())) ) }
static void record_locks_for_data_access(transaction_trace& trace, flat_set<shard_lock>& read_locks, flat_set<shard_lock>& write_locks ) {
for (const auto& at: trace.action_traces) {
......@@ -365,20 +367,22 @@ static void record_locks_for_data_access(transaction_trace& trace, flat_set<shar
transaction_trace chain_controller::_push_transaction( transaction_metadata&& data )
{ try {
auto process_apply_transaction = [&](transaction_metadata& meta) {
auto process_apply_transaction = [this](transaction_metadata& meta) {
auto cyclenum = _pending_block->regions.back().cycles_summary.size() - 1;
//wdump((transaction_header(meta.trx())));
/// TODO: move _pending_cycle into db so that it can be undone if transation fails, for now we will apply
/// the transaction first so that there is nothing to undo... this only works because things are currently
/// single threaded
// set cycle, shard, region etc
data.region_id = 0;
data.cycle_index = cyclenum;
data.shard_index = 0;
return _apply_transaction( data );
meta.region_id = 0;
meta.cycle_index = cyclenum;
meta.shard_index = 0;
return _apply_transaction( meta );
};
return wrap_transaction_processing( std::forward<transaction_metadata>(data), process_apply_transaction );
} FC_CAPTURE_AND_RETHROW() }
// wdump((transaction_header(data.trx())));
return wrap_transaction_processing( move(data), process_apply_transaction );
} FC_CAPTURE_AND_RETHROW( ) }
block_header chain_controller::head_block_header() const
......@@ -427,6 +431,7 @@ transaction chain_controller::_get_on_block_transaction()
trx.actions.emplace_back(std::move(on_block_act));
trx.set_reference_block(head_block_id());
trx.expiration = head_block_time() + fc::seconds(1);
trx.kcpu_usage = 2000; // 1 << 24;
return trx;
}
......@@ -1087,18 +1092,29 @@ static uint32_t calculate_transaction_cpu_usage( const transaction_trace& trace,
}
// charge a system discounted amount for context free cpu usage
uint32_t context_free_cpu_commitment = (uint32_t)(meta.trx().context_free_kilo_cpu_usage.value * 1024UL);
//uint32_t context_free_cpu_commitment = (uint32_t)(meta.trx().kcpu_usage.value * 1024UL);
/*
EOS_ASSERT(context_free_actual_cpu_usage <= context_free_cpu_commitment,
tx_resource_exhausted,
"Transaction context free actions can not fit into the cpu usage committed to by the transaction's header! [usage=${usage},commitment=${commit}]",
("usage", context_free_actual_cpu_usage)("commit", context_free_cpu_commitment) );
*/
uint32_t context_free_cpu_usage = (uint32_t)((uint64_t)context_free_cpu_commitment * chain_configuration.context_free_discount_cpu_usage_num / chain_configuration.context_free_discount_cpu_usage_den);
uint32_t context_free_cpu_usage = (uint32_t)((uint64_t)context_free_actual_cpu_usage * chain_configuration.context_free_discount_cpu_usage_num / chain_configuration.context_free_discount_cpu_usage_den);
return chain_configuration.base_per_transaction_cpu_usage +
auto actual_usage = chain_configuration.base_per_transaction_cpu_usage +
action_cpu_usage +
context_free_cpu_usage +
signature_cpu_usage;
if( meta.trx().kcpu_usage.value == 0 ) {
return actual_usage;
} else {
EOS_ASSERT( actual_usage <= meta.trx().kcpu_usage.value*1000ll, tx_resource_exhausted, "transaction did not declare sufficient cpu usage: ${actual} > ${declared}", ("actual", actual_usage)("declared",meta.trx().kcpu_usage.value*1000ll) );
}
return meta.trx().kcpu_usage;
}
static uint32_t calculate_transaction_net_usage( const transaction_trace& trace, const transaction_metadata& meta, const chain_config& chain_configuration ) {
......@@ -1804,7 +1820,7 @@ transaction_trace chain_controller::_apply_transaction( transaction_metadata& me
auto result = execute(meta);
result._profiling_us = fc::time_point::now() - start;
return result;
} FC_CAPTURE_AND_RETHROW() }
} FC_CAPTURE_AND_RETHROW( (transaction_header(meta.trx())) ) }
transaction_trace chain_controller::_apply_error( transaction_metadata& meta ) {
transaction_trace result(meta.id);
......@@ -1971,6 +1987,8 @@ transaction_trace chain_controller::wrap_transaction_processing( transaction_met
const transaction& trx = data.trx();
//wdump((transaction_header(trx)));
auto temp_session = _db.start_undo_session(true);
// for now apply the transaction serially but schedule it according to those invariants
......@@ -1991,9 +2009,10 @@ transaction_trace chain_controller::wrap_transaction_processing( transaction_met
// The transaction applied successfully. Merge its changes into the pending block session.
temp_session.squash();
_pending_transaction_metas.emplace_back(std::forward<transaction_metadata>(data));
//wdump((transaction_header(data.trx())));
_pending_transaction_metas.emplace_back( move(data) );
return result;
} FC_CAPTURE_AND_RETHROW() }
} FC_CAPTURE_AND_RETHROW( (transaction_header(data.trx())) ) }
} } /// eosio::chain
libraries/chain/contracts/chain_initializer.cpp
浏览文件 @ 18009d1e
......@@ -240,7 +240,8 @@ abi_def chain_initializer::eos_contract_abi(const abi_def& eosio_system_abi)
{"ref_block_num", "uint16"},
{"ref_block_prefix", "uint16"},
{"net_usage_words", "varuint32"},
{"context_free_kilo_cpu_usage", "varuint32"}
{"kcpu_usage", "varuint32"},
{"delay_sec", "varuint32"}
}
});
......
libraries/chain/include/eosio/chain/transaction.hpp
浏览文件 @ 18009d1e
......@@ -113,11 +113,12 @@ namespace eosio { namespace chain {
*/
struct transaction_header {
time_point_sec expiration; ///< the time at which a transaction expires
uint16_t region = 0U; ///< the computational memory region this transaction applies to.
uint16_t ref_block_num = 0U; ///< specifies a block num in the last 2^16 blocks.
uint16_t region = 0U; ///< the computational memory region this transaction applies to.
uint16_t ref_block_num = 0U; ///< specifies a block num in the last 2^16 blocks.
uint32_t ref_block_prefix = 0UL; ///< specifies the lower 32 bits of the blockid at get_ref_blocknum
fc::unsigned_int net_usage_words = 0UL; /// number of 8 byte words this transaction serialize too taking any compression into account
fc::unsigned_int context_free_kilo_cpu_usage = 0UL; /// number of kilo CPU usage units to bill transaction for to process context free actions
fc::unsigned_int net_usage_words = 0UL; /// number of 8 byte words this transaction serialize too taking any compression into account
fc::unsigned_int kcpu_usage = 0UL; /// number of kilo CPU usage units to bill transaction for to process all free actions
fc::unsigned_int delay_sec = 0UL; /// number of seconds to delay this transaction for during which it may be canceled.
/**
* @return the absolute block number given the relative ref_block_num
......@@ -150,7 +151,7 @@ namespace eosio { namespace chain {
// signed_transaction( const signed_transaction& ) = default;
// signed_transaction( signed_transaction&& ) = default;
signed_transaction( transaction&& trx, const vector<signature_type>& signatures, const vector<bytes>& context_free_data)
: transaction(std::forward<transaction>(trx))
: transaction(std::move(trx))
, signatures(signatures)
, context_free_data(context_free_data)
{
......@@ -243,7 +244,8 @@ namespace eosio { namespace chain {
FC_REFLECT( eosio::chain::permission_level, (actor)(permission) )
FC_REFLECT( eosio::chain::action, (account)(name)(authorization)(data) )
FC_REFLECT( eosio::chain::transaction_receipt, (status)(id))
FC_REFLECT( eosio::chain::transaction_header, (expiration)(region)(ref_block_num)(ref_block_prefix)(net_usage_words)(context_free_kilo_cpu_usage) )
FC_REFLECT( eosio::chain::transaction_header, (expiration)(region)(ref_block_num)(ref_block_prefix)
(net_usage_words)(kcpu_usage)(delay_sec) )
FC_REFLECT_DERIVED( eosio::chain::transaction, (eosio::chain::transaction_header), (context_free_actions)(actions) )
FC_REFLECT_DERIVED( eosio::chain::signed_transaction, (eosio::chain::transaction), (signatures)(context_free_data) )
FC_REFLECT_ENUM( eosio::chain::packed_transaction::compression_type, (none)(zlib))
......
libraries/testing/tester.cpp
浏览文件 @ 18009d1e
......@@ -118,7 +118,7 @@ namespace eosio { namespace testing {
trx.net_usage_words = estimated_size / 8;
// estimate the usage of the context free actions
trx.context_free_kilo_cpu_usage = extra_cf_cpu_usage + (trx.context_free_actions.size() * config::default_base_per_action_cpu_usage * 10);
trx.kcpu_usage = 30000 + extra_cf_cpu_usage + (trx.context_free_actions.size() * config::default_base_per_action_cpu_usage * 10);
}
void base_tester::create_account( account_name a, account_name creator, bool multisig ) {
......@@ -147,14 +147,14 @@ namespace eosio { namespace testing {
push_transaction( trx );
}
transaction_trace base_tester::push_transaction( packed_transaction& trx, uint32_t skip_flag ) {
transaction_trace base_tester::push_transaction( packed_transaction& trx, uint32_t skip_flag ) { try {
return control->push_transaction( trx, skip_flag );
}
} FC_CAPTURE_AND_RETHROW( (transaction_header(trx.get_transaction())) ) }
transaction_trace base_tester::push_transaction( signed_transaction& trx, uint32_t skip_flag ) {
transaction_trace base_tester::push_transaction( signed_transaction& trx, uint32_t skip_flag ) { try {
auto ptrx = packed_transaction(trx);
return push_transaction( ptrx, skip_flag );
}
} FC_CAPTURE_AND_RETHROW( (transaction_header(trx)) ) }
base_tester::action_result base_tester::push_action(action&& act, uint64_t authorizer) {
signed_transaction trx;
......@@ -236,6 +236,7 @@ namespace eosio { namespace testing {
signed_transaction trx;
contracts::abi_serializer::from_variant(pretty_trx, trx, get_resolver());
set_transaction_headers(trx);
wdump((trx));
for(auto iter = keys.begin(); iter != keys.end(); iter++)
trx.sign( *iter, chain_id_type() );
return push_transaction( trx );
......
programs/cleos/main.cpp
浏览文件 @ 18009d1e
......@@ -263,7 +263,7 @@ fc::variant push_transaction( signed_transaction& trx, packed_transaction::compr
auto required_keys = determine_required_keys(trx);
size_t num_keys = required_keys.is_array() ? required_keys.get_array().size() : 1;
trx.context_free_kilo_cpu_usage = estimate_transaction_context_free_kilo_cpu_usage(trx);
trx.kcpu_usage = estimate_transaction_context_free_kilo_cpu_usage(trx);
trx.net_usage_words = estimate_transaction_net_usage_words(trx, compression, num_keys);
if (!tx_skip_sign) {
......
tests/api_tests/api_tests.cpp
浏览文件 @ 18009d1e
......@@ -651,13 +651,13 @@ BOOST_FIXTURE_TEST_CASE(transaction_tests, tester) { try {
control->push_deferred_transactions( true );
// test test_transaction_size
CALL_TEST_FUNCTION(*this, "test_transaction", "test_transaction_size", fc::raw::pack(54) );
CALL_TEST_FUNCTION(*this, "test_transaction", "test_transaction_size", fc::raw::pack(57) );
control->push_deferred_transactions( true );
// test test_read_transaction
// this is a bit rough, but I couldn't figure out a better way to compare the hashes
auto tx_trace = CALL_TEST_FUNCTION( *this, "test_transaction", "test_read_transaction", {} );
string sha_expect = "96f7634b737511212dedb9c3eb42672882b066c7af3601a4b50beda56deb977e";
string sha_expect = "274e873c8b2e4de20de06e53c99fe703b5099ce4faaf5d78195a4a2538caba15";
BOOST_CHECK_EQUAL(tx_trace.action_traces.front().console == sha_expect, true);
// test test_tapos_block_num
CALL_TEST_FUNCTION(*this, "test_transaction", "test_tapos_block_num", fc::raw::pack(control->head_block_num()) );
......
tests/tests/abi_tests.cpp
浏览文件 @ 18009d1e
......@@ -1696,7 +1696,8 @@ BOOST_AUTO_TEST_CASE(general)
"context_free_actions":[{"account":"contextfree1", "name":"cfactionname1", "authorization":[{"actor":"cfacc1","permission":"cfpermname1"}], "data":"778899"}],
"actions":[{"account":"accountname1", "name":"actionname1", "authorization":[{"actor":"acc1","permission":"permname1"}], "data":"445566"}],
"net_usage_words":15,
"context_free_kilo_cpu_usage":43
"kcpu_usage":43,
"delay_sec":0
},
"transaction_arr": [{
"ref_block_num":"1",
......@@ -1706,7 +1707,8 @@ BOOST_AUTO_TEST_CASE(general)
"context_free_actions":[{"account":"contextfree1", "name":"cfactionname1", "authorization":[{"actor":"cfacc1","permission":"cfpermname1"}], "data":"778899"}],
"actions":[{"account":"acc1", "name":"actionname1", "authorization":[{"actor":"acc1","permission":"permname1"}], "data":"445566"}],
"net_usage_words":15,
"context_free_kilo_cpu_usage":43
"kcpu_usage":43,
"delay_sec":0
},{
"ref_block_num":"2",
"ref_block_prefix":"3",
......@@ -1715,7 +1717,8 @@ BOOST_AUTO_TEST_CASE(general)
"context_free_actions":[{"account":"contextfree1", "name":"cfactionname1", "authorization":[{"actor":"cfacc1","permission":"cfpermname1"}], "data":"778899"}],
"actions":[{"account":"acc2", "name":"actionname2", "authorization":[{"actor":"acc2","permission":"permname2"}], "data":""}],
"net_usage_words":21,
"context_free_kilo_cpu_usage":87
"kcpu_usage":87,
"delay_sec":0
}],
"strx": {
"ref_block_num":"1",
......@@ -1727,7 +1730,8 @@ BOOST_AUTO_TEST_CASE(general)
"context_free_actions":[{"account":"contextfree1", "name":"cfactionname1", "authorization":[{"actor":"cfacc1","permission":"cfpermname1"}], "data":"778899"}],
"actions":[{"account":"accountname1", "name":"actionname1", "authorization":[{"actor":"acc1","permission":"permname1"}], "data":"445566"}],
"net_usage_words":15,
"context_free_kilo_cpu_usage":43
"kcpu_usage":43,
"delay_sec":0
},
"strx_arr": [{
"ref_block_num":"1",
......@@ -1739,7 +1743,8 @@ BOOST_AUTO_TEST_CASE(general)
"context_free_actions":[{"account":"contextfree1", "name":"cfactionname1", "authorization":[{"actor":"cfacc1","permission":"cfpermname1"}], "data":"778899"}],
"actions":[{"account":"acc1", "name":"actionname1", "authorization":[{"actor":"acc1","permission":"permname1"}], "data":"445566"}],
"net_usage_words":15,
"context_free_kilo_cpu_usage":43
"kcpu_usage":43,
"delay_sec":0
},{
"ref_block_num":"2",
"ref_block_prefix":"3",
......@@ -1750,7 +1755,8 @@ BOOST_AUTO_TEST_CASE(general)
"context_free_actions":[{"account":"contextfree2", "name":"cfactionname2", "authorization":[{"actor":"cfacc2","permission":"cfpermname2"}], "data":"667788"}],
"actions":[{"account":"acc2", "name":"actionname2", "authorization":[{"actor":"acc2","permission":"permname2"}], "data":""}],
"net_usage_words":15,
"context_free_kilo_cpu_usage":43
"kcpu_usage":43,
"delay_sec":0
}],
"keyweight": {"key":"EOS6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", "weight":"100"},
"keyweight_arr": [{"key":"EOS6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", "weight":"100"},{"key":"EOS6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", "weight":"200"}],
......@@ -2561,7 +2567,7 @@ BOOST_AUTO_TEST_CASE(packed_transaction)
vector<permission_level>{{N(testapi4), config::active_name}},
action2{ 61, 23, (uint8_t)2});
txn.net_usage_words = 15;
txn.context_free_kilo_cpu_usage = 43;
txn.kcpu_usage = 43;
// pack the transaction to verify that the var unpacking logic is correct
auto packed_txn = chain::packed_transaction(txn);
......@@ -2642,7 +2648,7 @@ BOOST_AUTO_TEST_CASE(packed_transaction)
for (unsigned int i = 0; i < txn.actions.size(); ++i)
verify_action_equal<action2>(txn.actions[i], txn2.actions[i]);
BOOST_REQUIRE_EQUAL(txn.net_usage_words.value, txn2.net_usage_words.value);
BOOST_REQUIRE_EQUAL(txn.context_free_kilo_cpu_usage.value, txn2.context_free_kilo_cpu_usage.value);
BOOST_REQUIRE_EQUAL(txn.kcpu_usage.value, txn2.kcpu_usage.value);
} FC_LOG_AND_RETHROW() }
BOOST_AUTO_TEST_CASE(abi_type_repeat)
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或