resolve merge conflicts

This commit is contained in:
Eitan Seri-Levi
2026-05-22 18:15:37 +03:00
86 changed files with 1583 additions and 552 deletions

View File

@@ -93,8 +93,8 @@ SYNC_MESSAGE_DUE_BPS: 3333
CONTRIBUTION_DUE_BPS: 6667
# Gloas
# 2**6 (= 64) epochs
MIN_BUILDER_WITHDRAWABILITY_DELAY: 64
# 2**13 (= 8192) epochs
MIN_BUILDER_WITHDRAWABILITY_DELAY: 8192
# 2500 basis points, 25% of SLOT_DURATION_MS
ATTESTATION_DUE_BPS_GLOAS: 2500
# 5000 basis points, 50% of SLOT_DURATION_MS