Commit graph

1654 commits

Author SHA1 Message Date
Miha Čančula
1b4b5d7b24
Merge branch 'develop' into GRPH-50-network_broadcast_api-fix-v2 2019-09-02 10:27:33 +02:00
Miha Čančula
83c28c2c06
Use offsetof instead of custom macro 2019-08-28 15:42:50 +02:00
Miha Čančula
4c54011d98
Update fc submodule 2019-08-28 15:42:21 +02:00
Miha Čančula
cb99aaa0cf
Adapt to variant API with max_depth argument 2019-08-28 15:42:21 +02:00
abitmore
94f9c5f3eb
Increase max depth for trx confirmation callback 2019-08-28 15:42:21 +02:00
Abit
a49f8bf47c
Merge pull request #714 from pmconrad/json_fix
JSON fix
2019-08-28 15:42:21 +02:00
abitmore
22e7c44984
Add nullptr check in api.cpp for easier testing 2019-08-28 15:41:15 +02:00
satyakoneru
aeae7b254a GRPH-53-Log_format_error 2019-08-28 12:01:04 +00:00
pbattu123
2486eddb5d revert master changes that were brought in previous commit 2019-08-22 09:54:52 -03:00
pbattu123
481fac17d5
Merge branch 'master' into beatrice 2019-08-22 09:15:27 -03:00
Prabhjot
30c336ecfb Changed hardfork time for SWEEPS and Core-429 2019-08-22 09:08:12 -03:00
PBSA
896ac97962 5050 fee update and compilation error fix 2019-08-21 13:13:46 +00:00
pbattu123
f9e46a31df
Merge branch 'beatrice' into qa_gpos_18.04_gcc7_fix 2019-08-20 15:42:03 -03:00
pbattu123
947b02bd57
Merge branch 'beatrice' into beatrice-5050-merge 2019-08-20 15:15:01 -03:00
pbattu123
c2a7aa7a33
Merge pull request #39 from PBSA/virtual_op_fix
virtual-op-fix for deterministic virtual_op number
2019-08-20 14:54:18 -03:00
Prabhjot
2c14af0699 fix: is_benefactor_reward had the default value of true when not set 2019-08-19 11:47:04 -03:00
Miha Čančula
f525737879 Fix out-of-source CMake builds 2019-08-19 15:13:27 +02:00
Srdjan Obucina
4d426e1f5a Enable building on Ubuntu 18.04 using GCC 7 compiler 2019-08-14 14:05:30 +02:00
Prabhjot
37b813d4fa fix double definition of functions in database_api 2019-08-12 11:05:20 -04:00
Prabhjot Singh
8caeb0ec18 merge 5050 into beatrice 2019-08-12 08:38:53 -04:00
Prabhjot
80dc2003b9 Removed redundant if from asset_evaluator and fixed db_notify 2019-08-09 13:18:09 -04:00
Prabhjot
afe6cba258 Changed sweeps hardfork time 2019-08-09 13:04:02 -04:00
Prabhjot
a0ae945f8d Added new lottery_asset_create_operation 2019-08-09 13:01:57 -04:00
Prabhjot
0386ffebce Removed blind_sign and unblind_signature functions 2019-08-08 08:20:58 -04:00
Prabhjot
6072dd16bb fix casting in overloaded function 2019-08-08 07:46:55 -04:00
Prabhjot
f7555d3e04 checked out ubuntu upgrade branch of fc 2019-08-07 10:50:13 -04:00
Prabhjot
8c91abd6a3 Added fc library back 2019-08-07 10:48:37 -04:00
Prabhjot
744bff7741 Removed submodule libraries/fc 2019-08-07 10:46:09 -04:00
pbsa
485bb0e7b3 included sstring in 2 files, added missing ops to db_notify.cpp 2019-08-06 15:19:51 -03:00
Prabhjot
115bfb0370 fixed asset_object 2019-08-06 07:54:06 -04:00
Prabhjot
c278352713 removed sweeps_parameter_extensions 2019-08-02 09:47:32 -04:00
Prabhjot
7944a6db34 fixed returntype in chain_parameters.hpp 2019-07-31 10:22:51 -04:00
Prabhjot
7044e5c782 added missing comma in operations.hpp, small changes to config.hpp 2019-07-31 10:19:35 -04:00
Prabhjot
3db62bbe46 Added sweeps parameters to parameter_extension 2019-07-31 09:36:22 -04:00
Prabhjot
4829c3dd93 added missing , in types.hpp 2019-07-30 15:28:03 -04:00
Prabhjot
8175ca4451 Added libraries/fc 2019-07-30 15:09:19 -04:00
Prabhjot
dbf545aa6b Removed submodule libraries/fc 2019-07-30 15:06:05 -04:00
Prabhjot
7b98f7de16 Updated gitmodules, changes to allow voting on lottery fee 2019-07-30 15:01:44 -04:00
Prabhjot Singh
aa3128fe89 Merged beatrice into 5050 2019-07-30 11:43:31 -04:00
pbattu123
d365e555f4 virtual-op-fix for deterministic virtual_op number 2019-06-19 11:16:43 -03:00
Alfredo
891137cf57 merge PR 2 2019-05-30 00:04:53 -03:00
pbattu123
67616417b7
Revert "GPOS protocol" 2019-05-29 18:31:01 -03:00
pbattu123
2c86caacc5
Merge pull request #8 from oxarbitrage/gpos2
GPOS protocol
2019-05-29 18:09:48 -03:00
PBSA
4c174597ff compilation errors resolved 2019-05-22 16:34:55 +00:00
pbattu
ee02f268f5 want to update HEAD to latest commit of fc 2019-05-21 21:29:59 -03:00
pbattu
84dff76a0a updated submodules to support 18.04 upgrade 2019-05-21 19:13:44 -03:00
pbattu
0f06a9af2a Required changes to upgrade blockchain to ubuntu18.04 2019-05-20 22:32:17 -03:00
pbattu123
ea41e06471 update db_version for replay and removed duplicate include files 2019-04-15 09:47:04 -03:00
Roshan Syed
b787f3f21b Revert "Merge branch 'master' into beatrice"
This reverts commit cc8766d319, reversing
changes made to fd71c4b682.
2019-04-12 12:53:09 -03:00
pbattu123
cc8766d319
Merge branch 'master' into beatrice 2019-04-12 10:12:58 -03:00