Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync with the main repo #266

Merged
merged 78 commits into from
Feb 17, 2023
Merged
Changes from 1 commit
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
5669afb
fs: drop old WSL1 hack.
philmb3487 Aug 26, 2022
9d3127b
Add settings.json prune-prev, proxy-prev, onion-prev settings
ryanofsky Apr 22, 2022
741908a
test: previous releases: add v24.0.1
theStack Nov 27, 2022
7a83aa0
test: add coverage for unparsable `-maxuploadtarget`
brunoerg Dec 16, 2022
691eaf8
Pass MSG_MORE flag when sending non-final network messages
whitslack Feb 23, 2018
a804f3c
wallet: extract and reuse RPC argument format definition for outputs
rodentrabies Jun 14, 2022
c0ebb98
wallet: add `outputs` arguments to `bumpfee` and `psbtbumpfee`
rodentrabies Jun 11, 2022
4c8eccc
test: add tests for `outputs` argument to `bumpfee`/`psbtbumpfee`
rodentrabies Jun 11, 2022
ab4efad
test: fix immediate tx relay in wallet_groups.py
theStack Jan 26, 2023
9066314
s/transcation/transaction/
instagibbs Jan 30, 2023
e37bcaa
Split ChaCha20 into aligned/unaligned variants
sipa Sep 21, 2022
6babf40
Rename ChaCha20::Seek -> Seek64 to clarify multiple of 64
sipa Sep 21, 2022
12ff724
Make unrestricted ChaCha20 cipher not waste keystream bytes
sipa Sep 21, 2022
5f05b27
Add xoroshiro128++ PRNG
martinus Jun 10, 2022
38eaece
Add fuzz test for testing that ChaCha20 works as a stream
sipa Jun 13, 2022
5d16f75
Use ChaCha20 caching in FastRandomContext
sipa Sep 21, 2022
f21994a
Use ChaCha20Aligned in MuHash3072 code
sipa Sep 21, 2022
62ec713
Only support 32-byte keys in ChaCha20{,Aligned}
sipa Sep 21, 2022
93aee8b
Inline ChaCha20 32-byte specific constants
sipa Sep 21, 2022
fb243d2
Improve test vectors for ChaCha20
sipa Sep 21, 2022
511aa4f
Add unit test for ChaCha20's new caching
sipa Jan 18, 2023
b3b673f
mapport: require miniupnpc API version 17 or later
fanquake Jul 29, 2021
3c9cea1
Add simulation-based CCoinsViewCache fuzzer
sipa Jan 31, 2023
b0ff310
Add CCoinsViewCache::SanityCheck() and use it in fuzz test
sipa Feb 1, 2023
59e6828
Add deterministic mode to CCoinsViewCache
sipa Feb 1, 2023
77192c9
cli: include local ("unreachable") peers in -netinfo table
pinheadmz Nov 27, 2022
561848a
Exercise non-DIRTY spent coins in caches in fuzz test
sipa Feb 3, 2023
dee8549
test: simplify and speedup mempool_updatefromblock.py by using MiniWa…
theStack Feb 3, 2023
aafa5e9
Remove laanwj from trusted-keys
laanwj Feb 7, 2023
5fffff5
ci: Cache stuff in volumes, not host folders
Feb 3, 2023
7726712
test: p2p: check that headers message with invalid proof-of-work disc…
theStack Sep 25, 2022
fa8e92c
doc: Update ci docs
Feb 10, 2023
6ada37d
verify-commits: Bump trusted git root to after most recent laanwj merge
achow101 Feb 10, 2023
3a11adc
Zero out wallet master key upon lock
john-moffett Feb 10, 2023
22c5b00
miniscript: satisfaction support
darosior Aug 24, 2021
f5deb41
Various additional explanations of the satisfaction logic from Pieter
sipa Feb 8, 2023
4242c1c
Align 'e' property of or_d and andor with website spec
sipa Feb 8, 2023
61c6d1a
script/sign: basic signing support for Miniscript descriptors
darosior Dec 1, 2021
a2f81b6
script/sign: signing support for Miniscript with timelocks
darosior Dec 2, 2021
560e62b
script/sign: signing support for Miniscripts with hash preimage chall…
darosior Dec 4, 2021
0a8fc9e
wallet: check solvability using descriptor in AvailableCoins
darosior Aug 12, 2022
d57b7f2
refactor: make descriptors in Miniscript functional test more readable
darosior Feb 11, 2023
611e125
qa: functional test Miniscript signing with key and timelocks
darosior Jan 20, 2022
17e3547
qa: add a fuzz target generating random nodes from a binary encoding
darosior Feb 21, 2022
840a396
qa: add a "smart" Miniscript fuzz target
darosior Apr 14, 2022
a631659
Merge bitcoin/bitcoin#26970: test: fix immediate tx relay in wallet_g…
bitcoin-core-merge-script Feb 13, 2023
141115a
Merge bitcoin/bitcoin#27033: ci: Cache stuff in volumes, not host fol…
bitcoin-core-merge-script Feb 13, 2023
8126551
Merge bitcoin/bitcoin#27011: Add simulation-based `CCoinsViewCache` f…
bitcoin-core-merge-script Feb 13, 2023
6c7a17a
psbt: support externally provided preimages for Miniscript satisfaction
darosior Feb 11, 2023
1ad0711
Merge bitcoin/bitcoin#27016: mapport: require miniupnpc API version 1…
fanquake Feb 13, 2023
fa9ec7b
test: Fix intermittent sync issue in wallet_pruning
Feb 13, 2023
2c1fe27
Merge bitcoin/bitcoin#27080: Wallet: Zero out wallet master key upon …
achow101 Feb 13, 2023
e4e1790
Modernize rpcauth.py and its tests
sipa Feb 10, 2023
d6ef44c
Merge bitcoin/bitcoin#27081: Modernize rpcauth.py
fanquake Feb 14, 2023
588fad8
descriptors: fix docstring (param [in] vs [out])
SomberNight Feb 14, 2023
af49d86
Merge bitcoin/bitcoin#27093: test: Fix intermittent sync issue in wal…
fanquake Feb 14, 2023
fb2f093
Merge bitcoin/bitcoin#27097: descriptors: fix docstring (param [in] v…
fanquake Feb 14, 2023
9fa43b5
refactor: Disable unused special members functions in `UnlockContext`
hebasto Feb 14, 2023
576e16e
Merge bitcoin/bitcoin#26184: test: p2p: check that headers message wi…
achow101 Feb 14, 2023
68e484a
Merge bitcoin/bitcoin#26584: cli: include local ("unroutable") peers …
bitcoin-core-merge-script Feb 15, 2023
c572eae
update the freebsd build doc to reflect recent changes to DB4 install…
murrayn Dec 30, 2022
e43ff4e
Merge bitcoin-core/gui#603: Add settings.json prune-prev, proxy-prev,…
hebasto Feb 15, 2023
2b0cd76
Merge bitcoin/bitcoin#27076: verify-commits: Bump trusted git root to…
fanquake Feb 15, 2023
1e0198b
Merge bitcoin/bitcoin#26153: Reduce wasted pseudorandom bytes in ChaC…
fanquake Feb 15, 2023
a65d225
Merge bitcoin/bitcoin#27035: test: simplify and speedup mempool_updat…
bitcoin-core-merge-script Feb 15, 2023
5ecd14a
Merge bitcoin/bitcoin#26844: Net: Pass `MSG_MORE` flag when sending n…
fanquake Feb 15, 2023
5474253
Merge bitcoin-core/gui#711: refactor: Disable unused special members …
achow101 Feb 15, 2023
424fc60
Merge bitcoin/bitcoin#26997: psbt: s/transcation/transaction/
fanquake Feb 16, 2023
cbf511b
Merge bitcoin/bitcoin#27054: Remove laanwj from trusted-keys
fanquake Feb 16, 2023
fb82d91
Merge bitcoin/bitcoin#24149: Signing support for Miniscript Descriptors
fanquake Feb 16, 2023
304ae6d
doc: remove mention of "proper signing key"
fanquake Feb 16, 2023
3995c88
Merge bitcoin/bitcoin#25898: util: remove WSL 1 workaround in fs
fanquake Feb 16, 2023
3a68e19
Merge bitcoin/bitcoin#26586: test: previous releases: add v24.0.1
bitcoin-core-merge-script Feb 16, 2023
98042a0
Merge bitcoin/bitcoin#27107: doc: remove mention of "proper signing key"
bitcoin-core-merge-script Feb 16, 2023
437dfe1
Merge bitcoin/bitcoin#26714: test: add coverage for unparsable `-maxu…
bitcoin-core-merge-script Feb 16, 2023
75f0e0b
Merge bitcoin/bitcoin#26773: doc: FreeBSD build doc updates to reflec…
fanquake Feb 16, 2023
73966f7
Merge bitcoin/bitcoin#25344: New `outputs` argument for `bumpfee`/`ps…
achow101 Feb 16, 2023
976c90d
Merge commit '73966f75f67fb797163f0a766292a79d4b2c1b70' into main
jarolrod Feb 17, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
ci: Cache stuff in volumes, not host folders
MarcoFalke committed Feb 8, 2023
commit 5fffff54e9fcf154c722dc421025a567fa0c5c97
7 changes: 4 additions & 3 deletions ci/test/00_setup_env.sh
Original file line number Diff line number Diff line change
@@ -8,11 +8,10 @@ export LC_ALL=C.UTF-8

# The root dir.
# The ci system copies this folder.
# This is where the depends build is done.
BASE_ROOT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )"/../../ >/dev/null 2>&1 && pwd )
export BASE_ROOT_DIR
# The depends dir.
# This folder exists on the ci host and ci guest. Changes are propagated back and forth.
# This folder exists only on the ci guest, and on the ci host as a volume.
export DEPENDS_DIR=${DEPENDS_DIR:-$BASE_ROOT_DIR/depends}
# A folder for the ci system to put temporary files (ccache, datadirs for tests, ...)
# This folder only exists on the ci host.
@@ -58,12 +57,14 @@ export CCACHE_SIZE=${CCACHE_SIZE:-100M}
export CCACHE_TEMPDIR=${CCACHE_TEMPDIR:-/tmp/.ccache-temp}
export CCACHE_COMPRESS=${CCACHE_COMPRESS:-1}
# The cache dir.
# This folder exists on the ci host and ci guest. Changes are propagated back and forth.
# This folder exists only on the ci guest, and on the ci host as a volume.
export CCACHE_DIR=${CCACHE_DIR:-$BASE_SCRATCH_DIR/.ccache}
# Folder where the build result is put (bin and lib).
export BASE_OUTDIR=${BASE_OUTDIR:-$BASE_SCRATCH_DIR/out/$HOST}
# Folder where the build is done (dist and out-of-tree build).
export BASE_BUILD_DIR=${BASE_BUILD_DIR:-$BASE_SCRATCH_DIR/build}
# The folder for previous release binaries.
# This folder exists only on the ci guest, and on the ci host as a volume.
export PREVIOUS_RELEASES_DIR=${PREVIOUS_RELEASES_DIR:-$BASE_ROOT_DIR/releases/$HOST}
export SDK_URL=${SDK_URL:-https://bitcoincore.org/depends-sources/sdks}
export CI_BASE_PACKAGES=${CI_BASE_PACKAGES:-build-essential libtool autotools-dev automake pkg-config bsdmainutils curl ca-certificates ccache python3 rsync git procps bison}
9 changes: 6 additions & 3 deletions ci/test/04_install.sh
Original file line number Diff line number Diff line change
@@ -39,6 +39,9 @@ if [ -z "$DANGER_RUN_CI_ON_HOST" ]; then
--build-arg "FILE_ENV=${FILE_ENV}" \
--tag="${CONTAINER_NAME}" \
"${BASE_ROOT_DIR}"
docker volume create "${CONTAINER_NAME}_ccache" || true
docker volume create "${CONTAINER_NAME}_depends" || true
docker volume create "${CONTAINER_NAME}_previous_releases" || true

if [ -n "${RESTART_CI_DOCKER_BEFORE_RUN}" ] ; then
echo "Restart docker before run to stop and clear all containers started with --rm"
@@ -48,9 +51,9 @@ if [ -z "$DANGER_RUN_CI_ON_HOST" ]; then
# shellcheck disable=SC2086
CI_CONTAINER_ID=$(docker run $CI_CONTAINER_CAP --rm --interactive --detach --tty \
--mount type=bind,src=$BASE_ROOT_DIR,dst=/ro_base,readonly \
--mount type=bind,src=$CCACHE_DIR,dst=$CCACHE_DIR \
--mount type=bind,src=$DEPENDS_DIR,dst=$DEPENDS_DIR \
--mount type=bind,src=$PREVIOUS_RELEASES_DIR,dst=$PREVIOUS_RELEASES_DIR \
--mount "type=volume,src=${CONTAINER_NAME}_ccache,dst=$CCACHE_DIR" \
--mount "type=volume,src=${CONTAINER_NAME}_depends,dst=$DEPENDS_DIR" \
--mount "type=volume,src=${CONTAINER_NAME}_previous_releases,dst=$PREVIOUS_RELEASES_DIR" \
-w $BASE_ROOT_DIR \
--env-file /tmp/env \
--name $CONTAINER_NAME \