Commit graph

2332 commits

Author SHA1 Message Date
Srdjan Obucina
640bda75ee Cosmetic changes for cleaner diff 2019-09-04 15:11:43 +02:00
Srdjan Obucina
0524c0c216 Fix build error after merging with develop branch 2019-09-03 14:01:31 +02:00
Srdjan Obucina
6743860f42 Merge branch 'develop' into rng_api 2019-09-03 13:57:56 +02:00
Bobinson K B
cdc89c16ee
Merge pull request #97 from peerplays-network/feature/GRPH-61
Increase block creation timeout to 2500ms
2019-09-02 19:20:07 +05:30
Bobinson K B
e44b04df48
Merge pull request #93 from peerplays-network/GRPH-71
Fix failed app_test
2019-09-02 19:16:11 +05:30
Bobinson K B
07249e90bb
Merge pull request #92 from peerplays-network/GRPH-70
[GRPH-70] remove needless find()
2019-09-02 18:38:42 +05:30
gladcow
c5623fdabb increase delay for node connection 2019-08-30 15:54:00 +03:00
Bobinson K B
3b36d4686b
Merge pull request #96 from peerplays-network/feature/GRPH-77
Fix building error for develop branch + test fix
2019-08-30 18:02:38 +05:30
Srdjan Obucina
11cf55c5d2 Increase block creation timeout to 2500ms 2019-08-30 13:57:57 +02:00
Srdjan Obucina
2ceb77f796 Fix building error for develop branch + test fix from PR 65 2019-08-30 12:06:41 +02:00
Srdjan Obucina
94ec9a67b4 Merge branch 'develop' of https://github.com/peerplays-network/peerplays into develop 2019-08-29 18:33:01 +02:00
John Jones
8f4483dfea remove needless find() 2019-08-29 07:39:20 +03:00
Srdjan Obucina
1a6ba1ac1e Merge branch 'qa_gpos_18.04_gcc7_fix' into develop 2019-08-28 17:05:24 +02:00
satyakoneru
1d5372d432
Merge pull request #86 from peerplays-network/GRPH-53
GRPH-53-Log_format_error
2019-08-29 00:06:02 +10:00
satyakoneru
aeae7b254a GRPH-53-Log_format_error 2019-08-28 12:01:04 +00:00
Srdjan Obucina
0b134f2279 NTP client back 2019-08-27 20:35:42 +02:00
Bobinson K B
e80e9dd401
Merge pull request #82 from bobinson/develop
updating develop as part of  new branching strategy
2019-08-27 20:02:33 +05:30
Bobinson Bobby
5d61ba2925 Merge branch 'beatrice' into develop 2019-08-27 05:39:54 +05:30
Srdjan Obucina
fa5d3eccdf Merge branch 'qa_gpos_18.04_gcc7_fix' into rng_api 2019-08-22 17:08:00 +02:00
Srdjan Obucina
194b0dbbc9 Reorder operations in Dockerfile, to make image creation faster
- Reorder prevents unnecessary building of Boost libraries
2019-08-22 16:56:00 +02:00
pbattu123
2486eddb5d revert master changes that were brought in previous commit 2019-08-22 09:54:52 -03:00
pbattu123
481fac17d5
Merge branch 'master' into beatrice 2019-08-22 09:15:27 -03:00
Prabhjot
30c336ecfb Changed hardfork time for SWEEPS and Core-429 2019-08-22 09:08:12 -03:00
obucinac
6595acb3f3
Merge pull request #74 from peerplays-network/qa_gpos_18.04_docker_img
Docker for Ubuntu 18.04
2019-08-22 12:46:45 +02:00
pbattu123
e7badc138b
Merge pull request #62 from peerplays-network/qa_gpos_18.04_docker_img
Docker image for Ubuntu 18.04 and GCC 7
2019-08-21 16:42:35 -03:00
pbattu123
f1ce93268a
Merge branch 'beatrice' into qa_gpos_18.04_docker_img 2019-08-21 16:42:19 -03:00
obucinac
edcb19d53d
Update README.md 2019-08-21 19:57:14 +02:00
obucinac
818f0b7506
Update README.md
Fix typo
2019-08-21 19:55:08 +02:00
obucinac
afab9c28d0
Update README.md
Docker image info added
2019-08-21 19:51:46 +02:00
Srdjan Obucina
4ade70a239 Dockerfile, set system locale
Prevents locale::facet::_S_create_c_locale name error
2019-08-21 19:38:06 +02:00
pbattu123
c4d15fa692
Merge pull request #68 from peerplays-network/5050-feeupdate
5050 fee update and compilation error fix
2019-08-21 10:15:24 -03:00
PBSA
896ac97962 5050 fee update and compilation error fix 2019-08-21 13:13:46 +00:00
pbattu123
4f66954fab
Merge pull request #52 from peerplays-network/qa_gpos_18.04_gcc7_fix
Enable building on Ubuntu 18.04 using GCC 7 compiler
2019-08-20 15:42:13 -03:00
pbattu123
f9e46a31df
Merge branch 'beatrice' into qa_gpos_18.04_gcc7_fix 2019-08-20 15:42:03 -03:00
pbattu123
12ee8d06e3
Merge pull request #51 from peerplays-network/beatrice-5050-merge
beatrice-5050-merge [beatrice] 5050 code merge to beatrice
2019-08-20 15:17:02 -03:00
pbattu123
947b02bd57
Merge branch 'beatrice' into beatrice-5050-merge 2019-08-20 15:15:01 -03:00
pbattu123
c2a7aa7a33
Merge pull request #39 from PBSA/virtual_op_fix
virtual-op-fix for deterministic virtual_op number
2019-08-20 14:54:18 -03:00
pbattu123
2ccb62b797
Merge pull request #36 from peerplays-network/develop
Apply unit test fix from develop to beatrice
2019-08-20 14:53:47 -03:00
pbattu123
079dc10ef8
Merge pull request #33 from peerplays-network/feature/ubuntu18.04-upgrade
Feature/ubuntu18.04 upgrade
2019-08-20 14:53:29 -03:00
Srdjan Obucina
58b67524bf Docker file updates 2019-08-20 16:08:05 +02:00
Srdjan Obucina
0550711ddf Quick fix: Added missing package pkg-config 2019-08-20 15:51:27 +02:00
Srdjan Obucina
ef709b7b47 Docker file for Ubuntu 18.04
Base image updated to Unbuntu 18.04
Prerequisite list updated
Basic configuration updated
2019-08-20 15:46:30 +02:00
Srdjan Obucina
654e998d89 API endpoint for reading random numbers from the witness
Test cmd:
curl --data '{"method": "call", "params": ["database", "get_random_number", [1000]], "jsonrpc": "2.0", "id": 1}' http://127.0.0.1:8090/ws
curl --data '{"method": "call", "params": ["database", "get_random_number", [5000]], "jsonrpc": "2.0", "id": 1}' http://127.0.0.1:8090/ws
curl --data '{"method": "call", "params": ["database", "get_random_number", [1000000]], "jsonrpc": "2.0", "id": 1}' http://127.0.0.1:8090/ws
2019-08-19 19:55:26 +02:00
obucinac
38f560f861
Merge pull request #53 from peerplays-network/qa_gpos_18.04_out_of_source
Fix out-of-source CMake builds
2019-08-19 18:48:45 +02:00
Prabhjot
2c14af0699 fix: is_benefactor_reward had the default value of true when not set 2019-08-19 11:47:04 -03:00
Miha Čančula
f525737879 Fix out-of-source CMake builds 2019-08-19 15:13:27 +02:00
Srdjan Obucina
4d426e1f5a Enable building on Ubuntu 18.04 using GCC 7 compiler 2019-08-14 14:05:30 +02:00
Prabhjot
56de34d3ec removed redundant tgenesis file 2019-08-13 08:37:46 -04:00
Bobinson K B
859a5257b3
Update README.md
corrected an issue with the path
2019-08-13 18:01:21 +05:30
Prabhjot
c25d89ba92 fixed duplicate code in fee_tests 2019-08-12 11:19:03 -04:00