Kris Nuttycombe
71b6a59ec3
scripted-diff: Move utiltest to src/util
...
-BEGIN VERIFY SCRIPT-
git mv src/utiltest.h src/util/test.h
git mv src/utiltest.cpp src/util/test.cpp
sed -i -e 's/"utiltest\.h"/"util\/test\.h"/g' $(git ls-files 'src/*.h' 'src/*.cpp')
sed -i -e 's/ZCASH_UTILTEST_H/ZCASH_UTIL_TEST_H/g' src/util/test.h
sed -i -e 's/utiltest\.\(h\|cpp\)/util\/test\.\1/g' src/Makefile.am
-END VERIFY SCRIPT-
2022-07-06 10:25:28 -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
2e6a251de7
Merge pull request #5947 from nuttycom/deprecation/gettransaction_vjoinsplit
...
Deprecate vjoinsplit attribute of gettransaction result.
2022-07-01 12:03:27 -06:00
Kris Nuttycombe
74c4818d8f
Merge pull request #6041 from nuttycom/revert/feature-clock_capability
...
Revert "Merge pull request #6037 from nuttycom/feature/clock_capability"
2022-07-01 12:03:02 -06:00
Kris Nuttycombe
733289afa3
Revert "Merge pull request #6037 from nuttycom/feature/clock_capability"
...
This reverts commit 93ae72c17e
, reversing
changes made to f3f1f81302
.
2022-07-01 10:15:41 -06:00
Daira Hopwood
93ae72c17e
Merge pull request #6037 from nuttycom/feature/clock_capability
...
Add a clock for testing with an offset from the system clock.
2022-07-01 16:01:35 +01:00
str4d
f3f1f81302
Merge pull request #6022 from ebfull/shielded-req-debug
...
Make shielded requirements error "debug" level rather than an error.
2022-07-01 15:53:27 +01:00
str4d
ff82bbf408
Merge pull request #5987 from therealyingtong/orchard-getrawtransaction
...
Add Orchard details to getrawtransaction
2022-07-01 15:53:14 +01:00
Kris Nuttycombe
59cabff22d
Deprecate the `vjoinsplit` field of `gettransaction` results.
...
Author: Kris Nuttycombe <kris@nutty.land>
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2022-07-01 15:47:16 +01:00
Kris Nuttycombe
3b653fca31
Note that `gettransaction` doesn't provide shielded info in RPC help.
...
Fixes #5682
2022-07-01 15:43:59 +01:00
Sean Bowe
aa20e4399f
Make shielded requirements error "debug" level rather than an error.
2022-07-01 13:58:44 +01:00
Daira Hopwood
181710ee58
Apply cosmetic suggestions
2022-07-01 13:51:22 +01:00
Kris Nuttycombe
825ca45341
Apply suggestions from code review
...
Co-authored-by: Daira Hopwood <daira@jacaranda.org>
2022-07-01 13:51:22 +01:00
Kris Nuttycombe
88401bc25e
Add a clock for testing with an offset from the system clock.
...
This change improves clock management for zcashd by ensuring
that all clock methods (obtaining seconds, milliseconds, and
microseconds since the epoch) agree under testing conditions
using `-mocktime`, and also adds a feature that allows tests
to specify an offset to the system clock; this is useful to
allow comprehensive testing of the "timejacking attack mitigation"
consensus rules.
2022-07-01 13:51:22 +01:00
therealyingtong
da15ada52e
Test getrawtransaction in wallet_orchard.py
2022-07-01 08:50:34 -04:00
therealyingtong
acd45224bf
Use orchard_bundle ffi in getrawtransaction.
...
Co-authored-by: Jack Grigg <jack@electriccoin.co>
2022-07-01 08:50:34 -04:00
therealyingtong
d18fcc7092
Add orchard_bundle FFI.
...
Co-authored-by: Jack Grigg <jack@electriccoin.co>
2022-07-01 08:50:34 -04:00
str4d
bb64e895c2
Merge pull request #6014 from daira/upgrade-metrics
...
Upgrade to metrics 0.19.x and metrics-exporter-prometheus 0.10.x
2022-07-01 13:41:05 +01:00
Daira Hopwood
e584b1b43f
Upgrade to metrics 0.19.x and metrics-exporter-prometheus 0.10.x.
...
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2022-07-01 09:12:34 +01:00
Daira Hopwood
a119564abf
Merge pull request #6023 from str4d/orchard-batch-validation
...
Batch-verify Orchard proofs
2022-07-01 08:04:03 +01:00
Jack Grigg
eb9dd95f69
test: Load the proof verification keys in Boost tests
...
The change to use Orchard batch validation now requires the Orchard
verifying key to be available even if there are no items in the batch.
For simplicity, we now load all verifying keys in the Boost tests.
2022-07-01 01:24:15 +00:00
Jack Grigg
d46e18f955
Batch-validate Orchard proofs as well as Orchard signatures
2022-07-01 01:24:15 +00:00
Jack Grigg
0430fdf20d
Upgrade to `orchard 0.2.0`
2022-07-01 01:24:15 +00:00
Jack Grigg
107cb9636c
cargo vet fmt
2022-07-01 01:24:15 +00:00
Jack Grigg
079ff9721f
bench: Add `ConnectBlock` benchmark using block 1708048
...
This block has 88 Orchard transactions, containing a total of 552
actions, making for a nice benchmark of verification performance.
2022-07-01 01:24:15 +00:00
Jack Grigg
d3f249e0ce
bench: Support multiple trees in FakeCoinsViewDB
...
Blocks from mainnet aren't guaranteed to only contain transactions using
the same anchor, so we need to support sideloading multiple trees.
2022-07-01 01:24:15 +00:00
Jack Grigg
e6d81e0fc1
qa: Generalise `extract_benchmark_data` in `performance-measurements.sh`
2022-07-01 01:24:15 +00:00
Jack Grigg
eadfc028d6
qa: Fix `qa/zcash/create_benchmark_archive.py` script
2022-07-01 01:24:15 +00:00
Marshall Gaucher
2df8933c9d
Merge pull request #6034 from daira/bosl-notice
...
COPYING: Address feedback about the use of "permissive"
2022-06-30 15:47:14 -07:00
Daira Hopwood
747326b3dd
COPYING: Address feedback about the use of "permissive". Also refer to zcashd instead of "Zcash".
...
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2022-06-29 13:39:44 -06:00
Marshall Gaucher
f5da28d227
Merge pull request #6028 from zcash/update_walletbackup_patch
...
Update walletbackup.py
2022-06-28 19:10:23 -07:00
mdr0id
9a867e2958
Update walletbackup.py
2022-06-28 17:10:53 -07:00
Marshall Gaucher
83265428ed
Merge pull request #6027 from zcash/ci_rpc_update_parallelv1
...
Update test scripts to support initial parallel RPCs
2022-06-28 16:17:13 -07:00
mdr0id
c2d8153173
add rpc parallel test group logic
2022-06-28 13:51:21 -07:00
Charlie O'Keefe
1e6f4608b4
Merge pull request #6003 from str4d/cargo-vet
...
Integrate cargo-vet into CI system
2022-06-09 11:09:03 -06:00
Jack Grigg
ee256e2350
book: Add section about auditing Rust dependencies
2022-06-09 17:00:15 +00:00
Jack Grigg
ad369ca29f
qa: Add audits for the crates directly maintained by the ECC core team
2022-06-09 17:00:15 +00:00
Jack Grigg
dbcd7b396e
CI: Add workflow that runs `cargo vet --locked`
2022-06-09 17:00:15 +00:00
Jack Grigg
4b7445145d
qa: Add `crypto-reviewed` and `license-reviewed` criteria for `cargo vet`
2022-06-09 15:53:57 +00:00
Jack Grigg
19c7742318
qa: `cargo vet init`
2022-06-09 14:50:23 +00:00
sasha
0964fd77f1
Merge pull request #5997 from daira/update-copyrights
...
halo2 is now under MIT/Apache-2.0, so does not need a declaration in contrib/debian/copyright
Doc-only admin merge requested by @daira
2022-06-07 13:11:17 -07:00
Daira Hopwood
5b85d9df20
halo2 is now under MIT/Apache-2.0, so does not need a declaration in `contrib/debian/copyright`.
...
fixes #5203
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2022-06-07 18:59:28 +01:00
str4d
3d8cfa3a38
Merge pull request #5971 from str4d/rust-cxx
...
Integrate `cxx` crate for safe interop between Rust and C++
2022-06-02 16:11:22 +01:00
str4d
03d4cb82e4
Merge pull request #5986 from str4d/5931-bosl-exception
...
Note dependence on BOSL in COPYING
2022-06-02 12:08:29 +01:00
Jack Grigg
3753b1c4bb
Note dependence on BOSL in COPYING
...
Closes zcash/zcash#5931 .
2022-06-01 20:23:28 +00:00
Jack Grigg
340b2c3a84
Update orchard license with current exception text
...
Source: 21ad1ea5cb
which was committed directly on top of the orchard 0.1.0 release commit,
and therefore can be applied to it.
2022-06-01 20:23:28 +00:00
sasha
db3ace3a25
Merge pull request #5969 from buck54321/valuebalanceorchard-getrawtx
...
Add valueBalanceOrchard to getrawtransaction verbose output
Admin merge requested by @str4d
2022-06-01 12:54:09 -07:00
str4d
e66f768e5d
Merge pull request #5976 from nuttycom/bug/block_wallet_init_on_reindex
...
Scan wallet from genesis when reindexing
2022-06-01 18:21:10 +01:00
Jack Grigg
d8a8b30b61
Document that `-reindex` and `-salvagewallet` both imply `-rescan`
...
The latter soft-sets `-rescan` if corruption is detected, while the
former implicitly rescans as a side-effect of replaying the chain
history to the wallet.
2022-06-01 14:37:03 +00:00
Jack Grigg
22a284ceeb
wallet: Clear witness caches on load if reindexing
...
The reindexing process will replay the chain history against the wallet
starting from genesis, so we can just rebuild the witness caches from
scratch to ensure consistency.
2022-06-01 14:30:28 +00:00