Use the latest web3signer (#5732)
Other changes: * Include java in the Nix development shell (so users are able to run the web3signer) * Update the simulation config files to the latest spec (so the web3signer accepts them)
This commit is contained in:
parent
1559a09184
commit
00d05f8170
|
@ -22,6 +22,7 @@ mkShell {
|
||||||
lsof # for killing processes by port
|
lsof # for killing processes by port
|
||||||
killall # for killing processes manually
|
killall # for killing processes manually
|
||||||
curl # for working with the node APIs
|
curl # for working with the node APIs
|
||||||
|
openjdk # for running web3signer
|
||||||
|
|
||||||
mkdocs-python
|
mkdocs-python
|
||||||
] ++ lib.optionals (!stdenv.isDarwin) [
|
] ++ lib.optionals (!stdenv.isDarwin) [
|
||||||
|
|
|
@ -104,10 +104,11 @@ DL_GETH="0"
|
||||||
: ${BEACON_NODE_COMMAND:="./build/nimbus_beacon_node$EXE_EXTENSION"}
|
: ${BEACON_NODE_COMMAND:="./build/nimbus_beacon_node$EXE_EXTENSION"}
|
||||||
: ${CAPELLA_FORK_EPOCH:=0}
|
: ${CAPELLA_FORK_EPOCH:=0}
|
||||||
: ${DENEB_FORK_EPOCH:=50}
|
: ${DENEB_FORK_EPOCH:=50}
|
||||||
|
|
||||||
#NIMBUS EL VARS
|
#NIMBUS EL VARS
|
||||||
RUN_NIMBUS_ETH1="0"
|
RUN_NIMBUS_ETH1="0"
|
||||||
: ${NIMBUS_ETH1_BINARY:="./build/downloads/nimbus$EXE_EXTENSION"}
|
: ${NIMBUS_ETH1_BINARY:="./build/downloads/nimbus$EXE_EXTENSION"}
|
||||||
: ${WEB3SIGNER_VERSION:=23.1.0}
|
: ${WEB3SIGNER_VERSION:=24.1.0}
|
||||||
: ${WEB3SIGNER_DIR:="${BUILD_DIR}/downloads/web3signer-${WEB3SIGNER_VERSION}"}
|
: ${WEB3SIGNER_DIR:="${BUILD_DIR}/downloads/web3signer-${WEB3SIGNER_VERSION}"}
|
||||||
: ${WEB3SIGNER_BINARY:="${WEB3SIGNER_DIR}/bin/web3signer$BAT_EXTENSION"}
|
: ${WEB3SIGNER_BINARY:="${WEB3SIGNER_DIR}/bin/web3signer$BAT_EXTENSION"}
|
||||||
: ${SIGNER_NODES:=0}
|
: ${SIGNER_NODES:=0}
|
||||||
|
|
|
@ -58,7 +58,15 @@ CAPELLA_FORK_VERSION: 0x03000000
|
||||||
DENEB_FORK_VERSION: 0x04000000
|
DENEB_FORK_VERSION: 0x04000000
|
||||||
# (overriden in launch_local_testnet.sh) DENEB_FORK_EPOCH: 18446744073709551615
|
# (overriden in launch_local_testnet.sh) DENEB_FORK_EPOCH: 18446744073709551615
|
||||||
|
|
||||||
|
# EIP6110
|
||||||
|
EIP6110_FORK_VERSION: 0x05000000 # temporary stub
|
||||||
|
EIP6110_FORK_EPOCH: 18446744073709551615
|
||||||
|
# EIP7002
|
||||||
|
EIP7002_FORK_VERSION: 0x05000000 # temporary stub
|
||||||
|
EIP7002_FORK_EPOCH: 18446744073709551615
|
||||||
|
# WHISK
|
||||||
|
WHISK_FORK_VERSION: 0x06000000 # temporary stub
|
||||||
|
WHISK_FORK_EPOCH: 18446744073709551615
|
||||||
|
|
||||||
|
|
||||||
# Time parameters
|
# Time parameters
|
||||||
|
@ -88,15 +96,69 @@ MIN_PER_EPOCH_CHURN_LIMIT: 4
|
||||||
# 2**16 (= 65,536)
|
# 2**16 (= 65,536)
|
||||||
CHURN_LIMIT_QUOTIENT: 65536
|
CHURN_LIMIT_QUOTIENT: 65536
|
||||||
|
|
||||||
|
# [New in Deneb:EIP7514] 2**3 (= 8)
|
||||||
|
MAX_PER_EPOCH_ACTIVATION_CHURN_LIMIT: 8
|
||||||
|
|
||||||
# Fork choice
|
# Fork choice
|
||||||
# ---------------------------------------------------------------
|
# ---------------------------------------------------------------
|
||||||
# 40%
|
# 40%
|
||||||
PROPOSER_SCORE_BOOST: 40
|
PROPOSER_SCORE_BOOST: 40
|
||||||
|
|
||||||
|
# 20%
|
||||||
|
REORG_HEAD_WEIGHT_THRESHOLD: 20
|
||||||
|
# 160%
|
||||||
|
REORG_PARENT_WEIGHT_THRESHOLD: 160
|
||||||
|
# `2` epochs
|
||||||
|
REORG_MAX_EPOCHS_SINCE_FINALIZATION: 2
|
||||||
|
|
||||||
# Deposit contract
|
# Deposit contract
|
||||||
# ---------------------------------------------------------------
|
# ---------------------------------------------------------------
|
||||||
# Ethereum PoW Mainnet
|
# Ethereum PoW Mainnet
|
||||||
DEPOSIT_CHAIN_ID: 1
|
DEPOSIT_CHAIN_ID: 1
|
||||||
DEPOSIT_NETWORK_ID: 1
|
DEPOSIT_NETWORK_ID: 1
|
||||||
# (overriden in launch_local_testnet.sh) DEPOSIT_CONTRACT_ADDRESS: 0x00000000219ab540356cBB839Cbe05303d7705Fa
|
# (overriden in launch_local_testnet.sh) DEPOSIT_CONTRACT_ADDRESS: 0x00000000219ab540356cBB839Cbe05303d7705Fa
|
||||||
|
|
||||||
|
# Networking
|
||||||
|
# ---------------------------------------------------------------
|
||||||
|
# `10 * 2**20` (= 10485760, 10 MiB)
|
||||||
|
GOSSIP_MAX_SIZE: 10485760
|
||||||
|
# `2**10` (= 1024)
|
||||||
|
MAX_REQUEST_BLOCKS: 1024
|
||||||
|
# `2**8` (= 256)
|
||||||
|
EPOCHS_PER_SUBNET_SUBSCRIPTION: 256
|
||||||
|
# `MIN_VALIDATOR_WITHDRAWABILITY_DELAY + CHURN_LIMIT_QUOTIENT // 2` (= 33024, ~5 months)
|
||||||
|
MIN_EPOCHS_FOR_BLOCK_REQUESTS: 33024
|
||||||
|
# `10 * 2**20` (=10485760, 10 MiB)
|
||||||
|
MAX_CHUNK_SIZE: 10485760
|
||||||
|
# 5s
|
||||||
|
TTFB_TIMEOUT: 5
|
||||||
|
# 10s
|
||||||
|
RESP_TIMEOUT: 10
|
||||||
|
ATTESTATION_PROPAGATION_SLOT_RANGE: 32
|
||||||
|
# 500ms
|
||||||
|
MAXIMUM_GOSSIP_CLOCK_DISPARITY: 500
|
||||||
|
MESSAGE_DOMAIN_INVALID_SNAPPY: 0x00000000
|
||||||
|
MESSAGE_DOMAIN_VALID_SNAPPY: 0x01000000
|
||||||
|
# 2 subnets per node
|
||||||
|
SUBNETS_PER_NODE: 2
|
||||||
|
# 2**8 (= 64)
|
||||||
|
ATTESTATION_SUBNET_COUNT: 64
|
||||||
|
ATTESTATION_SUBNET_EXTRA_BITS: 0
|
||||||
|
# ceillog2(ATTESTATION_SUBNET_COUNT) + ATTESTATION_SUBNET_EXTRA_BITS
|
||||||
|
ATTESTATION_SUBNET_PREFIX_BITS: 6
|
||||||
|
|
||||||
|
# Deneb
|
||||||
|
# `2**7` (=128)
|
||||||
|
MAX_REQUEST_BLOCKS_DENEB: 128
|
||||||
|
# MAX_REQUEST_BLOCKS_DENEB * MAX_BLOBS_PER_BLOCK
|
||||||
|
MAX_REQUEST_BLOB_SIDECARS: 768
|
||||||
|
# `2**12` (= 4096 epochs, ~18 days)
|
||||||
|
MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS: 4096
|
||||||
|
# `6`
|
||||||
|
BLOB_SIDECAR_SUBNET_COUNT: 6
|
||||||
|
|
||||||
|
# Whisk
|
||||||
|
# `Epoch(2**8)`
|
||||||
|
WHISK_EPOCHS_PER_SHUFFLING_PHASE: 256
|
||||||
|
# `Epoch(2)`
|
||||||
|
WHISK_PROPOSER_SELECTION_GAP: 2
|
||||||
|
|
|
@ -57,6 +57,15 @@ CAPELLA_FORK_VERSION: 0x03000001
|
||||||
DENEB_FORK_VERSION: 0x04000001
|
DENEB_FORK_VERSION: 0x04000001
|
||||||
# (overriden in launch_local_testnet.sh) DENEB_FORK_EPOCH: 18446744073709551615
|
# (overriden in launch_local_testnet.sh) DENEB_FORK_EPOCH: 18446744073709551615
|
||||||
|
|
||||||
|
# EIP6110
|
||||||
|
EIP6110_FORK_VERSION: 0x05000001
|
||||||
|
EIP6110_FORK_EPOCH: 18446744073709551615
|
||||||
|
# EIP7002
|
||||||
|
EIP7002_FORK_VERSION: 0x05000001
|
||||||
|
EIP7002_FORK_EPOCH: 18446744073709551615
|
||||||
|
# WHISK
|
||||||
|
WHISK_FORK_VERSION: 0x06000001
|
||||||
|
WHISK_FORK_EPOCH: 18446744073709551615
|
||||||
|
|
||||||
# Time parameters
|
# Time parameters
|
||||||
# ---------------------------------------------------------------
|
# ---------------------------------------------------------------
|
||||||
|
@ -85,12 +94,20 @@ MIN_PER_EPOCH_CHURN_LIMIT: 4
|
||||||
# [customized] scale queue churn at much lower validator counts for testing
|
# [customized] scale queue churn at much lower validator counts for testing
|
||||||
CHURN_LIMIT_QUOTIENT: 32
|
CHURN_LIMIT_QUOTIENT: 32
|
||||||
|
|
||||||
|
# [New in Deneb:EIP7514] [customized]
|
||||||
|
MAX_PER_EPOCH_ACTIVATION_CHURN_LIMIT: 4
|
||||||
|
|
||||||
# Fork choice
|
# Fork choice
|
||||||
# ---------------------------------------------------------------
|
# ---------------------------------------------------------------
|
||||||
# 40%
|
# 40%
|
||||||
PROPOSER_SCORE_BOOST: 40
|
PROPOSER_SCORE_BOOST: 40
|
||||||
|
|
||||||
|
# 20%
|
||||||
|
REORG_HEAD_WEIGHT_THRESHOLD: 20
|
||||||
|
# 160%
|
||||||
|
REORG_PARENT_WEIGHT_THRESHOLD: 160
|
||||||
|
# `2` epochs
|
||||||
|
REORG_MAX_EPOCHS_SINCE_FINALIZATION: 2
|
||||||
|
|
||||||
# Deposit contract
|
# Deposit contract
|
||||||
# ---------------------------------------------------------------
|
# ---------------------------------------------------------------
|
||||||
|
@ -99,3 +116,46 @@ DEPOSIT_CHAIN_ID: 5
|
||||||
DEPOSIT_NETWORK_ID: 5
|
DEPOSIT_NETWORK_ID: 5
|
||||||
# Configured on a per testnet basis
|
# Configured on a per testnet basis
|
||||||
# (overriden in launch_local_testnet.sh) DEPOSIT_CONTRACT_ADDRESS: 0x1234567890123456789012345678901234567890
|
# (overriden in launch_local_testnet.sh) DEPOSIT_CONTRACT_ADDRESS: 0x1234567890123456789012345678901234567890
|
||||||
|
|
||||||
|
# Networking
|
||||||
|
# ---------------------------------------------------------------
|
||||||
|
# `10 * 2**20` (= 10485760, 10 MiB)
|
||||||
|
GOSSIP_MAX_SIZE: 10485760
|
||||||
|
# `2**10` (= 1024)
|
||||||
|
MAX_REQUEST_BLOCKS: 1024
|
||||||
|
# `2**8` (= 256)
|
||||||
|
EPOCHS_PER_SUBNET_SUBSCRIPTION: 256
|
||||||
|
# [customized] `MIN_VALIDATOR_WITHDRAWABILITY_DELAY + CHURN_LIMIT_QUOTIENT // 2` (= 272)
|
||||||
|
MIN_EPOCHS_FOR_BLOCK_REQUESTS: 272
|
||||||
|
# `10 * 2**20` (=10485760, 10 MiB)
|
||||||
|
MAX_CHUNK_SIZE: 10485760
|
||||||
|
# 5s
|
||||||
|
TTFB_TIMEOUT: 5
|
||||||
|
# 10s
|
||||||
|
RESP_TIMEOUT: 10
|
||||||
|
ATTESTATION_PROPAGATION_SLOT_RANGE: 32
|
||||||
|
# 500ms
|
||||||
|
MAXIMUM_GOSSIP_CLOCK_DISPARITY: 500
|
||||||
|
MESSAGE_DOMAIN_INVALID_SNAPPY: 0x00000000
|
||||||
|
MESSAGE_DOMAIN_VALID_SNAPPY: 0x01000000
|
||||||
|
# 2 subnets per node
|
||||||
|
SUBNETS_PER_NODE: 2
|
||||||
|
# 2**8 (= 64)
|
||||||
|
ATTESTATION_SUBNET_COUNT: 64
|
||||||
|
ATTESTATION_SUBNET_EXTRA_BITS: 0
|
||||||
|
# ceillog2(ATTESTATION_SUBNET_COUNT) + ATTESTATION_SUBNET_EXTRA_BITS
|
||||||
|
ATTESTATION_SUBNET_PREFIX_BITS: 6
|
||||||
|
|
||||||
|
# Deneb
|
||||||
|
# `2**7` (=128)
|
||||||
|
MAX_REQUEST_BLOCKS_DENEB: 128
|
||||||
|
# MAX_REQUEST_BLOCKS_DENEB * MAX_BLOBS_PER_BLOCK
|
||||||
|
MAX_REQUEST_BLOB_SIDECARS: 768
|
||||||
|
# `2**12` (= 4096 epochs, ~18 days)
|
||||||
|
MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS: 4096
|
||||||
|
# `6`
|
||||||
|
BLOB_SIDECAR_SUBNET_COUNT: 6
|
||||||
|
|
||||||
|
# Whisk
|
||||||
|
WHISK_EPOCHS_PER_SHUFFLING_PHASE: 4
|
||||||
|
WHISK_PROPOSER_SELECTION_GAP: 1
|
||||||
|
|
Loading…
Reference in New Issue