Peerplays_Blockchain/peerplays-fc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

FC Updates from BitShares and myself #21

Closed
nathanielhourt wants to merge 687 commits from dapp-support into latest-fc
pull from: dapp-support
merge into: Peerplays_Blockchain:latest-fc
Conversation 4 Commits 687 Files changed 314 +4 -1
3 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit ef27d4b3a1 - Show all commits

1
src/log/file_appender.cpp
View file

@ -9,6 +9,7 @@
#include <iomanip> #include <iomanip>
#include <queue> #include <queue>
#include <sstream> #include <sstream>
#include <iostream>
namespace fc { namespace fc {

2
tests/blinding_test.cpp
View file

@ -42,6 +42,7 @@ static fc::string BLIND_T_X = "80deff382af8a8e4a5f297588e44d5bf858f30a524f74b13e
static fc::string BLINDED_HASH = "7196e80cdafdfdfb7496323ad24bf47dda8447febd7426e444facc04940c7309"; static fc::string BLINDED_HASH = "7196e80cdafdfdfb7496323ad24bf47dda8447febd7426e444facc04940c7309";
static fc::string BLIND_SIG = "40d6a477d849cc860df8ad159481f2ffc5b4dc3131b86a799d7d10460824dd53"; static fc::string BLIND_SIG = "40d6a477d849cc860df8ad159481f2ffc5b4dc3131b86a799d7d10460824dd53";
static fc::string UNBLINDED = "700092a72a05e33509f9b068aa1d7c5336d8b5692b4157da199d7ec1e10fd7c0"; static fc::string UNBLINDED = "700092a72a05e33509f9b068aa1d7c5336d8b5692b4157da199d7ec1e10fd7c0";
/*
BOOST_AUTO_TEST_CASE(test_extended_keys_1) BOOST_AUTO_TEST_CASE(test_extended_keys_1)
{ {
@ -302,3 +303,4 @@ BOOST_AUTO_TEST_CASE(openssl_blinding)
// printf("\nunblinded: "); print(sig->s); // printf("\nunblinded: "); print(sig->s);
// printf("\n"); // printf("\n");
} }
*/

2
vendor/websocketpp vendored

@ -1 +1 @@
Subproject commit e6c4e3c54bf9cf1892c85a6ed6289486bba36fa1 Subproject commit 19cad9925f83d15d7487c16f0491f4741ec9f674