Commit graph

1306 commits

Author SHA1 Message Date
Eric Frias
4d8ac59b0b Merge commit 'cb62798' 2017-06-21 16:43:31 -04:00
Eric Frias
7c88a95df1 Merge commit 'b94a338e56475943eb9bcc79be60ed6afd586796' 2017-06-21 16:19:49 -04:00
Eric Frias
8eb2ccc180 Merge commit '1f41494' 2017-06-21 09:11:02 -04:00
Eric Frias
772c2b2822 Merge commit 'e323862' 2017-06-20 19:06:22 -04:00
Eric Frias
7a44b21acf Merge commit '31adee4' 2017-06-20 18:18:35 -04:00
Eric Frias
2c8cdf84b7 Merge commit '622ff58' 2017-06-20 17:27:58 -04:00
Vikram Rajkumar
cb627980a5 Remove unused CyoEncode and Base32
5c466150ec
2017-06-04 18:13:13 -05:00
Vikram Rajkumar
a30647d32e Revert "Add OpenSSL 1.1.0 support"
This reverts commit fee06a4c75.

Max compatible Boost version is not compatible with OpenSSL 1.1.0
2017-06-04 17:44:25 -05:00
Vikram Rajkumar
b94a338e56 Add missing include
4643586411
2017-06-01 16:49:10 -05:00
Vikram Rajkumar
895e833edc Remove unused FindWt
c2f9a37218
2017-06-01 16:47:58 -05:00
Vikram Rajkumar
04694f9c40 Merge branch 'btsabc-fix_vs2013' 2017-06-01 16:12:16 -05:00
Vikram Rajkumar
680731ef1b Remove equihash 2017-06-01 16:11:35 -05:00
kinglaw
0c25cb568f In order to pass compile in vs2013, fixed:
removed equihash from the cmakelists.txt.
Fix the inconsistencies of the template functions "from_variant" ,"unpack" and definitions that processes flat_map.
Signed-off-by: kinglaw <58291@qq.com>
2017-06-01 13:03:02 +08:00
Vikram Rajkumar
0e2b783168 Merge remote-tracking branch 'steem/13-jsonrpc-improvements' 2017-05-21 14:37:31 -05:00
Vikram Rajkumar
b3b4428abd Merge remote-tracking branch 'steem/develop' 2017-05-21 14:31:17 -05:00
Vikram Rajkumar
453b3de77e Better fix for Clang 4+ 2017-04-26 12:20:58 -05:00
Vikram Rajkumar
91af0e7edb Fix compilation on Clang 4+ 2017-04-26 11:58:32 -05:00
Vikram Rajkumar
6d386e442b Revert "...Fix build?"
This reverts commit 908762d687.
2017-04-25 20:22:31 -05:00
Nathan Hourt
fee06a4c75 Add OpenSSL 1.1.0 support
These changes should add support for openssl 1.1.0 while maintaining
compatibility with 1.0.2
2017-04-25 15:50:56 -05:00
Nathan Hourt
908762d687 ...Fix build? 2017-04-25 15:39:42 -05:00
Michael Vandeberg
fa63cd799f Responses contain jsonrpc field and increased readability of errors #13 2017-04-10 11:12:24 -04:00
Vikram Rajkumar
1f41494f36 Merge branch 'master' of github.com:steemit/fc 2017-03-18 11:38:57 -05:00
Vikram Rajkumar
f5f19d2c37 Merge pull request #3 from oxarbitrage/patch-1
struct range_proof_info change int to int64_t
2017-03-18 11:31:34 -05:00
oxarbitrage
25d7b3055f struct range_proof_info change int to int64_t
https://github.com/bitshares/bitshares-core/issues/160
2017-03-17 18:31:45 -03:00
Vikram Rajkumar
0d0b485f3a Remove GNTP (unrelated to NTP) 2017-03-16 12:33:30 -05:00
Vikram Rajkumar
fe82998021 Remove NTP 2017-03-16 12:29:57 -05:00
Michael Vandeberg
5cfcb5c0d6 Merge pull request #11 from steemit/9-log-api-times
Actually log methods and params #9
2017-02-01 11:37:39 -05:00
Vikram Rajkumar
e3238628fc Merge pull request #2 from elmato/named-api-call
Replace the call to get_api_by_name
2017-01-30 18:11:55 -06:00
Vikram Rajkumar
e1d6182763 Merge pull request #1 from elmato/websocket-header-access
Add access to HTTP request headers in websocket_connection
2017-01-30 18:11:45 -06:00
Michael Vandeberg
7144cdc20b Actually log methods and params #9 2017-01-27 12:07:50 -05:00
elmato
dd36202e74 Replace the call to get_api_by_name with a direct call to the functions that return fc::api<> in the login_api.
If the call to any of this functions succeed (because they where previously enabled),
the api will auto-register itself in the websocket_api_connection/http_api_connection and will return an api_id_type.
2017-01-27 06:03:36 +00:00
Michael Vandeberg
ca4f950195 Merge pull request #10 from steemit/9-log-api-times
Log API Times
2017-01-25 12:40:02 -05:00
Michael Vandeberg
c1a0dca92f Refactor to use cmake build options #9 2017-01-25 11:16:52 -05:00
Michael Vandeberg
0688b7eb64 Time execution of rpc API call and log long executing calls. #9 2017-01-25 10:16:02 -05:00
elmato
aed35f5b06 Add access to HTTP request headers in websocket_connection 2017-01-16 19:55:17 +00:00
Vikram Rajkumar
c1361d8cf9 Add fork note to README 2017-01-15 18:18:55 -06:00
Vikram Rajkumar
b973a4432d Update submodules 2017-01-15 18:18:55 -06:00
Vikram Rajkumar
2b26a51b6c Remove unused ssh code 2017-01-13 14:29:22 -06:00
Vikram Rajkumar
7f10088db8 Merge commit 'ca9a6977d93df48e12d92e675c1a66fa9f6065cf' 2017-01-13 13:36:30 -06:00
Vikram Rajkumar
326140a931 Remove leftover udt code 2017-01-13 13:36:21 -06:00
Vikram Rajkumar
d1faea2bde Revert incorrect start of boost compatibility update 2017-01-13 13:36:13 -06:00
Vikram Rajkumar
9d383077fa Revert "change json seralization of map<string,T> to be object rather than array of pairs"
This reverts commit a421e28048.
2017-01-13 13:35:48 -06:00
Vikram Rajkumar
0e4181fbbc Merge commit '72cd69bed9c818ea6294019e4911825736b367d4' 2017-01-13 13:35:25 -06:00
Vikram Rajkumar
df2642e931 Revert "Windows build fixes (disable compiling permessage-deflate, which isn't very useful right now. The build error will probably be resolved in websocketpp by the time we need it)"
This reverts commit 2bd8e92a75.
2017-01-13 13:34:44 -06:00
Michael Vandeberg
72cd69bed9 Merge pull request #7 from steemit/equihash_security
Implement test_canonical_order and test_intermediate_zeros for equihash
2017-01-05 14:18:12 -05:00
Michael Vandeberg
b4b7904c2e Merge pull request #8 from steemit/rpc-catch-all
Wrap non-FC exceptions thrown by client methods
2017-01-05 14:18:02 -05:00
Nathan Hourt
ca9a6977d9 Add cryptonomex's custom secp256k1 to install on non-Windows
This should be done on Windows too, but I don't know how and I don't
have a Windows test box anyways.
2017-01-04 15:09:56 -06:00
Nathan Hourt
159daffb25 Fix installation
FC now installs properly with a `make install`
2017-01-04 15:09:50 -06:00
Nathan Hourt
5e83b581c0 Prevent websocketpp from polluting installs
When clients of fc (such as graphene) do an install (via `make install` or similar), websocketpp was installing as well. This commit prevents this from happening.
2017-01-04 15:09:46 -06:00
Daniel Larimer
b07f429556 remove udt and make websocketpp includes public 2017-01-03 15:13:22 -05:00