Vlad Dobromyslov
ac8b6114af
Merge branch 'develop' into local_dev_subscribe_address
2023-10-30 20:19:51 +03:00
Vlad Dobromyslov
664379a8c1
Merge branch 'beatrice' into develop
2023-10-04 15:37:54 +03:00
Vlad Dobromyslov
b79df7db07
Set HARDFORK_SON_FOR_ETHEREUM_TIME to 24 of October
2023-10-04 15:34:35 +03:00
Vlad Dobromyslov
1472066af6
Merge branch 'develop' into 'beatrice'
...
Fixes for 1.5.25-beta
See merge request PBSA/peerplays!249
2023-10-03 16:24:00 +00:00
Vlad Dobromyslov
a641b8e93f
Fixes for 1.5.25-beta
2023-10-03 16:23:59 +00:00
Vlad Dobromyslov
b6e4fc5c3c
Merge branch 'bug/562-fix-libbitcoin-build' into 'develop'
...
#562 - Point to libbitcoin tag v3.8.0
See merge request PBSA/peerplays!248
2023-10-03 10:56:46 +00:00
Vlad Dobromyslov
f6c6ac2cc8
#562 - Point to libbitcoin tag v3.8.0
2023-10-03 11:57:09 +03:00
Vlad Dobromyslov
aa099f960f
Merge branch 'develop' into 'beatrice'
...
Fixes for 1.5.24-beta
See merge request PBSA/peerplays!246
2023-08-23 14:31:39 +00:00
Vlad Dobromyslov
f0654e5ffd
Fixes for 1.5.24-beta
2023-08-23 14:31:38 +00:00
Vlad Dobromyslov
56e15b8e80
Merge branch 'beatrice' into develop
...
Conflicts are resolved:
libraries/plugins/peerplays_sidechain/sidechain_net_handler.cpp
2023-08-23 15:29:30 +03:00
Vlad Dobromyslov
60207813b0
Merge branch 'bug/559-withdraw-native-asset' into 'develop'
...
#559 - Don't create withdraw operation if we use native asset
See merge request PBSA/peerplays!245
2023-08-22 11:08:47 +00:00
Vlad Dobromyslov
18589ab198
#559 - Don't create withdraw operation if we use native asset
2023-08-22 12:11:56 +03:00
Vlad Dobromyslov
c1aa13192d
Merge branch 'bug/558-schedule_son_processing' into 'develop'
...
#558 - Fix schedule_son_processing before fully sync
See merge request PBSA/peerplays!244
2023-08-09 13:28:19 +00:00
Vlad Dobromyslov
1520585b17
#558 - Fix schedule_son_processing before fully sync
2023-08-09 14:21:39 +03:00
Vlad Dobromyslov
c055445e6a
Merge branch 'bug/556-split-vote_ids' into 'develop'
...
#556 split vote ids fix
See merge request PBSA/peerplays!243
2023-08-01 12:12:01 +00:00
Vlad Dobromyslov
675eba96bb
#556 split vote ids fix
2023-08-01 12:12:01 +00:00
Vlad Dobromyslov
9fe351300b
Merge branch 'develop' into 'beatrice'
...
Set test-e2e as manual
See merge request PBSA/peerplays!242
2023-07-17 12:49:53 +00:00
Vlad Dobromyslov
5fd79c3e78
Set test-e2e as manual
2023-07-17 12:49:53 +00:00
Vlad Dobromyslov
270751cb86
Merge branch 'bug/555-e2e-tests' into 'develop'
...
#555 - set test-e2e as manual
See merge request PBSA/peerplays!241
2023-07-17 09:33:13 +00:00
Vlad Dobromyslov
8e2d3cf2f6
#555 - set test-e2e as manual
2023-07-17 10:06:14 +03:00
Vlad Dobromyslov
b56818b8ae
Merge branch 'develop' into 'beatrice'
...
Change DB_VERSION to PPY2.5
See merge request PBSA/peerplays!240
2023-07-13 16:44:03 +00:00
Vlad Dobromyslov
bc0fbeb707
Change DB_VERSION to PPY2.5
2023-07-13 16:44:03 +00:00
Vlad Dobromyslov
9d687b97d2
Merge branch 'feature/554-DB_VERSION' into 'develop'
...
#554 - new DB_VERSION
See merge request PBSA/peerplays!239
2023-07-13 11:47:04 +00:00
Vlad Dobromyslov
113790d956
#554 - new DB_VERSION
2023-07-13 09:39:57 +03:00
Vlad Dobromyslov
accd334a86
Merge branch 'develop' into 'beatrice'
...
NEW HARDFORK TIME FOR SON ETH
See merge request PBSA/peerplays!238
2023-07-07 12:10:44 +00:00
Vlad Dobromyslov
84a66c6722
NEW HARDFORK TIME FOR SON ETH
2023-07-07 12:10:44 +00:00
Vlad Dobromyslov
e24de4f199
Merge branch 'feature/552-son-eth-hf-time' into 'develop'
...
#552 - NEW HARDFORK TIME FOR SON ETH
See merge request PBSA/peerplays!237
2023-07-06 15:32:52 +00:00
Vlad Dobromyslov
15ebbfe6bb
#552 - NEW HARDFORK TIME FOR SON ETH
2023-07-06 15:38:20 +03:00
Vlad Dobromyslov
abd446d80b
Merge branch 'develop' into 'beatrice'
...
Fix balance discrepancies in 1.5.23-beta
See merge request PBSA/peerplays!235
2023-07-06 05:31:28 +00:00
Vlad Dobromyslov
93fb57c080
Fix balance discrepancies in 1.5.23-beta
2023-07-06 05:31:28 +00:00
Vlad Dobromyslov
917e09a80b
Merge branch 'bug/551-son-account-operations-count' into 'develop'
...
#551 - fix is_son_dereg_valid funtion
See merge request PBSA/peerplays!236
2023-07-03 19:50:59 +00:00
Vlad Dobromyslov
646b421308
#551 - fix is_son_dereg_valid funtion
2023-07-03 18:37:54 +03:00
Vlad Dobromyslov
dd2a531364
Merge branch 'bug/548-balance-discrepancies-blind-transfer' into 'develop'
...
#548 - Fix blind_transfer before and after ETH HARDFORK
See merge request PBSA/peerplays!234
2023-07-01 11:51:01 +00:00
Vlad Dobromyslov
ae0a895daf
#548 - Fix blind_transfer before and after ETH HARDFORK
2023-07-01 11:51:01 +00:00
Vlad Dobromyslov
8530228189
Merge branch 'feature/remove-image-e2e-tests' into 'develop'
...
Remove unneeded docker images at the end of the pipeline
See merge request PBSA/peerplays!233
2023-06-30 18:33:26 +00:00
Milo M
85fb3fee67
Remove unneeded docker images at the end of the pipeline
2023-06-30 18:33:26 +00:00
Bobinson K B
a8845ffde9
Merge branch 'develop' into 'beatrice'
...
Fix issue with balance discrepancies in 1.5.23-beta
See merge request PBSA/peerplays!232
2023-06-20 07:37:24 +00:00
Vlad Dobromyslov
435c1f8e96
Fix issue with balance discrepancies in 1.5.23-beta
2023-06-20 07:37:24 +00:00
Vlad Dobromyslov
2c9fd332d4
Merge branch 'bug/548-balance-discrepancies' into 'develop'
...
Fix balance discrepancies
See merge request PBSA/peerplays!231
2023-06-19 09:58:13 +00:00
Vlad Dobromyslov
fb01043e55
Fix balance discrepancies
2023-06-19 09:58:12 +00:00
hirunda
632f74b000
Polling trx from pool
2023-06-12 11:33:40 +02:00
Bobinson K B
1123ff6f93
Merge branch 'develop' into 'beatrice'
...
Fixes for public testnet
See merge request PBSA/peerplays!230
2023-06-09 08:10:26 +00:00
Vlad Dobromyslov
c34415b403
Fixes for public testnet
2023-06-09 08:10:26 +00:00
Vlad Dobromyslov
a1186372d2
Merge branch 'bug/550-son_schedule_object' into 'develop'
...
#550 - update schedule for sidechain type
See merge request PBSA/peerplays!229
2023-06-08 05:28:30 +00:00
Vlad Dobromyslov
3a51723e51
#550 - update schedule for sidechain type
2023-06-08 05:28:30 +00:00
Vlad Dobromyslov
f23244cde0
Merge branch 'bug/549-testnet-sync' into 'develop'
...
Fix #549 testnet sync
See merge request PBSA/peerplays!228
2023-06-05 09:24:05 +00:00
Vlad Dobromyslov
fee7bc99fa
Fix #549 testnet sync
2023-06-05 09:24:04 +00:00
Vlad Dobromyslov
6cf31b1075
Add develop branch to build target
2023-06-05 12:22:54 +03:00
Vlad Dobromyslov
97eaf4575a
Merge branch 'beatrice' into develop
...
Conflicts are resolved:
.gitlab-ci.yml
2023-06-05 09:32:07 +03:00
hirunda
8af1c851e6
Libbitcoin subscribe to address
...
- Exclude using libbitcoin block event
- Use SON address for subscribing on the
libbitcoin server
- Use the event from libbitcoin server if
something is related to subscribed address
2023-05-31 21:43:13 +02:00