Commit graph

172 commits

Author SHA1 Message Date
Sandip Patel
ac5d55be0f added new files 2019-11-14 17:05:01 +05:30
Alfredo Garcia
f831f9527f Merge branch 'qa_gpos_18.04' into develop_gpos 2019-11-05 14:34:04 -03:00
pbattu123
48d0d88ff0 changes to update last voting time 2019-10-23 18:33:17 -03:00
pbattu123
0d1c41557d changes to allow user to vote in each sub-period 2019-10-22 10:39:45 -03:00
Alfredo Garcia
8c188bd53f merge gpos to develop (#186)
* issue - 154: Don't allow to vote when vesting balance is 0

* changes to withdraw_vesting feature(for both cdd and GPOS)

* Comments update

* update to GPOS hardfork ref

* fix for get_vesting_balance API call

* braces update

* Create .gitlab-ci.yml

* fixing build errors (#150)

* fixing build errors

vest type correction

* fixing build errors

vest type correction

* fixes 

new Dockerfile

* vesting_balance_type correction

vesting_balance_type changed to normal

* gcc5 support to Dockerfile

gcc5 support to Dockerfile

* Changes to compiple with GCC 7(Ubuntu 18.04)

* changes to have separate methods and single withdrawl fee for multiple vest objects

* 163-fix, Return only non-zero vesting balances

* Revert "Revert "GPOS protocol""

This reverts commit 67616417b7.

* add new line needed to gpos hardfork file

* comment temporally cli_vote_for_2_witnesses until refactor or delete

* fix gpos tests

* fix gitlab-ci conflict
2019-10-17 22:09:44 +05:30
Bobinson K B
1cb494e686
Merge pull request #140 from peerplays-network/feature/GRPH-111
Added get_asset_count API
2019-09-23 09:55:27 -04:00
Sandip Patel
aa31de5d44 Added get_asset_count API 2019-09-20 17:51:43 +05:30
Abit
a49f8bf47c
Merge pull request #714 from pmconrad/json_fix
JSON fix
2019-08-28 15:42:21 +02:00
pbattu123
947b02bd57
Merge branch 'beatrice' into beatrice-5050-merge 2019-08-20 15:15:01 -03: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
ee8429938c moved check_trx_for_duplicate_operation and digest_accumulator to database api 2019-02-01 18:36:30 +01:00
Fabian Schuh
d8f3f6b399
Merge remote-tracking branch 'origin/list_pending_proposals_api' into testnet-beatrice 2018-10-11 14:20:53 +02:00
Peter Conrad
ade7cf2d87
Created plugin stub for affiliate statistics 2018-10-10 14:26:38 +02:00
Fabian Schuh
2be2826f3c [pending] use map instead of vector 2018-04-11 15:43:10 +02:00
Blockchain Projects BV
16e0b5353a Added Pending-transactions 2018-04-03 10:13:38 +02:00
kstdl
202153acdc added get_account_lotteries method to db_api and cli, lottery end_date and ticket_price verification 2018-01-03 15:34:15 +03:00
kstdl
8f379a3c53 fix reindex on peerplays network 2017-12-12 15:37:58 +03:00
kstdl
fdd77ef5af minor logic changes. added db_api and cli_wallet methods 2017-12-11 17:42:55 +03:00
Eric Frias
f3290a8827 Add get_unmatched_bets_for_bettor() to get unmatched bets across all betting markets 2017-08-31 11:02:16 -04:00
Eric Frias
38f1cbdcd6 Add list_events_in_group() and get_unmatched_bets_for_bettor() API calls 2017-08-30 19:21:27 -04:00
Eric Frias
c4470131ac Enable building bookie plugin, add API for bookie plugin, and implement a
function for getting binned order books (as yet untested)
2017-07-27 19:36:31 -04:00
Roman Olearski
d3482f3a08 Merge branch 'rock-paper-scissors' of https://bitbucket.org/peerplaysblockchain/peerplays-graphene into betting-merge 2017-07-13 16:07:30 +02:00
Eric Frias
90722fc0a4 Cherry-picke commit be6ad13.
Code cleanups -- renaming variables, adding comments, fix one bug with override transfers and dividend assets
2017-07-06 19:41:13 +02:00
Eric Frias
5b437d7363 Cherry-picked commit b584ee1.
Separate out unit tests for dividend-assets into their own test suite
2017-07-06 19:22:33 +02:00
Eric Frias
9c9af76e12 Merge commit 'd8e7c0afee573d82647018a9efd530a03274a2aa' into betting 2017-06-21 16:58:50 -04:00
Eric Frias
3238ea735f Merge commit '568ceb189eca96e77e38c4059b83a504008d7e91' into betting 2017-06-21 16:43:00 -04:00
Eric Frias
636f28eac6 Merge commit 'aa6f3e9051787bfc1b4284f1684544cca9bfc9c9' into betting 2017-06-21 16:08:58 -04:00
Eric Frias
c20978bae6 Merge commit '1e80d8a01e6181711bba3d6462e64286d79935b1' into betting 2017-06-20 19:34:52 -04:00
Eric Frias
bd525ef55d Merge commit 'c777a88649d50edf6c5e4a8c3b13dda88a66e9d0' into betting 2017-06-20 18:15:43 -04:00
Eric Frias
50fef80189 Merge commit 'ee3f81fa31e39a8ae4ebcfe5b3d78f2dbc103e1b' into betting 2017-06-20 17:44:12 -04:00
Vikram Rajkumar
d8e7c0afee Merge pull request #311 from elmato/push-transaction-sync
Implement network_broadcast_api::broadcast_transaction_synchronous
2017-06-14 18:52:14 -05:00
root
b307557182 add simple pagination to get_asset_holders 2017-06-14 17:47:18 +00:00
Matias Romeo
ea8f8964eb Implement network_broadcast_api::broadcast_transaction_synchronous (ported from steem) 2017-06-12 18:22:34 -03:00
Vikram Rajkumar
f9f60770f9 Revert "Merge branch 'goho' of git://github.com/oxarbitrage/bitshares-core into oxarbitrage-goho"
This reverts commit 628652f3eb, reversing
changes made to 568ceb189e.
2017-06-03 16:05:17 -05:00
Vikram Rajkumar
a263279b76 Revert "Fix warnings; #296"
This reverts commit 40c7a7ffa3.
2017-06-03 16:03:52 -05:00
Vikram Rajkumar
40c7a7ffa3 Fix warnings; #296 2017-06-02 19:38:30 -05:00
root
615321cc18 added get_account_transaction_history_id and some fixes 2017-05-31 23:11:29 +00:00
root
7c3904bfae adding get_operation_history_id 2017-05-31 20:45:25 +00:00
kstdl
342e6db610 inital 2017-05-25 12:13:59 +03:00
Roman Olearski
0c14896a3d done acounts_list_plugin 2017-05-22 19:49:10 +02:00
Roman Olearski
3e4d9c2aa3 added acounts_list_plugin 2017-05-22 17:57:35 +02:00
Roman Olearski
c18945f592 added reflections for betting API Calls 2017-05-09 13:49:41 +02:00