confidential_object.hpp: Move confidential objects into own header #466

libraries/app/api.cpp

@@ -31,11 +31,11 @@
 #include <graphene/chain/get_config.hpp>
 #include <graphene/utilities/key_conversion.hpp>
 #include <graphene/chain/protocol/fee_schedule.hpp>
+#include <graphene/chain/confidential_object.hpp>
 #include <graphene/chain/market_object.hpp>
 #include <graphene/chain/transaction_object.hpp>
 #include <graphene/chain/withdraw_permission_object.hpp>
 #include <graphene/chain/worker_object.hpp>
-#include <graphene/chain/confidential_evaluator.hpp>
 
 #include <fc/crypto/hex.hpp>
 #include <fc/smart_ref_impl.hpp>

libraries/app/include/graphene/app/database_api.hpp

@@ -34,12 +34,12 @@
 #include <graphene/chain/balance_object.hpp>
 #include <graphene/chain/chain_property_object.hpp>
 #include <graphene/chain/committee_member_object.hpp>
+#include <graphene/chain/confidential_object.hpp>
 #include <graphene/chain/market_object.hpp>
 #include <graphene/chain/operation_history_object.hpp>
 #include <graphene/chain/proposal_object.hpp>
 #include <graphene/chain/worker_object.hpp>
 #include <graphene/chain/witness_object.hpp>
-#include <graphene/chain/confidential_evaluator.hpp>
 
 #include <graphene/market_history/market_history_plugin.hpp>
 

libraries/chain/confidential_evaluator.cpp

@@ -24,6 +24,7 @@
 #include <graphene/chain/exceptions.hpp>
 #include <graphene/chain/protocol/confidential.hpp>
 #include <graphene/chain/confidential_evaluator.hpp>
+#include <graphene/chain/confidential_object.hpp>
 #include <graphene/chain/database.hpp>
 
 namespace graphene { namespace chain {

libraries/chain/db_init.cpp

@@ -31,6 +31,7 @@
 #include <graphene/chain/budget_record_object.hpp>
 #include <graphene/chain/chain_property_object.hpp>
 #include <graphene/chain/committee_member_object.hpp>
+#include <graphene/chain/confidential_object.hpp>
 #include <graphene/chain/global_property_object.hpp>
 #include <graphene/chain/market_object.hpp>
 #include <graphene/chain/operation_history_object.hpp>
@@ -45,8 +46,10 @@
 #include <graphene/chain/account_evaluator.hpp>
 #include <graphene/chain/asset_evaluator.hpp>
 #include <graphene/chain/assert_evaluator.hpp>
-#include <graphene/chain/custom_evaluator.hpp>
+#include <graphene/chain/balance_evaluator.hpp>
 #include <graphene/chain/committee_member_evaluator.hpp>
+#include <graphene/chain/confidential_evaluator.hpp>
+#include <graphene/chain/custom_evaluator.hpp>
 #include <graphene/chain/market_evaluator.hpp>
 #include <graphene/chain/proposal_evaluator.hpp>
 #include <graphene/chain/transfer_evaluator.hpp>
@@ -54,8 +57,6 @@
 #include <graphene/chain/withdraw_permission_evaluator.hpp>
 #include <graphene/chain/witness_evaluator.hpp>
 #include <graphene/chain/worker_evaluator.hpp>
-#include <graphene/chain/balance_evaluator.hpp>
-#include <graphene/chain/confidential_evaluator.hpp>
 
 #include <graphene/chain/protocol/fee_schedule.hpp>
 

libraries/chain/include/graphene/chain/confidential_evaluator.hpp

@@ -23,44 +23,12 @@
  */
 #pragma once
 #include <graphene/chain/evaluator.hpp>
-#include <graphene/db/object.hpp>
-#include <graphene/db/generic_index.hpp>
 
 namespace graphene { namespace chain {
 
-/**
+class transfer_to_blind_operation;
- * @class blinded_balance_object
+class transfer_from_blind_operation;
- * @brief tracks a blinded balance commitment
+class blind_transfer_operation;
- * @ingroup object
- * @ingroup protocol
- */
-class blinded_balance_object : public graphene::db::abstract_object<blinded_balance_object>
-{
-   public:
-      static const uint8_t space_id = implementation_ids;
-      static const uint8_t type_id  = impl_blinded_balance_object_type;
-
-      fc::ecc::commitment_type                commitment;
-      asset_id_type                           asset_id;
-      authority                               owner;
-};
-
-struct by_asset;
-struct by_owner;
-struct by_commitment;
-
-/**
- * @ingroup object_index
- */
-typedef multi_index_container<
-   blinded_balance_object,
-   indexed_by<
-      ordered_unique< tag<by_id>, member< object, object_id_type, &object::id > >,
-      ordered_unique< tag<by_commitment>, member<blinded_balance_object, commitment_type, &blinded_balance_object::commitment> >
-   >
-> blinded_balance_object_multi_index_type;
-typedef generic_index<blinded_balance_object, blinded_balance_object_multi_index_type> blinded_balance_index;
-
 
 class transfer_to_blind_evaluator : public evaluator<transfer_to_blind_evaluator>
 {
@@ -90,5 +58,3 @@ class blind_transfer_evaluator : public evaluator<blind_transfer_evaluator>
 };
 
 } } // namespace graphene::chain
-
-FC_REFLECT_DERIVED( graphene::chain::blinded_balance_object, (graphene::db::object), (commitment)(asset_id)(owner) )

libraries/chain/include/graphene/chain/confidential_object.hpp

@@ -0,0 +1,71 @@
+/*
+ * 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.
+ */
+#pragma once
+
+#include <graphene/chain/protocol/authority.hpp>
+#include <graphene/chain/protocol/types.hpp>
+
+#include <graphene/db/object.hpp>
+#include <graphene/db/generic_index.hpp>
+
+#include <fc/crypto/elliptic.hpp>
+
+namespace graphene { namespace chain {
+
+/**
+ * @class blinded_balance_object
+ * @brief tracks a blinded balance commitment
+ * @ingroup object
+ * @ingroup protocol
+ */
+class blinded_balance_object : public graphene::db::abstract_object<blinded_balance_object>
+{
+   public:
+      static const uint8_t space_id = implementation_ids;
+      static const uint8_t type_id  = impl_blinded_balance_object_type;
+
+      fc::ecc::commitment_type                commitment;
+      asset_id_type                           asset_id;
+      authority                               owner;
+};
+
+struct by_asset;
+struct by_owner;
+struct by_commitment;
+
+/**
+ * @ingroup object_index
+ */
+typedef multi_index_container<
+   blinded_balance_object,
+   indexed_by<
+      ordered_unique< tag<by_id>, member< object, object_id_type, &object::id > >,
+      ordered_unique< tag<by_commitment>, member<blinded_balance_object, commitment_type, &blinded_balance_object::commitment> >
+   >
+> blinded_balance_object_multi_index_type;
+typedef generic_index<blinded_balance_object, blinded_balance_object_multi_index_type> blinded_balance_index;
+
+} } // graphene::chain
+
+FC_REFLECT_DERIVED( graphene::chain::blinded_balance_object, (graphene::db::object), (commitment)(asset_id)(owner) )