get_transaction/get_actions for eosapi

learnforpractice · learnforpractice · commit 932231f75bf4 · 2018-05-18T21:37:26.000+08:00
diff --git a/programs/pyeos/CMakeLists.txt b/programs/pyeos/CMakeLists.txt
@@ -75,30 +75,31 @@ add_library(pyeos-shared eos_main.cpp interface/json.cpp interface/eosapi_.cpp
 
 
 if( APPLE )
-target_link_libraries( pyeos-shared appbase chain_api_plugin 
+target_link_libraries( pyeos-shared appbase chain_api_plugin history_api_plugin history_plugin
     producer_plugin chain_plugin net_plugin http_plugin fc ${CMAKE_DL_LIBS} ${PLATFORM_SPECIFIC_LIBS} 
     wallet_plugin wallet_api_plugin
     chainbase eos_utilities fc
     python3 eosio_chain intl )
 else( APPLE )
-target_link_libraries( pyeos-shared appbase chain_api_plugin 
+target_link_libraries( pyeos-shared appbase chain_api_plugin history_api_plugin history_plugin
     producer_plugin chain_plugin net_plugin http_plugin fc ${CMAKE_DL_LIBS} ${PLATFORM_SPECIFIC_LIBS} 
     wallet_plugin wallet_api_plugin
     chainbase eos_utilities fc
     python3 eosio_chain util -Xlinker -export-dynamic)
 endif( APPLE )
 
-target_include_directories( pyeos-shared PUBLIC ${CMAKE_SOURCE_DIR}/contracts 
-                                  PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include"
-                                  PUBLIC ${CMAKE_SOURCE_DIR}/libraries/python/Include
-                                  PUBLIC ${CMAKE_SOURCE_DIR}/libraries/python
-                                  PUBLIC ${CMAKE_SOURCE_DIR}/libraries/chain
-                                  PUBLIC  ${CMAKE_SOURCE_DIR}/plugins/wallet_plugin/include
-                                  PUBLIC  ${CMAKE_SOURCE_DIR}/plugins/wallet_plugin/include
-                                  PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/interface"
-                                  PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/util"
-                                  PRIVATE "${CMAKE_SOURCE_DIR}/plugins/account_history_api_plugin/include"
-                                  PRIVATE "${CPP_ETHEREUM_DIR}"
+target_include_directories( pyeos-shared 
+                              PRIVATE ${CPP_ETHEREUM_DIR}
+                              PUBLIC ${CMAKE_SOURCE_DIR}/contracts 
+                              PUBLIC ${CMAKE_SOURCE_DIR}/libraries/chain
+                              PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
+                              PUBLIC ${CMAKE_SOURCE_DIR}/libraries/python
+                              PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/interface
+                              PUBLIC ${CMAKE_SOURCE_DIR}/libraries/python/Include
+                              PUBLIC ${CMAKE_SOURCE_DIR}/plugins/wallet_plugin/include
+                              PUBLIC ${CMAKE_SOURCE_DIR}/plugins/wallet_plugin/include
+                              PRIVATE ${CMAKE_SOURCE_DIR}/plugins/history_plugin/include
+                              PRIVATE ${CMAKE_SOURCE_DIR}/plugins/history_api_plugin/include
                                   )
 
 
diff --git a/programs/pyeos/cython/eosapi.pyx b/programs/pyeos/cython/eosapi.pyx
@@ -49,6 +49,7 @@ cdef extern from "eosapi_.hpp":
     void quit_app_()
     uint32_t now2_()
     int produce_block_();
+
     object get_info_ ()
     object get_block_(char* num_or_id)
     object get_account_(char* name)
@@ -58,21 +59,16 @@ cdef extern from "eosapi_.hpp":
     object create_key_()
     object get_public_key_(string& wif_key)
 
-    int get_transaction_(string& id, string& result);
-    int get_transactions_(string& account_name, int skip_seq, int num_seq, string& result);
-    
+    object get_actions_(uint64_t account, int pos, int offset);
+    object get_transaction_(string& id);
+
     object set_evm_contract_(string& eth_address, string& sol_bin, bool sign);
 
     int get_code_(string& name, string& wast, string& abi, string& code_hash, int & vm_type);
     int get_table_(string& scope, string& code, string& table, string& result);
 
-    int setcode_(char* account_, char* wast_file, char* abi_file, char* ts_buffer, int length) 
-    int exec_func_(char* code_, char* action_, char* json_, char* scope, char* authorization, char* ts_result, int length)
-
     object get_currency_balance_(string& _code, string& _account, string& _symbol)
 
-    object traceback_()
-
     int compile_and_save_to_buffer_(const char* src_name, const char *src_buffer, size_t src_size, char* buffer, size_t size);
 
     void wast2wasm_( string& wast ,string& result)
@@ -243,16 +239,22 @@ def create_key():
 def get_public_key(priv_key):
     return get_public_key_(priv_key)
 
+def get_actions(account, pos, offset):
+    if isinstance(account, str):
+        account = s2n(account)
+
+    ret = get_actions_(account, pos, offset)
+    if ret:
+        return JsonStruct(ret)
+
 def get_transaction(id):
-    cdef string result
     if isinstance(id, int):
         id = str(id)
-    if 0 == get_transaction_(id, result):
-        return JsonStruct(result)
+    ret = get_transaction_(id)
+    if ret:
+        return JsonStruct(ret)
     return None
 
-
-
 def get_code(name):
     cdef string wast
     cdef string abi
@@ -483,13 +485,6 @@ def push_raw_transaction(signed_trx):
         signed_trx = json.dumps(signed_trx)
     return push_raw_transaction_(signed_trx)
 
-
-def get_transactions(account_name, skip_seq: int, num_seq: int):
-    cdef string result
-    if 0 == get_transactions_(account_name, skip_seq, num_seq, result):
-        return result
-    return None
-
 def push_transactions(actions, sign = True, uint64_t skip_flag=0, _async=False, compress=False):
     '''Send transactions
 
diff --git a/programs/pyeos/eos_main.cpp b/programs/pyeos/eos_main.cpp
@@ -1,22 +1,20 @@
 #include <appbase/application.hpp>
-
-//#include <eosio/account_history_api_plugin/account_history_api_plugin.hpp>
-//#include <eosio/account_history_plugin/account_history_plugin.hpp>
-#include <eosio/chain_api_plugin/chain_api_plugin.hpp>
-#include <eosio/chain_plugin/chain_plugin.hpp>
-#include <eosio/http_plugin/http_plugin.hpp>
+#include <fc/log/logger_config.hpp>
+#include <fc/exception/exception.hpp>
+#include <eosio/history_plugin.hpp>
 #include <eosio/net_plugin/net_plugin.hpp>
+#include <eosio/http_plugin/http_plugin.hpp>
+#include <eosio/chain_plugin/chain_plugin.hpp>
+#include <eosio/wallet_plugin/wallet_plugin.hpp>
 #include <eosio/producer_plugin/producer_plugin.hpp>
-//#include <eos/py_plugin/py_plugin.hpp>
+#include <eosio/chain_api_plugin/chain_api_plugin.hpp>
 #include <eosio/wallet_api_plugin/wallet_api_plugin.hpp>
-#include <eosio/wallet_plugin/wallet_plugin.hpp>
+#include <eosio/history_api_plugin/history_api_plugin.hpp>
 
-#include <fc/exception/exception.hpp>
-#include <fc/log/logger_config.hpp>
 
 #include <boost/chrono.hpp>
-#include <boost/exception/diagnostic_information.hpp>
 #include <boost/thread/thread.hpp>
+#include <boost/exception/diagnostic_information.hpp>
 
 
 #include <Python.h>
@@ -72,8 +70,8 @@ void start_eos() {
       app().register_plugin<net_plugin>();
       app().register_plugin<chain_api_plugin>();
       app().register_plugin<producer_plugin>();
-//      app().register_plugin<account_history_plugin>();
-//      app().register_plugin<account_history_api_plugin>();
+      app().register_plugin<history_plugin>();
+      app().register_plugin<history_api_plugin>();
       app().register_plugin<wallet_api_plugin>();
 
       if (!app().initialize<chain_plugin, http_plugin, net_plugin>(g_argc, g_argv)) {
diff --git a/programs/pyeos/initeos.py b/programs/pyeos/initeos.py
@@ -39,8 +39,8 @@
 # As well as API and HTTP plugins
 plugin = eosio::chain_api_plugin
 plugin = eosio::http_plugin
-plugin = eosio::account_history_plugin
-plugin = eosio::account_history_api_plugin
+plugin = eosio::history_plugin
+plugin = eosio::history_api_plugin
 '''
 
 genesis = '''
diff --git a/programs/pyeos/interface/eosapi_.cpp b/programs/pyeos/interface/eosapi_.cpp
@@ -11,6 +11,7 @@
 #include <eosio/utilities/common.hpp>
 #include <eosio/chain/wast_to_wasm.hpp>
 #include <eosio/chain/contract_types.hpp>
+#include <eosio/history_plugin.hpp>
 
 
 #include "fc/bitutil.hpp"
@@ -564,43 +565,37 @@ PyObject* get_controlled_accounts_(const char* account_name) {
    return arr.get();
 }
 
-int get_transaction_(string& id, string& result) {
-   #if 0
-   eosio::account_history_apis::read_only::get_transaction_params params = {
-       chain::transaction_id_type(id)};
+PyObject* get_actions_(uint64_t account, int pos, int offset) {
+
+   eosio::history_apis::read_only::get_actions_params params = {
+       name(account),
+       pos,
+       offset
+   };
    try {
-      auto ro_api =
-          app().get_plugin<account_history_plugin>().get_read_only_api();
-      eosio::account_history_apis::read_only::get_transaction_results results =
-          ro_api.get_transaction(params);
-      result = fc::json::to_string(fc::variant(results));
-      return 0;
+      auto ro_api = app().get_plugin<history_plugin>().get_read_only_api();
+      auto results = ro_api.get_actions(params);
+      return python::json::to_string(fc::variant(results));
    } catch (fc::exception& ex) {
       elog(ex.to_detail_string());
    }
-   #endif
-   return -1;
+   return py_new_none();
 }
 
-int get_transactions_(string& account_name, int skip_seq, int num_seq,
-                      string& result) {
-   #if 0
-   try {
-      const eosio::account_history_apis::read_only::get_transactions_params
-          params = {chain::account_name(account_name), skip_seq, num_seq};
-
-      auto ro_api = app().get_plugin<account_history_plugin>().get_read_only_api();
 
-      eosio::account_history_apis::read_only::get_transactions_results results =
-          ro_api.get_transactions(params);
+PyObject* get_transaction_(string& id) {
 
-      result = fc::json::to_string(results);
-      return 0;
+   eosio::history_apis::read_only::get_transaction_params params = {
+       chain::transaction_id_type(id)
+   };
+   try {
+      auto ro_api = app().get_plugin<history_plugin>().get_read_only_api();
+      auto results = ro_api.get_transaction(params);
+      return python::json::to_string(fc::variant(results));
    } catch (fc::exception& ex) {
       elog(ex.to_detail_string());
    }
-   #endif
-   return -1;
+   return py_new_none();
 }
 
 PyObject* set_evm_contract_(string& eth_address, string& sol_bin, bool sign) {
diff --git a/programs/pyeos/interface/eosapi_.hpp b/programs/pyeos/interface/eosapi_.hpp
@@ -1,23 +1,6 @@
 #include <Python.h>
 
-#ifndef __HELLO_H
-#define __HELLO_H
-#ifdef __cplusplus
-
-extern "C" {
-#endif
-int create_key_(char* pub_, int pub_length, char* priv_, int priv_length);
-int get_transaction_(char* id, char* result, int length);
-int transfer_(char* sender_, char* recipient_, int amount, char* result,
-              int length);
-int setcode_(char* account_, char* wast_file, char* abi_file, char* ts_buffer,
-             int length);
-int exec_func_(char* code_, char* action_, char* json_, char* scope,
-               char* authorization, char* ts_result, int length);
-#ifdef __cplusplus
-}
-#endif
-#endif
+#pragma once
 
 #include <boost/asio.hpp>
 #include <fc/exception/exception.hpp>
@@ -96,10 +79,6 @@ PyObject* create_key_();
 PyObject* get_public_key_(string& wif_key);
 
 int get_transaction_(string& id, string& result);
-int get_transactions_(string& account_name, int skip_seq, int num_seq, string& result);
-
-PyObject* transfer_(string& sender, string& recipient, int amount, string memo, bool sign);
-PyObject* set_contract_(string& account, string& wastPath, string& abiPath, int vmtype, bool sign);
 
 int get_code_(string& name, string& wast, string& abi, string& code_hash, int& vm_type);
 int get_table_(string& scope, string& code, string& table, string& result);
@@ -131,3 +110,6 @@ PyObject* gen_transaction_(vector<chain::action>& v, int expiration);
 PyObject* sign_transaction_(string& trx_json_to_sign, string& str_private_key);
 PyObject* push_raw_transaction_(string& signed_trx);
 
+PyObject* get_actions_(uint64_t account, int pos, int offset);
+PyObject* get_transaction_(string& id);
+
