Skip to content

Commit

Permalink
Update depend/zcash to newest version of upstream branch (#17)
Browse files Browse the repository at this point in the history
* Squashed 'depend/zcash/' changes from d94fe7678..fa1a578

fa1a578 zcash_script: Add API to verify scripts with precomputed tx data
c81adc3 Auto merge of #4979 - nuttycom:upstream_siphash, r=str4d
cfc4ca1 Use SipHash-2-4 for address relay selection
407532d Switch CTxMempool::mapTx to use a hash index for txids
ec4196d Use SipHash-2-4 for CCoinsCache index
f3b2cdb Add SipHash-2-4 primitives to hash
a960e89 Auto merge of #4966 - str4d:zcash-script-lib, r=nuttycom
090e284 Auto merge of #4964 - str4d:univalue-update, r=nuttycom
cc5574b Auto merge of #4963 - defuse:fix-updatecheck-token, r=nuttycom
b9504db Auto merge of #4967 - LarryRuane:upstream-lockfixes, r=nuttycom
dc94d76 Auto merge of #4968 - str4d:design-book, r=str4d
fecde3d Link to zips.z.cash for protocol spec
aec304d Show README as root of zcashd book
9cee568 Actions: Add a workflow to deploy the zcashd book
8cfbabd Set up an mdbook in which we can document zcashd's architecture design
8982265 Fix unlocked access to vNodes.size()
6da9ecd Remove double brackets in addrman
5123af4 Fix AddrMan locking
e78376b Make fImporting an std::atomic
e286250 Make fDisconnect an std::atomic
90232f6 Rename libzcashconsensus.la -> libzcash_script.la
ea80659 Rename zcashconsensus_* -> zcash_script_* in APIs
c5e7b84 Rename src/script/zcashconsensus.* -> src/script/zcash_script.*
308bb10 Add amount and consensus branch ID to zcashconsensus_verify_script
2e4edc5 Remove crypto/equihash from libzcashconsensus
92da71b Document the required .updatecheck-token file in the release docs
ce5d8da Auto merge of #4961 - str4d:leveldb-1.22-prep, r=str4d
82b40d0 scripted-diff: Use UniValue.pushKV instead of push_back(Pair())
36e86d3 Merge commit '9e26ae1c78fe62e23dcca7b22e1cd1a42b45dd25' into univalue-update
7580890 Auto merge of #4959 - str4d:dependency-updates, r=str4d
45392c2 Move the github API token out of updatecheck.py into an untracked file.
9e26ae1 Squashed 'src/univalue/' changes from 9ef5b78c1..98fadc090
3e672a5 Define TARGET_OS when host is android
b2f9192 Auto merge of #4754 - daira:fix-enable-debug, r=str4d
bd61fbf Ensure that `CONFIGURE_FLAGS=--enable-debug` correctly uses -O0 for dependencies and main build.
959e7be build: add missing leveldb defines
5d8fdbf [build] Add NETBSD leveldb target to configure.ac
5304bcd build: Updates for OpenBSD
f5d8c93 Re-instate TARGET_OS=linux in configure.ac. Removed by 351abf9e035.
780e354 cargo update
177df2c depends: Postpone updates that require adding CMake
4c7d173 depends: ZeroMQ 4.3.4
07449c1 QA: Postpone BDB update again
bb242b6 QA: Remove unused update postponements
3e35bc8 qa: Postpone Boost and native_b2 updates
c996fc1 Revert "Update boost to 1.75, postpone other updates."
c278705 Auto merge of #4956 - str4d:clang-11-macos-build, r=str4d
d0902ab depends: Ensure the native_clang download path is for the builder
c7df844 depends: Allow per-host package download paths
2de905c Auto merge of #4951 - str4d:clang-11, r=nuttycom
fa41e9a depends: Fix Boost warnings under Clang 11
a58d74c depends: Move to Clang 11
a0158ce Auto merge of #4950 - str4d:boost-build-backports, r=str4d
98ce8f8 depends: boost: Specify cflags+compileflags
cf70d2e depends: boost: Remove unnecessary _archiver_
80205dc depends: boost: Cleanup toolset selection
7f1598a depends: boost: Cleanup architecture/address-model
44f95d4 depends: boost: Disable all compression
d5dfbe0 depends: boost: Split into non-/native packages
63390e5 depends: boost: Refer to version in URL
5c03db0 depends: Propagate only specific CLI variables to sub-makes
9e997af depends: boost: Use clang toolset if clang in CXX
96cf6da depends: boost: Split target-os from toolset
b3fe7d3 depends: boost: Specify toolset to bootstrap.sh
2c1c82f depends: Propagate well-known vars into depends
0226ea4 depends: Consistent use of package variable
d642053 depends: fix boost mac cross build with clang 9+
ee10eb7 build: Add variable printing target to Makefiles
06d234d Auto merge of #4934 - oxarbitrage:issue4917, r=nuttycom
4698523 Auto merge of #4936 - oxarbitrage:issue4932, r=nuttycom
ada04aa Fix pyflakes complaints
93d1aec Auto merge of #4935 - LarryRuane:4624-ibd-getheaders, r=nuttycom
e034e26 Apply suggestions from code review
ab55776 hide password in -stdin `walletpassphrase` command
e528caf Auto merge of #4937 - centromere:freebsd, r=daira
addf0b3 #4624 improve IBD sync by eliminating getheaders requests
8c000ae Auto merge of #4944 - nuttycom:ibd_skip_tx_messages, r=str4d
2e36d42 Use parentheses for defined in windows-unused-variables.diff
feadf83 Auto merge of #4942 - str4d:rust-1.49, r=str4d
a0c1ba1 Set rust_target for all FreeBSD versions
5094a8b Auto merge of #4924 - daira:update-updatecheck, r=str4d
0bc9016 Skip "tx" messages during initial block download.
cea97a7 Auto merge of #4938 - sandakersmann:master, r=str4d
1614f1e Auto merge of #4913 - str4d:zcashconsensus-fixes, r=nuttycom
674fc8e depends: cargo update
79f531c rust: Use renamed broken_intra_doc_links lint
070d472 depends: Update Rust to 1.49.0
ae4ad8f Update of copyright year to 2021
4660e85 Update COPYRIGHT_YEAR in clientversion.h to 2021
6195593 Update _COPYRIGHT_YEAR in configure.ac to 2021
eadc3d4 Add support for FreeBSD 12
77db547 split wallet.py tests
c07007f Auto merge of #4931 - rex4539:discord-invite, r=daira
74bd17f Discord invite instead of direct link
b812c3a Auto merge of #4928 - nuttycom:release-v4.2.0, r=daira
993feb5 make-release.py: Updated release notes and changelog for 4.2.0.
a6eb9fc make-release.py: Updated manpages for 4.2.0.
c75e663 make-release.py: Versioning changes for 4.2.0.
f63bfc5 Auto merge of #4927 - daira:mempool-limit-test-fix, r=daira
66fe7a3 Revert changes in #4916 that assumed arguments represent fees, when they are actually number of confirmations.
2c17d1e Store inputs and outputs by reference in JSDescriptionInfo
6c280ab Remove init_and_check_sodium from crypto/common.h
c4ea423 prevector: Terminate without logging on failed allocation
79ad598 Remove JSDescription::h_sig
b1aa936 Add JSDescriptionInfo for constructing JSDescriptions
726c5c8 Default to defining endian-conversion DECLs in compat w/o config
9bfcba9 gtest/test_mempoollimit: the test failed to properly ensure that the "low fee penalty" threshold matches the new ZIP 313 fee.
651e7fb Auto merge of #4923 - nuttycom:release-v4.2.0-rc1, r=nuttycom
86aa5d3 qa/zcash/updatecheck.py: remove dead code; print instructions to run `cargo outdated` and `cargo update`.
a0dd3e3 make-release.py: Updated release notes and changelog for 4.2.0-rc1.
0b5b6d5 make-release.py: Updated manpages for 4.2.0-rc1.
f8bb085 make-release.py: Versioning changes for 4.2.0-rc1.
6fbf180 Auto merge of #4921 - nuttycom:fix_stdout_logging, r=str4d
8cdac68 Don't log to stdout if a file logger is configured.
c854ff7 Auto merge of #4919 - rex4539:old-boost, r=daira
2c0f6df Auto merge of #4916 - daira:reduce-fee, r=nuttycom
c2c69a1 Remove workaround affecting old Boost version
6771bef Auto merge of #4918 - str4d:update-deps, r=daira
e6a44ff Always allow transactions paying at least DEFAULT_FEE to be relayed, and do not rate-limit them. In other words, make sure that the "minimum relay fee" is no greater than DEFAULT_FEE.
8f4dd44 Update boost to 1.75, postpone other updates.
5dce316 tracing: Simplify init logic using optional layers
c97665f tracing: Remove unnecessary tracing_init_inner internal function
bdf44b1 cargo update
5e84362 Reduce the default fee for z_* operations, and the "low fee penalty" threshold for mempool limiting, to 1000 zatoshis.
844ef48 Auto merge of #4912 - daira:daira-partial-revert-4904, r=daira
4fedb32 Fix a typo introduced in #4904.
7a97e48 Auto merge of #4909 - str4d:improve-logging, r=str4d
dea5071 Auto merge of #4892 - str4d:boosted, r=str4d
2840790 Partial revert of "Update links". See #4904
a058196 Auto merge of #4603 - nuttycom:ff/no_global_params, r=daira
a8bcd46 test: Fix test_bitcoin compilation on macOS High Sierra
5b97cd2 Auto merge of #4904 - rex4539:https, r=nuttycom
bce1da6 Remove vestigial OSX_SDK_VERSION from darwin build.
f201e1e build: set minimum supported macOS to 10.14
8a1803b lint: Remove boost::variant and boost::optional from allowed includes
db17aae Finish migrating to std::optional
d8d0918 scripted-diff: Migrate from boost::optional to std::optional
521eb81 Add <optional> header to files that will need it
d992892 Migrate from boost::optional::get to boost::optional::value
ae45510 Finish migrating to std::variant
b521cb8 scripted-diff: Migrate from boost::variant to std::variant
f68c795 Add <variant> header to files that will need it
83a4ae4 Auto merge of #4886 - LarryRuane:getblocktemplate-shielded, r=str4d
8239c75 mempool: Log all accepted txids at INFO level
a5736aa rpc: Log the new filter when we set it
b517be4 rpc: Reload CNode spans after reloading the log filter
42c38b0 net: Rework CNode spans
e9b5d83 Prefer explicit passing of CChainParams to the Params() global.
5f68253 improve getblocktemplate performance for shielded coinbase
f459e43 Update links
e9cc9b4 Auto merge of #4896 - nuttycom:document_nsequence, r=daira
e7b4252 Auto merge of #4893 - str4d:ed25519-zebra-consensus, r=daira
ceccb10 Update minimum chain work and set activation block hashes for testnet
28e01d6 Update minimum chain work and set activation block hashes for mainnet
4ca2b20 test: Use ed25519_verify in ConsensusTests
5ab6976 Auto merge of #4891 - zquestz:add_hex_to_getblock, r=daira
2e9bdc6 Write down the folklore about nSequence
7dbd969 Auto merge of #4882 - rex4539:fix-readelf, r=daira
307dd88 Fix readelf configuration
36838ef Auto merge of #4889 - LarryRuane:getinfo-add-build-version, r=LarryRuane
c3a91be Switch to ed25519-zebra for consensus signature checks
77c2a5f Auto merge of #4877 - str4d:boost-backports, r=str4d
4cb31e5 Fix Hungarian notation nit from Daira
efb6035 Include transaction hex in verbose getblock output
1877530 add more version information to getinfo rpc
c8896f9 Auto merge of #4874 - str4d:rpc-tests-py, r=str4d
a7370b1 test: Run shielding-heavy RPC tests in serial
3a91bcf test: Silence pyflakes unused import warning
21bfa3a readelf is Linux only
e03667b lint: Remove boost/foreach.hpp from allowed includes
ed5c647 refactor: Drop boost::this_thread::interruption_point and boost::thread_interrupted in main thread
8e2d9a7 gui: get special folder in unicode
1ffd2d5 util: Replace boost::signals2 with std::function
df3b668 clang-format: Delete ForEachMacros
c3983cc scripted-diff: Remove #include <boost/foreach.hpp>
62114cf scripted-diff: Remove BOOST_REVERSE_FOREACH
e8b5d36 Fix const_reverse_iterator constructor (pass const ptr)
46509b9 Introduce src/reverse_iterator.hpp and include it...
f5e98e0 scripted-diff: Remove PAIRTYPE
92a867f scripted-diff: Fully remove BOOST_FOREACH
32433c2 Small preparations for Q_FOREACH, PAIRTYPE and #include <boost/foreach.hpp> removal
5a82dd0 Add autocomplete to bitcoin-qt's console window.
21a7ec8 test: Run rpc-tests.py in full_test_suite.py
891fbff test: Adjust some Zcash RPC tests to work with parallel runner
01449d8 qa: Set correct path for binaries in rpc tests
bc64428 Add exclude option to rpc-tests.py
32249fb [qa][doc] Correct rpc test options in readme
b18c437 [trivial] Add tests_config.ini to .gitignore
4f4f8d5 Various review markups for rpc-tests.py improvements
6aad43b Refactor rpc-tests.py
cc099b3 Improve rpc-tests.py arguments
389b70c Use argparse in rpc_tests.py
41c2bc1 Use configparser in rpc-tests.py
2eab4f7 remove obsolete run-bitcoind-for-test.sh
3accdb2 Reorder RPC tests for running time
8b3c39e [qa] rpc-tests: Apply random offset to portseed
0a73a0f [qa] test_framework: Exit when tmpdir exists
d014a30 [qa] pull-tester: Only print output when failed
bcbf03e [qa] Refactor RPCTestHandler to prevent TimeoutExpired
352f2dc [qa] create_cache: Delete temp dir when done
2d90c8f [doc] - clarify statement about parallel jobs in rpc-tests.py
4500a75 [qa] pull-tester: Don't mute zmq ImportError
e4d1dcc [qa] Remove unused code
b25a635 [qa] Use single cache dir for chains
dbb41d1 [qa] Adjust timeouts for micro-optimization of run time
1b3866f [qa]: enable rpcbind_test
3c7f4ca [qa]: add parsing for '<host>:<port>' argument form to rpc_url()
2fc450d [doc] Add OS X ZMQ requirement to QA readme
7366e81 [qa] pull-tester: Start longest test first
fd7689f [qa] pull-tester: Fix assertion and check for run_parallel
63a3c9a [qa] test_framework: Use different rpc_auth_pair for each node
ecf9d8e build: a few ugly hacks to get the rpc tests working out-of-tree
2399cfc Tests: add timeout to sync_blocks() and sync_mempools()
17caf1d [qa] test_framework: Append portseed to tmpdir
818d2de [qa] Remove hardcoded "4 nodes" from test_framework
5a12bc9 [qa] Add option --portseed to test_framework
cbe91ea [qa] pull-tester: Run rpc test in parallel
0d8a629 [qa] pull-tester: Adjust comment
5f13446 [qa] Stop other nodes, even when one fails to stop
065255d [qa] Update README.md
08256c9 [qa] Refactor test_framework and pull tester
1572127 [qa] Switch to py3
d362b63 [qa] rpc-tests: Fix link in comment and label error msg
cc44368 [qa] pull-tester: Exit early when no tests are run
e7a6c49 [qa] pull-tester: Don't mute zmq ImportError
db76107 [qa] mininode: Catch exceptions in got_data
7108d6a [qa] rpc-tests: Properly use integers, floats
65a6249 [qa] Use python2/3 syntax
845b31a Check if zmq is installed in tests, update docs
239857d test: don't override BITCOIND and BITCOINCLI if they're set
fb1f76f [qa] pull-tester: Cleanup (run keypool, tidy stdout)
db27db2 [qa] keypool: DRY: Use test framework
fa44509 [qa] keypool: Fix white space to prepare transition to test framework
01c3629 [qa] Extend README.md
80b2274 [qa] Split README.md to /qa and /qa/rpc-tests
800bf0a Remove unmaintained example test script_test.py
eaf4dfe Add basic coverage reporting for RPC tests
5832635 build: don't distribute tests_config.py
760e500 [rpc-tests] Check return code
6aa4f19 [rpc-tests] fundrawtransaction: Update fee after minRelayTxFee increase
480f1bf Add tests for gettxoutsetinfo, CLevelDBBatch, CLevelDBIterator
8e58edd [doc] trivial: fix markdown syntax in qa/rpc-tests/README.md
6618580 qa/pull-tester/rpc-tests.py: chmod 0755
772d780 Migrated rpc-tests.sh to all python rpc-tests.py
4761c9f Add p2p-fullblocktest.py
95d1f88 Fix crash when mining with empty keypool.
8772124 Auto merge of #4745 - nathan-at-least:autoconf-require-prog, r=str4d
da081de configure.ac: Introduce macros to simplify requiring tools.
bf70e35 Auto merge of #4553 - oxarbitrage:issue4356, r=daira
9a5f9bf Merge branch 'master' into issue4356
10b09d4 Auto merge of #4793 - str4d:faster-rpc-tests, r=str4d
949fdca Auto merge of #4873 - str4d:rpc-test-blocks, r=str4d
2cc8366 Auto merge of #4843 - furszy:2020_improving_sendmany_redudant_loops_first_round, r=daira
044ff57 test: Re-enable regtest difficulty adjustment for unit tests that use it
e3974db Auto merge of #4870 - mdr0id:canopy_smoke_tests_update, r=str4d
a7f9365 test: Set hashFinalSaplingRoot default correctly in create_block
030a685 test: Fix SignatureHash RPC test helper
bbed3ec test: Remove FindAndDelete from RPC test framework
8bc0a59 Revert "remove SignatureHash from python rpc tests"
aead914 [doc][trivial] no retargeting in regtest mode
03f1d38 Added fPowNoRetargeting field to Consensus::Params that disables nBits recalculation.
20dd32f Auto merge of #4871 - rex4539:typos, r=str4d
31e220a Fix typo
4dc94c9 Update expected fails for  Sprout txns flows on Canopy
33fdb1b Auto merge of #4868 - daira:clean-removes-lib, r=str4d
6d85686 Auto merge of #4869 - zcash:release-v4.1.1, r=nuttycom
2514054 Add notable changes to release notes for v4.1.1
7ec8a9c make-release.py: Updated release notes and changelog for 4.1.1.
092829c make-release.py: Updated manpages for 4.1.1.
142328b make-release.py: Versioning changes for 4.1.1.
f6fc97f Windows cross-build generates .lib files, which should be ignored by git and removed by clean.
9248cd7 Auto merge of #4864 - daira:go-faster, r=daira
61ebef4 Auto merge of #4865 - nuttycom:fix/shielded_coinbase_fr_rpc_fields, r=str4d
c8a90d9 Update getblocktemplate documentation.
1a89167 Document how to get block subsidy information in getblocktemplate.
d107cf1 Correctly report founder's reward amount in getblocktemplate prior to Canopy
a0a87ab Set release CFLAGS/CXXFLAGS to use -O3.
0ccc885 Auto merge of #4863 - nuttycom:fix/ibd_flag_check_order, r=daira
b5ad4cf Change order of checks to skip IsInitialBlockDownload check if flag is unset.
2be143a sendmany::find_unspent_notes removing an unneeded recursive lock, GetFilteredNotes is already locking cs_main and cs_wallet.
b4e6353 asyncOp sendmany: moved inputs total amount check inside load_utxo before the dust validation.
ca9fc49 rpc_wallet_tests: changed "Insufficient funds" error message to a proper "Insufficient transparent funds". This is because we are now throwing the insufficient transparent balance rpc error inside load_utxo.
3a1b519 Improving asyncoperation_sendmany, removing another redundant for loop over all of the available utxos.
2c7b080 sendmany operation: Creating TxValues struct to store the transaction values in a more organized manner.
a9f3315 move-only: asyncOp_sendmany, target amount calculation moved before find inputs (utxos and notes).
88eef56 sendmany: removing now unused SendManyInputUTXO class.
726daee asyncRPCOperation_sendmany:find_utxos, removing a redundant loop over all of the available utxo in the wallet.
c843902 COutput: implemented Value() method.
d8e154e wallet:COutput adding fIsCoinbase member.
a1b7cd4 sendmany::find_utxo removing an unneeded recursive lock, AvailableCoins is already locking cs_main and cs_wallet.
359a05d wallet:AvailableCoins filter by destination/s feature implemented + connected to sendmany async operation.
4007e24 asyncrpcoperation_sendmany::find_utxos removing a redundant coinbase check, coinbases are already being filtered by the AvailableCoins flag.
fbfb2c0 wallet:AvailableCoins nMinDepth filter implemented + connected to sendmany async operation.
e4e9712 wallet:AvailableCoins fOnlySpendable filtering flag implemented + connected to sendmany async operation.
ac792a3 Auto merge of #4860 - daira:clarify-meantarget, r=daira
4d16bfd GetNextWorkRequired: clarify why this computation is equivalent to that in the protocol spec. refs zcash/zips#418
6c43a57 test: Use default shielded address in RPC tests where the type is irrelevant
5c47b9b Auto merge of #4852 - str4d:cargo-update, r=str4d
120b184 cargo update
091f5d7 Auto merge of #4851 - adityapk00:mining_fix, r=str4d
7732b9a Don't compile ehHashState::* if mining is disabled
60331b9 Auto merge of #4574 - oxarbitrage:issue4475, r=daira
5701095 Wording improvements to getrawtransaction RPC documentation
caed4ad Auto merge of #4849 - str4d:lint-fixes, r=str4d
e531d72 doc: Adjust subtree developer notes to refer to Zcash
399ab8a lint: Fix minor shellcheck lints
6b63fdd lint: s/trim/lenTrim in src/crypto/equihash.[cpp,h]
25dafc3 lint: Apply include guard style to src/rust/include
e6b1d44 lint: Re-exclude subtrees from lint-include-guards.sh
dbfb356 lint: Opt out of locale dependence in Zcash shell scripts
7c4b19f lint: Use consistent shebangs
337e528 python: Explicitly set encoding to utf8 when opening text files
1944eb1 lint: Fix duplicate includes
d0a5343 lint: Fix missing or inconsistent include guards
c0c05eb doc: improve subtree check instructions
9069364 [linter] Strip trailing / in path for git-subtree-check
cff7e77 Revert "Remove unused variable in shell script"
eb074fd Improve git-subtree-check.sh
52d9854 Remove unused variables in shell scripts.
92633fd uint256: replace sprintf with HexStr and reverse-iterator
5295079 test: Explicitly set encoding to utf8 when opening text files
ccf31ed [copyright] add MIT license headers to .sh scripts where missing
84a5830 Auto merge of #4829 - str4d:backport-lints, r=str4d
1e6d183 lint: Remove some subtrees from exclusion
5b543b1 lint: Allow stoi in src/rpc/blockchain.cpp
bd5ff7c Auto merge of #4835 - str4d:bctest-backports, r=str4d
95ad6fc test: Fix pyflakes warning in bitcoin-util-test.py
9dbf535 lints: Add a missing copyright header
4b69b94 Small documentation fixes
80a658f Auto merge of #4844 - ebfull:release-v4.1.0, r=daira
08fd678 Update approximate release height
9049362 Fix a comment about postponement of Clang upgrade
4f331d0 Update doc/release-notes/release-notes-4.1.0.md
f8c9a1f Update doc/release-notes/release-notes-4.1.0.md
fe681d2 make-release.py: Updated release notes and changelog for 4.1.0.
453dacc make-release.py: Updated manpages for 4.1.0.
75a8a6c make-release.py: Versioning changes for 4.1.0.
34c2a4b Postpone clang and libc++ dependency updates until after the 4.1.0 release.
2a78e35 Auto merge of #4837 - daira:fix-gitian, r=daira
6cbaa65 Gitian builds: Remove manual CFLAGS and CXXFLAGS from descriptor.
e289f81 Improve logging in bctest.py if there is a formatting mismatch
abd7840 Clean up bctest.py and bitcoin-util-test.py
5508f14 Add logging to bitcoin-util-test.py
3e2460b test: Add format-dependent comparison to bctest
2079d49 add verbose mode to bitcoin-util-test.py
e9c1703 bitcoin-util-test.py should fail if the output file is empty
cbce715 Add option to run bitcoin-util-test.py manually
25193f0 Add bitcoin-tx JSON tests
7c42009 lints: Match `export LC_ALL="C"` in lint-shell-locale
69d3d38 Follow-up to #13454: Fix broken build by exporting LC_ALL=C
32fe883 lints: Update expected Boost imports
f318ab3 lints: Use Zcash-specific include guards for new files
d89f31d Make lint-includes.sh work from any directory
bdaccd0 Run all lint scripts
1be9fa9 Remove no longer needed shellcheck suppressions
68393a4 Fix warnings introduced in shellcheck v0.6.0
8ed37f5 Remove repeated suppression. Fix indentation.
37604a1 refactor/lint: Add ignored suggestions to an array
653f6dc qa: Ignore shellcheck warning SC2236
27f9241 Scripts and tools & Docs: Used #!/usr/bin/env bash instead of obsolete #!/bin/bash, added linting for .sh files shebang and updated the Developer Notes.
5b11b94 macOS fix: Add excludes for checks added in the newer shellcheck version installed by brew
73a6c29 macOS fix: Work around empty (sub)expression error when using BSD grep
52f45ad use export LC_ALL=C.UTF-8
b90433a fix locale for lint-shell
be186b8 Obsolete #!/bin/bash shebang
f98ced2 Add linter: Make sure we explicitly open all text files using UTF-8 or ASCII encoding in Python
0eef155 Explicitly specify encoding when opening text files in Python code
1b32acd Add linter: Make sure all shell scripts opt out of locale dependence using "export LC_ALL=C"
745ac0a Add "export LC_ALL=C" to all shell scripts
aade01b docs: Mention lint-locale-dependence.sh in developer-notes.md
40316e9 build: Add linter for checking accidental locale dependence
9174cca build: Guard against accidental introduction of new Boost dependencies
c284807 test: Move linters to test/lint, add readme
2788e33 [contrib] convert test-security-check to python3
5d0affe add lint tool to check python3 shebang
eab2490 Add shell script linting: Check for shellcheck warnings in shell scripts
5747638 Refine travis check for duplicate includes
a3afa2a Add Travis check for duplicate includes
87bc7fc Add lint-include-guards.sh which checks include guard consistency
4ddfb21 Fix missing or inconsistent include guards
653846b Document include guard convention
b2d5605 [script] lint-whitespace: improve print linenumber
87f4e1c devtools: Exclude patches from lint-whitespace
c1683a1 [scripts] lint-whitespace: check last N commits or unstaged changes
034fe80 [scripts] lint-whitespace: use perl instead of grep -P
b77da1f contrib: Ignore historical release notes for whitespace check
378d6d0 Add tab char lint check and exclude imported dependencies
5da5d54 Add a lint check for trailing whitespace.
36463d4 Fix header guards using reserved identifiers
70e1e11 [Trivial] ensure minimal header conventions
75f1a46 Auto merge of #4832 - therealyingtong:release-v4.1.0-rc1, r=daira
d66cabf Update release-notes-4.1.0-rc1.md
3cdef42 make-release.py: Updated release notes and changelog for 4.1.0-rc1.
1f731e8 make-release.py: Updated manpages for 4.1.0-rc1.
f10cf66 make-release.py: Versioning changes for 4.1.0-rc1.
b61a7e2 Auto merge of #4831 - str4d:shell-cleanups, r=daira
ab5fdb7 Use bash instead of POSIX sh. POSIX sh does not support arrays.
8cd66cf Add error handling: exit if cd fails
5009f21 Auto merge of #4830 - daira:rename-bp-funding-stream, r=daira
d54dda7 Rename the FS_ZIP214_ECC funding stream to FS_ZIP214_BP. See also zcash/zips#412 .
d601267 Auto merge of #4826 - str4d:4823-static-assert, r=daira
d476537 scripted-diff: Remove BOOST_STATIC_ASSERT
1d5ed8f Auto merge of #4744 - LarryRuane:4721-treestate, r=daira
a91a7d3 add z_gettreestate rpc
b9a4f29 Auto merge of #4812 - str4d:shielded-reqs-reject-reasons, r=str4d
311a079 Auto merge of #4827 - str4d:commit-script-check, r=str4d
1b42734 tests: Update chained_joinsplits test for HaveShieldedRequirements API change
8aadc74 Use HTTPS in script license headers
e9b836d Update example scripted-diff comit in doc/developer-notes.md
1b01bd9 test/lint: Check for working changes before checking scripted diffs
001e803 test: Mention commit id in scripted diff error
1d3af17 Enable ShellCheck rules
ccd074a scripted-diff: Run scripted-diff in subshell
3b1bf4b Add "export LC_ALL=C" to all shell scripts
6506fba test: Move linters to test/lint, add readme
9645ae5 [docs] document scripted-diff
6b6f3b5 Fail on commit with VERIFY SCRIPT but no scripted-diff
553c9e6 devtools: add script to verify scriptable changes
8f56306 Add txid to "shielded requirements not met" messages
3605406 Auto merge of #4815 - daira:fix-checksum-message, r=daira
e86f83c Fix an error reporting bug in "Checksum missing or mismatched ..."
40d5f0a Auto merge of #4805 - str4d:fs-abstraction, r=str4d
d7c80e7 utils: Remove unnecessary GetTempPath()
fef4b91 Auto merge of #4804 - str4d:update-secp256k1-again, r=daira
6fa2d1b Add logging to CCoinsViewCache::HaveShieldedRequirements
47c0c65 Improve reject reasons for unmet shielded requirements
a4b6aaa Auto merge of #4810 - daira:fix-death-tests, r=daira
693def7 Auto merge of #4733 - nathan-at-least:download-stamp-native_rust-fix, r=daira
f23528d Fix death gtests on macOS by switching to the threadsafe style.
888039c Auto merge of #4808 - nuttycom:fix_release_notes, r=daira
4567e6f Replace invalid characters in log message decoding.
d264471 Auto merge of #4807 - nuttycom:release-fix-updatecheck, r=nuttycom
b28c535 Fix invocation of updatecheck.py in make-release.py
94fa873 depends: fix a logging bug for multi-archive packages.
3cf87df Remove unused Boost includes
e2273f1 [Trivial] Add BITCOIN_FS_H endif footer in fs.h
0d3bba0 Remove `namespace fs=fs`
532a0c5 torcontrol: Use fs::path instead of std::string for private key path
c0603a9 Use fsbridge for fopen and freopen
73bc7a0 Replace uses of boost::filesystem with fs
7044e39 Replace includes of boost/filesystem.h with fs.h
082f530 Add fs.cpp/h
dafc0d3 Move GetTempPath() to testutil.
42929fa Add a source file for unit test utils.
0522f6f build: Update secp256k1 configure flags
eec9e2d Update libsecp256k1 subtree to latest master
52ac872 Squashed 'src/secp256k1/' changes from 8ab24e8da..c6b6b8f1b
afe8509 Auto merge of #4803 - therealyingtong:postpone-ccache, r=therealyingtong
cafc622 Auto merge of #4757 - str4d:update-secp256k1, r=str4d
d8f2086 Postpone native_ccache 4.0
990f77b build: Use the endomorphism optimization for secp256k1
53ba817 Update src/secp256k1 subtree to upstream libsecp256k1
2fa8a70 Squashed 'src/secp256k1/' changes from 6ad5cdb42..8ab24e8da
1f06621 add myblockhash parameter to getrawtransaction
be9aec6 add address to z_importviewingkey error
REVERT: d94fe7678 zcash_script: Add API to verify scripts with precomputed tx data
REVERT: 2178e309d Rename libzcashconsensus.la -> libzcash_script.la
REVERT: 515b37aa2 Rename zcashconsensus_* -> zcash_script_* in APIs
REVERT: 021e8050d Rename src/script/zcashconsensus.* -> src/script/zcash_script.*
REVERT: 06d6b7d8b Add amount and consensus branch ID to zcashconsensus_verify_script
REVERT: 1f3b27427 Remove crypto/equihash from libzcashconsensus
REVERT: dc8ac9107 prevector: Terminate without logging on failed allocation
REVERT: 1075096bb Remove init_and_check_sodium from crypto/common.h
REVERT: 09e423ccc Remove JSDescription::h_sig
REVERT: bc2f687ca Add JSDescriptionInfo for constructing JSDescriptions
REVERT: 28c01c2b5 Default to defining endian-conversion DECLs in compat w/o config
REVERT: bd1166814 Replace boost::optional with std::optional
REVERT: 04bd26523 Replace boost::variant with std::variant

git-subtree-dir: depend/zcash
git-subtree-split: fa1a578

* fix compiler errors related to building c code as cpp
  • Loading branch information
yaahc committed Apr 16, 2021
1 parent 7c1a797 commit 2f6c4bb
Show file tree
Hide file tree
Showing 523 changed files with 18,355 additions and 7,851 deletions.
3 changes: 3 additions & 0 deletions build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,14 @@ fn main() -> Result<()> {
base_config
.include("depend/zcash/src/secp256k1")
.flag_if_supported("-Wno-unused-function") // some ecmult stuff is defined but not used upstream
.flag_if_supported("-Wno-missing-field-initializers")
.define("SECP256K1_BUILD", "1")
// zcash core defines libsecp to *not* use libgmp.
.define("USE_NUM_NONE", "1")
.define("USE_FIELD_INV_BUILTIN", "1")
.define("USE_SCALAR_INV_BUILTIN", "1")
.define("ECMULT_WINDOW_SIZE", "15")
.define("ECMULT_GEN_PREC_BITS", "4")
// Use the endomorphism optimization now that the patents have expired.
.define("USE_ENDOMORPHISM", "1")
// Technically libconsensus doesn't require the recovery feature, but `pubkey.cpp` does.
Expand Down
32 changes: 32 additions & 0 deletions depend/zcash/.github/workflows/book.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: zcashd book

on:
push:
branches:
- master

jobs:
deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

- name: Setup mdBook
uses: peaceiris/actions-mdbook@v1
with:
mdbook-version: '0.4.5'

- name: Install mdbook-katex
uses: actions-rs/cargo@v1
with:
command: install
args: mdbook-katex

- name: Build zcashd book
run: mdbook build book/

- name: Deploy to GitHub Pages
uses: peaceiris/actions-gh-pages@v3
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./book/book
10 changes: 6 additions & 4 deletions depend/zcash/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ src/univalue/gen
*.o-*
.zcash
*.a
*.lib
*.pb.cc
*.pb.h
.vscode
Expand Down Expand Up @@ -103,10 +104,9 @@ afl-temp
linux-coverage-build
linux-build
win32-build
qa/pull-tester/run-bitcoind-for-test.sh
qa/pull-tester/tests-config.sh
qa/pull-tester/cache/*
qa/pull-tester/test.*/*
qa/pull-tester/tests_config.py
qa/pull-tester/tests_config.ini
qa/cache/*

!src/leveldb*/Makefile

Expand All @@ -120,3 +120,5 @@ contrib/debian/substvars
src/fuzzing/*/input
src/fuzzing/*/output
src/fuzz.cpp

.updatecheck-token
6 changes: 3 additions & 3 deletions depend/zcash/COPYING
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Copyright (c) 2016-2020 The Zcash developers
Copyright (c) 2009-2020 The Bitcoin Core developers
Copyright (c) 2009-2020 Bitcoin Developers
Copyright (c) 2016-2021 The Zcash developers
Copyright (c) 2009-2021 The Bitcoin Core developers
Copyright (c) 2009-2021 Bitcoin Developers

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
Loading

0 comments on commit 2f6c4bb

Please sign in to comment.