Vlad Dobromyslov
|
0c49633759
|
Merge branch 'feature/son-for-hive-voting' into feature/310-refactor-maintenance-block
Conflicts are resolved:
libraries/chain/db_maint.cpp
|
2022-04-12 19:45:44 +03:00 |
|
Vlad Dobromyslov
|
0f442ef9f6
|
#310 - check txs_signed contains active_sidechain_type
|
2022-04-12 11:02:31 +03:00 |
|
Vlad Dobromyslov
|
b7ac7830ab
|
#310 - refactor pay_sons() function
|
2022-04-12 08:43:56 +03:00 |
|
Vlad Dobromyslov
|
19b5cb7854
|
Merge branch 'feature/339-refactor-sidechain_type' into feature/310-refactor-maintenance-block
|
2022-04-11 16:07:22 +03:00 |
|
Vlad Dobromyslov
|
508711f764
|
#339 - change bitcoin and hive schedule id
|
2022-04-11 12:44:14 +03:00 |
|
Vlad Dobromyslov
|
f1e1844748
|
Update fc submodule
|
2022-04-11 11:34:23 +03:00 |
|
Vlad Dobromyslov
|
7c49232f60
|
Merge branch 'feature/son-for-hive-voting' into feature/339-refactor-sidechain_type
# Conflicts are resolved:
libraries/chain/db_maint.cpp
libraries/chain/db_witness_schedule.cpp
libraries/chain/include/graphene/chain/database.hpp
libraries/chain/include/graphene/chain/global_property_object.hpp
libraries/chain/include/graphene/chain/son_object.hpp
libraries/plugins/peerplays_sidechain/peerplays_sidechain_plugin.cpp
libraries/wallet/wallet.cpp
|
2022-04-11 11:09:45 +03:00 |
|
Vlad Dobromyslov
|
aa3da2cf62
|
#339 - add function get_son_schedule_id
|
2022-04-11 10:41:29 +03:00 |
|
Vlad Dobromyslov
|
8bb452858c
|
#339 - fix son_ids in list_active_sons
|
2022-04-08 09:14:36 +03:00 |
|
Vlad Dobromyslov
|
b09c22b224
|
#339 - fix active_sidechain_types for peerplays_sidechain_plugin
|
2022-04-07 14:50:41 +03:00 |
|
Vlad Dobromyslov
|
e58b7d6916
|
#339 - fix database::pay_sons()
|
2022-04-07 14:29:57 +03:00 |
|
Vlad Dobromyslov
|
8f2c1b06b1
|
#339 - fix sidechain_type for schedule
|
2022-04-07 14:09:41 +03:00 |
|
Vlad Dobromyslov
|
ac3e16aca0
|
#339 - fix active_sidechain_type for update_active_sons funtion
|
2022-04-07 13:42:13 +03:00 |
|
Vlad Dobromyslov
|
626633c9b6
|
#339 - add active_sidechain_type
|
2022-04-07 12:32:24 +03:00 |
|
Vlad Dobromyslov
|
46b5f08caf
|
Merge branch 'feature/son-for-hive-voting' into feature/308-multiple-lists-of-active-SON
Conflicts are resolved:
libraries/chain/db_maint.cpp
|
2022-04-05 15:26:53 +03:00 |
|
Vlad Dobromyslov
|
7a41307712
|
#308 - fix active_sons in son_processing function
|
2022-04-05 15:24:05 +03:00 |
|
Vlad Dobromyslov
|
446d89764c
|
#308 - fix global_props.active_sons.size
|
2022-04-05 08:05:42 +03:00 |
|
Vlad Dobromyslov
|
550727757f
|
#308 - get cur_active_sons as copy, not reference
|
2022-04-04 11:20:22 +03:00 |
|
Vlad Dobromyslov
|
0d74fcf675
|
#308 - fix son_object statuses initialization
|
2022-04-04 11:19:57 +03:00 |
|
Vlad Dobromyslov
|
e217fb94f3
|
#308 - fix global_property_object active_sons initialization
|
2022-04-04 08:36:13 +03:00 |
|
Vlad Dobromyslov
|
f6c9b1b7a6
|
#308 - fix update_son_statuses + son_schedule
|
2022-03-31 15:31:56 +03:00 |
|
Vlad Dobromyslov
|
467522f7d8
|
#308 - son_status as map
|
2022-03-30 15:31:41 +03:00 |
|
Vlad Dobromyslov
|
32d67b2c30
|
#308 - delete sidechain_type map for public_key in son_info (we store son_info as map itself)
|
2022-03-28 16:01:00 +03:00 |
|
Vlad Dobromyslov
|
cbca83a90e
|
#308 - multiple lists of active_sons
|
2022-03-26 12:03:13 +03:00 |
|
Vlad Dobromyslov
|
00837a9a8b
|
Merge branch 'feature/328-son-voting-test' into feature/308-multiple-lists-of-active-SON
|
2022-03-25 07:38:15 +03:00 |
|
Vlad Dobromyslov
|
645fb32fc5
|
#328 - Fix SON tests
|
2022-03-24 12:39:02 +03:00 |
|
Vlad Dobromyslov
|
9c73357d97
|
№328 - Fix needed_sons in account_options
|
2022-03-24 08:27:51 +03:00 |
|
Vlad Dobromyslov
|
eec19a350b
|
#328 - total_votes as map of sidechain_type
|
2022-03-23 08:59:22 +03:00 |
|
Vlad Dobromyslov
|
5c5116f3fc
|
#328 - update "cli_update_son" test
|
2022-03-22 13:58:37 +03:00 |
|
Vlad Dobromyslov
|
97cdf1b6f0
|
#328 - Add additional checks for "create_sons" test
|
2022-03-22 12:12:01 +03:00 |
|
Vlad Dobromyslov
|
342b0917f3
|
#328 - fix build error in sidechain_withdraw_transaction_test
|
2022-03-22 09:52:06 +03:00 |
|