Charon/blockchain
1
0
Fork 0
forked from lthn/blockchain
Code Pull requests Activity
435 commits 28 branches 143 tags 45 MiB
Commit graph

435 commits

This branch
This branch
All branches
Author SHA1 Message Date
sowle
558e06b714 === build number: 18 -> 19 === 2019-05-02 21:35:21 +03:00
sowle
ef2aeb71b5 === build number: 17 -> 18 === 2019-05-02 20:45:59 +03:00
sowle
375e9fd990 wallet2: take escrow-blocked coins into account when calculating the total balance 2019-05-02 18:46:24 +02:00
wildkif
afa60fbb03 Merge remote-tracking branch 'origin/master' 2019-05-02 17:45:20 +03:00
wildkif
2eca825b87 Merge remote-tracking branch 'origin/frontend' 2019-05-02 17:45:09 +03:00
wildkif
1140197586 Merge remote-tracking branch 'origin/master' into frontend 2019-05-02 17:44:35 +03:00
wildkif
64a9a71e05 tooltip improvements 2019-05-02 17:44:06 +03:00
sowle
1535b943ef CMakeLists: split definitions and compile options for MSVC 2019-05-02 17:11:51 +03:00
wildkif
c69d3ab468 contracts buttons 2019-05-02 14:00:35 +03:00
anonimal
282214036c
contrib: update miniupnpc to 2.1, use submodule 
Resolves the following implemented client vulnerabilities:

https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-6031
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-8798

There are other client fixes as well and I would advise to
semi-regularly bump to master because of the lead developer's release
habits. In the meantime, version 2.1 should be good enough for now.

Note: the adding of TTL argument to upnpDiscover came with the API_VERSION 14.
 2019-05-01 23:03:09 +00:00
crypro.zoidberg
36c4dffb1a re-fixed stresstest preparation phase 2019-05-01 21:44:09 +02:00
anonimal
addc8cdf15
README: bump most recently tested gcc/clang 2019-05-01 19:38:38 +00:00
crypro.zoidberg
992171456b fixed stresstest preparation phase 2019-05-01 21:38:08 +02:00
sowle
a58cab8f9f coretests: gcc warnings fixed 2019-05-01 21:35:53 +02:00
sowle
303cb9b4ea various tests fixes for gcc 2019-05-01 21:25:56 +02:00
sowle
2143dc6779 functional_tests : fixed linkage for gcc 2019-05-01 21:02:33 +02:00
sowle
cbca150265 difficulty test removed as outdated 2019-05-01 21:01:40 +02:00
crypro.zoidberg
3c68509745 added more logs to exception in tests 2019-05-01 16:44:11 +02:00
sowle
02576ab740 minor operator<< refactoring & related stuff 2019-05-01 16:03:12 +02:00
sowle
976ed481d0 coretests adapted for serializable_pair 2019-05-01 16:01:10 +02:00
wildkif
8855ba5c55 custom not-allowed cursor 2019-05-01 14:15:53 +03:00
crypro.zoidberg
6f3c2fcbcc fixed linux serialization 2019-04-30 22:41:01 +02:00
crypro.zoidberg
afea59a25a more logs in error reporting 2019-04-30 21:29:41 +02:00
sowle
4987bfe6c5 gcc compilation fixup 2019-04-30 19:36:53 +02:00
sowle
14c9f82e96 wallet2: perf logging restored 2019-04-30 19:34:44 +02:00
crypro.zoidberg
a251c88537 fix of wrong serialization rule 2019-04-30 19:21:59 +02:00
crypro.zoidberg
76ce7518e7 added proper backward capability to wallet 2019-04-30 19:07:54 +02:00
crypro.zoidberg
ac7691aaf0 Merge branch 'master' of github.com:hyle-team/zano 2019-04-30 19:01:13 +02:00
sowle
dabc3e85d8 wallet2 serialization versioning corrected 2019-04-30 19:00:34 +02:00
crypro.zoidberg
a0d364908c Merge branch 'master' of github.com:hyle-team/zano 2019-04-30 18:56:05 +02:00
sowle
2d3ef5e41f Merge branch 'offsig' 2019-04-30 18:48:14 +02:00
sowle
e5c28e4642 Merge branch 'master' into offsig (2) 
# Conflicts:
#	tests/core_tests/multisig_wallet_tests.cpp
 2019-04-30 18:45:12 +02:00
sowle
5435bdbc01 Merge branch 'master' into offsig 
# Conflicts:
#	tests/core_tests/multisig_wallet_tests.cpp
 2019-04-30 18:44:15 +02:00
crypro.zoidberg
fc7e8d0514 Merge branch 'master' of github.com:hyle-team/zano 2019-04-30 18:35:36 +02:00
wildkif
557b0bf278 Merge branch 'frontend' 2019-04-30 17:27:14 +03:00
wildkif
194c7668f5 Merge branch 'master' into frontend 2019-04-30 17:26:38 +03:00
wildkif
85de9948a5 sorting contracts, search alias on creating new contract, fix creating wallet in root directory 2019-04-30 17:26:18 +03:00
wildkif
ff1e600ff2 comment for transaction length fix 2019-04-30 17:16:08 +03:00
sowle
13ea200399 tx_pool: do not remove txs with "future" receive_time as outdated 2019-04-30 16:58:01 +03:00
sowle
464f18f50c wallet2: don't move coinbase txs into unconfirmed_txs container 2019-04-30 15:51:12 +03:00
wildkif
59569c5024 comment for transaction fix 2019-04-30 15:35:52 +03:00
crypro.zoidberg
319a61a59a fixed timestamps trap for machine with late clock's 2019-04-30 02:30:55 +02:00
sowle
5b9677eaf9 === build number: 16 -> 17 === 2019-04-26 21:29:09 +03:00
sowle
fab4a7ddf1 coretest wallet_chain_switch_with_spending_the_same_ki + wallet fixes 2019-04-26 19:08:38 +03:00
wildkif
1cb050b367 Merge branch 'frontend' 2019-04-26 17:25:06 +03:00
wildkif
e9f6bf4d75 Merge branch 'master' into frontend 2019-04-26 17:24:23 +03:00
wildkif
86b84b9b31 add copy button to phrase page 2019-04-26 17:23:11 +03:00
crypro.zoidberg
7fc1eb4d8a multiple fixes on coretests 2019-04-25 23:37:43 +02:00
crypro.zoidberg
18c35f2274 attempt to fix bug with unreturned key_images to tx_pool on reorganize 2019-04-25 01:41:57 +02:00
wildkif
a609f6b974 Merge remote-tracking branch 'origin/frontend' 2019-04-24 17:40:49 +03:00