Cleos v2

programs/cleos/CMakeLists.txt

@@ -1,5 +1,5 @@
 configure_file(help_text.cpp.in help_text.cpp @ONLY)
-add_executable( ${CLI_CLIENT_EXECUTABLE_NAME} main.cpp httpc.cpp ${CMAKE_CURRENT_BINARY_DIR}/help_text.cpp localize.hpp config.hpp CLI11.hpp)
+add_executable( ${CLI_CLIENT_EXECUTABLE_NAME} main.cpp httpc.cpp helpers.cpp ${CMAKE_CURRENT_BINARY_DIR}/help_text.cpp localize.hpp config.hpp CLI11.hpp)
 if( UNIX AND NOT APPLE )
   set(rt_library rt )
 endif()
@@ -37,7 +37,7 @@ target_include_directories(${CLI_CLIENT_EXECUTABLE_NAME} PUBLIC ${Intl_INCLUDE_D
 
 target_link_libraries( ${CLI_CLIENT_EXECUTABLE_NAME}
                        PRIVATE appbase chain_api_plugin producer_plugin chain_plugin http_plugin eosio_chain fc ${CMAKE_DL_LIBS} ${PLATFORM_SPECIFIC_LIBS} ${Intl_LIBRARIES} )
-                    
+
 
 copy_bin( ${CLI_CLIENT_EXECUTABLE_NAME} )
 install( TARGETS

programs/cleos/helpers.cpp

@@ -0,0 +1,26 @@
+
+#include <cctype>
+#include "helpers.hpp"
+
+namespace eosio { namespace client { namespace helpers {
+
+	std::string& url_encode(std::string& str) {
+
+		char hex[17] = "0123456789ABCDEF";
+
+		for(int i = 0; i < str.length(); i++) {
+
+			char ch = str[i];
+
+			if (!(isalnum(ch) || ch == '-' || ch == '_' || ch == '.' || ch == '~') ) {
+				std::string rep = "%";
+				rep += hex[(ch & 0xF0) >> 4];
+				rep += hex[ch & 0x0F];
+				str.replace(i, 1, rep);
+				i += 2;
+			}
+		}
+        return str;
+    }
+
+}}}

programs/cleos/helpers.hpp

@@ -0,0 +1,13 @@
+/**
+ *  @file
+ *  @copyright defined in eos/LICENSE
+ */
+#pragma once
+
+#include <string>
+
+namespace eosio { namespace client { namespace helpers {
+
+	std::string& url_encode(std::string& str);
+
+}}}

programs/cleos/httpc.cpp

@@ -184,6 +184,7 @@ namespace eosio { namespace client { namespace http {
    }
 
    fc::variant do_http_call( const connection_param& cp,
+                             const string& method,
                              const fc::variant& postdata,
                              bool print_request,
                              bool print_response ) {
@@ -197,7 +198,7 @@ namespace eosio { namespace client { namespace http {
    boost::asio::streambuf request;
    std::ostream request_stream(&request);
    auto host_header_value = format_host_header(url);
-   request_stream << "POST " << url.path << " HTTP/1.0\r\n";
+   request_stream << method << " " << url.path << " HTTP/1.0\r\n";
    request_stream << "Host: " << host_header_value << "\r\n";
    request_stream << "content-length: " << postjson.size() << "\r\n";
    request_stream << "Accept: */*\r\n";

programs/cleos/httpc.hpp

@@ -78,6 +78,7 @@ namespace eosio { namespace client { namespace http {
 
    fc::variant do_http_call(
                              const connection_param& cp,
+                             const string& method = "GET",
                              const fc::variant& postdata = fc::variant(),
                              bool print_request = false,
                              bool print_response = false);
@@ -110,6 +111,19 @@ namespace eosio { namespace client { namespace http {
    const string get_key_accounts_func = history_func_base + "/get_key_accounts";
    const string get_controlled_accounts_func = history_func_base + "/get_controlled_accounts";
 
+   // v2
+   const string get_voters_func = "/v2/state/get_voters";
+   const string get_key_accounts_v2_func = "/v2/state/get_key_accounts";
+   const string get_deltas_func = "/v2/history/get_deltas";
+   const string get_creator_func = "/v2/history/get_creator";
+   const string get_created_accounts_func = "/v2/history/get_created_accounts";
+   const string get_transaction_v2_func = "/v2/history/get_transaction";
+   const string get_transacted_accounts_func = "/v2/history/get_transacted_accounts";
+   const string get_abi_snapshot_func = "/v2/history/get_abi_snapshot";
+   const string get_root_actions_func = "/v2/history/get_actions";
+   const string get_transfers_func = "/v2/history/get_transfers";
+   const string get_tokens_func = "/v2/state/get_tokens";
+
    const string net_func_base = "/v1/net";
    const string net_connect = net_func_base + "/connect";
    const string net_disconnect = net_func_base + "/disconnect";