UdjinM6
b9ad319d00
Unify subsidy formulas for different networks, add few comments
2016-05-10 12:50:57 +03:00
Holger Schinzel
641f464d44
Merge pull request #771 from dashpay/schinzelh-patch-1
...
Some houskeeping
2016-05-10 10:01:25 +02:00
Holger Schinzel
05661617a6
Some houskeeping:
...
- fixed testnet checkpoints
- revert testnet mining patch
2016-05-10 09:57:05 +02:00
Holger Schinzel
cd651ff6d1
Merge pull request #769 from dashpay/schinzelh-patch-1
...
Remove log spam
2016-05-10 07:23:00 +02:00
crowning-
5091ac939b
[UI] Rebranding: PrivateSend/InstantSend (update)
...
Accidentally overwrote my final version locally, so the change of the (unfortunately most prominent) InstantX label on the sendcoins page got lost.
Sorry :-/
2016-05-10 05:39:36 +02:00
Holger Schinzel
d61edf8452
Remove log spam
2016-05-10 00:28:36 +02:00
Evan Duffield
e0a4c6ec19
Merge pull request #760 from crowning-/UI_Enhancements
...
[UI] Rebranding: Darksend/InstantX changed to PrivateSend/InstantSend (UI+log)
2016-05-09 13:54:21 -07:00
Evan Duffield
bfaa5b6970
Merge pull request #761 from UdjinM6/fixStyling
...
Assign app name in NetworkStyle::NetworkStyle()
2016-05-09 13:52:37 -07:00
Evan Duffield
7bceb3446b
Merge pull request #763 from crowning-/patch-4
...
[Docs] Gitian: missing 'curl' download added to documentation
2016-05-09 13:51:51 -07:00
Evan Duffield
684994ca4e
Merge pull request #764 from crowning-/UI_Icons
...
[UI] Some standard Bitcoin icons beautified
2016-05-09 13:51:33 -07:00
Evan Duffield
f13b9ad418
Merge pull request #767 from moocowmoo/v0.12.1.x
...
config - changed network bip32 values, testnet/regtest pubkey
2016-05-09 13:51:03 -07:00
Evan Duffield
f1955a9673
Merge branch 'v0.12.1.x-gov' into v0.12.1.x
2016-05-09 13:47:43 -07:00
Evan Duffield
736d22262f
fixed mining
2016-05-09 12:51:23 -07:00
moocowmoo
c5004ce308
config - changed network bip32 values, testnet/regtest pubkey
...
mainnet bip32 seeds start with dpub/dprv
testnet/regtest bip32 seeds start with DPUB/DPRV
only create public testnet/regtest addresses starting with y
2016-05-09 19:13:22 +00:00
crowning-
243067c0ee
[UI] Rebranding: Darksend/InstantX changed to PrivateSend/InstantSend
2016-05-09 21:08:13 +02:00
Evan Duffield
60e048071f
added budget item func
2016-05-09 09:31:11 -07:00
Evan Duffield
8c48d9dbb9
fixed endian issues
2016-05-09 08:58:17 -07:00
Evan Duffield
4caf64569f
merged
2016-05-09 08:39:31 -07:00
Evan Duffield
358be66084
reset testnet
2016-05-09 08:32:47 -07:00
Evan Duffield
9b7504cb32
Fix dumb errors on ubuntu
2016-05-06 18:36:11 -04:00
Evan Duffield
e6d7f4ed7f
fixing more errors
2016-05-05 10:44:46 -07:00
Evan Duffield
aee86618cd
fixed greedy find/replace (opps)
2016-05-05 10:30:28 -07:00
Pieter Wuille
e3a9ce9c94
Refactor script tests
...
Github-Pull: #7818
Rebased-From: c7c664191fd6ca4843cfe9d00abf8f2362b9550f 269281b7cc56e728fa64803fc7509ab3a0ce1805 d03e46625ac95954bb9ecbc2cf73ffd8de6b8a13 76da7613517d05aca31c2cee42b5ebf3d5c54974 009b503792737ab03aeb6e15060bc4f499500a96 dde46d3ae1de18700e089bc1861cf1e18649dc5d
2016-05-04 13:01:59 +02:00
Wladimir J. van der Laan
87129b24e1
test: script_error checking in script_invalid tests
...
Github-Pull: #7517
Rebased-From: b0ff8572aeb8211ad30f24ca42d20a46debb5e9d 2317ad7c56c6f5a55984459947f69cc3bfbe340a 0ecb3401fe157cb0779d3970c6080b463b1b0ed2
2016-05-04 13:01:55 +02:00
Suhas Daftuar
43c14acf14
Fix headers announcements edge case
...
Previously we would assert that if every block in vBlockHashesToAnnounce is in
chainActive, then the blocks to be announced must connect. However, there are
edge cases where this assumption could be violated (eg using invalidateblock /
reconsiderblock), so just check for this case and revert to inv-announcement
instead.
Github-Pull: #7919
Rebased-From: 3a99fb2cb14955f5e029d315041a093e957e6c3e
2016-04-27 22:34:48 +02:00
Alexander Regueiro
06c73a1751
Removed call to TryCreateDirectory
from GetDefaultDataDir
in src/util.cpp
.
...
See https://github.com/bitcoin/bitcoin/issues/7845#issuecomment-207684728 .
Also refactored `GetDefaultDataDir` function to return path for Mac in one expression.
Github-Pull: #7850
Rebased-From: 41dbc4849e0bf14eef98962b0f0bddcde0bb3014
2016-04-27 22:34:48 +02:00
Suhas Daftuar
7e71785c40
Use txid as key in mapAlreadyAskedFor
...
Previously we used the CInv that would be sent to the peer announcing the
transaction as the key, but using the txid instead allows us to decouple the
p2p layer from the application logic (which relies on this map to avoid
duplicate tx requests).
Github-Pull: #7862
Rebased-From: 7e91f632c70ff1848a152f24ee67a06796803943
2016-04-27 22:34:48 +02:00
BtcDrak
5583a3d0a7
Add curl to Gitian setup instrustions
...
curl is required to fetch dependencies
Github-Pull: #7658
Rebased-From: ce41cf082c861cc8d333b811b3101d52d06f50ec
2016-04-27 22:34:48 +02:00
R E Broadley
d3ead9bcb6
Avoid "Unknown command" messages when receiving getaddr on outbound connections.
...
Github-Pull: #7642
Rebased-From: d84ea1a59ce3704457a162f1fd8a7353047156de
2016-04-27 22:34:48 +02:00
Patrick Strateman
a5bc6a1bc4
Remove vfReachable and modify IsReachable to only use vfLimited.
...
We do not know that a class of Network is reachable, only that it is not.
Github-Pull: #7553
Rebased-From: 110b62f06992d0fb989153afff2dc3aea62a674f
2016-04-27 22:34:48 +02:00
Matthew Zipkin
52c101158f
Clarify description of blockindex
...
see issues:
https://github.com/bitcoin-dot-org/bitcoin.org/issues/1237
https://github.com/bitcoin/bitcoin/issues/7532
Github-Pull: #7541
Rebased-From: 7eef1d0dad0c48e9faefdc4fe5cfb6182edc79ab
2016-04-27 22:34:48 +02:00
Alex Morcos
21b2f82eb7
Don't resend wallet txs that aren't in our own mempool
...
Github-Pull: #7521
Rebased-From: 5a2b1c0c8b49c5ae79946e71b9f989b33c9fcf5c
2016-04-27 22:34:48 +02:00
Wladimir J. van der Laan
66d5408559
Fix memleak in TorController [rework]
...
It looks like, TorController::disconnected_cb(TorControlConnection&
conn) gets called multiple times which results in multiple event_new().
Avoid this by creating the event only once in the constructore, and
deleting it only once in the destructor (thanks to Cory Fields for the
idea).
Replaces the fix by Jonas Schnelli in #7610 , see discussion there.
Github-Pull: #7637
Rebased-From: e2195037116f47b11b66452351dba4fe606423a2
2016-04-27 22:34:48 +02:00
Chris Moore
1c3d38bde7
Remove spurious dollar sign. Fixes #7189 .
...
Github-Pull: #7189
Rebased-From: 3d19193f14b9400f7c908a61375c330113571a38
2016-04-27 22:34:48 +02:00
jloughry
64fd0ce1d9
fix spelling of advertise in src and doc
...
Github-Pull: #7526
Rebased-From: 37767fd46f673a06864df6e14d3030622b1cb2c9
2016-04-27 22:34:48 +02:00
instagibbs
a9e73f71d4
Fix and cleanup listreceivedbyX documentation
...
Github-Pull: #7527
Rebased-From: c372572595b6b19a4dd88258401d8a0046ce4469
2016-04-27 22:34:48 +02:00
ptschip
90955940d5
Do not download transactions during inital sync
...
Github-Pull: #7164
Rebased-From: 39a525c21fd1b34df63ab30868423b97b708ee49
2016-04-27 22:34:47 +02:00
Wladimir J. van der Laan
18b3c3ced8
Merge #7950 : [0.12] travis: switch to Trusty
...
564aaa2
travis: switch to Trusty (Cory Fields)
9ca957b
tests: Make proxy_test work on travis servers without IPv6 (Wladimir J. van der Laan)
2016-04-27 14:11:44 +02:00
Cory Fields
564aaa2cd0
travis: switch to Trusty
...
Github-Pull: #7920
Rebased-From: 06fdffd222ba0a00add4abe9fab9ad2c3e220d8f, 9267a47d86d0673eae9e504ee566aa4e0410d923, cf77fcdb1fe525b63b004ef729173f04bdb48882, 174023c9b008fc02316bce972b0c1031de3feee3, a33b7c9cb545985771d074748c0e368ca2d06702
2016-04-27 12:29:56 +02:00
Wladimir J. van der Laan
9ca957bcd4
tests: Make proxy_test work on travis servers without IPv6
...
Github-Pull: #7489
Rebased-From: 7539f1aae3b41279dc5d49e09f448a78a071e114
2016-04-27 12:29:56 +02:00
Evan Duffield
f2de437f05
mixed up actions/outcomes
2016-04-26 11:36:07 -07:00
Evan Duffield
7e742d2e7d
cleaned up couple bugs
2016-04-26 11:34:53 -07:00
Evan Duffield
ad5d48dae4
Created nice interface for converting between:
...
- vote outcomes between string and int
- vote actions between string and int
2016-04-26 11:27:22 -07:00
Evan Duffield
d9d72dd7af
enable governance cache
2016-04-26 10:48:09 -07:00
Evan Duffield
2df4059f4e
Fix masternode voting object
2016-04-26 10:45:06 -07:00
UdjinM6
26b8d99be2
fix CGovernanceObject step1.5: not really a fix, just commented out simple broken parts (undeclared vars and functions, wrong number of arguments etc) to prove that it compiles now, needs to be actually fixed
2016-04-26 10:31:14 -07:00
UdjinM6
71bdc09470
fix CGovernanceObject step1: make, copy constructor, uint256, rpc
2016-04-26 10:31:00 -07:00
Evan Duffield
3fe02f4777
any help?
2016-04-25 21:08:36 -07:00
MarcoFalke
89ae85484c
Merge #7811 : [0.12.2] qa Backports
...
6862627
Add listunspent() test for spendable/unspendable UTXO (Joao Fonseca)
28ba22c
[qa] Remove misleading "errorString syntax" (MarcoFalke)
f1f1b82
[qa] py2: Unfiddle strings into bytes explicitly (MarcoFalke)
c0d9e31
Tests: make prioritise_transaction.py more robust (Suhas Daftuar)
ff9b436
[qa] Bug fixes and refactor (MarcoFalke)
b1dd64b
[qa] wallet: Wait for reindex to catch up (MarcoFalke)
f23cb7c
[qa] Add tests verifychain, lockunspent, getbalance, listsinceblock (MarcoFalke)
3316552
[qa] Test walletpassphrase timeout (MarcoFalke)
6aae129
[qa] wallet: Print maintenance (MarcoFalke)
ad8c743
[qa] Extend tests (MarcoFalke)
d89fbfe
[qa] rpc-test: Normalize assert() (MarcoFalke)
2016-04-25 14:59:52 +02:00
crowning-
ddfc3e98f0
[UI] Obsolete icons (+references) removed
2016-04-24 23:03:27 +02:00