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

Graphene Updates and DApp Support #643

Closed
nathanielhourt wants to merge 84 commits from dapp-support into develop
pull from: dapp-support
merge into: Peerplays_Blockchain:develop
Conversation 10 Commits 84 Files changed 376 +11 -132
4 changed files with 11 additions and 132 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 2af062e7cf - Show all commits

12
libraries/chain/CMakeLists.txt
View file

@ -66,13 +66,23 @@ add_library( graphene_chain
fba_object.cpp
proposal_object.cpp
vesting_balance_object.cpp
transaction_history_object.cpp
small_objects.cpp
block_database.cpp
is_authorized_asset.cpp
sport_evaluator.cpp
event_group_evaluator.cpp
event_group_object.cpp
event_evaluator.cpp
event_object.cpp
betting_market_evaluator.cpp
betting_market_object.cpp
betting_market_group_object.cpp
affiliate_payout.cpp
${HEADERS}
"${CMAKE_CURRENT_BINARY_DIR}/include/graphene/chain/hardfork.hpp"
)

95
libraries/chain/transaction_history_object.cpp
View file

@ -1,95 +0,0 @@
/*
* Copyright (c) 2015 Cryptonomex, Inc., and contributors.
*
* The MIT License
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#include <graphene/chain/transaction_history_object.hpp>
namespace graphene { namespace chain {
const object* transaction_index::create(const std::function<void (object*)>& constructor, object_id_type)
{
transaction_history_object obj;
obj.id = get_next_available_id();
constructor(&obj);
auto result = _index.insert(std::move(obj));
FC_ASSERT(result.second, "Could not create transaction_history_object! Most likely a uniqueness constraint is violated.");
return &*result.first;
}
void transaction_index::modify(const object* obj,
const std::function<void (object*)>& m)
{
assert(obj != nullptr);
FC_ASSERT(obj->id < _index.size());
const transaction_history_object* t = dynamic_cast<const transaction_history_object*>(obj);
assert(t != nullptr);
auto itr = _index.find(obj->id.instance());
assert(itr != _index.end());
_index.modify(itr, [&m](transaction_history_object& o) { m(&o); });
}
void transaction_index::add(unique_ptr<object> o)
{
assert(o);
object_id_type id = o->id;
assert(id.space() == transaction_history_object::space_id);
assert(id.type() == transaction_history_object::type_id);
assert(id.instance() == size());
auto trx = dynamic_cast<transaction_history_object*>(o.get());
assert(trx != nullptr);
o.release();
auto result = _index.insert(std::move(*trx));
FC_ASSERT(result.second, "Could not insert transaction_history_object! Most likely a uniqueness constraint is violated.");
}
void transaction_index::remove(object_id_type id)
{
auto& index = _index.get<instance>();
auto itr = index.find(id.instance());
if( itr == index.end() )
return;
assert(id.space() == transaction_history_object::space_id);
assert(id.type() == transaction_history_object::type_id);
index.erase(itr);
}
const object*transaction_index::get(object_id_type id) const
{
if( id.type() != transaction_history_object::type_id ||
id.space() != transaction_history_object::space_id )
return nullptr;
auto itr = _index.find(id.instance());
if( itr == _index.end() )
return nullptr;
return &*itr;
}
} } // graphene::chain

1
libraries/protocol/CMakeLists.txt
View file

@ -27,7 +27,6 @@ list(APPEND SOURCES account.cpp
withdraw_permission.cpp
worker.cpp
betting_market.cpp
competitor.cpp
event.cpp
event_group.cpp
lottery_ops.cpp

35
libraries/protocol/competitor.cpp
View file

@ -1,35 +0,0 @@
/*
* Copyright (c) 2018 Peerplays Blockchain Standards Association, and contributors.
*
* The MIT License
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#include <graphene/chain/protocol/competitor.hpp>
namespace graphene { namespace chain {
void competitor_create_operation::validate() const
{
FC_ASSERT( fee.amount >= 0 );
}
} } // graphene::chain