0b54ff17f2
## Issue Addressed There was an overeager assert in the import of slashing protection data here:fff01b24dd/validator_client/slashing_protection/src/slashing_database.rs (L939)We were asserting that if the import contained any blocks for a validator, then the database should contain only a single block for that validator due to pruning/consolidation. However, we would only prune if the import contained _relevant blocks_ (that would actually change the maximum slot):fff01b24dd/validator_client/slashing_protection/src/slashing_database.rs (L629-L633)This lead to spurious failures (in the form of `ConsistencyError`s) when importing an interchange containing no new blocks for any of the validators. This wasn't hard to trigger, e.g. export and then immediately re-import the same file. ## Proposed Changes This PR fixes the issue by simplifying the import so that it's more like the import for attestations. I.e. we make the assert true by always pruning when the imported file contains blocks. In practice this doesn't have any downsides: if we import a new block then the behaviour is as before, except that we drop the `signing_root`. If we import an existing block or an old block then we prune the database to a single block. The only time this would be relevant is during extreme clock drift locally _plus_ import of a non-drifted interchange, which should occur infrequently. ## Additional Info I've also added `Arbitrary` implementations to the slashing protection types so that we can fuzz them. I have a fuzzer sitting in a separate directory which I may or may not commit in a subsequent PR. There's a new test in the standard interchange tests v5.2.1 that checks for this issue: https://github.com/eth-clients/slashing-protection-interchange-tests/pull/12
42 lines
916 B
Makefile
42 lines
916 B
Makefile
TESTS_TAG := v5.2.1
|
|
GENERATE_DIR := generated-tests
|
|
OUTPUT_DIR := interchange-tests
|
|
TARBALL := $(OUTPUT_DIR)-$(TESTS_TAG).tar.gz
|
|
ARCHIVE_URL := https://github.com/eth2-clients/slashing-protection-interchange-tests/tarball/$(TESTS_TAG)
|
|
|
|
ifeq ($(OS),Windows_NT)
|
|
ifeq (, $(shell where rm))
|
|
rmfile = if exist $(1) (del /F /Q $(1))
|
|
rmdir = if exist $(1) (rmdir /Q /S $(1))
|
|
else
|
|
rmfile = rm -f $(1)
|
|
rmdir = rm -rf $(1)
|
|
endif
|
|
else
|
|
rmfile = rm -f $(1)
|
|
rmdir = rm -rf $(1)
|
|
endif
|
|
|
|
$(OUTPUT_DIR): $(TARBALL)
|
|
$(call rmdir,$@)
|
|
mkdir $@
|
|
tar --strip-components=1 -xzf $^ -C $@
|
|
|
|
$(TARBALL):
|
|
curl --fail -L -o $@ $(ARCHIVE_URL)
|
|
|
|
clean-test-files:
|
|
$(call rmdir,$(OUTPUT_DIR))
|
|
|
|
clean-archives:
|
|
$(call rmfile,$(TARBALL))
|
|
|
|
generate:
|
|
$(call rmdir,$(GENERATE_DIR))
|
|
cargo run --release --bin test_generator -- $(GENERATE_DIR)
|
|
|
|
clean: clean-test-files clean-archives
|
|
|
|
.PHONY: clean clean-archives clean-test-files generate
|
|
|