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

3328 commits

Author SHA1 Message Date
wildkif
9ed153d0ad build html 2019-05-06 16:50:17 +03:00
wildkif
c861d8fc70 Merge remote-tracking branch 'origin/frontend' into frontend 2019-05-06 16:48:18 +03:00
wildkif
2d54f102dc loading screen fix & move text in contracts time 2019-05-06 16:48:05 +03:00
wildkif
8bcb07c7e5 hide address on transfer coins 2019-05-06 15:21:40 +03:00
sowle
d06e6f4af5 === build number: 19 -> 20 === 2019-05-06 15:10:16 +03:00
wildkif
fc370790d1 add log level 2019-05-06 10:33:33 +03:00
wildkif
03261f4013 Merge branch 'master' into frontend 2019-05-05 15:39:27 +03:00
wildkif
0ac4fd827a contracts order, tooltip time 2019-05-05 15:38:00 +03:00
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
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
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
sowle
02576ab740 minor operator<< refactoring & related stuff 2019-05-01 16:03:12 +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
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
sowle
dabc3e85d8 wallet2 serialization versioning corrected 2019-04-30 19:00:34 +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
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
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
18c35f2274 attempt to fix bug with unreturned key_images to tx_pool on reorganize 2019-04-25 01:41:57 +02:00
wildkif
96c8da81b7 alias overflow fix 2019-04-24 17:20:44 +03:00
wildkif
3b975c7ce3 update contract state interval 2019-04-24 16:31:52 +03:00
wildkif
45fba9e81f contracts fix expiration time 2019-04-23 17:59:30 +03:00
sowle
6702b53662 Merge branch 'master' into offsig 2019-04-23 02:07:41 +03:00
sowle
408fab65a4 dump as json now supports different line endings + fixed logging for main_window 2019-04-23 02:03:09 +03:00
wildkif
7082b6d2e6 Merge branch 'master' into frontend 2019-04-22 20:47:42 +03:00
wildkif
52cf6bd869 Merge branch 'master' into frontend 2019-04-22 20:46:46 +03:00
wildkif
0cf02e3fde get alias when overflow 2019-04-22 20:44:59 +03:00
wildkif
1fac00329d skip master pass and open wallet logic 2019-04-22 12:22:16 +03:00
sowle
a13a5b270a Merge branch 'master' into offsig 2019-04-22 01:20:19 +03:00
sowle
a3bf957709 === build number: 15 -> 16 === 2019-04-20 19:31:56 +03:00
crypro.zoidberg
f7645670fe fixed genesis and changed network 2019-04-20 17:37:11 +02:00
sowle
060d829f3a Merge branch 'master' into offsig 2019-04-20 02:16:35 +03:00
sowle
edc6b99227 === build number: 14 -> 15 === 2019-04-20 00:51:31 +03:00