diff --git a/.cirrus.yml b/.cirrus.yml index 784418b04408..103fed740922 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -149,7 +149,7 @@ task: FILE_ENV: "./ci/test/00_setup_env_native_nowallet.sh" task: - name: 'macOS 10.12 [gui, no tests] [bionic]' + name: 'macOS 10.12 [gui, no tests] [focal]' << : *GLOBAL_TASK_TEMPLATE container: image: ubuntu:focal diff --git a/ci/test/00_setup_env_mac.sh b/ci/test/00_setup_env_mac.sh index 0584376ee8a8..97ea85d95be0 100755 --- a/ci/test/00_setup_env_mac.sh +++ b/ci/test/00_setup_env_mac.sh @@ -8,7 +8,7 @@ export LC_ALL=C.UTF-8 export CONTAINER_NAME=ci_macos_cross export HOST=x86_64-apple-darwin -export PACKAGES="cmake libcap-dev libz-dev libbz2-dev python3-setuptools" +export PACKAGES="cmake libcap-dev libz-dev libbz2-dev libtinfo5 python3-setuptools" export XCODE_VERSION=12.2 export XCODE_BUILD_ID=12B45b export RUN_UNIT_TESTS=false diff --git a/contrib/seeds/README.md b/contrib/seeds/README.md index 85dfaa8d1262..c4b678604c7f 100644 --- a/contrib/seeds/README.md +++ b/contrib/seeds/README.md @@ -26,7 +26,12 @@ that the list is as expected. ## Dependencies -Ubuntu: +Ubuntu, Debian: - sudo apt-get install python3-pip - pip3 install dnspython + sudo apt-get install python3-dnspython + +and/or for other operating systems: + + pip3 install dnspython3 + +See https://dnspython.readthedocs.io/en/latest/installation.html for more information. diff --git a/doc/build-openbsd.md b/doc/build-openbsd.md index 93fafa76d26b..bbda6de352ca 100644 --- a/doc/build-openbsd.md +++ b/doc/build-openbsd.md @@ -16,6 +16,7 @@ pkg_add autoconf # (select highest version, e.g. 2.69) pkg_add automake # (select highest version, e.g. 1.15) pkg_add python # (select highest version, e.g. 3.8) pkg_add gmp +pkg_add bash pkg_add boost git clone https://github.com/dashpay/dash.git diff --git a/doc/descriptors.md b/doc/descriptors.md index f8040e823d1f..24af88396eea 100644 --- a/doc/descriptors.md +++ b/doc/descriptors.md @@ -40,7 +40,7 @@ Output descriptors currently support: - `combo(0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798)` describes any P2PK, P2PKH with the specified public key. - `multi(1,022f8bde4d1a07209355b4a7250a5c5128e88b84bddc619ab7cba8d569b240efe4,025cbdf0646e5db4eaa398f365f2ea7a0e3d419b7e0330e39ce92bddedcac4f9bc)` describes a bare *1-of-2* multisig with the specified public key. - `sortedmulti(1,022f8bde4d1a07209355b4a7250a5c5128e88b84bddc619ab7cba8d569b240efe4,025cbdf0646e5db4eaa398f365f2ea7a0e3d419b7e0330e39ce92bddedcac4f9bc)` describes a bare *1-of-2* multisig with keys sorted lexicographically in the resulting redeemScript. -- `pkh(xpub68Gmy5EdvgibQVfPdqkBBCHxA5htiqg55crXYuXoQRKfDBFA1WEjWgP6LHhwBZeNK1VTsfTFUHCdrfp1bgwQ9xv5ski8PX9rL2dZXvgGDnw/1'/2)` describes a P2PKH output with child key *1'/2* of the specified xpub. +- `pkh(xpub68Gmy5EdvgibQVfPdqkBBCHxA5htiqg55crXYuXoQRKfDBFA1WEjWgP6LHhwBZeNK1VTsfTFUHCdrfp1bgwQ9xv5ski8PX9rL2dZXvgGDnw/1/2)` describes a P2PKH output with child key *1/2* of the specified xpub. - `pkh([d34db33f/44'/0'/0']xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL/1/*)` describes a set of P2PKH outputs, but additionally specifies that the specified xpub is a child of a master with fingerprint `d34db33f`, and derived using path `44'/0'/0'`. ## Reference diff --git a/doc/tor.md b/doc/tor.md index a54093ec31ba..66bc8e309e69 100644 --- a/doc/tor.md +++ b/doc/tor.md @@ -164,7 +164,6 @@ versions of Tor see [Section 4](#4-automatically-listen-on-tor).* HiddenServiceDir /var/lib/tor/dashcore-service/ HiddenServicePort 9999 127.0.0.1:9996 - HiddenServicePort 19999 127.0.0.1:19996 The directory can be different of course, but virtual port numbers should be equal to your dashd's P2P listen port (9999 by default), and target addresses and ports diff --git a/src/bench/duplicate_inputs.cpp b/src/bench/duplicate_inputs.cpp index 19da79cb5665..173a2faca902 100644 --- a/src/bench/duplicate_inputs.cpp +++ b/src/bench/duplicate_inputs.cpp @@ -44,7 +44,7 @@ static void DuplicateInputs(benchmark::Bench& bench) naughtyTx.vout[0].nValue = 0; naughtyTx.vout[0].scriptPubKey = SCRIPT_PUB; - uint64_t n_inputs = (((MaxBlockSize() / ::GetSerializeSize(CTransaction(), PROTOCOL_VERSION)) - (CTransaction(coinbaseTx).GetTotalSize() + CTransaction(naughtyTx).GetTotalSize())) / 41) - 100; + uint64_t n_inputs = (((MaxBlockSize() / ::GetSerializeSize(CMutableTransaction(), PROTOCOL_VERSION)) - (CTransaction(coinbaseTx).GetTotalSize() + CTransaction(naughtyTx).GetTotalSize())) / 41) - 100; for (uint64_t x = 0; x < (n_inputs - 1); ++x) { naughtyTx.vin.emplace_back(GetRandHash(), 0, CScript(), 0); } diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp index a1b1d983ada9..a599a2ed25ad 100644 --- a/src/bitcoin-tx.cpp +++ b/src/bitcoin-tx.cpp @@ -13,6 +13,7 @@ #include #include #include +#include #include #include