Kris Nuttycombe
da0a9c1313
Improve const-ness of CChainParams retrieval by network ID
...
This change ensures that we do not return non-const CChainParams
references.
2023-03-14 16:15:30 -06:00
Marius Kjærstad
cdfa020658
Update estimated number of transactions due to Blossom NU
...
Update estimated number of transactions due to Blossom NU
Co-authored-by: str4d <thestr4d@gmail.com>
2023-03-07 19:47:17 +01:00
Marius Kjærstad
9419a9bde8
New checkpoint at block 2000000 for mainnet
...
New checkpoint at block 2000000 for mainnet
2023-02-28 17:57:35 +01:00
Kris Nuttycombe
3cec519ce4
scripted-diff: Update Zcash copyrights to 2023
...
-BEGIN VERIFY SCRIPT-
for party in "The Zcash developers" "The Bitcoin Core developers" "Bitcoin Developers"; do
sed -i"" -e "s#Copyright (c) \([0-9]\{4\}\)\(-[0-9]\{4\}\)\? $party#Copyright (c) \1-2023 $party#" COPYING
sed -i"" -e "s#\(.*\)\([0-9]\{4\}\)\(-[0-9]\{4\}\)\, $party#\1\2-2023, $party#" contrib/debian/copyright
done
sed -i"" -e "s/define(_COPYRIGHT_YEAR, [0-9]\{4\})/define(_COPYRIGHT_YEAR, 2023)/" configure.ac
sed -i"" -e "s/#define COPYRIGHT_YEAR [0-9]\{4\}/#define COPYRIGHT_YEAR 2023/" src/clientversion.h
git grep "^// Copyright (c) .* The Zcash developers" \
| awk -F ':' '{print $1}' \
| xargs -I {} sed -i"" -e "s#// Copyright (c) \([0-9]\{4\}\)\(-[0-9]\{4\}\)\? The Zcash developers#// Copyright (c) \1-2023 The Zcash developers#" {}
-END VERIFY SCRIPT-
2023-01-23 11:31:54 -07:00
Marius Kjærstad
2f8303617c
Add some more historical checkpoints
...
Add some more historical checkpoints i.a.w: https://github.com/zcash/zcash/issues/6224
2022-12-19 03:14:07 +01:00
Marius Kjærstad
4d10ab43d7
Forgot to add 0x
...
Forgot to add 0x
2022-10-30 02:52:01 +02:00
Marius Kjærstad
8a6017d9e2
Some more formatting changes to chainparams.cpp
...
Some more formatting changes to chainparams.cpp
2022-10-29 18:03:26 +02:00
Marius Kjærstad
4e98f5ec31
Update src/chainparams.cpp
...
Co-authored-by: Daira Hopwood <daira@jacaranda.org>
2022-10-29 17:45:24 +02:00
Marius Kjærstad
37799ab56b
Hardened checkpoint update at block 1860000 for mainnet
...
Hardened checkpoint update at block 1860000 for mainnet
2022-10-29 16:25:12 +02:00
Pieter Wuille
ef5a37138e
Switch blocks to a constant-space Merkle root/branch algorithm.
...
This switches the Merkle tree logic for blocks to one that runs in constant (small) space.
The old code is moved to tests, and a new test is added that for various combinations of
block sizes, transaction positions to compute a branch for, and mutations:
* Verifies that the old code and new code agree for the Merkle root.
* Verifies that the old code and new code agree for the Merkle branch.
* Verifies that the computed Merkle branch is valid.
* Verifies that mutations don't change the Merkle root.
* Verifies that mutations are correctly detected.
(cherry picked from commit bitcoin/bitcoin@eece63fa72 )
2022-07-08 22:24:23 +00:00
Pieter Wuille
204d0c37ab
Do not store Merkle branches in the wallet.
...
Assume that when a wallet transaction has a valid block hash and transaction position
in it, the transaction is actually there. We're already trusting wallet data in a
much more fundamental way anyway.
To prevent backward compatibility issues, a new record is used for storing the
block locator in the wallet. Old wallets will see a wallet file synchronized up
to the genesis block, and rescan automatically.
(cherry picked from commit bitcoin/bitcoin@391dff16fe )
2022-07-08 21:03:40 +00:00
Kris Nuttycombe
e03b964abf
Merge pull request #6043 from nuttycom/backport/14555-move_util_files_to_dir
...
scripted-diff: Move util files to separate directory.
2022-07-06 12:00:14 -06:00
Sean Bowe
af2b3d35a4
Update minimum chain work and set NU5 activation block hash for mainnet
...
The chain work is taken from mainnet block 1710000.
2022-07-03 22:38:32 -06:00
Jim Posen
9a7e2c153d
scripted-diff: Move util files to separate directory.
...
-BEGIN VERIFY SCRIPT-
mkdir -p src/util
git mv src/util.h src/util/system.h
git mv src/util.cpp src/util/system.cpp
git mv src/utilmoneystr.h src/util/moneystr.h
git mv src/utilmoneystr.cpp src/util/moneystr.cpp
git mv src/utilstrencodings.h src/util/strencodings.h
git mv src/utilstrencodings.cpp src/util/strencodings.cpp
git mv src/utiltime.h src/util/time.h
git mv src/utiltime.cpp src/util/time.cpp
sed -i -e 's/"util\.h"/"util\/system\.h"/g' $(git ls-files 'src/*.h' 'src/*.cpp')
git checkout HEAD -- src/secp256k1 # exclude secp256k1, which has its own "util.h"
sed -i -e 's/"utilmoneystr\.h"/"util\/moneystr\.h"/g' $(git ls-files 'src/*.h' 'src/*.cpp')
sed -i -e 's/"utilstrencodings\.h"/"util\/strencodings\.h"/g' $(git ls-files 'src/*.h' 'src/*.cpp')
sed -i -e 's/<utilstrencodings\.h>/<util\/strencodings\.h>/g' $(git ls-files 'src/*.h' 'src/*.cpp')
sed -i -e 's/"utiltime\.h"/"util\/time\.h"/g' $(git ls-files 'src/*.h' 'src/*.cpp')
sed -i -e 's/BITCOIN_UTIL_H/BITCOIN_UTIL_SYSTEM_H/g' src/util/system.h
sed -i -e 's/BITCOIN_UTILMONEYSTR_H/BITCOIN_UTIL_MONEYSTR_H/g' src/util/moneystr.h
sed -i -e 's/BITCOIN_UTILSTRENCODINGS_H/BITCOIN_UTIL_STRENCODINGS_H/g' src/util/strencodings.h
sed -i -e 's/BITCOIN_UTILTIME_H/BITCOIN_UTIL_TIME_H/g' src/util/time.h
sed -i -e 's/ util\.\(h\|cpp\)/ util\/system\.\1/g' src/Makefile.am
sed -i -e 's/utilmoneystr\.\(h\|cpp\)/util\/moneystr\.\1/g' src/Makefile.am
sed -i -e 's/utilstrencodings\.\(h\|cpp\)/util\/strencodings\.\1/g' src/Makefile.am
sed -i -e 's/utiltime\.\(h\|cpp\)/util\/time\.\1/g' src/Makefile.am
sed -i -e 's/src\/util\.cpp/src\/util\/system\.cpp/g' test/lint/lint-locale-dependence.sh
sed -i -e 's/src\/utilmoneystr\.cpp/src\/util\/moneystr\.cpp/g' test/lint/lint-locale-dependence.sh
sed -i -e 's/src\/utilstrencodings\.\(h\|cpp\)/src\/util\/strencodings\.\1/g' test/lint/lint-locale-dependence.sh
-END VERIFY SCRIPT-
2022-07-01 17:50:09 -06:00
Kris Nuttycombe
5ae1772d2b
scripted-diff: Update Zcash copyrights to 2022
...
-BEGIN VERIFY SCRIPT-
git grep "// Copyright (c) .* The Zcash developers" \
| awk -F ':' '{print $1}' \
| xargs -I {} sed -i"" -e "s#// Copyright (c) \([0-9]\{4\}\)\(-[0-9]\{4\}\)\? The Zcash developers#// Copyright (c) \1-2022 The Zcash developers#" {}
-END VERIFY SCRIPT-
2022-05-11 16:47:12 -06:00
Kris Nuttycombe
83c1938af3
Fix inconsistent caplitalization in copyright notices.
2022-05-11 16:40:25 -06:00
Kris Nuttycombe
ca7323cc77
Set NU5 activation height & bump protocol version.
2022-05-10 19:58:35 -06:00
Jack Grigg
1a97f77205
Update minimum chain work and set NU5 activation block hash for testnet
...
The chain work is taken from testnet block 1855000.
Closes zcash/zcash#5899 .
2022-04-28 14:27:10 +00:00
Kris Nuttycombe
825d8e8781
Push back NU5 testnet release height to 1842420
2022-04-13 17:01:17 -06:00
Kris Nuttycombe
9ca0a41cf7
Update protocol version to 170050 for v4.7.0 release.
2022-04-13 08:22:56 -06:00
Kris Nuttycombe
40487c079d
Set NU5 testnet reactivation height.
2022-04-12 21:42:47 -06:00
Jack Grigg
e5210d50c9
Set NU5 protocol version for regtest to 170040, bump protocol version
...
We need to bump the `zcashd` protocol version because the new rules are
not compatible with existing rules followed by 170015 nodes, but we
_also_ need to ensure we can still bump it again once we set the testnet
reactivation height (changing node network behaviour again). This commit
also enables RPC tests to run (because previously the nodes considered
each other to be too old for NU5 to be active, and were disconnecting).
2022-03-23 18:37:56 +00:00
Jack Grigg
9e9f58b26f
Merge branch 'master' into unify-nu5-consensus-changes
2022-03-23 02:57:16 +00:00
Jack Grigg
77a971fbc1
Migrate to latest `zcash/librustzcash` revision
...
This includes:
- `orchard =0.1.0-beta.3` which includes the final circuit changes.
- The new NU5 consensus branch ID.
- Updated ZIP 244 test vectors (which use the NU5 consensus branch ID).
2022-03-23 02:05:06 +00:00
sasha
7071b41c55
Merge pull request #5578 from superbaud/powlimit-document
...
comment explaining the 0x0f0f[..]0f0f powLimit constant for regtest
2022-03-14 18:47:04 -07:00
sasha
eab7efcae5
explain the 0x0f0f[..]0f0f powLimit constant for regtest
2022-02-22 11:21:37 -08:00
Kris Nuttycombe
d17a0bb9de
Merge remote-tracking branch 'upstream/master' into feature/wallet_unified_addresses
2022-01-25 20:27:33 -07:00
Charlie O'Keefe
19bfc2f3b8
Merge pull request #5463 from zingolabs/drop_pyblake2_dep
...
Drop pyblake2 dependency
2022-01-25 09:32:08 -07:00
Kris Nuttycombe
cc392c70a6
Merge branch 'master' into feature/wallet_unified_addresses
2022-01-12 16:54:12 -07:00
zancas
fbbdb23214
blake2b/s is integrated into hashlib, drop external python package dependency
2022-01-11 10:16:22 -07:00
Kris Nuttycombe
20266ac911
Remove uses of KeyIO::DecodeDestination
2022-01-07 11:49:07 -07:00
Kris Nuttycombe
4966bf315a
Compute key id for UFVKs.
2021-12-15 13:53:10 -07:00
Kris Nuttycombe
8bf4ec3b4a
Require backup of the emergency recovery phrase.
...
After 4.5.2, all wallets will be populated with an emergency
recovery phrase, and all future addresses will be derived from
the associated seed. To prevent potential loss of funds, we
require that the user explicitly invoke the `walletconfirmbackup`
RPC method to verify that they have backed up this seed.
2021-10-29 13:38:36 -06:00
Jack Grigg
6e90c84be7
Fix bugs in testnet Orchard circuit
...
The consensus branch ID is updated (as the NU5 consensus rules are
altered). The testnet NU5 activation height is also reset.
2021-09-28 22:56:37 +01:00
Jack Grigg
872e95a599
Set testnet activation height for NU5
2021-09-23 05:09:42 +01:00
Jack Grigg
612f250814
Pass network type through to UA address handling logic
2021-07-13 13:40:13 +01:00
Kris Nuttycombe
041d363232
Merge remote-tracking branch 'upstream/master' into feature/3722-feature_flags
2021-04-02 09:02:16 -06:00
Daira Hopwood
f5d53f953c
Delete spare mainnet Founders' Reward addresses that will never be used.
...
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2021-04-01 13:03:06 +01:00
Kris Nuttycombe
2fc8963e63
Add feature flagging infrastructure to consensus parameters.
2021-03-10 08:55:19 -07:00
Steven Smith
48d5142dc1
Adding base NU5 declarations and logic
2021-03-06 17:35:54 -08:00
Kris Nuttycombe
6c656ab13d
Whitespace-only fix in chainparams.cpp
...
Fix a trivial annoyance.
2021-02-17 12:13:45 -07:00
Jack Grigg
d8d0918951
scripted-diff: Migrate from boost::optional to std::optional
...
-BEGIN VERIFY SCRIPT-
sed -i 's/boost::none/std::nullopt/g' ./src/*.h ./src/*.cpp ./src/*/*.h* ./src/*/*.cpp ./src/*/*/*.h* ./src/*/*/*.cpp ;
sed -i 's/boost::optional/std::optional/g' ./src/*.h ./src/*.cpp ./src/*/*.h* ./src/*/*.cpp ./src/*/*/*.h* ./src/*/*/*.cpp ;
sed -i 's/std::optional<\(.*\)&>/std::optional<std::reference_wrapper<\1>>/' ./src/*/*.h ./src/*/*.cpp ;
sed -i 's/is_initialized()/has_value()/' ./src/*.cpp ./src/*/*.cpp ;
sed -i ':a;N;$!ba;s/#include <boost\/optional.hpp>\n//' ./src/*.h ./src/*.cpp ./src/*/*.h* ./src/*/*.cpp ./src/*/*/*.h ./src/*/*/*.cpp ;
sed -i ':a;N;$!ba;s/#include "boost\/optional.hpp"\n//' ./src/*.h ;
-END VERIFY SCRIPT-
2020-12-16 22:59:35 +00:00
Jack Grigg
521eb81a95
Add <optional> header to files that will need it
2020-12-16 22:59:34 +00:00
Jack Grigg
ae4551004a
Finish migrating to std::variant
2020-12-16 22:59:32 +00:00
Jack Grigg
b521cb8932
scripted-diff: Migrate from boost::variant to std::variant
...
-BEGIN VERIFY SCRIPT-
sed -i 's/boost::variant/std::variant/' ./src/*.h ./src/*.cpp ./src/*/*.h* ./src/*/*.cpp ;
sed -i 's/boost::get<\(.*\)>(&/std::get_if<\1>(\&/' ./src/*.h ./src/*.cpp ./src/*/*.h ./src/*/*.cpp ./src/*/*/*.cpp ;
sed -i 's/boost::get</std::get</' ./src/*.h ./src/*.cpp ./src/*/*.h ./src/*/*.cpp ./src/*/*/*.cpp ;
sed -i 's/boost::apply_visitor(/std::visit(/' ./src/*.h ./src/*.cpp ./src/*/*.h ./src/*/*.cpp ;
sed -i 's/class \(.*\)\b \?: public boost::static_visitor<.*>/class \1/' ./src/*.h ./src/*.cpp ./src/*/*.h* ./src/*/*.cpp ;
sed -i ':a;N;$!ba;s/#include <boost\/variant\(\/.*\)\?.hpp>\n//' ./src/*.h ./src/*.cpp ./src/*/*.h ./src/*/*.cpp ;
sed -i ':a;N;$!ba;s/#include "boost\/variant\/.*.hpp"\n//' ./src/*/*.cpp ;
-END VERIFY SCRIPT-
2020-12-16 22:49:53 +00:00
Jack Grigg
f68c79554f
Add <variant> header to files that will need it
2020-12-16 22:48:21 +00:00
Jack Grigg
ceccb10e4f
Update minimum chain work and set activation block hashes for testnet
...
The chain work is taken from testnet block 1197611.
2020-12-09 13:00:46 +00:00
Jack Grigg
28e01d67f7
Update minimum chain work and set activation block hashes for mainnet
...
The chain work is taken from mainnet block 1069420.
2020-12-08 14:45:45 +00:00
Jack Grigg
044ff5716e
test: Re-enable regtest difficulty adjustment for unit tests that use it
2020-11-18 12:17:57 +00:00
Eric Lombrozo
03f1d38e04
Added fPowNoRetargeting field to Consensus::Params that disables nBits recalculation.
...
Zcash: Moved conditional into GetNextWorkRequired(), as we had rewritten
CalculateNextWorkRequired() to not have the necessary information. This
means that CalculateNextWorkRequired() will in unit tests calculate what
regtest would use were the new field not set; this is irrelevant, as only
GetNextWorkRequired() is used directly in consensus rules.
2020-11-17 18:48:32 +00:00