Sync develop with master #4

Merged
RoshanSyed merged 144 commits from master into develop 2019-12-16 15:20:56 +00:00

144 commits

Author SHA1 Message Date
pbattu123
961452f06f
Merge pull request #3 from PBSA/master
Ubuntu 18.04 Upgrade
2019-09-03 13:20:49 -03:00
Roshan Syed
1d60bbb65b
Merge pull request #5 from PBSA/feature/ubuntu18.04-upgrade
Feature/ubuntu18.04 upgrade
2019-09-03 13:00:47 -03:00
pbattu123
94b046dce6 commit cmake for cmakehelpers 2019-05-22 16:33:40 +00:00
pbattu
6c9e857bd2 maintaing PBSA own websocketpp(forked from zaphoyd 2019-05-21 19:19:03 -03:00
pbattu
997d211fb1 removed websocket submodule 2019-05-21 19:06:39 -03:00
pbattu
00efb88ac7 fc changes to support ubuntu-18.04 upgrade 2019-05-21 18:42:14 -03:00
Andrew Moore
c8c05254b1 Merged in betting-merge (pull request #1)
Betting merge
2018-08-27 13:59:03 +00:00
Eric Frias
69a1ceabce Add a fc_[diwe]dump() function, analogous to fc_[diew]log() 2018-05-09 15:39:57 -04:00
Eric Frias
b1bba0a5d7 add missing implementation for logger::remove_appender() 2018-04-29 18:58:22 -04:00
Eric Frias
8df97c6b35 Merge remote-tracking branch 'origin/betting' into betting-merge 2017-08-24 17:38:23 -04:00
Roman Olearski
ff099209b6 added ntp hash_ctr_rng 2017-07-13 16:18:29 +02:00
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
Eric Frias
9d408aa532 Fix serialization of enums to use variable-length integerd 2017-03-21 08:59:58 -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
SynaptiCAD User
c23bbfb068 Fix GetGitRevisionDescription to work with newer versions of git, which
use absolute paths in the .git files of submodules
2017-01-09 10:53:34 -05: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
theoreticalbts
d37811afdf Merge pull request #6 from steemit/rpc-catch-all
Wrap non-FC exceptions thrown by client methods
2016-12-22 12:48:02 -05:00
theoreticalbts
beca6a8264 Add debug logging 2016-12-14 13:10:09 -05:00
theoreticalbts
ad3efeb28a Add comments and minor refactoring of canonization methods for clarity
Also guard against out-of-bounds access for untrusted input
2016-12-14 13:08:51 -05:00
theoreticalbts
fe8710a7aa Implement test_canonical_order and test_intermediate_zeros for equihash 2016-12-13 15:27:44 -05:00
theoreticalbts
cfc53e8b82 Wrap non-FC exceptions thrown by client methods 2016-12-07 15:27:09 -05:00
Michael Vandeberg
2f202e017c Include is needed for some gcc build environments 2016-12-02 16:15:35 -05:00
theoreticalbts
d7276e2d15 Add -std=c99 when compiling equihash, needed by gcc 4.8 2016-11-22 13:36:05 -05:00
Michael Vandeberg
9bc8991f23 Merge commit '463f242ffa4132d22a5006d653bc67b5b703851f' 2016-11-16 11:24:29 -05:00
Michael Vandeberg
50dbc2b139 Add equihash 2016-11-16 11:23:33 -05:00
theoreticalbts
463f242ffa Implement parse_size() function 2016-11-07 14:35:05 -05:00
Michael Vandeberg
0e5a4fea68 Remove rapid JSON dependency 2016-10-27 12:52:44 -04:00
theoreticalbts
3dc9639bdd api_connection.hpp: Handle deserialization of null api_ptr 2016-10-26 13:17:48 -04:00
Daniel Larimer
0f9a96314e Merge branch 'master' of https://github.com/steemit/fc 2016-10-24 17:44:59 -04:00
Daniel Larimer
ee6ee27290 clean up tests and add some utility methods 2016-10-24 17:44:53 -04:00
Michael Vandeberg
013fbfb6a7 Remove logging on successful thread creation 2016-10-21 14:06:22 -04:00
Michael Vandeberg
9ce9270f82 Add to_variant for some bip types 2016-10-20 14:32:11 -04:00
theoreticalbts
929d42fe02 Add from/to variant for bip::vector<char, A...> 2016-10-19 09:47:11 -04:00
theoreticalbts
962a816d17 variant.cpp: Fix bug in FC_ASSERT() 2016-10-19 09:47:11 -04:00
Daniel Larimer
815f07506c small formatting issues and helper api 2016-10-18 11:53:26 -04:00
Daniel Larimer
6bd5a6c73b Merge branch 'master' of https://github.com/steemit/fc 2016-10-10 17:16:59 -04:00
Daniel Larimer
0ace4298c5 adding interprocess lock 2016-10-10 17:16:57 -04:00
theoreticalbts
636d4530e3 sha256: Add method to return approx log as double 2016-10-04 14:19:59 -04:00
theoreticalbts
585cea9472 sha256: Add inverse log and testing 2016-10-04 14:19:59 -04:00
Daniel Larimer
d352463e82 fix warnings generated by latest clang 2016-10-03 12:03:34 -04:00
Daniel Larimer
a1354c5382 Merge branch 'master' of https://github.com/steemit/fc 2016-09-29 16:09:10 -04:00
Daniel Larimer
e8b7e9d447 adding scoped_exit helper 2016-09-29 16:09:06 -04:00
theoreticalbts
0d7916b7c2 Handle zlib / bzip2 not found 2016-09-29 14:55:09 -04:00
theoreticalbts
b28e998a84 Allow CPP_STANDARD to be overridden 2016-09-29 14:43:18 -04:00
Daniel Larimer
9dfee17413 Merge branch 'master' of https://github.com/steemit/fc 2016-09-28 15:55:14 -04:00
Daniel Larimer
fa5d86d821 define interprocess vector packing 2016-09-28 15:55:08 -04:00
theoreticalbts
86e1cb83db Link with zlib and bzip2 libraries, if found
These libraries are not required by FC. However, the only way I've found to get CMake to pass them to the linker
in an order which will allow steemd to successfully link, is to put them in FC's CMakeLists.txt.
2016-09-28 14:37:35 -04:00
theoreticalbts
f14f463687 fixed_string.hpp: Don't use skip() as not all stream types support it 2016-09-28 14:37:35 -04:00
Daniel Larimer
5da49e5413 Merge branch 'master' of https://github.com/steemit/fc 2016-09-28 11:55:58 -04:00
Daniel Larimer
fb4ddbac0d addding improved support for serializing boost interprocss types 2016-09-28 11:55:51 -04:00
theoreticalbts
ea78d2e75d reflect.hpp: Improve reflection of enum types
- Fix implementation of FC_REFLECT_VISIT_ENUM()
- Re-enable visit() for enum
- Add typename information for enum
2016-09-23 12:21:28 -04:00
Michael Vandeberg
78b511c11e Fix warning in fixed_string.hpp 2016-09-20 15:06:00 -04:00
Daniel Larimer
3c6d7d9fe3 remove console spam 2016-09-16 17:17:06 -04:00
Daniel Larimer
ddc2c16cdb removing duplicate definitions given boost::flat_map == boost::interprocess::flat_map 2016-09-16 14:53:03 -04:00
Daniel Larimer
5c5156f3db remove multiprecision from fixed_string 2016-09-16 13:31:03 -04:00
Daniel Larimer
e7d0d26fe2 adding fixed_string definition 2016-09-15 15:29:16 -04:00
Daniel Larimer
f59a516256 define to/from variant for boost interprocess deque and vector 2016-09-14 10:30:48 -04:00
theoreticalbts
19d41b8606 Do not emit \a escape sequence 2016-09-02 10:36:11 -04:00
theoreticalbts
360d86da80 Fix uninitialized variable warning 2016-08-29 13:11:37 -04:00
theoreticalbts
21d62f0a96 Throw when deserializing an integer into a value not in enum 2016-08-26 16:28:36 -04:00
theoreticalbts
80b2341e77 Throw when parsing a string as enum if the string parses as integer but does not exist in enum 2016-08-26 15:29:43 -04:00
theoreticalbts
8d99ea94e6 Avoid undefined behavior in enum deserialization
atoi() has undefined behavior when given a string that can't be parsed as an integer.
This patch replaces atoi() with boost_lexical_cast() and throws an exception when we get
something that's not a number.
2016-08-26 15:01:26 -04:00
theoreticalbts
a7376ceba2 tcp_socket.cpp: More verbose error message 2016-08-16 14:51:50 -04:00
theoreticalbts
894d784523 api_connection.hpp: Rename member variable api -> _api to avoid conflicting with type name 2016-08-15 10:59:42 -04:00
theoreticalbts
f3e69d81a9 sha256: Implement and test clz(), approx_log_32() 2016-08-11 12:10:14 -04:00
Daniel Larimer
d74f49ab04 progress on binary api connection 2016-07-30 19:25:32 -04:00
Daniel Larimer
de9a29c33e Progress toward binary RPC" 2016-07-30 19:24:15 -04:00
Daniel Larimer
e8e26838cc first step toward binary RPC 2016-07-30 18:41:03 -04:00
theoreticalbts
c672e3b4b4 json.cpp: Add missing cases for control character escape sequences 2016-07-21 13:33:36 -04:00
Daniel Larimer
e5ffc620ba updating fc to support more threads 2016-07-18 21:20:40 -04:00
Daniel Larimer
c109dbecf3 improve performince of fc::uin128 divide 2016-06-27 16:22:14 -04:00
Daniel Larimer
8cfc246316 Merge pull request #2 from arhag/mingw-build-speedup
Changes to secp256k1 build that should speed up steemd hash rate on Windows
2016-05-26 17:15:38 -04:00
arhag
67fe2cfe16 Changes to secp256k1 build that should speed up hash rate on Windows 2016-05-26 15:45:51 -04:00
Daniel Larimer
2bc237537c updating websocket and adding new utf8 code 2016-05-24 19:24:03 -04:00
Daniel Larimer
bc5947d6c7 Merge pull request #1 from arhag/mingw-build
Changes to fc to get MinGW cross-compilation working
2016-05-23 16:54:41 -04:00
arhag
580d626fdd Fix diff-match-patch submodule 2016-05-22 03:07:14 -04:00
arhag
66d4b0841d Changes to fc to get MinGW cross-compilation working 2016-05-22 01:33:19 -04:00
theoreticalbts
44ede99409 websocket.cpp: Allow specifying CA root in websocket_client constructor 2016-05-18 21:14:25 -04:00
theoreticalbts
b6fdcdd5dd json_relaxed.hpp: Fix bug in triple quote string parsing 2016-05-05 13:03:35 -04:00
theoreticalbts
56e36bed8f Revert "Update the websocketpp library and change the configuration options we pass"
This reverts commit d5370fc2ea.
2016-04-19 22:58:39 -04:00
theoreticalbts
1f02c6790f Revert "Add an option to the websocket server constructor to allow disabling deflate"
This reverts commit 21045dde5f.
2016-04-19 22:58:37 -04:00
theoreticalbts
7906a58468 Revert "Make websocket permessage-deflate default to disabled since it causes problems with Chrome"
This reverts commit 622ff58039.
2016-04-19 22:58:30 -04:00
Daniel Larimer
b34e8584ae Merge branch 'master' of https://github.com/steemit/fc 2016-04-08 14:18:47 -04:00
Daniel Larimer
09975ce12b adding IP address to http request handler 2016-04-08 14:18:42 -04:00
theoreticalbts
5c1bb56177 Implement modular API support
- Create class `api_base` to be base class of `api<T>`, and `typedef shared_ptr<api_base> api_ptr`
- Create function `api_base::as<T>()` to allow simple downcast to `api<T>`
- Create class `any_api` to contain an API which has been returned from the remote end, but not yet cast with `as<T>`
- `to_generic()` override allowing remote API to return `api_ptr`, thus we need not know the type of the returned API at compile time
- Allow API's to be referenced by name, if we call with a string API name in the JSON the framework calls get_api_by_name on API 1 to determine the API ID
2016-04-04 00:50:56 -04:00
theoreticalbts
31adee49d9 Merge remote-tracking branch 'fmv/master' 2016-03-22 10:17:34 -04:00
Eric Frias
2bd8e92a75 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) 2016-03-18 09:32:55 -04:00
Nathan Hourt
397c10ce19 Fix installation
FC now installs properly with a `make install`
2016-03-17 17:41:31 -05:00
Nathan Hourt
ea2107d33a 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.
2016-03-17 17:27:21 -05:00
Daniel Larimer
2d521c390d Merge branch 'master' of github.com:steemit/fc 2016-03-17 17:24:42 -04:00
Daniel Larimer
a421e28048 change json seralization of map<string,T> to be object rather than array of pairs 2016-03-17 17:24:25 -04:00
Eric Frias
622ff58039 Make websocket permessage-deflate default to disabled since it causes problems with Chrome 2016-03-14 18:26:29 -04:00
Daniel Larimer
0dca15c395 Merge branch 'master' of https://github.com/cryptonomex/fc 2016-03-11 12:33:41 -05:00
Daniel Larimer
eaa763aff1 adding canonical flag 2016-03-11 12:33:33 -05:00
Eric Frias
21045dde5f Add an option to the websocket server constructor to allow disabling deflate
compression.  Refactored the code to remove duplication between tls/non-tls
versions of the server, which appear to have been cut & paste copies of
one another that had diverged slightly.  This makes some of the fixes to
the non-tls server available in the tls server.
cryptonomex/graphene#619
2016-03-10 17:22:28 -05:00
Eric Frias
d5370fc2ea Update the websocketpp library and change the configuration options we pass
when creating the websocket servers to enable deflate compression on
websocket frames.  This is relevant to cryptonomex/graphene#540 because
the spammed data is higly compressible.  In my tests, it reduces bandwidth
for a single idle node by a factor of ~16, from 577kbps down to 36kbps.
This doesn't require any changes to the wallets, simply upgrading the
public servers will begin sending compressed data to all clients that
support it.
Note: this commit adds a dependency on zlib for non-apple platforms
(it was already required on apple)
2016-03-03 16:53:43 -05:00
theoreticalbts
38419164b6 optional.hpp: Allow easy access to contained type 2016-02-26 14:26:58 -05:00