Commit graph

466 commits

Author SHA1 Message Date
Miha Čančula
4586cc5df5
Remove leftover comment from merge 2019-09-21 17:37:43 +02:00
Miha Čančula
97f9875918
Merge branch 'develop' into GRPH-50-network_broadcast_api-fix-v2 2019-09-21 17:17:19 +02:00
Miha Čančula
94157497bb
Merge branch 'develop' into feature/GRPH-93-v2 2019-09-18 18:19:17 +02:00
Miha Čančula
499a5fc33e
Merge branch 'develop' into GRPH-50-network_broadcast_api-fix-v2 2019-09-18 16:36:42 +02:00
Alfredo Garcia
d911b3db69
Merge branch 'develop' into GRPH-75 2019-09-17 15:53:18 -03:00
Ronak Patel
646dc2e548 Merged Bitshares PR #1462 and compilation fixes 2019-09-10 18:56:27 +05:30
Ronak Patel
3510704398 Fix for for history ID mismatch ( Bitshares PR #875 ) 2019-09-09 15:33:47 +05:30
Bobinson K B
b11edaa6a5
Merge pull request #69 from peerplays-network/WASM-49
get_account_history fix
2019-09-07 00:54:39 +05:30
Bobinson K B
f9a3d087ea
Merge pull request #60 from peerplays-network/GRPH-48-Object-Database-18.04
Grph 48 object database 18.04
2019-09-07 00:53:04 +05:30
Peter Conrad
17417037c6 Moved reindex logic into database / chain_database, make use of additional blocks in block_database
Fixed tests wrt db.open
2019-09-02 17:19:21 +03:00
satyakoneru
f6423d0b10 GRPH-4-CliWallet_crash_ctrlD 2019-08-28 13:53:41 +00: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
gladcow
5d38466f7d Backport fix for get_account_history from https://github.com/bitshares/bitshares-core/pull/628 and add additional account history test case 2019-08-28 15:49:33 +03:00
Peter Conrad
14b0d08d5a Fixed error when account_history_object with id 0 doesnt exist 2019-08-28 15:49:33 +03:00
Sandip Patel
0d0a6b7c74 Fixed error while loading object database 2019-08-28 12:11:43 +05:30
pbattu123
947b02bd57
Merge branch 'beatrice' into beatrice-5050-merge 2019-08-20 15:15:01 -03: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
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 Singh
aa3128fe89 Merged beatrice into 5050 2019-07-30 11:43:31 -04: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
pbattu
0f06a9af2a Required changes to upgrade blockchain to ubuntu18.04 2019-05-20 22:32:17 -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
Alfredo
a58eb6fae8 add get_gpos_info database api call 2019-03-05 17:48:47 -03:00
Fabian Schuh
6f3ddc0719
Merge branch 'hardfork' into feature/duplicate-operation-check-hardfork 2019-02-07 15:34:16 +01:00
Fabian Schuh
7598d54fa7
Fixes after review 2019-02-07 12:18:15 +01:00
dimfred
87bf4be89b digest_accumulator picks out bm_create and bmg_create and reworked duplicate check 2019-02-06 14:25:37 +01:00
dimfred
c86237cd86 changed api.cpp accordingly 2019-02-01 18:36:30 +01:00
dimfred
2922366e27 changed check_transaction to check only for proposals associated with GRAPHENE_WITNESS_ACC 2019-02-01 18:36:30 +01:00
dimfred
ee8429938c moved check_trx_for_duplicate_operation and digest_accumulator to database api 2019-02-01 18:36:30 +01:00
Fabian Schuh
e9970767f5
Ensure we use the correct genesis block, config and seed nodes 2019-01-22 10:21:39 +01:00
Fabian Schuh
fe138fabbf
Add more seed nodes 2018-12-11 11:20:16 +01:00
Fabian Schuh
462f737227 Chain launched by blckchnd 2018-10-29 10:21:55 +01:00
Fabian Schuh
ea3bb1a377
Proper variables for beatrice testnet 2018-10-12 12:20:30 +02:00
Fabian Schuh
d8f3f6b399
Merge remote-tracking branch 'origin/list_pending_proposals_api' into testnet-beatrice 2018-10-11 14:20:53 +02:00
Fabian Schuh
7d6432e4bf
Merge remote-tracking branch 'origin/sport_n_events_api_extension_release' into beatrice 2018-10-11 14:08:23 +02:00
Fabian Schuh
d0c6c49e44
Merge remote-tracking branch 'origin/broadcast-api-operations-duplication-check' into beatrice 2018-10-11 13:54:31 +02:00
Peter Conrad
ade7cf2d87
Created plugin stub for affiliate statistics 2018-10-10 14:26:38 +02:00
Peter Conrad
fdd7c193a6
Implemented affiliate payouts 2018-10-10 14:25:56 +02:00
Peter Conrad
0a2af8afb2 Merge remote-tracking branch 'origin/baxter' 2018-09-04 14:52:48 +02:00
Michael Neynens
d5d7900cb4 Updated seed nodes and added update section in README 2018-07-09 08:51:56 -07:00
Apr Team
140ecd7532 Added more tests. Fixed offsets in the db file. Pathced the network_broadcast_api. 2018-07-05 13:58:36 +03:00
Michael Neynens
7c853e42aa Merge branch 'pr10' 2018-07-04 16:14:13 -07:00
Apr Team
80efb85d72 Added event_group delete operation and evaluator. Fixed compilation issues. 2018-05-17 09:45:04 +02:00
Apr Team
4f501f6aaf Added sport_delete operation, evaluator and API. Fixed various compilation issues.
Added tests file.
2018-05-17 09:45:04 +02:00