Alfredo Garcia
e7edfefce7
change name of harden option
2020-05-20 09:32:41 -03:00
Homu
bfb1bfd9d6
Auto merge of #4534 - ebfull:fix-chainwork, r=daira
...
Update minimum chain work on testnet to reflect Heartwood activation.
2020-05-20 06:45:44 +00:00
Sean Bowe
5a955674a5
Bump the protocol version, as this node supports Heartwood on mainnet.
2020-05-19 14:38:53 -06:00
Sean Bowe
d0c96683bf
Set the Heartwood activation height to 903000.
2020-05-19 14:38:49 -06:00
Homu
ed9537f9dd
Auto merge of #4529 - daira:fix-abort-on-reindex, r=daira
...
Fix a null pointer dereference that occurs when formatting an error message
This fixes a bug in the error message printout for the case when we have sufficient chain work, but an expected network upgrade has not activated.
2020-05-19 19:33:31 +00:00
Daira Hopwood
cb7c90522d
Explicitly assert that chainActive[upgrade.nActivationHeight] is non-null at this point.
...
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-05-19 20:13:37 +01:00
Alfredo Garcia
d42e0a433c
remove additional not needed casts from py tests
2020-05-18 18:09:07 -03:00
Alfredo Garcia
1805466d5c
add MINOR_CURRENCY_UNIT
2020-05-18 16:53:01 -03:00
Alfredo Garcia
26e4889f87
Fix casting in listtransactions.py
2020-05-18 16:53:01 -03:00
Alfredo Garcia
507e1623f9
simplify inzat balances logic
...
Co-Authored-By: Daira Hopwood <daira@jacaranda.org>
2020-05-18 16:53:01 -03:00
Alfredo Garcia
24d3516e35
Fix casting in wallet.py
...
Co-Authored-By: Daira Hopwood <daira@jacaranda.org>
2020-05-18 16:53:01 -03:00
Alfredo Garcia
25bccb4814
replace with AssertionError assert_equal in receivedby.py
...
Co-Authored-By: Daira Hopwood <daira@jacaranda.org>
2020-05-18 16:53:01 -03:00
Alfredo Garcia
25f48c21dd
add amountZat field to z_listreceivedbyaddress
2020-05-18 16:53:01 -03:00
Alfredo Garcia
76e7f21d4a
add amountZat field to listunspent
2020-05-18 16:52:04 -03:00
Alfredo Garcia
9a55c8b238
add amountZat field to listtransactions, gettransaction and listsinceblock
2020-05-18 16:51:24 -03:00
Alfredo Garcia
2ec9ac3c81
add amountZat field to listreceivedbyaddress and listreceivedbyaccount
2020-05-18 16:49:39 -03:00
Alfredo Garcia
306270911e
add boolean inZat to z_getbalance
2020-05-18 16:47:17 -03:00
Alfredo Garcia
50372cab62
add boolean inZat to getbalance
2020-05-18 16:47:17 -03:00
Alfredo Garcia
d2c26b33e0
add boolean inZat to getreceivedbyaccount
2020-05-18 16:47:17 -03:00
Alfredo Garcia
4155db0325
change argument name
2020-05-18 16:47:17 -03:00
Alfredo Garcia
aba1d94673
add documentation to flag
2020-05-18 16:47:17 -03:00
Alfredo Garcia
4b61aede28
add bool argument to get balance in satoshis to rpc getreceivedbyaddress
2020-05-18 16:47:17 -03:00
Homu
5e7ecc80f2
Auto merge of #4532 - ebfull:disable-libsodium-config-updates, r=ebfull
...
Fix libsodium compilation
2020-05-18 17:47:05 +00:00
Sean Bowe
55ac118e65
Pass DO_NOT_UPDATE_CONFIG_SCRIPTS=1 to autogen.sh in libsodium dependency, to avoid updating config scripts over the network.
2020-05-18 11:37:04 -06:00
Kris Nuttycombe
6a0d464f41
Merge remote-tracking branch 'upstream/master' into hotfix-v2.1.2-2-golden
2020-05-18 11:22:22 -06:00
Kris Nuttycombe
04d82fa30f
Remove unused imports.
2020-05-18 10:38:37 -06:00
Sean Bowe
ecafe6913c
Update minimum chain work on testnet to reflect Heartwood activation.
2020-05-18 09:59:34 -06:00
Homu
1eff1f98b6
Auto merge of #4526 - defuse:update-univalue, r=daira
...
Add univalue to updatecheck.py and update it to v1.1.1
2020-05-17 18:12:13 +00:00
Daira Hopwood
a76e568800
Fix a null pointer dereference that occurs when formatting an error message, if we haven't activated an upgrade as expected.
...
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-05-16 00:26:44 +01:00
Taylor Hornby
fc4a70e812
Avoid names starting with __.
...
These are reserved for all uses (including member function names) in C++,
and their use is technically undefined behaviour:
https://stackoverflow.com/a/228797/393146
Co-authored-by: Daira Hopwood <daira@jacaranda.org>
2020-05-15 16:27:34 -06:00
Danny Willems
332ce1a800
Use preprocessor for ENTRY_SERIALIZED_LENGTH
2020-05-15 19:50:57 +02:00
Danny Willems
e465731e69
Use assert.h instead of define manually static_assert
2020-05-15 19:47:49 +02:00
Danny Willems
80fe96a04e
librustzcash: make the header C compatible
2020-05-15 19:38:41 +02:00
Kris Nuttycombe
bc617bce74
Merge remote-tracking branch 'upstream/master' into hotfix-v2.1.2-2-golden
2020-05-14 14:02:55 -06:00
Taylor Hornby
e0ab57ee36
Add univalue to updatecheck.py and update univalue, removing calls to deprecated methods
2020-05-14 12:42:19 -06:00
Homu
2d77cd241a
Auto merge of #4525 - therealyingtong:4524-off-by-one-createnewblock, r=ebfull
...
Fix off-by-one error in CreateNewBlock()
When calling `GetHistoryRoot()`, use `prevConsensusBranchId` instead of `consensusBranchId` for compatibility with NU4 and future upgrades.
Co-authored by @str4d
Closes #4524
2020-05-14 18:37:53 +00:00
Sean Bowe
43ffa3bf43
Add NU4 activation to golden test.
2020-05-14 12:24:56 -06:00
Kris Nuttycombe
9061f8251e
Merge remote-tracking branch 'upstream/master' into hotfix-v2.1.2-2-golden
2020-05-14 12:24:44 -06:00
therealyingtong
79657a8e3a
Fix off-by-one error in CreateNewBlock()
...
When calling GetHistoryRoot, use prevConsensusBranchId instead of consensusBranchId for compatibility with NU4 and future upgrades.
Co-authored by Jack Grigg (jack@electriccoin.co )
2020-05-14 21:29:47 +08:00
Alfredo Garcia
a17951bfa8
get fuzzing options from directory
2020-05-13 17:07:26 -03:00
Homu
d52003861c
Auto merge of #4508 - oxarbitrage:remove_fhelp_from_impls, r=str4d
...
Remove unused fHelp parameters from internal functions
- dumpwallet_impl
- importwallet_impl
2020-05-12 12:42:58 +00:00
Homu
d0b533aacb
Auto merge of #4304 - oxarbitrage:issue3893, r=str4d
...
Add status to transactions in RPC calls
Closes https://github.com/zcash/zcash/issues/3893 .
2020-05-12 03:05:37 +00:00
Homu
eab938b829
Auto merge of #4513 - zcash:hotfix-v2.1.2-3, r=str4d
...
Merge in hotfix v2.1.2-3
2020-05-12 00:27:26 +00:00
Homu
c82b3f9450
Auto merge of #4510 - zcash:hotfix-v2.1.2-2, r=nuttycom
...
Merge in 2.1.2-2 hotfix
2020-05-11 19:11:56 +00:00
ebfull
23713c87ce
Merge pull request #4511 from ebfull/release-v2.1.2-3
...
Release v2.1.2-3
2020-05-08 13:36:40 -06:00
Sean Bowe
1e945ee82a
Set the deprecation height manually to roughly July 14th.
2020-05-08 13:28:55 -06:00
Sean Bowe
98345b2ead
Update release notes for v2.1.2-3.
2020-05-08 13:28:44 -06:00
Sean Bowe
ca7b2dbd8e
make-release.py: Updated release notes and changelog for 2.1.2-3.
2020-05-08 12:41:23 -06:00
Sean Bowe
8b5365e127
make-release.py: Updated manpages for 2.1.2-3.
2020-05-08 12:41:23 -06:00
Sean Bowe
f9d4405c09
make-release.py: Versioning changes for 2.1.2-3.
2020-05-08 12:39:13 -06:00