Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

Evaluator checks in place

Browse source
This commit is contained in:
Srdjan Obucina 2020-06-19 02:44:02 +02:00
parent 21606396ee
commit 775eac55a9
2 changed files with 82 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
libraries/chain/nft_evaluator.cpp
View file

@ -22,8 +22,25 @@ object_id_type nft_create_evaluator::do_apply( const nft_create_operation& op )
void_result nft_safe_transfer_from_evaluator::do_evaluate( const nft_safe_transfer_from_operation& op ) void_result nft_safe_transfer_from_evaluator::do_evaluate( const nft_safe_transfer_from_operation& op )
{ try { { try {
const auto& idx_nft = db().get_index_type<nft_index>().indices().get<by_id>();
const auto& idx_acc = db().get_index_type<account_index>().indices().get<by_id>();
return void_result(); auto itr_nft = idx_nft.find(op.token_id);
FC_ASSERT( itr_nft != idx_nft.end(), "NFT does not exists" );
auto itr_owner = idx_acc.find(itr_nft->owner);
FC_ASSERT( itr_owner != idx_acc.end(), "Owner account does not exists" );
auto itr_from = idx_acc.find(op.from);
FC_ASSERT( itr_from != idx_acc.end(), "Sender account does not exists" );
auto itr_to = idx_acc.find(op.to);
FC_ASSERT( itr_to != idx_acc.end(), "Receiver account does not exists" );
auto itr_approved_op = std::find(itr_nft->approved_operators.begin(), itr_nft->approved_operators.end(), op.from);
FC_ASSERT( (itr_nft->owner == itr_from->id) || (itr_approved_op != itr_nft->approved_operators.end()), "Sender is not NFT owner or approved operator" );
return void_result();
} FC_CAPTURE_AND_RETHROW( (op) ) } } FC_CAPTURE_AND_RETHROW( (op) ) }
object_id_type nft_safe_transfer_from_evaluator::do_apply( const nft_safe_transfer_from_operation& op ) object_id_type nft_safe_transfer_from_evaluator::do_apply( const nft_safe_transfer_from_operation& op )
@ -43,6 +60,20 @@ object_id_type nft_safe_transfer_from_evaluator::do_apply( const nft_safe_transf
void_result nft_approve_evaluator::do_evaluate( const nft_approve_operation& op ) void_result nft_approve_evaluator::do_evaluate( const nft_approve_operation& op )
{ try { { try {
const auto& idx_nft = db().get_index_type<nft_index>().indices().get<by_id>();
const auto& idx_acc = db().get_index_type<account_index>().indices().get<by_id>();
auto itr_nft = idx_nft.find(op.token_id);
FC_ASSERT( itr_nft != idx_nft.end(), "NFT does not exists" );
auto itr_owner = idx_acc.find(op.owner);
FC_ASSERT( itr_owner != idx_acc.end(), "Owner account does not exists" );
auto itr_approved = idx_acc.find(op.approved);
FC_ASSERT( itr_approved != idx_acc.end(), "Approved account does not exists" );
auto itr_approved_op = std::find(itr_nft->approved_operators.begin(), itr_nft->approved_operators.end(), op.owner);
FC_ASSERT( (itr_nft->owner == itr_owner->id) || (itr_approved_op != itr_nft->approved_operators.end()), "Sender is not NFT owner or approved operator" );
return void_result(); return void_result();
} FC_CAPTURE_AND_RETHROW( (op) ) } } FC_CAPTURE_AND_RETHROW( (op) ) }
@ -54,7 +85,10 @@ object_id_type nft_approve_evaluator::do_apply( const nft_approve_operation& op
if (itr != idx.end()) if (itr != idx.end())
{ {
db().modify(*itr, [&op](nft_object &obj) { db().modify(*itr, [&op](nft_object &obj) {
obj.approved_operators.push_back(op.approved); auto itr = std::find(obj.approved_operators.begin(), obj.approved_operators.end(), op.approved);
if (itr == obj.approved_operators.end()) {
obj.approved_operators.push_back(op.approved);
}
}); });
} }
return op.token_id; return op.token_id;
@ -63,6 +97,10 @@ object_id_type nft_approve_evaluator::do_apply( const nft_approve_operation& op
void_result nft_set_approval_for_all_evaluator::do_evaluate( const nft_set_approval_for_all_operation& op ) void_result nft_set_approval_for_all_evaluator::do_evaluate( const nft_set_approval_for_all_operation& op )
{ try { { try {
const auto& idx_acc = db().get_index_type<account_index>().indices().get<by_id>();
auto itr_operator = idx_acc.find(op.operator_);
FC_ASSERT( itr_operator != idx_acc.end(), "Operator account does not exists" );
return void_result(); return void_result();
} FC_CAPTURE_AND_RETHROW( (op) ) } } FC_CAPTURE_AND_RETHROW( (op) ) }
@ -73,10 +111,12 @@ void_result nft_set_approval_for_all_evaluator::do_apply( const nft_set_approval
const auto &idx_range = idx.equal_range(op.owner); const auto &idx_range = idx.equal_range(op.owner);
std::for_each(idx_range.first, idx_range.second, [&](const nft_object &obj) { std::for_each(idx_range.first, idx_range.second, [&](const nft_object &obj) {
db().modify(obj, [&op](nft_object &obj) { db().modify(obj, [&op](nft_object &obj) {
if (op.approved) { auto itr = std::find(obj.approved_operators.begin(), obj.approved_operators.end(), op.operator_);
if ((op.approved) && (itr == obj.approved_operators.end())) {
obj.approved_operators.push_back(op.operator_); obj.approved_operators.push_back(op.operator_);
} else { }
// if ((!op.approved) && (itr != obj.approved_operators.end())) {
obj.approved_operators.erase(itr);
} }
}); });
}); });

60
tests/tests/nft_tests.cpp
View file

@ -218,6 +218,20 @@ BOOST_AUTO_TEST_CASE( nft_set_approval_for_all_test ) {
generate_block(); generate_block();
{
BOOST_TEST_MESSAGE("Send nft_approve_operation");
nft_set_approval_for_all_operation op;
op.owner = alice_id;
op.operator_ = bob_id;
op.approved = true;
trx.operations.push_back(op);
sign(trx, alice_private_key);
PUSH_TX(db, trx, ~0);
}
generate_block();
{ {
BOOST_TEST_MESSAGE("Send nft_approve_operation"); BOOST_TEST_MESSAGE("Send nft_approve_operation");
@ -243,29 +257,29 @@ BOOST_AUTO_TEST_CASE( nft_set_approval_for_all_test ) {
}); });
} }
//{ {
// BOOST_TEST_MESSAGE("Send nft_approve_operation"); BOOST_TEST_MESSAGE("Send nft_approve_operation");
//
// nft_set_approval_for_all_operation op; nft_set_approval_for_all_operation op;
// op.owner = alice_id; op.owner = alice_id;
// op.operator_ = bob_id; op.operator_ = bob_id;
// op.approved = false; op.approved = false;
//
// trx.operations.push_back(op); trx.operations.push_back(op);
// sign(trx, alice_private_key); sign(trx, alice_private_key);
// PUSH_TX(db, trx, ~0); PUSH_TX(db, trx, ~0);
//} }
//generate_block(); generate_block();
//
//{ {
// BOOST_TEST_MESSAGE("Check nft_approve_operation results"); BOOST_TEST_MESSAGE("Check nft_approve_operation results");
//
// const auto& idx = db.get_index_type<nft_index>().indices().get<by_owner>(); const auto& idx = db.get_index_type<nft_index>().indices().get<by_owner>();
// const auto &idx_range = idx.equal_range(alice_id); const auto &idx_range = idx.equal_range(alice_id);
// std::for_each(idx_range.first, idx_range.second, [&](const nft_object &obj) { std::for_each(idx_range.first, idx_range.second, [&](const nft_object &obj) {
// BOOST_CHECK( obj.approved_operators.size() == 1 ); BOOST_CHECK( obj.approved_operators.size() == 0 );
// }); });
//} }
} }
BOOST_AUTO_TEST_SUITE_END() BOOST_AUTO_TEST_SUITE_END()