From 4473ab98e91b307745be9f18804457b9cf895c04 Mon Sep 17 00:00:00 2001 From: Dustin Brody Date: Mon, 31 Aug 2020 12:01:29 +0200 Subject: [PATCH 1/3] ignore sqlite WAL journal files in git; switch attestation resolved from info to debug --- .gitignore | 2 ++ beacon_chain/attestation_pool.nim | 4 ++-- beacon_chain/eth2_network.nim | 2 +- beacon_chain/fork_choice/fork_choice.nim | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index da6ab1c8f2..e5e01d6623 100644 --- a/.gitignore +++ b/.gitignore @@ -30,6 +30,8 @@ build/ *.ssz *.log *.sqlite3 +*.sqlite3-shm +*.sqlite3-wal /local_testnet_data*/ /local_testnet*_data*/ diff --git a/beacon_chain/attestation_pool.nim b/beacon_chain/attestation_pool.nim index e85c0e096e..10e0358efd 100644 --- a/beacon_chain/attestation_pool.nim +++ b/beacon_chain/attestation_pool.nim @@ -152,7 +152,7 @@ proc addAttestation*(pool: var AttestationPool, attestation.data.slot, participants, attestation.data.beacon_block_root, wallSlot) - info "Attestation resolved", + debug "Attestation resolved", attestation = shortLog(attestation), validations = a.validations.len() @@ -169,7 +169,7 @@ proc addAttestation*(pool: var AttestationPool, attestation.data.slot, participants, attestation.data.beacon_block_root, wallSlot) - info "Attestation resolved", + debug "Attestation resolved", attestation = shortLog(attestation), validations = 1 diff --git a/beacon_chain/eth2_network.nim b/beacon_chain/eth2_network.nim index 0b6cf3f053..cfb73c3123 100644 --- a/beacon_chain/eth2_network.nim +++ b/beacon_chain/eth2_network.nim @@ -1,6 +1,6 @@ import # Std lib - std/[typetraits, strutils, os, algorithm, sequtils, math, sets], + std/[typetraits, strutils, os, algorithm, math, sets], std/options as stdOptions, # Status libs diff --git a/beacon_chain/fork_choice/fork_choice.nim b/beacon_chain/fork_choice/fork_choice.nim index 2817ee0e56..5d6830c116 100644 --- a/beacon_chain/fork_choice/fork_choice.nim +++ b/beacon_chain/fork_choice/fork_choice.nim @@ -9,7 +9,7 @@ import # Standard library - std/[sequtils, sets, tables, typetraits], + std/[sequtils, sets, tables], # Status libraries stew/results, chronicles, # Internal From 1ac40274ee58cc6a7fe39b8e0e671769cc195aea Mon Sep 17 00:00:00 2001 From: Dustin Brody Date: Mon, 31 Aug 2020 12:09:43 +0200 Subject: [PATCH 2/3] re-add sequtils --- beacon_chain/eth2_network.nim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/beacon_chain/eth2_network.nim b/beacon_chain/eth2_network.nim index cfb73c3123..0b6cf3f053 100644 --- a/beacon_chain/eth2_network.nim +++ b/beacon_chain/eth2_network.nim @@ -1,6 +1,6 @@ import # Std lib - std/[typetraits, strutils, os, algorithm, math, sets], + std/[typetraits, strutils, os, algorithm, sequtils, math, sets], std/options as stdOptions, # Status libs From cf265a90123bc078017f201f9e638276fe3910d0 Mon Sep 17 00:00:00 2001 From: Dustin Brody Date: Mon, 31 Aug 2020 14:37:25 +0200 Subject: [PATCH 3/3] promote sent attestations/blocks to notice rather than demote resolved attestations/blocks to debug --- beacon_chain/attestation_pool.nim | 4 ++-- beacon_chain/validator_duties.nim | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/beacon_chain/attestation_pool.nim b/beacon_chain/attestation_pool.nim index 10e0358efd..e85c0e096e 100644 --- a/beacon_chain/attestation_pool.nim +++ b/beacon_chain/attestation_pool.nim @@ -152,7 +152,7 @@ proc addAttestation*(pool: var AttestationPool, attestation.data.slot, participants, attestation.data.beacon_block_root, wallSlot) - debug "Attestation resolved", + info "Attestation resolved", attestation = shortLog(attestation), validations = a.validations.len() @@ -169,7 +169,7 @@ proc addAttestation*(pool: var AttestationPool, attestation.data.slot, participants, attestation.data.beacon_block_root, wallSlot) - debug "Attestation resolved", + info "Attestation resolved", attestation = shortLog(attestation), validations = 1 diff --git a/beacon_chain/validator_duties.nim b/beacon_chain/validator_duties.nim index 5db5d9d7f9..97ae4ff658 100644 --- a/beacon_chain/validator_duties.nim +++ b/beacon_chain/validator_duties.nim @@ -152,7 +152,7 @@ proc createAndSendAttestation(node: BeaconNode, if node.config.dumpEnabled: dump(node.config.dumpDirOutgoing, attestation.data, validator.pubKey) - info "Attestation sent", + notice "Attestation sent", attestation = shortLog(attestation), validator = shortLog(validator), indexInCommittee = indexInCommittee @@ -249,7 +249,7 @@ proc proposeSignedBlock*(node: BeaconNode, return head - info "Block proposed", + notice "Block proposed", blck = shortLog(newBlock.message), blockRoot = shortLog(newBlockRef[].root), validator = shortLog(validator)