Commit graph

2972 commits

Author SHA1 Message Date
serkixenos
b2105f471f Fix memo encryption tests 2021-11-30 17:46:01 -04:00
serkixenos
d5d975acf2 Merge branch 'develop' into hotfix/fix-memo-field-encryption 2021-11-30 16:48:45 -04:00
serkixenos
7b2161e87a Merge branch 'issue/son-for-hive-rpc-connection' into 'develop'
Fix RPC client issues with talking to different nodes

See merge request PBSA/peerplays!31
2021-11-30 19:14:37 +00:00
serkixenos
7f67397137 Fix RPC client issues with talking to different nodes 2021-11-30 19:14:37 +00:00
serkixenos
857a22b237 Fix memo field encryption 2021-11-30 15:12:38 -04:00
serkixenos
8fbe85babb Merge branch 'hotfix/fix-plugin-cli-option' into 'develop'
Fix plugins cli parameter ambiguity

See merge request PBSA/peerplays!35
2021-11-29 19:09:00 +00:00
serkixenos
f0bacb3cc1 Fix plugins cli parameter ambiguity 2021-11-29 19:08:59 +00:00
serkixenos
685e9d500c Merge branch 'develop' into beatrice 2021-11-25 20:09:15 -04:00
serkixenos
f279065c79 Handle HARDFORK_SON_FOR_HIVE_TIME properly 2021-11-25 20:08:45 -04:00
serkixenos
873310e16d Merge branch 'develop' into 'beatrice'
Merge Develop to Beatrice 2021-11

See merge request PBSA/peerplays!32
2021-11-22 19:36:16 +00:00
serkixenos
bf0cdbdc6e Merge branch 'feature/son-for-hive' into 'develop'
SON for Hive

See merge request PBSA/peerplays!13
2021-11-18 17:32:30 +00:00
serkixenos
ceffe4cf3c SON for Hive 2021-11-18 17:32:30 +00:00
serkixenos
43c29ce1bf Merge branch 'beatrice' into develop 2021-11-17 23:15:29 -04:00
serkixenos
4eaef1c171 Merge branch 'master' into beatrice 2021-11-17 19:27:51 -04:00
ss
8e5dfb0e72 Merge branch 'beatrice' into develop 2021-09-11 01:50:55 +02:00
ss
01f860e15b Merge branch 'master' into beatrice 2021-09-11 01:49:05 +02:00
Bobinson K B
2778a99842 Merge branch 'hotfix/son-cli-test-fix' into 'master'
Fix failing son cli test

See merge request PBSA/peerplays!26
2021-07-27 12:47:05 +00:00
sierra19XX
d75177b7a1 fix cli test 2021-07-27 09:38:51 +00:00
Bobinson K B
6035d29428 Merge branch 'feature/rel-mainnet-jul21' into 'master'
Merge Beatrice changes to Main net

See merge request PBSA/peerplays!25
2021-07-26 20:16:25 +00:00
sierra19XX
ba69da5d5c Merge Beatrice changes to Main net 2021-07-26 20:16:24 +00:00
Bobinson K B
183906370b Merge branch 'feature/reserve-tokens' into 'develop'
Reserve popular tokens

See merge request PBSA/peerplays!24
2021-06-29 11:24:08 +00:00
sierra19XX
8b84459e8c Reserve popular tokens 2021-06-29 11:24:07 +00:00
Bobinson K B
5dc753054b Merge branch 'feature/beatrice-changes-to-develop' into 'develop'
merge beatrice release delta changes into develop

See merge request PBSA/peerplays!23
2021-06-18 09:09:02 +00:00
sierra19XX
e6b57a2285 merge beatrice release delta changes into develop 2021-06-15 11:51:57 +00:00
Bobinson K B
5ae230e533 Merge branch 'feature/testnet-release-jun2021' into 'beatrice'
Testnet Beatrice release June 2021

See merge request PBSA/peerplays!22
2021-06-05 22:22:45 +00:00
sierra19XX
0a5e3d7080 Testnet Beatrice release June 2021 2021-06-05 22:22:45 +00:00
Bobinson K B
20c9e0f9a3 Merge branch 'feature/son-wrong-weights' into 'develop'
fix wrong son weights from voting

See merge request PBSA/peerplays!20
2021-05-26 16:08:43 +00:00
Bobinson K B
6c8aed3c18 Merge branch 'feature/add-cliwallet-version' into 'develop'
add cli wallet version

See merge request PBSA/peerplays!21
2021-05-25 12:26:13 +00:00
sierra19XX
557270db39 add cli wallet version 2021-05-21 14:27:03 +00:00
sierra19XX
93c980ab2c fix wrong son weights from voting 2021-05-18 12:05:44 +00:00
Bobinson K B
7eba0eb2a8 Merge branch 'support/sonarcloud' into 'develop'
Update .sonarcloud.properties

See merge request PBSA/peerplays!19
2021-05-15 03:46:35 +00:00
Roshan Syed
d8246bc404 chore: update .sonarcloud.properties 2021-05-14 19:59:42 +00:00
Bobinson K B
ec464694a4 Merge branch 'feature/add-get-blocks' into 'develop'
Feature/add get blocks

See merge request PBSA/peerplays!18
2021-05-14 07:54:43 +00:00
sierra19XX
997941611c add ddos mitigation 2021-05-12 13:28:10 +00:00
sierra19XX
b22086ff7e add get_blocks 2021-05-12 11:44:27 +00:00
Bobinson K B
8b3952d26b Merge branch 'feature/sidechain-throttling' into 'develop'
Rate limiting for son deposit, withdrawal, pw change, tx settle operations

See merge request PBSA/peerplays!17
2021-05-03 11:15:43 +00:00
sierra19XX
668f677867 rate limiting for son deposit, withdrawal, pw change, tx settle operations 2021-05-03 09:26:43 +00:00
Bobinson K B
cd0bcf3087 Delete codeql-analysis.yml 2021-03-31 17:29:14 +00:00
Bobinson K B
010b873c8e
Create codeql-analysis.yml 2021-03-31 22:05:16 +05:30
Roshan Syed
2c396f6b19
ci: added automated docker image building and upload (#413) 2021-03-31 17:59:27 +05:30
Bobinson K B
0b0718f739 Merge branch 'issue/dex-crash' into 'develop'
dex crash fix - replace assert with FC_ASSERT

See merge request PBSA/peerplays!15
2021-03-30 11:58:48 +00:00
sierra19XX
974c8f987e dex crash fix - replace assert with FC_ASSERT 2021-03-29 22:52:48 +00:00
Bobinson K B
652d37e206 Merge branch 'feature/hf-btc-flags-change' into 'develop'
Feature/hf btc flags change

See merge request PBSA/peerplays!14
2021-03-22 12:13:09 +00:00
sierra19XX
30e4b50891 only modify flag if it is not already 2021-03-19 12:00:01 +00:00
sierra19XX
ad5f89ba99 change the asset flags to allow transfers/dex trades of pBTC 2021-03-17 12:48:24 +00:00
serkixenos
ae712122d4 Merge branch 'hotfix/build-warnings-210210' into 'develop'
Remove build warnings & update Doxygen file

See merge request PBSA/peerplays!12
2021-02-22 13:29:03 +00:00
serkixenos
2a977793de Remove build warnings & update Doxygen file 2021-02-10 12:53:51 +01:00
serkixenos
d3a3722c1e Merge branch 'master' into beatrice 2021-02-09 13:13:21 +01:00
Bobinson K B
bb4fc3c9c1 Merge branch 'hotfix/master-son-vb-checks' into 'master'
Check vesting balance properties before creating/updating SON

See merge request PBSA/peerplays!11
2021-02-09 03:43:42 +00:00
serkixenos
b362ca23a6 Check vesting balance properties before creating/updating SON 2021-02-09 03:43:42 +00:00